-rw-r--r-- | noncore/apps/confedit/confedit.pro | 12 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconf.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/confedit/main.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 13 |
4 files changed, 23 insertions, 10 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 | |||
@@ -3,14 +3,14 @@ TEMPLATE = app | |||
3 | #CONFIG = qt warn_on release | 3 | #CONFIG = qt warn_on release |
4 | CONFIG = qt warn_on debug | 4 | CONFIG = qt warn_on debug |
5 | HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h | 5 | HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h |
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 |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/ioclude | 8 | DEPENDPATH+= $(OPIEDIR)/ioclude |
9 | LIBS += -lqpe | ||
10 | INTERFACES= | 9 | INTERFACES= |
10 | LIBS += -lopiecore2 -lopieui2 | ||
11 | TARGET = confedit | 11 | TARGET = confedit |
12 | 12 | ||
13 | TRANSLATIONS = ../../../i18n/de/confedit.ts \ | 13 | TRANSLATIONS = ../../../i18n/de/confedit.ts \ |
14 | ../../../i18n/nl/confedit.ts \ | 14 | ../../../i18n/nl/confedit.ts \ |
15 | ../../../i18n/da/confedit.ts \ | 15 | ../../../i18n/da/confedit.ts \ |
16 | ../../../i18n/xx/confedit.ts \ | 16 | ../../../i18n/xx/confedit.ts \ |
@@ -26,8 +26,18 @@ TRANSLATIONS = ../../../i18n/de/confedit.ts \ | |||
26 | ../../../i18n/pt_BR/confedit.ts \ | 26 | ../../../i18n/pt_BR/confedit.ts \ |
27 | ../../../i18n/sl/confedit.ts \ | 27 | ../../../i18n/sl/confedit.ts \ |
28 | ../../../i18n/zh_CN/confedit.ts \ | 28 | ../../../i18n/zh_CN/confedit.ts \ |
29 | ../../../i18n/zh_TW/confedit.ts | 29 | ../../../i18n/zh_TW/confedit.ts |
30 | 30 | ||
31 | 31 | ||
32 | !contains( platform, x11 ) { | ||
32 | 33 | ||
33 | include ( $(OPIEDIR)/include.pro ) | 34 | include ( $(OPIEDIR)/include.pro ) |
35 | LIBS += -lqpe | ||
36 | } | ||
37 | |||
38 | contains( platform, x11 ) { | ||
39 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
40 | } | ||
41 | |||
42 | |||
43 | |||
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 | |||
@@ -46,6 +46,9 @@ void ListViewItemConf::unchanged() | |||
46 | } | 46 | } |
47 | 47 | ||
48 | bool ListViewItemConf::revertable() | 48 | bool ListViewItemConf::revertable() |
49 | { | 49 | { |
50 | return _changed; | 50 | return _changed; |
51 | } \ No newline at end of file | 51 | } \ No newline at end of file |
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,14 +1,13 @@ | |||
1 | 1 | ||
2 | #include "mainwindow.h" | 2 | #include "mainwindow.h" |
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | 4 | #include <opie2/oapplication.h> |
5 | 5 | ||
6 | int main( int argc, char ** argv ) | 6 | int 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 ); |
13 | return a.exec(); | 12 | return a.exec(); |
14 | } | 13 | } |
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 | |||
@@ -9,28 +9,29 @@ | |||
9 | 9 | ||
10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 10 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> |
11 | 11 | ||
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> |
24 | #include <qtoolbutton.h> | 24 | #include <qtoolbutton.h> |
25 | #include <qstring.h> | 25 | #include <qstring.h> |
26 | #include <qlabel.h> | 26 | #include <qlabel.h> |
27 | #include <qfile.h> | 27 | #include <qfile.h> |
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" |
34 | #include "listviewitemconfigentry.h" | 35 | #include "listviewitemconfigentry.h" |
35 | 36 | ||
36 | 37 | ||