API clean ups

8 files changed, 31 insertions, 38 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index ff6981b..8ddc161 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -427,19 +427,20 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
             deviceItem->setPixmap( 1, m_offPix );
         }
     }
 
     /**
      * Open the "scan for devices"  dialog
      */
     void BlueBase::startScan() {
-        ScanDialog *scan = new ScanDialog( this, "", true);
-        QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ),
-                         this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) );
+        ScanDialog *scan = new ScanDialog( this, "ScanDialog",
+                                           true, WDestructiveClose );
+        QObject::connect( scan, SIGNAL( selectedDevices( QValueList<RemoteDevice>& ) ),
+                         this, SLOT( addSearchedDevices( QValueList<RemoteDevice>& ) ) );
 
         scan->showMaximized();
     }
 
 
     /**
      * Set the informations about the local device in information Tab
      */
diff --git a/noncore/net/opietooth/manager/btlistitem.cpp b/noncore/net/opietooth/manager/btlistitem.cpp
index ce5b141..82e7c00 100644
--- a/noncore/net/opietooth/manager/btlistitem.cpp
+++ b/noncore/net/opietooth/manager/btlistitem.cpp
@@ -1,67 +1,61 @@
 
 #include "btlistitem.h"
 
 namespace OpieTooth {
 
 
     BTListItem::BTListItem( QListView * parent  ) : QListViewItem( parent ) {
-        m_name = "";
-        m_mac ="";
-        m_type ="";
     }
 
     BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) {
-        m_name = "";
-        m_mac ="";
-        m_type ="";
     }
 
 
     // name, and then mac and then servicetype
-    BTListItem::BTListItem( QListView * parent,  QString name , QString mac, QString type   )
+    BTListItem::BTListItem( QListView * parent,  const QString &name , const QString& mac, const QString& type   )
         : QListViewItem( parent, name ){
 
         m_name = name;
         m_mac = mac;
         m_type = type;
 
     }
 
-    BTListItem::BTListItem( QListViewItem * parent , QString name, QString mac, QString type   )
+    BTListItem::BTListItem( QListViewItem * parent , const QString& name, const QString& mac, const QString& type   )
         : QListViewItem( parent, name ){
 
         m_name = name;
         m_mac = mac;
         m_type = type;
     }
 
 
-    void BTListItem::setMac( QString mac ) {
+    void BTListItem::setMac( const QString& mac ) {
         m_mac = mac;
     }
 
-    QString BTListItem::mac() {
+    QString BTListItem::mac() const {
         return m_mac;
     }
 
-    void BTListItem::setName( QString name ) {
+    void BTListItem::setName( const QString& name ) {
         m_name = name;
     }
 
-    QString BTListItem::name() {
+    QString BTListItem::name() const {
         return m_name;
     }
 
-    void BTListItem::setType( QString type ) {
+    void BTListItem::setType( const QString& type ) {
         m_type = type;
     }
 
-    QString BTListItem::type() {
+    QString BTListItem::type() const {
         return m_type;
     }
 
 
     BTListItem::~BTListItem() {
     }
 
 };
diff --git a/noncore/net/opietooth/manager/btlistitem.h b/noncore/net/opietooth/manager/btlistitem.h
index 8963caa..d7ce03b 100644
--- a/noncore/net/opietooth/manager/btlistitem.h
+++ b/noncore/net/opietooth/manager/btlistitem.h
@@ -7,26 +7,26 @@ namespace OpieTooth {
 
     class BTListItem : public QListViewItem {
 
     public:
         BTListItem( QListView * parent  );
         BTListItem( QListViewItem * parent );
 
         // name, and then mac and then servicetype
-        BTListItem( QListView * ,  QString, QString, QString  );
-        BTListItem( QListViewItem * parent , QString, QString , QString );
+        BTListItem( QListView * ,  const QString&, const QString&, const QString&  );
+        BTListItem( QListViewItem * parent , const QString&, const QString& , const QString& );
         ~BTListItem();
 
-        void setMac( QString );
-        QString mac();
-        void setName( QString );
-        QString name();
-        void setType( QString );
-        QString type();
+        void setMac( const QString& );
+        QString mac()const;
+        void setName( const QString& );
+        QString name()const;
+        void setType( const QString& );
+        QString type()const;
     private:
         QString m_name;
         QString m_mac;
         QString m_type;
 
     };
 };
 
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 0b90e87..5f74fee 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -11,21 +11,21 @@ namespace OpieTooth {
     HciConfWrapper::HciConfWrapper( const QString &fileName) {
         m_fileName = fileName;
     }
 
     HciConfWrapper::~HciConfWrapper() {
     }
 
 
-    void HciConfWrapper::setPinHelper( QString app  ) {
+    void HciConfWrapper::setPinHelper( const QString& app  ) {
         setValue( "pin_helper"  , app  );
     }
 
-    void HciConfWrapper::setName( QString name ) {
+    void HciConfWrapper::setName( const QString &name ) {
         qDebug ("NAME : " + name);
         setValue( "name" , "\"" +  name + "\"" );
     }
 
     void HciConfWrapper::setIscan( bool enable) {
 
         if ( enable ) {
             setValue( "iscan" , "enable" );
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.h b/noncore/net/opietooth/manager/hciconfwrapper.h
index 10738c0..de8c9a8 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.h
+++ b/noncore/net/opietooth/manager/hciconfwrapper.h
@@ -6,18 +6,18 @@
 namespace OpieTooth {
 
     class HciConfWrapper {
 
     public:
         HciConfWrapper( const QString &fileName );
         ~HciConfWrapper();
 
-        void setPinHelper( QString app  );
-        void setName( QString name );
+        void setPinHelper( const QString& app  );
+        void setName( const QString& name );
         void setIscan( bool enable );
         void setPscan( bool enable );
         void setAuth( bool enable);
         void setEncrypt( bool enable);
 
     private:
 
         void setValue(const QString &entry, const  QString &value );
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp
index d60ef1c..a86e36d 100644
--- a/noncore/net/opietooth/manager/main.cpp
+++ b/noncore/net/opietooth/manager/main.cpp
@@ -22,17 +22,17 @@
 
 
 QPEApplication *BluetoothApp;
 
 int main( int argc, char ** argv ) {
     QPEApplication a(argc, argv);
     BluetoothApp=&a;
 
-    OpieTooth::BlueBase *t = new OpieTooth::BlueBase();
+    OpieTooth::BlueBase t;
 
     // t.setCaption( OpieTooth::BlueBase::tr("Bluetooth Manager") );
-    a.showMainWidget(t);
+    a.showMainWidget(&t);
 
     return a.exec();
 }
 
 
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 0e6e93b..3d6c928 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -153,29 +153,27 @@ namespace OpieTooth {
  */
     void ScanDialog::emitToManager() {
         qDebug("vor liste durchsuchen");
 
         if (!ListView1) {
             return;
         }
 
-        QList<RemoteDevice> *deviceList = new QList<RemoteDevice>;
-        deviceList->setAutoDelete(true);
+        QValueList<RemoteDevice> deviceList;
 
         QListViewItemIterator it( ListView1 );
         for ( ; it.current(); ++it ) {
             if ( ((QCheckListItem*)it.current())->isOn() ) {
-                RemoteDevice * device = new RemoteDevice(  it.current()->text(1), it.current()->text(0));
-                deviceList->append( device );
+                RemoteDevice device(  it.current()->text(1), it.current()->text(0));
+                deviceList.append( device );
             }
         }
         qDebug("vor emit");
-        emit selectedDevices( *deviceList );
-        delete deviceList;
+        emit selectedDevices( deviceList );
     }
 
 /*
  * Cleanup
  */
     ScanDialog::~ScanDialog() {
         delete localDevice;
     }
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index 7c84ce2..cc890f3 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -65,15 +65,15 @@ public slots:
         void fillList(const QString& device, RemoteDevice::ValueList list);
 
     private:
         void emitToManager();
         Manager *localDevice;
         int progressStat;
 
     signals:
-        void selectedDevices(QList<RemoteDevice>&);
+        void selectedDevices(QValueList<RemoteDevice>&);
     };
 
 
 }
 
 #endif // SCANDIALOG_H