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
@@ -60,53 +60,53 @@ _;:,   .>  :=|.         This program is free software; you can
 const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
 using namespace Opie::Core;
 ODevice *ODevice::inst()
 {
    static ODevice *dev = 0;
    // rewrite this to only use /proc/cpuinfo or so
    if ( !dev )
    {
        QFile f( PATH_PROC_CPUINFO );
        if ( f.open( IO_ReadOnly ) )
        {
            QTextStream s( &f );
            while ( !s.atEnd() )
            {
                QString line;
                line = s.readLine();
                if ( line.startsWith( "Hardware" ) )
                {
                    qDebug( "ODevice() - found '%s'", (const char*) line );
-                    if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus();
+                    if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus();
-                    else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ();
+                    else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ();
-                    else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad();
+                    else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad();
-                    else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada();
+                    else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada();
-                    else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses();
+                    else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses();
                    else qWarning( "ODevice() - unknown hardware - using default." );
                    break;
                }
            }
        }
        else
        {
            qWarning( "ODevice() - can't open '%s' - unknown hardware - using default.", PATH_PROC_CPUINFO );
        }
        if ( !dev ) dev = new ODevice();
        dev->init();
    }
    return dev;
 }
 ODevice::ODevice()
 {
    d = new ODeviceData;
    d->m_modelstr = "Unknown";
    d->m_model = Model_Unknown;
    d->m_vendorstr = "Unknown";
    d->m_vendor = Vendor_Unknown;
    d->m_systemstr = "Unknown";
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
@@ -34,49 +34,49 @@
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 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 ))
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 typedef struct {
  unsigned char OffOnBlink;       /* 0=off 1=on 2=Blink */
  unsigned char TotalTime;        /* Units of 5 seconds */
  unsigned char OnTime;           /* units of 100m/s */
  unsigned char OffTime;          /* units of 100m/s */
 } LED_IN;
 typedef struct {
        unsigned char mode;
        unsigned char pwr;
        unsigned char brightness;
 } FLITE_IN;
 #define LED_ON    OD_IOW( 'f', 5, LED_IN )
 #define FLITE_ON  OD_IOW( 'f', 7, FLITE_IN )
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
@@ -16,49 +16,49 @@
 � � : .. � �.:, � � . . .    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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_IPAQ
 #define ODEVICE_IPAQ
 #include "odevice.h"
 /* QT */
 #include <qwindowsystem_qws.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class iPAQ : public ODevice, public QWSServer::KeyboardFilter
 {
  protected:
    virtual void init();
    virtual void initButtons();
  public:
    virtual bool setSoftSuspend( bool soft );
    virtual bool setDisplayBrightness( int b );
    virtual int displayBrightnessResolution() const;
    virtual void playAlarmSound();
    virtual QValueList <OLed> ledList() const;
    virtual QValueList <OLedState> ledStateList( OLed led ) const;
    virtual OLedState ledState( OLed led ) const;
    virtual bool setLedState( OLed led, OLedState st );
    virtual bool hasLightSensor() const;
    virtual int readLightSensor();
    virtual int lightSensorResolution() const;
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
@@ -56,49 +56,49 @@
 /* KERNEL */
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 typedef struct {
  unsigned char OffOnBlink;       /* 0=off 1=on 2=Blink */
  unsigned char TotalTime;        /* Units of 5 seconds */
  unsigned char OnTime;           /* units of 100m/s */
  unsigned char OffTime;          /* units of 100m/s */
 } LED_IN;
 typedef struct {
        unsigned char mode;
        unsigned char pwr;
        unsigned char brightness;
 } FLITE_IN;
 #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()
 {
    d->m_vendorstr = "HP";
    d->m_vendor = Vendor_HP;
    d->m_modelstr = "Jornada 56x";
    d->m_model = Model_Jornada_56x;
    d->m_systemstr = "Familiar";
    d->m_system = System_Familiar;
    d->m_rotation = Rot0;
    QFile f ( "/etc/familiar-version" );
    f.setName ( "/etc/familiar-version" );
    if ( f.open ( IO_ReadOnly )) {
        QTextStream ts ( &f );
        d->m_sysverstr = ts.readLine().mid( 10 );
        f. close();
    }
 }
 int Jornada::displayBrightnessResolution() const
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
@@ -13,41 +13,41 @@
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This program 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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_JORNADA
 #define ODEVICE_JORNADA
 #include <opie2/odevice.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Jornada : public ODevice
 {
  protected:
    virtual void init();
  public:
    virtual bool setSoftSuspend ( bool soft );
    virtual bool setDisplayBrightness ( int b );
    virtual int displayBrightnessResolution() const;
 };
 }
 }
 }
 #endif
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
@@ -33,49 +33,49 @@
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #endif
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 struct r_button ramses_buttons [] = {
    { Model_Ramses_MNCI,
    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
    "devicebuttons/z_menu",
    "QPE/TaskBar", "toggleMenu()",
    "QPE/TaskBar", "toggleStartMenu()" },
    { Model_Ramses_MNCI,
    Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
    "devicebuttons/ipaq_home",
    "QPE/Launcher", "home()",
    "buttonsettings", "raise()" },
 };
 void Ramses::init()
 {
    d->m_vendorstr = "M und N";
    d->m_vendor = Vendor_MundN;
    QFile f("/proc/sys/board/ramses");
    d->m_modelstr = "Ramses";
    d->m_model = 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
@@ -15,49 +15,49 @@
 � � �+ �. �-:. � � � =       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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_RAMSES
 #define ODEVICE_RAMSES
 #include <opie2/odevice.h>
 /* QT */
 #include <qwindowsystem_qws.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Ramses : public ODevice, public QWSServer::KeyboardFilter
 {
  protected:
    virtual void init();
  public:
    virtual bool setSoftSuspend( bool soft );
    virtual bool suspend();
    virtual bool setDisplayStatus( bool on );
    virtual bool setDisplayBrightness( int b );
    virtual int displayBrightnessResolution() const;
    virtual bool setDisplayContrast( int b );
    virtual int displayContrastResolution() const;
  protected:
    virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
    virtual void timerEvent ( QTimerEvent *te );
    int m_power_timer;
 };
 struct r_button {
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
@@ -33,49 +33,49 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #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,
    Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"),
    "devicebuttons/simpad_lower_up",
    "datebook", "nextView()",
    "today", "raise()" },
    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
    Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"),
    "devicebuttons/simpad_lower_down",
    "addressbook", "raise()",
    "addressbook", "beamBusinessCard()" },
    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
    Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"),
    "devicebuttons/simpad_lower_right",
    "QPE/TaskBar", "toggleMenu()",
    "QPE/TaskBar", "toggleStartMenu()" },
    { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus,
    Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"),
    "devicebuttons/simpad_lower_left",
    "mail", "raise()",
    "mail", "newMail()" },
    { 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
@@ -16,49 +16,49 @@
 � � : .. � �.:, � � . . .    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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_SIMPAD
 #define ODEVICE_SIMPAD
 #include <opie2/odevice.h>
 /* QT */
 #include <qwindowsystem_qws.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class SIMpad : public ODevice, public QWSServer::KeyboardFilter
 {
  protected:
    virtual void init();
    virtual void initButtons();
  public:
    virtual bool setSoftSuspend( bool soft );
    virtual bool suspend();
    virtual bool setDisplayStatus( bool on );
    virtual bool setDisplayBrightness( int b );
    virtual int displayBrightnessResolution() const;
    virtual void playAlarmSound();
    virtual QValueList <OLed> ledList() const;
    virtual QValueList <OLedState> ledStateList( OLed led ) const;
    virtual OLedState ledState( OLed led ) const;
    virtual bool setLedState( OLed led, OLedState st );
  protected:
    virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
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
@@ -33,49 +33,49 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #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" ),
        "devicebuttons/yopy_action",
        "datebook", "nextView()",
        "today", "raise()" },
    { Qt::Key_F11, QT_TRANSLATE_NOOP( "Button", "OK Button" ),
        "devicebuttons/yopy_ok",
        "addressbook", "raise()",
        "addressbook", "beamBusinessCard()" },
    { Qt::Key_F12, QT_TRANSLATE_NOOP( "Button", "End Button" ),
        "devicebuttons/yopy_end",
        "QPE/Launcher", "home()",
        "buttonsettings", "raise()" },
 };
 void Yopy::init()
 {
    d->m_vendorstr = "G.Mate";
    d->m_vendor = Vendor_GMate;
    d->m_modelstr = "Yopy3700";
    d->m_model = Model_Yopy_3700;
    d->m_rotation = Rot0;
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
@@ -13,49 +13,49 @@ _;:, � � .> � �:=|.         This program is free software; you can
 � .%`+i> � � � _;_.
 � .i_,=:_. � � �-<s.       This program 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,
                            Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_YOPY
 #define ODEVICE_YOPY
 #include <opie2/odevice.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Yopy : public ODevice
 {
  protected:
    virtual void init();
    virtual void initButtons();
  public:
    virtual bool suspend();
    virtual bool setDisplayBrightness ( int b );
    virtual int displayBrightnessResolution() const;
 };
 struct yopy_button
 {
    Qt::Key code;
    char *utext;
    char *pix;
    char *fpressedservice;
    char *fpressedaction;
    char *fheldservice;
    char *fheldaction;
 };
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
@@ -33,49 +33,49 @@ _;:,   .>  :=|.         This program is free software; you can
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qwindowsystem_qws.h>
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
 #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"),
    "devicebuttons/z_calendar",
    "datebook", "nextView()",
    "today", "raise()" },
    { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"),
    "devicebuttons/z_contact",
    "addressbook", "raise()",
    "addressbook", "beamBusinessCard()" },
    { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"),
    "devicebuttons/z_home",
    "QPE/Launcher", "home()",
    "buttonsettings", "raise()" },
    { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"),
    "devicebuttons/z_menu",
    "QPE/TaskBar", "toggleMenu()",
    "QPE/TaskBar", "toggleStartMenu()" },
    { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
    "devicebuttons/z_mail",
    "mail", "raise()",
    "mail", "newMail()" },
 };
@@ -366,57 +366,57 @@ void Zaurus::buzzer ( int sound )
                Config cfg ( "qpe" );
                cfg. setGroup ( "Volume" );
                int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
                if ( volalarm < 0 )
                    volalarm = 0;
                else if ( volalarm > 100 )
                    volalarm = 100;
                volalarm |= ( volalarm << 8 );
                if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 )
                    vol_reset = true;
            }
        }
        snd. play();
        while ( !snd. isFinished())
            qApp->processEvents();
        if ( fd >= 0 ) {
            if ( vol_reset )
                ::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
            ::close ( fd );
        }
-            } else {    
+    } else {
        int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
        if ( fd >= 0 ) {
            ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
            ::close ( fd );
        }
-    } 
+    }
 #endif
 }
 void Zaurus::playAlarmSound()
 {
    buzzer ( SHARP_BUZ_SCHEDULE_ALARM );
 }
 void Zaurus::playTouchSound()
 {
    buzzer ( SHARP_BUZ_TOUCHSOUND );
 }
 void Zaurus::playKeySound()
 {
    buzzer ( SHARP_BUZ_KEYSOUND );
 }
 QValueList <OLed> Zaurus::ledList() const
 {
    QValueList <OLed> vl;
    vl << Led_Mail;
@@ -585,51 +585,51 @@ bool Zaurus::suspend()
            ::gettimeofday ( &tvn, 0 );
        } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 15000 );
    }
    QCopEnvelope ( "QPE/Rotation", "rotateDefault()" );
    return res;
 }
 Transformation Zaurus::rotation() const
 {
    Transformation rot;
    int handle = 0;
    int retval = 0;
    switch ( d->m_model ) {
        case Model_Zaurus_SLC7x0:
            handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK);
            if (handle == -1) {
                return Rot270;
            } else {
                retval = ::ioctl(handle, SHARP_IOCTL_GET_ROTATION);
                ::close (handle);
-                if (retval == 2 ) 
+                if (retval == 2 )
                    rot = Rot0;
-                else 
+                else
                    rot = Rot270;
            }
            break;
        case Model_Zaurus_SLA300:
        case Model_Zaurus_SLB600:
        case Model_Zaurus_SL5500:
        case Model_Zaurus_SL5000:
        default:
            rot = d->m_rotation;
            break;
    }
    return rot;
 }
 ODirection Zaurus::direction() const
 {
    ODirection dir;
    int handle = 0;
    int retval = 0;
    switch ( d->m_model ) {
        case Model_Zaurus_SLC7x0:
            handle = ::open("/dev/apm_bios", O_RDWR|O_NONBLOCK);
            if (handle == -1) {
                dir = CW;
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
@@ -27,49 +27,49 @@
                             Boston, MA 02111-1307, USA.
 */
 #ifndef ODEVICE_ZAURUS
 #define ODEVICE_ZAURUS
 #include <opie2/odevice.h>
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 // _IO and friends are only defined in kernel headers ...
 #define OD_IOC(dir,type,number,size)    (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 ))
 #define OD_IO(type,number)              OD_IOC(0,type,number,0)
 #define OD_IOW(type,number,size)        OD_IOC(1,type,number,sizeof(size))
 #define OD_IOR(type,number,size)        OD_IOC(2,type,number,sizeof(size))
 #define OD_IORW(type,number,size)       OD_IOC(3,type,number,sizeof(size))
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class Zaurus : public ODevice
 {
  protected:
    virtual void init();
    virtual void initButtons();
  public:
    virtual bool setSoftSuspend ( bool soft );
    virtual bool setDisplayBrightness ( int b );
    virtual int displayBrightnessResolution() const;
    virtual void playAlarmSound();
    virtual void playKeySound();
    virtual void playTouchSound();
    virtual QValueList <OLed> ledList() const;
    virtual QValueList <OLedState> ledStateList ( OLed led ) const;
    virtual OLedState ledState( OLed led ) const;
    virtual bool setLedState( OLed led, OLedState st );
    virtual bool hasHingeSensor() const;
    virtual OHingeStatus readHingeSensor();
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
@@ -15,61 +15,61 @@
 � � �+ �. �-:. � � � =       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,
                             Boston, MA 02111-1307, USA.
 */
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <opie2/odevicebutton.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OQCopMessageData
 {
  public:
    QCString m_channel;
    QCString m_message;
    QByteArray m_data;
 };
 }
 using namespace Opie::Core;
-using namespace Opie::Core::Private;
+using Opie::Core::Internal::OQCopMessageData;
 OQCopMessage::OQCopMessage()
        : d ( 0 )
 {
    init ( QCString(), QCString(), QByteArray());
 }
 OQCopMessage::OQCopMessage ( const OQCopMessage &copy )
        : d ( 0 )
 {
    init ( copy. channel(), copy. message(), copy. data());
 }
 OQCopMessage &OQCopMessage::operator = ( const OQCopMessage &assign )
 {
    init ( assign. channel(), assign. message(), assign. data());
    return *this;
 }
 OQCopMessage::OQCopMessage ( const QCString &ch, const QCString &m, const QByteArray &arg )
        : d ( 0 )
 {
    init ( ch, m, arg );
 }
@@ -111,55 +111,55 @@ QByteArray OQCopMessage::data() const
    return d->m_data;
 }
 bool OQCopMessage::isNull() const
 {
    return d->m_message.isNull() || d->m_channel.isNull();
 }
 void OQCopMessage::setChannel ( const QCString &ch )
 {
    d->m_channel = ch;
 }
 void OQCopMessage::setMessage ( const QCString &m )
 {
    d->m_message = m;
 }
 void OQCopMessage::setData ( const QByteArray &data )
 {
    d->m_data = 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
 */
 ODeviceButton::ODeviceButton()
 {}
 ODeviceButton::~ODeviceButton()
 {}
 /*!
 Returns the button's keycode.
 */
 ushort ODeviceButton::keycode() const
 {
    return m_Keycode;
 }
 /*!
 This function returns a human readable, translated description of the button.
 */
 QString ODeviceButton::userText() const
 {
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
@@ -5,77 +5,77 @@
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef DEVICE_BUTTON_H
 #define DEVICE_BUTTON_H
 #include <qpixmap.h>
 #include <qstring.h>
 namespace Opie{
 namespace Core{
-namespace Private {
+namespace Internal {
 class OQCopMessageData;
 }
 class OQCopMessage
 {
 public:
    OQCopMessage ( );
    OQCopMessage ( const OQCopMessage &copy );
    OQCopMessage ( const QCString &m_channel, const QCString &message, const QByteArray &args = QByteArray ( ));
    OQCopMessage &operator = ( const OQCopMessage &assign );
    void setChannel ( const QCString &channel );
    void setMessage ( const QCString &message );
    void setData ( const QByteArray &ba );
    QCString channel ( ) const;
    QCString message ( ) const;
    QByteArray data ( ) const;
    bool isNull()const;
    bool send ( );
 private:
    void init ( const QCString &m_channel, const QCString &message, const QByteArray &args );
-    Private::OQCopMessageData *d;
+    Internal::OQCopMessageData *d;
    class Private;
    Private* m_data;
 };
 /**
 * This class represents a physical button on a Qtopia device.  A device may
 * have n "user programmable" buttons, which are number 1..n.  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.
 *
 * @version 1.0
 * @author Trolltech
 * @short A representation of buttons
 */
 class ODeviceButton
 {
  public:
    ODeviceButton();
    virtual ~ODeviceButton();
    ushort keycode ( ) const;
    QString userText ( ) const;
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
@@ -24,95 +24,95 @@
 � � -- � � � �:-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 #include <signal.h>
 #include <stdio.h>
 using namespace Opie::Core;
 OApplication* OApplication::_instance = 0;
 /**************************************************************************************************
 * OApplicationPrivate
 **************************************************************************************************/
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OApplicationPrivate
 {
  public:
    OApplicationPrivate() {};
    ~OApplicationPrivate() {};
 };
 }
 /**************************************************************************************************
 * OApplication
 **************************************************************************************************/
 OApplication::OApplication( int& argc, char** argv, const QCString& rAppName )
             :QPEApplication( argc, argv ),
             _appname( rAppName ),
             _config( 0 )
 {
    init();
 }
 OApplication::~OApplication()
 {
    delete d;
    if ( _config )
        delete _config;
    OApplication::_instance = 0;
    // after deconstruction of the one-and-only application object,
    // the construction of another object is allowed
 }
 OConfig* OApplication::config()
 {
    if ( !_config )
    {
        _config = new OConfig( _appname );
    }
    return _config;
 }
 void OApplication::init()
 {
-    d = new Private::OApplicationPrivate();
+    d = new Internal::OApplicationPrivate();
    if ( !OApplication::_instance )
    {
        OApplication::_instance = this;
        /* register SIGSEGV handler to give programs an option
         * to exit gracefully, e.g. save or close devices or files.
        struct sigaction sa;
        sa.sa_handler = ( void (*)(int) ) &segv_handler;
        sa.sa_flags = SA_SIGINFO | SA_RESTART;
        sigemptyset(&sa.sa_mask);
        sigaction(SIGSEGV, &sa, NULL);
        */
    }
    else
    {
        ofatal << "OApplication: Can't create more than one OApplication object. Aborting." << oendl;
        //FIXME exit gracefully ?
        ::exit( -1 );
    }
 }
 void OApplication::showMainWidget( QWidget* widget, bool nomax )
 {
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
@@ -16,49 +16,49 @@
 � � : .. � �.:, � � . . .    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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OAPPLICATION_H
 #define OAPPLICATION_H
 #define oApp Opie::Core::OApplication::oApplication()
 #include <qpe/qpeapplication.h>
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OApplicationPrivate;
 } // private class
 class OConfig;
 class OApplication : public QPEApplication
 {
  Q_OBJECT
  public:
    /**
     * Constructor. Parses command-line arguments and sets the window caption.
     *
     * @param rAppName application name. Will be used for finding the
     * associated message, icon and configuration files
     *
     */
    OApplication( int& argc, char** argv, const QCString& rAppName );
    /**
     * Destructor. Destroys the application object and its children.
     */
    virtual ~OApplication();
    /**
@@ -81,31 +81,31 @@ class OApplication : public QPEApplication
     * @returns the application session config object.
     *
     * @see OConfig
     */
    OConfig* config();
    /**
     * Shows the main @a widget and sets the name of the application as window caption.
     */
    virtual void showMainWidget( QWidget* widget, bool nomax = false );
    /**
     * Set the application title. The application title will be concatenated
     * to the application name given in the constructor.
     *
     * @param title the title. If not given, resets caption to appname
     */
    virtual void setTitle( const QString& title = QString::null ) const;
  protected:
    void init();
  private:
    const QCString _appname;
    static OApplication* _instance;
    OConfig* _config;
-    Private::OApplicationPrivate* d;
+    Internal::OApplicationPrivate* d;
 };
 } // Core
 } // Opie
 #endif // OAPPLICATION_H
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
@@ -46,58 +46,58 @@ namespace Core {
 /**
  * A Configuration class based on the Qtopia @ref Config class
  * featuring additional handling of color and font entries
  */
 class OConfig : public Config
 {
  public:
    /**
     * Constructs a OConfig object with a @a name.
     */
    OConfig( const QString &name, Domain domain = User );
    /**
     * Destructs the OConfig object.
     *
     * Writes back any dirty configuration entries, and destroys
     * dynamically created objects.
     */
    virtual ~OConfig();
    /**
     * @returns the name of the current group.
     * 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.
     */
    QColor readColorEntry( const QString& key, const QColor* pDefault ) const;
    /**
     * @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;
 };
 /**
 * @brief Helper class for easier use of OConfig groups.
 *
 * Careful programmers always set the group of a
 * @ref OConfig object to the group they want to read from
 * and set it back to the old one of afterwards. This is usually
 * written as:
 * <pre>
 *
 * QString oldgroup config()->group();
 * config()->setGroup( "TheGroupThatIWant" );
 * ...
 * config()->writeEntry( "Blah", "Blubb" );
 *
 * config()->setGroup( oldgroup );
 * </pre>
 *
 * In order to facilitate this task, you can use
 * OConfigGroupSaver. Simply construct such an object ON THE STACK
@@ -123,32 +123,32 @@ class OConfigGroupSaver
     */
    OConfigGroupSaver( OConfig* config, QString group ) :_config(config), _oldgroup(config->group() )
        { _config->setGroup( group ); }
    OConfigGroupSaver( OConfig* config, const char *group ) :_config(config), _oldgroup(config->group())
        { _config->setGroup( group ); }
    OConfigGroupSaver( OConfig* config, const QCString &group ) : _config(config), _oldgroup(config->group())
        { _config->setGroup( group ); }
    /**
     * Destructor.
     * Restores the last current group.
     * @todo make it not inline for bc reasons. See KDE BC guide
     */
    ~OConfigGroupSaver() { _config->setGroup( _oldgroup ); }
    OConfig* config() { return _config; };
  private:
    OConfig* _config;
    QString _oldgroup;
    OConfigGroupSaver( const OConfigGroupSaver& );
    OConfigGroupSaver& operator=( const OConfigGroupSaver& );
-    
    class Private;
    Private *d;
 };
 }
 }
 #endif // OCONFIG_H
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
@@ -46,48 +46,57 @@
 #include <opie2/oconfig.h>
 /* QT */
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qsocketdevice.h>
 /* UNIX */
 #include <stdlib.h>     // abort
 #include <unistd.h>     // getpid
 #include <stdarg.h>     // vararg stuff
 #include <ctype.h>      // isprint
 #include <syslog.h>
 #include <errno.h>
 #include <string.h>
 #ifndef OPIE_NO_BACKTRACE
 #include <execinfo.h>
 #endif
 namespace Opie {
 namespace Core {
+namespace Internal {
+class  DebugBackend {
+};
+static  DebugBackend *backEnd = 0;
+}
+static void clean_up_routine() {
+    delete Internal::backEnd;
+}
 /*======================================================================================
 * debug levels
 *======================================================================================*/
 enum DebugLevels {
    ODEBUG_INFO     = 0,
    ODEBUG_WARN     = 1,
    ODEBUG_ERROR    = 2,
    ODEBUG_FATAL    = 3
 };
 /*======================================================================================
 * oDebug private data
 *======================================================================================*/
 /*======================================================================================
 * the main debug function
 *======================================================================================*/
 static void oDebugBackend( unsigned short level, unsigned int area, const char *data)
 {
    //qDebug( "oDebugBackend: Level=%d, Area=%d, Data=%s", level, area, data );
    // ML: OPIE doesn't use areacodes at the moment. See the KDE debug classes for an
@@ -601,25 +610,25 @@ QString odBacktrace( int levels )
        s += QString::number(i) +
             QString::fromLatin1(": ") +
             QString::fromLatin1(strings[i]) + QString::fromLatin1("\n");
    s += "]\n";
    free (strings);
 #endif
    return s;
 }
 void odClearDebugConfig()
 {
    /*
    delete oDebug_data->config;
    oDebug_data->config = 0;
    */
 }
 #ifdef OPIE_NO_DEBUG
 #define odDebug ondDebug
 #define odBacktrace ondBacktrace
 #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,68 +1,68 @@
 /* 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,
    Boston, MA 02111-1307, USA.
 */
 //
 //  KPROCESSCONTROLLER -- A helper class for KProcess
 //
 //  version 0.3.1, Jan, 8th 1997
 //
 //  (C) Christian Czezatke
 //  e9025461@student.tuwien.ac.at
 //  Ported by Holger Freyther
 //
 //#include <config.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
 #include <qsocketnotifier.h>
 #include "oprocctrl.h"
-using namespace Opie::Core::Private;
+using namespace Opie::Core::Internal;
 OProcessController *OProcessController::theOProcessController = 0;
 struct sigaction OProcessController::oldChildHandlerData;
 bool OProcessController::handlerSet = false;
 OProcessController::OProcessController()
 {
    assert( theOProcessController == 0 );
    if (0 > pipe(fd))
        printf(strerror(errno));
    notifier = new QSocketNotifier(fd[0], QSocketNotifier::Read);
    notifier->setEnabled(true);
    QObject::connect(notifier, SIGNAL(activated(int)),
                     this, SLOT(slotDoHousekeeping(int)));
    connect( &delayedChildrenCleanupTimer, SIGNAL( timeout()),
             SLOT( delayedChildrenCleanup()));
    theOProcessController = this;
    setupHandlers();
 }
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,66 +1,66 @@
 /* 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,
    Boston, MA 02111-1307, USA.
 */
 //
 //  KPROCESSCONTROLLER -- A helper class for KProcess
 //
 //  version 0.3.1, Jan 8th 1997
 //
 //  (C) Christian Czezatke
 //  e9025461@student.tuwien.ac.at
 //  Ported by Holger Freyther
 //
 #ifndef __KPROCCTRL_H__
 #define __KPROCCTRL_H__
 #include <qvaluelist.h>
 #include <qtimer.h>
 #include "oprocess.h"
 class QSocketNotifier;
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessControllerPrivate;
 /**
 * @short Used internally by @ref OProcess
 * @internal
 * @author Christian Czezakte <e9025461@student.tuwien.ac.at>
 *
 *  A class for internal use by OProcess only. -- Exactly one instance
 *  of this class is generated by the first instance of OProcess that is
 *  created (a pointer to it gets stored in @ref theOProcessController ).
 *
 * This class takes care of the actual (UN*X) signal handling.
 */
 class OProcessController : public QObject
 {
    Q_OBJECT
 public:
    OProcessController();
    ~OProcessController();
    //CC: WARNING! Destructor Not virtual (but you don't derive classes from this anyhow...)
 public:
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
@@ -40,53 +40,53 @@ _;:, � � .> � �:=|.         This program is free software; you can
 #include <qmap.h>
 #include <qsocketnotifier.h>
 #include <qtextstream.h>
 /* STD */
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #ifdef HAVE_INITGROUPS
 #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:
    OProcessPrivate() : useShell( false )
    { }
    bool useShell;
    QMap<QString, QString> env;
    QString wd;
    QCString shell;
 };
 }
 OProcess::OProcess( QObject *parent, const char *name )
        : QObject( parent, name )
 {
    init ( );
 }
 OProcess::OProcess( const QString &arg0, QObject *parent, const char *name )
        : QObject( parent, name )
 {
    init ( );
    *this << arg0;
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
@@ -25,49 +25,49 @@ _;:, � � .> � �:=|.         This program is free software; you can
 � -- � � � �:-=`           this library; see the file COPYING.LIB.
                            If not, write to the Free Software Foundation,
                            Inc., 59 Temple Place - Suite 330,
                            Boston, MA 02111-1307, USA.
 */
 #ifndef OPROCESS_H
 #define OPROCESS_H
 /* QT */
 #include <qcstring.h>
 #include <qobject.h>
 #include <qvaluelist.h>
 /* STD */
 #include <sys/types.h> // for pid_t
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
 class QSocketNotifier;
 namespace Opie {
 namespace Core {
-namespace Private {
+namespace Internal {
 class OProcessController;
 class OProcessPrivate;
 }
 /**
 * Child process invocation, monitoring and control.
 *
 * @sect General usage and features
 *
 *This class allows a KDE and OPIE application to start child processes without having
 *to worry about UN*X signal handling issues and zombie process reaping.
 *
 *@see KProcIO
 *
 *Basically, this class distinguishes three different ways of running
 *child processes:
 *
 *@li  OProcess::DontCare -- The child process is invoked and both the child
 *process and the parent process continue concurrently.
 *
 *Starting a  DontCare child process means that the application is
 *not interested in any notification to determine whether the
 *child process has already exited or not.
 *
@@ -702,60 +702,60 @@ protected:
    /**
     * Called by "slotChildOutput" this function copies data arriving from the
     * child process's stdout to the respective buffer and emits the signal
     * "@ref receivedStderr".
     */
    int childOutput( int fdno );
    /**
     * Called by "slotChildOutput" this function copies data arriving from the
     * child process's stdout to the respective buffer and emits the signal
     * "@ref receivedStderr"
     */
    int childError( int fdno );
    // information about the data that has to be sent to the child:
    const char *input_data;  // the buffer holding the data
    int input_sent;    // # of bytes already transmitted
    int input_total;   // total length of input_data
    /**
     * @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:
    /**
     * Searches for a valid shell.
     * Here is the algorithm used for finding an executable shell:
     *
     *    @li Try the executable pointed to by the "SHELL" environment
     *    variable with white spaces stripped off
     *
     *    @li If your process runs with uid != euid or gid != egid, a shell
     *    not listed in /etc/shells will not used.
     *
     *    @li If no valid shell could be found, "/bin/sh" is used as a last resort.
     */
    QCString searchShell();
    /**
     * Used by @ref searchShell in order to find out whether the shell found
     * is actually executable at all.
     */
    bool isExecutable( const QCString &filename );
    // Disallow assignment and copy-construction
    OProcess( const OProcess& );
    OProcess& operator= ( const OProcess& );
 private:
    void init ( );
-    Private::OProcessPrivate *d;
+    Internal::OProcessPrivate *d;
 };
 }
 }
 #endif
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
@@ -20,49 +20,49 @@
 ++= � -. � � .` � � .:       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,
                             Boston, MA 02111-1307, USA.
 */
 #include "osqlquery.h"
 #include "osqlitedriver.h"
 #include <opie2/odebug.h>
 #include <stdlib.h>
 // fromLocal8Bit() does not work as expected. Thus it
 // is replaced by fromLatin1() (eilers)
 #define __BUGGY_LOCAL8BIT_
 using namespace Opie::DB;
-using namespace Opie::DB::Private;
+using namespace Opie::DB::Internal;
 namespace {
    struct Query {
        OSQLError::ValueList errors;
        OSQLResultItem::ValueList items;
        OSQLiteDriver *driver;
    };
 }
 OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
    : OSQLDriver( lib )
 {
    m_sqlite = 0l;
 }
 OSQLiteDriver::~OSQLiteDriver() {
    close();
 }
 QString OSQLiteDriver::id()const {
    return QString::fromLatin1("SQLite");
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
@@ -1,36 +1,36 @@
 #ifndef OSQL_LITE_DRIVER_H
 #define OSQL_LITE_DRIVER_H
 #include <sqlite.h>
 #include "osqldriver.h"
 #include "osqlerror.h"
 #include "osqlresult.h"
 namespace Opie {
 namespace DB {
-namespace Private {
+namespace Internal {
 class OSQLiteDriver : public OSQLDriver {
    Q_OBJECT
 public:
    OSQLiteDriver( QLibrary *lib = 0l );
    ~OSQLiteDriver();
    QString id()const;
    void setUserName( const QString& );
    void setPassword( const QString& );
    void setUrl( const QString& url );
    void setOptions( const QStringList& );
    bool open();
    bool close();
    OSQLError lastError();
    OSQLResult query( OSQLQuery* );
    OSQLTable::ValueList tables()const;
 private:
    OSQLError m_lastE;
    OSQLResult m_result;
    OSQLResultItem m_items;
    int handleCallBack( int, char**, char** );
    static int call_back( void*, int, char**, char** );
    QString m_url;
    sqlite *m_sqlite;
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
@@ -12,60 +12,60 @@ OSQLManager::OSQLManager() {
 OSQLBackEnd::ValueList OSQLManager::queryBackEnd() {
    m_list.clear();
    QString opie = QString::fromLatin1( getenv("OPIEDIR") );
    QString qpe = QString::fromLatin1( getenv("QPEDIR") );
    if ( !m_path.contains(opie) && !opie.isEmpty() )
        m_path << opie;
    if ( !m_path.contains(qpe) && !qpe.isEmpty() )
        m_path << qpe;
    OSQLBackEndManager mng( m_path );
    m_list = mng.scan();
    m_list += builtIn();
    return m_list;
 }
 /*
 * loading dso's is currently not enabled due problems with QLibrary
 * beeing in libqpe and not libqte
 */
 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;
 }
 /*
 * same as above
 */
 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;
 }
 /*
 * let's find the a default with the highes preference
 */
 OSQLDriver* OSQLManager::standard() {
    OSQLDriver* driver =0l;
    if ( m_list.isEmpty() ) queryBackEnd();
    OSQLBackEnd::ValueList::Iterator it;
    OSQLBackEnd back;
    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
        if ( (*it).isDefault() &&
             back.preference() < (*it).preference() ) {
            back = (*it);
        }
    }
    driver = load( back );
    return driver;
 }
 void OSQLManager::registerPath( const QString& path ) {
    m_path << path;
 }
 bool OSQLManager::unregisterPath( const QString& path ) {
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
@@ -1,38 +1,38 @@
 /*
 * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
 */
 #include <opie2/odebug.h>
 #include "odebugmapper.h"
 using namespace Opie::Core;
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 DebugMapper::DebugMapper()
 {
    odebug << "DebugMapper::DebugMapper()" << oendl;
    _map.insert( 0x8902, new QString("SIOCSPGRP") );
    _map.insert( 0x8904, new QString("SIOCGPGRP") );
    _map.insert( 0x8905, new QString("SIOCATMARK") );
    _map.insert( 0x8906, new QString("SIOCGSTAMP") );
    _map.insert( 0x890B, new QString("SIOCADDRT") );
    _map.insert( 0x890C, new QString("SIOCDELRT") );
    _map.insert( 0x890D, new QString("SIOCRTMSG") );
    _map.insert( 0x8910, new QString("SIOCGIFNAME") );
    _map.insert( 0x8911, new QString("SIOCSIFLINK") );
    _map.insert( 0x8912, new QString("SIOCGIFCONF") );
    _map.insert( 0x8913, new QString("SIOCGIFFLAGS") );
    _map.insert( 0x8914, new QString("SIOCSIFFLAGS") );
    _map.insert( 0x8915, new QString("SIOCGIFADDR") );
    _map.insert( 0x8916, new QString("SIOCSIFADDR") );
    _map.insert( 0x8917, new QString("SIOCGIFDSTADDR") );
    _map.insert( 0x8918, new QString("SIOCSIFDSTADDR") );
    _map.insert( 0x8919, new QString("SIOCGIFBRDADDR") );
    _map.insert( 0x891a, new QString("SIOCSIFBRDADDR") );
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
@@ -1,36 +1,36 @@
 /*
 * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
 */
 #ifndef DEBUGMAPPER_H
 #define DEBUGMAPPER_H
 #include <qstring.h>
 #include <qintdict.h>
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 typedef QIntDict<QString> IntStringMap;
 class DebugMapper
 {
  public:
    DebugMapper();
    ~DebugMapper();
    const QString& map( int value ) const;
  private:
    IntStringMap _map;
    class Private;
    Private *d;
 };
 }
 }
 }
 #endif
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
@@ -169,49 +169,49 @@ int OPrivateIOCTL::numberSetArgs() const
    return _setargs & IW_PRIV_SIZE_MASK;
 }
 int OPrivateIOCTL::typeSetArgs() const
 {
    return _setargs & IW_PRIV_TYPE_MASK >> 12;
 }
 void OPrivateIOCTL::invoke() const
 {
    ( (OWirelessNetworkInterface*) parent() )->wioctl( _ioctl );
 }
 void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 {
    u_int32_t* arglist = (u_int32_t*) &( (OWirelessNetworkInterface*) parent() )->_iwr.u.name;
    arglist[num] = value;
 }
-namespace Private {
+namespace Internal {
 /*======================================================================================
 * assorted functions
 *======================================================================================*/
 void dumpBytes( const unsigned char* data, int num )
 {
    printf( "Dumping %d bytes @ %0x", num, data );
    printf( "-------------------------------------------\n" );
    for ( int i = 0; i < num; ++i )
    {
        printf( "%02x ", data[i] );
        if ( !((i+1) % 32) ) printf( "\n" );
    }
    printf( "\n\n" );
 }
 int stringToMode( const QString& mode )
 {
    if ( mode == "auto" )            return IW_MODE_AUTO;
    else if ( mode == "adhoc" )      return IW_MODE_ADHOC;
    else if ( mode == "managed" )    return IW_MODE_INFRA;
    else if ( mode == "master" )     return IW_MODE_MASTER;
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
@@ -111,49 +111,49 @@ class OPrivateIOCTL : public QObject
    ~OPrivateIOCTL();
    int numberGetArgs() const;
    int typeGetArgs() const;
    int numberSetArgs() const;
    int typeSetArgs() const;
    // FIXME return int? as ::ioctl does? -zecke
    void invoke() const;
    void setParameter( int, u_int32_t );
  private:
    u_int32_t _ioctl;
    u_int16_t _getargs;
    u_int16_t _setargs;
    class Private;
    Private *d;
 };
 /*======================================================================================
 * Miscellaneous
 *======================================================================================*/
-namespace Private {
+namespace Internal {
 void dumpBytes( const unsigned char* data, int num );
 QString modeToString( int );
 int stringToMode( const QString& );
 }
 }
 }
 #define IW_PRIV_TYPE_MASK       0x7000
 #define IW_PRIV_TYPE_NONE       0x0000
 #define IW_PRIV_TYPE_BYTE       0x1000
 #define IW_PRIV_TYPE_CHAR       0x2000
 #define IW_PRIV_TYPE_INT        0x4000
 #define IW_PRIV_TYPE_FLOAT      0x5000
 #define IW_PRIV_TYPE_ADDR       0x6000
 #define IW_PRIV_SIZE_FIXED      0x0800
 #define IW_PRIV_SIZE_MASK       0x07FF
 #ifndef ARPHRD_IEEE80211
 #define ARPHRD_IEEE80211 801
 #endif
 #ifndef ARPHRD_IEEE80211_PRISM
 #define ARPHRD_IEEE80211_PRISM 802
 #endif
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
@@ -39,92 +39,92 @@
 #include <qfile.h>
 #include <qtextstream.h>
 /* UNIX */
 #include <assert.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <linux/sockios.h>
 #include <net/if_arp.h>
 #include <stdarg.h>
 #ifndef NODEBUG
 #include <opie2/odebugmapper.h>
 using namespace Opie::Core;
-using namespace Opie::Net::Private;
+using namespace Opie::Net::Internal;
 DebugMapper* debugmapper = new DebugMapper();
 #endif
 /*======================================================================================
 * ONetwork
 *======================================================================================*/
 namespace Opie {
 namespace Net  {
 ONetwork* ONetwork::_instance = 0;
 ONetwork::ONetwork()
 {
    odebug << "ONetwork::ONetwork()" << oendl;
    odebug << "ONetwork: This code has been compiled against Wireless Extensions V" << WIRELESS_EXT << oendl;
    synchronize();
 }
 void ONetwork::synchronize()
 {
    // gather available interfaces by inspecting /proc/net/dev
    //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
    //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices
    //FIXME: Best is use SIOCGIFCONF and if this doesn't work (result=-1), then fallback to parsing /proc/net/dev
    _interfaces.clear();
    QString str;
    QFile f( "/proc/net/dev" );
    bool hasFile = f.open( IO_ReadOnly );
    if ( !hasFile )
    {
        odebug << "ONetwork: /proc/net/dev not existing. No network devices available" << oendl;
        return;
    }
    QTextStream s( &f );
    s.readLine();
    s.readLine();
    while ( !s.atEnd() )
    {
        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 );
            odebug << "ONetwork: interface '" << str << "' has Wireless Extensions" << oendl;
        }
        else
        {
            iface = new ONetworkInterface( this, (const char*) str );
        }
        _interfaces.insert( str, iface );
        s.readLine();
    }
 }
 short ONetwork::wirelessExtensionVersion()
 {
    return WIRELESS_EXT;
 }
 int ONetwork::count() const
 {
    return _interfaces.count();
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
@@ -1,31 +1,31 @@
 #ifndef OPIE_BIG_SCREEN_PRIVATE
 #define OPIE_BIG_SCREEN_PRIVATE
 /* QT */
 #include <qstring.h>
 class QWidget;
 namespace Opie {
 namespace Ui  {
-namespace Private{
+namespace Internal{
 struct OSplitterContainer
 {
    bool operator==( const OSplitterContainer& o) const
    {
        if (widget != o.widget ) return false;
        if (icon   != o.icon   ) return false;
        if (name   != o.name   ) return false;
        return true;
    }
    QWidget* widget;
    QString icon;
    QString name;
 };
 }
 }
 }
 #endif
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
@@ -15,49 +15,49 @@
 � � =_ � � � �+ � � =;=|`    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,
                             Boston, MA 02111-1307, USA.
 */
 #include "osplitter.h"
 /* OPIE */
 #include <opie2/otabwidget.h>
 /* QT */
 #include <qvaluelist.h>
 #include <qvbox.h>
 using namespace Opie::Ui;
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
 /**
 *
 * This is the constructor of OSplitter
 * You might want to call setSizeChange to tell
 * OSplitter to change its layout when a specefic
 * mark was crossed. OSplitter sets a default value.
 *
 * You cann add widget with addWidget to the OSplitter.
 * OSplitter supports also grouping of Splitters where they
 * can share one OTabBar in small screen mode. This can be used
 * for email clients like vies but see the example.
 *
 * @param orient The orientation wether to layout horizontal or vertical
 * @param parent The parent of this widget
 * @param name   The name passed on to QObject
 * @param fl     Additional widgets flags passed to QWidget
 *
 * @short single c'tor of the OSplitter
 */
 OSplitter::OSplitter( Orientation orient, QWidget* parent, const char* name, WFlags fl )
        : QFrame( parent, name, fl )
 {
    m_orient = orient;
@@ -376,63 +376,63 @@ void OSplitter::resizeEvent( QResizeEvent* res )
        mode = false;
    }
    else if ( (res->size().width() <= m_size_policy &&
               m_orient == Horizontal ) ||
              (res->size().height() <= m_size_policy &&
               m_orient == Vertical ) )
    {
        changeTab();
    }
    else if ( res->size().height() > m_size_policy &&
              m_orient == Vertical )
    {
        qWarning("Changng to vbox %s", name() );
        changeVBox();
        mode = false;
    }
    emit sizeChanged(mode, m_orient );
 }
 /*
 * 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) );
    if (m_parentTab )
        m_parentTab->addTab( wid, con.icon, con.name );
    else
        m_tabWidget->addTab( wid, con.icon, con.name );
 }
 /*
 * 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) );
 }
 /*
 * Removes a widget from the tab
 */
 void OSplitter::removeFromTab( QWidget* wid )
 {
    if (m_parentTab )
        m_parentTab->removePage( wid );
    else
        m_tabWidget->removePage( wid );
 }
 /*
 * switches over to a OTabWidget layout
 * it is recursive
 */
 void OSplitter::changeTab()
 {
    /* if we're the owner of the tab widget */
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
@@ -52,49 +52,49 @@ namespace Opie{
 namespace Ui  {
 class OTabWidget;
 /**
 *
 * If you've widgets that could be placed side by side but you think
 * on small resolutions is not enough place but it would really make sense
 * on bigger resolutions this class will help you.
 * You can add as many widgets you want to it. Set a poliy on which width/height it
 * should switch the layout.
 * You can either say to place widgets vertical or horizontal.
 * This class uses QHBox, QVBox and QTAbWidget internally.
 * OSplitter takes ownership of the widgets
 *
 * @since 1.2
 *
 * @short a small dynamically changing its layout to store two or more widgets side by side
 * @version 0.1
 * @author zecke
 */
 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();
    void setLabel( const QString& name );
    void setIconName( const QString& name );
    QString label()const;
    QString iconName()const;
    void setSizeChange( int width_height );
    void addWidget( OSplitter* splitter );
    void addWidget( QWidget* wid, const QString& icon, const QString& label );
    void removeWidget( QWidget* );
    void removeWidget( OSplitter* );
    void setCurrentWidget( QWidget* );
    void setCurrentWidget( const QString& label );
    void setCurrentWidget( int );
    QWidget* currentWidget()const;
 signals:
    /**
@@ -103,49 +103,49 @@ signals:
     */
    void currentChanged( QWidget* );
    /**
     * emitted whenever a border is crossed
     * true if in small screen mode
     * false if in bigscreen
     * this signal is emitted after the layout switch
     * @param b The layout mode
     * @param ori The orientation
     */
    void sizeChanged( bool b, Orientation ori);
 public:
    //    QSize sizeHint()const;
    //    QSize minimumSizeHint()const;
 protected:
    void resizeEvent( QResizeEvent* );
 private:
    /* true if OTabMode */
    bool layoutMode()const;
    //    void reparentAll();
    void setTabWidget( OTabWidget*);
-    void addToTab( const Opie::Ui::Private::OSplitterContainer& );
+    void addToTab( const Opie::Ui::Internal::OSplitterContainer& );
-    void addToBox( const Opie::Ui::Private::OSplitterContainer& );
+    void addToBox( const Opie::Ui::Internal::OSplitterContainer& );
    void removeFromTab( QWidget* );
    void changeTab();
    void changeHBox();
    void changeVBox();
    void commonChangeBox();
    QHBox *m_hbox;
    OTabWidget *m_tabWidget;
    OTabWidget *m_parentTab;
    Orientation m_orient;
    int m_size_policy;
    ContainerList m_container;
    QList<OSplitter> m_splitter;
    QString m_icon, m_name;
    struct Private;
    Private *d;
 };
 }
 }
 #endif
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,24 +1,25 @@
 /*
 � � � � � � � �=.            This file is part of the OPIE Project
 � � � � � � �.=l.            Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This library is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU Library General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       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,
@@ -34,53 +35,53 @@
 #include "ofileselector_p.h"
 /* OPIE */
 #include <opie2/ofileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/mimetype.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 /* QT */
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 #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 )
 {}
 OFileViewInterface::~OFileViewInterface()
 {}
 QString OFileViewInterface::name()const
 {
    return m_name;
 }
 void OFileViewInterface::setName( const QString& name )
 {
    m_name = name;
 }
 OFileSelector* OFileViewInterface::selector()const
 {
    return m_selector;
 }
 DocLnk OFileViewInterface::selectedDocument()const
 {
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
@@ -34,70 +34,70 @@
 #ifndef OFILESELECTOR_H
 #define OFILESELECTOR_H
 /* OPIE */
 #include <qpe/applnk.h>
 /* QT */
 #include <qlist.h>
 #include <qwidget.h>
 #include <qmap.h>
 #include <qvaluelist.h>
 #include <qstringlist.h>
 class QLineEdit;
 class QComboBox;
 class QWidgetStack;
 class QHBox;
 typedef QMap<QString, QStringList> MimeTypes;
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 class OFileViewInterface;
 class OFileViewFileListView;
 }
 /**
 * @short a dropin replacement for the FileSelector
 *
 * This class is first used insert the OFileDialog.
 * It supports multiple view and mimetype filtering for now.
 *
 * @see OFileDialog
 * @see FileSelector
 * @author zecke
 * @version 0.1
 */
 class OFileSelector : public QWidget
 {
    Q_OBJECT
-    friend class Private::OFileViewInterface;
+    friend class Internal::OFileViewInterface;
-    friend class Private::OFileViewFileListView;
+    friend class Internal::OFileViewFileListView;
 public:
    /**
     * The Mode of the Fileselector
     * Open = Open A File
     * Save = Save a File
     * FILESELECTOR = As A GUI in a screen to select a file
     */
    enum Mode { Open=1, Save=2, FileSelector=4, OPEN=1, SAVE=2, FILESELECTOR=4 };
    //    enum OldMode { OPEN=1, SAVE=2, FILESELECTOR = 4 };
    /**
     * Normal       = The old FileSelector
     * Extended     = Dir View
     * ExtendedAll  = Dir View with all hidden files
     * Default      = What the vendor considers best
     */
    enum Selector { Normal = 0, Extended=1,  ExtendedAll =2, Default=3,  NORMAL=0,EXTENDED=1, EXTENDED_ALL =2, DEFAULT=3 };
    //    enum OldSelector { NORMAL = 0, EXTENDED =1, EXTENDED_ALL = 2};
    OFileSelector(QWidget* parent, int mode, int selector,
                  const QString& dirName,
                  const QString& fileName,
                  const MimeTypes& mimetypes = MimeTypes(),
                  bool newVisible = FALSE, bool closeVisible = FALSE );
@@ -166,55 +166,55 @@ signals:
    * in the line edit
    */
    void ok();
    void cancel();
    /* used by the ViewInterface */
 private:
    bool showNew()const;
    bool showClose()const;
    MimeTypes mimeTypes()const;
    QStringList currentMimeType()const;
 private:
    /* inits the Widgets */
    void initUI();
    /* inits the MimeType ComboBox content + connects signals and slots */
    void initMime();
    /* init the Views :) */
    void initViews();
 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
+    Internal::OFileViewInterface* currentView() const; // returns the currentView
-    Private::OFileViewInterface* m_current; // here is the view saved
+    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
    QString m_startDir;
    int m_mode;
    int m_selector;
    struct Data; // used for future versions
    Data *d;
 private slots:
    void slotMimeTypeChanged();
    /* will set the text of the lineedit and emit a fileChanged signal */
    void slotDocLnkBridge( const DocLnk& );
    void slotFileBridge( const QString& );
    void slotViewChange( const QString& );
    bool eventFilter (QObject *o, QEvent *e);
 };
 }
 }
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
@@ -38,49 +38,49 @@
 #include <qstringlist.h>
 #include <qwidget.h>
 #include <qlistview.h>
 /*
 * How to avoid having really two different objects
 * for Extended and ExtendedAll
 * The only difference is the Lister...
 * a) static object?
 * b) leave some object inside the OFileSelector which can be used?
 * c) when switching views tell which view we want o have.. internally we can switch then
 *
 * I'll take c) -zecke
 */
 typedef QMap<QString, QStringList> MimeTypes;
 /* the View Interface */
 class QFileInfo;
 class QToolButton;
 namespace Opie{
 namespace Ui{
 class OFileSelector;
-namespace Private {
+namespace Internal {
 class OFileViewInterface
 {
 public:
    OFileViewInterface( OFileSelector* selector );
    virtual ~OFileViewInterface();
    virtual QString selectedName()const = 0;
    virtual QString selectedPath()const = 0;
    virtual QString directory()const = 0;
    virtual void reread() = 0;
    virtual int fileCount()const = 0;
    virtual DocLnk selectedDocument()const;
    virtual QWidget* widget( QWidget* parent) = 0;
    virtual void activate( const QString& );
    QString name()const;
 protected:
    OFileSelector* selector()const;
    void setName( const QString& );
    bool showNew()const;
    bool showClose()const;
    MimeTypes mimeTypes()const;
    QStringList currentMimeType()const;
    QString startDirectory()const;
 protected:
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
@@ -20,49 +20,49 @@
 ++= � -. � � .` � � .:       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,
                             Boston, MA 02111-1307, USA.
 */
 /* OPIE */
 #include <opie2/ofontselector.h>
 #include <qpe/fontdatabase.h>
 /* QT */
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qmultilineedit.h>
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 class OFontSelectorPrivate
 {
 public:
    QListBox *      m_font_family_list;
    QComboBox *     m_font_style_list;
    QComboBox *     m_font_size_list;
    QMultiLineEdit *m_preview;
    bool            m_pointbug : 1;
    FontDatabase    m_fdb;
 };
 class FontListItem : public QListBoxText
 {
 public:
    FontListItem ( const QString &t, const QStringList &styles, const QValueList<int> &sizes ) : QListBoxText()
    {
        m_name = t;
        m_styles = styles;
        m_sizes = sizes;
        QString str = t;
@@ -75,49 +75,49 @@ public:
        return m_name;
    }
    const QStringList &styles() const
    {
        return m_styles;
    }
    const QValueList<int> &sizes() const
    {
        return m_sizes;
    }
 private:
    QStringList m_styles;
    QValueList<int> m_sizes;
    QString m_name;
 };
 }
 }
 }
 using namespace Opie::Ui;
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
 static int findItemCB( QComboBox *box, const QString &str )
 {
    for ( int i = 0; i < box->count(); i++ )
    {
        if ( box->text ( i ) == str )
            return i;
    }
    return -1;
 }
 /* static same as anon. namespace */
 static int qt_version()
 {
    const char *qver = qVersion();
    return ( qver [0] - '0' ) * 100 + ( qver [2] - '0' ) * 10 + ( qver [4] - '0' );
 }
 /**
 * Constructs the Selector object
 * @param withpreview If a font preview should be given
 * @param parent The parent of the Font Selector
 * @param name The name of the object
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
@@ -16,49 +16,49 @@
 � � : .. � �.:, � � . . .    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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OFONTSELECTOR_H
 #define OFONTSELECTOR_H
 /* QT */
 #include <qwidget.h>
 class QListBox;
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 class OFontSelectorPrivate;
 }
 /**
 * This class lets you chose a Font out of a list of Fonts.
 * It can show a preview too. This selector will use all available
 * fonts
 *
 *
 * @short A widget to select a font
 * @see QWidget
 * @see QFont
 * @author Rober Griebl
 */
 class OFontSelector : public QWidget
 {
    Q_OBJECT
 public:
    OFontSelector ( bool withpreview, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    virtual ~OFontSelector ( );
    bool selectedFont ( QString &family, QString &style, int &size );
    bool selectedFont ( QString &family, QString &style, int &size, QString &charset );
@@ -75,32 +75,32 @@ public:
 signals:
    /**
     * This signal gets emitted when a font got chosen
     */
    void fontSelected ( const QFont & );
 protected slots:
    /** @internal */
    virtual void fontFamilyClicked ( int );
    /** @internal */
    virtual void fontStyleClicked ( int );
    /** @internal */
    virtual void fontSizeClicked ( int );
 protected:
    virtual void resizeEvent ( QResizeEvent *re );
 private:
    void loadFonts ( QListBox * );
    void changeFont ( );
 private:
-    Private::OFontSelectorPrivate *d;
+    Internal::OFontSelectorPrivate *d;
 };
 }
 }
 #endif
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
@@ -453,119 +453,120 @@ bool OKeyConfigItem::operator!=( const OKeyConfigItem& conf )const {
 OKeyConfigManager::OKeyConfigManager( Opie::Core::OConfig* conf,
                                      const QString& group,
                                      const OKeyPair::List& black,
                                      bool grabkeyboard, QObject* par,
                                      const char* name)
    : QObject( par, name ), m_conf( conf ), m_group( group ),
      m_blackKeys( black ), m_grab( grabkeyboard ), m_map( 0 ){
    if ( m_grab )
        QPEApplication::grabKeyboard();
 }
 /**
 * Destructor
 */
 OKeyConfigManager::~OKeyConfigManager() {
    if ( m_grab )
        QPEApplication::ungrabKeyboard();
 }
 /**
 * 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
     */
    int key, mod;
    for( OKeyConfigItem::List::Iterator it = m_keys.begin(); it != m_keys.end(); ++it ) {
        key = m_conf->readNumEntry( (*it).configKey()+"key", (*it).defaultKeyPair().keycode()  );
        mod = m_conf->readNumEntry( (*it).configKey()+"mod", (*it).defaultKeyPair().modifier() );
        OKeyPair okey( key, mod );
        if (  !m_blackKeys.contains( okey ) && key != -1  && mod != -1 )
            (*it).setKeyPair( OKeyPair(key, mod) );
        else
            (*it).setKeyPair( OKeyPair::emptyKey() );
    }
    delete m_map; m_map = 0;
 }
 /**
 * 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
     */
    for( OKeyConfigItem::List::Iterator it = m_keys.begin();it != m_keys.end(); ++it ) {
        /* skip empty items */
        if ( (*it).isEmpty() )
            continue;
        OKeyPair pair = (*it).keyPair();
        OKeyPair deft = (*it).defaultKeyPair();
        /*
         * don't write if it is the default setting
         * FIXME allow to remove Keys from config
        if (  (pair.keycode() == deft.keycode()) &&
              (pair.modifier()== deft.modifier() ) )
            return;
        */
        m_conf->writeEntry((*it).configKey()+"key", pair.keycode()  );
        m_conf->writeEntry((*it).configKey()+"mod", pair.modifier() );
    }
 }
 /**
 * This is function uses a QMap internally  but you can have the same keycode
 * with different modifier key. The behaviour is undefined if you add a OKeyConfigItem
 * with same keycode and modifier key. The GUI takes care that a user can't
 * cofigure two keys.
 *
 * Make sure you call e->ignore if you don't want to handle this event
 */
 OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) {
   /*
    * Fix Up issues with Qt/E, my keybard, and virtual input
    * methods
    * First my Keyboard delivers 256,512,1024 for shift/ctrl/alt instead of the button state
    * Also key() on virtual inputmethods are zero and only ascii. We need to fix upper and lower
    * 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() )
        return OKeyConfigItem();
    OKeyConfigItem item;
    for ( OKeyConfigItem::List::Iterator it = _keyList.begin(); it != _keyList.end();
          ++it ) {
        if ( (*it).keyPair().modifier() == mod ) {
            item = *it;
            break;
        }
    }
    return item;
 }
 /**
 * Return the associated id of the item or -1 if no item
 * matched the key
 *
 * @see handleKeyEvent
 */
@@ -695,49 +696,49 @@ OKeyConfigItem::List OKeyConfigManager::keyList( int keycode) {
              it!= m_keys.end(); ++it ) {
            bool add = true;
            /* see if this key is blocked */
            OKeyPair pair = (*it).keyPair();
            for ( OKeyPair::List::Iterator pairIt = m_blackKeys.begin();
                  pairIt != m_blackKeys.end(); ++pairIt ) {
                if ( (*pairIt).keycode()  == pair.keycode() &&
                     (*pairIt).modifier() == pair.modifier() ) {
                    add = false;
                    break;
                }
            }
            /* check if we added it */
            if ( add )
                (*m_map)[pair.keycode()].append( *it );
        }
    }
    return (*m_map)[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 )  {
        m_origItem = item;
        setItem( item );
    }
    OKeyListViewItem::~OKeyListViewItem() {}
    OKeyConfigItem &OKeyListViewItem::item(){
        return m_item;
    }
    OKeyConfigItem  OKeyListViewItem::origItem() const{
        return m_origItem;
    }
    OKeyConfigManager* OKeyListViewItem::manager() {
        return m_manager;
    }
    void OKeyListViewItem::setItem( const OKeyConfigItem& item ) {
        m_item = item;
        setPixmap( 0, m_item.pixmap() );
        setText  ( 1, m_item.text() );
        m_item.keyPair().isEmpty() ? setText( 2, QObject::tr( "None" ) ) :
                                     setText( 2, keyToString( m_item.keyPair() ) );
        m_item.defaultKeyPair().isEmpty() ? setText( 3, QObject::tr( "None" ) ) :
@@ -917,214 +918,214 @@ void OKeyConfigWidget::initUi() {
 /**
 * Set the ChangeMode.
 * You need to call this function prior to load
 * If you call this function past load the behaviour is undefined
 * But caling load again is safe
 */
 void OKeyConfigWidget::setChangeMode( enum ChangeMode mode) {
    m_mode = mode;
 }
 /**
 * return the current mode
 */
 OKeyConfigWidget::ChangeMode OKeyConfigWidget::changeMode()const {
    return m_mode;
 }
 /**
 * 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);
 }
 /**
 * 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 );
    }
 }
 /**
 * Saves if in Queue Mode. It'll update the supplied
 * OKeyConfigManager objects.
 * If in Queue mode it'll just return
 */
 void OKeyConfigWidget::save() {
    /*
     * Iterate over all config items
     */
    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() );
        }
        ++it;
    }
 }
 /**
 * @internal
 */
 void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
    if ( !_item || !_item->parent() ) {
        m_box->setEnabled( false );
        m_none->setChecked( true );
        m_btn ->setEnabled( false );
        m_def ->setChecked( false );
        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() ) {
            m_none->setChecked( true );
            m_btn ->setEnabled( false );
            m_def ->setChecked( false );
            m_cus ->setChecked( false );
        }else {
            m_none->setChecked( false );
            m_cus ->setChecked( true );
            m_btn ->setEnabled( true );
            m_def ->setChecked( false );
        }
    }
 }
 void OKeyConfigWidget::slotNoKey() {
    m_none->setChecked( true );
    m_cus ->setChecked( false );
    m_btn ->setEnabled( false );
    m_def ->setChecked( false );
    if ( !m_view->currentItem() || !m_view->currentItem()->parent() )
        return;
    /*
     * 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() );
 }
 void OKeyConfigWidget::slotDefaultKey() {
    m_none->setChecked( false );
    m_cus ->setChecked( false );
    m_btn ->setEnabled( false );
    m_def ->setChecked( true );
    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() );
 }
 void OKeyConfigWidget::slotCustomKey() {
    m_cus ->setChecked( true );
    m_btn ->setEnabled( true );
    m_def ->setChecked( false );
    m_none->setChecked( false );
    if ( !m_view->currentItem() || !m_view->currentItem()->parent() )
        return;
 }
 void OKeyConfigWidget::slotConfigure() {
    if ( !m_view->currentItem() || !m_view->currentItem()->parent() )
        return;
   /* FIXME make use of OModalHelper */
    OKeyChooserConfigDialog dlg( this, "Dialog Name", true );
    dlg.setCaption(tr("Configure Key"));
    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 ) {
        /* black list matched */
        if ( *it == newItem ) {
            QMessageBox::warning( 0, tr("Key is on BlackList" ),
                                  tr("<qt>The Key you choose is on the black list "
                                     "and may not be used with this manager. Please "
                                     "use a different key.</qt>" ) );
            return false;
        }
    }
    /* no we need to check the other items which is dog slow */
    QListViewItemIterator it( item->parent() );
    while ( it.current() ) {
        /* 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"
                                         "using a different key.</qt>" ) );
                return false;
            }
        }
        ++it;
    }
    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
     * check if another item uses this key which is o(n) at least
     */
    if ( !newItem.isEmpty() && !sanityCheck(item, newItem ))
        return;
    /*
    * If immediate we need to remove and readd the key
    */
    if ( m_mode == Imediate )
        item->manager()->removeKeyConfig( item->item() );
    item->item().setKeyPair( newItem );
    item->updateText();
    if ( m_mode == Imediate )
        item->manager()->addKeyConfig( item->item() );
 }
@@ -1144,104 +1145,104 @@ OKeyChooserConfigDialog::OKeyChooserConfigDialog( QWidget* par, const char* nam,
    m_lbl = new QLabel( this );
    lay->addWidget( m_lbl );
    m_lbl->setFocusPolicy( NoFocus );
    m_timer = new QTimer( this );
    connect(m_timer, SIGNAL(timeout()),
            this, SLOT(slotTimeUp()) );
 }
 OKeyChooserConfigDialog::~OKeyChooserConfigDialog() {
 }
 Opie::Ui::OKeyPair OKeyChooserConfigDialog::keyPair()const{
    return m_keyPair;
 }
 void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
    QDialog::keyPressEvent( ev );
    if ( ev->isAutoRepeat() )
        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
     */
    if ( !m_virtKey && !ev->key()) {
        m_virtKey = true;
        m_keyPair = OKeyPair( key, mod );
    }else{
        mod = 0;
        switch( key ) {
        case Qt::Key_Control:
            mod = Qt::ControlButton;
            break;
        case Qt::Key_Shift:
            mod = Qt::ShiftButton;
            break;
        case Qt::Key_Alt:
            mod = Qt::AltButton;
            break;
        default:
            break;
        }
        if (mod ) {
            m_mod |= mod;
            key = 0;
        }else
            m_key = key;
        if ( ( !mod || m_key || key ) && !m_timer->isActive() )
            m_timer->start( 150, true );
        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 ) );
 }
 void OKeyChooserConfigDialog::keyReleaseEvent( QKeyEvent* ev ) {
    m_timer->stop();
    QDialog::keyPressEvent( ev );
    if ( ev->isAutoRepeat() )
        return;
    if ( m_virtKey && !ev->key()) {
        m_virtKey = false;
        slotTimeUp();
    }else {
        int mod = 0;
        int key = ev->key();
        switch( key ) {
        case Qt::Key_Control:
            mod = Qt::ControlButton;
            break;
        case Qt::Key_Shift:
            mod = Qt::ShiftButton;
            break;
        case Qt::Key_Alt:
            mod = Qt::AltButton;
            break;
        default:
            break;
        }
        if (mod )
            m_mod &= ~mod;
        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 ) );
    }
 }
 void OKeyChooserConfigDialog::slotTimeUp() {
    m_mod = m_key = 0;
    QTimer::singleShot(0, this, SIGNAL(keyCaptured()) );
 }
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
@@ -4,49 +4,49 @@
 */
 #ifndef ODP_KEY_CONFIG_WIDGET_H
 #define ODP_KEY_CONFIG_WIDGET_H
 #include <opie2/oconfig.h>
 #include <opie2/odevice.h>
 #include <qstring.h>
 #include <qpixmap.h>
 #include <qcstring.h>
 #include <qhbox.h>
 #include <qvaluelist.h>
 class QKeyEvent;
 class QLabel;
 class QPushButton;
 class QListViewItem;
 class QRadioButton;
 class QTimer;
 namespace Opie {
 namespace Ui {
-namespace Private {
+namespace Internal {
    class OKeyConfigWidgetPrivate;
    typedef QValueList<OKeyConfigWidgetPrivate> OKeyConfigWidgetPrivateList;
    class OKeyListViewItem;
 }
    class OListViewItem;
    class OListView;
 /**
 * \brief small class representing a Key with possible modifiers
 * This class holds information about key code and possible
 * modifier state. That is the lowest level of the key input
 * functions.
 * There are also static methods to get special keys.
 * OKeyPair will be used with \see OKeyConfigItem
 *
 * @since 1.2
 */
 class OKeyPair {
 public:
    typedef QValueList<OKeyPair> List;
    OKeyPair( int key = -1, int modifier = -1);
    ~OKeyPair();
    bool operator==( const OKeyPair& )const;
@@ -232,55 +232,55 @@ public:
    /**
     * Immediate Apply the change directly to the underlying OKeyConfigManager
     * Queue Save all items and then apply when you save()
     */
    enum ChangeMode { Imediate, Queue };
    OKeyConfigWidget( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~OKeyConfigWidget();
    void setChangeMode( enum ChangeMode );
    ChangeMode changeMode()const;
    void insert( const QString& name, OKeyConfigManager* );
    void load();
    void save();
 private slots:
    void slotListViewItem(  QListViewItem* );
    void slotNoKey();
    void slotDefaultKey();
    void slotCustomKey();
    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;
    QWidget* m_box;
    ChangeMode m_mode;
    class Private;
    Private *d;
 };
 /**
 * This is a small dialog that allows you to
 * capture a key sequence.
 * If you want it to close after a key was captured you
 * can use this code snippet.
 *
 * \code
 *  OKeyChooserConfigDialog diag(0,0,true);
 *  connect(&diag,SIGNAL(keyCaptured()),
 *         this,SLOT(accept()));
 *  if( QPEApplication::execDialog(&diag) == QDialog::Accept ){
 *     take_the_key_and_do_something
 *  }
 *
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
@@ -1,33 +1,33 @@
 /*
 * Only Internal implemented in the same .cpp file anyway
 */
 #include <opie2/olistview.h>
 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 {
    public:
        OKeyListViewItem( const OKeyConfigItem& item, OKeyConfigManager*, Opie::Ui::OListViewItem* parent);
        ~OKeyListViewItem();
        void setDefault();
        OKeyConfigItem& item();
        OKeyConfigItem origItem()const;
        void setItem( const OKeyConfigItem& item );
        void updateText();
        OKeyConfigManager *manager();
    private:
        OKeyConfigItem m_item;
        OKeyConfigItem m_origItem;
        OKeyConfigManager* m_manager;
    };
 }
 }
 }
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
@@ -20,49 +20,49 @@
 ..}^=.= � � � = � � � ;      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,
                             Boston, MA 02111-1307, USA.
 */
 #ifndef OTASKBARAPPLET_H
 #define OTASKBARAPPLET_H
 #include <qpe/taskbarappletinterface.h>
 #include <qpe/qcom.h>
 #include <qwidget.h>
 class QMouseEvent;
 namespace Opie {
 namespace Ui   {
-namespace Private {
+namespace Internal {
 /*======================================================================================
 * OTaskbarAppletWrapper
 *======================================================================================*/
 class OTaskbarAppletWrapperPrivate;
 template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
 {
  public:
    OTaskbarAppletWrapper():_applet( 0 )
    {
    }
    virtual ~OTaskbarAppletWrapper()
    {
        delete _applet;
    }
    QRESULT queryInterface( const QUuid& uuid, QUnknownInterface** iface )
    {
        qDebug( "OTaskbarAppletWrapper::queryInterface()" );
        *iface = 0;
        if ( uuid == IID_QUnknown )
            *iface = this;
        else if ( uuid == IID_TaskbarApplet )
@@ -101,29 +101,29 @@ template<class T> class OTaskbarAppletWrapper : public TaskbarAppletInterface
 // Having OTaskBarApplet reside in libopieui2 is not possible
 // until we link the launcher binary against libopieui2 -
 // otherwise the necessary symbols are not present, when
 // the dynamic loader [dlopen] tries to resolve an applet which
 // inherits OTaskbarApplet
 class OTaskbarApplet : public QWidget
 {
  public:
    OTaskbarApplet( QWidget* parent, const char* name = 0 );
    virtual ~OTaskbarApplet();
  protected:
    virtual void popup( QWidget* widget );
 private:
    class Private;
    Private *d;
 };
 }
 }
 #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