-rw-r--r-- | noncore/net/wellenreiter/gui/gui.pro | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlistitem.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlistitem.h | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro index 822b0db..6037661 100644 --- a/noncore/net/wellenreiter/gui/gui.pro +++ b/noncore/net/wellenreiter/gui/gui.pro | |||
@@ -22,25 +22,25 @@ SOURCES = main.cpp \ | |||
22 | wellenreiter.cpp \ | 22 | wellenreiter.cpp \ |
23 | scanlistitem.cpp \ | 23 | scanlistitem.cpp \ |
24 | scanlist.cpp \ | 24 | scanlist.cpp \ |
25 | logwindow.cpp \ | 25 | logwindow.cpp \ |
26 | hexwindow.cpp \ | 26 | hexwindow.cpp \ |
27 | configwindow.cpp \ | 27 | configwindow.cpp \ |
28 | wlan.cpp \ | 28 | wlan.cpp \ |
29 | cardconfig.cpp \ | 29 | cardconfig.cpp \ |
30 | manufacturers.cpp | 30 | manufacturers.cpp |
31 | 31 | ||
32 | INCLUDEPATH += $(OPIEDIR)/include ../ | 32 | INCLUDEPATH += $(OPIEDIR)/include ../ |
33 | DEPENDPATH += $(OPIEDIR)/include ../ | 33 | DEPENDPATH += $(OPIEDIR)/include ../ |
34 | LIBS += -L. -lwellenreiter | 34 | LIBS += -L. -lwellenreiter -lcornucopia |
35 | INTERFACES = configbase.ui | 35 | INTERFACES = configbase.ui |
36 | TARGET = wellenreiter | 36 | TARGET = wellenreiter |
37 | 37 | ||
38 | !contains( platform, x11 ) { | 38 | !contains( platform, x11 ) { |
39 | message( qws ) | 39 | message( qws ) |
40 | include ( $(OPIEDIR)/include.pro ) | 40 | include ( $(OPIEDIR)/include.pro ) |
41 | LIBS += -lqpe -lopie | 41 | LIBS += -lqpe -lopie |
42 | } | 42 | } |
43 | 43 | ||
44 | contains( platform, x11 ) { | 44 | contains( platform, x11 ) { |
45 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 45 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
46 | SOURCES += resource.cpp | 46 | SOURCES += resource.cpp |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index a689cca..6d3469c 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -12,25 +12,25 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "scanlist.h" | 16 | #include "scanlist.h" |
17 | #include "scanlistitem.h" | 17 | #include "scanlistitem.h" |
18 | 18 | ||
19 | #include <assert.h> | 19 | #include <assert.h> |
20 | 20 | ||
21 | #include "manufacturers.h" | 21 | #include "manufacturers.h" |
22 | 22 | ||
23 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 23 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
24 | :QListView( parent, name ), _manufacturerdb( 0 ) | 24 | :OListView( parent, name ), _manufacturerdb( 0 ) |
25 | { | 25 | { |
26 | 26 | ||
27 | setFrameShape( QListView::StyledPanel ); | 27 | setFrameShape( QListView::StyledPanel ); |
28 | setFrameShadow( QListView::Sunken ); | 28 | setFrameShadow( QListView::Sunken ); |
29 | 29 | ||
30 | addColumn( tr( "Net/Station" ) ); | 30 | addColumn( tr( "Net/Station" ) ); |
31 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); | 31 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); |
32 | addColumn( tr( "B" ) ); | 32 | addColumn( tr( "B" ) ); |
33 | setColumnAlignment( 1, AlignCenter ); | 33 | setColumnAlignment( 1, AlignCenter ); |
34 | addColumn( tr( "AP" ) ); | 34 | addColumn( tr( "AP" ) ); |
35 | setColumnAlignment( 2, AlignCenter ); | 35 | setColumnAlignment( 2, AlignCenter ); |
36 | addColumn( tr( "Chn" ) ); | 36 | addColumn( tr( "Chn" ) ); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index 9a35a82..475f7b6 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -7,31 +7,31 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** 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. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef SCANLIST_H | 16 | #ifndef SCANLIST_H |
17 | #define SCANLIST_H | 17 | #define SCANLIST_H |
18 | 18 | ||
19 | #include <qlistview.h> | 19 | #include <cornucopia/olistview.h> |
20 | 20 | ||
21 | class QString; | 21 | class QString; |
22 | 22 | ||
23 | class ManufacturerDB; | 23 | class ManufacturerDB; |
24 | 24 | ||
25 | class MScanListView: public QListView | 25 | class MScanListView: public OListView |
26 | { | 26 | { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
30 | MScanListView( QWidget* parent = 0, const char* name = 0 ); | 30 | MScanListView( QWidget* parent = 0, const char* name = 0 ); |
31 | virtual ~MScanListView(); | 31 | virtual ~MScanListView(); |
32 | 32 | ||
33 | void setManufacturerDB( ManufacturerDB* manufacturerdb ); | 33 | void setManufacturerDB( ManufacturerDB* manufacturerdb ); |
34 | 34 | ||
35 | public slots: | 35 | public slots: |
36 | void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); | 36 | void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ); |
37 | 37 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp index dd33f5f..bfa7aa9 100644 --- a/noncore/net/wellenreiter/gui/scanlistitem.cpp +++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp | |||
@@ -28,35 +28,35 @@ const int col_type = 0; | |||
28 | const int col_essid = 0; | 28 | const int col_essid = 0; |
29 | const int col_sig = 1; | 29 | const int col_sig = 1; |
30 | const int col_ap = 2; | 30 | const int col_ap = 2; |
31 | const int col_channel = 3; | 31 | const int col_channel = 3; |
32 | const int col_wep = 4; | 32 | const int col_wep = 4; |
33 | const int col_traffic = 5; | 33 | const int col_traffic = 5; |
34 | const int col_manuf = 6; | 34 | const int col_manuf = 6; |
35 | const int col_firstseen = 7; | 35 | const int col_firstseen = 7; |
36 | const int col_lastseen = 8; | 36 | const int col_lastseen = 8; |
37 | 37 | ||
38 | MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, | 38 | MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, |
39 | bool wep, int channel, int signal ) | 39 | bool wep, int channel, int signal ) |
40 | :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), | 40 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), |
41 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), | 41 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), |
42 | _channel( channel ), _signal( signal ), _beacons( 0 ) | 42 | _channel( channel ), _signal( signal ), _beacons( 0 ) |
43 | { | 43 | { |
44 | qDebug( "creating scanlist item" ); | 44 | qDebug( "creating scanlist item" ); |
45 | decorateItem( type, essid, macaddr, wep, channel, signal ); | 45 | decorateItem( type, essid, macaddr, wep, channel, signal ); |
46 | } | 46 | } |
47 | 47 | ||
48 | MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr, | 48 | MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr, |
49 | bool wep, int channel, int signal ) | 49 | bool wep, int channel, int signal ) |
50 | :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) | 50 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) |
51 | { | 51 | { |
52 | qDebug( "creating scanlist item" ); | 52 | qDebug( "creating scanlist item" ); |
53 | decorateItem( type, essid, macaddr, wep, channel, signal ); | 53 | decorateItem( type, essid, macaddr, wep, channel, signal ); |
54 | } | 54 | } |
55 | 55 | ||
56 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) | 56 | void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) |
57 | { | 57 | { |
58 | qDebug( "decorating scanlist item %s / %s / %s [%d]", | 58 | qDebug( "decorating scanlist item %s / %s / %s [%d]", |
59 | (const char*) type, | 59 | (const char*) type, |
60 | (const char*) essid, | 60 | (const char*) essid, |
61 | (const char*) macaddr, | 61 | (const char*) macaddr, |
62 | channel ); | 62 | channel ); |
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.h b/noncore/net/wellenreiter/gui/scanlistitem.h index c3c6255..89b3bc4 100644 --- a/noncore/net/wellenreiter/gui/scanlistitem.h +++ b/noncore/net/wellenreiter/gui/scanlistitem.h | |||
@@ -7,29 +7,29 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** 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. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef SCANLISTITEM_H | 16 | #ifndef SCANLISTITEM_H |
17 | #define SCANLISTITEM_H | 17 | #define SCANLISTITEM_H |
18 | 18 | ||
19 | #include <qlistview.h> | 19 | #include <cornucopia/olistview.h> |
20 | 20 | ||
21 | class QString; | 21 | class QString; |
22 | 22 | ||
23 | class MScanListItem: public QListViewItem | 23 | class MScanListItem: public OListViewItem |
24 | { | 24 | { |
25 | public: | 25 | public: |
26 | 26 | ||
27 | MScanListItem::MScanListItem( QListView* parent, | 27 | MScanListItem::MScanListItem( QListView* parent, |
28 | QString type, | 28 | QString type, |
29 | QString essid, | 29 | QString essid, |
30 | QString macaddr, | 30 | QString macaddr, |
31 | bool wep, | 31 | bool wep, |
32 | int channel, | 32 | int channel, |
33 | int signal ); | 33 | int signal ); |
34 | 34 | ||
35 | MScanListItem::MScanListItem( QListViewItem* parent, | 35 | MScanListItem::MScanListItem( QListViewItem* parent, |