summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -239,17 +239,17 @@ using namespace OpieTooth;
QMessageBox::information( this, tr("Test") , tr("Changes were applied.") );
}
/**
* Add fresh found devices from scan dialog to the listing
*
*/
- void BlueBase::addSearchedDevices( QValueList<RemoteDevice> &newDevices ) {
+ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
BTListItem * deviceItem;
QValueList<RemoteDevice>::ConstIterator it;
for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
deviceItem = new BTListItem( ListView2 , (*it).name(), (*it).mac(), "device" );
deviceItem->setExpandable ( true );
// look if device is avail. atm, async
@@ -429,18 +429,18 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
}
/**
* Open the "scan for devices" dialog
*/
void BlueBase::startScan() {
ScanDialog *scan = new ScanDialog( this, "ScanDialog",
true, WDestructiveClose );
- QObject::connect( scan, SIGNAL( selectedDevices( QValueList<RemoteDevice>& ) ),
- this, SLOT( addSearchedDevices( QValueList<RemoteDevice>& ) ) );
+ QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ),
+ this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) );
scan->showMaximized();
}
/**
* Set the informations about the local device in information Tab
*/
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
@@ -63,17 +63,17 @@ namespace OpieTooth {
bool m_enableInquiryscan;
QPixmap m_offPix;
QPixmap m_onPix;
BTIconLoader *m_iconLoader;
private slots:
- void addSearchedDevices( QValueList<RemoteDevice> &newDevices );
+ void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
void addServicesToDevice( BTListItem *item );
void addServicesToDevice( const QString& device, Services::ValueList );
void addConnectedDevices();
void addConnectedDevices( Connection::ValueList );
void startServiceActionClicked( QListViewItem *item );
void startServiceActionHold( QListViewItem *, const QPoint &, int );
void deviceActive( const QString& mac, bool connected );
void applyConfigChanges();
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,13 +1,13 @@
TEMPLATE = app
CONFIG = qt warn_on debug
#CONFIG = qt warn_on release
-HEADERS = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h
-SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp
+HEADERS = popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h
+SOURCES = popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp
INCLUDEPATH += $(OPIEDIR)/include
INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopietooth -lopie
INTERFACES = bluetoothbase.ui devicedialog.ui
DESTDIR = $(OPIEDIR)/bin
TARGET = bluetooth-manager
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 @@
+
+#include "popuphelper.h"
+
+using namespace OpieTooth;
+
+PopupHelper::PopupHelper() {
+ init();
+}
+PopupHelper::~PopupHelper() {
+
+}
+void PopupHelper::insert( int id, popupFactory fact ) {
+ m_map.insert(id, fact );
+}
+QPopupMenu* PopupHelper::find( int id ) {
+ FactoryMap::Iterator it = m_map.find(id );
+ if ( it != m_map.end() ) {
+ popupFactory fact = it.data();
+ return (*fact)();
+ }
+ return 0l;
+}
+void PopupHelper::init() {
+
+}
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 @@
+
+#ifndef OPIE_TOOTH_POPUP_HELPER
+#define OPIE_TOOTH_POPUP_HELPER
+
+#include <qpopupmenu.h>
+#include <qmap.h>
+
+
+namespace OpieTooth {
+ typedef QPopupMenu* (*popupFactory)(void);
+ typedef QMap<int, popupFactory> FactoryMap;
+ class PopupHelper {
+ public:
+ PopupHelper();
+ ~PopupHelper();
+ void insert( int id, popupFactory fact );
+ QPopupMenu* find( int id );
+ private:
+ void init();
+ FactoryMap m_map;
+
+ };
+};
+
+#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
@@ -65,15 +65,15 @@ public slots:
void fillList(const QString& device, RemoteDevice::ValueList list);
private:
void emitToManager();
Manager *localDevice;
int progressStat;
signals:
- void selectedDevices(QValueList<RemoteDevice>&);
+ void selectedDevices(const QValueList<RemoteDevice>&);
};
}
#endif // SCANDIALOG_H