summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-03-09 15:50:17 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-03-09 16:04:20 +0100
commit77ee92a6bd8f40022ab03325d158de4b67a41dd0 (patch)
tree7b3bbab1687b1979f7ff51fd550bb53ac4cb3e07 /fpicker
parentb8d86729799d0494ca0a4d5ee659541d3d81f775 (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 'fpicker')
-rw-r--r--fpicker/source/unx/kde4/KDE4FilePicker.cxx15
1 files changed, 0 insertions, 15 deletions
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 8e8b3e8fa7d9..d8df515912b5 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -55,14 +55,6 @@
/* ********* Hack, but needed because of conflicting types... */
#define Region QtXRegion
-//kde has an enum that uses this...OO does too
-#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
-#undef SETTINGS_MOUSE
-#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
-#undef SETTINGS_LOCALE
-#define LO_SETTINGS_STYLE SETTINGS_STYLE
-#undef SETTINGS_STYLE
-
#include <kfiledialog.h>
#include <kwindowsystem.h>
#include <kapplication.h>
@@ -75,13 +67,6 @@
#undef Region
-#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
-#undef LO_SETTINGS_MOUSE
-#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
-#undef LO_SETTINGS_LOCALE
-#define SETTINGS_STYLE LO_SETTINGS_STYLE
-#undef LO_SETTINGS_STYLE
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::ui::dialogs;