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
@@ -68,9 +68,9 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
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) ),
@@ -85,6 +85,6 @@ 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);
//Load all icons needed
@@ -106,5 +106,5 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
initGui();
- ListView2->setRootIsDecorated(true);
+ devicesView->setRootIsDecorated(true);
@@ -190,5 +190,5 @@ void BlueBase::readSavedDevices()
void BlueBase::writeSavedDevices()
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
BTDeviceItem* device;
@@ -290,5 +290,5 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
continue;
- deviceItem = new BTDeviceItem( ListView2 , (*it) );
+ deviceItem = new BTDeviceItem( devicesView , (*it) );
deviceItem->setPixmap( 1, m_findPix );
deviceItem->setExpandable ( true );
@@ -488,5 +488,5 @@ void BlueBase::addSignalStrength()
{
- QListViewItemIterator it( ListView4 );
+ QListViewItemIterator it( connectionsView );
for ( ; it.current(); ++it )
{
@@ -500,5 +500,5 @@ void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
{
- QListViewItemIterator it( ListView4 );
+ QListViewItemIterator it( connectionsView );
for ( ; it.current(); ++it )
{
@@ -535,5 +535,5 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
{
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
bool found = false;
for ( ; it2.current(); ++it2 )
@@ -547,5 +547,5 @@ 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() )
@@ -557,5 +557,5 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
}
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
for ( ; it2.current(); ++it2 )
{
@@ -580,8 +580,8 @@ 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 );
}
@@ -674,5 +674,5 @@ BlueBase::~BlueBase()
bool BlueBase::find( const RemoteDevice& rem )
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
BTDeviceItem* 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
@@ -12,5 +12,5 @@
<x>0</x>
<y>0</y>
- <width>297</width>
+ <width>293</width>
<height>382</height>
</rect>
@@ -98,5 +98,5 @@
<property stdset="1">
<name>name</name>
- <cstring>ListView2</cstring>
+ <cstring>devicesView</cstring>
</property>
</widget>
@@ -186,5 +186,5 @@
<property stdset="1">
<name>name</name>
- <cstring>ListView4</cstring>
+ <cstring>connectionsView</cstring>
</property>
</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
@@ -12,5 +12,5 @@
<x>0</x>
<y>0</y>
- <width>275</width>
+ <width>267</width>
<height>323</height>
</rect>
@@ -70,5 +70,5 @@
<property stdset="1">
<name>name</name>
- <cstring>PushButton5</cstring>
+ <cstring>applyChanges</cstring>
</property>
<property stdset="1">
@@ -109,5 +109,5 @@
<property stdset="1">
<name>name</name>
- <cstring>ListView1</cstring>
+ <cstring>serviceView</cstring>
</property>
</widget>
@@ -148,5 +148,5 @@
<property stdset="1">
<name>name</name>
- <cstring>LineEdit6</cstring>
+ <cstring>defaultPinCode</cstring>
</property>
</widget>
@@ -155,5 +155,5 @@
<property stdset="1">
<name>name</name>
- <cstring>LineEdit1</cstring>
+ <cstring>deviceName</cstring>
</property>
</widget>
@@ -215,5 +215,5 @@
<property stdset="1">
<name>name</name>
- <cstring>DeviceInfoLabel</cstring>
+ <cstring>deviceInfoLabel</cstring>
</property>
<property stdset="1">
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
@@ -57,11 +57,11 @@ namespace OpieTooth {
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 );
@@ -103,5 +103,5 @@ namespace OpieTooth {
// empty list before a new scan
- ListView1->clear();
+ serviceView->clear();
progressTimer();
@@ -126,5 +126,5 @@ namespace OpieTooth {
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() );
}
@@ -139,5 +139,5 @@ namespace OpieTooth {
void ScanDialog::emitToManager() {
- if (!ListView1) {
+ if (!serviceView) {
return;
}
@@ -145,5 +145,5 @@ namespace OpieTooth {
QValueList<RemoteDevice> deviceList;
- QListViewItemIterator it( ListView1 );
+ QListViewItemIterator it( serviceView );
for ( ; it.current(); ++it ) {
if ( ( (QCheckListItem*)it.current() )->isOn() ) {
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
@@ -47,5 +47,5 @@ class Device;
QProgressBar* progress;
QPushButton* StartStopButton;
- QListView* ListView1;
+ QListView* serviceView;
public slots: