-rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp index 8d71f32..8ea3a48 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp | |||
@@ -1,26 +1,28 @@ | |||
1 | #include <opie2/odebug.h> | 1 | #include <opie2/odebug.h> |
2 | #include <opie2/oledbox.h> | 2 | #include <opie2/oledbox.h> |
3 | using namespace Opie::Core; | ||
4 | using namespace Opie::Ui; | ||
3 | 5 | ||
4 | #include <qpe/resource.h> | 6 | #include <qpe/resource.h> |
5 | #include <qcheckbox.h> | 7 | #include <qcheckbox.h> |
6 | #include <qgroupbox.h> | 8 | #include <qgroupbox.h> |
7 | #include <qlabel.h> | 9 | #include <qlabel.h> |
8 | #include <qprogressbar.h> | 10 | #include <qprogressbar.h> |
9 | #include <qheader.h> | 11 | #include <qheader.h> |
10 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
11 | #include <qapplication.h> | 13 | #include <qapplication.h> |
12 | #include <qlistbox.h> | 14 | #include <qlistbox.h> |
13 | #include <qdialog.h> | 15 | #include <qdialog.h> |
14 | #include <qlayout.h> | 16 | #include <qlayout.h> |
15 | #include <qcombobox.h> | 17 | #include <qcombobox.h> |
16 | #include <qlabel.h> | 18 | #include <qlabel.h> |
17 | #include <qlistview.h> | 19 | #include <qlistview.h> |
18 | #include <qpushbutton.h> | 20 | #include <qpushbutton.h> |
19 | 21 | ||
20 | #include <Opietooth.h> | 22 | #include <Opietooth.h> |
21 | #include <OTDriver.h> | 23 | #include <OTDriver.h> |
22 | #include <OTPeer.h> | 24 | #include <OTPeer.h> |
23 | #include <OTGateway.h> | 25 | #include <OTGateway.h> |
24 | #include <OTSDPAttribute.h> | 26 | #include <OTSDPAttribute.h> |
25 | #include <OTSDPService.h> | 27 | #include <OTSDPService.h> |
26 | #include <OTInquiry.h> | 28 | #include <OTInquiry.h> |
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h index 9e53fcb..16a22d6 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.h +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h | |||
@@ -1,31 +1,31 @@ | |||
1 | #ifndef OPIETOOTH_H | 1 | #ifndef OPIETOOTH_H |
2 | #define OPIETOOTH_H | 2 | #define OPIETOOTH_H |
3 | 3 | ||
4 | #include <OTIcons.h> | 4 | #include <OTIcons.h> |
5 | 5 | ||
6 | #include <OTPairingGUI.h> | 6 | #include <OTPairingGUI.h> |
7 | class OLedBox; | 7 | namespace Opie { namespace Ui { class OLedBox; }; }; |
8 | 8 | ||
9 | namespace Opietooth2 { | 9 | namespace Opietooth2 { |
10 | 10 | ||
11 | class OTGateway; | 11 | class OTGateway; |
12 | class OTDriver; | 12 | class OTDriver; |
13 | class OTInquiry; | 13 | class OTInquiry; |
14 | class OTPeer; | 14 | class OTPeer; |
15 | class PeerLVI; | 15 | class PeerLVI; |
16 | 16 | ||
17 | class OTPairing : public OTPairingGUI { | 17 | class OTPairing : public OTPairingGUI { |
18 | 18 | ||
19 | Q_OBJECT | 19 | Q_OBJECT |
20 | 20 | ||
21 | public : | 21 | public : |
22 | 22 | ||
23 | OTPairing( QWidget * parent, | 23 | OTPairing( QWidget * parent, |
24 | OTIcons * _Ic = 0 ); | 24 | OTIcons * _Ic = 0 ); |
25 | ~OTPairing(); | 25 | ~OTPairing(); |
26 | 26 | ||
27 | private slots : | 27 | private slots : |
28 | 28 | ||
29 | void SLOT_Unpair( void ); | 29 | void SLOT_Unpair( void ); |
30 | 30 | ||
31 | signals : | 31 | signals : |
@@ -88,49 +88,49 @@ private slots : | |||
88 | void SLOT_CleanupOld( void ); | 88 | void SLOT_CleanupOld( void ); |
89 | void SLOT_UpdateStrength( void ); | 89 | void SLOT_UpdateStrength( void ); |
90 | void SLOT_PeerState( OTPeer * ); | 90 | void SLOT_PeerState( OTPeer * ); |
91 | void SLOT_Selected( QListViewItem * ); | 91 | void SLOT_Selected( QListViewItem * ); |
92 | 92 | ||
93 | signals : | 93 | signals : |
94 | 94 | ||
95 | void selected( void ); | 95 | void selected( void ); |
96 | 96 | ||
97 | protected : | 97 | protected : |
98 | 98 | ||
99 | private : | 99 | private : |
100 | 100 | ||
101 | void refreshState( PeerLVI *, bool ); | 101 | void refreshState( PeerLVI *, bool ); |
102 | void scanMode( bool ); | 102 | void scanMode( bool ); |
103 | 103 | ||
104 | // load scanned devices | 104 | // load scanned devices |
105 | 105 | ||
106 | bool MyIcons; | 106 | bool MyIcons; |
107 | OTIcons * Icons; | 107 | OTIcons * Icons; |
108 | OTGateway * OT; | 108 | OTGateway * OT; |
109 | OTInquiry * Scanning; | 109 | OTInquiry * Scanning; |
110 | UUIDVector Filter; | 110 | UUIDVector Filter; |
111 | 111 | ||
112 | OLedBox * Paired_Led; | 112 | Opie::Ui::OLedBox * Paired_Led; |
113 | QTimer * StrengthTimer; | 113 | QTimer * StrengthTimer; |
114 | PeerLVI * Current; | 114 | PeerLVI * Current; |
115 | 115 | ||
116 | OTPeer * SelectedPeer; | 116 | OTPeer * SelectedPeer; |
117 | int SelectedChannel; | 117 | int SelectedChannel; |
118 | }; | 118 | }; |
119 | }; | 119 | }; |
120 | 120 | ||
121 | #include <OTManageGUI.h> | 121 | #include <OTManageGUI.h> |
122 | namespace Opietooth2 { | 122 | namespace Opietooth2 { |
123 | 123 | ||
124 | class OTManage : public OTManageGUI { | 124 | class OTManage : public OTManageGUI { |
125 | 125 | ||
126 | Q_OBJECT | 126 | Q_OBJECT |
127 | 127 | ||
128 | public : | 128 | public : |
129 | 129 | ||
130 | OTManage( QWidget * parent, | 130 | OTManage( QWidget * parent, |
131 | OTIcons * _IC = 0 ); | 131 | OTIcons * _IC = 0 ); |
132 | ~OTManage(); | 132 | ~OTManage(); |
133 | 133 | ||
134 | public slots : | 134 | public slots : |
135 | 135 | ||
136 | private slots : | 136 | private slots : |