author | mickeyl <mickeyl> | 2004-02-07 20:20:24 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-07 20:20:24 (UTC) |
commit | 9212a1715e5092ce143043770c5f2ff86db907ee (patch) (unidiff) | |
tree | bb1058f0ea85d0bc4556ac0efebdf00ffa113975 /noncore/net/wellenreiter/gui | |
parent | b2ddc28220478b9f60201c06629db744db461d68 (diff) | |
download | opie-9212a1715e5092ce143043770c5f2ff86db907ee.zip opie-9212a1715e5092ce143043770c5f2ff86db907ee.tar.gz opie-9212a1715e5092ce143043770c5f2ff86db907ee.tar.bz2 |
no longer link against libopie1 since libopie2 provides everything
Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -23,5 +23,5 @@ | |||
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 |
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 | |||
@@ -36,5 +36,5 @@ TARGET = wellenreiter | |||
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 | ||
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 | |||
@@ -40,5 +40,6 @@ | |||
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" |
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 | |||
@@ -243,4 +243,5 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& | |||
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; |
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,6 +1,4 @@ | |||
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 |
@@ -29,11 +27,6 @@ | |||
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> |
@@ -42,4 +35,6 @@ using namespace Opie; | |||
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 |
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,6 +1,4 @@ | |||
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 |
@@ -20,5 +18,5 @@ | |||
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 |
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 | |||
@@ -36,5 +36,6 @@ | |||
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" |
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 | |||
@@ -32,5 +32,6 @@ 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; |