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
@@ -1,4 +1,4 @@
   config OPIE-READER
     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
@@ -1,4 +1,4 @@
   config QASHMONEY
     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
@@ -34,13 +34,13 @@ SyntaxDocument::SyntaxDocument()
   setupModeList();
 }
 
 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) );
   
 }
 
 SyntaxDocument::~SyntaxDocument()
 {
@@ -75,13 +75,13 @@ void SyntaxDocument::setupModeList(bool force)
       myModeList.append(mli);
     }
     else
     {
         qDebug("Found a description file:"+path+(*it));
         setIdentifier(path+(*it));
-        Opie::XMLElement *e=m_root;
+        Opie::Core::XMLElement *e=m_root;
         if (e)
         {
           e=e->firstChild();
           qDebug(e->tagName());
           if (e->tagName()=="language")
           {
@@ -192,21 +192,21 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
 
   return retval;
 }
 
 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)
   {
     kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl;
 
     if (e->tagName().compare(mainGroupName)==0 )
     {
-       Opie::XMLElement *e1=e->firstChild();
+       Opie::Core::XMLElement *e1=e->firstChild();
 
       while (e1)
       {
         kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl;
 
         if (e1->tagName()==Config)
@@ -234,21 +234,21 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
 
 
 
 syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, const QString &group)
 {
 
-  Opie::XMLElement *e=m_root->firstChild()->firstChild();
+  Opie::Core::XMLElement *e=m_root->firstChild()->firstChild();
 
   while (e)
   {
     kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl;
 
     if (e->tagName().compare(mainGroupName)==0 )
     {
-      Opie::XMLElement *e1=e->firstChild();
+      Opie::Core::XMLElement *e1=e->firstChild();
 
       while (e1)
       {
         kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl;
         if (e1->tagName()==group+"s")
         {
@@ -273,27 +273,27 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
   return 0;
 }
 
 
 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();
 
   for(e=e->firstChild(); e; e=e->nextChild())
   {
     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;
 
                 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());
                                 m_data+=e2->firstChild()->value().stripWhiteSpace();
                         }
                    break;
                 }
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
@@ -33,15 +33,15 @@ class syntaxModeListItem
     QString identifier;
 };
 
 class syntaxContextData
 {
   public:
-    Opie::XMLElement *parent;
-    Opie::XMLElement *currentGroup;
-    Opie::XMLElement *item;
+    Opie::Core::XMLElement *parent;
+    Opie::Core::XMLElement *currentGroup;
+    Opie::Core::XMLElement *item;
 };
 
 typedef QList<syntaxModeListItem> SyntaxModeList;
 
 class SyntaxDocument
 {
@@ -60,13 +60,13 @@ class SyntaxDocument
     syntaxContextData* getSubItems(syntaxContextData* data);
     QString groupItemData(syntaxContextData* data,QString name);
     QString groupData(syntaxContextData* data,QString name);
     void setIdentifier(const QString& identifier);
 
   private:
-     Opie::XMLElement *m_root;
+     Opie::Core::XMLElement *m_root;
      void setupModeList(bool force=false);
      QString currentFile;
     SyntaxModeList myModeList;
     QStringList m_data;
 };
 
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
@@ -45,13 +45,12 @@
 #include "../document/katedocument.h"
 #include "kateviewdialog.h"
 #include <opie2/ofontselector.h>
 
 
 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 )
   , m_replace( 0L )
 {
   QWidget *page = new QWidget( this );
   setMainWidget( page );
@@ -529,13 +528,13 @@ FontConfig::FontConfig( QWidget *parent, char *name )
   QGridLayout *grid = new QGridLayout( this, 1, 1 );
 //     QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
 //     QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
 //     int size = cfg. readNumEntry ( "FontSize", 10 );
 //  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,
 //   tr( "Select the desired name, style and size of the default font applications will use." ) );
 
     connect( m_fontselect, SIGNAL( fontSelected(const QFont&)),
              this, SLOT( slotFontSelected(const QFont&)));
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
@@ -181,13 +181,13 @@ public:
   ~FontConfig();
 
   void setFont ( const QFont &font );
   QFont getFont ( ) { return myFont; };
 
   private:
-  Opie::Opie::Ui::OFontSelector *m_fontselect;
+  Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;
     QFont myFont;
 
   private slots:
     void slotFontSelected( const QFont &font );
 };