diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-09 15:50:17 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-09 16:04:20 +0100 |
| commit | 77ee92a6bd8f40022ab03325d158de4b67a41dd0 (patch) | |
| tree | 7b3bbab1687b1979f7ff51fd550bb53ac4cb3e07 /vcl | |
| parent | b8d86729799d0494ca0a4d5ee659541d3d81f775 (diff) | |
change vcl's SETTINGS_* #define's to const int
They pollute not only the global namespace, but all namespaces,
given they're are #define's. I bet they'd eventually all conflict
with the namespaced enum in kdelibs headers.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/settings.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 2f333ca97520..f69f91f0955a 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -990,19 +990,19 @@ private: // - AllSettings - // --------------- -#define SETTINGS_MOUSE ((sal_uLong)0x00000001) -#define SETTINGS_STYLE ((sal_uLong)0x00000002) -#define SETTINGS_MISC ((sal_uLong)0x00000004) -#define SETTINGS_SOUND ((sal_uLong)0x00000008) -#define SETTINGS_HELP ((sal_uLong)0x00000010) -#define SETTINGS_LOCALE ((sal_uLong)0x00000020) -#define SETTINGS_UILOCALE ((sal_uLong)0x00000040) -#define SETTINGS_ALLSETTINGS (SETTINGS_MOUSE |\ - SETTINGS_STYLE | SETTINGS_MISC |\ - SETTINGS_SOUND |\ - SETTINGS_HELP |\ - SETTINGS_LOCALE | SETTINGS_UILOCALE ) -#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uLong)0x00000800) // this flag indicates that the data changed event was created +const int SETTINGS_MOUSE = 0x00000001; +const int SETTINGS_STYLE = 0x00000002; +const int SETTINGS_MISC = 0x00000004; +const int SETTINGS_SOUND = 0x00000008; +const int SETTINGS_HELP = 0x00000010; +const int SETTINGS_LOCALE = 0x00000020; +const int SETTINGS_UILOCALE = 0x00000040; +const int SETTINGS_ALLSETTINGS = ( SETTINGS_MOUSE | + SETTINGS_STYLE | SETTINGS_MISC | + SETTINGS_SOUND | + SETTINGS_HELP | + SETTINGS_LOCALE | SETTINGS_UILOCALE ); +const int SETTINGS_IN_UPDATE_SETTINGS = 0x00000800; // this flag indicates that the data changed event was created // in Windows::UpdateSettings probably because of a global // settings changed |