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
@@ -9,5 +9,5 @@ class QWidget;
namespace Opie {
namespace Ui {
-namespace Private{
+namespace Internal{
struct OSplitterContainer
diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index bcfd3a6..f0287ed 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -37,5 +37,5 @@
using namespace Opie::Ui;
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
/**
@@ -398,5 +398,5 @@ void OSplitter::resizeEvent( QResizeEvent* res )
* 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;
@@ -412,5 +412,5 @@ void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
* adds a container to the box
*/
-void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con )
+void OSplitter::addToBox( const Opie::Ui::Internal::OSplitterContainer& con )
{
QWidget* wid = con.widget;
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
@@ -74,5 +74,5 @@ 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 );
@@ -125,6 +125,6 @@ private:
// void reparentAll();
void setTabWidget( OTabWidget*);
- void addToTab( const Opie::Ui::Private::OSplitterContainer& );
- void addToBox( const Opie::Ui::Private::OSplitterContainer& );
+ void addToTab( const Opie::Ui::Internal::OSplitterContainer& );
+ void addToBox( const Opie::Ui::Internal::OSplitterContainer& );
void removeFromTab( QWidget* );
void changeTab();
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,2 +1,3 @@
+
/*
               =. This file is part of the OPIE Project
@@ -56,9 +57,9 @@
#include <qobjectlist.h>
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
OFileViewInterface::OFileViewInterface( OFileSelector* selector )
: m_selector( selector )
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index 2205963..8bcd9ee 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -56,5 +56,5 @@ namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OFileViewInterface;
class OFileViewFileListView;
@@ -76,6 +76,6 @@ class OFileSelector : public QWidget
{
Q_OBJECT
- friend class Private::OFileViewInterface;
- friend class Private::OFileViewFileListView;
+ friend class Internal::OFileViewInterface;
+ friend class Internal::OFileViewFileListView;
public:
@@ -188,11 +188,11 @@ private:
QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType
QWidgetStack* m_stack; // our widget stack which will contain the views
- Private::OFileViewInterface* currentView() const; // returns the currentView
- Private::OFileViewInterface* m_current; // here is the view saved
+ Internal::OFileViewInterface* currentView() const; // returns the currentView
+ Internal::OFileViewInterface* m_current; // here is the view saved
bool m_shNew : 1; // should we show New?
bool m_shClose : 1; // should we show Close?
MimeTypes m_mimeType; // list of mimetypes
- QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+ QMap<QString, Internal::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
QHBox* m_nameBox; // the LineEdit + Label is hold here
QHBox* m_cmbBox; // this holds the two combo boxes
diff --git a/libopie2/opieui/fileselector/ofileselector_p.h b/libopie2/opieui/fileselector/ofileselector_p.h
index 376dc98..a3ef8e2 100644
--- a/libopie2/opieui/fileselector/ofileselector_p.h
+++ b/libopie2/opieui/fileselector/ofileselector_p.h
@@ -60,5 +60,5 @@ namespace Opie{
namespace Ui{
class OFileSelector;
-namespace Private {
+namespace Internal {
class OFileViewInterface
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index b19c26e..6763ee6 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -42,5 +42,5 @@
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OFontSelectorPrivate
@@ -97,5 +97,5 @@ private:
using namespace Opie::Ui;
-using namespace Opie::Ui::Private;
+using namespace Opie::Ui::Internal;
static int findItemCB( QComboBox *box, const QString &str )
diff --git a/libopie2/opieui/ofontselector.h b/libopie2/opieui/ofontselector.h
index 1d97233..cd134f4 100644
--- a/libopie2/opieui/ofontselector.h
+++ b/libopie2/opieui/ofontselector.h
@@ -38,5 +38,5 @@ class QListBox;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OFontSelectorPrivate;
}
@@ -97,5 +97,5 @@ 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
@@ -475,10 +475,10 @@ OKeyConfigManager::~OKeyConfigManager() {
* 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 );
/*
@@ -501,8 +501,9 @@ 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 );
/*
@@ -545,5 +546,5 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) {
*/
int key, mod;
- Opie::Ui::Private::fixupKeys( key, mod, e );
+ Opie::Ui::Internal::fixupKeys( key, mod, e );
OKeyConfigItem::List _keyList = keyList( key );
@@ -717,5 +718,5 @@ OKeyConfigItem::List OKeyConfigManager::keyList( int keycode) {
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
OKeyListViewItem::OKeyListViewItem( const OKeyConfigItem& item, OKeyConfigManager* man, OListViewItem* parent)
@@ -939,5 +940,5 @@ 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);
}
@@ -948,10 +949,10 @@ 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 ) {
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 );
}
@@ -970,5 +971,5 @@ void OKeyConfigWidget::save() {
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() );
@@ -994,5 +995,5 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
}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 ) );
@@ -1025,5 +1026,5 @@ void OKeyConfigWidget::slotNoKey() {
* If immediate we need to remove and readd the key
*/
- Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem());
+ Opie::Ui::Internal::OKeyListViewItem *item = static_cast<Opie::Ui::Internal::OKeyListViewItem*>(m_view->currentItem());
updateItem( item, OKeyPair::emptyKey() );
}
@@ -1038,5 +1039,5 @@ void OKeyConfigWidget::slotDefaultKey() {
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() );
}
@@ -1064,5 +1065,5 @@ 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() );
}
@@ -1071,5 +1072,5 @@ void OKeyConfigWidget::slotConfigure() {
}
-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();
@@ -1090,5 +1091,5 @@ bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item,
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 "
@@ -1104,5 +1105,5 @@ 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) {
/* sanity check
@@ -1166,5 +1167,5 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
int mod, key;
- Opie::Ui::Private::fixupKeys( key,mod, ev );
+ Opie::Ui::Internal::fixupKeys( key,mod, ev );
/* either we used software keyboard
@@ -1201,5 +1202,5 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
}
- m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) );
+ m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) );
}
@@ -1237,5 +1238,5 @@ void OKeyChooserConfigDialog::keyReleaseEvent( QKeyEvent* ev ) {
m_key = key;
m_keyPair = OKeyPair( m_key, m_mod );
- m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) );
+ m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) );
}
}
diff --git a/libopie2/opieui/okeyconfigwidget.h b/libopie2/opieui/okeyconfigwidget.h
index f75ed99..bb8eb6c 100644
--- a/libopie2/opieui/okeyconfigwidget.h
+++ b/libopie2/opieui/okeyconfigwidget.h
@@ -26,5 +26,5 @@ class QTimer;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OKeyConfigWidgetPrivate;
typedef QValueList<OKeyConfigWidgetPrivate> OKeyConfigWidgetPrivateList;
@@ -254,11 +254,11 @@ 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);
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;
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
@@ -7,5 +7,5 @@
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
static QString keyToString( const OKeyPair& );
static void fixupKeys( int&, int&, QKeyEvent* );
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
@@ -42,5 +42,5 @@ class QMouseEvent;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
/*======================================================================================
* OTaskbarAppletWrapper
@@ -123,5 +123,5 @@ private:
#define EXPORT_OPIE_APPLET_v1( AppLet ) \
Q_EXPORT_INTERFACE() { \
- Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \
+ Q_CREATE_INSTANCE( Opie::Ui::Internal::OTaskbarAppletWrapper<AppLet> ) \
}