author | mickeyl <mickeyl> | 2003-12-29 01:35:34 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-29 01:35:34 (UTC) |
commit | dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd (patch) (unidiff) | |
tree | 15fa32456809982685cdce110b54bf1658efd0e5 /noncore | |
parent | 29fa04fc898c53cfdc9b148d79fcff54d9173707 (diff) | |
download | opie-dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd.zip opie-dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd.tar.gz opie-dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd.tar.bz2 |
waited too long for tille to do something - merged it on my own... :(
5 files changed, 9 insertions, 19 deletions
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp index 1b74d62..5d275ac 100644 --- a/noncore/settings/networksettings/main.cpp +++ b/noncore/settings/networksettings/main.cpp | |||
@@ -1,13 +1,6 @@ | |||
1 | #include "mainwindowimp.h" | 1 | #include "mainwindowimp.h" |
2 | #include <qpe/qpeapplication.h> | 2 | #include <opie/oapplicationfactory.h> |
3 | 3 | ||
4 | int main(int argc, char **argv) | 4 | OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> ) |
5 | { | ||
6 | QPEApplication app(argc, argv); | ||
7 | MainWindowImp window; | ||
8 | app.showMainWidget(&window); | ||
9 | return app.exec(); | ||
10 | } | ||
11 | 5 | ||
12 | // main.cpp | ||
13 | 6 | ||
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index f74cf87..d9752ce 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -52,3 +52,3 @@ | |||
52 | 52 | ||
53 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){ | 53 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){ |
54 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); | 54 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); |
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h index 451835b..f211d6e 100644 --- a/noncore/settings/networksettings/mainwindowimp.h +++ b/noncore/settings/networksettings/mainwindowimp.h | |||
@@ -25,3 +25,4 @@ class MainWindowImp : public MainWindow { | |||
25 | public: | 25 | public: |
26 | MainWindowImp(QWidget *parent=0, const char *name=0); | 26 | static QString appName() { return QString::fromLatin1("networksettings"); } |
27 | MainWindowImp(QWidget *parent=0, const char *name=0, WFlags fl = 0); | ||
27 | ~MainWindowImp(); | 28 | ~MainWindowImp(); |
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro index cdd133a..e8dbe5b 100644 --- a/noncore/settings/networksettings/networksettings.pro +++ b/noncore/settings/networksettings/networksettings.pro | |||
@@ -1,6 +1,2 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | CONFIG = qt warn_on debug quick-app |
2 | TEMPLATE = app | ||
3 | # | ||
4 | CONFIG = qt warn_on debug | ||
5 | #CONFIG = qt warn_on release | ||
6 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h | 2 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h |
@@ -8,4 +4,4 @@ SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp | |||
8 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ | 4 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ |
9 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ | 5 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/ |
10 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie | 6 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie -lopiecore2 -lopienet2 |
11 | INTERFACES = mainwindow.ui addconnection.ui | 7 | INTERFACES = mainwindow.ui addconnection.ui |
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control index 82aac2a..08a79c6 100644 --- a/noncore/settings/networksettings/opie-networksettings.control +++ b/noncore/settings/networksettings/opie-networksettings.control | |||
@@ -6,3 +6,3 @@ Maintainer: Patrick S. Vogt <tille@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopienet2 |
8 | Description: Network settings. | 8 | Description: Network settings. |