summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-07 20:20:24 (UTC)
committer mickeyl <mickeyl>2004-02-07 20:20:24 (UTC)
commit9212a1715e5092ce143043770c5f2ff86db907ee (patch) (side-by-side diff)
treebb1058f0ea85d0bc4556ac0efebdf00ffa113975
parentb2ddc28220478b9f60201c06629db744db461d68 (diff)
downloadopie-9212a1715e5092ce143043770c5f2ff86db907ee.zip
opie-9212a1715e5092ce143043770c5f2ff86db907ee.tar.gz
opie-9212a1715e5092ce143043770c5f2ff86db907ee.tar.bz2
no longer link against libopie1 since libopie2 provides everything
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro2
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp3
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp13
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h6
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp3
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.h3
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 @@
#include <opie2/oapplication.h>
#include <opie2/oconfig.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
using namespace Opie;
#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
message( qws )
include ( $(OPIEDIR)/include.pro )
- LIBS += -lqpe -lopie -lopiecore2 -lopieui2 -lopienet2
+ LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
}
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 @@
#ifdef QWS
#include <qpe/resource.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
+using namespace Opie;
#else
#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&
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;
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 @@
/**********************************************************************
-** 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
@@ -29,11 +27,6 @@
#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>
@@ -42,4 +35,6 @@ using namespace Opie;
#include <opie2/onetwork.h>
#include <opie2/opcap.h>
+#include <qpe/qcopenvelope_qws.h>
+using namespace Opie;
// 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 @@
/**********************************************************************
-** 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
@@ -20,5 +18,5 @@
#ifdef QWS
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
using namespace Opie;
#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 @@
#ifdef QWS
#include <qpe/resource.h>
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
+using namespace Opie;
#else
#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;
#ifdef QWS
-class OTabWidget;
+#include <opie2/otabwidget.h>
+using namespace Opie;
#else
class QTabWidget;