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

Timestamp:

Jan 24, 2007 11:03:55 AM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Small naming corrections.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (2 diffs)
• include/VBoxDefs.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -84 +84 @@
     void onFullscreenChange (bool on);
     
-    void FixModifierState (LONG *codes, uint *count);
+    void fixModifierState (LONG *codes, uint *count);
 
 signals:
@@ -196 +196 @@
     bool autoresize_guest : 1;
 
-    bool mfNumLock;
-    bool mfScrollLock;
-    bool mfCapsLock;
+    bool mfNumLock : 1;
+    bool mfScrollLock : 1;
+    bool mfCapsLock : 1;
     long muNumLockAdaptionCnt;
     long muCapsLockAdaptionCnt;

trunk/src/VBox/Frontends/VirtualBox/include/VBoxDefs.h

@@ -148 +148 @@
         SessionStateChangeEventType = QEvent::User + 7,
         SnapshotEventType = QEvent::User + 8,
-        ModifierKeyChangeEventType = QEvent::User + 9,
+        RuntimeErrorEventType = QEvent::User + 9,
+        ModifierKeyChangeEventType = QEvent::User + 10,
         EnumerateMediaEventType = QEvent::User + 100,
         ActivateMenuEventType = QEvent::User + 101,
-        RuntimeErrorEventType = QEvent::User + 102,
     };
 };

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

@@ -200 +200 @@
     ModifierKeyChangeEvent(bool fNumLock, bool fCapsLock, bool fScrollLock) :
         QEvent ((QEvent::Type) VBoxDefs::ModifierKeyChangeEventType),
-        mfNumLock(fNumLock), mfCapsLock(fCapsLock), mfScrollLock(fScrollLock) {}
-    bool NumLock()    const { return mfNumLock; }
-    bool CapsLock()   const { return mfCapsLock; }
-    bool ScrollLock() const { return mfScrollLock; }
+        mfNumLock (fNumLock), mfCapsLock (fCapsLock), mfScrollLock (fScrollLock) {}
+    bool numLock()    const { return mfNumLock; }
+    bool capsLock()   const { return mfCapsLock; }
+    bool scrollLock() const { return mfScrollLock; }
 private:
     bool mfNumLock, mfCapsLock, mfScrollLock;
@@ -349 +349 @@
     , ignore_mainwnd_resize (false)
     , autoresize_guest (false)
+    , mfNumLock (false)
+    , mfScrollLock (false)
+    , mfCapsLock (false)
     , muNumLockAdaptionCnt (2)
     , muCapsLockAdaptionCnt (2)
@@ -783 +786 @@
             {
                 ModifierKeyChangeEvent *me = (ModifierKeyChangeEvent* )e;
-                if (me->NumLock() != mfNumLock)
+                if (me->numLock() != mfNumLock)
                     muNumLockAdaptionCnt = 2;
-                if (me->CapsLock() != mfCapsLock)
+                if (me->capsLock() != mfCapsLock)
                     muCapsLockAdaptionCnt = 2;
-                mfNumLock    = me->NumLock();
-                mfCapsLock   = me->CapsLock();
-                mfScrollLock = me->ScrollLock();
+                mfNumLock    = me->numLock();
+                mfCapsLock   = me->capsLock();
+                mfScrollLock = me->scrollLock();
                 return true;
             }
@@ -1290 +1293 @@
  *  @param  count  pointer to the keycodes counter
  */
-void VBoxConsoleView::FixModifierState(LONG *codes, uint *count)
+void VBoxConsoleView::fixModifierState(LONG *codes, uint *count)
 {
 #if defined(Q_WS_X11)
@@ -1347 +1350 @@
 #else
 
-#warning Adapt VBoxConsoleView::FixModifierState
+#warning Adapt VBoxConsoleView::fixModifierState
 
 #endif
@@ -1407 +1410 @@
                 // CapsLock, ScrollLock) as the X server. If not, send KeyPress events
                 // to synchronize the state.
-                FixModifierState (codes, &count);
+                fixModifierState (codes, &count);
             }