-rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/main.cc | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlg.cc | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bticonloader.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btserviceitem.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/hciconfwrapper.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/rfcommassigndialogitem.cpp | 1 |
7 files changed, 1 insertions, 8 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index b76b397..817936d 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -1,84 +1,83 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> | 3 | .=l. Copyright (c) 2002 Maximilian Reiss <max.reiss@gmx.de> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <, > . <= redistribute it and/or modify it under | 6 | .> <, > . <= redistribute it and/or modify it under |
7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%+i> _;_. | 11 | .%+i> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. . .: details. | 18 | ++= -. . .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-= this library; see the file COPYING.LIB. | 22 | -- :-= this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | #include "bluezapplet.h" | 30 | #include "bluezapplet.h" |
31 | #include <qapplication.h> | 31 | #include <qapplication.h> |
32 | 32 | ||
33 | #include <qpe/resource.h> | ||
34 | #include <qpe/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
35 | #include <qpe/resource.h> | ||
36 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/resource.h> | ||
37 | 36 | ||
38 | #include <opie/odevice.h> | 37 | #include <opie/odevice.h> |
39 | 38 | ||
40 | #include <qpoint.h> | 39 | #include <qpoint.h> |
41 | #include <qpainter.h> | 40 | #include <qpainter.h> |
42 | #include <qlayout.h> | 41 | #include <qlayout.h> |
43 | #include <qframe.h> | 42 | #include <qframe.h> |
44 | #include <qpixmap.h> | 43 | #include <qpixmap.h> |
45 | #include <qstring.h> | 44 | #include <qstring.h> |
46 | #include <qtimer.h> | 45 | #include <qtimer.h> |
47 | #include <qpopupmenu.h> | 46 | #include <qpopupmenu.h> |
48 | 47 | ||
49 | #include <device.h> | 48 | #include <device.h> |
50 | 49 | ||
51 | using namespace Opie; | 50 | using namespace Opie; |
52 | 51 | ||
53 | namespace OpieTooth { | 52 | namespace OpieTooth { |
54 | 53 | ||
55 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { | 54 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { |
56 | setFixedHeight( 18 ); | 55 | setFixedHeight( 18 ); |
57 | setFixedWidth( 14 ); | 56 | setFixedWidth( 14 ); |
58 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 57 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); |
59 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 58 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); |
60 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 59 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); |
61 | startTimer(4000); | 60 | startTimer(4000); |
62 | btDevice = 0; | 61 | btDevice = 0; |
63 | bluezactive = false; | 62 | bluezactive = false; |
64 | bluezDiscoveryActive = false; | 63 | bluezDiscoveryActive = false; |
65 | 64 | ||
66 | } | 65 | } |
67 | 66 | ||
68 | BluezApplet::~BluezApplet() { | 67 | BluezApplet::~BluezApplet() { |
69 | if ( btDevice ) { | 68 | if ( btDevice ) { |
70 | delete btDevice; | 69 | delete btDevice; |
71 | } | 70 | } |
72 | } | 71 | } |
73 | 72 | ||
74 | bool BluezApplet::checkBluezStatus() { | 73 | bool BluezApplet::checkBluezStatus() { |
75 | if (btDevice) { | 74 | if (btDevice) { |
76 | if (btDevice->isLoaded() ) { | 75 | if (btDevice->isLoaded() ) { |
77 | return true; | 76 | return true; |
78 | } else { | 77 | } else { |
79 | return false; | 78 | return false; |
80 | } | 79 | } |
81 | } else { | 80 | } else { |
82 | return false; | 81 | return false; |
83 | } | 82 | } |
84 | } | 83 | } |
diff --git a/noncore/net/opietooth/blue-pin/main.cc b/noncore/net/opietooth/blue-pin/main.cc index 1b7daec..aa360aa 100644 --- a/noncore/net/opietooth/blue-pin/main.cc +++ b/noncore/net/opietooth/blue-pin/main.cc | |||
@@ -1,39 +1,38 @@ | |||
1 | #include <stdio.h> | 1 | #include <stdio.h> |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | 3 | ||
4 | 4 | ||
5 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
6 | #include <qpe/config.h> | ||
7 | 6 | ||
8 | #include "pindlg.h" | 7 | #include "pindlg.h" |
9 | 8 | ||
10 | 9 | ||
11 | int main( int argc, char* argv[] ) | 10 | int main( int argc, char* argv[] ) |
12 | { | 11 | { |
13 | if (argc < 2 ) { | 12 | if (argc < 2 ) { |
14 | printf("ERR\n"); | 13 | printf("ERR\n"); |
15 | exit(0); | 14 | exit(0); |
16 | } | 15 | } |
17 | QCString dir(argv[1] ); | 16 | QCString dir(argv[1] ); |
18 | QCString bdaddr( argv[2] ); | 17 | QCString bdaddr( argv[2] ); |
19 | QCString name; | 18 | QCString name; |
20 | if ( argc > 3 ) { | 19 | if ( argc > 3 ) { |
21 | name = argv[3]; | 20 | name = argv[3]; |
22 | } | 21 | } |
23 | QPEApplication a(argc, argv ); | 22 | QPEApplication a(argc, argv ); |
24 | QString status; | 23 | QString status; |
25 | if (dir == "out" ) { | 24 | if (dir == "out" ) { |
26 | status = QObject::tr("Outgoing connection to "); | 25 | status = QObject::tr("Outgoing connection to "); |
27 | }else | 26 | }else |
28 | status = QObject::tr("Incoming connection from "); | 27 | status = QObject::tr("Incoming connection from "); |
29 | status += name; | 28 | status += name; |
30 | status += "<br>"; | 29 | status += "<br>"; |
31 | status += "[" + bdaddr + "]"; | 30 | status += "[" + bdaddr + "]"; |
32 | OpieTooth::PinDlg dlg( status, bdaddr ); | 31 | OpieTooth::PinDlg dlg( status, bdaddr ); |
33 | if ( dlg.exec() ) { | 32 | if ( dlg.exec() ) { |
34 | printf("PIN:%s\n", dlg.pin().stripWhiteSpace().latin1() ); | 33 | printf("PIN:%s\n", dlg.pin().stripWhiteSpace().latin1() ); |
35 | }else | 34 | }else |
36 | printf("ERR\n"); | 35 | printf("ERR\n"); |
37 | return 0; | 36 | return 0; |
38 | } | 37 | } |
39 | 38 | ||
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc index 9418a20..f0b2309 100644 --- a/noncore/net/opietooth/blue-pin/pindlg.cc +++ b/noncore/net/opietooth/blue-pin/pindlg.cc | |||
@@ -1,60 +1,59 @@ | |||
1 | 1 | ||
2 | #include "pindlg.h" | 2 | #include "pindlg.h" |
3 | 3 | ||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | 7 | ||
8 | /* QT */ | 8 | /* QT */ |
9 | #include <qcheckbox.h> | 9 | #include <qcheckbox.h> |
10 | #include <qlabel.h> | 10 | #include <qlabel.h> |
11 | #include <qlineedit.h> | 11 | #include <qlineedit.h> |
12 | #include <qtimer.h> | ||
13 | 12 | ||
14 | /* STD */ | 13 | /* STD */ |
15 | #include <stdio.h> | 14 | #include <stdio.h> |
16 | 15 | ||
17 | using namespace OpieTooth; | 16 | using namespace OpieTooth; |
18 | 17 | ||
19 | PinDlg::PinDlg( const QString& status, | 18 | PinDlg::PinDlg( const QString& status, |
20 | const QString& mac, QWidget* parent, | 19 | const QString& mac, QWidget* parent, |
21 | const char* name ) | 20 | const char* name ) |
22 | : PinDlgBase( parent, name, WType_Modal ) | 21 | : PinDlgBase( parent, name, WType_Modal ) |
23 | { | 22 | { |
24 | m_mac = mac; | 23 | m_mac = mac; |
25 | test( mac ); | 24 | test( mac ); |
26 | txtStatus->setText(status); | 25 | txtStatus->setText(status); |
27 | QPEApplication::showDialog( this ); | 26 | QPEApplication::showDialog( this ); |
28 | } | 27 | } |
29 | 28 | ||
30 | PinDlg::~PinDlg() | 29 | PinDlg::~PinDlg() |
31 | {} | 30 | {} |
32 | void PinDlg::setMac( const QString& mac ) | 31 | void PinDlg::setMac( const QString& mac ) |
33 | { | 32 | { |
34 | txtStatus->setText( mac ); | 33 | txtStatus->setText( mac ); |
35 | } | 34 | } |
36 | QString PinDlg::pin() const | 35 | QString PinDlg::pin() const |
37 | { | 36 | { |
38 | return lnePin->text(); | 37 | return lnePin->text(); |
39 | } | 38 | } |
40 | 39 | ||
41 | void PinDlg::test( const QString& mac ) | 40 | void PinDlg::test( const QString& mac ) |
42 | { | 41 | { |
43 | if (!mac.isEmpty() ) | 42 | if (!mac.isEmpty() ) |
44 | { | 43 | { |
45 | Config cfg("bluepin"); | 44 | Config cfg("bluepin"); |
46 | cfg.setGroup(mac); | 45 | cfg.setGroup(mac); |
47 | lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) ); | 46 | lnePin->setText(cfg.readEntryCrypt("pin", QString::null ) ); |
48 | if ( !lnePin->text().isEmpty() ) | 47 | if ( !lnePin->text().isEmpty() ) |
49 | { | 48 | { |
50 | //QTimer::singleShot(100, this, SLOT(accept() ) ); | 49 | //QTimer::singleShot(100, this, SLOT(accept() ) ); |
51 | } | 50 | } |
52 | 51 | ||
53 | } | 52 | } |
54 | 53 | ||
55 | } | 54 | } |
56 | void PinDlg::accept() | 55 | void PinDlg::accept() |
57 | { | 56 | { |
58 | if ( ckbPin->isChecked() ) | 57 | if ( ckbPin->isChecked() ) |
59 | { | 58 | { |
60 | Config cfg("bluepin"); | 59 | Config cfg("bluepin"); |
diff --git a/noncore/net/opietooth/manager/bticonloader.cpp b/noncore/net/opietooth/manager/bticonloader.cpp index e5d8092..6bac256 100644 --- a/noncore/net/opietooth/manager/bticonloader.cpp +++ b/noncore/net/opietooth/manager/bticonloader.cpp | |||
@@ -1,52 +1,51 @@ | |||
1 | 1 | ||
2 | #include "bticonloader.h" | 2 | #include "bticonloader.h" |
3 | 3 | ||
4 | #include <qpixmap.h> | ||
5 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
6 | 5 | ||
7 | namespace OpieTooth { | 6 | namespace OpieTooth { |
8 | 7 | ||
9 | 8 | ||
10 | BTIconLoader::BTIconLoader() { | 9 | BTIconLoader::BTIconLoader() { |
11 | 10 | ||
12 | // still need to find out real ids | 11 | // still need to find out real ids |
13 | deviceIcons.insert( 100 , "computer_16" ); | 12 | deviceIcons.insert( 100 , "computer_16" ); |
14 | deviceIcons.insert( 101 , "phone_16" ); | 13 | deviceIcons.insert( 101 , "phone_16" ); |
15 | deviceIcons.insert( 102 , "brain_16" ); | 14 | deviceIcons.insert( 102 , "brain_16" ); |
16 | deviceIcons.insert( 103 , "conduit_16" ); | 15 | deviceIcons.insert( 103 , "conduit_16" ); |
17 | 16 | ||
18 | 17 | ||
19 | serviceIcons.insert( 4357 , "obex_16" ); //OBEXObjectPush | 18 | serviceIcons.insert( 4357 , "obex_16" ); //OBEXObjectPush |
20 | serviceIcons.insert( 4358 , "obex_16" ); //OBEXFileTransfer | 19 | serviceIcons.insert( 4358 , "obex_16" ); //OBEXFileTransfer |
21 | serviceIcons.insert( 4369 , "print_16" ); //Fax | 20 | serviceIcons.insert( 4369 , "print_16" ); //Fax |
22 | serviceIcons.insert( 4353 , "serial_16" ); //SerialPort | 21 | serviceIcons.insert( 4353 , "serial_16" ); //SerialPort |
23 | serviceIcons.insert( 4356 , "sync_16" ); //IrMCSync | 22 | serviceIcons.insert( 4356 , "sync_16" ); //IrMCSync |
24 | serviceIcons.insert( 4359 , "sync_16" ); //IrMCSyncCommand | 23 | serviceIcons.insert( 4359 , "sync_16" ); //IrMCSyncCommand |
25 | serviceIcons.insert( 4354 , "network_16" ); //LANAccessUsingPPP | 24 | serviceIcons.insert( 4354 , "network_16" ); //LANAccessUsingPPP |
26 | serviceIcons.insert( 4355 , "network_16"); //DialupNetworking | 25 | serviceIcons.insert( 4355 , "network_16"); //DialupNetworking |
27 | serviceIcons.insert( 4360 , "phone_16"); // Headset | 26 | serviceIcons.insert( 4360 , "phone_16"); // Headset |
28 | serviceIcons.insert( 4370 , "audio_16"); //HeadsetAudioGateway | 27 | serviceIcons.insert( 4370 , "audio_16"); //HeadsetAudioGateway |
29 | serviceIcons.insert( 4374 , "network_16"); // Network Access Point | 28 | serviceIcons.insert( 4374 , "network_16"); // Network Access Point |
30 | serviceIcons.insert( 4361 , "phone_16"); // CordlessTelephony | 29 | serviceIcons.insert( 4361 , "phone_16"); // CordlessTelephony |
31 | serviceIcons.insert( 4362 , "audio_16"); // AudioSource | 30 | serviceIcons.insert( 4362 , "audio_16"); // AudioSource |
32 | serviceIcons.insert( 4363 , "audio_16"); // AudioSink | 31 | serviceIcons.insert( 4363 , "audio_16"); // AudioSink |
33 | serviceIcons.insert( 4390 , "print_16" ); //HCR_Print | 32 | serviceIcons.insert( 4390 , "print_16" ); //HCR_Print |
34 | serviceIcons.insert( 4392 , "phone_16" ); //Common_ISDN_Access | 33 | serviceIcons.insert( 4392 , "phone_16" ); //Common_ISDN_Access |
35 | 34 | ||
36 | serviceIcons.insert( 4609 , "network_16" ); //GenericNetworking | 35 | serviceIcons.insert( 4609 , "network_16" ); //GenericNetworking |
37 | serviceIcons.insert( 4610 , "folder_16" ); //GenericFileTransfer | 36 | serviceIcons.insert( 4610 , "folder_16" ); //GenericFileTransfer |
38 | serviceIcons.insert( 4392 , "audio_16" ); //GenericAudio | 37 | serviceIcons.insert( 4392 , "audio_16" ); //GenericAudio |
39 | // serviceIcons.insert( 4392 , "phone_16" ); //GenericTelephony | 38 | // serviceIcons.insert( 4392 , "phone_16" ); //GenericTelephony |
40 | // the above is duplicated? -zecke | 39 | // the above is duplicated? -zecke |
41 | 40 | ||
42 | //serviceIcons.insert( "106" , "link_16" ); | 41 | //serviceIcons.insert( "106" , "link_16" ); |
43 | //serviceIcons.insert( "107" , "misc_16" ); | 42 | //serviceIcons.insert( "107" , "misc_16" ); |
44 | } | 43 | } |
45 | 44 | ||
46 | BTIconLoader::~BTIconLoader() { | 45 | BTIconLoader::~BTIconLoader() { |
47 | } | 46 | } |
48 | 47 | ||
49 | QPixmap BTIconLoader::deviceIcon( int deviceClass ) { | 48 | QPixmap BTIconLoader::deviceIcon( int deviceClass ) { |
50 | 49 | ||
51 | QString iconName; | 50 | QString iconName; |
52 | 51 | ||
diff --git a/noncore/net/opietooth/manager/btserviceitem.cpp b/noncore/net/opietooth/manager/btserviceitem.cpp index 7db93c9..fb5f21e 100644 --- a/noncore/net/opietooth/manager/btserviceitem.cpp +++ b/noncore/net/opietooth/manager/btserviceitem.cpp | |||
@@ -1,26 +1,25 @@ | |||
1 | 1 | ||
2 | #include <qobject.h> | ||
3 | #include "btserviceitem.h" | 2 | #include "btserviceitem.h" |
4 | 3 | ||
5 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
6 | 5 | ||
7 | BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv ) | 6 | BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv ) |
8 | : BTListItem( item ) { | 7 | : BTListItem( item ) { |
9 | m_service = serv; | 8 | m_service = serv; |
10 | setText(0, QObject::tr(serv.serviceName() ) ); | 9 | setText(0, QObject::tr(serv.serviceName() ) ); |
11 | } | 10 | } |
12 | BTServiceItem::~BTServiceItem() { | 11 | BTServiceItem::~BTServiceItem() { |
13 | 12 | ||
14 | } | 13 | } |
15 | QString BTServiceItem::type() const { | 14 | QString BTServiceItem::type() const { |
16 | return QString::fromLatin1("service"); | 15 | return QString::fromLatin1("service"); |
17 | } | 16 | } |
18 | int BTServiceItem::typeId() const { | 17 | int BTServiceItem::typeId() const { |
19 | return Service; | 18 | return Service; |
20 | } | 19 | } |
21 | Services BTServiceItem::services() const { | 20 | Services BTServiceItem::services() const { |
22 | return m_service; | 21 | return m_service; |
23 | } | 22 | } |
24 | int BTServiceItem::serviceId() const { | 23 | int BTServiceItem::serviceId() const { |
25 | return m_service.recHandle(); | 24 | return m_service.recHandle(); |
26 | }; | 25 | }; |
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index 46eed42..35e9cd9 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp | |||
@@ -1,53 +1,52 @@ | |||
1 | #include "hciconfwrapper.h" | 1 | #include "hciconfwrapper.h" |
2 | 2 | ||
3 | #include <qfile.h> | 3 | #include <qfile.h> |
4 | #include <qtextstream.h> | 4 | #include <qtextstream.h> |
5 | #include <qstringlist.h> | ||
6 | #include <qregexp.h> | 5 | #include <qregexp.h> |
7 | 6 | ||
8 | namespace OpieTooth { | 7 | namespace OpieTooth { |
9 | 8 | ||
10 | 9 | ||
11 | HciConfWrapper::HciConfWrapper( const QString &fileName) { | 10 | HciConfWrapper::HciConfWrapper( const QString &fileName) { |
12 | m_fileName = fileName; | 11 | m_fileName = fileName; |
13 | } | 12 | } |
14 | 13 | ||
15 | HciConfWrapper::~HciConfWrapper() { | 14 | HciConfWrapper::~HciConfWrapper() { |
16 | } | 15 | } |
17 | 16 | ||
18 | 17 | ||
19 | void HciConfWrapper::setPinHelper( const QString& app ) { | 18 | void HciConfWrapper::setPinHelper( const QString& app ) { |
20 | setValue( "pin_helper" , app ); | 19 | setValue( "pin_helper" , app ); |
21 | } | 20 | } |
22 | 21 | ||
23 | void HciConfWrapper::setName( const QString &name ) { | 22 | void HciConfWrapper::setName( const QString &name ) { |
24 | qDebug ("NAME : " + name); | 23 | qDebug ("NAME : " + name); |
25 | setValue( "name" , "\"" + name + "\"" ); | 24 | setValue( "name" , "\"" + name + "\"" ); |
26 | } | 25 | } |
27 | 26 | ||
28 | void HciConfWrapper::setIscan( bool enable) { | 27 | void HciConfWrapper::setIscan( bool enable) { |
29 | 28 | ||
30 | if ( enable ) { | 29 | if ( enable ) { |
31 | setValue( "iscan" , "enable" ); | 30 | setValue( "iscan" , "enable" ); |
32 | } else { | 31 | } else { |
33 | setValue( "iscan" , "disable" ); | 32 | setValue( "iscan" , "disable" ); |
34 | } | 33 | } |
35 | } | 34 | } |
36 | 35 | ||
37 | void HciConfWrapper::setPscan( bool enable) { | 36 | void HciConfWrapper::setPscan( bool enable) { |
38 | 37 | ||
39 | if ( enable ) { | 38 | if ( enable ) { |
40 | setValue( "pscan" , "enable" ); | 39 | setValue( "pscan" , "enable" ); |
41 | } else { | 40 | } else { |
42 | setValue( "pscan" , "disable" ); | 41 | setValue( "pscan" , "disable" ); |
43 | } | 42 | } |
44 | } | 43 | } |
45 | 44 | ||
46 | 45 | ||
47 | void HciConfWrapper::setAuth( bool enable) { | 46 | void HciConfWrapper::setAuth( bool enable) { |
48 | 47 | ||
49 | if ( enable ) { | 48 | if ( enable ) { |
50 | setValue( "auth" , "enable" ); | 49 | setValue( "auth" , "enable" ); |
51 | } else { | 50 | } else { |
52 | setValue( "auth" , "disable" ); | 51 | setValue( "auth" , "disable" ); |
53 | } | 52 | } |
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp index 1e7130f..a41f304 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp | |||
@@ -1,54 +1,53 @@ | |||
1 | 1 | ||
2 | #include "rfcommassigndialogitem.h" | 2 | #include "rfcommassigndialogitem.h" |
3 | 3 | ||
4 | #include <qlineedit.h> | 4 | #include <qlineedit.h> |
5 | #include <qcombobox.h> | 5 | #include <qcombobox.h> |
6 | #include <qlabel.h> | ||
7 | #include <qgroupbox.h> | 6 | #include <qgroupbox.h> |
8 | 7 | ||
9 | using namespace OpieTooth; | 8 | using namespace OpieTooth; |
10 | 9 | ||
11 | 10 | ||
12 | RfcommDialogItem::RfcommDialogItem( QWidget* parent, const char* name, WFlags fl ) | 11 | RfcommDialogItem::RfcommDialogItem( QWidget* parent, const char* name, WFlags fl ) |
13 | : RfcommDialogItemBase( parent, name, fl ) { | 12 | : RfcommDialogItemBase( parent, name, fl ) { |
14 | 13 | ||
15 | } | 14 | } |
16 | 15 | ||
17 | RfcommDialogItem::~RfcommDialogItem() { | 16 | RfcommDialogItem::~RfcommDialogItem() { |
18 | } | 17 | } |
19 | 18 | ||
20 | 19 | ||
21 | int RfcommDialogItem::ident() { | 20 | int RfcommDialogItem::ident() { |
22 | return m_ident; | 21 | return m_ident; |
23 | } | 22 | } |
24 | 23 | ||
25 | QString RfcommDialogItem::mac() { | 24 | QString RfcommDialogItem::mac() { |
26 | return m_macAddress->text(); | 25 | return m_macAddress->text(); |
27 | } | 26 | } |
28 | 27 | ||
29 | int RfcommDialogItem::channel() { | 28 | int RfcommDialogItem::channel() { |
30 | return m_channelDropdown->currentItem(); | 29 | return m_channelDropdown->currentItem(); |
31 | } | 30 | } |
32 | 31 | ||
33 | QString RfcommDialogItem::comment() { | 32 | QString RfcommDialogItem::comment() { |
34 | return m_commentLine->text(); | 33 | return m_commentLine->text(); |
35 | } | 34 | } |
36 | 35 | ||
37 | void RfcommDialogItem::setIdent( int ident ) { | 36 | void RfcommDialogItem::setIdent( int ident ) { |
38 | m_ident = ident; | 37 | m_ident = ident; |
39 | m_identLabel->setTitle( QString( "rfcomm%1").arg( ident ) ); | 38 | m_identLabel->setTitle( QString( "rfcomm%1").arg( ident ) ); |
40 | } | 39 | } |
41 | 40 | ||
42 | void RfcommDialogItem::setMac( const QString &mac ) { | 41 | void RfcommDialogItem::setMac( const QString &mac ) { |
43 | m_macAddress->setText( mac ); | 42 | m_macAddress->setText( mac ); |
44 | } | 43 | } |
45 | 44 | ||
46 | void RfcommDialogItem::setChannel( int channel ) { | 45 | void RfcommDialogItem::setChannel( int channel ) { |
47 | m_channelDropdown->setCurrentItem( channel ); | 46 | m_channelDropdown->setCurrentItem( channel ); |
48 | } | 47 | } |
49 | 48 | ||
50 | void RfcommDialogItem::setComment( const QString &comment ) { | 49 | void RfcommDialogItem::setComment( const QString &comment ) { |
51 | m_commentLine->setText( comment ); | 50 | m_commentLine->setText( comment ); |
52 | } | 51 | } |
53 | 52 | ||
54 | 53 | ||