23 files changed, 42 insertions, 33 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 1ad0327..ee66d95 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -83,7 +83,7 @@ ODevice *ODevice::inst()
                     qDebug( "ODevice() - found '%s'", (const char*) line );
-                    if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus();
-                    else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ();
-                    else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad();
-                    else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada();
-                    else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses();
+                    if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus();
+                    else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ();
+                    else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad();
+                    else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada();
+                    else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses();
                     else qWarning( "ODevice() - unknown hardware - using default." );
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 177fd4c..2efcd3a 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -57,3 +57,3 @@
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h
index 4f4af46..968f715 100644
--- a/libopie2/opiecore/device/odevice_ipaq.h
+++ b/libopie2/opiecore/device/odevice_ipaq.h
@@ -39,3 +39,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index b79b0b5..eaa93ca 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -79,3 +79,3 @@ typedef struct {
 
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/device/odevice_jornada.h b/libopie2/opiecore/device/odevice_jornada.h
index c37d75e..e2e67af 100644
--- a/libopie2/opiecore/device/odevice_jornada.h
+++ b/libopie2/opiecore/device/odevice_jornada.h
@@ -36,3 +36,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Jornada : public ODevice
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 77de8c5..10b7b61 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -56,3 +56,3 @@
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/device/odevice_ramses.h b/libopie2/opiecore/device/odevice_ramses.h
index e673b1a..aea9e2a 100644
--- a/libopie2/opiecore/device/odevice_ramses.h
+++ b/libopie2/opiecore/device/odevice_ramses.h
@@ -38,3 +38,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 80d40a3..7d79ef5 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -56,3 +56,3 @@ _;:,   .>  :=|.         This program is free software; you can
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h
index 1848151..3d5acb5 100644
--- a/libopie2/opiecore/device/odevice_simpad.h
+++ b/libopie2/opiecore/device/odevice_simpad.h
@@ -39,3 +39,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index f7a4025..4e9f227 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -56,3 +56,3 @@ _;:,     .>    :=|.         This program is free software; you can
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/device/odevice_yopy.h b/libopie2/opiecore/device/odevice_yopy.h
index 7d85479..6e1db88 100644
--- a/libopie2/opiecore/device/odevice_yopy.h
+++ b/libopie2/opiecore/device/odevice_yopy.h
@@ -36,3 +36,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Yopy : public ODevice
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 0d21f26..000d29c 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -56,3 +56,3 @@ _;:,   .>  :=|.         This program is free software; you can
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index ffb648f..a0b1787 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -50,3 +50,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Zaurus : public ODevice
diff --git a/libopie2/opiecore/device/odevicebutton.cpp b/libopie2/opiecore/device/odevicebutton.cpp
index a081b7f..6974b30 100644
--- a/libopie2/opiecore/device/odevicebutton.cpp
+++ b/libopie2/opiecore/device/odevicebutton.cpp
@@ -38,3 +38,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
@@ -50,3 +50,3 @@ class OQCopMessageData
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using Opie::Core::Internal::OQCopMessageData;
 
diff --git a/libopie2/opiecore/device/odevicebutton.h b/libopie2/opiecore/device/odevicebutton.h
index 4000144..e3f9ba9 100644
--- a/libopie2/opiecore/device/odevicebutton.h
+++ b/libopie2/opiecore/device/odevicebutton.h
@@ -28,3 +28,3 @@ namespace Opie{
 namespace Core{
-namespace Private {
+namespace Internal {
 class OQCopMessageData;
@@ -56,3 +56,3 @@ private:
 
-    Private::OQCopMessageData *d;
+    Internal::OQCopMessageData *d;
     class Private;
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp
index e2f6e82..ac7cd5a 100644
--- a/libopie2/opiecore/oapplication.cpp
+++ b/libopie2/opiecore/oapplication.cpp
@@ -47,3 +47,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OApplicationPrivate
@@ -93,3 +93,3 @@ void OApplication::init()
 {
-    d = new Private::OApplicationPrivate();
+    d = new Internal::OApplicationPrivate();
     if ( !OApplication::_instance )
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h
index c1e32a6..337fe5e 100644
--- a/libopie2/opiecore/oapplication.h
+++ b/libopie2/opiecore/oapplication.h
@@ -39,3 +39,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OApplicationPrivate;
@@ -104,3 +104,3 @@ class OApplication : public QPEApplication
     OConfig* _config;
-    Private::OApplicationPrivate* d;
+    Internal::OApplicationPrivate* d;
 };
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h
index 29c1f86..8c3060c 100644
--- a/libopie2/opiecore/oconfig.h
+++ b/libopie2/opiecore/oconfig.h
@@ -69,3 +69,3 @@ class OConfig : public Config
      */
-    const QString& group() { return git.key(); };
+    const QString& group()const { return git.key(); };
     /**
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp
index cac985b..f258faa 100644
--- a/libopie2/opiecore/odebug.cpp
+++ b/libopie2/opiecore/odebug.cpp
@@ -69,2 +69,11 @@ namespace Opie {
 namespace Core {
+namespace Internal {
+class  DebugBackend {
+};
+
+static  DebugBackend *backEnd = 0;
+}
+static void clean_up_routine() {
+    delete Internal::backEnd;
+}
 /*======================================================================================
diff --git a/libopie2/opiecore/oprocctrl.cpp b/libopie2/opiecore/oprocctrl.cpp
index 46708ba..404e0b3 100644
--- a/libopie2/opiecore/oprocctrl.cpp
+++ b/libopie2/opiecore/oprocctrl.cpp
@@ -43,3 +43,3 @@
 
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
diff --git a/libopie2/opiecore/oprocctrl.h b/libopie2/opiecore/oprocctrl.h
index 4922ba2..ea00859 100644
--- a/libopie2/opiecore/oprocctrl.h
+++ b/libopie2/opiecore/oprocctrl.h
@@ -41,3 +41,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessControllerPrivate;
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp
index dfde74a..b3f9724 100644
--- a/libopie2/opiecore/oprocess.cpp
+++ b/libopie2/opiecore/oprocess.cpp
@@ -63,3 +63,3 @@ _;:,     .>    :=|.         This program is free software; you can
 
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
@@ -67,3 +67,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessPrivate
diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h
index e23f98c..be1436c 100644
--- a/libopie2/opiecore/oprocess.h
+++ b/libopie2/opiecore/oprocess.h
@@ -48,3 +48,3 @@ namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessController;
@@ -725,3 +725,3 @@ protected:
      */
-    friend class Private::OProcessController;
+    friend class Internal::OProcessController;
 
@@ -754,3 +754,3 @@ private:
     void init ( );
-    Private::OProcessPrivate *d;
+    Internal::OProcessPrivate *d;
 };