summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/confedit/confedit.pro14
-rw-r--r--noncore/apps/confedit/listviewitemconf.cpp9
-rw-r--r--noncore/apps/confedit/main.cpp5
-rw-r--r--noncore/apps/confedit/mainwindow.cpp13
4 files changed, 27 insertions, 14 deletions
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index f6227f7..d2629de 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -7,6 +7,6 @@ SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/ioclude
-LIBS += -lqpe
INTERFACES =
+LIBS += -lopiecore2 -lopieui2
TARGET = confedit
@@ -30,4 +30,14 @@ TRANSLATIONS = ../../../i18n/de/confedit.ts \
+!contains( platform, x11 ) {
+
+ include ( $(OPIEDIR)/include.pro )
+ LIBS += -lqpe
+}
+
+contains( platform, x11 ) {
+ LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
+}
+
+
-include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/confedit/listviewitemconf.cpp b/noncore/apps/confedit/listviewitemconf.cpp
index 91edca2..61bd7ea 100644
--- a/noncore/apps/confedit/listviewitemconf.cpp
+++ b/noncore/apps/confedit/listviewitemconf.cpp
@@ -14,5 +14,5 @@ ListViewItemConf::ListViewItemConf(ListViewItemConf *parent)
{
}
-
+
ListViewItemConf::ListViewItemConf(QListView *parent)
: QListViewItem(parent), _changed(false)
@@ -20,5 +20,5 @@ ListViewItemConf::ListViewItemConf(QListView *parent)
_type = File;
}
-
+
ListViewItemConf::~ListViewItemConf()
{
@@ -49,3 +49,6 @@ bool ListViewItemConf::revertable()
{
return _changed;
-} \ No newline at end of file
+}
+
+
+
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 6c18adb..7e7f064 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -2,10 +2,9 @@
#include "mainwindow.h"
-#include <qpe/qpeapplication.h>
+#include <opie2/oapplication.h>
int main( int argc, char ** argv )
{
-
- QPEApplication a( argc, argv );
+ OApplication a( argc, argv, "confedit" );
MainWindow mw;
mw.showMaximized();
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 8e36980..58538af 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -13,10 +13,10 @@
#include "mainwindow.h"
-#include <qpe/qpemenubar.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
+#include <opie2/omenubar.h>
+#include <opie2/omessagebox.h>
+#include <opie2/oresource.h>
+#include <opie2/oconfig.h>
+#include <opie2/otoolbar.h>
+#include <opie2/oapplication.h>
#include <qaction.h>
#include <qmessagebox.h>
@@ -29,4 +29,5 @@
#include <qlayout.h>
#include <qlineedit.h>
+#include <qcursor.h>
#include "listviewconfdir.h"