summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-29 01:35:34 (UTC)
committer mickeyl <mickeyl>2003-12-29 01:35:34 (UTC)
commitdae677b6e29e2a0efb7128bcc4b0d87bf2b535dd (patch) (side-by-side diff)
tree15fa32456809982685cdce110b54bf1658efd0e5
parent29fa04fc898c53cfdc9b148d79fcff54d9173707 (diff)
downloadopie-dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd.zip
opie-dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd.tar.gz
opie-dae677b6e29e2a0efb7128bcc4b0d87bf2b535dd.tar.bz2
waited too long for tille to do something - merged it on my own... :(
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/main.cpp11
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.h3
-rw-r--r--noncore/settings/networksettings/networksettings.pro10
-rw-r--r--noncore/settings/networksettings/opie-networksettings.control2
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 @@
#include "mainwindowimp.h"
-#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
-int main(int argc, char **argv)
-{
- QPEApplication app(argc, argv);
- MainWindowImp window;
- app.showMainWidget(&window);
- return app.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
-// main.cpp
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
@@ -50,7 +50,7 @@
#define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
#define _PROCNETDEV "/proc/net/dev"
-MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){
+MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){
connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked()));
connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked()));
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
@@ -23,7 +23,8 @@ class MainWindowImp : public MainWindow {
Q_OBJECT
public:
- MainWindowImp(QWidget *parent=0, const char *name=0);
+ static QString appName() { return QString::fromLatin1("networksettings"); }
+ MainWindowImp(QWidget *parent=0, const char *name=0, WFlags fl = 0);
~MainWindowImp();
QCopChannel *channel;
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,13 +1,9 @@
-DESTDIR = $(OPIEDIR)/bin
-TEMPLATE = app
-#
-CONFIG = qt warn_on debug
-#CONFIG = qt warn_on release
+CONFIG = qt warn_on debug quick-app
HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
INCLUDEPATH += $(OPIEDIR)/include interfaces/
-DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/
-LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie
+DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
+LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie -lopiecore2 -lopienet2
INTERFACES = mainwindow.ui addconnection.ui
TARGET = networksettings
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
@@ -4,7 +4,7 @@ Priority: optional
Section: opie/settings
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopienet2
Description: Network settings.
Replaces: opie-networksetup
Version: $QPE_VERSION$EXTRAVERSION