-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 13 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.h | 3 |
8 files changed, 15 insertions, 18 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 9358866..ca53471 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -19,13 +19,13 @@ | |||
19 | 19 | ||
20 | /* OPIE */ | 20 | /* OPIE */ |
21 | #include <opie2/onetwork.h> | 21 | #include <opie2/onetwork.h> |
22 | #ifdef QWS | 22 | #ifdef QWS |
23 | #include <opie2/oapplication.h> | 23 | #include <opie2/oapplication.h> |
24 | #include <opie2/oconfig.h> | 24 | #include <opie2/oconfig.h> |
25 | #include <opie/odevice.h> | 25 | #include <opie2/odevice.h> |
26 | using namespace Opie; | 26 | using namespace Opie; |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* QT */ | 29 | /* QT */ |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 188d96a..7957d4c 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -32,13 +32,13 @@ DEPENDPATH += $(OPIEDIR)/include | |||
32 | INTERFACES = configbase.ui | 32 | INTERFACES = configbase.ui |
33 | TARGET = wellenreiter | 33 | TARGET = wellenreiter |
34 | 34 | ||
35 | !contains( platform, x11 ) { | 35 | !contains( platform, x11 ) { |
36 | message( qws ) | 36 | message( qws ) |
37 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |
38 | LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2 | 38 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2 |
39 | } | 39 | } |
40 | 40 | ||
41 | contains( platform, x11 ) { | 41 | contains( platform, x11 ) { |
42 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter | 42 | LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter |
43 | SOURCES += resource.cpp | 43 | SOURCES += resource.cpp |
44 | HEADERS += resource.h | 44 | HEADERS += resource.h |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index d4e3279..05a8913 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -36,13 +36,14 @@ | |||
36 | #include <qstatusbar.h> | 36 | #include <qstatusbar.h> |
37 | #include <qtextstream.h> | 37 | #include <qtextstream.h> |
38 | #include <qtoolbutton.h> | 38 | #include <qtoolbutton.h> |
39 | 39 | ||
40 | #ifdef QWS | 40 | #ifdef QWS |
41 | #include <qpe/resource.h> | 41 | #include <qpe/resource.h> |
42 | #include <opie/ofiledialog.h> | 42 | #include <opie2/ofiledialog.h> |
43 | using namespace Opie; | ||
43 | #else | 44 | #else |
44 | #include "resource.h" | 45 | #include "resource.h" |
45 | #include <qapplication.h> | 46 | #include <qapplication.h> |
46 | #include <qfiledialog.h> | 47 | #include <qfiledialog.h> |
47 | #endif | 48 | #endif |
48 | 49 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 10ead53..b42f1df 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -239,12 +239,13 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& | |||
239 | MLogWindow::logwindow()->log( s ); | 239 | MLogWindow::logwindow()->log( s ); |
240 | } | 240 | } |
241 | 241 | ||
242 | 242 | ||
243 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) | 243 | void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) |
244 | { | 244 | { |
245 | qDebug( "WDSTraffic: %s and %s seem to form a WDS", (const char*) viaFrom.toString(), (const char*) viaTo.toString() ); | ||
245 | QString s; | 246 | QString s; |
246 | MScanListItem* network; | 247 | MScanListItem* network; |
247 | 248 | ||
248 | QListViewItemIterator it( this ); | 249 | QListViewItemIterator it( this ); |
249 | while ( it.current() && | 250 | while ( it.current() && |
250 | it.current()->text( col_ap ) != viaFrom.toString(true) && | 251 | it.current()->text( col_ap ) != viaFrom.toString(true) && |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index cd74bed..43a04e3 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -1,10 +1,8 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | ||
4 | ** This file is part of Opie Environment. | ||
5 | ** | 3 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 4 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 5 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 6 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 7 | ** packaging of this file. |
10 | ** | 8 | ** |
@@ -25,25 +23,22 @@ | |||
25 | #include "graphwindow.h" | 23 | #include "graphwindow.h" |
26 | #include "protolistview.h" | 24 | #include "protolistview.h" |
27 | 25 | ||
28 | // Opie | 26 | // Opie |
29 | 27 | ||
30 | #ifdef QWS | 28 | #ifdef QWS |
31 | #include <opie/odevice.h> | ||
32 | #include <qpe/qcopenvelope_qws.h> | ||
33 | using namespace Opie; | ||
34 | #endif | ||
35 | |||
36 | #ifdef QWS | ||
37 | #include <opie2/oapplication.h> | 29 | #include <opie2/oapplication.h> |
30 | #include <opie2/odevice.h> | ||
38 | #else | 31 | #else |
39 | #include <qapplication.h> | 32 | #include <qapplication.h> |
40 | #endif | 33 | #endif |
41 | #include <opie2/omanufacturerdb.h> | 34 | #include <opie2/omanufacturerdb.h> |
42 | #include <opie2/onetwork.h> | 35 | #include <opie2/onetwork.h> |
43 | #include <opie2/opcap.h> | 36 | #include <opie2/opcap.h> |
37 | #include <qpe/qcopenvelope_qws.h> | ||
38 | using namespace Opie; | ||
44 | 39 | ||
45 | // Qt | 40 | // Qt |
46 | 41 | ||
47 | #include <qcheckbox.h> | 42 | #include <qcheckbox.h> |
48 | #include <qcombobox.h> | 43 | #include <qcombobox.h> |
49 | #include <qdatetime.h> | 44 | #include <qdatetime.h> |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index a28740b..745486f 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -1,10 +1,8 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | ||
4 | ** This file is part of Opie Environment. | ||
5 | ** | 3 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 4 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 5 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 6 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 7 | ** packaging of this file. |
10 | ** | 8 | ** |
@@ -16,13 +14,13 @@ | |||
16 | #ifndef WELLENREITER_H | 14 | #ifndef WELLENREITER_H |
17 | #define WELLENREITER_H | 15 | #define WELLENREITER_H |
18 | 16 | ||
19 | #include "wellenreiterbase.h" | 17 | #include "wellenreiterbase.h" |
20 | 18 | ||
21 | #ifdef QWS | 19 | #ifdef QWS |
22 | #include <opie/odevice.h> | 20 | #include <opie2/odevice.h> |
23 | using namespace Opie; | 21 | using namespace Opie; |
24 | #endif | 22 | #endif |
25 | 23 | ||
26 | class QTimerEvent; | 24 | class QTimerEvent; |
27 | class QPixmap; | 25 | class QPixmap; |
28 | class OPacket; | 26 | class OPacket; |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index eac5d89..c2413dc 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -32,13 +32,14 @@ | |||
32 | #include "scanlist.h" | 32 | #include "scanlist.h" |
33 | #include "statwindow.h" | 33 | #include "statwindow.h" |
34 | #include "graphwindow.h" | 34 | #include "graphwindow.h" |
35 | 35 | ||
36 | #ifdef QWS | 36 | #ifdef QWS |
37 | #include <qpe/resource.h> | 37 | #include <qpe/resource.h> |
38 | #include <opie/otabwidget.h> | 38 | #include <opie2/otabwidget.h> |
39 | using namespace Opie; | ||
39 | #else | 40 | #else |
40 | #include "resource.h" | 41 | #include "resource.h" |
41 | #include <qtabwidget.h> | 42 | #include <qtabwidget.h> |
42 | #endif | 43 | #endif |
43 | 44 | ||
44 | 45 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h index e8dc924..2cc273e 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.h +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h | |||
@@ -28,13 +28,14 @@ class QPushButton; | |||
28 | class MLogWindow; | 28 | class MLogWindow; |
29 | class MHexWindow; | 29 | class MHexWindow; |
30 | class MStatWindow; | 30 | class MStatWindow; |
31 | class MGraphWindow; | 31 | class MGraphWindow; |
32 | 32 | ||
33 | #ifdef QWS | 33 | #ifdef QWS |
34 | class OTabWidget; | 34 | #include <opie2/otabwidget.h> |
35 | using namespace Opie; | ||
35 | #else | 36 | #else |
36 | class QTabWidget; | 37 | class QTabWidget; |
37 | #endif | 38 | #endif |
38 | 39 | ||
39 | class WellenreiterBase : public QWidget | 40 | class WellenreiterBase : public QWidget |
40 | { | 41 | { |