| author | mickeyl <mickeyl> | 2003-11-03 23:04:01 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-11-03 23:04:01 (UTC) |
| commit | 7f34e7b45108c353e0a2575153904ce655cb1896 (patch) (unidiff) | |
| tree | 871f86dd24313fb3bdc085c0b4b5ed119aee4b08 | |
| parent | 196486dafe08d6d78831e97b0a6058067d512eb9 (diff) | |
| download | opie-7f34e7b45108c353e0a2575153904ce655cb1896.zip opie-7f34e7b45108c353e0a2575153904ce655cb1896.tar.gz opie-7f34e7b45108c353e0a2575153904ce655cb1896.tar.bz2 | |
noncore/apps/confedit fully merged
| -rw-r--r-- | noncore/apps/confedit/confedit.pro | 7 | ||||
| -rw-r--r-- | noncore/apps/confedit/main.cpp | 3 | ||||
| -rw-r--r-- | noncore/apps/confedit/mainwindow.h | 2 |
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,9 +1,6 @@ | |||
| 1 | DESTDIR = $(OPIEDIR)/bin | 1 | CONFIG = qt warn_on release quick-app |
| 2 | TEMPLATE= app | ||
| 3 | #CONFIG = qt warn_on release | ||
| 4 | CONFIG = qt warn_on debug | ||
| 5 | HEADERS = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h | 2 | 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 | 3 | SOURCES = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp |
| 7 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
| 8 | DEPENDPATH+= $(OPIEDIR)/ioclude | 5 | DEPENDPATH+= $(OPIEDIR)/ioclude |
| 9 | INTERFACES= | 6 | INTERFACES= |
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 @@ | |||
| 1 | 1 | ||
| 2 | #include "mainwindow.h" | 2 | #include "mainwindow.h" |
| 3 | |||
| 4 | #include <qpe/qpeapplication.h> | ||
| 5 | #include <opie/oapplicationfactory.h> | 3 | #include <opie/oapplicationfactory.h> |
| 6 | 4 | ||
| 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 5 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
| 8 | |||
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 | |||
| @@ -33,5 +33,5 @@ public: | |||
| 33 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 33 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
| 34 | ~MainWindow(); | 34 | ~MainWindow(); |
| 35 | 35 | static QString appName() { return QString::fromLatin1("confedit"); } | |
| 36 | 36 | ||
| 37 | public slots: | 37 | public slots: |