summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp6
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
-rw-r--r--noncore/net/opietooth/manager/manager.pro4
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp25
-rw-r--r--noncore/net/opietooth/manager/popuphelper.h25
-rw-r--r--noncore/net/opietooth/manager/scandialog.h2
6 files changed, 57 insertions, 7 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index c29eb1a..85c6717 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -244,7 +244,7 @@ using namespace OpieTooth;
244 * Add fresh found devices from scan dialog to the listing 244 * Add fresh found devices from scan dialog to the listing
245 * 245 *
246 */ 246 */
247 void BlueBase::addSearchedDevices( QValueList<RemoteDevice> &newDevices ) { 247 void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
248 BTListItem * deviceItem; 248 BTListItem * deviceItem;
249 QValueList<RemoteDevice>::ConstIterator it; 249 QValueList<RemoteDevice>::ConstIterator it;
250 250
@@ -434,8 +434,8 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
434 void BlueBase::startScan() { 434 void BlueBase::startScan() {
435 ScanDialog *scan = new ScanDialog( this, "ScanDialog", 435 ScanDialog *scan = new ScanDialog( this, "ScanDialog",
436 true, WDestructiveClose ); 436 true, WDestructiveClose );
437 QObject::connect( scan, SIGNAL( selectedDevices( QValueList<RemoteDevice>& ) ), 437 QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ),
438 this, SLOT( addSearchedDevices( QValueList<RemoteDevice>& ) ) ); 438 this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) );
439 439
440 scan->showMaximized(); 440 scan->showMaximized();
441 } 441 }
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 97ce8c3..73fac97 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -68,7 +68,7 @@ namespace OpieTooth {
68 BTIconLoader *m_iconLoader; 68 BTIconLoader *m_iconLoader;
69 69
70 private slots: 70 private slots:
71 void addSearchedDevices( QValueList<RemoteDevice> &newDevices ); 71 void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
72 void addServicesToDevice( BTListItem *item ); 72 void addServicesToDevice( BTListItem *item );
73 void addServicesToDevice( const QString& device, Services::ValueList ); 73 void addServicesToDevice( const QString& device, Services::ValueList );
74 void addConnectedDevices(); 74 void addConnectedDevices();
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 55f2fd2..4f0ea60 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,8 +1,8 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on debug 2CONFIG = qt warn_on debug
3#CONFIG = qt warn_on release 3#CONFIG = qt warn_on release
4HEADERS = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h 4HEADERS = popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h
5SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp 5SOURCES = popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 7INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
new file mode 100644
index 0000000..2a6dad0
--- a/dev/null
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -0,0 +1,25 @@
1
2#include "popuphelper.h"
3
4using namespace OpieTooth;
5
6PopupHelper::PopupHelper() {
7 init();
8}
9PopupHelper::~PopupHelper() {
10
11}
12void PopupHelper::insert( int id, popupFactory fact ) {
13 m_map.insert(id, fact );
14}
15QPopupMenu* PopupHelper::find( int id ) {
16 FactoryMap::Iterator it = m_map.find(id );
17 if ( it != m_map.end() ) {
18 popupFactory fact = it.data();
19 return (*fact)();
20 }
21 return 0l;
22}
23void PopupHelper::init() {
24
25}
diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h
new file mode 100644
index 0000000..7485f71
--- a/dev/null
+++ b/noncore/net/opietooth/manager/popuphelper.h
@@ -0,0 +1,25 @@
1
2#ifndef OPIE_TOOTH_POPUP_HELPER
3#define OPIE_TOOTH_POPUP_HELPER
4
5#include <qpopupmenu.h>
6#include <qmap.h>
7
8
9namespace OpieTooth {
10 typedef QPopupMenu* (*popupFactory)(void);
11 typedef QMap<int, popupFactory> FactoryMap;
12 class PopupHelper {
13 public:
14 PopupHelper();
15 ~PopupHelper();
16 void insert( int id, popupFactory fact );
17 QPopupMenu* find( int id );
18 private:
19 void init();
20 FactoryMap m_map;
21
22 };
23};
24
25#endif
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index cc890f3..f18784d 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -70,7 +70,7 @@ public slots:
70 int progressStat; 70 int progressStat;
71 71
72 signals: 72 signals:
73 void selectedDevices(QValueList<RemoteDevice>&); 73 void selectedDevices(const QValueList<RemoteDevice>&);
74 }; 74 };
75 75
76 76