| -rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 5 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 13 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 28 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/lib/.cvsignore | 4 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/lib/lib.pro | 28 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 3 |
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 @@ -27,3 +27,2 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -lopieui2 -lopienet2 INTERFACES = configbase.ui @@ -34,3 +33,3 @@ TARGET = wellenreiter include ( $(OPIEDIR)/include.pro ) - LIBS += -lqpe -lopie + LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 } @@ -38,3 +37,3 @@ TARGET = wellenreiter contains( platform, x11 ) { - LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib + LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib -lwellenreiter SOURCES += resource.cpp 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 @@ -16,3 +16,7 @@ #include "mainwindow.h" +#ifdef QWS #include <opie2/oapplication.h> +#else +#include <qapplication.h> +#endif @@ -20,5 +24,14 @@ 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(); 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 @@ -15,10 +15,2 @@ -// Qt - -#include <qpushbutton.h> -#include <qmessagebox.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qsocketnotifier.h> - // Opie @@ -30,3 +22,7 @@ using namespace Opie; +#ifdef QWS #include <opie2/oapplication.h> +#else +#include <qapplication.h> +#endif #include <opie2/onetwork.h> @@ -34,2 +30,10 @@ using namespace Opie; +// Qt + +#include <qpushbutton.h> +#include <qmessagebox.h> +#include <qcombobox.h> +#include <qspinbox.h> +#include <qsocketnotifier.h> + // Standard @@ -145,3 +149,7 @@ void Wellenreiter::startStopClicked() sniffing = false; + #ifdef QWS oApp->setTitle(); + #else + qApp->mainWidget()->setCaption( "Wellenreiter II" ); + #endif @@ -223,3 +231,7 @@ void Wellenreiter::startStopClicked() 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,4 +1,3 @@ TEMPLATE = subdirs -unix:SUBDIRS = gui - +unix:SUBDIRS = lib gui |