fix memleaks

fix possible crashes
clean up

1 files changed, 15 insertions, 15 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index ce0483f..73fac97 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -35,43 +35,43 @@ namespace OpieTooth {
         BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~BlueBase();
 
     protected:
 
 
-            private slots:
+    private slots:
         void startScan();
 
     private:
 	void readConfig();
 	void writeConfig();
         void readSavedDevices();
         void writeSavedDevices();
         void writeToHciConfig();
-	QString getStatus();
+	QString status()const;
 	void initGui();
         void setInfo();
-        Manager *localDevice;
-        QMap<QString,BTListItem*> deviceList;
+        Manager *m_localDevice;
+        QMap<QString,BTListItem*> m_deviceList;
 
-        void deviceActive( RemoteDevice *device );
+        void deviceActive( const RemoteDevice &device );
 
-	QString deviceName;
-	QString defaultPasskey;
-	int useEncryption;
-	int enableAuthentification;
-	int enablePagescan;
-	int enableInquiryscan;
+	QString m_deviceName;
+	QString m_defaultPasskey;
+	bool m_useEncryption;
+	bool m_enableAuthentification;
+	bool m_enablePagescan;
+	bool m_enableInquiryscan;
 
-        QPixmap offPix;
-        QPixmap onPix;
+        QPixmap m_offPix;
+        QPixmap m_onPix;
 
-        BTIconLoader *iconLoader;
+        BTIconLoader *m_iconLoader;
 
 	private slots:
-        void addSearchedDevices( QList<RemoteDevice> &newDevices );
+        void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
         void addServicesToDevice( BTListItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );
         void addConnectedDevices();
         void addConnectedDevices( Connection::ValueList );
         void startServiceActionClicked( QListViewItem *item );
         void startServiceActionHold( QListViewItem *, const QPoint &, int );