From 2318b309ef4c5147fa1a975b7b261ceec5dd13a7 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 31 Mar 2003 10:20:23 +0000 Subject: reenable the X11 standalone build (qmake platform=x11 wellenreiter.pro) --- (limited to 'noncore/net') 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 @@ -25,18 +25,17 @@ SOURCES = main.cpp \ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -lopieui2 -lopienet2 INTERFACES = configbase.ui TARGET = wellenreiter !contains( platform, x11 ) { message( qws ) include ( $(OPIEDIR)/include.pro ) - LIBS += -lqpe -lopie + LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 } contains( platform, x11 ) { - LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter SOURCES += resource.cpp 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 @@ -14,13 +14,26 @@ **********************************************************************/ #include "mainwindow.h" +#ifdef QWS #include +#else +#include +#endif int main( int argc, char **argv ) { + #ifdef QWS OApplication a( argc, argv, "Wellenreiter II" ); + #else + QApplication a( argc, argv ); + #endif WellenreiterMainWindow* w = new WellenreiterMainWindow(); + #ifdef QWS a.showMainWidget( w ); + #else + a.setMainWidget( w ); + w->show(); + #endif a.exec(); delete w; return 0; 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 @@ -13,14 +13,6 @@ ** ***********************************************************************/ -// Qt - -#include -#include -#include -#include -#include - // Opie #ifdef QWS @@ -28,10 +20,22 @@ using namespace Opie; #endif +#ifdef QWS #include +#else +#include +#endif #include #include +// Qt + +#include +#include +#include +#include +#include + // Standard #include @@ -143,7 +147,11 @@ void Wellenreiter::startStopClicked() iface->setChannelHopping(); // stop hopping channels pcap->close(); sniffing = false; + #ifdef QWS oApp->setTitle(); + #else + qApp->mainWidget()->setCaption( "Wellenreiter II" ); + #endif // get interface name from config window const QString& interface = configwindow->interfaceName->currentText(); @@ -221,7 +229,11 @@ void Wellenreiter::startStopClicked() connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); logwindow->log( "(i) Daemon has been started." ); + #ifdef QWS oApp->setTitle( "Scanning ..." ); + #else + qApp->mainWidget()->setCaption( "Wellenreiter II / Scanning ..." ); + #endif sniffing = true; } 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 @@ +*.o +*~ +moc_* +Makefile 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 @@ +MOC_DIR = ./tmp +OBJECTS_DIR = ./tmp +DESTDIR = $(OPIEDIR)/lib +TEMPLATE = lib +CONFIG = qt warn_on debug + +HEADERS = $(OPIEDIR)/libopie2/opieui/olistview.h \ + $(OPIEDIR)/libopie2/opienet/onetutils.h \ + $(OPIEDIR)/libopie2/opienet/onetwork.h \ + $(OPIEDIR)/libopie2/opienet/opcap.h + +SOURCES = $(OPIEDIR)/libopie2/opieui/olistview.cpp \ + $(OPIEDIR)/libopie2/opienet/onetutils.cpp \ + $(OPIEDIR)/libopie2/opienet/onetwork.cpp \ + $(OPIEDIR)/libopie2/opienet/opcap.cpp + +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS = -lpcap +TARGET = wellenreiter +VERSION = 1.0.0 + +contains( platform, x11 ) { + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib + SOURCES += resource.cpp + HEADERS += resource.h +} + 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,6 +1,5 @@ TEMPLATE = subdirs -unix:SUBDIRS = gui - +unix:SUBDIRS = lib gui !contains( platform, x11 ) { message( Configuring Wellenreiter for build on Opie ) -- cgit v0.9.0.2