5 files changed, 41 insertions, 40 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
@@ -1,21 +1,9 @@
-CONFIG        = qt warn_on  quick-app
-HEADERS        = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
-SOURCES        = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
-INCLUDEPATH     += $(OPIEDIR)/include
+CONFIG        = qt warn_on quick-app
+HEADERS       = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
+SOURCES       = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
+INCLUDEPATH   += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
-INTERFACES    =
-LIBS            += -lopiecore2
+LIBS          += -lqpe -lopiecore2
 TARGET        = confedit
 
-!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/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 @@
   config CONFEDIT
-    boolean "opie-confeditor (generic editor for all Opie settings)"
+    boolean "opie-confedit (generic editor for all Opie settings)"
     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 @@
 #include "listviewconfdir.h"
+#include "listviewitemconffile.h"
 
-#include <qmessagebox.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
-#include "listviewitemconffile.h"
+/* QT */
+#include <qmessagebox.h>
 
@@ -38,3 +42,3 @@ void ListViewConfDir::readConfFiles()
 
-        confDir.setFilter( QDir::Files | QDir::NoSymLinks );
+  confDir.setFilter( QDir::Files | QDir::NoSymLinks );
   confDir.setSorting( QDir::Name );
@@ -49,3 +53,3 @@ void ListViewConfDir::readConfFiles()
          {
-    qDebug( "opening: >%s<", fi->fileName().data() );
+    odebug << "opening: >" << fi->fileName().data() << "<" << oendl; 
           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 @@
 #include "listviewitemconffile.h"
+#include "listviewitemconfigentry.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmessagebox.h>
 #include <qtextstream.h>
-#include "listviewitemconfigentry.h"
 
@@ -21,3 +27,3 @@ ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent)
   confFileInfo = file;
-//  parseFile();
+  //  parseFile();
   displayText();
@@ -42,4 +48,4 @@ void ListViewItemConfFile::parseFile()
 {
-        //qDebug("ListViewItemConfFile::parseFile BEGIN");
-  QFile confFile(confFileInfo->absFilePath());
+        //odebug << "ListViewItemConfFile::parseFile BEGIN" << oendl; 
+        QFile confFile(confFileInfo->absFilePath());
         if(! confFile.open(IO_ReadOnly))
@@ -54,3 +60,3 @@ void ListViewItemConfFile::parseFile()
           s = t.readLine().stripWhiteSpace();
-                //qDebug( "line: >%s<\n", s.latin1() );
+                //odebug << "line: >" << s.latin1() << "<\n" << oendl; 
           if (s.contains("<?xml"))
@@ -62,3 +68,3 @@ void ListViewItemConfFile::parseFile()
            {
-  //    qDebug("got group"+s);
+  //    odebug << "got group"+s << oendl; 
       group = s.mid(1,s.length()-2);
@@ -70,4 +76,4 @@ void ListViewItemConfFile::parseFile()
     {
-//      qDebug("got key"+s);
-             if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1());
+//      odebug << "got key"+s << oendl; 
+             if (!groupItem) odebug << "PANIK NO GROUP! >" << group.latin1() << "<" << oendl; 
             item = new ListViewItemConfigEntry(this, group, s );
@@ -78,3 +84,3 @@ void ListViewItemConfFile::parseFile()
         setExpandable( _valid );
-        //qDebug("ListViewItemConfFile::parseFile END");
+        //odebug << "ListViewItemConfFile::parseFile END" << oendl; 
 }
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 @@
 #include "mainwindow.h"
+#include "listviewconfdir.h"
+#include "listviewitemconfigentry.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qlabel.h>
@@ -18,6 +25,2 @@
 
-#include "listviewconfdir.h"
-#include "listviewitemconfigentry.h"
-
-
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
@@ -35,3 +38,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
-  qDebug("creating settingList");
+  odebug << "creating settingList" << oendl; 
   settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist");
@@ -40,3 +43,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
-  qDebug("creating editor");
+  odebug << "creating editor" << oendl; 
   editor = new EditWidget(this);
@@ -100,3 +103,3 @@ void MainWindow::setCurrent(QListViewItem *item)
 {
-        //qDebug("MainWindow::setCurrent");
+        //odebug << "MainWindow::setCurrent" << oendl; 
         if (!item) return;
@@ -176,3 +179,3 @@ void MainWindow::showPopup()
 {
-qDebug("showPopup");
+odebug << "showPopup" << oendl; 
          if (!_item) return;