5 files changed, 35 insertions, 35 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 90e44cb..7954cc3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -66,13 +66,13 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
     connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
 
     connect( rfcommBindButton,  SIGNAL( clicked() ),  this,  SLOT( rfcommDialog() ) );
     // not good since lib is async
-    //       connect( ListView2, SIGNAL( expanded(QListViewItem*) ),
+    //       connect( devicesView, SIGNAL( expanded(QListViewItem*) ),
     //                  this, SLOT( addServicesToDevice(QListViewItem*) ) );
-    connect( ListView2, SIGNAL( clicked(QListViewItem*)),
+    connect( devicesView, SIGNAL( clicked(QListViewItem*)),
              this, SLOT( startServiceActionClicked(QListViewItem*) ) );
-    connect( ListView2, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
+    connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
              this,  SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) );
     connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ),
              this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) );
     connect( m_localDevice, SIGNAL( available(const QString&,bool) ),
@@ -83,10 +83,10 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
              this, SLOT( addSignalStrength(const QString&,const QString&) ) );
 
 
     // let hold be rightButtonClicked()
-    QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
-    QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
+    QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold);
+    QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold);
 
     //Load all icons needed
     m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
     m_onPix = Resource::loadPixmap( "opietooth/connected" );
@@ -104,9 +104,9 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
 
     readConfig();
     initGui();
 
-    ListView2->setRootIsDecorated(true);
+    devicesView->setRootIsDecorated(true);
 
 
     writeToHciConfig();
     // search conncetions
@@ -188,9 +188,9 @@ void BlueBase::readSavedDevices()
  * Write the list of allready known devices
  */
 void BlueBase::writeSavedDevices()
 {
-    QListViewItemIterator it( ListView2 );
+    QListViewItemIterator it( devicesView );
     BTListItem* item;
     BTDeviceItem* device;
     RemoteDevice::ValueList list;
     for ( ; it.current(); ++it )
@@ -288,9 +288,9 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
 
         if (find( (*it)  )) // is already inserted
             continue;
 
-        deviceItem = new BTDeviceItem( ListView2 , (*it) );
+        deviceItem = new BTDeviceItem( devicesView , (*it) );
         deviceItem->setPixmap( 1, m_findPix );
         deviceItem->setExpandable ( true );
 
         // look if device is avail. atm, async
@@ -486,9 +486,9 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
 
 void BlueBase::addSignalStrength()
 {
 
-    QListViewItemIterator it( ListView4 );
+    QListViewItemIterator it( connectionsView );
     for ( ; it.current(); ++it )
     {
         m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
     }
@@ -498,9 +498,9 @@ void BlueBase::addSignalStrength()
 
 void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
 {
 
-    QListViewItemIterator it( ListView4 );
+    QListViewItemIterator it( connectionsView );
     for ( ; it.current(); ++it )
     {
         if( ((BTConnectionItem*)it.current())->connection().mac() == mac )
         {
@@ -533,9 +533,9 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
 
         for (it = connectionList.begin(); it != connectionList.end(); ++it)
         {
 
-            QListViewItemIterator it2( ListView4 );
+            QListViewItemIterator it2( connectionsView );
             bool found = false;
             for ( ; it2.current(); ++it2 )
             {
                 if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() )
@@ -545,9 +545,9 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
             }
 
             if ( found == false )
             {
-                connectionItem = new BTConnectionItem( ListView4, (*it) );
+                connectionItem = new BTConnectionItem( connectionsView, (*it) );
 
                 if( m_deviceList.find((*it).mac()).data() )
                 {
                     connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
@@ -555,9 +555,9 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
             }
 
         }
 
-        QListViewItemIterator it2( ListView4 );
+        QListViewItemIterator it2( connectionsView );
         for ( ; it2.current(); ++it2 )
         {
             bool found = false;
             for (it = connectionList.begin(); it != connectionList.end(); ++it)
@@ -578,12 +578,12 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
 
     }
     else
     {
-        ListView4->clear();
+        connectionsView->clear();
         ConnectionState con;
         con.setMac( tr("No connections found") );
-        connectionItem = new BTConnectionItem( ListView4 , con );
+        connectionItem = new BTConnectionItem( connectionsView , con );
     }
 
     //  recall connection search after some time
     QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
@@ -672,9 +672,9 @@ BlueBase::~BlueBase()
  * @return returns true if found
  */
 bool BlueBase::find( const RemoteDevice& rem )
 {
-    QListViewItemIterator it( ListView2 );
+    QListViewItemIterator it( devicesView );
     BTListItem* item;
     BTDeviceItem* device;
     for (; it.current(); ++it )
     {
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 2d14b8f..cbde3c6 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -10,9 +10,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>297</width>
+            <width>293</width>
             <height>382</height>
         </rect>
     </property>
     <property stdset="1">
@@ -96,9 +96,9 @@
                             </property>
                         </column>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>ListView2</cstring>
+                            <cstring>devicesView</cstring>
                         </property>
                     </widget>
                     <widget>
                         <class>QPushButton</class>
@@ -184,9 +184,9 @@
                             </property>
                         </column>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>ListView4</cstring>
+                            <cstring>connectionsView</cstring>
                         </property>
                     </widget>
                 </vbox>
             </widget>
diff --git a/noncore/net/opietooth/manager/devicedialog.ui b/noncore/net/opietooth/manager/devicedialog.ui
index 2ecfd4c..f5cd9ab 100644
--- a/noncore/net/opietooth/manager/devicedialog.ui
+++ b/noncore/net/opietooth/manager/devicedialog.ui
@@ -10,9 +10,9 @@
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>275</width>
+            <width>267</width>
             <height>323</height>
         </rect>
     </property>
     <property stdset="1">
@@ -68,9 +68,9 @@
                     <widget row="1"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>PushButton5</cstring>
+                            <cstring>applyChanges</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&amp;Apply Changes</string>
@@ -107,9 +107,9 @@
                             </property>
                         </column>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>ListView1</cstring>
+                            <cstring>serviceView</cstring>
                         </property>
                     </widget>
                 </grid>
             </widget>
@@ -146,16 +146,16 @@
                     <widget row="1"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>LineEdit6</cstring>
+                            <cstring>defaultPinCode</cstring>
                         </property>
                     </widget>
                     <widget row="0"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>LineEdit1</cstring>
+                            <cstring>deviceName</cstring>
                         </property>
                     </widget>
                     <widget row="0"  column="0" >
                         <class>QLabel</class>
@@ -213,9 +213,9 @@
                     <widget row="0"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>DeviceInfoLabel</cstring>
+                            <cstring>deviceInfoLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>TextLabel9</string>
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index bccc6c2..160e8dd 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -55,15 +55,15 @@ namespace OpieTooth {
 
         StartStopButton = new QPushButton( this, "StartButton" );
         StartStopButton->setText( tr( "Start scan" ) );
 
-        ListView1 = new QListView( this, "ListView1" );
+        serviceView = new QListView( this, "serviceView" );
 
-        //ListView1->addColumn( tr( "Add" ) );
-        ListView1->addColumn( tr( "Add Device" ) );
-        //ListView1->addColumn( tr( "Type" ) );
+        //serviceView->addColumn( tr( "Add" ) );
+        serviceView->addColumn( tr( "Add Device" ) );
+        //serviceView->addColumn( tr( "Type" ) );
 
-        Layout11->addWidget( ListView1 );
+        Layout11->addWidget( serviceView );
         Layout11->addWidget( progress );
         Layout11->addWidget( StartStopButton );
 
         localDevice = new Manager( "hci0" );
@@ -101,9 +101,9 @@ namespace OpieTooth {
         progress->setProgress(0);
         progressStat = 0;
 
         // empty list before a new scan
-        ListView1->clear();
+        serviceView->clear();
 
         progressTimer();
         // when finished, it emmite foundDevices()
         // checken ob initialisiert , qcop ans applet.
@@ -124,9 +124,9 @@ namespace OpieTooth {
 
         RemoteDevice::ValueList::Iterator it;
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
 
-            deviceItem = new QCheckListItem( ListView1, (*it).name(),  QCheckListItem::CheckBox );
+            deviceItem = new QCheckListItem( serviceView, (*it).name(),  QCheckListItem::CheckBox );
             deviceItem->setText( 1, (*it).mac() );
         }
         m_search = false;
         StartStopButton->setText( tr( "Start scan" ) );
@@ -137,15 +137,15 @@ namespace OpieTooth {
  * Then it emits it, so the manager can connect to the signal to fill the listing.
  */
     void ScanDialog::emitToManager() {
 
-        if (!ListView1) {
+        if (!serviceView) {
             return;
         }
 
         QValueList<RemoteDevice> deviceList;
 
-        QListViewItemIterator it( ListView1 );
+        QListViewItemIterator it( serviceView );
         for ( ; it.current(); ++it ) {
             if ( ( (QCheckListItem*)it.current() )->isOn() ) {
                 RemoteDevice device(  it.current()->text(1), it.current()->text(0) );
                 deviceList.append( device );
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index a644e96..2b04964 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -45,9 +45,9 @@ class Device;
 
     private: 
         QProgressBar* progress;
         QPushButton* StartStopButton;
-        QListView* ListView1;
+        QListView* serviceView;
 
     public slots:
          void accept();