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 @@ -83,7 +83,7 @@ ODevice *ODevice::inst() qDebug( "ODevice() - found '%s'", (const char*) line ); - if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus(); - else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ(); - else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad(); - else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada(); - else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses(); + if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); + else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); + else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); + else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); + else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); else qWarning( "ODevice() - unknown hardware - using default." ); diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 177fd4c..2efcd3a 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp @@ -57,3 +57,3 @@ using namespace Opie::Core; -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h index 4f4af46..968f715 100644 --- a/libopie2/opiecore/device/odevice_ipaq.h +++ b/libopie2/opiecore/device/odevice_ipaq.h @@ -39,3 +39,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp index b79b0b5..eaa93ca 100644 --- a/libopie2/opiecore/device/odevice_jornada.cpp +++ b/libopie2/opiecore/device/odevice_jornada.cpp @@ -79,3 +79,3 @@ typedef struct { -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; diff --git a/libopie2/opiecore/device/odevice_jornada.h b/libopie2/opiecore/device/odevice_jornada.h index c37d75e..e2e67af 100644 --- a/libopie2/opiecore/device/odevice_jornada.h +++ b/libopie2/opiecore/device/odevice_jornada.h @@ -36,3 +36,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class Jornada : public ODevice diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp index 77de8c5..10b7b61 100644 --- a/libopie2/opiecore/device/odevice_ramses.cpp +++ b/libopie2/opiecore/device/odevice_ramses.cpp @@ -56,3 +56,3 @@ using namespace Opie::Core; -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; diff --git a/libopie2/opiecore/device/odevice_ramses.h b/libopie2/opiecore/device/odevice_ramses.h index e673b1a..aea9e2a 100644 --- a/libopie2/opiecore/device/odevice_ramses.h +++ b/libopie2/opiecore/device/odevice_ramses.h @@ -38,3 +38,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp index 80d40a3..7d79ef5 100644 --- a/libopie2/opiecore/device/odevice_simpad.cpp +++ b/libopie2/opiecore/device/odevice_simpad.cpp @@ -56,3 +56,3 @@ _;:, .> :=|. This program is free software; you can using namespace Opie::Core; -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h index 1848151..3d5acb5 100644 --- a/libopie2/opiecore/device/odevice_simpad.h +++ b/libopie2/opiecore/device/odevice_simpad.h @@ -39,3 +39,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp index f7a4025..4e9f227 100644 --- a/libopie2/opiecore/device/odevice_yopy.cpp +++ b/libopie2/opiecore/device/odevice_yopy.cpp @@ -56,3 +56,3 @@ _;:, .> :=|. This program is free software; you can using namespace Opie::Core; -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; diff --git a/libopie2/opiecore/device/odevice_yopy.h b/libopie2/opiecore/device/odevice_yopy.h index 7d85479..6e1db88 100644 --- a/libopie2/opiecore/device/odevice_yopy.h +++ b/libopie2/opiecore/device/odevice_yopy.h @@ -36,3 +36,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class Yopy : public ODevice diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 0d21f26..000d29c 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp @@ -56,3 +56,3 @@ _;:, .> :=|. This program is free software; you can using namespace Opie::Core; -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; @@ -389,3 +389,3 @@ void Zaurus::buzzer ( int sound ) } - } else { + } else { int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK ); @@ -397,3 +397,3 @@ void Zaurus::buzzer ( int sound ) - } + } #endif @@ -608,5 +608,5 @@ Transformation Zaurus::rotation() const - if (retval == 2 ) + if (retval == 2 ) rot = Rot0; - else + else rot = Rot270; diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h index ffb648f..a0b1787 100644 --- a/libopie2/opiecore/device/odevice_zaurus.h +++ b/libopie2/opiecore/device/odevice_zaurus.h @@ -50,3 +50,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class Zaurus : public ODevice diff --git a/libopie2/opiecore/device/odevicebutton.cpp b/libopie2/opiecore/device/odevicebutton.cpp index a081b7f..6974b30 100644 --- a/libopie2/opiecore/device/odevicebutton.cpp +++ b/libopie2/opiecore/device/odevicebutton.cpp @@ -38,3 +38,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { @@ -50,3 +50,3 @@ class OQCopMessageData using namespace Opie::Core; -using namespace Opie::Core::Private; +using Opie::Core::Internal::OQCopMessageData; @@ -134,3 +134,3 @@ void OQCopMessage::setData ( const QByteArray &data ) \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 @@ -140,3 +140,3 @@ void OQCopMessage::setData ( const QByteArray &data ) to the user in help documentation. - + \ingroup qtopiaemb diff --git a/libopie2/opiecore/device/odevicebutton.h b/libopie2/opiecore/device/odevicebutton.h index 4000144..e3f9ba9 100644 --- a/libopie2/opiecore/device/odevicebutton.h +++ b/libopie2/opiecore/device/odevicebutton.h @@ -28,3 +28,3 @@ namespace Opie{ namespace Core{ -namespace Private { +namespace Internal { class OQCopMessageData; @@ -56,3 +56,3 @@ private: - Private::OQCopMessageData *d; + Internal::OQCopMessageData *d; class Private; diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index e2f6e82..ac7cd5a 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp @@ -47,3 +47,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class OApplicationPrivate @@ -93,3 +93,3 @@ void OApplication::init() { - d = new Private::OApplicationPrivate(); + d = new Internal::OApplicationPrivate(); if ( !OApplication::_instance ) diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index c1e32a6..337fe5e 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -39,3 +39,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class OApplicationPrivate; @@ -104,3 +104,3 @@ class OApplication : public QPEApplication OConfig* _config; - Private::OApplicationPrivate* d; + Internal::OApplicationPrivate* d; }; diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h index 29c1f86..8c3060c 100644 --- a/libopie2/opiecore/oconfig.h +++ b/libopie2/opiecore/oconfig.h @@ -69,3 +69,3 @@ class OConfig : public Config */ - const QString& group() { return git.key(); }; + const QString& group()const { return git.key(); }; /** @@ -78,3 +78,3 @@ class OConfig : public Config QFont readFontEntry( const QString& key, const QFont* pDefault ) const; - + private: @@ -146,3 +146,3 @@ class OConfigGroupSaver OConfigGroupSaver& operator=( const OConfigGroupSaver& ); - + class Private; diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp index cac985b..f258faa 100644 --- a/libopie2/opiecore/odebug.cpp +++ b/libopie2/opiecore/odebug.cpp @@ -69,2 +69,11 @@ namespace Opie { namespace Core { +namespace Internal { +class DebugBackend { +}; + +static DebugBackend *backEnd = 0; +} +static void clean_up_routine() { + delete Internal::backEnd; +} /*====================================================================================== @@ -624,2 +633,2 @@ void odClearDebugConfig() } -}
\ 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 @@ -2,3 +2,3 @@ Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at) - + This library is free software; you can redistribute it and/or @@ -7,3 +7,3 @@ version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, @@ -12,3 +12,3 @@ Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License @@ -43,3 +43,3 @@ -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; diff --git a/libopie2/opiecore/oprocctrl.h b/libopie2/opiecore/oprocctrl.h index 4922ba2..ea00859 100644 --- a/libopie2/opiecore/oprocctrl.h +++ b/libopie2/opiecore/oprocctrl.h @@ -2,3 +2,3 @@ Copyright (C) 1997 Christian Czezakte (e9025461@student.tuwien.ac.at) - + This library is free software; you can redistribute it and/or @@ -7,3 +7,3 @@ version 2 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, @@ -12,3 +12,3 @@ Library General Public License for more details. - + You should have received a copy of the GNU Library General Public License @@ -41,3 +41,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class OProcessControllerPrivate; diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp index dfde74a..b3f9724 100644 --- a/libopie2/opiecore/oprocess.cpp +++ b/libopie2/opiecore/oprocess.cpp @@ -63,3 +63,3 @@ _;:, .> :=|. This program is free software; you can -using namespace Opie::Core::Private; +using namespace Opie::Core::Internal; @@ -67,3 +67,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class OProcessPrivate diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h index e23f98c..be1436c 100644 --- a/libopie2/opiecore/oprocess.h +++ b/libopie2/opiecore/oprocess.h @@ -48,3 +48,3 @@ namespace Opie { namespace Core { -namespace Private { +namespace Internal { class OProcessController; @@ -725,3 +725,3 @@ protected: */ - friend class Private::OProcessController; + friend class Internal::OProcessController; @@ -754,3 +754,3 @@ private: void init ( ); - Private::OProcessPrivate *d; + Internal::OProcessPrivate *d; }; 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 @@ -43,3 +43,3 @@ using namespace Opie::DB; -using namespace Opie::DB::Private; +using namespace Opie::DB::Internal; 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 @@ -11,3 +11,3 @@ namespace Opie { namespace DB { -namespace Private { +namespace Internal { 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 @@ -35,3 +35,3 @@ OSQLDriver* OSQLManager::load( const QString& name ) { if ( name == "SQLite" ) { - driver = new Opie::DB::Private::OSQLiteDriver; + driver = new Opie::DB::Internal::OSQLiteDriver; } @@ -46,3 +46,3 @@ OSQLDriver* OSQLManager::load( const OSQLBackEnd& end) { end.name() == "SQLite" ) - driver = new Opie::DB::Private::OSQLiteDriver; + driver = new Opie::DB::Internal::OSQLiteDriver; 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 @@ -13,3 +13,3 @@ namespace Opie { namespace Net { -namespace Private { +namespace Internal { 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 @@ -13,3 +13,3 @@ namespace Opie { namespace Net { -namespace Private { +namespace Internal { 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 @@ -192,3 +192,3 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value ) -namespace Private { +namespace Internal { /*====================================================================================== 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 @@ -134,3 +134,3 @@ class OPrivateIOCTL : public QObject -namespace Private { +namespace Internal { void dumpBytes( const unsigned char* data, int num ); 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 @@ -62,3 +62,3 @@ using namespace Opie::Core;
-using namespace Opie::Net::Private;
+using namespace Opie::Net::Internal;
DebugMapper* debugmapper = new DebugMapper();
@@ -105,3 +105,3 @@ void ONetwork::synchronize() odebug << "ONetwork: found interface '" << str << "'" << oendl;
- ONetworkInterface* iface;
+ ONetworkInterface* iface = 0;
if ( isWirelessInterface( str ) )
diff --git a/libopie2/opieui/big-screen/obigscreen_p.h b/libopie2/opieui/big-screen/obigscreen_p.h index a85a56c..baa2bbc 100644 --- a/libopie2/opieui/big-screen/obigscreen_p.h +++ b/libopie2/opieui/big-screen/obigscreen_p.h @@ -10,3 +10,3 @@ namespace Opie { namespace Ui { -namespace Private{ +namespace Internal{ 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 @@ -38,3 +38,3 @@ using namespace Opie::Ui; -using namespace Opie::Ui::Private; +using namespace Opie::Ui::Internal; @@ -399,3 +399,3 @@ void OSplitter::resizeEvent( QResizeEvent* res ) */ -void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con ) +void OSplitter::addToTab( const Opie::Ui::Internal::OSplitterContainer& con ) { @@ -413,3 +413,3 @@ void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con ) */ -void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con ) +void OSplitter::addToBox( const Opie::Ui::Internal::OSplitterContainer& con ) { 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 @@ -75,3 +75,3 @@ class OSplitter : public QFrame public: - typedef QValueList<Opie::Ui::Private::OSplitterContainer> ContainerList; + typedef QValueList<Opie::Ui::Internal::OSplitterContainer> ContainerList; OSplitter( Qt::Orientation = Horizontal, QWidget *parent = 0, @@ -126,4 +126,4 @@ private: void setTabWidget( OTabWidget*); - void addToTab( const Opie::Ui::Private::OSplitterContainer& ); - void addToBox( const Opie::Ui::Private::OSplitterContainer& ); + void addToTab( const Opie::Ui::Internal::OSplitterContainer& ); + void addToBox( const Opie::Ui::Internal::OSplitterContainer& ); void removeFromTab( QWidget* ); 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 +1,2 @@ + /* @@ -57,3 +58,3 @@ -using namespace Opie::Ui::Private; +using namespace Opie::Ui::Internal; @@ -61,3 +62,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { OFileViewInterface::OFileViewInterface( OFileSelector* selector ) diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h index 2205963..8bcd9ee 100644 --- a/libopie2/opieui/fileselector/ofileselector.h +++ b/libopie2/opieui/fileselector/ofileselector.h @@ -57,3 +57,3 @@ namespace Ui { -namespace Private { +namespace Internal { class OFileViewInterface; @@ -77,4 +77,4 @@ class OFileSelector : public QWidget Q_OBJECT - friend class Private::OFileViewInterface; - friend class Private::OFileViewFileListView; + friend class Internal::OFileViewInterface; + friend class Internal::OFileViewFileListView; @@ -189,4 +189,4 @@ private: QWidgetStack* m_stack; // our widget stack which will contain the views - Private::OFileViewInterface* currentView() const; // returns the currentView - Private::OFileViewInterface* m_current; // here is the view saved + Internal::OFileViewInterface* currentView() const; // returns the currentView + Internal::OFileViewInterface* m_current; // here is the view saved bool m_shNew : 1; // should we show New? @@ -195,3 +195,3 @@ private: - 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 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 @@ -61,3 +61,3 @@ namespace Ui{ class OFileSelector; -namespace Private { +namespace Internal { 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 @@ -43,3 +43,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { @@ -98,3 +98,3 @@ private: using namespace Opie::Ui; -using namespace Opie::Ui::Private; +using namespace Opie::Ui::Internal; 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 @@ -39,3 +39,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { class OFontSelectorPrivate; @@ -98,3 +98,3 @@ private: private: - Private::OFontSelectorPrivate *d; + Internal::OFontSelectorPrivate *d; }; diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp index ef6d713..eb7acbd 100644 --- a/libopie2/opieui/okeyconfigwidget.cpp +++ b/libopie2/opieui/okeyconfigwidget.cpp @@ -476,3 +476,3 @@ OKeyConfigManager::~OKeyConfigManager() { * 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. * @@ -481,3 +481,3 @@ OKeyConfigManager::~OKeyConfigManager() { void OKeyConfigManager::load() { - m_conf->setGroup( m_group ); + Opie::Core::OConfigGroupSaver( m_conf, m_group ); @@ -502,6 +502,7 @@ void OKeyConfigManager::load() { * We will save the current configuration - * to the OConfig. We will change the group. + * to the OConfig. We will change the group but restore + * to the previous */ void OKeyConfigManager::save() { - m_conf->setGroup( m_group ); + Opie::Core::OConfigGroupSaver( m_conf, m_group ); @@ -546,3 +547,3 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) { int key, mod; - Opie::Ui::Private::fixupKeys( key, mod, e ); + Opie::Ui::Internal::fixupKeys( key, mod, e ); @@ -718,3 +719,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { @@ -940,3 +941,3 @@ OKeyConfigWidget::ChangeMode OKeyConfigWidget::changeMode()const { 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); @@ -949,3 +950,3 @@ void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) { 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 ) { @@ -954,3 +955,3 @@ void OKeyConfigWidget::load() { 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 ); @@ -971,3 +972,3 @@ void OKeyConfigWidget::save() { 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(); @@ -995,3 +996,3 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) { 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(); @@ -1026,3 +1027,3 @@ void OKeyConfigWidget::slotNoKey() { */ - 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() ); @@ -1039,3 +1040,3 @@ void OKeyConfigWidget::slotDefaultKey() { - 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() ); @@ -1065,3 +1066,3 @@ void OKeyConfigWidget::slotConfigure() { 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() ); @@ -1072,3 +1073,3 @@ void OKeyConfigWidget::slotConfigure() { -bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item, +bool OKeyConfigWidget::sanityCheck( Opie::Ui::Internal::OKeyListViewItem* item, const OKeyPair& newItem ) { @@ -1091,3 +1092,3 @@ bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* 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" ), @@ -1105,3 +1106,3 @@ bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item, -void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item, +void OKeyConfigWidget::updateItem( Opie::Ui::Internal::OKeyListViewItem *item, const OKeyPair& newItem) { @@ -1167,3 +1168,3 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) { int mod, key; - Opie::Ui::Private::fixupKeys( key,mod, ev ); + Opie::Ui::Internal::fixupKeys( key,mod, ev ); @@ -1202,3 +1203,3 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) { - m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) ); + m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) ); @@ -1238,3 +1239,3 @@ void OKeyChooserConfigDialog::keyReleaseEvent( QKeyEvent* ev ) { m_keyPair = OKeyPair( m_key, m_mod ); - m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) ); + m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) ); } 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 @@ -27,3 +27,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { class OKeyConfigWidgetPrivate; @@ -255,5 +255,5 @@ private slots: 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); @@ -261,3 +261,3 @@ private: Opie::Ui::OListView *m_view; - Opie::Ui::Private::OKeyConfigWidgetPrivateList m_list; + Opie::Ui::Internal::OKeyConfigWidgetPrivateList m_list; QLabel *m_lbl; 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 @@ -8,3 +8,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { static QString keyToString( const OKeyPair& ); 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 @@ -43,3 +43,3 @@ namespace Opie { namespace Ui { -namespace Private { +namespace Internal { /*====================================================================================== @@ -124,3 +124,3 @@ private: Q_EXPORT_INTERFACE() { \ - Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \ + Q_CREATE_INSTANCE( Opie::Ui::Internal::OTaskbarAppletWrapper<AppLet> ) \ } |