Changeset 51447 in vbox for trunk/src/VBox

Timestamp:

May 28, 2014 1:38:38 PM (11 years ago)

Author:

vboxsync

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

94010

Message:

FE/Qt: 6660: Advanced extra-data management framework: Unifying Network Manager related stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extradata

Files:

• UIExtraDataManager.cpp (modified) (2 diffs)
• UIExtraDataManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -160 +160 @@
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+bool UIExtraDataManager::shouldWeAllowApplicationUpdate() const
+{
+    /* Allow unless 'forbidden' flag is set: */
+    return !isFeatureAllowed(GUI_PreventApplicationUpdate);
+}
+
 QString UIExtraDataManager::applicationUpdateData() const
 {
@@ -266 +272 @@
     return extraDataStringList(GUI_InvertMessageOption);
 }
-
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-bool UIExtraDataManager::shouldWeAllowApplicationUpdate() const
-{
-    /* Allow unless 'forbidden' flag is set: */
-    return !isFeatureAllowed(GUI_PreventApplicationUpdate);
-}
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 WizardMode UIExtraDataManager::modeForWizard(WizardType type)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -77 +77 @@
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    /** Returns last application update date. */
+    /** Returns whether we should allow Application Update. */
+    bool shouldWeAllowApplicationUpdate() const;
+    /** Returns last Application Update date. */
     QString applicationUpdateData() const;
-    /** Defines last application update date as @a strValue. */
+    /** Defines last Application Update date as @a strValue. */
     void setApplicationUpdateData(const QString &strValue);
-    /** Returns application update check counter. */
+    /** Returns Application Update check counter. */
     qulonglong applicationUpdateCheckCounter() const;
-    /** Increments application update check counter. */
+    /** Increments Application Update check counter. */
     void incrementApplicationUpdateCheckCounter();
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
@@ -120 +122 @@
     /** Returns list of the messages for the Message/Popup center frameworks with inverted check-box state. */
     QStringList messagesWithInvertedOption() const;
-
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    /** Returns whether we should allow Application Update. */
-    bool shouldWeAllowApplicationUpdate() const;
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
     /** Returns mode (basic/expert) for wizard of @a type. */