author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c /noncore/net/opietooth | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startdunconnection.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 16 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/devicehandler.cpp | 10 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/dunpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/hciconfwrapper.cpp | 16 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexpopup.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/panpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommconfhandler.cpp | 10 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcpopup.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 2 |
16 files changed, 47 insertions, 47 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 8a7f0bc..1d93f5c 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -201,17 +201,17 @@ namespace OpieTooth { | |||
201 | } | 201 | } |
202 | 202 | ||
203 | /** | 203 | /** |
204 | * Implementation of the paint event | 204 | * Implementation of the paint event |
205 | * @param the QPaintEvent | 205 | * @param the QPaintEvent |
206 | */ | 206 | */ |
207 | void BluezApplet::paintEvent( QPaintEvent* ) { | 207 | void BluezApplet::paintEvent( QPaintEvent* ) { |
208 | QPainter p(this); | 208 | QPainter p(this); |
209 | qDebug("paint bluetooth pixmap"); | 209 | odebug << "paint bluetooth pixmap" << oendl; |
210 | 210 | ||
211 | if (bluezactive > 0) { | 211 | if (bluezactive > 0) { |
212 | p.drawPixmap( 0, 1, bluezOnPixmap ); | 212 | p.drawPixmap( 0, 1, bluezOnPixmap ); |
213 | } else { | 213 | } else { |
214 | p.drawPixmap( 0, 1, bluezOffPixmap ); | 214 | p.drawPixmap( 0, 1, bluezOffPixmap ); |
215 | } | 215 | } |
216 | 216 | ||
217 | if (bluezDiscoveryActive > 0) { | 217 | if (bluezDiscoveryActive > 0) { |
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index 09b19d2..37f2ae7 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -40,17 +40,17 @@ void StartDunConnection::start() { | |||
40 | m_dunConnect = new OProcess(); | 40 | m_dunConnect = new OProcess(); |
41 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; | 41 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; |
42 | 42 | ||
43 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 43 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
48 | qWarning( "could not start" ); | 48 | owarn << "could not start" << oendl; |
49 | delete m_dunConnect; | 49 | delete m_dunConnect; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | void StartDunConnection::slotExited( OProcess* proc ) { | 54 | void StartDunConnection::slotExited( OProcess* proc ) { |
55 | delete m_dunConnect; | 55 | delete m_dunConnect; |
56 | } | 56 | } |
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index 24ac530..50afc9f 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -34,25 +34,25 @@ void StartPanConnection::setConnectionType() { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | StartConnection::ConnectionType StartPanConnection::type() { | 36 | StartConnection::ConnectionType StartPanConnection::type() { |
37 | return m_connectionType; | 37 | return m_connectionType; |
38 | } | 38 | } |
39 | 39 | ||
40 | void StartPanConnection::start() { | 40 | void StartPanConnection::start() { |
41 | m_panConnect = new OProcess(); | 41 | m_panConnect = new OProcess(); |
42 | qDebug( "IM START " + m_mac ); | 42 | odebug << "IM START " + m_mac << oendl; |
43 | *m_panConnect << "pand" << "--connect" << m_mac; | 43 | *m_panConnect << "pand" << "--connect" << m_mac; |
44 | 44 | ||
45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
50 | qWarning( "could not start" ); | 50 | owarn << "could not start" << oendl; |
51 | delete m_panConnect; | 51 | delete m_panConnect; |
52 | } | 52 | } |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | void StartPanConnection::slotExited( OProcess* proc ) { | 56 | void StartPanConnection::slotExited( OProcess* proc ) { |
57 | delete m_panConnect; | 57 | delete m_panConnect; |
58 | m_panConnect = 0l; | 58 | m_panConnect = 0l; |
@@ -63,22 +63,22 @@ void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) | |||
63 | 63 | ||
64 | 64 | ||
65 | void StartPanConnection::stop() { | 65 | void StartPanConnection::stop() { |
66 | if ( m_panConnect ) { | 66 | if ( m_panConnect ) { |
67 | delete m_panConnect; | 67 | delete m_panConnect; |
68 | m_panConnect = 0l; | 68 | m_panConnect = 0l; |
69 | } | 69 | } |
70 | m_panConnect = new OProcess(); | 70 | m_panConnect = new OProcess(); |
71 | qDebug("IM STOP " + m_mac); | 71 | odebug << "IM STOP " + m_mac << oendl; |
72 | 72 | ||
73 | *m_panConnect << "pand" << "--kill" << m_mac; | 73 | *m_panConnect << "pand" << "--kill" << m_mac; |
74 | 74 | ||
75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
80 | qWarning( "could not stop" ); | 80 | owarn << "could not stop" << oendl; |
81 | delete m_panConnect; | 81 | delete m_panConnect; |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 29030ab..b1cddd2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -150,17 +150,17 @@ void BlueBase::writeConfig() | |||
150 | writeToHciConfig(); | 150 | writeToHciConfig(); |
151 | } | 151 | } |
152 | 152 | ||
153 | /** | 153 | /** |
154 | * Modify the hcid.conf file to our needs | 154 | * Modify the hcid.conf file to our needs |
155 | */ | 155 | */ |
156 | void BlueBase::writeToHciConfig() | 156 | void BlueBase::writeToHciConfig() |
157 | { | 157 | { |
158 | qWarning("writeToHciConfig"); | 158 | owarn << "writeToHciConfig" << oendl; |
159 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); | 159 | HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); |
160 | hciconf.load(); | 160 | hciconf.load(); |
161 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); | 161 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); |
162 | hciconf.setName( m_deviceName ); | 162 | hciconf.setName( m_deviceName ); |
163 | hciconf.setEncrypt( m_useEncryption ); | 163 | hciconf.setEncrypt( m_useEncryption ); |
164 | hciconf.setAuth( m_enableAuthentification ); | 164 | hciconf.setAuth( m_enableAuthentification ); |
165 | hciconf.setPscan( m_enablePagescan ); | 165 | hciconf.setPscan( m_enablePagescan ); |
166 | hciconf.setIscan( m_enableInquiryscan ); | 166 | hciconf.setIscan( m_enableInquiryscan ); |
@@ -362,35 +362,35 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
362 | else if ( ((BTListItem*)item)->type() == "service") | 362 | else if ( ((BTListItem*)item)->type() == "service") |
363 | { | 363 | { |
364 | BTServiceItem* service = (BTServiceItem*)item; | 364 | BTServiceItem* service = (BTServiceItem*)item; |
365 | QMap<int, QString> list = service->services().classIdList(); | 365 | QMap<int, QString> list = service->services().classIdList(); |
366 | QMap<int, QString>::Iterator it = list.begin(); | 366 | QMap<int, QString>::Iterator it = list.begin(); |
367 | QPopupMenu *popup =0l; | 367 | QPopupMenu *popup =0l; |
368 | if ( it != list.end() ) | 368 | if ( it != list.end() ) |
369 | { | 369 | { |
370 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); | 370 | owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl; |
371 | popup = m_popHelper.find( it.key(), | 371 | popup = m_popHelper.find( it.key(), |
372 | service->services(), | 372 | service->services(), |
373 | (BTDeviceItem*)service->parent() ); | 373 | (BTDeviceItem*)service->parent() ); |
374 | } | 374 | } |
375 | else | 375 | else |
376 | { | 376 | { |
377 | qWarning("Empty"); | 377 | owarn << "Empty" << oendl; |
378 | } | 378 | } |
379 | 379 | ||
380 | if ( popup == 0l ) | 380 | if ( popup == 0l ) |
381 | { | 381 | { |
382 | qWarning("factory returned 0l"); | 382 | owarn << "factory returned 0l" << oendl; |
383 | popup = new QPopupMenu(); | 383 | popup = new QPopupMenu(); |
384 | } | 384 | } |
385 | int test1 = popup->insertItem( tr("Test1:"), 2); | 385 | int test1 = popup->insertItem( tr("Test1:"), 2); |
386 | 386 | ||
387 | ret = popup->exec( point ); | 387 | ret = popup->exec( point ); |
388 | qWarning("returned from exec() "); | 388 | owarn << "returned from exec() " << oendl; |
389 | if ( ret == -1 ) | 389 | if ( ret == -1 ) |
390 | { | 390 | { |
391 | ; | 391 | ; |
392 | } | 392 | } |
393 | else if ( ret == test1 ) | 393 | else if ( ret == test1 ) |
394 | { | 394 | { |
395 | ; | 395 | ; |
396 | } | 396 | } |
@@ -401,34 +401,34 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
401 | 401 | ||
402 | 402 | ||
403 | /** | 403 | /** |
404 | * Search and display avail. services for a device (on expand from device listing) | 404 | * Search and display avail. services for a device (on expand from device listing) |
405 | * @param item the service item returned | 405 | * @param item the service item returned |
406 | */ | 406 | */ |
407 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) | 407 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) |
408 | { | 408 | { |
409 | qDebug("addServicesToDevice"); | 409 | odebug << "addServicesToDevice" << oendl; |
410 | // row of mac adress text(3) | 410 | // row of mac adress text(3) |
411 | RemoteDevice device = item->remoteDevice(); | 411 | RemoteDevice device = item->remoteDevice(); |
412 | m_deviceList.insert( item->mac() , item ); | 412 | m_deviceList.insert( item->mac() , item ); |
413 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back | 413 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back |
414 | m_localDevice->searchServices( device ); | 414 | m_localDevice->searchServices( device ); |
415 | } | 415 | } |
416 | 416 | ||
417 | 417 | ||
418 | /** | 418 | /** |
419 | * Overloaded. This one it the one that is | 419 | * Overloaded. This one it the one that is |
420 | ted to the foundServices signal | 420 | ted to the foundServices signal |
421 | * @param device the mac address of the remote device | 421 | * @param device the mac address of the remote device |
422 | * @param servicesList the list with the service the device has. | 422 | * @param servicesList the list with the service the device has. |
423 | */ | 423 | */ |
424 | void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) | 424 | void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) |
425 | { | 425 | { |
426 | qDebug("fill services list"); | 426 | odebug << "fill services list" << oendl; |
427 | 427 | ||
428 | QMap<QString,BTDeviceItem*>::Iterator it; | 428 | QMap<QString,BTDeviceItem*>::Iterator it; |
429 | BTDeviceItem* deviceItem = 0; | 429 | BTDeviceItem* deviceItem = 0; |
430 | 430 | ||
431 | // get the right devices which requested the search | 431 | // get the right devices which requested the search |
432 | it = m_deviceList.find( device ); | 432 | it = m_deviceList.find( device ); |
433 | if( it == m_deviceList.end() ) | 433 | if( it == m_deviceList.end() ) |
434 | return; | 434 | return; |
@@ -602,17 +602,17 @@ void BlueBase::deviceActive( const RemoteDevice &device ) | |||
602 | 602 | ||
603 | /** | 603 | /** |
604 | * The signal catcher. Set the avail. status on device. | 604 | * The signal catcher. Set the avail. status on device. |
605 | * @param device - the mac address | 605 | * @param device - the mac address |
606 | * @param connected - if it is avail. or not | 606 | * @param connected - if it is avail. or not |
607 | */ | 607 | */ |
608 | void BlueBase::deviceActive( const QString& device, bool connected ) | 608 | void BlueBase::deviceActive( const QString& device, bool connected ) |
609 | { | 609 | { |
610 | qDebug("deviceActive slot"); | 610 | odebug << "deviceActive slot" << oendl; |
611 | 611 | ||
612 | QMap<QString,BTDeviceItem*>::Iterator it; | 612 | QMap<QString,BTDeviceItem*>::Iterator it; |
613 | 613 | ||
614 | it = m_deviceList.find( device ); | 614 | it = m_deviceList.find( device ); |
615 | if( it == m_deviceList.end() ) | 615 | if( it == m_deviceList.end() ) |
616 | return; | 616 | return; |
617 | 617 | ||
618 | BTDeviceItem* deviceItem = it.data(); | 618 | BTDeviceItem* deviceItem = it.data(); |
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp index 9c5b817..bd34351 100644 --- a/noncore/net/opietooth/manager/devicehandler.cpp +++ b/noncore/net/opietooth/manager/devicehandler.cpp | |||
@@ -28,23 +28,23 @@ QString path = QDir::homeDirPath() + "/Settings/bluetooth"; | |||
28 | if (!devicesFileList.isEmpty() ) { | 28 | if (!devicesFileList.isEmpty() ) { |
29 | QString name; | 29 | QString name; |
30 | QString mac; | 30 | QString mac; |
31 | QStringList::Iterator it; | 31 | QStringList::Iterator it; |
32 | for (it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { | 32 | for (it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { |
33 | if ( (*it) == "." || (*it) == ".." ) | 33 | if ( (*it) == "." || (*it) == ".." ) |
34 | continue; | 34 | continue; |
35 | 35 | ||
36 | qDebug((*it).latin1() ); | 36 | odebug << (*it).latin1() << oendl; |
37 | Config conf(path + "/"+(*it), Config::File); | 37 | Config conf(path + "/"+(*it), Config::File); |
38 | conf.setGroup("Info"); | 38 | conf.setGroup("Info"); |
39 | name = conf.readEntry("name", "Error"); | 39 | name = conf.readEntry("name", "Error"); |
40 | mac = conf.readEntry("mac", QString::null); | 40 | mac = conf.readEntry("mac", QString::null); |
41 | qDebug("MAC: " + mac); | 41 | odebug << "MAC: " + mac << oendl; |
42 | qDebug("NAME: " + name); | 42 | odebug << "NAME: " + name << oendl; |
43 | if (mac.isEmpty() ) | 43 | if (mac.isEmpty() ) |
44 | continue; | 44 | continue; |
45 | RemoteDevice currentDevice( mac , name ); | 45 | RemoteDevice currentDevice( mac , name ); |
46 | list.append( currentDevice ); | 46 | list.append( currentDevice ); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | return list; | 49 | return list; |
50 | }; | 50 | }; |
@@ -61,24 +61,24 @@ void DeviceHandler::save( const RemoteDevice::ValueList& list) { | |||
61 | if (list.isEmpty() ) // no need to create the dir | 61 | if (list.isEmpty() ) // no need to create the dir |
62 | return; | 62 | return; |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * Create a new dir | 65 | * Create a new dir |
66 | */ | 66 | */ |
67 | rm = "mkdir "; | 67 | rm = "mkdir "; |
68 | rm += QDir::homeDirPath() + "/Settings/bluetooth"; | 68 | rm += QDir::homeDirPath() + "/Settings/bluetooth"; |
69 | qWarning("out %s", rm.data() ); | 69 | owarn << "out " << rm.data() << "" << oendl; |
70 | system( rm.data() ); | 70 | system( rm.data() ); |
71 | 71 | ||
72 | RemoteDevice::ValueList::ConstIterator it; | 72 | RemoteDevice::ValueList::ConstIterator it; |
73 | // write the config | 73 | // write the config |
74 | 74 | ||
75 | for ( it = list.begin(); it != list.end(); ++it ) { | 75 | for ( it = list.begin(); it != list.end(); ++it ) { |
76 | qDebug( "/Settings/bluetooth/" + (*it).mac() + ".conf"); | 76 | odebug << "/Settings/bluetooth/" + (*it).mac() + ".conf" << oendl; |
77 | 77 | ||
78 | Config conf( QDir::homeDirPath() + | 78 | Config conf( QDir::homeDirPath() + |
79 | "/Settings/bluetooth/" + | 79 | "/Settings/bluetooth/" + |
80 | (*it).mac() + ".conf", Config::File ); | 80 | (*it).mac() + ".conf", Config::File ); |
81 | 81 | ||
82 | conf.setGroup( "Info" ); | 82 | conf.setGroup( "Info" ); |
83 | conf.writeEntry( "name", (*it).name() ); | 83 | conf.writeEntry( "name", (*it).name() ); |
84 | conf.writeEntry( "mac", (*it).mac() ); | 84 | conf.writeEntry( "mac", (*it).mac() ); |
diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp index 3043f71..5b01d2f 100644 --- a/noncore/net/opietooth/manager/dunpopup.cpp +++ b/noncore/net/opietooth/manager/dunpopup.cpp | |||
@@ -6,17 +6,17 @@ | |||
6 | 6 | ||
7 | using namespace OpieTooth; | 7 | using namespace OpieTooth; |
8 | 8 | ||
9 | /* | 9 | /* |
10 | * c'tor init the QAction | 10 | * c'tor init the QAction |
11 | */ | 11 | */ |
12 | DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | 12 | DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { |
13 | 13 | ||
14 | qWarning("DunPopup c'tor"); | 14 | owarn << "DunPopup c'tor" << oendl; |
15 | 15 | ||
16 | m_item = item; | 16 | m_item = item; |
17 | QAction *a, *b, *c; | 17 | QAction *a, *b, *c; |
18 | 18 | ||
19 | m_dunconnection = 0l; | 19 | m_dunconnection = 0l; |
20 | /* connect action */ | 20 | /* connect action */ |
21 | 21 | ||
22 | 22 | ||
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index 35e9cd9..71c935c 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp | |||
@@ -69,71 +69,71 @@ namespace OpieTooth { | |||
69 | return; | 69 | return; |
70 | 70 | ||
71 | QStringList::Iterator it; | 71 | QStringList::Iterator it; |
72 | 72 | ||
73 | QString str; | 73 | QString str; |
74 | for (it = m_file.begin(); it != m_file.end(); ++it ) { | 74 | for (it = m_file.begin(); it != m_file.end(); ++it ) { |
75 | str = (*it); | 75 | str = (*it); |
76 | if( (str.contains(key)) > 0 ) { | 76 | if( (str.contains(key)) > 0 ) { |
77 | qDebug("Found"); | 77 | odebug << "Found" << oendl; |
78 | // still need to look if its commented out!!! | 78 | // still need to look if its commented out!!! |
79 | str.simplifyWhiteSpace(); | 79 | str.simplifyWhiteSpace(); |
80 | qDebug( key ); | 80 | odebug << key << oendl; |
81 | if (str.startsWith("#")) { | 81 | if (str.startsWith("#")) { |
82 | str = (key + " " + value + ";"); | 82 | str = (key + " " + value + ";"); |
83 | } else { | 83 | } else { |
84 | str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); | 84 | str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); |
85 | } | 85 | } |
86 | qDebug( str ); | 86 | odebug << str << oendl; |
87 | it = m_file.remove( it ); | 87 | it = m_file.remove( it ); |
88 | it = m_file.insert( it, str ); | 88 | it = m_file.insert( it, str ); |
89 | //return; the regexp is too wide -zecke // all set | 89 | //return; the regexp is too wide -zecke // all set |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | } | 94 | } |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * This loads the config file and stores it inside | 97 | * This loads the config file and stores it inside |
98 | * the m_file | 98 | * the m_file |
99 | */ | 99 | */ |
100 | void HciConfWrapper::load() { | 100 | void HciConfWrapper::load() { |
101 | qWarning("loaded"); | 101 | owarn << "loaded" << oendl; |
102 | m_file.clear(); | 102 | m_file.clear(); |
103 | QFile file( m_fileName ); | 103 | QFile file( m_fileName ); |
104 | if (!file.open( IO_ReadOnly ) ) { | 104 | if (!file.open( IO_ReadOnly ) ) { |
105 | qDebug("Could not open"); | 105 | odebug << "Could not open" << oendl; |
106 | return; | 106 | return; |
107 | } | 107 | } |
108 | 108 | ||
109 | /** | 109 | /** |
110 | * readAll() into a QByteArray | 110 | * readAll() into a QByteArray |
111 | * QStringList::split('\n', array ) | 111 | * QStringList::split('\n', array ) |
112 | * would this be faster? -zecke | 112 | * would this be faster? -zecke |
113 | */ | 113 | */ |
114 | QTextStream stream(&file ); | 114 | QTextStream stream(&file ); |
115 | QString tmp; | 115 | QString tmp; |
116 | while ( !stream.atEnd() ) { | 116 | while ( !stream.atEnd() ) { |
117 | tmp = stream.readLine(); | 117 | tmp = stream.readLine(); |
118 | m_file.append( tmp ); | 118 | m_file.append( tmp ); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | void HciConfWrapper::save() { | 121 | void HciConfWrapper::save() { |
122 | qWarning("save"); | 122 | owarn << "save" << oendl; |
123 | if (m_file.isEmpty() ) // load first | 123 | if (m_file.isEmpty() ) // load first |
124 | return; | 124 | return; |
125 | 125 | ||
126 | QFile file( m_fileName ); | 126 | QFile file( m_fileName ); |
127 | if ( !file.open(IO_WriteOnly ) ) { | 127 | if ( !file.open(IO_WriteOnly ) ) { |
128 | qWarning("could not open %s", m_fileName.latin1() ); | 128 | owarn << "could not open " << m_fileName.latin1() << "" << oendl; |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | 131 | ||
132 | QTextStream stream(&file ); | 132 | QTextStream stream(&file ); |
133 | QStringList::Iterator it; | 133 | QStringList::Iterator it; |
134 | for ( it = m_file.begin(); it != m_file.end(); ++it ) { | 134 | for ( it = m_file.begin(); it != m_file.end(); ++it ) { |
135 | stream << (*it) << endl; | 135 | stream << (*it) << endl; |
136 | } | 136 | } |
137 | qWarning("saved"); | 137 | owarn << "saved" << oendl; |
138 | }; | 138 | }; |
139 | } | 139 | } |
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index 1ef862a..3a3dbb0 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -75,15 +75,15 @@ void ObexDialog::sendData() { | |||
75 | // vom popupmenu beziehen | 75 | // vom popupmenu beziehen |
76 | OProcess* obexSend = new OProcess(); | 76 | OProcess* obexSend = new OProcess(); |
77 | if ( !modifiedName.isEmpty() ) { | 77 | if ( !modifiedName.isEmpty() ) { |
78 | *obexSend << "ussp-push" << m_device << fileURL << modifiedName; | 78 | *obexSend << "ussp-push" << m_device << fileURL << modifiedName; |
79 | } else { | 79 | } else { |
80 | *obexSend << "ussp-push" << m_device << fileURL << file; | 80 | *obexSend << "ussp-push" << m_device << fileURL << file; |
81 | } | 81 | } |
82 | if (!obexSend->start(OProcess::DontCare, OProcess::AllOutput) ) { | 82 | if (!obexSend->start(OProcess::DontCare, OProcess::AllOutput) ) { |
83 | qWarning("could not start"); | 83 | owarn << "could not start" << oendl; |
84 | delete obexSend; | 84 | delete obexSend; |
85 | } | 85 | } |
86 | 86 | ||
87 | 87 | ||
88 | 88 | ||
89 | } | 89 | } |
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp index d147d52..9a50199 100644 --- a/noncore/net/opietooth/manager/obexpopup.cpp +++ b/noncore/net/opietooth/manager/obexpopup.cpp | |||
@@ -11,17 +11,17 @@ | |||
11 | using namespace OpieTooth; | 11 | using namespace OpieTooth; |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * c'tor init the QAction | 14 | * c'tor init the QAction |
15 | */ | 15 | */ |
16 | ObexPopup::ObexPopup() | 16 | ObexPopup::ObexPopup() |
17 | : QPopupMenu() | 17 | : QPopupMenu() |
18 | { | 18 | { |
19 | qWarning("RfcCommPopup c'tor"); | 19 | owarn << "RfcCommPopup c'tor" << oendl; |
20 | 20 | ||
21 | QAction* a; | 21 | QAction* a; |
22 | 22 | ||
23 | /* connect action */ | 23 | /* connect action */ |
24 | a = new QAction( ); // so it's get deleted | 24 | a = new QAction( ); // so it's get deleted |
25 | a->setText("Push file"); | 25 | a->setText("Push file"); |
26 | a->addTo( this ); | 26 | a->addTo( this ); |
27 | connect( a, SIGNAL( activated() ), | 27 | connect( a, SIGNAL( activated() ), |
@@ -31,15 +31,15 @@ ObexPopup::ObexPopup() | |||
31 | 31 | ||
32 | ObexPopup::~ObexPopup() | 32 | ObexPopup::~ObexPopup() |
33 | {} | 33 | {} |
34 | 34 | ||
35 | 35 | ||
36 | void ObexPopup::slotPush() | 36 | void ObexPopup::slotPush() |
37 | { | 37 | { |
38 | 38 | ||
39 | qWarning("push something"); | 39 | owarn << "push something" << oendl; |
40 | 40 | ||
41 | ObexDialog obexDialog; | 41 | ObexDialog obexDialog; |
42 | QPEApplication::execDialog( &obexDialog ); | 42 | QPEApplication::execDialog( &obexDialog ); |
43 | } | 43 | } |
44 | 44 | ||
45 | 45 | ||
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 8b05964..43c2777 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp | |||
@@ -6,17 +6,17 @@ | |||
6 | 6 | ||
7 | using namespace OpieTooth; | 7 | using namespace OpieTooth; |
8 | 8 | ||
9 | /* | 9 | /* |
10 | * c'tor init the QAction | 10 | * c'tor init the QAction |
11 | */ | 11 | */ |
12 | PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | 12 | PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { |
13 | 13 | ||
14 | qWarning("PanPopup c'tor"); | 14 | owarn << "PanPopup c'tor" << oendl; |
15 | 15 | ||
16 | m_item = item; | 16 | m_item = item; |
17 | QAction *a, *b, *c; | 17 | QAction *a, *b, *c; |
18 | 18 | ||
19 | m_panconnection = 0l; | 19 | m_panconnection = 0l; |
20 | /* connect action */ | 20 | /* connect action */ |
21 | 21 | ||
22 | 22 | ||
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index ab22fea..19deb19 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp | |||
@@ -11,20 +11,20 @@ PopupHelper::PopupHelper() { | |||
11 | PopupHelper::~PopupHelper() { | 11 | PopupHelper::~PopupHelper() { |
12 | } | 12 | } |
13 | 13 | ||
14 | void PopupHelper::insert( int id, popupFactory fact ) { | 14 | void PopupHelper::insert( int id, popupFactory fact ) { |
15 | m_map.insert(id, fact ); | 15 | m_map.insert(id, fact ); |
16 | } | 16 | } |
17 | 17 | ||
18 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { | 18 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { |
19 | //qWarning("find"); | 19 | //owarn << "find" << oendl; |
20 | FactoryMap::Iterator it = m_map.find(id ); | 20 | FactoryMap::Iterator it = m_map.find(id ); |
21 | if ( it != m_map.end() ) { | 21 | if ( it != m_map.end() ) { |
22 | //qWarning("found"); | 22 | //owarn << "found" << oendl; |
23 | popupFactory fact = it.data(); | 23 | popupFactory fact = it.data(); |
24 | return (*fact)(ser, item); | 24 | return (*fact)(ser, item); |
25 | } | 25 | } |
26 | return 0l; | 26 | return 0l; |
27 | } | 27 | } |
28 | 28 | ||
29 | void PopupHelper::init() { | 29 | void PopupHelper::init() { |
30 | insert( 4355, newRfcComPopup ); | 30 | insert( 4355, newRfcComPopup ); |
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 78c1501..989bf45 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -51,17 +51,17 @@ void PPPDialog::connectToDevice() { | |||
51 | outPut->clear(); | 51 | outPut->clear(); |
52 | // vom popupmenu beziehen | 52 | // vom popupmenu beziehen |
53 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); | 53 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); |
54 | OProcess* pppDial = new OProcess(); | 54 | OProcess* pppDial = new OProcess(); |
55 | *pppDial << "pppd" << m_device << "call" << connectScript; | 55 | *pppDial << "pppd" << m_device << "call" << connectScript; |
56 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), | 56 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
57 | this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) ); | 57 | this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) ); |
58 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { | 58 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { |
59 | qWarning("could not start"); | 59 | owarn << "could not start" << oendl; |
60 | delete pppDial; | 60 | delete pppDial; |
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
64 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { | 64 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { |
65 | QCString str(cha, len ); | 65 | QCString str(cha, len ); |
66 | outPut->insertLine( str ); | 66 | outPut->insertLine( str ); |
67 | delete pppDial; | 67 | delete pppDial; |
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp index fc76301..4469129 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | |||
@@ -66,17 +66,17 @@ void RfcommAssignDialog::newDevice( const QString & mac ) | |||
66 | if ( QPEApplication::execDialog( &dialog ) == QDialog::Accepted ) | 66 | if ( QPEApplication::execDialog( &dialog ) == QDialog::Accepted ) |
67 | { | 67 | { |
68 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); | 68 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); |
69 | m_itemList.insert( i , rfcomm ); | 69 | m_itemList.insert( i , rfcomm ); |
70 | rfcomm->setIdent( i ); | 70 | rfcomm->setIdent( i ); |
71 | rfcomm->setMac( mac ); | 71 | rfcomm->setMac( mac ); |
72 | rfcomm->setChannel( newDev->channel() ); | 72 | rfcomm->setChannel( newDev->channel() ); |
73 | rfcomm->setComment( newDev->comment() ); | 73 | rfcomm->setComment( newDev->comment() ); |
74 | qDebug( "New device set up" ); | 74 | odebug << "New device set up" << oendl; |
75 | } | 75 | } |
76 | } | 76 | } |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | void RfcommAssignDialog::loadConfig() | 80 | void RfcommAssignDialog::loadConfig() |
81 | { | 81 | { |
82 | 82 | ||
@@ -87,17 +87,17 @@ void RfcommAssignDialog::loadConfig() | |||
87 | // cfg.setGroup( QString("%1").arg( i ) ); | 87 | // cfg.setGroup( QString("%1").arg( i ) ); |
88 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); | 88 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); |
89 | m_itemList.insert( i , rfcomm ); | 89 | m_itemList.insert( i , rfcomm ); |
90 | rfcomm->setIdent( i ); | 90 | rfcomm->setIdent( i ); |
91 | QMap<QString, RfCommConfObject*>::Iterator it; | 91 | QMap<QString, RfCommConfObject*>::Iterator it; |
92 | it = confHandler->foundEntries().find( QString("%1").arg( i ) ); | 92 | it = confHandler->foundEntries().find( QString("%1").arg( i ) ); |
93 | if ( it != confHandler->foundEntries().end() ) | 93 | if ( it != confHandler->foundEntries().end() ) |
94 | { | 94 | { |
95 | qDebug( "Found key in foundEntries() " ); | 95 | odebug << "Found key in foundEntries() " << oendl; |
96 | rfcomm->setMac( it.data()->mac() ); | 96 | rfcomm->setMac( it.data()->mac() ); |
97 | rfcomm->setChannel( it.data()->channel() ); | 97 | rfcomm->setChannel( it.data()->channel() ); |
98 | rfcomm->setComment( it.data()->comment() ); | 98 | rfcomm->setComment( it.data()->comment() ); |
99 | } | 99 | } |
100 | /* Use rfcomm.conf directly for now | 100 | /* Use rfcomm.conf directly for now |
101 | * rfcomm->setMac( cfg.readEntry( "mac", "" ) ); | 101 | * rfcomm->setMac( cfg.readEntry( "mac", "" ) ); |
102 | * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) ); | 102 | * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) ); |
103 | * rfcomm->setComment( cfg.readEntry( "comment", "" ) ); | 103 | * rfcomm->setComment( cfg.readEntry( "comment", "" ) ); |
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp index 20453e8..2ef95ff 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp +++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp | |||
@@ -87,28 +87,28 @@ void RfCommConfHandler::load() { | |||
87 | QString comment; | 87 | QString comment; |
88 | 88 | ||
89 | for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ ) { | 89 | for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ ) { |
90 | 90 | ||
91 | QString tmpLine = ( *line ).stripWhiteSpace(); | 91 | QString tmpLine = ( *line ).stripWhiteSpace(); |
92 | 92 | ||
93 | if ( tmpLine.startsWith("rfcomm") ) { | 93 | if ( tmpLine.startsWith("rfcomm") ) { |
94 | QString number = tmpLine.mid( 6,1 ); | 94 | QString number = tmpLine.mid( 6,1 ); |
95 | qDebug( tmpLine ); | 95 | odebug << tmpLine << oendl; |
96 | qDebug( "TEST " + number ); | 96 | odebug << "TEST " + number << oendl; |
97 | } else if ( tmpLine.startsWith( "}" ) ) { | 97 | } else if ( tmpLine.startsWith( "}" ) ) { |
98 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); | 98 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); |
99 | } else if ( tmpLine.startsWith( "device" ) ) { | 99 | } else if ( tmpLine.startsWith( "device" ) ) { |
100 | mac = tmpLine.mid( 7, 17 ); | 100 | mac = tmpLine.mid( 7, 17 ); |
101 | qDebug( "mac" + mac ); | 101 | odebug << "mac" + mac << oendl; |
102 | } else if ( tmpLine.startsWith( "channel" ) ) { | 102 | } else if ( tmpLine.startsWith( "channel" ) ) { |
103 | channel = tmpLine.mid( 8, 1 ); | 103 | channel = tmpLine.mid( 8, 1 ); |
104 | qDebug ( "Channel :" + channel ); | 104 | qDebug ( "Channel :" + channel ); |
105 | } else if ( tmpLine.startsWith( "comment" ) ) { | 105 | } else if ( tmpLine.startsWith( "comment" ) ) { |
106 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); | 106 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); |
107 | qDebug( "Comment: " + comment ); | 107 | odebug << "Comment: " + comment << oendl; |
108 | } | 108 | } |
109 | } | 109 | } |
110 | rfCommConf.close(); | 110 | rfCommConf.close(); |
111 | } | 111 | } |
112 | save( m_foundEntries ); | 112 | save( m_foundEntries ); |
113 | qDebug( QString( "ENTries: %1").arg( m_foundEntries.count() ) ); | 113 | odebug << QString( "ENTries: %1").arg( m_foundEntries.count() ) << oendl; |
114 | } | 114 | } |
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index 04bfe48..01ad616 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp | |||
@@ -12,17 +12,17 @@ | |||
12 | using namespace OpieTooth; | 12 | using namespace OpieTooth; |
13 | 13 | ||
14 | /* | 14 | /* |
15 | * c'tor init the QAction | 15 | * c'tor init the QAction |
16 | */ | 16 | */ |
17 | RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) | 17 | RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) |
18 | : QPopupMenu() | 18 | : QPopupMenu() |
19 | { | 19 | { |
20 | qWarning("RfcCommPopup c'tor"); | 20 | owarn << "RfcCommPopup c'tor" << oendl; |
21 | 21 | ||
22 | QAction* a; | 22 | QAction* a; |
23 | 23 | ||
24 | 24 | ||
25 | m_item = item; | 25 | m_item = item; |
26 | 26 | ||
27 | /* connect action */ | 27 | /* connect action */ |
28 | a = new QAction( ); // so it's get deleted | 28 | a = new QAction( ); // so it's get deleted |
@@ -65,26 +65,26 @@ RfcCommPopup::~RfcCommPopup() | |||
65 | delete m_foo; | 65 | delete m_foo; |
66 | delete m_bar; */ | 66 | delete m_bar; */ |
67 | } | 67 | } |
68 | 68 | ||
69 | 69 | ||
70 | void RfcCommPopup::slotConnect() | 70 | void RfcCommPopup::slotConnect() |
71 | { | 71 | { |
72 | 72 | ||
73 | qWarning("connect"); | 73 | owarn << "connect" << oendl; |
74 | 74 | ||
75 | PPPDialog pppDialog; | 75 | PPPDialog pppDialog; |
76 | QPEApplication::execDialog( &pppDialog ); | 76 | QPEApplication::execDialog( &pppDialog ); |
77 | } | 77 | } |
78 | 78 | ||
79 | 79 | ||
80 | void RfcCommPopup::slotDisconnect() | 80 | void RfcCommPopup::slotDisconnect() |
81 | { | 81 | { |
82 | qWarning("slot disconnected"); | 82 | owarn << "slot disconnected" << oendl; |
83 | } | 83 | } |
84 | 84 | ||
85 | 85 | ||
86 | void RfcCommPopup::slotBind() | 86 | void RfcCommPopup::slotBind() |
87 | { | 87 | { |
88 | RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp ); | 88 | RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp ); |
89 | 89 | ||
90 | rfcommAssign.newDevice( m_item->mac() ); | 90 | rfcommAssign.newDevice( m_item->mac() ); |
@@ -93,11 +93,11 @@ void RfcCommPopup::slotBind() | |||
93 | { | 93 | { |
94 | rfcommAssign.saveConfig(); | 94 | rfcommAssign.saveConfig(); |
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | 98 | ||
99 | void RfcCommPopup::slotBar() | 99 | void RfcCommPopup::slotBar() |
100 | { | 100 | { |
101 | qWarning("slotBar"); | 101 | owarn << "slotBar" << oendl; |
102 | }; | 102 | }; |
103 | 103 | ||
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index c8ea3e3..3b005c4 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp | |||
@@ -150,12 +150,12 @@ namespace OpieTooth { | |||
150 | } | 150 | } |
151 | emit selectedDevices( deviceList ); | 151 | emit selectedDevices( deviceList ); |
152 | } | 152 | } |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * Cleanup | 155 | * Cleanup |
156 | */ | 156 | */ |
157 | ScanDialog::~ScanDialog() { | 157 | ScanDialog::~ScanDialog() { |
158 | qWarning("delete scan dialog"); | 158 | owarn << "delete scan dialog" << oendl; |
159 | delete localDevice; | 159 | delete localDevice; |
160 | } | 160 | } |
161 | } | 161 | } |