summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx4
-rw-r--r--vcl/unx/kde/FPServiceInfo.hxx2
-rw-r--r--vcl/unx/kde/UnxFilePicker.cxx4
-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
-rw-r--r--vcl/unx/kde/kdedata.cxx2
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx2
13 files changed, 25 insertions, 25 deletions
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index f4cba0ea199a..bacd1465b579 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -109,7 +109,7 @@ X11SalGraphics::X11SalGraphics()
nTextPixel_ = 0;
nTextColor_ = MAKE_SALCOLOR( 0x00, 0x00, 0x00 ); // Black
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// check if graphite fonts have been disabled
static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" );
bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : sal_False;
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 391da493e039..96ce72da2bdf 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -67,7 +67,7 @@
#include "outdev.h"
#include <config_graphite.h>
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
#include <graphite_layout.hxx>
#include <graphite_serverfont.hxx>
#endif
@@ -744,7 +744,7 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
if( mpServerFont[ nFallbackLevel ]
&& !(rArgs.mnFlags & SAL_LAYOUT_DISABLE_GLYPH_PROCESSING) )
{
-#ifdef ENABLE_GRAPHITE
+#if ENABLE_GRAPHITE
// Is this a Graphite font?
if (!bDisableGraphite_ &&
GraphiteServerFontLayout::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
diff --git a/vcl/unx/kde/FPServiceInfo.hxx b/vcl/unx/kde/FPServiceInfo.hxx
index 5cddc5f2e829..49f30c1da9c4 100644
--- a/vcl/unx/kde/FPServiceInfo.hxx
+++ b/vcl/unx/kde/FPServiceInfo.hxx
@@ -22,7 +22,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
// the service names
#define FILE_PICKER_SERVICE_NAME "com.sun.star.ui.dialogs.TDEFilePicker"
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 914768a3852b..afd4350f8719 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -73,7 +73,7 @@ namespace
uno::Sequence<rtl::OUString> aRet(3);
aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker");
#else // ENABLE_TDE
aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker");
@@ -703,7 +703,7 @@ void UnxFilePicker::initFilePicker()
#endif
// The executable name
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
rtl::OUString helperurl("${ORIGIN}/tdefilepicker");
#else // ENABLE_TDE
rtl::OUString helperurl("${ORIGIN}/kdefilepicker");
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>
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 1724ac506385..5151350b72e2 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -46,7 +46,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
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 7b8b4eeba2d7..1f9971038019 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -34,7 +34,7 @@
#include <config_vclplug.h>
-#ifdef ENABLE_TDE
+#if ENABLE_TDE
#define QPushButton_String "TQPushButton"
#define QRadioButton_String "TQRadioButton"
#define QCheckBox_String "TQCheckBox"