19 files changed, 34 insertions, 6 deletions
diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in index 33ef9b2..8ac8ad6 100644 --- a/libopie2/opiepim/config.in +++ b/libopie2/opiepim/config.in | |||
@@ -1,21 +1,21 @@ | |||
1 | config LIBOPIE2PIM | 1 | config LIBOPIE2PIM |
2 | boolean "libopie2pim (pim related classes)" | 2 | boolean "libopie2pim (pim related classes)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIEDB2 |
5 | comment "libopie2pim needs a libqpe and libopie2core" | 5 | comment "libopie2pim needs a libqpe and libopie2core" |
6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE ) | 6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE ) |
7 | 7 | ||
8 | config SQL_PIM_BACKEND | 8 | config SQL_PIM_BACKEND |
9 | boolean "Enable SQL Backend for libopie2pim" | 9 | boolean "Enable SQL Backend for libopie2pim" |
10 | default n | 10 | default n |
11 | help | 11 | help |
12 | This adds the SQL-Support, using SQLite. Which database is used | 12 | This adds the SQL-Support, using SQLite. Which database is used |
13 | by the backends is defined by the file "pimaccess.conf" in the | 13 | by the backends is defined by the file "pimaccess.conf" in the |
14 | directory "Settings". | 14 | directory "Settings". |
15 | There currently do exist to groups "[contact]" and "[todo]". You can | 15 | There currently do exist to groups "[contact]" and "[todo]". You can |
16 | select the used backend by the variable "usebackend=<type>", where | 16 | select the used backend by the variable "usebackend=<type>", where |
17 | <type> is "sql" or "xml". "xml" is the default ! | 17 | <type> is "sql" or "xml". "xml" is the default ! |
18 | Important: The SQLite-library "libsqlite.so" must be installed ! | 18 | Important: The SQLite-library "libsqlite.so" must be installed ! |
19 | depends ( LIBOPIE2DB ) | 19 | depends ( LIBOPIE2DB ) |
20 | comment "SQL-Support needs libopie2db (and libsqlite)" | 20 | comment "SQL-Support needs libopie2db (and libsqlite)" |
21 | depends !( LIBOPIE2DB ) | 21 | depends !( LIBOPIE2DB ) |
diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp index ff69286..2181153 100644 --- a/library/qlibrary_unix.cpp +++ b/library/qlibrary_unix.cpp | |||
@@ -178,52 +178,52 @@ void* QLibraryPrivate::resolveSymbol( const char* symbol ) | |||
178 | NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol); | 178 | NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol); |
179 | void* address = 0; | 179 | void* address = 0; |
180 | if (sym != 0) { | 180 | if (sym != 0) { |
181 | address = NSAddressOfSymbol(sym); | 181 | address = NSAddressOfSymbol(sym); |
182 | } | 182 | } |
183 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) | 183 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) |
184 | if ( address == 0 ) | 184 | if ( address == 0 ) |
185 | qWarning( "Cannot find symbol: %s", symbol ); | 185 | qWarning( "Cannot find symbol: %s", symbol ); |
186 | #endif | 186 | #endif |
187 | return address; | 187 | return address; |
188 | } | 188 | } |
189 | 189 | ||
190 | #else | 190 | #else |
191 | // Something else, assuming POSIX | 191 | // Something else, assuming POSIX |
192 | #include <dlfcn.h> | 192 | #include <dlfcn.h> |
193 | 193 | ||
194 | bool QLibraryPrivate::loadLibrary() | 194 | bool QLibraryPrivate::loadLibrary() |
195 | { | 195 | { |
196 | if ( pHnd ) | 196 | if ( pHnd ) |
197 | return TRUE; | 197 | return TRUE; |
198 | 198 | ||
199 | QString filename = library->library(); | 199 | QString filename = library->library(); |
200 | 200 | ||
201 | pHnd = dlopen( filename.latin1() , RTLD_LAZY ); | 201 | pHnd = dlopen( filename.latin1() , RTLD_LAZY ); |
202 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) | 202 | // #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) |
203 | if ( !pHnd ) | 203 | if ( !pHnd ) |
204 | qWarning( "%s", dlerror() ); | 204 | qWarning( "%s", dlerror() ); |
205 | #endif | 205 | // #endif |
206 | return pHnd != 0; | 206 | return pHnd != 0; |
207 | } | 207 | } |
208 | 208 | ||
209 | bool QLibraryPrivate::freeLibrary() | 209 | bool QLibraryPrivate::freeLibrary() |
210 | { | 210 | { |
211 | if ( !pHnd ) | 211 | if ( !pHnd ) |
212 | return TRUE; | 212 | return TRUE; |
213 | 213 | ||
214 | int ec = dlclose( pHnd ); | 214 | int ec = dlclose( pHnd ); |
215 | if ( !ec ) | 215 | if ( !ec ) |
216 | pHnd = 0; | 216 | pHnd = 0; |
217 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) | 217 | #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) |
218 | else { | 218 | else { |
219 | const char* error = dlerror(); | 219 | const char* error = dlerror(); |
220 | if ( error ) | 220 | if ( error ) |
221 | qWarning( "%s", error ); | 221 | qWarning( "%s", error ); |
222 | } | 222 | } |
223 | #endif | 223 | #endif |
224 | return pHnd == 0; | 224 | return pHnd == 0; |
225 | } | 225 | } |
226 | 226 | ||
227 | void* QLibraryPrivate::resolveSymbol( const char* f ) | 227 | void* QLibraryPrivate::resolveSymbol( const char* f ) |
228 | { | 228 | { |
229 | if ( !pHnd ) | 229 | if ( !pHnd ) |
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 1d93f5c..66e8f01 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -14,48 +14,49 @@ | |||
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/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | 36 | ||
37 | #include <opie2/odevice.h> | 37 | #include <opie2/odevice.h> |
38 | #include <opie2/odebug.h> | ||
38 | 39 | ||
39 | #include <qpoint.h> | 40 | #include <qpoint.h> |
40 | #include <qpainter.h> | 41 | #include <qpainter.h> |
41 | #include <qlayout.h> | 42 | #include <qlayout.h> |
42 | #include <qframe.h> | 43 | #include <qframe.h> |
43 | #include <qpixmap.h> | 44 | #include <qpixmap.h> |
44 | #include <qstring.h> | 45 | #include <qstring.h> |
45 | #include <qtimer.h> | 46 | #include <qtimer.h> |
46 | #include <qpopupmenu.h> | 47 | #include <qpopupmenu.h> |
47 | 48 | ||
48 | #include <device.h> | 49 | #include <device.h> |
49 | 50 | ||
50 | using namespace Opie::Core; | 51 | using namespace Opie::Core; |
51 | 52 | ||
52 | namespace OpieTooth { | 53 | namespace OpieTooth { |
53 | 54 | ||
54 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { | 55 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { |
55 | setFixedHeight( 18 ); | 56 | setFixedHeight( 18 ); |
56 | setFixedWidth( 14 ); | 57 | setFixedWidth( 14 ); |
57 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 58 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); |
58 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 59 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); |
59 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 60 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); |
60 | startTimer(4000); | 61 | startTimer(4000); |
61 | btDevice = 0; | 62 | btDevice = 0; |
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index 37f2ae7..2d23b3a 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -1,24 +1,25 @@ | |||
1 | #include <opie2/odebug.h> | ||
1 | 2 | ||
2 | #include "startdunconnection.h" | 3 | #include "startdunconnection.h" |
3 | 4 | ||
4 | using namespace OpieTooth; | 5 | using namespace OpieTooth; |
5 | 6 | ||
6 | 7 | ||
7 | using namespace Opie::Core; | 8 | using namespace Opie::Core; |
8 | StartDunConnection::StartDunConnection() { | 9 | StartDunConnection::StartDunConnection() { |
9 | m_dunConnect = 0l; | 10 | m_dunConnect = 0l; |
10 | setConnectionType(); | 11 | setConnectionType(); |
11 | } | 12 | } |
12 | 13 | ||
13 | StartDunConnection::~StartDunConnection() { | 14 | StartDunConnection::~StartDunConnection() { |
14 | delete m_dunConnect; | 15 | delete m_dunConnect; |
15 | } | 16 | } |
16 | 17 | ||
17 | StartDunConnection::StartDunConnection( QString mac ) { | 18 | StartDunConnection::StartDunConnection( QString mac ) { |
18 | m_dunConnect = 0l; | 19 | m_dunConnect = 0l; |
19 | m_mac = mac; | 20 | m_mac = mac; |
20 | setConnectionType(); | 21 | setConnectionType(); |
21 | } | 22 | } |
22 | 23 | ||
23 | void StartDunConnection::setName( QString name ) { | 24 | void StartDunConnection::setName( QString name ) { |
24 | m_name = name; | 25 | m_name = name; |
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index 50afc9f..29b95e9 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -1,25 +1,25 @@ | |||
1 | 1 | #include <opie2/odebug.h> | |
2 | #include "startpanconnection.h" | 2 | #include "startpanconnection.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
8 | using namespace Opie::Core; | 8 | using namespace Opie::Core; |
9 | StartPanConnection::StartPanConnection() { | 9 | StartPanConnection::StartPanConnection() { |
10 | m_panConnect = 0l; | 10 | m_panConnect = 0l; |
11 | setConnectionType(); | 11 | setConnectionType(); |
12 | } | 12 | } |
13 | 13 | ||
14 | StartPanConnection::~StartPanConnection() { | 14 | StartPanConnection::~StartPanConnection() { |
15 | delete m_panConnect; | 15 | delete m_panConnect; |
16 | } | 16 | } |
17 | 17 | ||
18 | StartPanConnection::StartPanConnection( QString mac ) { | 18 | StartPanConnection::StartPanConnection( QString mac ) { |
19 | m_panConnect = 0l; | 19 | m_panConnect = 0l; |
20 | m_mac = mac; | 20 | m_mac = mac; |
21 | setConnectionType(); | 21 | setConnectionType(); |
22 | } | 22 | } |
23 | 23 | ||
24 | void StartPanConnection::setName( QString name ) { | 24 | void StartPanConnection::setName( QString name ) { |
25 | m_name = name; | 25 | m_name = name; |
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index b1cddd2..ee01b61 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -5,48 +5,50 @@ | |||
5 | * copyright : (c) 2002 by Maximilian Reiß | 5 | * copyright : (c) 2002 by Maximilian Reiß |
6 | * email : max.reiss@gmx.de | 6 | * email : max.reiss@gmx.de |
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include "bluebase.h" | 18 | #include "bluebase.h" |
19 | #include "scandialog.h" | 19 | #include "scandialog.h" |
20 | #include "hciconfwrapper.h" | 20 | #include "hciconfwrapper.h" |
21 | #include "devicehandler.h" | 21 | #include "devicehandler.h" |
22 | #include "btconnectionitem.h" | 22 | #include "btconnectionitem.h" |
23 | #include "rfcommassigndialogimpl.h" | 23 | #include "rfcommassigndialogimpl.h" |
24 | 24 | ||
25 | /* OPIE */ | 25 | /* OPIE */ |
26 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
27 | #include <qpe/resource.h> | 27 | #include <qpe/resource.h> |
28 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
29 | #include <opie2/odebug.h> | ||
30 | using namespace Opie::Core; | ||
29 | 31 | ||
30 | /* QT */ | 32 | /* QT */ |
31 | #include <qframe.h> | 33 | #include <qframe.h> |
32 | #include <qlabel.h> | 34 | #include <qlabel.h> |
33 | #include <qpushbutton.h> | 35 | #include <qpushbutton.h> |
34 | #include <qlayout.h> | 36 | #include <qlayout.h> |
35 | #include <qvariant.h> | 37 | #include <qvariant.h> |
36 | #include <qimage.h> | 38 | #include <qimage.h> |
37 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
38 | #include <qtabwidget.h> | 40 | #include <qtabwidget.h> |
39 | #include <qscrollview.h> | 41 | #include <qscrollview.h> |
40 | #include <qvbox.h> | 42 | #include <qvbox.h> |
41 | #include <qmessagebox.h> | 43 | #include <qmessagebox.h> |
42 | #include <qcheckbox.h> | 44 | #include <qcheckbox.h> |
43 | #include <qlineedit.h> | 45 | #include <qlineedit.h> |
44 | #include <qlistview.h> | 46 | #include <qlistview.h> |
45 | #include <qdir.h> | 47 | #include <qdir.h> |
46 | #include <qpopupmenu.h> | 48 | #include <qpopupmenu.h> |
47 | #include <qtimer.h> | 49 | #include <qtimer.h> |
48 | #include <qlist.h> | 50 | #include <qlist.h> |
49 | 51 | ||
50 | /* STD */ | 52 | /* STD */ |
51 | #include <remotedevice.h> | 53 | #include <remotedevice.h> |
52 | #include <services.h> | 54 | #include <services.h> |
diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in index ecebb9b..56d8b78 100644 --- a/noncore/net/opietooth/manager/config.in +++ b/noncore/net/opietooth/manager/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIETOOTH-MANAGER | 1 | config OPIETOOTH-MANAGER |
2 | boolean "opie-bluetoothmanager (Bluetooth manager)" | 2 | boolean "opie-bluetoothmanager (Bluetooth manager)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH && LIBOPIE2UI |
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp index bd34351..320ad44 100644 --- a/noncore/net/opietooth/manager/devicehandler.cpp +++ b/noncore/net/opietooth/manager/devicehandler.cpp | |||
@@ -1,29 +1,31 @@ | |||
1 | 1 | ||
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | 3 | ||
4 | #include <qdir.h> | 4 | #include <qdir.h> |
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | #include <opie2/odebug.h> | ||
7 | using namespace Opie::Core; | ||
6 | 8 | ||
7 | #include "devicehandler.h" | 9 | #include "devicehandler.h" |
8 | 10 | ||
9 | using namespace OpieTooth; | 11 | using namespace OpieTooth; |
10 | 12 | ||
11 | DeviceHandler::DeviceHandler() { | 13 | DeviceHandler::DeviceHandler() { |
12 | 14 | ||
13 | }; | 15 | }; |
14 | DeviceHandler::~DeviceHandler() { | 16 | DeviceHandler::~DeviceHandler() { |
15 | 17 | ||
16 | } | 18 | } |
17 | 19 | ||
18 | RemoteDevice::ValueList DeviceHandler::load() { | 20 | RemoteDevice::ValueList DeviceHandler::load() { |
19 | RemoteDevice::ValueList list; | 21 | RemoteDevice::ValueList list; |
20 | QString path = QDir::homeDirPath() + "/Settings/bluetooth"; | 22 | QString path = QDir::homeDirPath() + "/Settings/bluetooth"; |
21 | QDir deviceListSave( path); | 23 | QDir deviceListSave( path); |
22 | 24 | ||
23 | // list of .conf files | 25 | // list of .conf files |
24 | QStringList devicesFileList = deviceListSave.entryList(); | 26 | QStringList devicesFileList = deviceListSave.entryList(); |
25 | 27 | ||
26 | 28 | ||
27 | // cut .conf of to get the mac and also read the name entry in it. | 29 | // cut .conf of to get the mac and also read the name entry in it. |
28 | if (!devicesFileList.isEmpty() ) { | 30 | if (!devicesFileList.isEmpty() ) { |
29 | QString name; | 31 | QString name; |
diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp index 5b01d2f..10505a9 100644 --- a/noncore/net/opietooth/manager/dunpopup.cpp +++ b/noncore/net/opietooth/manager/dunpopup.cpp | |||
@@ -1,27 +1,29 @@ | |||
1 | #include <qpe/qcopenvelope_qws.h> | 1 | #include <qpe/qcopenvelope_qws.h> |
2 | 2 | ||
3 | #include <qtimer.h> | 3 | #include <qtimer.h> |
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
4 | 6 | ||
5 | #include "dunpopup.h" | 7 | #include "dunpopup.h" |
6 | 8 | ||
7 | using namespace OpieTooth; | 9 | using namespace OpieTooth; |
8 | 10 | ||
9 | /* | 11 | /* |
10 | * c'tor init the QAction | 12 | * c'tor init the QAction |
11 | */ | 13 | */ |
12 | DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | 14 | DunPopup::DunPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { |
13 | 15 | ||
14 | owarn << "DunPopup c'tor" << oendl; | 16 | owarn << "DunPopup c'tor" << oendl; |
15 | 17 | ||
16 | m_item = item; | 18 | m_item = item; |
17 | QAction *a, *b, *c; | 19 | QAction *a, *b, *c; |
18 | 20 | ||
19 | m_dunconnection = 0l; | 21 | m_dunconnection = 0l; |
20 | /* connect action */ | 22 | /* connect action */ |
21 | 23 | ||
22 | 24 | ||
23 | a = new QAction(); // so it's get deleted | 25 | a = new QAction(); // so it's get deleted |
24 | a->setText( tr("connect") ); | 26 | a->setText( tr("connect") ); |
25 | a->addTo( this ); | 27 | a->addTo( this ); |
26 | connect( a, SIGNAL( activated() ), this, SLOT( slotConnect() ) ); | 28 | connect( a, SIGNAL( activated() ), this, SLOT( slotConnect() ) ); |
27 | 29 | ||
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index 71c935c..ca2e7bd 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp | |||
@@ -1,30 +1,33 @@ | |||
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 <qregexp.h> | 5 | #include <qregexp.h> |
6 | 6 | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
7 | namespace OpieTooth { | 10 | namespace OpieTooth { |
8 | 11 | ||
9 | 12 | ||
10 | HciConfWrapper::HciConfWrapper( const QString &fileName) { | 13 | HciConfWrapper::HciConfWrapper( const QString &fileName) { |
11 | m_fileName = fileName; | 14 | m_fileName = fileName; |
12 | } | 15 | } |
13 | 16 | ||
14 | HciConfWrapper::~HciConfWrapper() { | 17 | HciConfWrapper::~HciConfWrapper() { |
15 | } | 18 | } |
16 | 19 | ||
17 | 20 | ||
18 | void HciConfWrapper::setPinHelper( const QString& app ) { | 21 | void HciConfWrapper::setPinHelper( const QString& app ) { |
19 | setValue( "pin_helper" , app ); | 22 | setValue( "pin_helper" , app ); |
20 | } | 23 | } |
21 | 24 | ||
22 | void HciConfWrapper::setName( const QString &name ) { | 25 | void HciConfWrapper::setName( const QString &name ) { |
23 | qDebug ("NAME : " + name); | 26 | qDebug ("NAME : " + name); |
24 | setValue( "name" , "\"" + name + "\"" ); | 27 | setValue( "name" , "\"" + name + "\"" ); |
25 | } | 28 | } |
26 | 29 | ||
27 | void HciConfWrapper::setIscan( bool enable) { | 30 | void HciConfWrapper::setIscan( bool enable) { |
28 | 31 | ||
29 | if ( enable ) { | 32 | if ( enable ) { |
30 | setValue( "iscan" , "enable" ); | 33 | setValue( "iscan" , "enable" ); |
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 238acb3..5c05b4d 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro | |||
@@ -1,30 +1,30 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | HEADERS = btconnectionitem.h btdeviceitem.h \ | 2 | HEADERS = btconnectionitem.h btdeviceitem.h \ |
3 | btserviceitem.h stdpopups.h \ | 3 | btserviceitem.h stdpopups.h \ |
4 | popuphelper.h bluebase.h \ | 4 | popuphelper.h bluebase.h \ |
5 | scandialog.h btlistitem.h \ | 5 | scandialog.h btlistitem.h \ |
6 | hciconfwrapper.h bticonloader.h \ | 6 | hciconfwrapper.h bticonloader.h \ |
7 | pppdialog.h obexdialog.h \ | 7 | pppdialog.h obexdialog.h \ |
8 | rfcommassigndialogimpl.h rfcommassigndialogitem.h \ | 8 | rfcommassigndialogimpl.h rfcommassigndialogitem.h \ |
9 | devicehandler.h rfcpopup.h obexpopup.h \ | 9 | devicehandler.h rfcpopup.h obexpopup.h \ |
10 | rfcommhelper.h panpopup.h dunpopup.h rfcommconfhandler.h | 10 | rfcommhelper.h panpopup.h dunpopup.h rfcommconfhandler.h |
11 | 11 | ||
12 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | 12 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ |
13 | btserviceitem.cpp stdpopups.cpp \ | 13 | btserviceitem.cpp stdpopups.cpp \ |
14 | popuphelper.cpp main.cpp \ | 14 | popuphelper.cpp main.cpp \ |
15 | bluebase.cpp scandialog.cpp \ | 15 | bluebase.cpp scandialog.cpp \ |
16 | btlistitem.cpp hciconfwrapper.cpp \ | 16 | btlistitem.cpp hciconfwrapper.cpp \ |
17 | bticonloader.cpp pppdialog.cpp \ | 17 | bticonloader.cpp pppdialog.cpp \ |
18 | rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \ | 18 | rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \ |
19 | obexdialog.cpp devicehandler.cpp \ | 19 | obexdialog.cpp devicehandler.cpp \ |
20 | rfcpopup.cpp obexpopup.cpp \ | 20 | rfcpopup.cpp obexpopup.cpp \ |
21 | rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp | 21 | rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp |
22 | INCLUDEPATH += $(OPIEDIR)/include | 22 | INCLUDEPATH += $(OPIEDIR)/include |
23 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 23 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
24 | DEPENDPATH += $(OPIEDIR)/include | 24 | DEPENDPATH += $(OPIEDIR)/include |
25 | LIBS += -lqpe -lopietooth -lopiecore2 | 25 | LIBS += -lqpe -lopietooth -lopiecore2 -lopieui2 |
26 | INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui | 26 | INTERFACES = bluetoothbase.ui devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui |
27 | 27 | ||
28 | TARGET = bluetooth-manager | 28 | TARGET = bluetooth-manager |
29 | 29 | ||
30 | include ( $(OPIEDIR)/include.pro ) | 30 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index 3a3dbb0..951d87a 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -1,37 +1,39 @@ | |||
1 | 1 | ||
2 | #include "obexdialog.h" | 2 | #include "obexdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
9 | 9 | ||
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include <opie2/oprocess.h> | 12 | #include <opie2/oprocess.h> |
13 | #include <opie2/ofiledialog.h> | 13 | #include <opie2/ofiledialog.h> |
14 | #include <opie2/odebug.h> | ||
15 | using namespace Opie::Core; | ||
14 | 16 | ||
15 | using namespace OpieTooth; | 17 | using namespace OpieTooth; |
16 | 18 | ||
17 | using namespace Opie::Core; | 19 | using namespace Opie::Core; |
18 | using namespace Opie::Ui; | 20 | using namespace Opie::Ui; |
19 | using namespace Opie::Core; | 21 | using namespace Opie::Core; |
20 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 22 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
21 | : QDialog( parent, name, modal, fl ) { | 23 | : QDialog( parent, name, modal, fl ) { |
22 | 24 | ||
23 | if ( !name ) | 25 | if ( !name ) |
24 | setName( "ObexDialog" ); | 26 | setName( "ObexDialog" ); |
25 | setCaption( tr( "beam files " ) ) ; | 27 | setCaption( tr( "beam files " ) ) ; |
26 | 28 | ||
27 | m_device = device; | 29 | m_device = device; |
28 | 30 | ||
29 | layout = new QVBoxLayout( this ); | 31 | layout = new QVBoxLayout( this ); |
30 | 32 | ||
31 | QLabel* info = new QLabel( this ); | 33 | QLabel* info = new QLabel( this ); |
32 | info->setText( tr("Which file should be beamed?") ); | 34 | info->setText( tr("Which file should be beamed?") ); |
33 | 35 | ||
34 | cmdLine = new QLineEdit( this ); | 36 | cmdLine = new QLineEdit( this ); |
35 | 37 | ||
36 | QPushButton *browserButton; | 38 | QPushButton *browserButton; |
37 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); | 39 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); |
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp index 9a50199..010f7de 100644 --- a/noncore/net/opietooth/manager/obexpopup.cpp +++ b/noncore/net/opietooth/manager/obexpopup.cpp | |||
@@ -1,30 +1,32 @@ | |||
1 | 1 | ||
2 | #include "obexdialog.h" | 2 | #include "obexdialog.h" |
3 | #include "obexpopup.h" | 3 | #include "obexpopup.h" |
4 | 4 | ||
5 | /* OPIE */ | 5 | /* OPIE */ |
6 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
7 | 9 | ||
8 | /* QT */ | 10 | /* QT */ |
9 | #include <qtimer.h> | 11 | #include <qtimer.h> |
10 | 12 | ||
11 | using namespace OpieTooth; | 13 | using namespace OpieTooth; |
12 | 14 | ||
13 | /* | 15 | /* |
14 | * c'tor init the QAction | 16 | * c'tor init the QAction |
15 | */ | 17 | */ |
16 | ObexPopup::ObexPopup() | 18 | ObexPopup::ObexPopup() |
17 | : QPopupMenu() | 19 | : QPopupMenu() |
18 | { | 20 | { |
19 | owarn << "RfcCommPopup c'tor" << oendl; | 21 | owarn << "RfcCommPopup c'tor" << oendl; |
20 | 22 | ||
21 | QAction* a; | 23 | QAction* a; |
22 | 24 | ||
23 | /* connect action */ | 25 | /* connect action */ |
24 | a = new QAction( ); // so it's get deleted | 26 | a = new QAction( ); // so it's get deleted |
25 | a->setText("Push file"); | 27 | a->setText("Push file"); |
26 | a->addTo( this ); | 28 | a->addTo( this ); |
27 | connect( a, SIGNAL( activated() ), | 29 | connect( a, SIGNAL( activated() ), |
28 | this, SLOT( slotPush() ) ); | 30 | this, SLOT( slotPush() ) ); |
29 | }; | 31 | }; |
30 | 32 | ||
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 43c2777..f02a58c 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp | |||
@@ -1,25 +1,27 @@ | |||
1 | #include <qpe/qcopenvelope_qws.h> | 1 | #include <qpe/qcopenvelope_qws.h> |
2 | #include <opie2/odebug.h> | ||
3 | using namespace Opie::Core; | ||
2 | 4 | ||
3 | #include <qtimer.h> | 5 | #include <qtimer.h> |
4 | 6 | ||
5 | #include "panpopup.h" | 7 | #include "panpopup.h" |
6 | 8 | ||
7 | using namespace OpieTooth; | 9 | using namespace OpieTooth; |
8 | 10 | ||
9 | /* | 11 | /* |
10 | * c'tor init the QAction | 12 | * c'tor init the QAction |
11 | */ | 13 | */ |
12 | PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | 14 | PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { |
13 | 15 | ||
14 | owarn << "PanPopup c'tor" << oendl; | 16 | owarn << "PanPopup c'tor" << oendl; |
15 | 17 | ||
16 | m_item = item; | 18 | m_item = item; |
17 | QAction *a, *b, *c; | 19 | QAction *a, *b, *c; |
18 | 20 | ||
19 | m_panconnection = 0l; | 21 | m_panconnection = 0l; |
20 | /* connect action */ | 22 | /* connect action */ |
21 | 23 | ||
22 | 24 | ||
23 | a = new QAction(); // so it's get deleted | 25 | a = new QAction(); // so it's get deleted |
24 | a->setText( tr("connect") ); | 26 | a->setText( tr("connect") ); |
25 | a->addTo( this ); | 27 | a->addTo( this ); |
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 989bf45..ef007f5 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -1,32 +1,34 @@ | |||
1 | 1 | ||
2 | #include "pppdialog.h" | 2 | #include "pppdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <opie2/oprocess.h> | 8 | #include <opie2/oprocess.h> |
9 | #include <opie2/odebug.h> | ||
10 | using namespace Opie::Core; | ||
9 | 11 | ||
10 | using namespace OpieTooth; | 12 | using namespace OpieTooth; |
11 | 13 | ||
12 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
13 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 15 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
14 | : QDialog( parent, name, modal, fl ) { | 16 | : QDialog( parent, name, modal, fl ) { |
15 | 17 | ||
16 | if ( !name ) | 18 | if ( !name ) |
17 | setName( "PPPDialog" ); | 19 | setName( "PPPDialog" ); |
18 | setCaption( tr( "ppp connection " ) ) ; | 20 | setCaption( tr( "ppp connection " ) ) ; |
19 | 21 | ||
20 | m_device = device; | 22 | m_device = device; |
21 | 23 | ||
22 | layout = new QVBoxLayout( this ); | 24 | layout = new QVBoxLayout( this ); |
23 | 25 | ||
24 | QLabel* info = new QLabel( this ); | 26 | QLabel* info = new QLabel( this ); |
25 | info->setText( tr("Enter an ppp script name:") ); | 27 | info->setText( tr("Enter an ppp script name:") ); |
26 | 28 | ||
27 | cmdLine = new QLineEdit( this ); | 29 | cmdLine = new QLineEdit( this ); |
28 | 30 | ||
29 | outPut = new QMultiLineEdit( this ); | 31 | outPut = new QMultiLineEdit( this ); |
30 | QFont outPut_font( outPut->font() ); | 32 | QFont outPut_font( outPut->font() ); |
31 | outPut_font.setPointSize( 8 ); | 33 | outPut_font.setPointSize( 8 ); |
32 | outPut->setFont( outPut_font ); | 34 | outPut->setFont( outPut_font ); |
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp index 4469129..3fe2ea6 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | |||
@@ -1,32 +1,34 @@ | |||
1 | 1 | ||
2 | #include "rfcommassigndialogimpl.h" | 2 | #include "rfcommassigndialogimpl.h" |
3 | #include "rfcommassigndialogitem.h" | 3 | #include "rfcommassigndialogitem.h" |
4 | #include "rfcommconfhandler.h" | 4 | #include "rfcommconfhandler.h" |
5 | 5 | ||
6 | /* OPIE */ | 6 | /* OPIE */ |
7 | #include <qpe/config.h> | 7 | #include <qpe/config.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | #include <opie2/odebug.h> | ||
10 | using namespace Opie::Core; | ||
9 | 11 | ||
10 | /* QT */ | 12 | /* QT */ |
11 | #include <qlayout.h> | 13 | #include <qlayout.h> |
12 | 14 | ||
13 | using namespace OpieTooth; | 15 | using namespace OpieTooth; |
14 | 16 | ||
15 | // TODO: write only the file in bluebase? | 17 | // TODO: write only the file in bluebase? |
16 | // muss rfcommd dann neu gestartet werden | 18 | // muss rfcommd dann neu gestartet werden |
17 | // sollte rfcomm bind all nicht eh default config sein ( polled das? - d.h. sobald nen gerät in der nähe ist bindet es? | 19 | // sollte rfcomm bind all nicht eh default config sein ( polled das? - d.h. sobald nen gerät in der nähe ist bindet es? |
18 | 20 | ||
19 | 21 | ||
20 | RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 22 | RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
21 | : RfcommAssignDialogBase( parent, name, modal, fl ) | 23 | : RfcommAssignDialogBase( parent, name, modal, fl ) |
22 | { | 24 | { |
23 | 25 | ||
24 | m_range = 5; | 26 | m_range = 5; |
25 | 27 | ||
26 | m_scrollView = new QScrollView( this ); | 28 | m_scrollView = new QScrollView( this ); |
27 | m_scrollView->setResizePolicy( QScrollView::AutoOneFit ); | 29 | m_scrollView->setResizePolicy( QScrollView::AutoOneFit ); |
28 | m_scrollView->setHScrollBarMode( QScrollView::AlwaysOff ); | 30 | m_scrollView->setHScrollBarMode( QScrollView::AlwaysOff ); |
29 | 31 | ||
30 | RfcommAssignDialogBaseLayout->addWidget( m_scrollView ); | 32 | RfcommAssignDialogBaseLayout->addWidget( m_scrollView ); |
31 | 33 | ||
32 | m_box = new QVBox( m_scrollView->viewport() ); | 34 | m_box = new QVBox( m_scrollView->viewport() ); |
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp index 2ef95ff..1f7ba65 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp +++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp | |||
@@ -1,26 +1,28 @@ | |||
1 | 1 | ||
2 | #include <qtextstream.h> | 2 | #include <qtextstream.h> |
3 | #include <opie2/odebug.h> | ||
4 | using namespace Opie::Core; | ||
3 | 5 | ||
4 | #include "rfcommconfhandler.h" | 6 | #include "rfcommconfhandler.h" |
5 | 7 | ||
6 | 8 | ||
7 | using namespace OpieTooth; | 9 | using namespace OpieTooth; |
8 | 10 | ||
9 | // move to lib | 11 | // move to lib |
10 | 12 | ||
11 | 13 | ||
12 | RfCommConfObject::RfCommConfObject( int number, QString mac, int channel, QString comment ) { | 14 | RfCommConfObject::RfCommConfObject( int number, QString mac, int channel, QString comment ) { |
13 | m_number = number; | 15 | m_number = number; |
14 | m_mac = mac; | 16 | m_mac = mac; |
15 | m_channel = channel; | 17 | m_channel = channel; |
16 | m_comment = comment; | 18 | m_comment = comment; |
17 | // m_foundEntries = 0; | 19 | // m_foundEntries = 0; |
18 | } | 20 | } |
19 | 21 | ||
20 | void RfCommConfObject::setNumber( int number ) { | 22 | void RfCommConfObject::setNumber( int number ) { |
21 | m_number = number; | 23 | m_number = number; |
22 | } | 24 | } |
23 | 25 | ||
24 | void RfCommConfObject::setMac( QString mac ) { | 26 | void RfCommConfObject::setMac( QString mac ) { |
25 | m_mac = mac; | 27 | m_mac = mac; |
26 | } | 28 | } |
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index 01ad616..54f1eb7 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp | |||
@@ -1,31 +1,33 @@ | |||
1 | 1 | ||
2 | #include "pppdialog.h" | 2 | #include "pppdialog.h" |
3 | #include "rfcpopup.h" | 3 | #include "rfcpopup.h" |
4 | #include "rfcommassigndialogimpl.h" | 4 | #include "rfcommassigndialogimpl.h" |
5 | 5 | ||
6 | /* OPIE */ | 6 | /* OPIE */ |
7 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
8 | #include <opie2/odebug.h> | ||
9 | using namespace Opie::Core; | ||
8 | 10 | ||
9 | /* QT */ | 11 | /* QT */ |
10 | #include <qtimer.h> | 12 | #include <qtimer.h> |
11 | 13 | ||
12 | using namespace OpieTooth; | 14 | using namespace OpieTooth; |
13 | 15 | ||
14 | /* | 16 | /* |
15 | * c'tor init the QAction | 17 | * c'tor init the QAction |
16 | */ | 18 | */ |
17 | RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) | 19 | RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item ) |
18 | : QPopupMenu() | 20 | : QPopupMenu() |
19 | { | 21 | { |
20 | owarn << "RfcCommPopup c'tor" << oendl; | 22 | owarn << "RfcCommPopup c'tor" << oendl; |
21 | 23 | ||
22 | QAction* a; | 24 | QAction* a; |
23 | 25 | ||
24 | 26 | ||
25 | m_item = item; | 27 | m_item = item; |
26 | 28 | ||
27 | /* connect action */ | 29 | /* connect action */ |
28 | a = new QAction( ); // so it's get deleted | 30 | a = new QAction( ); // so it's get deleted |
29 | a->setText("Connect"); | 31 | a->setText("Connect"); |
30 | a->addTo( this ); | 32 | a->addTo( this ); |
31 | connect( a, SIGNAL( activated() ), | 33 | connect( a, SIGNAL( activated() ), |
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index 3b005c4..bccc6c2 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp | |||
@@ -10,48 +10,51 @@ | |||
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | 18 | ||
19 | #include "scandialog.h" | 19 | #include "scandialog.h" |
20 | 20 | ||
21 | #include <qheader.h> | 21 | #include <qheader.h> |
22 | #include <qlistview.h> | 22 | #include <qlistview.h> |
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | #include <qvariant.h> | 25 | #include <qvariant.h> |
26 | #include <qtooltip.h> | 26 | #include <qtooltip.h> |
27 | #include <qwhatsthis.h> | 27 | #include <qwhatsthis.h> |
28 | #include <qprogressbar.h> | 28 | #include <qprogressbar.h> |
29 | #include <qlist.h> | 29 | #include <qlist.h> |
30 | 30 | ||
31 | #include <manager.h> | 31 | #include <manager.h> |
32 | #include <device.h> | 32 | #include <device.h> |
33 | 33 | ||
34 | #include <opie2/odebug.h> | ||
35 | using namespace Opie::Core; | ||
36 | |||
34 | 37 | ||
35 | namespace OpieTooth { | 38 | namespace OpieTooth { |
36 | 39 | ||
37 | #include <remotedevice.h> | 40 | #include <remotedevice.h> |
38 | 41 | ||
39 | /** | 42 | /** |
40 | */ | 43 | */ |
41 | ScanDialog::ScanDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 44 | ScanDialog::ScanDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
42 | : QDialog( parent, name, modal, fl ) { | 45 | : QDialog( parent, name, modal, fl ) { |
43 | 46 | ||
44 | setCaption( tr( "Scan for devices" ) ); | 47 | setCaption( tr( "Scan for devices" ) ); |
45 | 48 | ||
46 | Layout11 = new QVBoxLayout( this ); | 49 | Layout11 = new QVBoxLayout( this ); |
47 | Layout11->setSpacing( 6 ); | 50 | Layout11->setSpacing( 6 ); |
48 | Layout11->setMargin( 0 ); | 51 | Layout11->setMargin( 0 ); |
49 | 52 | ||
50 | progress = new QProgressBar( this, "progbar"); | 53 | progress = new QProgressBar( this, "progbar"); |
51 | progress->setTotalSteps(20); | 54 | progress->setTotalSteps(20); |
52 | 55 | ||
53 | StartStopButton = new QPushButton( this, "StartButton" ); | 56 | StartStopButton = new QPushButton( this, "StartButton" ); |
54 | StartStopButton->setText( tr( "Start scan" ) ); | 57 | StartStopButton->setText( tr( "Start scan" ) ); |
55 | 58 | ||
56 | ListView1 = new QListView( this, "ListView1" ); | 59 | ListView1 = new QListView( this, "ListView1" ); |
57 | 60 | ||