Split the KeyConfig Manager and Widget into Ui and Core parts

Adjust the only user...
Don't add a 2nd example to core but mention the one for the classes
in opieui/okeyconfigwidget

7 files changed, 47 insertions, 51 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 7e4164b..2a49786 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -33,7 +33,7 @@
 #include <qstyle.h>
 
 
-using Opie::Ui::OKeyConfigItem;
+using Opie::Core::OKeyConfigItem;
 
 /*
  * The Icons, Request Cache and IconViewItem for the IconView
@@ -156,7 +156,7 @@ PIconView::~PIconView() {
     delete m_viewManager;
 }
 
-Opie::Ui::OKeyConfigManager* PIconView::manager() {
+Opie::Core::OKeyConfigManager* PIconView::manager() {
     return m_viewManager;
 }
 
@@ -166,30 +166,30 @@ Opie::Ui::OKeyConfigManager* PIconView::manager() {
  * called from the c'tor
  */
 void PIconView::initKeys() {
-    Opie::Ui::OKeyPair::List lst;
-    lst.append( Opie::Ui::OKeyPair::upArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::downArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::leftArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::rightArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::returnKey() );
-
-    m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "View-KeyBoard-Config",
+    Opie::Core::OKeyPair::List lst;
+    lst.append( Opie::Core::OKeyPair::upArrowKey() );
+    lst.append( Opie::Core::OKeyPair::downArrowKey() );
+    lst.append( Opie::Core::OKeyPair::leftArrowKey() );
+    lst.append( Opie::Core::OKeyPair::rightArrowKey() );
+    lst.append( Opie::Core::OKeyPair::returnKey() );
+
+    m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "View-KeyBoard-Config",
                                                     lst, false,this, "keyconfig name" );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam",
                                                 Resource::loadPixmap("beam"), BeamItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_B, Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton),
                                                 this, SLOT(slotBeam())) );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete",
                                                 Resource::loadPixmap("trash"), DeleteItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_D, Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton),
                                                 this, SLOT(slotTrash())) );
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view",
                                                 Resource::loadPixmap("1to1"), ViewItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
                                                 this, SLOT(slotShowImage())));
     m_viewManager->addKeyConfig( OKeyConfigItem(tr("Show Image Info") , "info",
                                                 Resource::loadPixmap("DocumentTypeWord"), InfoItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_I, Qt::ShiftButton ),
+                                                Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ),
                                                 this, SLOT(slotImageInfo()) ) );
     m_viewManager->load();
     m_viewManager->handleWidget( m_view );
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h
index a4ca0bc..9cf7b3e 100644
--- a/noncore/graphics/opie-eye/gui/iconview.h
+++ b/noncore/graphics/opie-eye/gui/iconview.h
@@ -19,8 +19,6 @@ class Ir;
 namespace Opie {
 namespace Core{
     class OConfig;
-}
-namespace Ui {
     class OKeyConfigManager;
 }
 }
@@ -35,7 +33,7 @@ public:
     PIconView( QWidget* wid, Opie::Core::OConfig *cfg );
     ~PIconView();
     void resetView();
-    Opie::Ui::OKeyConfigManager* manager();
+    Opie::Core::OKeyConfigManager* manager();
 
 signals:
     void sig_showInfo( const QString& );
@@ -73,7 +71,7 @@ private slots:
     void slotThumbInfo(const QString&, const QString&);
     void slotThumbNail(const QString&, const QPixmap&);
 private:
-    Opie::Ui::OKeyConfigManager *m_viewManager;
+    Opie::Core::OKeyConfigManager *m_viewManager;
     Opie::Core::OConfig *m_cfg;
     QComboBox* m_views;
     QIconView* m_view;
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
index 0b3250c..27a67a6 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
@@ -46,7 +46,7 @@ imageinfo::imageinfo(const QString&_path, QWidget* parent,  const char* name, WF
     slotChangeName(_path);
 }
 
-Opie::Ui::OKeyConfigManager* imageinfo::manager()
+Opie::Core::OKeyConfigManager* imageinfo::manager()
 {
     if (!m_viewManager) {
         initKeys();
@@ -63,19 +63,19 @@ void imageinfo::initKeys()
         m_cfg->setGroup("imageinfo_keys" );
     }
 #endif
-    Opie::Ui::OKeyPair::List lst;
-    lst.append( Opie::Ui::OKeyPair::upArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::downArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::leftArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::rightArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::returnKey() );
-
-    m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "imageinfo_keys",
+    Opie::Core::OKeyPair::List lst;
+    lst.append( Opie::Core::OKeyPair::upArrowKey() );
+    lst.append( Opie::Core::OKeyPair::downArrowKey() );
+    lst.append( Opie::Core::OKeyPair::leftArrowKey() );
+    lst.append( Opie::Core::OKeyPair::rightArrowKey() );
+    lst.append( Opie::Core::OKeyPair::returnKey() );
+
+    m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys",
                                                     lst, false,this, "keyconfig name" );
-    m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Full Image"), "infoview",
-                                                Resource::loadPixmap("1to1"), ViewItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton),
-                                                this, SLOT(slotShowImage())));
+    m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview",
+                                                            Resource::loadPixmap("1to1"), ViewItem,
+                                                            Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
+                                                            this, SLOT(slotShowImage())));
     m_viewManager->load();
     m_viewManager->handleWidget( this );
     m_viewManager->handleWidget( TextView1 );
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.h b/noncore/graphics/opie-eye/gui/imageinfoui.h
index c9b83a1..bc99bf9 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.h
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.h
@@ -15,8 +15,6 @@ class QTextView;
 namespace Opie {
     namespace Core {
         class OConfig;
-    }
-    namespace Ui {
         class OKeyConfigManager;
     }
 }
@@ -34,7 +32,7 @@ public:
     virtual ~imageinfo();
 
     void setDestructiveClose();
-    Opie::Ui::OKeyConfigManager* manager();
+    Opie::Core::OKeyConfigManager* manager();
 
 signals:
     void dispImage(const QString&);
@@ -56,7 +54,7 @@ protected:
     QString currentFile;
 
     Opie::Core::OConfig * m_cfg;
-    Opie::Ui::OKeyConfigManager*m_viewManager;
+    Opie::Core::OKeyConfigManager*m_viewManager;
     void initKeys();
 
 protected slots:
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index e43bbff..2078b19 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -23,7 +23,7 @@ ImageView::~ImageView()
     }
 }
 
-Opie::Ui::OKeyConfigManager* ImageView::manager()
+Opie::Core::OKeyConfigManager* ImageView::manager()
 {
     if (!m_viewManager) {
         initKeys();
@@ -38,18 +38,18 @@ void ImageView::initKeys()
         m_cfg = new Opie::Core::OConfig("phunkview");
         m_cfg->setGroup("image_view_keys" );
     }
-    Opie::Ui::OKeyPair::List lst;
-    lst.append( Opie::Ui::OKeyPair::upArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::downArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::leftArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::rightArrowKey() );
-    lst.append( Opie::Ui::OKeyPair::returnKey() );
-
-    m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "image_view_keys",
+    Opie::Core::OKeyPair::List lst;
+    lst.append( Opie::Core::OKeyPair::upArrowKey() );
+    lst.append( Opie::Core::OKeyPair::downArrowKey() );
+    lst.append( Opie::Core::OKeyPair::leftArrowKey() );
+    lst.append( Opie::Core::OKeyPair::rightArrowKey() );
+    lst.append( Opie::Core::OKeyPair::returnKey() );
+
+    m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
                                                     lst, false,this, "image_view_keys" );
-    m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
+    m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
                                                 Resource::loadPixmap("1to1"), ViewInfo,
-                                                Opie::Ui::OKeyPair(Qt::Key_I,Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_I,Qt::ShiftButton),
                                                 this, SLOT(slotShowImageInfo())));
     m_viewManager->handleWidget( this );
     m_viewManager->load();
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index f61c93f..87e2b32 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -7,8 +7,6 @@
 namespace Opie {
     namespace Core {
         class OConfig;
-    }
-    namespace Ui {
         class OKeyConfigManager;
     }
 }
@@ -24,7 +22,7 @@ class ImageView:public ImageScrollView
 public:
     ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 );
     virtual ~ImageView();
-    Opie::Ui::OKeyConfigManager* manager();
+    Opie::Core::OKeyConfigManager* manager();
 
 signals:
     void dispImageInfo(const QString&);
@@ -32,7 +30,7 @@ signals:
 
 protected:
     Opie::Core::OConfig * m_cfg;
-    Opie::Ui::OKeyConfigManager*m_viewManager;
+    Opie::Core::OKeyConfigManager*m_viewManager;
     void initKeys();
 protected slots:
     virtual void slotShowImageInfo();
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index 042d568..59dba30 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -14,9 +14,11 @@
 
 namespace Opie {
 namespace Ui{
-    class OKeyConfigManager;
     class OWidgetStack;
 }
+namespace Core{
+    class OKeyConfigManager;
+}
 }
 
 class PIconView;