noncore/apps/confedit fully merged

3 files changed, 3 insertions, 9 deletions

diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index d2629de..06cd8ab 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,15 +1,12 @@
-        DESTDIR         = $(OPIEDIR)/bin
-        TEMPLATE= app
-        #CONFIG         = qt warn_on release
-        CONFIG  = qt warn_on debug
+        CONFIG  = qt warn_on release 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
+INCLUDEPATH     += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/ioclude
         INTERFACES= 
 LIBS            += -lopiecore2 -lopieui2
         TARGET  = confedit
 
 TRANSLATIONS = ../../../i18n/de/confedit.ts \
          ../../../i18n/nl/confedit.ts \
          ../../../i18n/da/confedit.ts \
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 74923c8..7a312c3 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,8 +1,5 @@
 
 #include "mainwindow.h"
-
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
-
diff --git a/noncore/apps/confedit/mainwindow.h b/noncore/apps/confedit/mainwindow.h
index 878558a..96331db 100644
--- a/noncore/apps/confedit/mainwindow.h
+++ b/noncore/apps/confedit/mainwindow.h
@@ -27,17 +27,17 @@ class ListViewItemConf;
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 
 public:
   MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~MainWindow();
-
+  static QString appName() { return QString::fromLatin1("confedit"); }
 
 public slots:
   void setCurrent(QListViewItem*);
   void groupChanged(const QString&);
   void keyChanged(const QString&);
   void valueChanged(const QString&);
   void showPopup();
   void stopTimer( QListViewItem* );