Changeset 2354 in vbox for trunk/src/VBox/Frontends/VirtualBox/include
- Timestamp:
- Apr 26, 2007 1:48:04 PM (18 years ago)
- svn:sync-xref-src-repo-rev:
- 20747
- Location:
- trunk/src/VBox/Frontends/VirtualBox/include
- Files:
-
- 2 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h
r2221 r2354 27 27 28 28 #include "VBoxDefs.h" 29 #include "V MGlobalSettings.h"29 #include "VBoxGlobalSettings.h" 30 30 31 31 #include <qdatetime.h> … … 180 180 CConsole cconsole; 181 181 182 const V MGlobalSettings &gs;182 const VBoxGlobalSettings &gs; 183 183 184 184 CEnums::MachineState last_state; -
trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h
r2319 r2354 26 26 #include "COMDefs.h" 27 27 28 #include "V MGlobalSettings.h"28 #include "VBoxGlobalSettings.h" 29 29 30 30 #include <qapplication.h> … … 154 154 CVirtualBox virtualBox() const { return vbox; } 155 155 156 const V MGlobalSettings &settings() const { return gset; }157 bool setSettings (const V MGlobalSettings &gs);156 const VBoxGlobalSettings &settings() const { return gset; } 157 bool setSettings (const VBoxGlobalSettings &gs); 158 158 159 159 VBoxSelectorWnd &selectorWnd(); … … 483 483 CVirtualBox vbox; 484 484 485 V MGlobalSettings gset;485 VBoxGlobalSettings gset; 486 486 487 487 VBoxSelectorWnd *selector_wnd; -
trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobalSettings.h
r2349 r2354 2 2 * 3 3 * VBox frontends: Qt GUI ("VirtualBox"): 4 * V MGlobalSettingsData, VMGlobalSettings class declarations4 * VBoxGlobalSettingsData, VBoxGlobalSettings class declarations 5 5 */ 6 6 … … 21 21 */ 22 22 23 #ifndef __V MGlobalSettings_h__24 #define __V MGlobalSettings_h__23 #ifndef __VBoxGlobalSettings_h__ 24 #define __VBoxGlobalSettings_h__ 25 25 26 26 #include "CIShared.h" … … 30 30 class CVirtualBox; 31 31 32 class V MGlobalSettingsData32 class VBoxGlobalSettingsData 33 33 { 34 34 public: 35 35 36 V MGlobalSettingsData();37 V MGlobalSettingsData( const VMGlobalSettingsData &that );38 virtual ~V MGlobalSettingsData();39 bool operator==( const V MGlobalSettingsData &that ) const;36 VBoxGlobalSettingsData(); 37 VBoxGlobalSettingsData( const VBoxGlobalSettingsData &that ); 38 virtual ~VBoxGlobalSettingsData(); 39 bool operator==( const VBoxGlobalSettingsData &that ) const; 40 40 41 41 private: … … 46 46 QString languageId; 47 47 48 friend class V MGlobalSettings;48 friend class VBoxGlobalSettings; 49 49 }; 50 50 51 51 ///////////////////////////////////////////////////////////////////////////// 52 52 53 class V MGlobalSettings : public QObject, public CIShared <VMGlobalSettingsData>53 class VBoxGlobalSettings : public QObject, public CIShared <VBoxGlobalSettingsData> 54 54 { 55 55 Q_OBJECT … … 61 61 public: 62 62 63 V MGlobalSettings (bool null = true)64 : CIShared <V MGlobalSettingsData> (null) {}65 V MGlobalSettings (const VMGlobalSettings &that)66 : QObject(), CIShared <V MGlobalSettingsData> (that) {}67 V MGlobalSettings &operator= (const VMGlobalSettings &that) {68 CIShared <V MGlobalSettingsData>::operator= (that);63 VBoxGlobalSettings (bool null = true) 64 : CIShared <VBoxGlobalSettingsData> (null) {} 65 VBoxGlobalSettings (const VBoxGlobalSettings &that) 66 : QObject(), CIShared <VBoxGlobalSettingsData> (that) {} 67 VBoxGlobalSettings &operator= (const VBoxGlobalSettings &that) { 68 CIShared <VBoxGlobalSettingsData>::operator= (that); 69 69 return *this; 70 70 } … … 132 132 }; 133 133 134 #endif // __V MGlobalSettings_h__134 #endif // __VBoxGlobalSettings_h__
Note:
See TracChangeset
for help on using the changeset viewer.