summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-29 01:35:34 (UTC)
committer mickeyl <mickeyl>2003-12-29 01:35:34 (UTC)
commitdae677b6e29e2a0efb7128bcc4b0d87bf2b535dd (patch) (unidiff)
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 @@
1#include "mainwindowimp.h" 1#include "mainwindowimp.h"
2#include <qpe/qpeapplication.h> 2#include <opie/oapplicationfactory.h>
3 3
4int main(int argc, char **argv) 4OPIE_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
@@ -50,7 +50,7 @@
50#define DEFAULT_SCHEME "/var/lib/pcmcia/scheme" 50#define DEFAULT_SCHEME "/var/lib/pcmcia/scheme"
51#define _PROCNETDEV "/proc/net/dev" 51#define _PROCNETDEV "/proc/net/dev"
52 52
53MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){ 53MainWindowImp::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()));
55 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); 55 connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked()));
56 connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); 56 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 {
23 Q_OBJECT 23 Q_OBJECT
24 24
25public: 25public:
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();
28 29
29 QCopChannel *channel; 30 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 @@
1DESTDIR = $(OPIEDIR)/bin 1CONFIG = qt warn_on debug quick-app
2TEMPLATE = app
3#
4CONFIG = qt warn_on debug
5#CONFIG = qt warn_on release
6HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h 2HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
7SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp 3SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
8INCLUDEPATH += $(OPIEDIR)/include interfaces/ 4INCLUDEPATH += $(OPIEDIR)/include interfaces/
9DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ 5DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
10LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie 6LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopie -lopiecore2 -lopienet2
11INTERFACES = mainwindow.ui addconnection.ui 7INTERFACES = mainwindow.ui addconnection.ui
12TARGET = networksettings 8TARGET = networksettings
13 9
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
4Section: opie/settings 4Section: opie/settings
5Maintainer: Patrick S. Vogt <tille@handhelds.org> 5Maintainer: Patrick S. Vogt <tille@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2, libopienet2
8Description: Network settings. 8Description: Network settings.
9Replaces: opie-networksetup 9Replaces: opie-networksetup
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION