author | mickeyl <mickeyl> | 2005-01-04 23:03:23 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-04 23:03:23 (UTC) |
commit | 49683b3396a2e93cf49ac1726eafca6e8798be81 (patch) (unidiff) | |
tree | 6aaa08205dbf55a214655c275c11cd7ef8a27bdd /noncore/settings | |
parent | b41e4499d41fc92cc1ed4ed487e57d0a002c1a02 (diff) | |
download | opie-49683b3396a2e93cf49ac1726eafca6e8798be81.zip opie-49683b3396a2e93cf49ac1726eafca6e8798be81.tar.gz opie-49683b3396a2e93cf49ac1726eafca6e8798be81.tar.bz2 |
catch up with proper inclusion of OLedBox into libopieui
-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,14 +1,16 @@ | |||
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> |
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,19 +1,19 @@ | |||
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 |
@@ -100,25 +100,25 @@ 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 { |