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
@@ -2,3 +2,3 @@
     boolean "opie-reader (E-Text reader)"
     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
@@ -2,3 +2,3 @@
     boolean "opie-qashmoney (money manager)" 
     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
@@ -38,5 +38,5 @@ 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) );
   
@@ -79,5 +79,5 @@ void SyntaxDocument::setupModeList(bool force)
         qDebug("Found a description file:"+path+(*it));
         setIdentifier(path+(*it));
-        Opie::XMLElement *e=m_root;
+        Opie::Core::XMLElement *e=m_root;
         if (e)
         {
@@ -196,5 +196,5 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
 syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const QString &Config)
 {
-  Opie::XMLElement *e = m_root->firstChild()->firstChild();
+  Opie::Core::XMLElement *e = m_root->firstChild()->firstChild();
 
   while (e)
@@ -204,5 +204,5 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
     if (e->tagName().compare(mainGroupName)==0 )
     {
-       Opie::XMLElement *e1=e->firstChild();
+       Opie::Core::XMLElement *e1=e->firstChild();
 
       while (e1)
@@ -238,5 +238,5 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
 {
 
-  Opie::XMLElement *e=m_root->firstChild()->firstChild();
+  Opie::Core::XMLElement *e=m_root->firstChild()->firstChild();
 
   while (e)
@@ -246,5 +246,5 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
     if (e->tagName().compare(mainGroupName)==0 )
     {
-      Opie::XMLElement *e1=e->firstChild();
+      Opie::Core::XMLElement *e1=e->firstChild();
 
       while (e1)
@@ -277,5 +277,5 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
 QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& type,bool clearList)
 {
-  Opie::XMLElement *e  = m_root->firstChild();
+  Opie::Core::XMLElement *e  = m_root->firstChild();
   if (clearList)
     m_data.clear();
@@ -285,5 +285,5 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
     if (e->tagName()==mainGroup)
     {
-        for (Opie::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
+        for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
         {
           if (e1->tagName()!="list") continue;
@@ -291,5 +291,5 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
                 if (e1->attribute("name")==type)
                 {
-                        for (Opie::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
+                        for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
                         {
                                 qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
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
@@ -37,7 +37,7 @@ class syntaxContextData
 {
   public:
-    Opie::XMLElement *parent;
-    Opie::XMLElement *currentGroup;
-    Opie::XMLElement *item;
+    Opie::Core::XMLElement *parent;
+    Opie::Core::XMLElement *currentGroup;
+    Opie::Core::XMLElement *item;
 };
 
@@ -64,5 +64,5 @@ class SyntaxDocument
 
   private:
-     Opie::XMLElement *m_root;
+     Opie::Core::XMLElement *m_root;
      void setupModeList(bool force=false);
      QString currentFile;
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
@@ -49,5 +49,4 @@
 
 using namespace Opie::Ui;
-using namespace Opie::Ui;
 SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
   : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
@@ -533,5 +532,5 @@ FontConfig::FontConfig( QWidget *parent, char *name )
 //  OFontSelector *m_fontselect;
 
-    m_fontselect = new Opie::OFontSelector ( false, this, "FontTab" );
+    m_fontselect = new OFontSelector ( false, this, "FontTab" );
 //    m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
 //   QWhatsThis::add( m_fontselect,
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
@@ -185,5 +185,5 @@ public:
 
   private:
-  Opie::Opie::Ui::OFontSelector *m_fontselect;
+  Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;
     QFont myFont;