summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/appearance2/appearance.cpp7
-rw-r--r--noncore/settings/appearance2/appearance.h4
-rw-r--r--noncore/settings/appearance2/appearance2.pro4
-rw-r--r--noncore/settings/appearance2/editScheme.cpp2
-rw-r--r--noncore/settings/appearance2/editScheme.h4
5 files changed, 12 insertions, 9 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index ba12e55..b39203b 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -36,10 +36,9 @@
#include "sample.h"
/* OPIE */
-#include <opie/ofontselector.h>
-#include <opie/odevice.h>
-#include <opie/ofiledialog.h>
-#include <opie/otabwidget.h>
+#include <opie2/odevice.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/otabwidget.h>
#include <qpe/config.h>
#include <qpe/global.h>
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index 51e9636..f45f549 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -29,10 +29,14 @@
#ifndef APPEARANCESETTINGS_H
#define APPEARANCESETTINGS_H
+#include <opie2/ofontselector.h>
+
#include <qpe/fontdatabase.h>
#include <qdialog.h>
+using Opie::OFontSelector;
+
class QCheckBox;
class QComboBox;
class QLabel;
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index ca5a4ec..e2d73c2 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -2,10 +2,8 @@ CONFIG = qt warn_on release quick-app
HEADERS = appearance.h editScheme.h sample.h
SOURCES = appearance.cpp editScheme.cpp main.cpp sample.cpp
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
-LIBS += -lqpe -lopie
-INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
+LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2
TARGET = appearance
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index 7e5225f..0f3702f 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -28,8 +28,6 @@
#include "editScheme.h"
-#include <opie/ocolorbutton.h>
-
#include <qaction.h>
#include <qlabel.h>
#include <qlayout.h>
diff --git a/noncore/settings/appearance2/editScheme.h b/noncore/settings/appearance2/editScheme.h
index 93dc50d..c7539cb 100644
--- a/noncore/settings/appearance2/editScheme.h
+++ b/noncore/settings/appearance2/editScheme.h
@@ -29,8 +29,12 @@
#ifndef EDITSCHEME_H
#define EDITSCHEME_H
+#include <opie2/ocolorbutton.h>
+
#include <qdialog.h>
+using Opie::OColorButton;
+
class QColor;
class OColorButton;