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
@@ -23,36 +23,35 @@
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "appearance.h"
 #include "editScheme.h"
 #include "stylelistitem.h"
 #include "decolistitem.h"
 #include "colorlistitem.h"
 #include "exceptlistitem.h"
 #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>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpestyle.h>
 #include <qpe/lightstyle.h>
 #include <qpe/styleinterface.h>
 
 /* QT */
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qdir.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
@@ -16,36 +16,40 @@
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:       
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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;
 class QLineEdit;
 class QListBox;
 class QMultiLineEdit;
 class QPushButton;
 class QRadioButton;
 class QToolButton;
 class SampleWindow;
 class OFontSelector;
 class QListView;
 class QListViewItem;
 class Config;
 
 class Appearance : public QDialog
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
@@ -1,12 +1,10 @@
 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
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -15,34 +15,32 @@
 � � : .. � �.:, � � . . .    without even the implied warranty of
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "editScheme.h"
 
-#include <opie/ocolorbutton.h>
-
 #include <qaction.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags )
 	: QDialog ( parent, name, modal, WStyle_ContextHelp )
 {
 	setCaption ( tr( "Edit scheme" ) );
 	QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
 
     m_count = cnt;
     m_buttons = new OColorButton * [cnt];
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
@@ -16,34 +16,38 @@
 � � =_ � � � �+ � � =;=|`    MERCHANTABILITY or FITNESS FOR A
 � _.=:. � � � : � �:=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.= � � � = � � � ;      Public License for more details.
 ++= � -. � � .` � � .:       
 �: � � = �...= . :.=-        You should have received a copy of the GNU
 �-. � .:....=;==+<;          General Public License along with this file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef EDITSCHEME_H
 #define EDITSCHEME_H
 
+#include <opie2/ocolorbutton.h>
+
 #include <qdialog.h>
 
+using Opie::OColorButton;
+
 class QColor;
 class OColorButton;
 
 class EditScheme : public QDialog {
 	Q_OBJECT
 
 public:
 	EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	virtual ~EditScheme ( );
 
 protected slots:
 	virtual void accept ( );
 
 private:
 	int m_count;
 	QColor *m_colors;