From 6d08277737e22b7a1527124623f3571969073ddf Mon Sep 17 00:00:00 2001 From: zecke Date: Sat, 13 Mar 2004 19:51:45 +0000 Subject: 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 --- (limited to 'libopie2/opiemm') 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 SOURCES = osoundsystem.cpp INTERFACES = TARGET = opiemm2 -VERSION = 1.8.2 +VERSION = 1.9.0 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include 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 @@ #include +using namespace Opie::Core; +using namespace Opie::MM; /*====================================================================================== * OSoundSystem *======================================================================================*/ 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 @@ #include #include +namespace Opie { +namespace MM { + class OAudioInterface; class OMixerInterface; class OSoundCard; @@ -90,6 +93,8 @@ class OSoundSystem : public QObject private: static OSoundSystem* _instance; CardMap _interfaces; + class Private; + Private *d; }; @@ -124,6 +129,9 @@ class OSoundCard : public QObject private: void init(); + private: + class Private; + Private *d; }; /*====================================================================================== @@ -150,6 +158,9 @@ class OAudioInterface : public QObject private: void init(); + private: + class Private; + Private *d; }; @@ -210,7 +221,13 @@ class OMixerInterface : public QObject private: void init(); + private: + class Private; + Private *d; }; +} +} + #endif // OSOUNDSYSTEM_H -- cgit v0.9.0.2