summaryrefslogtreecommitdiff
path: root/noncore/net/opietooth
Side-by-side diff
Diffstat (limited to 'noncore/net/opietooth') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.cc39
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp201
-rw-r--r--noncore/net/opietooth/manager/obexpopup.cpp22
-rw-r--r--noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp41
-rw-r--r--noncore/net/opietooth/manager/rfcpopup.cpp35
5 files changed, 218 insertions, 120 deletions
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc
index 7d60d6c..9418a20 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.cc
+++ b/noncore/net/opietooth/blue-pin/pindlg.cc
@@ -1,5 +1,10 @@
-#include <stdio.h>
+#include "pindlg.h"
+
+/* OPIE */
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+/* QT */
#include <qcheckbox.h>
#include <qlabel.h>
@@ -7,7 +12,6 @@
#include <qtimer.h>
-#include <qpe/config.h>
-
-#include "pindlg.h"
+/* STD */
+#include <stdio.h>
using namespace OpieTooth;
@@ -21,22 +25,27 @@ PinDlg::PinDlg( const QString& status,
test( mac );
txtStatus->setText(status);
- showMaximized();
+ QPEApplication::showDialog( this );
}
-PinDlg::~PinDlg() {
-}
-void PinDlg::setMac( const QString& mac ) {
+PinDlg::~PinDlg()
+{}
+void PinDlg::setMac( const QString& mac )
+{
txtStatus->setText( mac );
}
-QString PinDlg::pin() const{
+QString PinDlg::pin() const
+{
return lnePin->text();
}
-void PinDlg::test( const QString& mac ) {
- if (!mac.isEmpty() ) {
+void PinDlg::test( const QString& mac )
+{
+ if (!mac.isEmpty() )
+ {
Config cfg("bluepin");
cfg.setGroup(mac);
lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) );
- if ( !lnePin->text().isEmpty() ) {
+ if ( !lnePin->text().isEmpty() )
+ {
//QTimer::singleShot(100, this, SLOT(accept() ) );
}
@@ -45,6 +54,8 @@ void PinDlg::test( const QString& mac ) {
}
-void PinDlg::accept() {
- if ( ckbPin->isChecked() ) {
+void PinDlg::accept()
+{
+ if ( ckbPin->isChecked() )
+ {
Config cfg("bluepin");
cfg.setGroup(m_mac );
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 2e68984..0ea45d2 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -23,9 +23,10 @@
#include "rfcommassigndialogimpl.h"
-#include <remotedevice.h>
-#include <services.h>
-
-#include <stdlib.h>
+/* OPIE */
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
+/* QT */
#include <qframe.h>
#include <qlabel.h>
@@ -47,13 +48,14 @@
#include <qlist.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-
+/* STD */
+#include <remotedevice.h>
+#include <services.h>
+#include <stdlib.h>
using namespace OpieTooth;
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
- : BluetoothBase( parent, name, fl ) {
+ : BluetoothBase( parent, name, fl )
+{
m_localDevice = new Manager( "hci0" );
@@ -116,5 +118,6 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
* Reads all options from the config file
*/
-void BlueBase::readConfig() {
+void BlueBase::readConfig()
+{
Config cfg( "bluetoothmanager" );
@@ -132,5 +135,6 @@ void BlueBase::readConfig() {
* Writes all options to the config file
*/
-void BlueBase::writeConfig() {
+void BlueBase::writeConfig()
+{
Config cfg( "bluetoothmanager" );
@@ -150,5 +154,6 @@ void BlueBase::writeConfig() {
* Modify the hcid.conf file to our needs
*/
-void BlueBase::writeToHciConfig() {
+void BlueBase::writeToHciConfig()
+{
qWarning("writeToHciConfig");
HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
@@ -167,5 +172,6 @@ void BlueBase::writeToHciConfig() {
* Read the list of allready known devices
*/
-void BlueBase::readSavedDevices() {
+void BlueBase::readSavedDevices()
+{
QValueList<RemoteDevice> loadedDevices;
@@ -180,10 +186,12 @@ void BlueBase::readSavedDevices() {
* Write the list of allready known devices
*/
-void BlueBase::writeSavedDevices() {
+void BlueBase::writeSavedDevices()
+{
QListViewItemIterator it( ListView2 );
BTListItem* item;
BTDeviceItem* device;
RemoteDevice::ValueList list;
- for ( ; it.current(); ++it ) {
+ for ( ; it.current(); ++it )
+ {
item = (BTListItem*)it.current();
if(item->typeId() != BTListItem::Device )
@@ -206,5 +214,6 @@ void BlueBase::writeSavedDevices() {
* Set up the gui
*/
-void BlueBase::initGui() {
+void BlueBase::initGui()
+{
StatusLabel->setText( status() ); // maybe move it to getStatus()
cryptCheckBox->setChecked( m_useEncryption );
@@ -223,5 +232,6 @@ void BlueBase::initGui() {
* @return QString the status informations gathered
*/
-QString BlueBase::status()const{
+QString BlueBase::status()const
+{
QString infoString = tr( "<b>Device name : </b> Ipaq" );
infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
@@ -235,5 +245,6 @@ QString BlueBase::status()const{
* Read the current values from the gui and invoke writeConfig()
*/
-void BlueBase::applyConfigChanges() {
+void BlueBase::applyConfigChanges()
+{
m_deviceName = deviceNameLine->text();
m_defaultPasskey = passkeyLine->text();
@@ -252,10 +263,10 @@ void BlueBase::applyConfigChanges() {
*
*/
-void BlueBase::rfcommDialog() {
+void BlueBase::rfcommDialog()
+{
RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp );
- rfcommAssign.showMaximized();
-
- if ( rfcommAssign.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted )
+ {
rfcommAssign.saveConfig();
}
@@ -266,9 +277,11 @@ void BlueBase::rfcommDialog() {
*
*/
-void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
+void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
+{
BTDeviceItem * deviceItem;
QValueList<RemoteDevice>::ConstIterator it;
- for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
+ for( it = newDevices.begin(); it != newDevices.end() ; ++it )
+ {
if (find( (*it) )) // is already inserted
@@ -291,6 +304,6 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
* Action that is toggled on entrys on click
*/
-void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
-}
+void BlueBase::startServiceActionClicked( QListViewItem */*item*/ )
+{}
@@ -298,5 +311,6 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
* Action that are toggled on hold (mostly QPopups i guess)
*/
-void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
+void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ )
+{
if (!item )
return;
@@ -305,5 +319,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
int ret=0;
- if ( ((BTListItem*)item)->type() == "device") {
+ if ( ((BTListItem*)item)->type() == "device")
+ {
QPopupMenu *groups = new QPopupMenu();
@@ -317,5 +332,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
ret = menu->exec( point , 0);
- switch(ret) {
+ switch(ret)
+ {
case -1:
break;
@@ -344,19 +360,24 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
*
*/
- else if ( ((BTListItem*)item)->type() == "service") {
+ else if ( ((BTListItem*)item)->type() == "service")
+ {
BTServiceItem* service = (BTServiceItem*)item;
QMap<int, QString> list = service->services().classIdList();
QMap<int, QString>::Iterator it = list.begin();
QPopupMenu *popup =0l;
- if ( it != list.end() ) {
+ if ( it != list.end() )
+ {
qWarning("Searching id %d %s", it.key(), it.data().latin1() );
popup = m_popHelper.find( it.key(),
service->services(),
(BTDeviceItem*)service->parent() );
- }else {
+ }
+ else
+ {
qWarning("Empty");
}
- if ( popup == 0l ) {
+ if ( popup == 0l )
+ {
qWarning("factory returned 0l");
popup = new QPopupMenu();
@@ -366,7 +387,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
ret = popup->exec( point );
qWarning("returned from exec() ");
- if ( ret == -1 ) {
+ if ( ret == -1 )
+ {
;
- } else if ( ret == test1 ) {
+ }
+ else if ( ret == test1 )
+ {
;
}
@@ -381,5 +405,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
* @param item the service item returned
*/
-void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
+void BlueBase::addServicesToDevice( BTDeviceItem * item )
+{
qDebug("addServicesToDevice");
// row of mac adress text(3)
@@ -397,5 +422,6 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
* @param servicesList the list with the service the device has.
*/
-void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) {
+void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList )
+{
qDebug("fill services list");
@@ -413,5 +439,6 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
tempList.setAutoDelete( true );
QListViewItem * child = deviceItem->firstChild();
- while( child ) {
+ while( child )
+ {
tempList.append( child );
child = child->nextSibling();
@@ -423,14 +450,17 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
- if (!servicesList.isEmpty() ) {
+ if (!servicesList.isEmpty() )
+ {
// add services
QMap<int, QString> list;
QMap<int, QString>::Iterator classIt;
- for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
+ for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 )
+ {
serviceItem = new BTServiceItem( deviceItem, (*it2) );
list = (*it2).classIdList();
classIt = list.begin();
int classId=0;
- if ( classIt != list.end() ) {
+ if ( classIt != list.end() )
+ {
classId = classIt.key();
}
@@ -438,5 +468,7 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) );
}
- } else {
+ }
+ else
+ {
Services s1;
s1.setServiceName( tr("no services found") );
@@ -451,8 +483,10 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
-void BlueBase::addSignalStrength() {
+void BlueBase::addSignalStrength()
+{
QListViewItemIterator it( ListView4 );
- for ( ; it.current(); ++it ) {
+ for ( ; it.current(); ++it )
+ {
m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
}
@@ -461,9 +495,12 @@ void BlueBase::addSignalStrength() {
}
-void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) {
+void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
+{
QListViewItemIterator it( ListView4 );
- for ( ; it.current(); ++it ) {
- if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) {
+ for ( ; it.current(); ++it )
+ {
+ if( ((BTConnectionItem*)it.current())->connection().mac() == mac )
+ {
((BTConnectionItem*)it.current() )->setSignalStrength( strength );
}
@@ -475,5 +512,6 @@ void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
* This one triggers the search
*/
-void BlueBase::addConnectedDevices() {
+void BlueBase::addConnectedDevices()
+{
m_localDevice->searchConnections();
}
@@ -483,25 +521,32 @@ void BlueBase::addConnectedDevices() {
* @param connectionList the ValueList with all current connections
*/
-void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) {
+void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
+{
QValueList<OpieTooth::ConnectionState>::Iterator it;
BTConnectionItem * connectionItem;
- if ( !connectionList.isEmpty() ) {
+ if ( !connectionList.isEmpty() )
+ {
- for (it = connectionList.begin(); it != connectionList.end(); ++it) {
+ for (it = connectionList.begin(); it != connectionList.end(); ++it)
+ {
QListViewItemIterator it2( ListView4 );
bool found = false;
- for ( ; it2.current(); ++it2 ) {
- if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) {
+ for ( ; it2.current(); ++it2 )
+ {
+ if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() )
+ {
found = true;
}
}
- if ( found == false ) {
+ if ( found == false )
+ {
connectionItem = new BTConnectionItem( ListView4, (*it) );
- if( m_deviceList.find((*it).mac()).data() ) {
+ if( m_deviceList.find((*it).mac()).data() )
+ {
connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
}
@@ -511,13 +556,17 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
QListViewItemIterator it2( ListView4 );
- for ( ; it2.current(); ++it2 ) {
+ for ( ; it2.current(); ++it2 )
+ {
bool found = false;
- for (it = connectionList.begin(); it != connectionList.end(); ++it) {
- if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) {
+ for (it = connectionList.begin(); it != connectionList.end(); ++it)
+ {
+ if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() )
+ {
found = true;
}
}
- if ( !found ) {
+ if ( !found )
+ {
delete it2.current();
}
@@ -526,5 +575,7 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
- } else {
+ }
+ else
+ {
ListView4->clear();
ConnectionState con;
@@ -542,5 +593,6 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
* @param device
*/
-void BlueBase::deviceActive( const RemoteDevice &device ) {
+void BlueBase::deviceActive( const RemoteDevice &device )
+{
// search by mac, async, gets a signal back
// We should have a BTDeviceItem there or where does it get added to the map -zecke
@@ -554,5 +606,6 @@ void BlueBase::deviceActive( const RemoteDevice &device ) {
* @param connected - if it is avail. or not
*/
-void BlueBase::deviceActive( const QString& device, bool connected ) {
+void BlueBase::deviceActive( const QString& device, bool connected )
+{
qDebug("deviceActive slot");
@@ -566,7 +619,10 @@ void BlueBase::deviceActive( const QString& device, bool connected ) {
- if ( connected ) {
+ if ( connected )
+ {
deviceItem->setPixmap( 1, m_onPix );
- } else {
+ }
+ else
+ {
deviceItem->setPixmap( 1, m_offPix );
}
@@ -578,5 +634,6 @@ void BlueBase::deviceActive( const QString& device, bool connected ) {
* Open the "scan for devices" dialog
*/
-void BlueBase::startScan() {
+void BlueBase::startScan()
+{
ScanDialog *scan = new ScanDialog( this, "ScanDialog",
true, WDestructiveClose );
@@ -584,5 +641,5 @@ void BlueBase::startScan() {
this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) );
- scan->showMaximized();
+ QPEApplication::showDialog( scan );
}
@@ -591,5 +648,6 @@ void BlueBase::startScan() {
* Set the informations about the local device in information Tab
*/
-void BlueBase::setInfo() {
+void BlueBase::setInfo()
+{
StatusLabel->setText( status() );
}
@@ -599,5 +657,6 @@ void BlueBase::setInfo() {
* Decontructor
*/
-BlueBase::~BlueBase() {
+BlueBase::~BlueBase()
+{
writeSavedDevices();
delete m_iconLoader;
@@ -611,9 +670,11 @@ BlueBase::~BlueBase() {
* @return returns true if found
*/
-bool BlueBase::find( const RemoteDevice& rem ) {
+bool BlueBase::find( const RemoteDevice& rem )
+{
QListViewItemIterator it( ListView2 );
BTListItem* item;
BTDeviceItem* device;
- for (; it.current(); ++it ) {
+ for (; it.current(); ++it )
+ {
item = (BTListItem*) it.current();
if ( item->typeId() != BTListItem::Device )
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp
index a550648..d147d52 100644
--- a/noncore/net/opietooth/manager/obexpopup.cpp
+++ b/noncore/net/opietooth/manager/obexpopup.cpp
@@ -1,8 +1,12 @@
-#include <qtimer.h>
-
#include "obexdialog.h"
#include "obexpopup.h"
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qtimer.h>
+
using namespace OpieTooth;
@@ -11,5 +15,6 @@ using namespace OpieTooth;
*/
ObexPopup::ObexPopup()
- : QPopupMenu() {
+ : QPopupMenu()
+{
qWarning("RfcCommPopup c'tor");
@@ -25,16 +30,15 @@ ObexPopup::ObexPopup()
-ObexPopup::~ObexPopup() {
-}
+ObexPopup::~ObexPopup()
+{}
-void ObexPopup::slotPush() {
+void ObexPopup::slotPush()
+{
qWarning("push something");
-
ObexDialog obexDialog;
- obexDialog.showMaximized();
- obexDialog.exec();
+ QPEApplication::execDialog( &obexDialog );
}
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
index b5cc074..fc76301 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
@@ -4,6 +4,9 @@
#include "rfcommconfhandler.h"
+/* OPIE */
#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+/* QT */
#include <qlayout.h>
@@ -16,5 +19,6 @@ using namespace OpieTooth;
RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
- : RfcommAssignDialogBase( parent, name, modal, fl ) {
+ : RfcommAssignDialogBase( parent, name, modal, fl )
+{
m_range = 5;
@@ -34,6 +38,8 @@ RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool
}
-RfcommAssignDialog::~RfcommAssignDialog() {
- if ( confHandler ) {
+RfcommAssignDialog::~RfcommAssignDialog()
+{
+ if ( confHandler )
+ {
delete confHandler;
}
@@ -41,19 +47,23 @@ RfcommAssignDialog::~RfcommAssignDialog() {
-void RfcommAssignDialog::newDevice( const QString & mac ) {
+void RfcommAssignDialog::newDevice( const QString & mac )
+{
- for ( int i = 0 ; i < m_range; i++ ) {
+ for ( int i = 0 ; i < m_range; i++ )
+ {
QMap<QString, RfCommConfObject*>::Iterator it;
it = confHandler->foundEntries().find( QString("%1").arg( i ) );
// make sure that rfcommX is not assigned yet
- if ( it == confHandler->foundEntries().end() ) {
+ if ( it == confHandler->foundEntries().end() )
+ {
QDialog dialog( this, "newdevice", true, WStyle_ContextHelp );
- dialog.showMaximized();
+
RfcommDialogItem *newDev = new RfcommDialogItem( &dialog );
newDev->setIdent( i );
newDev->setMac( mac );
- if ( dialog.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &dialog ) == QDialog::Accepted )
+ {
RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
m_itemList.insert( i , rfcomm );
@@ -68,9 +78,11 @@ void RfcommAssignDialog::newDevice( const QString & mac ) {
}
-void RfcommAssignDialog::loadConfig() {
+void RfcommAssignDialog::loadConfig()
+{
//Config cfg( "bluetoothmanager-rfcommbind" );
- for ( int i = 0 ; i < m_range; i++ ) {
+ for ( int i = 0 ; i < m_range; i++ )
+ {
// cfg.setGroup( QString("%1").arg( i ) );
RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
@@ -79,5 +91,6 @@ void RfcommAssignDialog::loadConfig() {
QMap<QString, RfCommConfObject*>::Iterator it;
it = confHandler->foundEntries().find( QString("%1").arg( i ) );
- if ( it != confHandler->foundEntries().end() ) {
+ if ( it != confHandler->foundEntries().end() )
+ {
qDebug( "Found key in foundEntries() " );
rfcomm->setMac( it.data()->mac() );
@@ -94,5 +107,6 @@ void RfcommAssignDialog::loadConfig() {
-void RfcommAssignDialog::saveConfig() {
+void RfcommAssignDialog::saveConfig()
+{
//Config cfg( "bluetoothmanager-rfcommbind" );
@@ -102,5 +116,6 @@ void RfcommAssignDialog::saveConfig() {
QMap< QString, RfCommConfObject*> outMap;
- for( it = m_itemList.begin(); it != m_itemList.end(); ++it ) {
+ for( it = m_itemList.begin(); it != m_itemList.end(); ++it )
+ {
//cfg.setGroup( QString("%1").arg( it.key() ) );
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index d95f14b..04bfe48 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -1,9 +1,13 @@
-#include <qtimer.h>
-
#include "pppdialog.h"
#include "rfcpopup.h"
#include "rfcommassigndialogimpl.h"
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qtimer.h>
+
using namespace OpieTooth;
@@ -12,5 +16,6 @@ using namespace OpieTooth;
*/
RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item )
- : QPopupMenu() {
+ : QPopupMenu()
+{
qWarning("RfcCommPopup c'tor");
@@ -54,5 +59,6 @@ RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item )
-RfcCommPopup::~RfcCommPopup() {
+RfcCommPopup::~RfcCommPopup()
+{
/* delete m_con;
delete m_dis;
@@ -62,28 +68,28 @@ RfcCommPopup::~RfcCommPopup() {
-void RfcCommPopup::slotConnect() {
+void RfcCommPopup::slotConnect()
+{
qWarning("connect");
-
-
PPPDialog pppDialog;
- pppDialog.showMaximized();
- pppDialog.exec();
+ QPEApplication::execDialog( &pppDialog );
}
-void RfcCommPopup::slotDisconnect() {
+void RfcCommPopup::slotDisconnect()
+{
qWarning("slot disconnected");
}
-void RfcCommPopup::slotBind() {
+void RfcCommPopup::slotBind()
+{
RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp );
- rfcommAssign.showMaximized();
rfcommAssign.newDevice( m_item->mac() );
- if ( rfcommAssign.exec() == QDialog::Accepted ) {
+ if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted )
+ {
rfcommAssign.saveConfig();
}
@@ -91,5 +97,6 @@ void RfcCommPopup::slotBind() {
-void RfcCommPopup::slotBar() {
+void RfcCommPopup::slotBar()
+{
qWarning("slotBar");
};