Only use ODP

6 files changed, 17 insertions, 18 deletions

diff --git a/noncore/apps/opie-reader/config.in b/noncore/apps/opie-reader/config.in
index 9f1e02e..8ade941 100644
--- a/noncore/apps/opie-reader/config.in
+++ b/noncore/apps/opie-reader/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in
index 94c39b6..91739fe 100644
--- a/noncore/apps/qashmoney/config.in
+++ b/noncore/apps/qashmoney/config.in
@@ -3,2 +3,2 @@
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index f90a5f8..6059e9b 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -39,3 +39,3 @@ void SyntaxDocument::setIdentifier(const QString& identifier)
 #warning FIXME  delete m_root;
-  m_root=Opie::XMLElement::load(identifier);
+  m_root=Opie::Core::XMLElement::load(identifier);
   if (!m_root)    KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) );
@@ -80,3 +80,3 @@ void SyntaxDocument::setupModeList(bool force)
         setIdentifier(path+(*it));
-        Opie::XMLElement *e=m_root;
+        Opie::Core::XMLElement *e=m_root;
         if (e)
@@ -197,3 +197,3 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
 {
-  Opie::XMLElement *e = m_root->firstChild()->firstChild();
+  Opie::Core::XMLElement *e = m_root->firstChild()->firstChild();
 
@@ -205,3 +205,3 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
     {
-       Opie::XMLElement *e1=e->firstChild();
+       Opie::Core::XMLElement *e1=e->firstChild();
 
@@ -239,3 +239,3 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
 
-  Opie::XMLElement *e=m_root->firstChild()->firstChild();
+  Opie::Core::XMLElement *e=m_root->firstChild()->firstChild();
 
@@ -247,3 +247,3 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
     {
-      Opie::XMLElement *e1=e->firstChild();
+      Opie::Core::XMLElement *e1=e->firstChild();
 
@@ -278,3 +278,3 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
 {
-  Opie::XMLElement *e  = m_root->firstChild();
+  Opie::Core::XMLElement *e  = m_root->firstChild();
   if (clearList)
@@ -286,3 +286,3 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
     {
-	for (Opie::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
+	for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
 	{
@@ -292,3 +292,3 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
         	{
-			for (Opie::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
+			for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
 			{
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h
index 5eefc77..072f5f0 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h
@@ -38,5 +38,5 @@ class syntaxContextData
   public:
-    Opie::XMLElement *parent;
-    Opie::XMLElement *currentGroup;
-    Opie::XMLElement *item;
+    Opie::Core::XMLElement *parent;
+    Opie::Core::XMLElement *currentGroup;
+    Opie::Core::XMLElement *item;
 };
@@ -65,3 +65,3 @@ class SyntaxDocument
   private:
-     Opie::XMLElement *m_root;
+     Opie::Core::XMLElement *m_root;
      void setupModeList(bool force=false);
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index c3a0a2e..f82356b 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -50,3 +50,2 @@
 using namespace Opie::Ui;
-using namespace Opie::Ui;
 SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
@@ -534,3 +533,3 @@ FontConfig::FontConfig( QWidget *parent, char *name )
 
-    m_fontselect = new Opie::OFontSelector ( false, this, "FontTab" );
+    m_fontselect = new OFontSelector ( false, this, "FontTab" );
 //    m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
index d081152..65f2dca 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
@@ -186,3 +186,3 @@ public:
   private:
-  Opie::Opie::Ui::OFontSelector *m_fontselect;
+  Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;