summaryrefslogtreecommitdiff
Unidiff
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
@@ -6,8 +6,8 @@ HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemcon
6 SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp 6 SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/ioclude 8 DEPENDPATH+= $(OPIEDIR)/ioclude
9LIBS += -lqpe
10 INTERFACES= 9 INTERFACES=
10LIBS += -lopiecore2 -lopieui2
11 TARGET = confedit 11 TARGET = confedit
12 12
13TRANSLATIONS = ../../../i18n/de/confedit.ts \ 13TRANSLATIONS = ../../../i18n/de/confedit.ts \
@@ -29,5 +29,15 @@ TRANSLATIONS = ../../../i18n/de/confedit.ts \
29 ../../../i18n/zh_TW/confedit.ts 29 ../../../i18n/zh_TW/confedit.ts
30 30
31 31
32!contains( platform, x11 ) {
33
34 include ( $(OPIEDIR)/include.pro )
35 LIBS += -lqpe
36}
37
38contains( platform, x11 ) {
39 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
40}
41
42
32 43
33include ( $(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
@@ -13,13 +13,13 @@ ListViewItemConf::ListViewItemConf(ListViewItemConf *parent)
13 : QListViewItem(parent), _changed(false) 13 : QListViewItem(parent), _changed(false)
14{ 14{
15} 15}
16 16
17ListViewItemConf::ListViewItemConf(QListView *parent) 17ListViewItemConf::ListViewItemConf(QListView *parent)
18 : QListViewItem(parent), _changed(false) 18 : QListViewItem(parent), _changed(false)
19{ 19{
20 _type = File; 20 _type = File;
21} 21}
22 22
23ListViewItemConf::~ListViewItemConf() 23ListViewItemConf::~ListViewItemConf()
24{ 24{
25} 25}
@@ -48,4 +48,7 @@ void ListViewItemConf::unchanged()
48bool ListViewItemConf::revertable() 48bool ListViewItemConf::revertable()
49{ 49{
50 return _changed; 50 return _changed;
51} \ No newline at end of file 51}
52
53
54
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
@@ -1,12 +1,11 @@
1 1
2#include "mainwindow.h" 2#include "mainwindow.h"
3 3
4#include <qpe/qpeapplication.h> 4#include <opie2/oapplication.h>
5 5
6int main( int argc, char ** argv ) 6int main( int argc, char ** argv )
7{ 7{
8 8 OApplication a( argc, argv, "confedit" );
9 QPEApplication a( argc, argv );
10 MainWindow mw; 9 MainWindow mw;
11 mw.showMaximized(); 10 mw.showMaximized();
12 a.showMainDocumentWidget( &mw ); 11 a.showMainDocumentWidget( &mw );
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
@@ -12,12 +12,12 @@
12 12
13#include "mainwindow.h" 13#include "mainwindow.h"
14 14
15#include <qpe/qpemenubar.h> 15#include <opie2/omenubar.h>
16#include <qpe/qpemessagebox.h> 16#include <opie2/omessagebox.h>
17#include <qpe/resource.h> 17#include <opie2/oresource.h>
18#include <qpe/config.h> 18#include <opie2/oconfig.h>
19#include <qpe/qpetoolbar.h> 19#include <opie2/otoolbar.h>
20#include <qpe/qpeapplication.h> 20#include <opie2/oapplication.h>
21#include <qaction.h> 21#include <qaction.h>
22#include <qmessagebox.h> 22#include <qmessagebox.h>
23#include <qpopupmenu.h> 23#include <qpopupmenu.h>
@@ -28,6 +28,7 @@
28#include <qpushbutton.h> 28#include <qpushbutton.h>
29#include <qlayout.h> 29#include <qlayout.h>
30#include <qlineedit.h> 30#include <qlineedit.h>
31#include <qcursor.h>
31 32
32#include "listviewconfdir.h" 33#include "listviewconfdir.h"
33#include "listviewitemconf.h" 34#include "listviewitemconf.h"