summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -13,25 +13,25 @@
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16/* LOCAL */ 16/* LOCAL */
17#include "configwindow.h" 17#include "configwindow.h"
18#include "mainwindow.h" 18#include "mainwindow.h"
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>
26using namespace Opie; 26using 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>
32#include <qcombobox.h> 32#include <qcombobox.h>
33#include <qfile.h> 33#include <qfile.h>
34#include <qlineedit.h> 34#include <qlineedit.h>
35#include <qlayout.h> 35#include <qlayout.h>
36#include <qmap.h> 36#include <qmap.h>
37#include <qpushbutton.h> 37#include <qpushbutton.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
@@ -26,22 +26,22 @@ SOURCES = main.cpp \
26 graphwindow.cpp \ 26 graphwindow.cpp \
27 protolistview.cpp \ 27 protolistview.cpp \
28 gps.cpp 28 gps.cpp
29 29
30INCLUDEPATH += $(OPIEDIR)/include 30INCLUDEPATH += $(OPIEDIR)/include
31DEPENDPATH += $(OPIEDIR)/include 31DEPENDPATH += $(OPIEDIR)/include
32INTERFACES = configbase.ui 32INTERFACES = configbase.ui
33TARGET = wellenreiter 33TARGET = 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
41contains( platform, x11 ) { 41contains( 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
45 DESTDIR = $(OPIEDIR)/output/bin 45 DESTDIR = $(OPIEDIR)/output/bin
46} 46}
47 47
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
@@ -30,25 +30,26 @@
30#include <qlineedit.h> 30#include <qlineedit.h>
31#include <qiconset.h> 31#include <qiconset.h>
32#include <qmenubar.h> 32#include <qmenubar.h>
33#include <qmessagebox.h> 33#include <qmessagebox.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.h>
35#include <qpushbutton.h> 35#include <qpushbutton.h>
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>
43using 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
49WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) 50WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
50 :QMainWindow( parent, name, f ) 51 :QMainWindow( parent, name, f )
51{ 52{
52 cw = new WellenreiterConfigWindow( this ); 53 cw = new WellenreiterConfigWindow( this );
53 mw = new Wellenreiter( this ); 54 mw = new Wellenreiter( this );
54 mw->setConfigWindow( cw ); 55 mw->setConfigWindow( cw );
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
@@ -233,24 +233,25 @@ void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress&
233 s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) ); 233 s.sprintf( "(i) New Station in '%s' [xx]", (const char*) network->text( col_essid ) );
234 } 234 }
235 else 235 else
236 { 236 {
237 s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) ); 237 s.sprintf( "(i) New Wireless Station in '%s' [xx]", (const char*) network->text( col_essid ) );
238 } 238 }
239 MLogWindow::logwindow()->log( s ); 239 MLogWindow::logwindow()->log( s );
240} 240}
241 241
242 242
243void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ) 243void 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) &&
251 it.current()->text( col_ap ) != viaTo.toString(true) ) ++it; 252 it.current()->text( col_ap ) != viaTo.toString(true) ) ++it;
252 253
253 MScanListItem* item = static_cast<MScanListItem*>( it.current() ); 254 MScanListItem* item = static_cast<MScanListItem*>( it.current() );
254 255
255 if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations 256 if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
256 { 257 {
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,16 +1,14 @@
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**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 9** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 10** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 11**
14***********************************************************************/ 12***********************************************************************/
15 13
16// Local 14// Local
@@ -19,37 +17,34 @@
19#include "wellenreiter.h" 17#include "wellenreiter.h"
20#include "scanlist.h" 18#include "scanlist.h"
21#include "logwindow.h" 19#include "logwindow.h"
22#include "hexwindow.h" 20#include "hexwindow.h"
23#include "configwindow.h" 21#include "configwindow.h"
24#include "statwindow.h" 22#include "statwindow.h"
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>
33using 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>
38using 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>
50#include <qpushbutton.h> 45#include <qpushbutton.h>
51#include <qlineedit.h> 46#include <qlineedit.h>
52#include <qmessagebox.h> 47#include <qmessagebox.h>
53#include <qobjectlist.h> 48#include <qobjectlist.h>
54#include <qregexp.h> 49#include <qregexp.h>
55#include <qspinbox.h> 50#include <qspinbox.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,34 +1,32 @@
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**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 9** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 10** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 11**
14**********************************************************************/ 12**********************************************************************/
15 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>
23using namespace Opie; 21using namespace Opie;
24#endif 22#endif
25 23
26class QTimerEvent; 24class QTimerEvent;
27class QPixmap; 25class QPixmap;
28class OPacket; 26class OPacket;
29class OWaveLanManagementPacket; 27class OWaveLanManagementPacket;
30class OWaveLanControlPacket; 28class OWaveLanControlPacket;
31class OWaveLanDataPacket; 29class OWaveLanDataPacket;
32class OEthernetPacket; 30class OEthernetPacket;
33class OARPPacket; 31class OARPPacket;
34class OMacAddress; 32class OMacAddress;
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
@@ -26,25 +26,26 @@
26#include <qwhatsthis.h> 26#include <qwhatsthis.h>
27#include <qimage.h> 27#include <qimage.h>
28#include <qpixmap.h> 28#include <qpixmap.h>
29 29
30#include "logwindow.h" 30#include "logwindow.h"
31#include "hexwindow.h" 31#include "hexwindow.h"
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>
39using 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
45/* 46/*
46 * Constructs a WellenreiterBase which is a child of 'parent', with the 47 * Constructs a WellenreiterBase which is a child of 'parent', with the
47 * name 'name' and widget flags set to 'f' 48 * name 'name' and widget flags set to 'f'
48 */ 49 */
49WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) 50WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl )
50 : QWidget( parent, name, fl ) 51 : QWidget( parent, name, fl )
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
@@ -22,25 +22,26 @@ class QVBoxLayout;
22class QHBoxLayout; 22class QHBoxLayout;
23class QGridLayout; 23class QGridLayout;
24class QLabel; 24class QLabel;
25class MScanListView; 25class MScanListView;
26class MScanListItem; 26class MScanListItem;
27class QPushButton; 27class QPushButton;
28class MLogWindow; 28class MLogWindow;
29class MHexWindow; 29class MHexWindow;
30class MStatWindow; 30class MStatWindow;
31class MGraphWindow; 31class MGraphWindow;
32 32
33#ifdef QWS 33#ifdef QWS
34class OTabWidget; 34#include <opie2/otabwidget.h>
35using namespace Opie;
35#else 36#else
36class QTabWidget; 37class QTabWidget;
37#endif 38#endif
38 39
39class WellenreiterBase : public QWidget 40class WellenreiterBase : public QWidget
40{ 41{
41 Q_OBJECT 42 Q_OBJECT
42 43
43public: 44public:
44 WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 45 WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
45 ~WellenreiterBase(); 46 ~WellenreiterBase();
46 47