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
@@ -35,3 +35,3 @@
 
-using Opie::Ui::OKeyConfigItem;
+using Opie::Core::OKeyConfigItem;
 
@@ -158,3 +158,3 @@ PIconView::~PIconView() {
 
-Opie::Ui::OKeyConfigManager* PIconView::manager() {
+Opie::Core::OKeyConfigManager* PIconView::manager() {
     return m_viewManager;
@@ -168,10 +168,10 @@ Opie::Ui::OKeyConfigManager* PIconView::manager() {
 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" );
@@ -179,3 +179,3 @@ void PIconView::initKeys() {
                                                 Resource::loadPixmap("beam"), BeamItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_B, Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton),
                                                 this, SLOT(slotBeam())) );
@@ -183,3 +183,3 @@ void PIconView::initKeys() {
                                                 Resource::loadPixmap("trash"), DeleteItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_D, Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton),
                                                 this, SLOT(slotTrash())) );
@@ -187,3 +187,3 @@ void PIconView::initKeys() {
                                                 Resource::loadPixmap("1to1"), ViewItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton),
+                                                Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton),
                                                 this, SLOT(slotShowImage())));
@@ -191,3 +191,3 @@ void PIconView::initKeys() {
                                                 Resource::loadPixmap("DocumentTypeWord"), InfoItem,
-                                                Opie::Ui::OKeyPair(Qt::Key_I, Qt::ShiftButton ),
+                                                Opie::Core::OKeyPair(Qt::Key_I, Qt::ShiftButton ),
                                                 this, SLOT(slotImageInfo()) ) );
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
@@ -21,4 +21,2 @@ namespace Core{
     class OConfig;
-}
-namespace Ui {
     class OKeyConfigManager;
@@ -37,3 +35,3 @@ public:
     void resetView();
-    Opie::Ui::OKeyConfigManager* manager();
+    Opie::Core::OKeyConfigManager* manager();
 
@@ -75,3 +73,3 @@ private slots:
 private:
-    Opie::Ui::OKeyConfigManager *m_viewManager;
+    Opie::Core::OKeyConfigManager *m_viewManager;
     Opie::Core::OConfig *m_cfg;
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
@@ -48,3 +48,3 @@ imageinfo::imageinfo(const QString&_path, QWidget* parent,  const char* name, WF
 
-Opie::Ui::OKeyConfigManager* imageinfo::manager()
+Opie::Core::OKeyConfigManager* imageinfo::manager()
 {
@@ -65,15 +65,15 @@ void imageinfo::initKeys()
 #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();
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
@@ -17,4 +17,2 @@ namespace Opie {
         class OConfig;
-    }
-    namespace Ui {
         class OKeyConfigManager;
@@ -36,3 +34,3 @@ public:
     void setDestructiveClose();
-    Opie::Ui::OKeyConfigManager* manager();
+    Opie::Core::OKeyConfigManager* manager();
 
@@ -58,3 +56,3 @@ protected:
     Opie::Core::OConfig * m_cfg;
-    Opie::Ui::OKeyConfigManager*m_viewManager;
+    Opie::Core::OKeyConfigManager*m_viewManager;
     void initKeys();
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
@@ -25,3 +25,3 @@ ImageView::~ImageView()
 
-Opie::Ui::OKeyConfigManager* ImageView::manager()
+Opie::Core::OKeyConfigManager* ImageView::manager()
 {
@@ -40,14 +40,14 @@ void ImageView::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, "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())));
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
@@ -9,4 +9,2 @@ namespace Opie {
         class OConfig;
-    }
-    namespace Ui {
         class OKeyConfigManager;
@@ -26,3 +24,3 @@ public:
     virtual ~ImageView();
-    Opie::Ui::OKeyConfigManager* manager();
+    Opie::Core::OKeyConfigManager* manager();
 
@@ -34,3 +32,3 @@ protected:
     Opie::Core::OConfig * m_cfg;
-    Opie::Ui::OKeyConfigManager*m_viewManager;
+    Opie::Core::OKeyConfigManager*m_viewManager;
     void initKeys();
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
@@ -16,5 +16,7 @@ namespace Opie {
 namespace Ui{
-    class OKeyConfigManager;
     class OWidgetStack;
 }
+namespace Core{
+    class OKeyConfigManager;
+}
 }