author | zecke <zecke> | 2004-03-13 19:51:45 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 19:51:45 (UTC) |
commit | 6d08277737e22b7a1527124623f3571969073ddf (patch) (unidiff) | |
tree | 4129e674e21df767b31299e873dd44e33a308e1b /libopie2/opiemm | |
parent | 8e28911f7199f4450ac5eef09482069f9b9caea2 (diff) | |
download | opie-6d08277737e22b7a1527124623f3571969073ddf.zip opie-6d08277737e22b7a1527124623f3571969073ddf.tar.gz opie-6d08277737e22b7a1527124623f3571969073ddf.tar.bz2 |
Move XML class to internal PIM
Add namespaces!!!
Opie::Core and Opie::Core::Private
Opie::Net and Opie::Net::Private
Opie::Ui and Opie::Ui::Private
Opie::MM and Opie::MM::Private
Opie::DB and Opie::DB::Private
PIM classes are not yet converted because we will do other work
on it as well
-rw-r--r-- | libopie2/opiemm/opiemm.pro | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiemm/osoundsystem.h | 17 |
3 files changed, 20 insertions, 1 deletions
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index d6f54ee..ce30dfb 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro | |||
@@ -5,7 +5,7 @@ HEADERS = osoundsystem.h | |||
5 | SOURCES = osoundsystem.cpp | 5 | SOURCES = osoundsystem.cpp |
6 | INTERFACES = | 6 | INTERFACES = |
7 | TARGET = opiemm2 | 7 | TARGET = opiemm2 |
8 | VERSION = 1.8.2 | 8 | VERSION = 1.9.0 |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | 11 | ||
diff --git a/libopie2/opiemm/osoundsystem.cpp b/libopie2/opiemm/osoundsystem.cpp index 51e088c..07f26c0 100644 --- a/libopie2/opiemm/osoundsystem.cpp +++ b/libopie2/opiemm/osoundsystem.cpp | |||
@@ -41,6 +41,8 @@ | |||
41 | #include <sys/stat.h> | 41 | #include <sys/stat.h> |
42 | 42 | ||
43 | 43 | ||
44 | using namespace Opie::Core; | ||
45 | using namespace Opie::MM; | ||
44 | /*====================================================================================== | 46 | /*====================================================================================== |
45 | * OSoundSystem | 47 | * OSoundSystem |
46 | *======================================================================================*/ | 48 | *======================================================================================*/ |
diff --git a/libopie2/opiemm/osoundsystem.h b/libopie2/opiemm/osoundsystem.h index 096d397..3c3b622 100644 --- a/libopie2/opiemm/osoundsystem.h +++ b/libopie2/opiemm/osoundsystem.h | |||
@@ -36,6 +36,9 @@ | |||
36 | #include <qdict.h> | 36 | #include <qdict.h> |
37 | #include <qmap.h> | 37 | #include <qmap.h> |
38 | 38 | ||
39 | namespace Opie { | ||
40 | namespace MM { | ||
41 | |||
39 | class OAudioInterface; | 42 | class OAudioInterface; |
40 | class OMixerInterface; | 43 | class OMixerInterface; |
41 | class OSoundCard; | 44 | class OSoundCard; |
@@ -90,6 +93,8 @@ class OSoundSystem : public QObject | |||
90 | private: | 93 | private: |
91 | static OSoundSystem* _instance; | 94 | static OSoundSystem* _instance; |
92 | CardMap _interfaces; | 95 | CardMap _interfaces; |
96 | class Private; | ||
97 | Private *d; | ||
93 | }; | 98 | }; |
94 | 99 | ||
95 | 100 | ||
@@ -124,6 +129,9 @@ class OSoundCard : public QObject | |||
124 | 129 | ||
125 | private: | 130 | private: |
126 | void init(); | 131 | void init(); |
132 | private: | ||
133 | class Private; | ||
134 | Private *d; | ||
127 | }; | 135 | }; |
128 | 136 | ||
129 | /*====================================================================================== | 137 | /*====================================================================================== |
@@ -150,6 +158,9 @@ class OAudioInterface : public QObject | |||
150 | 158 | ||
151 | private: | 159 | private: |
152 | void init(); | 160 | void init(); |
161 | private: | ||
162 | class Private; | ||
163 | Private *d; | ||
153 | }; | 164 | }; |
154 | 165 | ||
155 | 166 | ||
@@ -210,7 +221,13 @@ class OMixerInterface : public QObject | |||
210 | 221 | ||
211 | private: | 222 | private: |
212 | void init(); | 223 | void init(); |
224 | private: | ||
225 | class Private; | ||
226 | Private *d; | ||
213 | }; | 227 | }; |
214 | 228 | ||
229 | } | ||
230 | } | ||
231 | |||
215 | #endif // OSOUNDSYSTEM_H | 232 | #endif // OSOUNDSYSTEM_H |
216 | 233 | ||