summaryrefslogtreecommitdiff
Side-by-side diff
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 )
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) ) );
@@ -84,8 +84,8 @@ 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
m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
@@ -105,7 +105,7 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
readConfig();
initGui();
- ListView2->setRootIsDecorated(true);
+ devicesView->setRootIsDecorated(true);
writeToHciConfig();
@@ -189,7 +189,7 @@ void BlueBase::readSavedDevices()
*/
void BlueBase::writeSavedDevices()
{
- QListViewItemIterator it( ListView2 );
+ QListViewItemIterator it( devicesView );
BTListItem* item;
BTDeviceItem* device;
RemoteDevice::ValueList list;
@@ -289,7 +289,7 @@ 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 );
@@ -487,7 +487,7 @@ 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() );
@@ -499,7 +499,7 @@ 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 )
@@ -534,7 +534,7 @@ 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 )
{
@@ -546,7 +546,7 @@ 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() )
{
@@ -556,7 +556,7 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
}
- QListViewItemIterator it2( ListView4 );
+ QListViewItemIterator it2( connectionsView );
for ( ; it2.current(); ++it2 )
{
bool found = false;
@@ -579,10 +579,10 @@ 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
@@ -673,7 +673,7 @@ BlueBase::~BlueBase()
*/
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
@@ -11,7 +11,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>297</width>
+ <width>293</width>
<height>382</height>
</rect>
</property>
@@ -97,7 +97,7 @@
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView2</cstring>
+ <cstring>devicesView</cstring>
</property>
</widget>
<widget>
@@ -185,7 +185,7 @@
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView4</cstring>
+ <cstring>connectionsView</cstring>
</property>
</widget>
</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 @@
<rect>
<x>0</x>
<y>0</y>
- <width>275</width>
+ <width>267</width>
<height>323</height>
</rect>
</property>
@@ -69,7 +69,7 @@
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>PushButton5</cstring>
+ <cstring>applyChanges</cstring>
</property>
<property stdset="1">
<name>text</name>
@@ -108,7 +108,7 @@
</column>
<property stdset="1">
<name>name</name>
- <cstring>ListView1</cstring>
+ <cstring>serviceView</cstring>
</property>
</widget>
</grid>
@@ -147,14 +147,14 @@
<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" >
@@ -214,7 +214,7 @@
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>DeviceInfoLabel</cstring>
+ <cstring>deviceInfoLabel</cstring>
</property>
<property stdset="1">
<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 {
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 );
@@ -102,7 +102,7 @@ namespace OpieTooth {
progressStat = 0;
// empty list before a new scan
- ListView1->clear();
+ serviceView->clear();
progressTimer();
// when finished, it emmite foundDevices()
@@ -125,7 +125,7 @@ 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;
@@ -138,13 +138,13 @@ namespace OpieTooth {
*/
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) );
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;
private:
QProgressBar* progress;
QPushButton* StartStopButton;
- QListView* ListView1;
+ QListView* serviceView;
public slots:
void accept();