summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-11 13:26:52 (UTC)
committer llornkcor <llornkcor>2002-06-11 13:26:52 (UTC)
commitd7be88ed0355e32f15da6ecbf56f2d825c530d2a (patch) (side-by-side diff)
treeb8badca1426dd9128126b1af620541c89bb14d42
parente9b7ffa394fa30bea063fbed68b36800e9ebee6d (diff)
downloadopie-d7be88ed0355e32f15da6ecbf56f2d825c530d2a.zip
opie-d7be88ed0355e32f15da6ecbf56f2d825c530d2a.tar.gz
opie-d7be88ed0355e32f15da6ecbf56f2d825c530d2a.tar.bz2
follow up to the follow up for custom.h related things
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/desktop.cpp3
-rw-r--r--core/launcher/taskbar.cpp6
2 files changed, 6 insertions, 3 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 693e77f..974de0c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -29,25 +29,28 @@
#include "transferserver.h"
#include "irserver.h"
#include "packageslave.h"
#include <qpe/applnk.h>
#include <qpe/mimetype.h>
#include <qpe/password.h>
#include <qpe/config.h>
#include <qpe/power.h>
#include <qpe/timeconversion.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/global.h>
+
+#ifdef QT_QWS_CUSTOM
#include <qpe/custom.h>
+#endif
#include <qgfx_qws.h>
#include <qmainwindow.h>
#include <qmessagebox.h>
#include <qtimer.h>
#include <qwindowsystem_qws.h>
#include <qvaluelist.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index b69d165..bff2a1c 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -23,27 +23,27 @@
#include "mrulist.h"
#include "systray.h"
#include "calibrate.h"
#include "wait.h"
#include "appicons.h"
#include "taskbar.h"
#include "desktop.h"
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/global.h>
-//#ifdef QT_QWS_CUSTOM
-//#include <qpe/custom.h>
-//#endif
+#ifdef QT_QWS_CUSTOM
+#include <qpe/custom.h>
+#endif
#if defined(QT_QWS_IPAQ)
#include "qpe/custom-ipaq.h"
#endif
#include <qlabel.h>
#include <qlayout.h>
#include <qtimer.h>
#include <qwindowsystem_qws.h>
#include <qwidgetstack.h>
#if defined( Q_WS_QWS )