Changeset 2333 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 24, 2007 4:41:01 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20715

Message:

gcc-4.2 warnings

Location:

trunk/src/VBox/Frontends

Files:

• VBoxBFE/VBoxBFE.cpp (modified) (1 diff)
• VBoxManage/VBoxManage.cpp (modified) (9 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -169 +169 @@
 static char *cdromFile = NULL;
 static char *fdaFile   = NULL;
-static char *pszBootDevice = "IDE";
+static const char *pszBootDevice = "IDE";
 static uint32_t memorySize = 128;
 static uint32_t vramSize = 4;

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1060 +1060 @@
             vrdpServer->COMGETTER(Port)(&port);
             VRDPAuthType_T vrdpAuthType;
-            char *strAuthType;
+            const char *strAuthType;
             vrdpServer->COMGETTER(AuthType)(&vrdpAuthType);
             switch (vrdpAuthType)
@@ -1664 +1664 @@
             HardDiskStorageType_T storageType;
             hdd->COMGETTER(StorageType)(&storageType);
-            char *storageTypeString = "unknown";
+            const char *storageTypeString = "unknown";
             switch (storageType)
             {
@@ -1821 +1821 @@
             USBDeviceState_T state;
             CHECK_ERROR_RET (dev, COMGETTER(State)(&state), 1);
-            char *pszState = "?";
+            const char *pszState = "?";
             switch (state)
             {
@@ -1886 +1886 @@
             USBDeviceFilterAction_T action;
             CHECK_ERROR_RET (flt, COMGETTER (Action) (&action), 1);
-            char *pszAction = "<invalid>";
+            const char *pszAction = "<invalid>";
             switch (action)
             {
@@ -2022 +2022 @@
     Bstr comment;
     bool fRegister = false;
-    char *type = "normal";
+    const char *type = "normal";
 
     /* let's have a closer look at the arguments */
@@ -4754 +4754 @@
         HardDiskType_T type;
         hardDisk->COMGETTER(Type)(&type);
-        char *typeStr = "unknown";
+        const char *typeStr = "unknown";
         switch (type)
         {
@@ -4770 +4770 @@
 
         HardDiskStorageType_T storageType;
-        char *storageTypeStr = "unknown";
+        const char *storageTypeStr = "unknown";
         hardDisk->COMGETTER(StorageType)(&storageType);
         switch (storageType)
@@ -4821 +4821 @@
     if (strcmp(argv[0], "disk") == 0)
     {
-        char *type = "normal";
+        const char *type = "normal";
         /* there can be a type parameter */
         if ((argc > 2) && (argc != 4))
@@ -6152 +6152 @@
     struct
     {
-        char *command;
+        const char *command;
         PFNHANDLER handler;
     } commandHandlers[] =

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1375 +1375 @@
         QString info =
             tr ("<qt>Indicates&nbsp;the&nbsp;activity&nbsp;of&nbsp;virtual&nbsp;hard&nbsp;disks");
-        char *ctlNames[] = { "IDE0", "IDE1", "Controller%1" };
-        char *devNames[] = { "Master", "Slave", "Device%1" };
+        const char *ctlNames[] = { "IDE0", "IDE1", "Controller%1" };
+        const char *devNames[] = { "Master", "Slave", "Device%1" };
         bool hasDisks = false;
         CHardDiskAttachmentEnumerator aen = cmachine.GetHardDiskAttachments().Enumerate();