author | zecke <zecke> | 2002-07-12 19:17:11 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-07-12 19:17:11 (UTC) |
commit | 04fc12b5275c5b5968f52f84c997fc2bdffb5781 (patch) (unidiff) | |
tree | e7ce14fd1df7c6b6b0501f0044b5bc849ec5297b /noncore/net | |
parent | d0401e1888a9a1af6be3a737484afca699642d15 (diff) | |
download | opie-04fc12b5275c5b5968f52f84c997fc2bdffb5781.zip opie-04fc12b5275c5b5968f52f84c997fc2bdffb5781.tar.gz opie-04fc12b5275c5b5968f52f84c997fc2bdffb5781.tar.bz2 |
Changes I don't remember
But now the really refactoring begins
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btserviceitem.cpp | 2 |
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 | |||
@@ -1,79 +1,81 @@ | |||
1 | 1 | ||
2 | #ifndef BLUEBASE_H | 2 | #ifndef BLUEBASE_H |
3 | #define BLUEBASE_H | 3 | #define BLUEBASE_H |
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 | ||
22 | class QVBox; | 23 | class QVBox; |
23 | class QHBoxLayout; | 24 | class QHBoxLayout; |
24 | class QGridLayout; | 25 | class QGridLayout; |
25 | class QFrame; | 26 | class QFrame; |
26 | class QLabel; | 27 | class QLabel; |
27 | class QPushButton; | 28 | class QPushButton; |
28 | class QTabWidget; | 29 | class QTabWidget; |
29 | class QCheckBox; | 30 | class QCheckBox; |
30 | 31 | ||
31 | 32 | ||
32 | namespace OpieTooth { | 33 | namespace OpieTooth { |
33 | 34 | ||
34 | class BlueBase : public BluetoothBase { | 35 | class BlueBase : public BluetoothBase { |
35 | Q_OBJECT | 36 | Q_OBJECT |
36 | 37 | ||
37 | public: | 38 | public: |
38 | BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 39 | BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
39 | ~BlueBase(); | 40 | ~BlueBase(); |
40 | 41 | ||
41 | protected: | 42 | protected: |
42 | 43 | ||
43 | 44 | ||
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 | ||
68 | QPixmap m_offPix; | 70 | QPixmap m_offPix; |
69 | QPixmap m_onPix; | 71 | QPixmap m_onPix; |
70 | 72 | ||
71 | BTIconLoader *m_iconLoader; | 73 | BTIconLoader *m_iconLoader; |
72 | 74 | ||
73 | private slots: | 75 | private slots: |
74 | void addSearchedDevices( const QValueList<RemoteDevice> &newDevices ); | 76 | void addSearchedDevices( const QValueList<RemoteDevice> &newDevices ); |
75 | void addServicesToDevice( BTDeviceItem *item ); | 77 | void addServicesToDevice( BTDeviceItem *item ); |
76 | void addServicesToDevice( const QString& device, Services::ValueList ); | 78 | void addServicesToDevice( const QString& device, Services::ValueList ); |
77 | void addConnectedDevices(); | 79 | void addConnectedDevices(); |
78 | void addConnectedDevices( ConnectionState::ValueList ); | 80 | void addConnectedDevices( ConnectionState::ValueList ); |
79 | void startServiceActionClicked( QListViewItem *item ); | 81 | void startServiceActionClicked( QListViewItem *item ); |
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 | |||
@@ -1,23 +1,23 @@ | |||
1 | 1 | ||
2 | #include <qobject.h> | 2 | #include <qobject.h> |
3 | #include "btserviceitem.h" | 3 | #include "btserviceitem.h" |
4 | 4 | ||
5 | using namespace OpieTooth; | 5 | using namespace OpieTooth; |
6 | 6 | ||
7 | BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv ) | 7 | BTServiceItem::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 | } |
12 | BTServiceItem::~BTServiceItem() { | 12 | BTServiceItem::~BTServiceItem() { |
13 | 13 | ||
14 | } | 14 | } |
15 | QString BTServiceItem::type() const { | 15 | QString BTServiceItem::type() const { |
16 | return QString::fromLatin1("Service"); | 16 | return QString::fromLatin1("service"); |
17 | } | 17 | } |
18 | int BTServiceItem::typeId() const { | 18 | int BTServiceItem::typeId() const { |
19 | return Service; | 19 | return Service; |
20 | } | 20 | } |
21 | Services BTServiceItem::services() const { | 21 | Services BTServiceItem::services() const { |
22 | return m_service; | 22 | return m_service; |
23 | } | 23 | } |