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 \
                   wellenreiter.cpp \
                   scanlistitem.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   configwindow.cpp \
                   wlan.cpp \
                   cardconfig.cpp \
                   manufacturers.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include ../
 DEPENDPATH      += $(OPIEDIR)/include ../
-LIBS            += -L. -lwellenreiter
+LIBS            += -L. -lwellenreiter -lcornucopia
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
 
 !contains( platform, x11 ) {
   message( qws )
   include ( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopie
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
   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 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "scanlistitem.h"
 
 #include <assert.h>
 
 #include "manufacturers.h"
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
-              :QListView( parent, name ), _manufacturerdb( 0 )
+              :OListView( parent, name ), _manufacturerdb( 0 )
 {
 
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
     
     addColumn( tr( "Net/Station" ) );
     setColumnAlignment( 0, AlignLeft || AlignVCenter );
     addColumn( tr( "B" ) );
     setColumnAlignment( 1, AlignCenter );
     addColumn( tr( "AP" ) );
     setColumnAlignment( 2, AlignCenter );
     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 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef SCANLIST_H
 #define SCANLIST_H
 
-#include <qlistview.h>
+#include <cornucopia/olistview.h>
 
 class QString;
 
 class ManufacturerDB;
 
-class MScanListView: public QListView
+class MScanListView: public OListView
 {
   Q_OBJECT
   
   public:
     MScanListView( QWidget* parent = 0, const char* name = 0 );
     virtual ~MScanListView();
   
     void setManufacturerDB( ManufacturerDB* manufacturerdb );
   
   public slots:
     void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
     
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;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_manuf = 6;
 const int col_firstseen = 7;
 const int col_lastseen = 8;
 
 MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
-               :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
+               :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 0 )
 {
     qDebug( "creating scanlist item" );
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
 MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
-               :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
+               :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     qDebug( "creating scanlist item" );
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
 {
     qDebug( "decorating scanlist item %s / %s / %s [%d]",
         (const char*) type,
         (const char*) essid,
         (const char*) macaddr,
         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 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef SCANLISTITEM_H
 #define SCANLISTITEM_H
 
-#include <qlistview.h>
+#include <cornucopia/olistview.h>
 
 class QString;
 
-class MScanListItem: public QListViewItem
+class MScanListItem: public OListViewItem
 {
   public:
 
     MScanListItem::MScanListItem( QListView* parent,
                                   QString type,
                                   QString essid,
                                   QString macaddr,
                                   bool wep,
                                   int channel,
                                   int signal );
 
     MScanListItem::MScanListItem( QListViewItem* parent,