Changeset 32479 in vbox

Timestamp:

Sep 14, 2010 1:23:16 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: some cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (4 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)

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

@@ -63 +63 @@
     remapScancodes = QString::null;
     trayIconEnabled = false;
-    dockPreviewEnabled = true;
     presentationModeEnabled = false;
     hostScreenSaverDisabled = false;
@@ -77 +76 @@
     remapScancodes = that.remapScancodes;
     trayIconEnabled = that.trayIconEnabled;
-    dockPreviewEnabled = that.dockPreviewEnabled;
     presentationModeEnabled = that.presentationModeEnabled;
     hostScreenSaverDisabled = that.hostScreenSaverDisabled;
@@ -96 +94 @@
          remapScancodes == that.remapScancodes &&
          trayIconEnabled == that.trayIconEnabled &&
-         dockPreviewEnabled == that.dockPreviewEnabled &&
          presentationModeEnabled == that.presentationModeEnabled &&
          hostScreenSaverDisabled == that.hostScreenSaverDisabled
@@ -128 +125 @@
     { "GUI/TrayIcon/Enabled",                      "trayIconEnabled",         "true|false", true },
 #ifdef Q_WS_MAC
-    { VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "dockPreviewEnabled",      "true|false", true },
     { VBoxDefs::GUI_PresentationModeEnabled,       "presentationModeEnabled", "true|false", true },
 #endif /* Q_WS_MAC */
-    { "GUI/HostScreenSaverDisabled",                "hostScreenSaverDisabled",     "true|false", true }
+    { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled",     "true|false", true }
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -45 +45 @@
     QString remapScancodes;
     bool trayIconEnabled;
-    bool dockPreviewEnabled;
     bool presentationModeEnabled;
     bool hostScreenSaverDisabled;
@@ -64 +63 @@
     Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
     Q_PROPERTY (bool trayIconEnabled READ trayIconEnabled WRITE setTrayIconEnabled)
-    Q_PROPERTY (bool dockPreviewEnabled READ dockPreviewEnabled WRITE setDockPreviewEnabled)
     Q_PROPERTY (bool presentationModeEnabled READ presentationModeEnabled WRITE setPresentationModeEnabled)
     Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
@@ -123 +121 @@
     }
 
-    bool dockPreviewEnabled() const { return data()->dockPreviewEnabled; }
-    void setDockPreviewEnabled (bool enabled)
-    {
-        mData()->dockPreviewEnabled = enabled;
-    }
-
     bool presentationModeEnabled() const { return data()->presentationModeEnabled; }
     void setPresentationModeEnabled (bool enabled)