summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro5
-rw-r--r--noncore/net/wellenreiter/gui/main.cpp13
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp28
-rw-r--r--noncore/net/wellenreiter/lib/.cvsignore4
-rw-r--r--noncore/net/wellenreiter/lib/lib.pro28
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro3
6 files changed, 68 insertions, 13 deletions
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 505d376..5a8972c 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -26,5 +26,4 @@ SOURCES = main.cpp \
26INCLUDEPATH += $(OPIEDIR)/include 26INCLUDEPATH += $(OPIEDIR)/include
27DEPENDPATH += $(OPIEDIR)/include 27DEPENDPATH += $(OPIEDIR)/include
28LIBS += -lopiecore2 -lopieui2 -lopienet2
29INTERFACES = configbase.ui 28INTERFACES = configbase.ui
30TARGET = wellenreiter 29TARGET = wellenreiter
@@ -33,9 +32,9 @@ TARGET = wellenreiter
33 message( qws ) 32 message( qws )
34 include ( $(OPIEDIR)/include.pro ) 33 include ( $(OPIEDIR)/include.pro )
35 LIBS += -lqpe -lopie 34 LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2
36} 35}
37 36
38contains( platform, x11 ) { 37contains( platform, x11 ) {
39 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 38 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter
40 SOURCES += resource.cpp 39 SOURCES += resource.cpp
41 HEADERS += resource.h 40 HEADERS += resource.h
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index 96a8c1c..8d4ef57 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -15,11 +15,24 @@
15 15
16#include "mainwindow.h" 16#include "mainwindow.h"
17#ifdef QWS
17#include <opie2/oapplication.h> 18#include <opie2/oapplication.h>
19#else
20#include <qapplication.h>
21#endif
18 22
19int main( int argc, char **argv ) 23int main( int argc, char **argv )
20{ 24{
25 #ifdef QWS
21 OApplication a( argc, argv, "Wellenreiter II" ); 26 OApplication a( argc, argv, "Wellenreiter II" );
27 #else
28 QApplication a( argc, argv );
29 #endif
22 WellenreiterMainWindow* w = new WellenreiterMainWindow(); 30 WellenreiterMainWindow* w = new WellenreiterMainWindow();
31 #ifdef QWS
23 a.showMainWidget( w ); 32 a.showMainWidget( w );
33 #else
34 a.setMainWidget( w );
35 w->show();
36 #endif
24 a.exec(); 37 a.exec();
25 delete w; 38 delete w;
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 3bff7c4..41ffdcc 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -14,12 +14,4 @@
14***********************************************************************/ 14***********************************************************************/
15 15
16// Qt
17
18#include <qpushbutton.h>
19#include <qmessagebox.h>
20#include <qcombobox.h>
21#include <qspinbox.h>
22#include <qsocketnotifier.h>
23
24// Opie 16// Opie
25 17
@@ -29,8 +21,20 @@ using namespace Opie;
29#endif 21#endif
30 22
23#ifdef QWS
31#include <opie2/oapplication.h> 24#include <opie2/oapplication.h>
25#else
26#include <qapplication.h>
27#endif
32#include <opie2/onetwork.h> 28#include <opie2/onetwork.h>
33#include <opie2/opcap.h> 29#include <opie2/opcap.h>
34 30
31// Qt
32
33#include <qpushbutton.h>
34#include <qmessagebox.h>
35#include <qcombobox.h>
36#include <qspinbox.h>
37#include <qsocketnotifier.h>
38
35// Standard 39// Standard
36 40
@@ -144,5 +148,9 @@ void Wellenreiter::startStopClicked()
144 pcap->close(); 148 pcap->close();
145 sniffing = false; 149 sniffing = false;
150 #ifdef QWS
146 oApp->setTitle(); 151 oApp->setTitle();
152 #else
153 qApp->mainWidget()->setCaption( "Wellenreiter II" );
154 #endif
147 155
148 // get interface name from config window 156 // get interface name from config window
@@ -222,5 +230,9 @@ void Wellenreiter::startStopClicked()
222 230
223 logwindow->log( "(i) Daemon has been started." ); 231 logwindow->log( "(i) Daemon has been started." );
232 #ifdef QWS
224 oApp->setTitle( "Scanning ..." ); 233 oApp->setTitle( "Scanning ..." );
234 #else
235 qApp->mainWidget()->setCaption( "Wellenreiter II / Scanning ..." );
236 #endif
225 sniffing = true; 237 sniffing = true;
226 238
diff --git a/noncore/net/wellenreiter/lib/.cvsignore b/noncore/net/wellenreiter/lib/.cvsignore
new file mode 100644
index 0000000..924753a
--- a/dev/null
+++ b/noncore/net/wellenreiter/lib/.cvsignore
@@ -0,0 +1,4 @@
1*.o
2*~
3moc_*
4Makefile
diff --git a/noncore/net/wellenreiter/lib/lib.pro b/noncore/net/wellenreiter/lib/lib.pro
new file mode 100644
index 0000000..8728323
--- a/dev/null
+++ b/noncore/net/wellenreiter/lib/lib.pro
@@ -0,0 +1,28 @@
1MOC_DIR = ./tmp
2OBJECTS_DIR = ./tmp
3DESTDIR = $(OPIEDIR)/lib
4TEMPLATE = lib
5CONFIG = qt warn_on debug
6
7HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \
8 $(OPIEDIR)/libopie2/opienet/onetutils.h \
9 $(OPIEDIR)/libopie2/opienet/onetwork.h \
10 $(OPIEDIR)/libopie2/opienet/opcap.h
11
12SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \
13 $(OPIEDIR)/libopie2/opienet/onetutils.cpp \
14 $(OPIEDIR)/libopie2/opienet/onetwork.cpp \
15 $(OPIEDIR)/libopie2/opienet/opcap.cpp
16
17INCLUDEPATH += $(OPIEDIR)/include
18DEPENDPATH += $(OPIEDIR)/include
19LIBS = -lpcap
20TARGET = wellenreiter
21VERSION = 1.0.0
22
23contains( platform, x11 ) {
24 LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
25 SOURCES += resource.cpp
26 HEADERS += resource.h
27}
28
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index d473695..6fe49c3 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,5 +1,4 @@
1TEMPLATE = subdirs 1TEMPLATE = subdirs
2unix:SUBDIRS = gui 2unix:SUBDIRS = lib gui
3
4 3
5!contains( platform, x11 ) { 4!contains( platform, x11 ) {