summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-09 13:33:21 (UTC)
committer mickeyl <mickeyl>2005-07-09 13:33:21 (UTC)
commit7bccb3143fbfb4dd70cc22d5233e6275245d0285 (patch) (unidiff)
tree34972468579899cbe3eff62f669217b6fbec112d
parentdf81736967930c523b3c1be163f830e9120b7b27 (diff)
downloadopie-7bccb3143fbfb4dd70cc22d5233e6275245d0285.zip
opie-7bccb3143fbfb4dd70cc22d5233e6275245d0285.tar.gz
opie-7bccb3143fbfb4dd70cc22d5233e6275245d0285.tar.bz2
change the default generated names of Qt Designer to something meaningful
~lart Harlekin for being unbelievable lazy :/ ~lart all other Opie developers for not correcting this when they spotted it...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp32
-rw-r--r--noncore/net/opietooth/manager/bluetoothbase.ui6
-rw-r--r--noncore/net/opietooth/manager/devicedialog.ui12
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp18
-rw-r--r--noncore/net/opietooth/manager/scandialog.h2
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
@@ -64,31 +64,31 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
64 64
65 connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); 65 connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
66 connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); 66 connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
67 67
68 connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) ); 68 connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) );
69 // not good since lib is async 69 // not good since lib is async
70 // connect( ListView2, SIGNAL( expanded(QListViewItem*) ), 70 // connect( devicesView, SIGNAL( expanded(QListViewItem*) ),
71 // this, SLOT( addServicesToDevice(QListViewItem*) ) ); 71 // this, SLOT( addServicesToDevice(QListViewItem*) ) );
72 connect( ListView2, SIGNAL( clicked(QListViewItem*)), 72 connect( devicesView, SIGNAL( clicked(QListViewItem*)),
73 this, SLOT( startServiceActionClicked(QListViewItem*) ) ); 73 this, SLOT( startServiceActionClicked(QListViewItem*) ) );
74 connect( ListView2, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ), 74 connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
75 this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) ); 75 this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) );
76 connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ), 76 connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ),
77 this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) ); 77 this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) );
78 connect( m_localDevice, SIGNAL( available(const QString&,bool) ), 78 connect( m_localDevice, SIGNAL( available(const QString&,bool) ),
79 this, SLOT( deviceActive(const QString&,bool) ) ); 79 this, SLOT( deviceActive(const QString&,bool) ) );
80 connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ), 80 connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ),
81 this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) ); 81 this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) );
82 connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ), 82 connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ),
83 this, SLOT( addSignalStrength(const QString&,const QString&) ) ); 83 this, SLOT( addSignalStrength(const QString&,const QString&) ) );
84 84
85 85
86 // let hold be rightButtonClicked() 86 // let hold be rightButtonClicked()
87 QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold); 87 QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold);
88 QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold); 88 QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold);
89 89
90 //Load all icons needed 90 //Load all icons needed
91 m_offPix = Resource::loadPixmap( "opietooth/notconnected" ); 91 m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
92 m_onPix = Resource::loadPixmap( "opietooth/connected" ); 92 m_onPix = Resource::loadPixmap( "opietooth/connected" );
93 m_findPix = Resource::loadPixmap( "opietooth/find" ); 93 m_findPix = Resource::loadPixmap( "opietooth/find" );
94 94
@@ -102,13 +102,13 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
102 102
103 setCaption( tr( "Bluetooth Manager" ) ); 103 setCaption( tr( "Bluetooth Manager" ) );
104 104
105 readConfig(); 105 readConfig();
106 initGui(); 106 initGui();
107 107
108 ListView2->setRootIsDecorated(true); 108 devicesView->setRootIsDecorated(true);
109 109
110 110
111 writeToHciConfig(); 111 writeToHciConfig();
112 // search conncetions 112 // search conncetions
113 addConnectedDevices(); 113 addConnectedDevices();
114 addSignalStrength(); 114 addSignalStrength();
@@ -186,13 +186,13 @@ void BlueBase::readSavedDevices()
186 186
187/** 187/**
188 * Write the list of allready known devices 188 * Write the list of allready known devices
189 */ 189 */
190void BlueBase::writeSavedDevices() 190void BlueBase::writeSavedDevices()
191{ 191{
192 QListViewItemIterator it( ListView2 ); 192 QListViewItemIterator it( devicesView );
193 BTListItem* item; 193 BTListItem* item;
194 BTDeviceItem* device; 194 BTDeviceItem* device;
195 RemoteDevice::ValueList list; 195 RemoteDevice::ValueList list;
196 for ( ; it.current(); ++it ) 196 for ( ; it.current(); ++it )
197 { 197 {
198 item = (BTListItem*)it.current(); 198 item = (BTListItem*)it.current();
@@ -286,13 +286,13 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
286 for( it = newDevices.begin(); it != newDevices.end() ; ++it ) 286 for( it = newDevices.begin(); it != newDevices.end() ; ++it )
287 { 287 {
288 288
289 if (find( (*it) )) // is already inserted 289 if (find( (*it) )) // is already inserted
290 continue; 290 continue;
291 291
292 deviceItem = new BTDeviceItem( ListView2 , (*it) ); 292 deviceItem = new BTDeviceItem( devicesView , (*it) );
293 deviceItem->setPixmap( 1, m_findPix ); 293 deviceItem->setPixmap( 1, m_findPix );
294 deviceItem->setExpandable ( true ); 294 deviceItem->setExpandable ( true );
295 295
296 // look if device is avail. atm, async 296 // look if device is avail. atm, async
297 deviceActive( (*it) ); 297 deviceActive( (*it) );
298 298
@@ -484,25 +484,25 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
484 484
485 485
486 486
487void BlueBase::addSignalStrength() 487void BlueBase::addSignalStrength()
488{ 488{
489 489
490 QListViewItemIterator it( ListView4 ); 490 QListViewItemIterator it( connectionsView );
491 for ( ; it.current(); ++it ) 491 for ( ; it.current(); ++it )
492 { 492 {
493 m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() ); 493 m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
494 } 494 }
495 495
496 QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) ); 496 QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
497} 497}
498 498
499void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) 499void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
500{ 500{
501 501
502 QListViewItemIterator it( ListView4 ); 502 QListViewItemIterator it( connectionsView );
503 for ( ; it.current(); ++it ) 503 for ( ; it.current(); ++it )
504 { 504 {
505 if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) 505 if( ((BTConnectionItem*)it.current())->connection().mac() == mac )
506 { 506 {
507 ((BTConnectionItem*)it.current() )->setSignalStrength( strength ); 507 ((BTConnectionItem*)it.current() )->setSignalStrength( strength );
508 } 508 }
@@ -531,35 +531,35 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
531 if ( !connectionList.isEmpty() ) 531 if ( !connectionList.isEmpty() )
532 { 532 {
533 533
534 for (it = connectionList.begin(); it != connectionList.end(); ++it) 534 for (it = connectionList.begin(); it != connectionList.end(); ++it)
535 { 535 {
536 536
537 QListViewItemIterator it2( ListView4 ); 537 QListViewItemIterator it2( connectionsView );
538 bool found = false; 538 bool found = false;
539 for ( ; it2.current(); ++it2 ) 539 for ( ; it2.current(); ++it2 )
540 { 540 {
541 if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) 541 if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() )
542 { 542 {
543 found = true; 543 found = true;
544 } 544 }
545 } 545 }
546 546
547 if ( found == false ) 547 if ( found == false )
548 { 548 {
549 connectionItem = new BTConnectionItem( ListView4, (*it) ); 549 connectionItem = new BTConnectionItem( connectionsView, (*it) );
550 550
551 if( m_deviceList.find((*it).mac()).data() ) 551 if( m_deviceList.find((*it).mac()).data() )
552 { 552 {
553 connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() ); 553 connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
554 } 554 }
555 } 555 }
556 556
557 } 557 }
558 558
559 QListViewItemIterator it2( ListView4 ); 559 QListViewItemIterator it2( connectionsView );
560 for ( ; it2.current(); ++it2 ) 560 for ( ; it2.current(); ++it2 )
561 { 561 {
562 bool found = false; 562 bool found = false;
563 for (it = connectionList.begin(); it != connectionList.end(); ++it) 563 for (it = connectionList.begin(); it != connectionList.end(); ++it)
564 { 564 {
565 if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) 565 if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() )
@@ -576,16 +576,16 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
576 } 576 }
577 577
578 578
579 } 579 }
580 else 580 else
581 { 581 {
582 ListView4->clear(); 582 connectionsView->clear();
583 ConnectionState con; 583 ConnectionState con;
584 con.setMac( tr("No connections found") ); 584 con.setMac( tr("No connections found") );
585 connectionItem = new BTConnectionItem( ListView4 , con ); 585 connectionItem = new BTConnectionItem( connectionsView , con );
586 } 586 }
587 587
588 // recall connection search after some time 588 // recall connection search after some time
589 QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) ); 589 QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
590} 590}
591 591
@@ -670,13 +670,13 @@ BlueBase::~BlueBase()
670 * the same Device if found return true else false 670 * the same Device if found return true else false
671 * @param dev RemoteDevice to find 671 * @param dev RemoteDevice to find
672 * @return returns true if found 672 * @return returns true if found
673 */ 673 */
674bool BlueBase::find( const RemoteDevice& rem ) 674bool BlueBase::find( const RemoteDevice& rem )
675{ 675{
676 QListViewItemIterator it( ListView2 ); 676 QListViewItemIterator it( devicesView );
677 BTListItem* item; 677 BTListItem* item;
678 BTDeviceItem* device; 678 BTDeviceItem* device;
679 for (; it.current(); ++it ) 679 for (; it.current(); ++it )
680 { 680 {
681 item = (BTListItem*) it.current(); 681 item = (BTListItem*) it.current();
682 if ( item->typeId() != BTListItem::Device ) 682 if ( item->typeId() != BTListItem::Device )
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
@@ -8,13 +8,13 @@
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>297</width> 14 <width>293</width>
15 <height>382</height> 15 <height>382</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form1</string> 20 <string>Form1</string>
@@ -94,13 +94,13 @@
94 <name>resizeable</name> 94 <name>resizeable</name>
95 <bool>true</bool> 95 <bool>true</bool>
96 </property> 96 </property>
97 </column> 97 </column>
98 <property stdset="1"> 98 <property stdset="1">
99 <name>name</name> 99 <name>name</name>
100 <cstring>ListView2</cstring> 100 <cstring>devicesView</cstring>
101 </property> 101 </property>
102 </widget> 102 </widget>
103 <widget> 103 <widget>
104 <class>QPushButton</class> 104 <class>QPushButton</class>
105 <property stdset="1"> 105 <property stdset="1">
106 <name>name</name> 106 <name>name</name>
@@ -182,13 +182,13 @@
182 <name>resizeable</name> 182 <name>resizeable</name>
183 <bool>true</bool> 183 <bool>true</bool>
184 </property> 184 </property>
185 </column> 185 </column>
186 <property stdset="1"> 186 <property stdset="1">
187 <name>name</name> 187 <name>name</name>
188 <cstring>ListView4</cstring> 188 <cstring>connectionsView</cstring>
189 </property> 189 </property>
190 </widget> 190 </widget>
191 </vbox> 191 </vbox>
192 </widget> 192 </widget>
193 <widget> 193 <widget>
194 <class>QWidget</class> 194 <class>QWidget</class>
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
@@ -8,13 +8,13 @@
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>275</width> 14 <width>267</width>
15 <height>323</height> 15 <height>323</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form2</string> 20 <string>Form2</string>
@@ -66,13 +66,13 @@
66 <number>3</number> 66 <number>3</number>
67 </property> 67 </property>
68 <widget row="1" column="0" > 68 <widget row="1" column="0" >
69 <class>QPushButton</class> 69 <class>QPushButton</class>
70 <property stdset="1"> 70 <property stdset="1">
71 <name>name</name> 71 <name>name</name>
72 <cstring>PushButton5</cstring> 72 <cstring>applyChanges</cstring>
73 </property> 73 </property>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>text</name> 75 <name>text</name>
76 <string>&amp;Apply Changes</string> 76 <string>&amp;Apply Changes</string>
77 </property> 77 </property>
78 </widget> 78 </widget>
@@ -105,13 +105,13 @@
105 <name>resizeable</name> 105 <name>resizeable</name>
106 <bool>true</bool> 106 <bool>true</bool>
107 </property> 107 </property>
108 </column> 108 </column>
109 <property stdset="1"> 109 <property stdset="1">
110 <name>name</name> 110 <name>name</name>
111 <cstring>ListView1</cstring> 111 <cstring>serviceView</cstring>
112 </property> 112 </property>
113 </widget> 113 </widget>
114 </grid> 114 </grid>
115 </widget> 115 </widget>
116 <widget> 116 <widget>
117 <class>QWidget</class> 117 <class>QWidget</class>
@@ -144,20 +144,20 @@
144 </property> 144 </property>
145 </widget> 145 </widget>
146 <widget row="1" column="1" > 146 <widget row="1" column="1" >
147 <class>QLineEdit</class> 147 <class>QLineEdit</class>
148 <property stdset="1"> 148 <property stdset="1">
149 <name>name</name> 149 <name>name</name>
150 <cstring>LineEdit6</cstring> 150 <cstring>defaultPinCode</cstring>
151 </property> 151 </property>
152 </widget> 152 </widget>
153 <widget row="0" column="1" > 153 <widget row="0" column="1" >
154 <class>QLineEdit</class> 154 <class>QLineEdit</class>
155 <property stdset="1"> 155 <property stdset="1">
156 <name>name</name> 156 <name>name</name>
157 <cstring>LineEdit1</cstring> 157 <cstring>deviceName</cstring>
158 </property> 158 </property>
159 </widget> 159 </widget>
160 <widget row="0" column="0" > 160 <widget row="0" column="0" >
161 <class>QLabel</class> 161 <class>QLabel</class>
162 <property stdset="1"> 162 <property stdset="1">
163 <name>name</name> 163 <name>name</name>
@@ -211,13 +211,13 @@
211 <number>2</number> 211 <number>2</number>
212 </property> 212 </property>
213 <widget row="0" column="0" > 213 <widget row="0" column="0" >
214 <class>QLabel</class> 214 <class>QLabel</class>
215 <property stdset="1"> 215 <property stdset="1">
216 <name>name</name> 216 <name>name</name>
217 <cstring>DeviceInfoLabel</cstring> 217 <cstring>deviceInfoLabel</cstring>
218 </property> 218 </property>
219 <property stdset="1"> 219 <property stdset="1">
220 <name>text</name> 220 <name>text</name>
221 <string>TextLabel9</string> 221 <string>TextLabel9</string>
222 </property> 222 </property>
223 </widget> 223 </widget>
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
@@ -53,19 +53,19 @@ namespace OpieTooth {
53 progress = new QProgressBar( this, "progbar"); 53 progress = new QProgressBar( this, "progbar");
54 progress->setTotalSteps(20); 54 progress->setTotalSteps(20);
55 55
56 StartStopButton = new QPushButton( this, "StartButton" ); 56 StartStopButton = new QPushButton( this, "StartButton" );
57 StartStopButton->setText( tr( "Start scan" ) ); 57 StartStopButton->setText( tr( "Start scan" ) );
58 58
59 ListView1 = new QListView( this, "ListView1" ); 59 serviceView = new QListView( this, "serviceView" );
60 60
61 //ListView1->addColumn( tr( "Add" ) ); 61 //serviceView->addColumn( tr( "Add" ) );
62 ListView1->addColumn( tr( "Add Device" ) ); 62 serviceView->addColumn( tr( "Add Device" ) );
63 //ListView1->addColumn( tr( "Type" ) ); 63 //serviceView->addColumn( tr( "Type" ) );
64 64
65 Layout11->addWidget( ListView1 ); 65 Layout11->addWidget( serviceView );
66 Layout11->addWidget( progress ); 66 Layout11->addWidget( progress );
67 Layout11->addWidget( StartStopButton ); 67 Layout11->addWidget( StartStopButton );
68 68
69 localDevice = new Manager( "hci0" ); 69 localDevice = new Manager( "hci0" );
70 70
71 connect( StartStopButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); 71 connect( StartStopButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
@@ -99,13 +99,13 @@ namespace OpieTooth {
99 } 99 }
100 m_search = true; 100 m_search = true;
101 progress->setProgress(0); 101 progress->setProgress(0);
102 progressStat = 0; 102 progressStat = 0;
103 103
104 // empty list before a new scan 104 // empty list before a new scan
105 ListView1->clear(); 105 serviceView->clear();
106 106
107 progressTimer(); 107 progressTimer();
108 // when finished, it emmite foundDevices() 108 // when finished, it emmite foundDevices()
109 // checken ob initialisiert , qcop ans applet. 109 // checken ob initialisiert , qcop ans applet.
110 StartStopButton->setText( tr( "Stop scan" ) ); 110 StartStopButton->setText( tr( "Stop scan" ) );
111 111
@@ -122,32 +122,32 @@ namespace OpieTooth {
122 progressStat = 0; 122 progressStat = 0;
123 QCheckListItem * deviceItem; 123 QCheckListItem * deviceItem;
124 124
125 RemoteDevice::ValueList::Iterator it; 125 RemoteDevice::ValueList::Iterator it;
126 for( it = deviceList.begin(); it != deviceList.end(); ++it ) { 126 for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
127 127
128 deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox ); 128 deviceItem = new QCheckListItem( serviceView, (*it).name(), QCheckListItem::CheckBox );
129 deviceItem->setText( 1, (*it).mac() ); 129 deviceItem->setText( 1, (*it).mac() );
130 } 130 }
131 m_search = false; 131 m_search = false;
132 StartStopButton->setText( tr( "Start scan" ) ); 132 StartStopButton->setText( tr( "Start scan" ) );
133 } 133 }
134 134
135/** 135/**
136 * Iterates trough the items, and collects the checked items. 136 * Iterates trough the items, and collects the checked items.
137 * Then it emits it, so the manager can connect to the signal to fill the listing. 137 * Then it emits it, so the manager can connect to the signal to fill the listing.
138 */ 138 */
139 void ScanDialog::emitToManager() { 139 void ScanDialog::emitToManager() {
140 140
141 if (!ListView1) { 141 if (!serviceView) {
142 return; 142 return;
143 } 143 }
144 144
145 QValueList<RemoteDevice> deviceList; 145 QValueList<RemoteDevice> deviceList;
146 146
147 QListViewItemIterator it( ListView1 ); 147 QListViewItemIterator it( serviceView );
148 for ( ; it.current(); ++it ) { 148 for ( ; it.current(); ++it ) {
149 if ( ( (QCheckListItem*)it.current() )->isOn() ) { 149 if ( ( (QCheckListItem*)it.current() )->isOn() ) {
150 RemoteDevice device( it.current()->text(1), it.current()->text(0) ); 150 RemoteDevice device( it.current()->text(1), it.current()->text(0) );
151 deviceList.append( device ); 151 deviceList.append( device );
152 } 152 }
153 } 153 }
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
@@ -43,13 +43,13 @@ class Device;
43 ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 43 ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
44 ~ScanDialog(); 44 ~ScanDialog();
45 45
46 private: 46 private:
47 QProgressBar* progress; 47 QProgressBar* progress;
48 QPushButton* StartStopButton; 48 QPushButton* StartStopButton;
49 QListView* ListView1; 49 QListView* serviceView;
50 50
51 public slots: 51 public slots:
52 void accept(); 52 void accept();
53 53
54 protected: 54 protected:
55 QVBoxLayout* Layout11; 55 QVBoxLayout* Layout11;