Changeset 32483 in vbox

Timestamp:

Sep 14, 2010 1:45:07 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: style cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• VBoxUI.pro (modified) (2 diffs)
• src/runtime/UIMachineWindow.cpp (modified) (2 diffs)
• src/runtime/UIVMCloseDialog.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/VBoxCloseVMDlg.cpp ) (3 diffs)
• src/runtime/UIVMCloseDialog.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/VBoxCloseVMDlg.h ) (4 diffs)
• src/runtime/UIVMCloseDialog.ui (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/VBoxCloseVMDlg.ui ) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -177 +177 @@
         ./src/selector \
         ./src/runtime \
+        ./src/runtime/fullscreen \
         ./src/runtime/normal \
-        ./src/runtime/fullscreen \
-        ./src/runtime/seamless \
-        ./src/runtime/scale
+        ./src/runtime/scale \
+        ./src/runtime/seamless
 
 ifdef VBOX_WITH_REGISTRATION
@@ -245 +245 @@
 VirtualBox_QT_MOCHDRS = \
         src/VBoxAboutDlg.h \
-        src/VBoxCloseVMDlg.h \
         src/VBoxGlobalSettings.h \
         src/VBoxMediaManagerDlg.h \
@@ -335 +334 @@
         src/selector/VBoxSelectorWnd.h \
         src/selector/VBoxSnapshotsWgt.h \
-        src/runtime/UIMachine.h \
-        src/runtime/UISession.h \
         src/runtime/UIActionsPool.h \
+        src/runtime/UIConsoleEventHandler.h \
         src/runtime/UIIndicatorsPool.h \
         src/runtime/UIKeyboardHandler.h \
-        src/runtime/UIMouseHandler.h \
+        src/runtime/UIMachine.h \
         src/runtime/UIMachineLogic.h \
         src/runtime/UIMachineView.h \
+        src/runtime/UIMouseHandler.h \
         src/runtime/UIMultiScreenLayout.h \
-        src/runtime/UIConsoleEventHandler.h \
+        src/runtime/UISession.h \
+        src/runtime/UIVMCloseDialog.h \
+        src/runtime/fullscreen/UIKeyboardHandlerFullscreen.h \
+        src/runtime/fullscreen/UIMachineLogicFullscreen.h \
+        src/runtime/fullscreen/UIMachineViewFullscreen.h \
+        src/runtime/fullscreen/UIMachineWindowFullscreen.h \
         src/runtime/normal/UIKeyboardHandlerNormal.h \
         src/runtime/normal/UIMachineLogicNormal.h \
+        src/runtime/normal/UIMachineViewNormal.h \
         src/runtime/normal/UIMachineWindowNormal.h \
-        src/runtime/normal/UIMachineViewNormal.h \
-        src/runtime/fullscreen/UIKeyboardHandlerFullscreen.h \
-        src/runtime/fullscreen/UIMachineLogicFullscreen.h \
-        src/runtime/fullscreen/UIMachineWindowFullscreen.h \
-        src/runtime/fullscreen/UIMachineViewFullscreen.h \
+        src/runtime/scale/UIKeyboardHandlerScale.h \
+        src/runtime/scale/UIMachineLogicScale.h \
+        src/runtime/scale/UIMachineViewScale.h \
+        src/runtime/scale/UIMachineWindowScale.h \
         src/runtime/seamless/UIKeyboardHandlerSeamless.h \
         src/runtime/seamless/UIMachineLogicSeamless.h \
-        src/runtime/seamless/UIMachineWindowSeamless.h \
         src/runtime/seamless/UIMachineViewSeamless.h \
-        src/runtime/scale/UIKeyboardHandlerScale.h \
-        src/runtime/scale/UIMachineLogicScale.h \
-        src/runtime/scale/UIMachineWindowScale.h \
-        src/runtime/scale/UIMachineViewScale.h
+        src/runtime/seamless/UIMachineWindowSeamless.h
 
 ifdef VBOX_WITH_REGISTRATION
@@ -397 +397 @@
         src/main.cpp \
         src/VBoxAboutDlg.cpp \
-        src/VBoxCloseVMDlg.cpp \
         src/VBoxGlobalSettings.cpp \
         src/VBoxHelpActions.cpp \
@@ -491 +490 @@
         src/selector/VBoxSelectorWnd.cpp \
         src/selector/VBoxSnapshotsWgt.cpp \
-        src/runtime/UIMachine.cpp \
-        src/runtime/UISession.cpp \
         src/runtime/UIActionsPool.cpp \
-        src/runtime/UIIndicatorsPool.cpp \
-        src/runtime/UIKeyboardHandler.cpp \
-        src/runtime/UIMouseHandler.cpp \
+        src/runtime/UIConsoleEventHandler.cpp \
         src/runtime/UIFrameBuffer.cpp \
         src/runtime/UIFrameBufferQGL.cpp \
         src/runtime/UIFrameBufferQImage.cpp \
         src/runtime/UIFrameBufferSDL.cpp \
+        src/runtime/UIIndicatorsPool.cpp \
+        src/runtime/UIKeyboardHandler.cpp \
+        src/runtime/UIMachine.cpp \
         src/runtime/UIMachineLogic.cpp \
+        src/runtime/UIMachineMenuBar.cpp \
+        src/runtime/UIMachineView.cpp \
         src/runtime/UIMachineWindow.cpp \
-        src/runtime/UIMachineView.cpp \
-        src/runtime/UIMachineMenuBar.cpp \
+        src/runtime/UIMouseHandler.cpp \
         src/runtime/UIMultiScreenLayout.cpp \
-        src/runtime/UIConsoleEventHandler.cpp \
+        src/runtime/UISession.cpp \
+        src/runtime/UIVMCloseDialog.cpp \
+        src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp \
+        src/runtime/fullscreen/UIMachineLogicFullscreen.cpp \
+        src/runtime/fullscreen/UIMachineViewFullscreen.cpp \
+        src/runtime/fullscreen/UIMachineWindowFullscreen.cpp \
         src/runtime/normal/UIKeyboardHandlerNormal.cpp \
         src/runtime/normal/UIMachineLogicNormal.cpp \
+        src/runtime/normal/UIMachineViewNormal.cpp \
         src/runtime/normal/UIMachineWindowNormal.cpp \
-        src/runtime/normal/UIMachineViewNormal.cpp \
-        src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp \
-        src/runtime/fullscreen/UIMachineLogicFullscreen.cpp \
-        src/runtime/fullscreen/UIMachineWindowFullscreen.cpp \
-        src/runtime/fullscreen/UIMachineViewFullscreen.cpp \
+        src/runtime/scale/UIKeyboardHandlerScale.cpp \
+        src/runtime/scale/UIMachineLogicScale.cpp \
+        src/runtime/scale/UIMachineViewScale.cpp \
+        src/runtime/scale/UIMachineWindowScale.cpp \
         src/runtime/seamless/UIKeyboardHandlerSeamless.cpp \
         src/runtime/seamless/UIMachineLogicSeamless.cpp \
-        src/runtime/seamless/UIMachineWindowSeamless.cpp \
         src/runtime/seamless/UIMachineViewSeamless.cpp \
-        src/runtime/scale/UIKeyboardHandlerScale.cpp \
-        src/runtime/scale/UIMachineLogicScale.cpp \
-        src/runtime/scale/UIMachineWindowScale.cpp \
-        src/runtime/scale/UIMachineViewScale.cpp
+        src/runtime/seamless/UIMachineWindowSeamless.cpp
 VirtualBox_SOURCES.win += \
         src/runtime/UIFrameBufferDirectDraw.cpp

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -22 +22 @@
 
 FORMS = \
-    src/VBoxCloseVMDlg.ui \
     src/VBoxVMInformationDlg.ui \
     src/VBoxMediaManagerDlg.ui \
@@ -68 +67 @@
     src/wizards/registration/UIRegistrationWzdPage1.ui \
     src/widgets/VBoxApplianceEditorWgt.ui \
-    src/selector/VBoxSnapshotsWgt.ui
+    src/selector/VBoxSnapshotsWgt.ui \
+    src/runtime/UIVMCloseDialog.ui
 
 TRANSLATIONS = \

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -31 +31 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxCloseVMDlg.h"
-
-#include "UISession.h"
+
 #include "UIActionsPool.h"
 #include "UIKeyboardHandler.h"
+#include "UIMachineLogic.h"
+#include "UIMachineView.h"
+#include "UIMachineWindow.h"
+#include "UIMachineWindowFullscreen.h"
+#include "UIMachineWindowNormal.h"
+#include "UIMachineWindowScale.h"
+#include "UIMachineWindowSeamless.h"
 #include "UIMouseHandler.h"
-#include "UIMachineLogic.h"
-#include "UIMachineWindow.h"
-#include "UIMachineView.h"
-#include "UIMachineWindowNormal.h"
-#include "UIMachineWindowFullscreen.h"
-#include "UIMachineWindowSeamless.h"
-#include "UIMachineWindowScale.h"
+#include "UISession.h"
+#include "UIVMCloseDialog.h"
 
 #ifdef Q_WS_X11
@@ -204 +204 @@
 
             /* Prepare close dialog: */
-            VBoxCloseVMDlg dlg(machineWindow());
+            UIVMCloseDialog dlg(machineWindow());
 
             /* Assign close-dialog pixmap: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -3 +3 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxCloseVMDlg class implementation
+ * UIVMCloseDialog class implementation
  */
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
 # include "precomp.h"
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-#include "VBoxCloseVMDlg.h"
+#include "UIVMCloseDialog.h"
 #include "VBoxProblemReporter.h"
 #include "UIMachineWindowNormal.h"
@@ -33 +33 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-VBoxCloseVMDlg::VBoxCloseVMDlg (QWidget *aParent)
-    : QIWithRetranslateUI<QIDialog> (aParent)
+UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent)
+    : QIWithRetranslateUI<QIDialog>(pParent)
 {
 #ifdef Q_WS_MAC
     /* No sheets in another mode than normal for now. Firstly it looks ugly and
      * secondly in some cases it is broken. */
-    if (vboxGlobal().isSheetWindowsAllowed(aParent))
-        setWindowFlags (Qt::Sheet);
+    if (vboxGlobal().isSheetWindowsAllowed(pParent))
+        setWindowFlags(Qt::Sheet);
 #endif /* Q_WS_MAC */
 
     /* Apply UI decorations */
-    Ui::VBoxCloseVMDlg::setupUi (this);
+    Ui::UIVMCloseDialog::setupUi(this);
 
 #ifdef Q_WS_MAC
     /* Make some more space around the content */
-    hboxLayout->setContentsMargins (40, 0, 40, 0);
-    vboxLayout2->insertSpacing (1, 20);
+    hboxLayout->setContentsMargins(40, 0, 40, 0);
+    vboxLayout2->insertSpacing(1, 20);
     /* and more space between the radio buttons */
-    gridLayout->setSpacing (15);
+    gridLayout->setSpacing(15);
 #endif /* Q_WS_MAC */
     /* Set fixed size */
-    setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-    connect (mButtonBox, SIGNAL (helpRequested()),
-             &vboxProblem(), SLOT (showHelpHelpDialog()));
+    connect(mButtonBox, SIGNAL(helpRequested()),
+            &vboxProblem(), SLOT(showHelpHelpDialog()));
 }
 
-void VBoxCloseVMDlg::retranslateUi()
+void UIVMCloseDialog::retranslateUi()
 {
     /* Translate uic generated strings */
-    Ui::VBoxCloseVMDlg::retranslateUi (this);
+    Ui::UIVMCloseDialog::retranslateUi(this);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h

@@ -2 +2 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxCloseVMDlg class declaration
+ * UIVMCloseDialog class declaration
  */
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
  */
 
-#ifndef __VBoxCloseVMDlg_h__
-#define __VBoxCloseVMDlg_h__
+#ifndef __UIVMCloseDialog_h__
+#define __UIVMCloseDialog_h__
 
-#include "VBoxCloseVMDlg.gen.h"
+#include "UIVMCloseDialog.gen.h"
 #include "QIWithRetranslateUI.h"
 #include "QIDialog.h"
 
-class VBoxCloseVMDlg : public QIWithRetranslateUI<QIDialog>,
-                       public Ui::VBoxCloseVMDlg
+class UIVMCloseDialog : public QIWithRetranslateUI<QIDialog>,
+                        public Ui::UIVMCloseDialog
 {
     Q_OBJECT;
@@ -31 +31 @@
 public:
 
-    VBoxCloseVMDlg (QWidget *aParent);
+    UIVMCloseDialog(QWidget *pParent);
 
 protected:
@@ -38 +38 @@
 };
 
-#endif // __VBoxCloseVMDlg_h__
+#endif // __UIVMCloseDialog_h__
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.ui

@@ -3 +3 @@
  VBox frontends: Qt4 GUI ("VirtualBox"):
 
-     Copyright (C) 2008 Oracle Corporation
+     Copyright (C) 2008-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -13 +13 @@
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  </comment>
- <class>VBoxCloseVMDlg</class>
- <widget class="QDialog" name="VBoxCloseVMDlg" >
+ <class>UIVMCloseDialog</class>
+ <widget class="QDialog" name="UIVMCloseDialog" >
   <property name="geometry" >
    <rect>
@@ -255 +255 @@
    <sender>mButtonBox</sender>
    <signal>accepted()</signal>
-   <receiver>VBoxCloseVMDlg</receiver>
+   <receiver>UIVMCloseDialog</receiver>
    <slot>accept()</slot>
    <hints>
@@ -271 +271 @@
    <sender>mButtonBox</sender>
    <signal>rejected()</signal>
-   <receiver>VBoxCloseVMDlg</receiver>
+   <receiver>UIVMCloseDialog</receiver>
    <slot>reject()</slot>
    <hints>