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
@@ -67,11 +67,11 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
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) ) );
@@ -84,8 +84,8 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
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" );
@@ -105,7 +105,7 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
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();
@@ -189,7 +189,7 @@ void BlueBase::readSavedDevices()
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;
@@ -289,7 +289,7 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
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
@@ -487,7 +487,7 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
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() );
@@ -499,7 +499,7 @@ void BlueBase::addSignalStrength()
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 )
@@ -534,7 +534,7 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
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 {
@@ -546,7 +546,7 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
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 {
@@ -556,7 +556,7 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
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;
@@ -579,10 +579,10 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
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
@@ -673,7 +673,7 @@ BlueBase::~BlueBase()
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 )
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
@@ -11,7 +11,7 @@
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>
@@ -97,7 +97,7 @@
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>
@@ -185,7 +185,7 @@
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>
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
@@ -11,7 +11,7 @@
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>
@@ -69,7 +69,7 @@
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>
@@ -108,7 +108,7 @@
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>
@@ -147,14 +147,14 @@
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" >
@@ -214,7 +214,7 @@
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>
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
@@ -56,13 +56,13 @@ namespace OpieTooth {
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
@@ -102,7 +102,7 @@ namespace OpieTooth {
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()
@@ -125,7 +125,7 @@ namespace OpieTooth {
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;
@@ -138,13 +138,13 @@ namespace OpieTooth {
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) );
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
@@ -46,7 +46,7 @@ class Device;
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();