summaryrefslogtreecommitdiff
path: root/libopie2/opieui
Side-by-side diff
Diffstat (limited to 'libopie2/opieui') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opieui/big-screen/obigscreen_p.h2
-rw-r--r--libopie2/opieui/big-screen/osplitter.cpp6
-rw-r--r--libopie2/opieui/big-screen/osplitter.h6
-rw-r--r--libopie2/opieui/fileselector/ofileselector.cpp5
-rw-r--r--libopie2/opieui/fileselector/ofileselector.h12
-rw-r--r--libopie2/opieui/fileselector/ofileselector_p.h2
-rw-r--r--libopie2/opieui/ofontselector.cpp4
-rw-r--r--libopie2/opieui/ofontselector.h4
-rw-r--r--libopie2/opieui/okeyconfigwidget.cpp41
-rw-r--r--libopie2/opieui/okeyconfigwidget.h8
-rw-r--r--libopie2/opieui/okeyconfigwidget_p.h2
-rw-r--r--libopie2/opieui/otaskbarapplet.h4
12 files changed, 49 insertions, 47 deletions
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> ) \
}