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
@@ -21,9 +21,9 @@
 #include <opie2/onetwork.h>
 #ifdef QWS
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 using namespace Opie;
 #endif
 
 /* QT */
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
@@ -34,9 +34,9 @@ TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
-  LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2
+  LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
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
@@ -38,9 +38,10 @@
 #include <qtoolbutton.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
+using namespace Opie;
 #else
 #include "resource.h"
 #include <qapplication.h>
 #include <qfiledialog.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
@@ -241,8 +241,9 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
 
 
 void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
+    qDebug( "WDSTraffic: %s and %s seem to form a WDS", (const char*) viaFrom.toString(), (const char*) viaTo.toString() );
     QString s;
     MScanListItem* network;
 
     QListViewItemIterator it( this );
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,8 +1,6 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -27,21 +25,18 @@
 
 // Opie
 
 #ifdef QWS
-#include <opie/odevice.h>
-#include <qpe/qcopenvelope_qws.h>
-using namespace Opie;
-#endif
-
-#ifdef QWS
 #include <opie2/oapplication.h>
+#include <opie2/odevice.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/omanufacturerdb.h>
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie;
 
 // Qt
 
 #include <qcheckbox.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,8 +1,6 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -18,9 +16,9 @@
 
 #include "wellenreiterbase.h"
 
 #ifdef QWS
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 using namespace Opie;
 #endif
 
 class QTimerEvent;
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
@@ -34,9 +34,10 @@
 #include "graphwindow.h"
 
 #ifdef QWS
 #include <qpe/resource.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
+using namespace Opie;
 #else
 #include "resource.h"
 #include <qtabwidget.h>
 #endif
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
@@ -30,9 +30,10 @@ class MHexWindow;
 class MStatWindow;
 class MGraphWindow;
 
 #ifdef QWS
-class OTabWidget;
+#include <opie2/otabwidget.h>
+using namespace Opie;
 #else
 class QTabWidget;
 #endif