1 files changed, 7 insertions, 4 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 73fac97..a8f4fe4 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -7,13 +7,16 @@
 #include <qscrollview.h>
 #include <qsplitter.h>
 #include <qlist.h>
 #include <qpixmap.h>
 
 #include "bluetoothbase.h"
-#include "btlistitem.h"
+
+#include "btserviceitem.h"
+#include "btdeviceitem.h"
+
 #include "bticonloader.h"
 
 #include <remotedevice.h>
 #include <manager.h>
 
 class QVBox;
@@ -48,13 +51,13 @@ namespace OpieTooth {
         void writeSavedDevices();
         void writeToHciConfig();
         QString status()const;
         void initGui();
         void setInfo();
         Manager *m_localDevice;
-        QMap<QString,BTListItem*> m_deviceList;
+        QMap<QString,BTDeviceItem*> m_deviceList;
 
         void deviceActive( const RemoteDevice &device );
 
         QString m_deviceName;
         QString m_defaultPasskey;
         bool m_useEncryption;
@@ -66,16 +69,16 @@ namespace OpieTooth {
         QPixmap m_onPix;
 
         BTIconLoader *m_iconLoader;
 
         private slots:
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
-        void addServicesToDevice( BTListItem *item );
+        void addServicesToDevice( BTDeviceItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );
         void addConnectedDevices();
-        void addConnectedDevices( Connection::ValueList );
+        void addConnectedDevices( ConnectionState::ValueList );
         void startServiceActionClicked( QListViewItem *item );
         void startServiceActionHold( QListViewItem *, const QPoint &, int );
         void deviceActive( const QString& mac, bool connected  );
         void applyConfigChanges();
 
     };