Changeset 30012 in vbox

Timestamp:

Jun 3, 2010 2:21:33 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: cleanup some compiler warnings

File:

• trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaApplication.m (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaApplication.m

@@ -41 +41 @@
 
 
--(id) init;
+-(id) init
 {
     self = [super init];
@@ -49 +49 @@
 
 
--(void) sendEvent:(NSEvent *)pEvent;
+-(void) sendEvent:(NSEvent *)pEvent
 {
     /*
@@ -129 +129 @@
             uint32_t fNewMask;
 
-            if (i + 1 != self->m_cCallbacks)
+            if (i + 1 != (int)self->m_cCallbacks)
                 self->m_aCallbacks[i] = self->m_aCallbacks[self->m_cCallbacks - 1];
             self->m_cCallbacks--;
@@ -276 +276 @@
         }
 
-        //if (fCocoa & NSNumericPadKeyMask)
-        //    fCarbon |= ???;
-
-        //if (fCocoa & NSHelpKeyMask)
-        //    fCarbon |= ???;
-
-        //if (fCocoa & NSFunctionKeyMask)
-        //    fCarbon |= ???;
+        /*
+        if (fCocoa & NSNumericPadKeyMask)
+            fCarbon |= ???;
+
+        if (fCocoa & NSHelpKeyMask)
+            fCarbon |= ???;
+
+        if (fCocoa & NSFunctionKeyMask)
+            fCarbon |= ???;
+        */
     }
 
@@ -358 +360 @@
             NSUInteger fEvtMask = [pEvent modifierFlags];
             unsigned short KeyCode = [pEvent keyCode];
-            if (   ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK))  // L+CMD
-                || ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK))) // R+CMD
-            {
-                if (   KeyCode == 0x0c  // CMD+Q (Quit)
-                    || KeyCode == 0x04) // CMD+H (Hide)
+            if (   ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK))  /* L+CMD */
+                || ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK))) /* R+CMD */
+            {
+                if (   KeyCode == 0x0c  /* CMD+Q (Quit) */
+                    || KeyCode == 0x04) /* CMD+H (Hide) */
                     fGlobalHotkey = true;
             } 
-            else if (   ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICELALTKEYMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICELALTKEYMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)) // L+ALT+CMD
-                     || ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICERCMDKEYMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICERCMDKEYMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK))) // R+ALT+CMD
-            {
-                if (KeyCode == 0x04)    // ALT+CMD+H (Hide-Others)
+            else if (   ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICELALTKEYMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICELALTKEYMASK | NX_COMMANDMASK | NX_DEVICELCMDKEYMASK)) /* L+ALT+CMD */
+                     || ((fEvtMask & (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICERCMDKEYMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK)) == (NX_NONCOALSESCEDMASK | NX_ALTERNATEMASK | NX_DEVICERCMDKEYMASK | NX_COMMANDMASK | NX_DEVICERCMDKEYMASK))) /* R+ALT+CMD */
+            {
+                if (KeyCode == 0x04)    /* ALT+CMD+H (Hide-Others) */
                     fGlobalHotkey = true;
             }
@@ -394 +396 @@
 
     printf("%s%p: Type=%lu Modifiers=%08lx pWindow=%p #Wnd=%ld pGraphCtx=%p %s\n",
-           pszPrefix, pvEvent, (unsigned long)eEvtType, (unsigned long)fEvtMask, pEvtWindow,
-           (long)iEvtWindow, pEvtGraphCtx, VBoxCocoaApplication_eventTypeName(eEvtType));
+           pszPrefix, pvEvent, (unsigned long)eEvtType, (unsigned long)fEvtMask, (void*)pEvtWindow,
+           (long)iEvtWindow, (void*)pEvtGraphCtx, VBoxCocoaApplication_eventTypeName(eEvtType));
 
     /* dump type specific into. */