-rw-r--r-- | noncore/apps/confedit/confedit.pro | 14 | ||||
-rw-r--r-- | noncore/apps/confedit/config.in | 2 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewconfdir.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/confedit/listviewitemconffile.cpp | 20 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.cpp | 19 |
5 files changed, 33 insertions, 32 deletions
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro index 5a71680..785c588 100644 --- a/noncore/apps/confedit/confedit.pro +++ b/noncore/apps/confedit/confedit.pro | |||
@@ -5,17 +5,5 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
5 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
6 | INTERFACES = | 6 | LIBS += -lqpe -lopiecore2 |
7 | LIBS += -lopiecore2 | ||
8 | TARGET = confedit | 7 | TARGET = confedit |
9 | 8 | ||
10 | !contains( platform, x11 ) { | ||
11 | |||
12 | include ( $(OPIEDIR)/include.pro ) | 9 | include ( $(OPIEDIR)/include.pro ) |
13 | LIBS += -lqpe | ||
14 | } | ||
15 | |||
16 | contains( platform, x11 ) { | ||
17 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | ||
18 | } | ||
19 | |||
20 | |||
21 | |||
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in index e377307..d7682dc 100644 --- a/noncore/apps/confedit/config.in +++ b/noncore/apps/confedit/config.in | |||
@@ -1,3 +1,3 @@ | |||
1 | config CONFEDIT | 1 | config CONFEDIT |
2 | boolean "opie-confeditor (generic editor for all Opie settings)" | 2 | boolean "opie-confedit (generic editor for all Opie settings)" |
3 | default "y" | 3 | default "y" |
diff --git a/noncore/apps/confedit/listviewconfdir.cpp b/noncore/apps/confedit/listviewconfdir.cpp index 0c2feeb..33bffe1 100644 --- a/noncore/apps/confedit/listviewconfdir.cpp +++ b/noncore/apps/confedit/listviewconfdir.cpp | |||
@@ -11,6 +11,10 @@ | |||
11 | #include "listviewconfdir.h" | 11 | #include "listviewconfdir.h" |
12 | #include "listviewitemconffile.h" | ||
12 | 13 | ||
13 | #include <qmessagebox.h> | 14 | /* OPIE */ |
15 | #include <opie2/odebug.h> | ||
16 | using namespace Opie::Core; | ||
14 | 17 | ||
15 | #include "listviewitemconffile.h" | 18 | /* QT */ |
19 | #include <qmessagebox.h> | ||
16 | 20 | ||
@@ -49,3 +53,3 @@ void ListViewConfDir::readConfFiles() | |||
49 | { | 53 | { |
50 | qDebug( "opening: >%s<", fi->fileName().data() ); | 54 | odebug << "opening: >" << fi->fileName().data() << "<" << oendl; |
51 | fileEntry = new ListViewItemConfFile( fi, this ); | 55 | fileEntry = new ListViewItemConfFile( fi, this ); |
diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp index 1ff2c44..2958cf5 100644 --- a/noncore/apps/confedit/listviewitemconffile.cpp +++ b/noncore/apps/confedit/listviewitemconffile.cpp | |||
@@ -11,5 +11,11 @@ | |||
11 | #include "listviewitemconffile.h" | 11 | #include "listviewitemconffile.h" |
12 | #include "listviewitemconfigentry.h" | ||
13 | |||
14 | /* OPIE */ | ||
15 | #include <opie2/odebug.h> | ||
16 | using namespace Opie::Core; | ||
17 | |||
18 | /* QT */ | ||
12 | #include <qmessagebox.h> | 19 | #include <qmessagebox.h> |
13 | #include <qtextstream.h> | 20 | #include <qtextstream.h> |
14 | #include "listviewitemconfigentry.h" | ||
15 | 21 | ||
@@ -42,3 +48,3 @@ void ListViewItemConfFile::parseFile() | |||
42 | { | 48 | { |
43 | //qDebug("ListViewItemConfFile::parseFile BEGIN"); | 49 | //odebug << "ListViewItemConfFile::parseFile BEGIN" << oendl; |
44 | QFile confFile(confFileInfo->absFilePath()); | 50 | QFile confFile(confFileInfo->absFilePath()); |
@@ -54,3 +60,3 @@ void ListViewItemConfFile::parseFile() | |||
54 | s = t.readLine().stripWhiteSpace(); | 60 | s = t.readLine().stripWhiteSpace(); |
55 | //qDebug( "line: >%s<\n", s.latin1() ); | 61 | //odebug << "line: >" << s.latin1() << "<\n" << oendl; |
56 | if (s.contains("<?xml")) | 62 | if (s.contains("<?xml")) |
@@ -62,3 +68,3 @@ void ListViewItemConfFile::parseFile() | |||
62 | { | 68 | { |
63 | // qDebug("got group"+s); | 69 | // odebug << "got group"+s << oendl; |
64 | group = s.mid(1,s.length()-2); | 70 | group = s.mid(1,s.length()-2); |
@@ -70,4 +76,4 @@ void ListViewItemConfFile::parseFile() | |||
70 | { | 76 | { |
71 | // qDebug("got key"+s); | 77 | // odebug << "got key"+s << oendl; |
72 | if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1()); | 78 | if (!groupItem) odebug << "PANIK NO GROUP! >" << group.latin1() << "<" << oendl; |
73 | item = new ListViewItemConfigEntry(this, group, s ); | 79 | item = new ListViewItemConfigEntry(this, group, s ); |
@@ -78,3 +84,3 @@ void ListViewItemConfFile::parseFile() | |||
78 | setExpandable( _valid ); | 84 | setExpandable( _valid ); |
79 | //qDebug("ListViewItemConfFile::parseFile END"); | 85 | //odebug << "ListViewItemConfFile::parseFile END" << oendl; |
80 | } | 86 | } |
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp index 6ef1043..4b04c97 100644 --- a/noncore/apps/confedit/mainwindow.cpp +++ b/noncore/apps/confedit/mainwindow.cpp | |||
@@ -13,3 +13,10 @@ | |||
13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
14 | #include "listviewconfdir.h" | ||
15 | #include "listviewitemconfigentry.h" | ||
14 | 16 | ||
17 | /* OPIE */ | ||
18 | #include <opie2/odebug.h> | ||
19 | using namespace Opie::Core; | ||
20 | |||
21 | /* QT */ | ||
15 | #include <qlabel.h> | 22 | #include <qlabel.h> |
@@ -18,6 +25,2 @@ | |||
18 | 25 | ||
19 | #include "listviewconfdir.h" | ||
20 | #include "listviewitemconfigentry.h" | ||
21 | |||
22 | |||
23 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | 26 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : |
@@ -35,3 +38,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
35 | 38 | ||
36 | qDebug("creating settingList"); | 39 | odebug << "creating settingList" << oendl; |
37 | settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist"); | 40 | settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist"); |
@@ -40,3 +43,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
40 | 43 | ||
41 | qDebug("creating editor"); | 44 | odebug << "creating editor" << oendl; |
42 | editor = new EditWidget(this); | 45 | editor = new EditWidget(this); |
@@ -100,3 +103,3 @@ void MainWindow::setCurrent(QListViewItem *item) | |||
100 | { | 103 | { |
101 | //qDebug("MainWindow::setCurrent"); | 104 | //odebug << "MainWindow::setCurrent" << oendl; |
102 | if (!item) return; | 105 | if (!item) return; |
@@ -176,3 +179,3 @@ void MainWindow::showPopup() | |||
176 | { | 179 | { |
177 | qDebug("showPopup"); | 180 | odebug << "showPopup" << oendl; |
178 | if (!_item) return; | 181 | if (!_item) return; |