summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -69,7 +69,7 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
// 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) ) );
@@ -86,4 +86,4 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
// 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);
@@ -107,3 +107,3 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
- ListView2->setRootIsDecorated(true);
+ devicesView->setRootIsDecorated(true);
@@ -191,3 +191,3 @@ void BlueBase::writeSavedDevices()
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
@@ -291,3 +291,3 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
- deviceItem = new BTDeviceItem( ListView2 , (*it) );
+ deviceItem = new BTDeviceItem( devicesView , (*it) );
deviceItem->setPixmap( 1, m_findPix );
@@ -489,3 +489,3 @@ void BlueBase::addSignalStrength()
- QListViewItemIterator it( ListView4 );
+ QListViewItemIterator it( connectionsView );
for ( ; it.current(); ++it )
@@ -501,3 +501,3 @@ void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
- QListViewItemIterator it( ListView4 );
+ QListViewItemIterator it( connectionsView );
for ( ; it.current(); ++it )
@@ -536,3 +536,3 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
bool found = false;
@@ -548,3 +548,3 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
{
- connectionItem = new BTConnectionItem( ListView4, (*it) );
+ connectionItem = new BTConnectionItem( connectionsView, (*it) );
@@ -558,3 +558,3 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
for ( ; it2.current(); ++it2 )
@@ -581,6 +581,6 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
{
- ListView4->clear();
+ connectionsView->clear();
ConnectionState con;
con.setMac( tr("No connections found") );
- connectionItem = new BTConnectionItem( ListView4 , con );
+ connectionItem = new BTConnectionItem( connectionsView , con );
}
@@ -675,3 +675,3 @@ bool BlueBase::find( const RemoteDevice& rem )
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>297</width>
+ <width>293</width>
<height>382</height>
@@ -99,3 +99,3 @@
<name>name</name>
- <cstring>ListView2</cstring>
+ <cstring>devicesView</cstring>
</property>
@@ -187,3 +187,3 @@
<name>name</name>
- <cstring>ListView4</cstring>
+ <cstring>connectionsView</cstring>
</property>
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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>275</width>
+ <width>267</width>
<height>323</height>
@@ -71,3 +71,3 @@
<name>name</name>
- <cstring>PushButton5</cstring>
+ <cstring>applyChanges</cstring>
</property>
@@ -110,3 +110,3 @@
<name>name</name>
- <cstring>ListView1</cstring>
+ <cstring>serviceView</cstring>
</property>
@@ -149,3 +149,3 @@
<name>name</name>
- <cstring>LineEdit6</cstring>
+ <cstring>defaultPinCode</cstring>
</property>
@@ -156,3 +156,3 @@
<name>name</name>
- <cstring>LineEdit1</cstring>
+ <cstring>deviceName</cstring>
</property>
@@ -216,3 +216,3 @@
<name>name</name>
- <cstring>DeviceInfoLabel</cstring>
+ <cstring>deviceInfoLabel</cstring>
</property>
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
@@ -58,9 +58,9 @@ namespace OpieTooth {
- 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 );
@@ -104,3 +104,3 @@ namespace OpieTooth {
// empty list before a new scan
- ListView1->clear();
+ serviceView->clear();
@@ -127,3 +127,3 @@ namespace OpieTooth {
- deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox );
+ deviceItem = new QCheckListItem( serviceView, (*it).name(), QCheckListItem::CheckBox );
deviceItem->setText( 1, (*it).mac() );
@@ -140,3 +140,3 @@ namespace OpieTooth {
- if (!ListView1) {
+ if (!serviceView) {
return;
@@ -146,3 +146,3 @@ namespace OpieTooth {
- QListViewItemIterator it( ListView1 );
+ QListViewItemIterator it( serviceView );
for ( ; it.current(); ++it ) {
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
@@ -48,3 +48,3 @@ class Device;
QPushButton* StartStopButton;
- QListView* ListView1;
+ QListView* serviceView;