summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-03 23:04:01 (UTC)
committer mickeyl <mickeyl>2003-11-03 23:04:01 (UTC)
commit7f34e7b45108c353e0a2575153904ce655cb1896 (patch) (side-by-side diff)
tree871f86dd24313fb3bdc085c0b4b5ed119aee4b08
parent196486dafe08d6d78831e97b0a6058067d512eb9 (diff)
downloadopie-7f34e7b45108c353e0a2575153904ce655cb1896.zip
opie-7f34e7b45108c353e0a2575153904ce655cb1896.tar.gz
opie-7f34e7b45108c353e0a2575153904ce655cb1896.tar.bz2
noncore/apps/confedit fully merged
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/confedit/confedit.pro7
-rw-r--r--noncore/apps/confedit/main.cpp3
-rw-r--r--noncore/apps/confedit/mainwindow.h2
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,10 +1,7 @@
-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
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
@@ -32,7 +32,7 @@ class MainWindow : public QMainWindow
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*);