summaryrefslogtreecommitdiff
path: root/vcl/unx/kde/fpicker
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-03-19 16:44:12 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-03-20 11:34:18 +0100
commit52f8321c412cad280c9029f10f9aef03f4f20544 (patch)
tree9942cfe490f7107177ad69175be3039b0f20b32a /vcl/unx/kde/fpicker
parent151abb8b2b9d3a22229b98cec12e29484d12109b (diff)
use #if instead of #ifdef for testing config_xxx.hxx macros
http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3
Diffstat (limited to 'vcl/unx/kde/fpicker')
-rw-r--r--vcl/unx/kde/fpicker/kdecommandthread.cxx2
-rw-r--r--vcl/unx/kde/fpicker/kdecommandthread.hxx4
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.cxx8
-rw-r--r--vcl/unx/kde/fpicker/kdefilepicker.hxx8
-rw-r--r--vcl/unx/kde/fpicker/kdefpmain.cxx6
-rw-r--r--vcl/unx/kde/fpicker/kdemodalityfilter.cxx2
-rw-r--r--vcl/unx/kde/fpicker/kdemodalityfilter.hxx4
7 files changed, 17 insertions, 17 deletions
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx
index 064d06c610bd..55559d2117f1 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.cxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx
@@ -23,7 +23,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqstringlist.h>
#include <tdeapplication.h>
#else // ENABLE_TDE
diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx
index acb90d8af248..b78592c3982e 100644
--- a/vcl/unx/kde/fpicker/kdecommandthread.hxx
+++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx
@@ -22,11 +22,11 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <shell/tde_defines.h>
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqevent.h>
#include <tqmutex.h>
#include <tqthread.h>
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx
index 5163079b4eb8..4dafb1ef0e4e 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.cxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx
@@ -24,7 +24,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqcheckbox.h>
#include <tqcombobox.h>
@@ -78,7 +78,7 @@
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define QCheckBox_String "TQCheckBox"
#define QComboBox_String "TQComboBox"
#else // ENABLE_TDE
@@ -105,7 +105,7 @@ KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter,
m_bIsExecuting( false ),
m_bCanNotifySelection( true )
{
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
connect( this, SIGNAL( fileHighlighted( const TQString & ) ),
this, SLOT( fileHighlightedCommand( const TQString & ) ) );
#else // ENABLE_TDE
@@ -666,7 +666,7 @@ QString KDEFileDialog::localCopy( const QString &rFileName ) const
return qDestURL.url();
}
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
void KDEFileDialog::fileHighlightedCommand( const TQString & )
#else // ENABLE_TDE
void KDEFileDialog::fileHighlightedCommand( const QString & )
diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx
index 046a1bc92645..e317a7d0e996 100644
--- a/vcl/unx/kde/fpicker/kdefilepicker.hxx
+++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx
@@ -22,13 +22,13 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <shell/tde_defines.h>
#endif // ENABLE_TDE
#include <cstddef>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tdefiledialog.h>
#include <tdefilefiltercombo.h>
#else // ENABLE_TDE
@@ -42,7 +42,7 @@ class QVBox;
class KDEFileDialog : public KFileDialog
{
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
TQ_OBJECT
#else // ENABLE_TDE
Q_OBJECT
@@ -114,7 +114,7 @@ protected:
protected slots:
// Qt3 moc does not really understand #ifdef and would process both slots,
// so the FILTER_OUT_FOO tags are used to remove some slots before moc sees them.
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
void fileHighlightedCommand( const TQString & ); // FILTER_OUT_TDE
#else // ENABLE_TDE
void fileHighlightedCommand( const QString & ); // FILTER_OUT_KDE
diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx
index df39e01e43ca..8178586b14e9 100644
--- a/vcl/unx/kde/fpicker/kdefpmain.cxx
+++ b/vcl/unx/kde/fpicker/kdefpmain.cxx
@@ -23,7 +23,7 @@
#include <kdefilepicker.hxx>
#include <kdecommandthread.hxx>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqeventloop.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
@@ -39,7 +39,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define THIS_DESKENV_NAME_CAP "TDE"
#define THIS_DESKENV_NAME_LOW "tde"
#else // ENABLE_TDE
@@ -47,7 +47,7 @@
#define THIS_DESKENV_NAME_LOW "kde"
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define KAboutData TDEAboutData
#define KCmdLineArgs TDECmdLineArgs
#define KCmdLineOptions TDECmdLineOptions
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
index 2c1f03475425..57e889a58460 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx
@@ -21,7 +21,7 @@
#include <kdemodalityfilter.hxx>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tdeapplication.h>
#include <kdialogbase.h>
#else // ENABLE_TDE
diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
index 05331fe8afb3..fadf77d24097 100644
--- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
+++ b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx
@@ -22,11 +22,11 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <shell/tde_defines.h>
#endif // ENABLE_TDE
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#include <tqobject.h>
#else // ENABLE_TDE
#include <qobject.h>