cec: renamed enum methods. fixes potential macro collision with isset(). thanks davilla

[deb_libcec.git] / src / testclient / main.cpp

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index de9f90342928507ce3e64d8188dbf270a16f110e..2e35dce4e5e32491a4a20d7191c79b0fb48aa68b 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -269,7 +269,7 @@ void ShowHelpConsole(void)
 int main (int argc, char *argv[])
 {
   cec_device_type_list typeList;
-  typeList.clear();
+  typeList.Clear();
 
   int iArgPtr = 1;
   bool bSingleCommand(false);
@@ -327,25 +327,25 @@ int main (int argc, char *argv[])
           {
             if (!bSingleCommand)
               cout << "== using device type 'playback device'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+            typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
           }
           else if (!strcmp(argv[iArgPtr + 1], "r"))
           {
             if (!bSingleCommand)
               cout << "== using device type 'recording device'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+            typeList.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
           }
           else if (!strcmp(argv[iArgPtr + 1], "t"))
           {
             if (!bSingleCommand)
               cout << "== using device type 'tuner'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_TUNER);
+            typeList.Add(CEC_DEVICE_TYPE_TUNER);
           }
           else if (!strcmp(argv[iArgPtr + 1], "a"))
           {
             if (!bSingleCommand)
               cout << "== using device type 'audio system'" << endl;
-            typeList.add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+            typeList.Add(CEC_DEVICE_TYPE_AUDIO_SYSTEM);
           }
           else
           {
@@ -385,11 +385,11 @@ int main (int argc, char *argv[])
     }
   }
 
-  if (typeList.empty())
+  if (typeList.IsEmpty())
   {
     if (!bSingleCommand)
       cout << "No device type given. Using 'playback device'" << endl;
-    typeList.add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+    typeList.Add(CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
   }
 
   ICECAdapter *parser = LibCecInit("CECTester", typeList);
@@ -489,10 +489,10 @@ int main (int argc, char *argv[])
           string strvalue;
           uint8_t ivalue;
           cec_command bytes;
-          bytes.clear();
+          bytes.Clear();
 
           while (GetWord(input, strvalue) && HexStrToInt(strvalue, ivalue))
-            bytes.push_back(ivalue);
+            bytes.PushBack(ivalue);
 
           if (command == "txn")
             bytes.transmit_timeout = 0;