Only use ODP

4 files changed, 15 insertions, 16 deletions

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
@@ -37,7 +37,7 @@ SyntaxDocument::SyntaxDocument()
 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) );
   
 }
@@ -78,7 +78,7 @@ 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)
         {
 	  e=e->firstChild();
@@ -195,7 +195,7 @@ 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)
   {
@@ -203,7 +203,7 @@ 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)
       {
@@ -237,7 +237,7 @@ 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)
   {
@@ -245,7 +245,7 @@ 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)
       {
@@ -276,7 +276,7 @@ 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();
 
@@ -284,13 +284,13 @@ 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;
 
 	        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();
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
@@ -36,9 +36,9 @@ class syntaxModeListItem
 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;
@@ -63,7 +63,7 @@ class SyntaxDocument
     void setIdentifier(const QString& identifier);
 
   private:
-     Opie::XMLElement *m_root;
+     Opie::Core::XMLElement *m_root;
      void setupModeList(bool force=false);
      QString currentFile;
     SyntaxModeList myModeList;
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
@@ -48,7 +48,6 @@
 
 
 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 )
@@ -532,7 +531,7 @@ FontConfig::FontConfig( QWidget *parent, char *name )
 //     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." ) );
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
@@ -184,7 +184,7 @@ public:
   QFont getFont ( ) { return myFont; };
 
   private:
-  Opie::Opie::Ui::OFontSelector *m_fontselect;
+  Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;
     QFont myFont;