43 files changed, 116 insertions, 105 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
@@ -81,11 +81,11 @@ ODevice *ODevice::inst()
                 if ( line.startsWith( "Hardware" ) )
                 {
                     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." );
                     break;
                 }
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
@@ -55,7 +55,7 @@
 
 
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 /* KERNEL */
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
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
@@ -37,7 +37,7 @@
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter
 {
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
@@ -77,7 +77,7 @@ typedef struct {
 #define LED_ON    OD_IOW( 'f', 5, LED_IN )
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
 
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 void Jornada::init()
 {
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
@@ -34,7 +34,7 @@
 
 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
@@ -54,7 +54,7 @@
 #endif
 
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 struct r_button ramses_buttons [] = {
     { Model_Ramses_MNCI,
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
@@ -36,7 +36,7 @@
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
 class Ramses : public ODevice, public QWSServer::KeyboardFilter
 {
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
@@ -54,7 +54,7 @@ _;:,   .>  :=|.         This program is free software; you can
 #endif
 
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 struct s_button simpad_buttons [] = {
     { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
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
@@ -37,7 +37,7 @@
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
 class SIMpad : public ODevice, public QWSServer::KeyboardFilter
 {
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
@@ -54,7 +54,7 @@ _;:,     .>    :=|.         This program is free software; you can
 #endif
 
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 struct yopy_button yopy_buttons [] = {
     { Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Action Button" ),
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
@@ -34,7 +34,7 @@ _;:,     .>    :=|.         This program is free software; you can
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Yopy : public ODevice
 {
   protected:
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
@@ -54,7 +54,7 @@ _;:,   .>  :=|.         This program is free software; you can
 #endif
 
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 struct z_button z_buttons [] = {
     { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
@@ -387,7 +387,7 @@ void Zaurus::buzzer ( int sound )
                 ::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
             ::close ( fd );
         }
-            } else {    
+    } else {
         int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
 
         if ( fd >= 0 ) {
@@ -395,7 +395,7 @@ void Zaurus::buzzer ( int sound )
             ::close ( fd );
         }
 
-    } 
+    }
 #endif
 }
 
@@ -606,9 +606,9 @@ Transformation Zaurus::rotation() const
                 retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
                 ::close (handle);
 
-                if (retval == 2 ) 
+                if (retval == 2 )
                     rot = Rot0;
-                else 
+                else
                     rot = Rot270;
             }
             break;
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
@@ -48,7 +48,7 @@
 
 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
@@ -36,7 +36,7 @@
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 
 class OQCopMessageData
 {
@@ -48,7 +48,7 @@ class OQCopMessageData
 }
 
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using Opie::Core::Internal::OQCopMessageData;
 
 OQCopMessage::OQCopMessage()
         : d ( 0 )
@@ -132,13 +132,13 @@ void OQCopMessage::setData ( const QByteArray &data )
 
 /*! \class Opie::Core::ODeviceButton
     \brief The Opie::Core::ODeviceButton class represents a physical user mappable button on a Qtopia device.
- 
+
     This class represents a physical button on a Qtopia device.    A
     device may have "user programmable" buttons.
     The location and number of buttons will vary from device to
     device.    userText() and pixmap() may be used to describe this button
     to the user in help documentation.
- 
+
     \ingroup qtopiaemb
     \internal
 */
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
@@ -26,7 +26,7 @@
 
 namespace Opie{
 namespace Core{
-namespace Private {
+namespace Internal {
 class OQCopMessageData;
 }
 
@@ -54,7 +54,7 @@ public:
 private:
     void init ( const QCString &m_channel, const QCString &message, const QByteArray &args );
 
-    Private::OQCopMessageData *d;
+    Internal::OQCopMessageData *d;
     class Private;
     Private* m_data;
 };
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
@@ -45,7 +45,7 @@ OApplication* OApplication::_instance = 0;
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OApplicationPrivate
 {
   public:
@@ -91,7 +91,7 @@ OConfig* OApplication::config()
 
 void OApplication::init()
 {
-    d = new Private::OApplicationPrivate();
+    d = new Internal::OApplicationPrivate();
     if ( !OApplication::_instance )
     {
         OApplication::_instance = this;
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
@@ -37,7 +37,7 @@
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OApplicationPrivate;
 } // private class
 
@@ -102,7 +102,7 @@ class OApplication : public QPEApplication
     const QCString _appname;
     static OApplication* _instance;
     OConfig* _config;
-    Private::OApplicationPrivate* d;
+    Internal::OApplicationPrivate* d;
 };
 
 } // Core
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
@@ -67,7 +67,7 @@ class OConfig : public Config
      * The current group is used for searching keys and accessing entries.
      * @todo make const
      */
-    const QString& group() { return git.key(); };
+    const QString& group()const { return git.key(); };
     /**
      * @returns a @ref QColor entry or a @a default value if the key is not found.
      */
@@ -76,7 +76,7 @@ class OConfig : public Config
      * @returns a @ref QFont value or a @a default value if the key is not found.
      */
     QFont readFontEntry( const QString& key, const QFont* pDefault ) const;
-    
+
 private:
     class Private;
     Private *d;
@@ -144,7 +144,7 @@ class OConfigGroupSaver
 
     OConfigGroupSaver( const OConfigGroupSaver& );
     OConfigGroupSaver& operator=( const OConfigGroupSaver& );
-    
+
     class Private;
     Private *d;
 };
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
@@ -67,6 +67,15 @@
 
 namespace Opie {
 namespace Core {
+namespace Internal {
+class  DebugBackend {
+};
+
+static  DebugBackend *backEnd = 0;
+}
+static void clean_up_routine() {
+    delete Internal::backEnd;
+}
 /*======================================================================================
  * debug levels
  *======================================================================================*/
@@ -622,4 +631,4 @@ void odClearDebugConfig()
 #endif
 
 }
-}
\ No newline at end of file
+}
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
@@ -1,16 +1,16 @@
 /* This file is part of the KDE libraries
     Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at)
- 
+
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
- 
+
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
- 
+
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -41,7 +41,7 @@
 #include <qsocketnotifier.h>
 #include "oprocctrl.h"
 
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 OProcessController *OProcessController::theOProcessController = 0;
 
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
@@ -1,16 +1,16 @@
 /* This file is part of the KDE libraries
     Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at)
- 
+
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
- 
+
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
- 
+
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -39,7 +39,7 @@ class QSocketNotifier;
 
 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
@@ -61,11 +61,11 @@ _;:,     .>    :=|.         This program is free software; you can
 #include <grp.h>
 #endif
 
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessPrivate
 {
 public:
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
@@ -46,7 +46,7 @@ class QSocketNotifier;
 
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessController;
 class OProcessPrivate;
 }
@@ -723,7 +723,7 @@ protected:
      * @ref OProcessController is a friend of OProcess because it has to have
      * access to various data members.
      */
-    friend class Private::OProcessController;
+    friend class Internal::OProcessController;
 
 private:
     /**
@@ -752,7 +752,7 @@ private:
 
 private:
     void init ( );
-    Private::OProcessPrivate *d;
+    Internal::OProcessPrivate *d;
 };
 }
 }
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 47bc250..2c53248 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -41,7 +41,7 @@
 
 
 using namespace Opie::DB;
-using namespace Opie::DB::Private;
+using namespace Opie::DB::Internal;
 
 namespace {
     struct Query {
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h
index 3e1325b..9064e52 100644
--- a/libopie2/opiedb/osqlitedriver.h
+++ b/libopie2/opiedb/osqlitedriver.h
@@ -9,7 +9,7 @@
 
 namespace Opie {
 namespace DB {
-namespace Private {
+namespace Internal {
 
 class OSQLiteDriver : public OSQLDriver {
     Q_OBJECT
diff --git a/libopie2/opiedb/osqlmanager.cpp b/libopie2/opiedb/osqlmanager.cpp
index 990d258..a6498df 100644
--- a/libopie2/opiedb/osqlmanager.cpp
+++ b/libopie2/opiedb/osqlmanager.cpp
@@ -33,7 +33,7 @@ OSQLDriver* OSQLManager::load( const QString& name ) {
     OSQLDriver* driver = 0l;
 
     if ( name == "SQLite" ) {
-        driver = new Opie::DB::Private::OSQLiteDriver;
+        driver = new Opie::DB::Internal::OSQLiteDriver;
     }
     return driver;
 }
@@ -44,7 +44,7 @@ OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) {
     OSQLDriver *driver = 0l;
     if ( end.library() == "builtin" &&
          end.name() == "SQLite" )
-        driver = new Opie::DB::Private::OSQLiteDriver;
+        driver = new Opie::DB::Internal::OSQLiteDriver;
 
     return driver;
 }
diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index f679afb..0de1247 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -11,7 +11,7 @@ using namespace Opie::Core;
 
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 
 DebugMapper::DebugMapper()
 {
diff --git a/libopie2/opienet/odebugmapper.h b/libopie2/opienet/odebugmapper.h
index f47db47..79fb42e 100644
--- a/libopie2/opienet/odebugmapper.h
+++ b/libopie2/opienet/odebugmapper.h
@@ -11,7 +11,7 @@
 
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 
 typedef QIntDict<QString> IntStringMap;
 
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 7794334..c185805 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -190,7 +190,7 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 
 
 
-namespace Private {
+namespace Internal {
 /*======================================================================================
  * assorted functions
  *======================================================================================*/
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index ca6815d..4a09426 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -132,7 +132,7 @@ class OPrivateIOCTL : public QObject
  * Miscellaneous
  *======================================================================================*/
 
-namespace Private {
+namespace Internal {
 void dumpBytes( const unsigned char* data, int num );
 QString modeToString( int );
 int stringToMode( const QString& );
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 26a6c81..b6c9876 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -60,7 +60,7 @@
 

 

 using namespace Opie::Core;

-using namespace Opie::Net::Private;

+using namespace Opie::Net::Internal;

 DebugMapper* debugmapper = new DebugMapper();

 #endif

 

@@ -103,7 +103,7 @@ void ONetwork::synchronize()
         s >> str;

         str.truncate( str.find( ':' ) );

         odebug << "ONetwork: found interface '" << str << "'" << oendl;

-        ONetworkInterface* iface;

+        ONetworkInterface* iface = 0;

         if ( isWirelessInterface( str ) )

         {

             iface = new OWirelessNetworkInterface( this, (const char*) str );

diff --git a/libopie2/opieui/big-screen/obigscreen_p.h b/libopie2/opieui/big-screen/obigscreen_p.h
index a85a56c..baa2bbc 100644
--- a/libopie2/opieui/big-screen/obigscreen_p.h
+++ b/libopie2/opieui/big-screen/obigscreen_p.h
@@ -8,7 +8,7 @@ class QWidget;
 
 namespace Opie {
 namespace Ui  {
-namespace Private{
+namespace Internal{
 
 struct OSplitterContainer
 {
diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index bcfd3a6..f0287ed 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -36,7 +36,7 @@
 #include <qvbox.h>
 
 using namespace Opie::Ui;
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
 
 /**
  *
@@ -397,7 +397,7 @@ void OSplitter::resizeEvent( QResizeEvent* res )
  * Adds a container to a tab either the parent tab
  * or our own
  */
-void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
+void OSplitter::addToTab( const Opie::Ui::Internal::OSplitterContainer& con )
 {
     QWidget *wid = con.widget;
     // not needed widgetstack will reparent as well    wid.reparent(m_tabWidget, wid->getWFlags(), QPoint(0, 0) );
@@ -411,7 +411,7 @@ void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
 /*
  * adds a container to the box
  */
-void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con )
+void OSplitter::addToBox( const Opie::Ui::Internal::OSplitterContainer& con )
 {
     QWidget* wid = con.widget;
     wid->reparent(m_hbox, 0,  QPoint(0, 0) );
diff --git a/libopie2/opieui/big-screen/osplitter.h b/libopie2/opieui/big-screen/osplitter.h
index 7b5ea53..46dad05 100644
--- a/libopie2/opieui/big-screen/osplitter.h
+++ b/libopie2/opieui/big-screen/osplitter.h
@@ -73,7 +73,7 @@ class OSplitter : public QFrame
 {
     Q_OBJECT
 public:
-    typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList;
+    typedef QValueList<Opie::Ui::Internal::OSplitterContainer> ContainerList;
     OSplitter( Qt::Orientation = Horizontal,  QWidget *parent = 0,
                const char* name = 0, WFlags fl = 0 );
     ~OSplitter();
@@ -124,8 +124,8 @@ private:
     bool layoutMode()const;
     //    void reparentAll();
     void setTabWidget( OTabWidget*);
-    void addToTab( const Opie::Ui::Private::OSplitterContainer& );
-    void addToBox( const Opie::Ui::Private::OSplitterContainer& );
+    void addToTab( const Opie::Ui::Internal::OSplitterContainer& );
+    void addToBox( const Opie::Ui::Internal::OSplitterContainer& );
     void removeFromTab( QWidget* );
     void changeTab();
     void changeHBox();
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index c4d5033..a9ec8c4 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -1,3 +1,4 @@
+
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org>
@@ -55,11 +56,11 @@
 #include <qregexp.h>
 #include <qobjectlist.h>
 
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
 
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 OFileViewInterface::OFileViewInterface( OFileSelector* selector )
         : m_selector( selector )
 {}
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index 2205963..8bcd9ee 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -55,7 +55,7 @@ typedef QMap<QString, QStringList> MimeTypes;
 namespace Opie {
 namespace Ui   {
 
-namespace Private {
+namespace Internal {
 class OFileViewInterface;
 class OFileViewFileListView;
 }
@@ -75,8 +75,8 @@ class OFileViewFileListView;
 class OFileSelector : public QWidget
 {
     Q_OBJECT
-    friend class Private::OFileViewInterface;
-    friend class Private::OFileViewFileListView;
+    friend class Internal::OFileViewInterface;
+    friend class Internal::OFileViewFileListView;
 
 public:
     /**
@@ -187,13 +187,13 @@ private:
     QLineEdit* m_lneEdit; // the LineEdit for the Name
     QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType
     QWidgetStack* m_stack;  // our widget stack which will contain the views
-    Private::OFileViewInterface* currentView() const; // returns the currentView
-    Private::OFileViewInterface* m_current; // here is the view saved
+    Internal::OFileViewInterface* currentView() const; // returns the currentView
+    Internal::OFileViewInterface* m_current; // here is the view saved
     bool m_shNew   : 1; // should we show New?
     bool m_shClose : 1; // should we show Close?
     MimeTypes m_mimeType; // list of mimetypes
 
-    QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+    QMap<QString, Internal::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
     QHBox* m_nameBox; // the LineEdit + Label is hold here
     QHBox* m_cmbBox; // this holds the two combo boxes
 
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h
index 376dc98..a3ef8e2 100644
--- a/libopie2/opieui/fileselector/ofileselector_p.h
+++ b/libopie2/opieui/fileselector/ofileselector_p.h
@@ -59,7 +59,7 @@ class QToolButton;
 namespace Opie{
 namespace Ui{
 class OFileSelector;
-namespace Private {
+namespace Internal {
 
 class OFileViewInterface
 {
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index b19c26e..6763ee6 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -41,7 +41,7 @@
 
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 
 class OFontSelectorPrivate
 {
@@ -96,7 +96,7 @@ private:
 
 
 using namespace Opie::Ui;
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
 
 static int findItemCB( QComboBox *box, const QString &str )
 {
diff --git a/libopie2/opieui/ofontselector.h b/libopie2/opieui/ofontselector.h
index 1d97233..cd134f4 100644
--- a/libopie2/opieui/ofontselector.h
+++ b/libopie2/opieui/ofontselector.h
@@ -37,7 +37,7 @@ class QListBox;
 
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 class OFontSelectorPrivate;
 }
 
@@ -96,7 +96,7 @@ private:
     void changeFont ( );
 
 private:
-    Private::OFontSelectorPrivate *d;
+    Internal::OFontSelectorPrivate *d;
 };
 
 }
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp
index ef6d713..eb7acbd 100644
--- a/libopie2/opieui/okeyconfigwidget.cpp
+++ b/libopie2/opieui/okeyconfigwidget.cpp
@@ -474,12 +474,12 @@ OKeyConfigManager::~OKeyConfigManager() {
  * Load the Configuration  from the OConfig
  * If a Key is restricted but was in the config we will
  * make it be the empty key paur
- * We will change the group of the OConfig Item!
+ * We will change the group but restore to the previous.
  *
  * @see OKeyPair::emptyKey
  */
 void OKeyConfigManager::load() {
-    m_conf->setGroup( m_group );
+    Opie::Core::OConfigGroupSaver( m_conf, m_group );
 
     /*
      * Read each item
@@ -500,10 +500,11 @@ void OKeyConfigManager::load() {
 
 /**
  * We will save the current configuration
- * to the OConfig. We will change the group.
+ * to the OConfig. We will change the group but restore
+ * to the previous
  */
 void OKeyConfigManager::save() {
-    m_conf->setGroup( m_group );
+    Opie::Core::OConfigGroupSaver( m_conf, m_group );
 
     /*
      * Write each item
@@ -544,7 +545,7 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) {
     * case ascii
     */
     int key, mod;
-    Opie::Ui::Private::fixupKeys( key, mod, e );
+    Opie::Ui::Internal::fixupKeys( key, mod, e );
 
     OKeyConfigItem::List _keyList =  keyList( key );
     if ( _keyList.isEmpty() )
@@ -716,7 +717,7 @@ OKeyConfigItem::List OKeyConfigManager::keyList( int keycode) {
 
 namespace Opie {
 namespace Ui {
-namespace Private {
+namespace Internal {
 
     OKeyListViewItem::OKeyListViewItem( const OKeyConfigItem& item, OKeyConfigManager* man, OListViewItem* parent)
         : Opie::Ui::OListViewItem( parent ), m_manager( man )  {
@@ -938,7 +939,7 @@ OKeyConfigWidget::ChangeMode OKeyConfigWidget::changeMode()const {
  * insert these items before calling load
  */
 void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) {
-    Opie::Ui::Private::OKeyConfigWidgetPrivate root( str, man );
+    Opie::Ui::Internal::OKeyConfigWidgetPrivate root( str, man );
     m_list.append(root);
 }
 
@@ -947,12 +948,12 @@ void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) {
  * loads the items and allows editing them
  */
 void OKeyConfigWidget::load() {
-    Opie::Ui::Private::OKeyConfigWidgetPrivateList::Iterator it;
+    Opie::Ui::Internal::OKeyConfigWidgetPrivateList::Iterator it;
     for ( it = m_list.begin(); it != m_list.end(); ++it ) {
         OListViewItem *item = new OListViewItem( m_view, (*it).name );
         OKeyConfigItem::List list = (*it).manager->keyConfigList();
         for (OKeyConfigItem::List::Iterator keyIt = list.begin(); keyIt != list.end();++keyIt )
-            (void )new  Opie::Ui::Private::OKeyListViewItem(*keyIt, (*it).manager, item );
+            (void )new  Opie::Ui::Internal::OKeyListViewItem(*keyIt, (*it).manager, item );
 
     }
 }
@@ -969,7 +970,7 @@ void OKeyConfigWidget::save() {
     QListViewItemIterator it( m_view );
     while ( it.current() ) {
         if (it.current()->parent() ) {
-            Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>( it.current() );
+            Opie::Ui::Internal::OKeyListViewItem *item = static_cast<Opie::Ui::Internal::OKeyListViewItem*>( it.current() );
             OKeyConfigManager *man = item->manager();
             man->removeKeyConfig( item->origItem() );
             man->addKeyConfig( item->item() );
@@ -993,7 +994,7 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
         m_cus ->setChecked( false );
     }else{
         m_box->setEnabled( true );
-        Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>( _item );
+        Opie::Ui::Internal::OKeyListViewItem *item = static_cast<Opie::Ui::Internal::OKeyListViewItem*>( _item );
         OKeyConfigItem keyItem= item->item();
         m_lbl->setText(  tr("Default: " )+ item->text( 3 ) );
         if ( keyItem.keyPair().isEmpty() ) {
@@ -1024,7 +1025,7 @@ void OKeyConfigWidget::slotNoKey() {
     /*
      * If immediate we need to remove and readd the key
      */
-    Opie::Ui::Private::OKeyListViewItem *item =  static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem());
+    Opie::Ui::Internal::OKeyListViewItem *item =  static_cast<Opie::Ui::Internal::OKeyListViewItem*>(m_view->currentItem());
     updateItem( item, OKeyPair::emptyKey() );
 }
 
@@ -1037,7 +1038,7 @@ void OKeyConfigWidget::slotDefaultKey() {
     if ( !m_view->currentItem() || !m_view->currentItem()->parent() )
         return;
 
-    Opie::Ui::Private::OKeyListViewItem *item =  static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem());
+    Opie::Ui::Internal::OKeyListViewItem *item =  static_cast<Opie::Ui::Internal::OKeyListViewItem*>(m_view->currentItem());
     updateItem( item, item->item().defaultKeyPair() );
 }
 
@@ -1063,14 +1064,14 @@ void OKeyConfigWidget::slotConfigure() {
     connect(&dlg, SIGNAL(keyCaptured()), &dlg, SLOT(accept()) );
 
     if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) {
-        Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem());
+        Opie::Ui::Internal::OKeyListViewItem *item = static_cast<Opie::Ui::Internal::OKeyListViewItem*>(m_view->currentItem());
         updateItem( item, dlg.keyPair() );
     }
 
 
 }
 
-bool OKeyConfigWidget::sanityCheck(  Opie::Ui::Private::OKeyListViewItem* item,
+bool OKeyConfigWidget::sanityCheck(  Opie::Ui::Internal::OKeyListViewItem* item,
                                      const OKeyPair& newItem ) {
     OKeyPair::List bList = item->manager()->blackList();
     for ( OKeyPair::List::Iterator it = bList.begin(); it != bList.end(); ++it ) {
@@ -1089,7 +1090,7 @@ bool OKeyConfigWidget::sanityCheck(  Opie::Ui::Private::OKeyListViewItem* item,
         /* if not our parent and not us */
         if (it.current()->parent() &&  it.current() != item) {
             /* damn already given away*/
-            if ( newItem == static_cast<Opie::Ui::Private::OKeyListViewItem*>(it.current() )->item().keyPair() ) {
+            if ( newItem == static_cast<Opie::Ui::Internal::OKeyListViewItem*>(it.current() )->item().keyPair() ) {
                 QMessageBox::warning( 0, tr("Key is already assigned" ),
                                       tr("<qt>The Key you choose is already taken by "
                                          "a different Item of your config. Please try"
@@ -1103,7 +1104,7 @@ bool OKeyConfigWidget::sanityCheck(  Opie::Ui::Private::OKeyListViewItem* item,
     return true;
 }
 
-void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item,
+void OKeyConfigWidget::updateItem( Opie::Ui::Internal::OKeyListViewItem *item,
                                    const OKeyPair& newItem) {
     /* sanity check
      * check against the blacklist of the manager
@@ -1165,7 +1166,7 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
         return;
 
     int mod, key;
-    Opie::Ui::Private::fixupKeys( key,mod, ev );
+    Opie::Ui::Internal::fixupKeys( key,mod, ev );
 
     /* either we used software keyboard
      * or we've true support
@@ -1200,7 +1201,7 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
         m_keyPair = OKeyPair( m_key, m_mod );
     }
 
-    m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) );
+    m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) );
 
 }
 
@@ -1236,7 +1237,7 @@ void OKeyChooserConfigDialog::keyReleaseEvent( QKeyEvent* ev ) {
         else
             m_key = key;
        m_keyPair = OKeyPair( m_key, m_mod );
-       m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) );
+       m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) );
     }
 }
 
diff --git a/libopie2/opieui/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h
index f75ed99..bb8eb6c 100644
--- a/libopie2/opieui/okeyconfigwidget.h
+++ b/libopie2/opieui/okeyconfigwidget.h
@@ -25,7 +25,7 @@ class QTimer;
 
 namespace Opie {
 namespace Ui {
-namespace Private {
+namespace Internal {
     class OKeyConfigWidgetPrivate;
     typedef QValueList<OKeyConfigWidgetPrivate> OKeyConfigWidgetPrivateList;
     class OKeyListViewItem;
@@ -253,13 +253,13 @@ private slots:
     void slotConfigure();
 
 private:
-    static bool sanityCheck(  Opie::Ui::Private::OKeyListViewItem* man,
+    static bool sanityCheck(  Opie::Ui::Internal::OKeyListViewItem* man,
                               const OKeyPair& newItem );
-    void updateItem( Opie::Ui::Private::OKeyListViewItem* man,
+    void updateItem( Opie::Ui::Internal::OKeyListViewItem* man,
                      const OKeyPair& newItem);
     void initUi();
     Opie::Ui::OListView *m_view;
-    Opie::Ui::Private::OKeyConfigWidgetPrivateList m_list;
+    Opie::Ui::Internal::OKeyConfigWidgetPrivateList m_list;
     QLabel *m_lbl;
     QPushButton *m_btn;
     QRadioButton *m_def, *m_cus, *m_none;
diff --git a/libopie2/opieui/okeyconfigwidget_p.h b/libopie2/opieui/okeyconfigwidget_p.h
index e7eaba6..7690846 100644
--- a/libopie2/opieui/okeyconfigwidget_p.h
+++ b/libopie2/opieui/okeyconfigwidget_p.h
@@ -6,7 +6,7 @@
 
 namespace Opie {
 namespace Ui {
-namespace Private {
+namespace Internal {
     static QString keyToString( const OKeyPair& );
     static void fixupKeys( int&, int&, QKeyEvent* );
     class OKeyListViewItem : public Opie::Ui::OListViewItem {
diff --git a/libopie2/opieui/otaskbarapplet.h b/libopie2/opieui/otaskbarapplet.h
index 0c85ee7..ec7b9c4 100644
--- a/libopie2/opieui/otaskbarapplet.h
+++ b/libopie2/opieui/otaskbarapplet.h
@@ -41,7 +41,7 @@ class QMouseEvent;
 
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 /*======================================================================================
  * OTaskbarAppletWrapper
  *======================================================================================*/
@@ -122,7 +122,7 @@ private:
 
 #define EXPORT_OPIE_APPLET_v1(  AppLet ) \
     Q_EXPORT_INTERFACE() { \
-    Q_CREATE_INSTANCE(  Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \
+    Q_CREATE_INSTANCE(  Opie::Ui::Internal::OTaskbarAppletWrapper<AppLet> ) \
     }
 
 #endif