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
@@ -7,9 +7,9 @@
class QWidget;
namespace Opie {
namespace Ui {
-namespace Private{
+namespace Internal{
struct OSplitterContainer
{
bool operator==( const OSplitterContainer& o) const
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
@@ -35,9 +35,9 @@
#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
@@ -396,9 +396,9 @@ void OSplitter::resizeEvent( QResizeEvent* res )
/*
* Adds a container to a tab either the parent tab
* or our own
*/
-void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
+void OSplitter::addToTab( const Opie::Ui::Internal::OSplitterContainer& con )
{
QWidget *wid = con.widget;
// not needed widgetstack will reparent as well wid.reparent(m_tabWidget, wid->getWFlags(), QPoint(0, 0) );
if (m_parentTab )
@@ -410,9 +410,9 @@ void OSplitter::addToTab( const Opie::Ui::Private::OSplitterContainer& con )
/*
* adds a container to the box
*/
-void OSplitter::addToBox( const Opie::Ui::Private::OSplitterContainer& con )
+void OSplitter::addToBox( const Opie::Ui::Internal::OSplitterContainer& con )
{
QWidget* wid = con.widget;
wid->reparent(m_hbox, 0, QPoint(0, 0) );
}
diff --git a/libopie2/opieui/big-screen/osplitter.h b/libopie2/opieui/big-screen/osplitter.h
index 7b5ea53..46dad05 100644
--- a/libopie2/opieui/big-screen/osplitter.h
+++ b/libopie2/opieui/big-screen/osplitter.h
@@ -72,9 +72,9 @@ class OTabWidget;
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();
@@ -123,10 +123,10 @@ private:
/* true if OTabMode */
bool layoutMode()const;
// void reparentAll();
void setTabWidget( OTabWidget*);
- void addToTab( const Opie::Ui::Private::OSplitterContainer& );
- void addToBox( const Opie::Ui::Private::OSplitterContainer& );
+ void addToTab( const Opie::Ui::Internal::OSplitterContainer& );
+ void addToBox( const Opie::Ui::Internal::OSplitterContainer& );
void removeFromTab( QWidget* );
void changeTab();
void changeHBox();
void changeVBox();
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,4 +1,5 @@
+
/*
               =. This file is part of the OPIE Project
             .=l. Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org>
           .>+-=
@@ -54,13 +55,13 @@
#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 )
{}
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
@@ -54,9 +54,9 @@ typedef QMap<QString, QStringList> MimeTypes;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OFileViewInterface;
class OFileViewFileListView;
}
@@ -74,10 +74,10 @@ class OFileViewFileListView;
*/
class OFileSelector : public QWidget
{
Q_OBJECT
- friend class Private::OFileViewInterface;
- friend class Private::OFileViewFileListView;
+ friend class Internal::OFileViewInterface;
+ friend class Internal::OFileViewFileListView;
public:
/**
* The Mode of the Fileselector
@@ -186,15 +186,15 @@ private:
private:
QLineEdit* m_lneEdit; // the LineEdit for the Name
QComboBox *m_cmbView, *m_cmbMime; // two ComboBoxes to select the View and MimeType
QWidgetStack* m_stack; // our widget stack which will contain the views
- Private::OFileViewInterface* currentView() const; // returns the currentView
- Private::OFileViewInterface* m_current; // here is the view saved
+ Internal::OFileViewInterface* currentView() const; // returns the currentView
+ Internal::OFileViewInterface* m_current; // here is the view saved
bool m_shNew : 1; // should we show New?
bool m_shClose : 1; // should we show Close?
MimeTypes m_mimeType; // list of mimetypes
- QMap<QString, Private::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
+ QMap<QString, Internal::OFileViewInterface*> m_views; // QString translated view name + ViewInterface Ptr
QHBox* m_nameBox; // the LineEdit + Label is hold here
QHBox* m_cmbBox; // this holds the two combo boxes
QString m_startDir;
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
@@ -58,9 +58,9 @@ class QToolButton;
namespace Opie{
namespace Ui{
class OFileSelector;
-namespace Private {
+namespace Internal {
class OFileViewInterface
{
public:
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
@@ -40,9 +40,9 @@
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OFontSelectorPrivate
{
public:
@@ -95,9 +95,9 @@ private:
}
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++ )
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
@@ -36,9 +36,9 @@
class QListBox;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OFontSelectorPrivate;
}
/**
@@ -95,9 +95,9 @@ private:
void changeFont ( );
private:
- Private::OFontSelectorPrivate *d;
+ Internal::OFontSelectorPrivate *d;
};
}
}
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp
index ef6d713..eb7acbd 100644
--- a/libopie2/opieui/okeyconfigwidget.cpp
+++ b/libopie2/opieui/okeyconfigwidget.cpp
@@ -473,14 +473,14 @@ OKeyConfigManager::~OKeyConfigManager() {
/**
* Load the Configuration from the OConfig
* If a Key is restricted but was in the config we will
* make it be the empty key paur
- * We will change the group of the OConfig Item!
+ * We will change the group but restore to the previous.
*
* @see OKeyPair::emptyKey
*/
void OKeyConfigManager::load() {
- m_conf->setGroup( m_group );
+ Opie::Core::OConfigGroupSaver( m_conf, m_group );
/*
* Read each item
*/
@@ -499,12 +499,13 @@ void OKeyConfigManager::load() {
}
/**
* We will save the current configuration
- * to the OConfig. We will change the group.
+ * to the OConfig. We will change the group but restore
+ * to the previous
*/
void OKeyConfigManager::save() {
- m_conf->setGroup( m_group );
+ Opie::Core::OConfigGroupSaver( m_conf, m_group );
/*
* Write each item
*/
@@ -543,9 +544,9 @@ OKeyConfigItem OKeyConfigManager::handleKeyEvent( QKeyEvent* e ) {
* 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();
@@ -715,9 +716,9 @@ OKeyConfigItem::List OKeyConfigManager::keyList( int keycode) {
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
OKeyListViewItem::OKeyListViewItem( const OKeyConfigItem& item, OKeyConfigManager* man, OListViewItem* parent)
: Opie::Ui::OListViewItem( parent ), m_manager( man ) {
m_origItem = item;
@@ -937,23 +938,23 @@ OKeyConfigWidget::ChangeMode OKeyConfigWidget::changeMode()const {
/**
* insert these items before calling load
*/
void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) {
- Opie::Ui::Private::OKeyConfigWidgetPrivate root( str, man );
+ Opie::Ui::Internal::OKeyConfigWidgetPrivate root( str, man );
m_list.append(root);
}
/**
* 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 );
}
}
@@ -968,9 +969,9 @@ void OKeyConfigWidget::save() {
*/
QListViewItemIterator it( m_view );
while ( it.current() ) {
if (it.current()->parent() ) {
- Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>( it.current() );
+ Opie::Ui::Internal::OKeyListViewItem *item = static_cast<Opie::Ui::Internal::OKeyListViewItem*>( it.current() );
OKeyConfigManager *man = item->manager();
man->removeKeyConfig( item->origItem() );
man->addKeyConfig( item->item() );
}
@@ -992,9 +993,9 @@ void OKeyConfigWidget::slotListViewItem( QListViewItem* _item) {
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 );
@@ -1023,9 +1024,9 @@ 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() );
}
void OKeyConfigWidget::slotDefaultKey() {
@@ -1036,9 +1037,9 @@ void OKeyConfigWidget::slotDefaultKey() {
if ( !m_view->currentItem() || !m_view->currentItem()->parent() )
return;
- Opie::Ui::Private::OKeyListViewItem *item = static_cast<Opie::Ui::Private::OKeyListViewItem*>(m_view->currentItem());
+ Opie::Ui::Internal::OKeyListViewItem *item = static_cast<Opie::Ui::Internal::OKeyListViewItem*>(m_view->currentItem());
updateItem( item, item->item().defaultKeyPair() );
}
void OKeyConfigWidget::slotCustomKey() {
@@ -1062,16 +1063,16 @@ void OKeyConfigWidget::slotConfigure() {
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 */
@@ -1088,9 +1089,9 @@ bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item,
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>" ) );
@@ -1102,9 +1103,9 @@ bool OKeyConfigWidget::sanityCheck( Opie::Ui::Private::OKeyListViewItem* item,
return true;
}
-void OKeyConfigWidget::updateItem( Opie::Ui::Private::OKeyListViewItem *item,
+void OKeyConfigWidget::updateItem( Opie::Ui::Internal::OKeyListViewItem *item,
const OKeyPair& newItem) {
/* sanity check
* check against the blacklist of the manager
* check if another item uses this key which is o(n) at least
@@ -1164,9 +1165,9 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* 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
*/
@@ -1199,9 +1200,9 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
m_keyPair = OKeyPair( m_key, m_mod );
}
- m_lbl->setText( Opie::Ui::Private::keyToString( m_keyPair ) );
+ m_lbl->setText( Opie::Ui::Internal::keyToString( m_keyPair ) );
}
void OKeyChooserConfigDialog::keyReleaseEvent( QKeyEvent* ev ) {
@@ -1235,9 +1236,9 @@ void OKeyChooserConfigDialog::keyReleaseEvent( QKeyEvent* ev ) {
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 ) );
}
}
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
@@ -24,9 +24,9 @@ class QRadioButton;
class QTimer;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
class OKeyConfigWidgetPrivate;
typedef QValueList<OKeyConfigWidgetPrivate> OKeyConfigWidgetPrivateList;
class OKeyListViewItem;
}
@@ -252,15 +252,15 @@ private slots:
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;
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
@@ -5,9 +5,9 @@
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:
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
@@ -40,9 +40,9 @@
class QMouseEvent;
namespace Opie {
namespace Ui {
-namespace Private {
+namespace Internal {
/*======================================================================================
* OTaskbarAppletWrapper
*======================================================================================*/
@@ -121,9 +121,9 @@ private:
}
#define EXPORT_OPIE_APPLET_v1( AppLet ) \
Q_EXPORT_INTERFACE() { \
- Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<AppLet> ) \
+ Q_CREATE_INSTANCE( Opie::Ui::Internal::OTaskbarAppletWrapper<AppLet> ) \
}
#endif