summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
-rw-r--r--noncore/net/opietooth/manager/btserviceitem.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index a8f4fe4..bbc519c 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -4,24 +4,25 @@
4 4
5#include <qvariant.h> 5#include <qvariant.h>
6#include <qwidget.h> 6#include <qwidget.h>
7#include <qscrollview.h> 7#include <qscrollview.h>
8#include <qsplitter.h> 8#include <qsplitter.h>
9#include <qlist.h> 9#include <qlist.h>
10#include <qpixmap.h> 10#include <qpixmap.h>
11 11
12#include "bluetoothbase.h" 12#include "bluetoothbase.h"
13 13
14#include "btserviceitem.h" 14#include "btserviceitem.h"
15#include "btdeviceitem.h" 15#include "btdeviceitem.h"
16#include "popuphelper.h"
16 17
17#include "bticonloader.h" 18#include "bticonloader.h"
18 19
19#include <remotedevice.h> 20#include <remotedevice.h>
20#include <manager.h> 21#include <manager.h>
21 22
22class QVBox; 23class QVBox;
23class QHBoxLayout; 24class QHBoxLayout;
24class QGridLayout; 25class QGridLayout;
25class QFrame; 26class QFrame;
26class QLabel; 27class QLabel;
27class QPushButton; 28class QPushButton;
@@ -44,24 +45,25 @@ namespace OpieTooth {
44 private slots: 45 private slots:
45 void startScan(); 46 void startScan();
46 47
47 private: 48 private:
48 void readConfig(); 49 void readConfig();
49 void writeConfig(); 50 void writeConfig();
50 void readSavedDevices(); 51 void readSavedDevices();
51 void writeSavedDevices(); 52 void writeSavedDevices();
52 void writeToHciConfig(); 53 void writeToHciConfig();
53 QString status()const; 54 QString status()const;
54 void initGui(); 55 void initGui();
55 void setInfo(); 56 void setInfo();
57 PopupHelper m_popHelper;
56 Manager *m_localDevice; 58 Manager *m_localDevice;
57 QMap<QString,BTDeviceItem*> m_deviceList; 59 QMap<QString,BTDeviceItem*> m_deviceList;
58 60
59 void deviceActive( const RemoteDevice &device ); 61 void deviceActive( const RemoteDevice &device );
60 62
61 QString m_deviceName; 63 QString m_deviceName;
62 QString m_defaultPasskey; 64 QString m_defaultPasskey;
63 bool m_useEncryption; 65 bool m_useEncryption;
64 bool m_enableAuthentification; 66 bool m_enableAuthentification;
65 bool m_enablePagescan; 67 bool m_enablePagescan;
66 bool m_enableInquiryscan; 68 bool m_enableInquiryscan;
67 69
diff --git a/noncore/net/opietooth/manager/btserviceitem.cpp b/noncore/net/opietooth/manager/btserviceitem.cpp
index db71c3c..352e793 100644
--- a/noncore/net/opietooth/manager/btserviceitem.cpp
+++ b/noncore/net/opietooth/manager/btserviceitem.cpp
@@ -4,20 +4,20 @@
4 4
5using namespace OpieTooth; 5using namespace OpieTooth;
6 6
7BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv ) 7BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv )
8 : BTListItem( item ) { 8 : BTListItem( item ) {
9 m_service = serv; 9 m_service = serv;
10 setText(0, QObject::tr(serv.serviceName() ) ); 10 setText(0, QObject::tr(serv.serviceName() ) );
11} 11}
12BTServiceItem::~BTServiceItem() { 12BTServiceItem::~BTServiceItem() {
13 13
14} 14}
15QString BTServiceItem::type() const { 15QString BTServiceItem::type() const {
16 return QString::fromLatin1("Service"); 16 return QString::fromLatin1("service");
17} 17}
18int BTServiceItem::typeId() const { 18int BTServiceItem::typeId() const {
19 return Service; 19 return Service;
20} 20}
21Services BTServiceItem::services() const { 21Services BTServiceItem::services() const {
22 return m_service; 22 return m_service;
23} 23}