1 files changed, 19 insertions, 19 deletions

diff --git a/amarok/src/xmlloader.cpp b/amarok/src/xmlloader.cpp
index 4d945cda..5793e9de 100644
--- a/amarok/src/xmlloader.cpp
+++ b/amarok/src/xmlloader.cpp
@@ -18,7 +18,7 @@
 */
 
 
-#include <qapplication.h>
+#include <tqapplication.h>
 
 #include "xmlloader.h"
 #include "xmlloader_p.h"
@@ -32,7 +32,7 @@ MetaBundle::XmlLoader::XmlLoader(): m_aborted( false ), m_target( 0 )
 
 MetaBundle::XmlLoader::~XmlLoader() {}
 
-bool MetaBundle::XmlLoader::load( QXmlInputSource *source, QObject *target )
+bool MetaBundle::XmlLoader::load( TQXmlInputSource *source, TQObject *target )
 {
     m_target = target;
     return m_reader.parse( source, false );
@@ -43,22 +43,22 @@ void MetaBundle::XmlLoader::abort()
     m_aborted = true;
 }
 
-QString MetaBundle::XmlLoader::lastError() const
+TQString MetaBundle::XmlLoader::lastError() const
 {
     return m_lastError;
 }
 
-BundleList MetaBundle::XmlLoader::loadBundles( QXmlInputSource *source, bool *ok ) //static
+BundleList MetaBundle::XmlLoader::loadBundles( TQXmlInputSource *source, bool *ok ) //static
 {
     return SimpleLoader( source, ok ).bundles;
 }
 
-void MetaBundle::XmlLoader::loadInThread( QXmlInputSource *source, QObject *target ) //static
+void MetaBundle::XmlLoader::loadInThread( TQXmlInputSource *source, TQObject *target ) //static
 {
     ( new ThreadedLoader( source, target ) )->start();
 }
 
-void MetaBundle::XmlLoader::newAttribute( const QString &key, const QString &value )
+void MetaBundle::XmlLoader::newAttribute( const TQString &key, const TQString &value )
 {
     if( key == "url" )
         m_bundle.setUrl( value );
@@ -67,10 +67,10 @@ void MetaBundle::XmlLoader::newAttribute( const QString &key, const QString &val
     else if( key == "compilation" )
         m_bundle.setCompilation( MetaBundle::CompilationYes );
     else
-        m_attributes << QPair<QString, QString>( key, value );
+        m_attributes << QPair<TQString, TQString>( key, value );
 }
 
-void MetaBundle::XmlLoader::newTag( const QString &name, const QString &value )
+void MetaBundle::XmlLoader::newTag( const TQString &name, const TQString &value )
 {
     static int start = 0; //most of the time, the columns should be in order
     for( int i = start; i < NUM_COLUMNS; ++i )
@@ -142,21 +142,21 @@ void MetaBundle::XmlLoader::bundleLoaded()
     if( m_target )
     {
         BundleLoadedEvent e( m_bundle, m_attributes );
-        QApplication::sendEvent( m_target, &e );
+        TQApplication::sendEvent( m_target, &e );
     }
 }
 
-void MetaBundle::XmlLoader::errorEncountered( const QString &, int, int )
+void MetaBundle::XmlLoader::errorEncountered( const TQString &, int, int )
 {
     emit error( m_lastError );
     if( m_target )
     {
         BundleLoadedEvent e( m_lastError );
-        QApplication::sendEvent( m_target, &e );
+        TQApplication::sendEvent( m_target, &e );
     }
 }
 
-bool MetaBundle::XmlLoader::startElement( const QString &, const QString &localName, const QString &, const QXmlAttributes &atts )
+bool MetaBundle::XmlLoader::startElement( const TQString &, const TQString &localName, const TQString &, const TQXmlAttributes &atts )
 {
     if( localName == "item" )
     {
@@ -165,7 +165,7 @@ bool MetaBundle::XmlLoader::startElement( const QString &, const QString &localN
         for( int i = 0, n = atts.count(); i < n; ++i )
             newAttribute( atts.localName( i ), atts.value( i ) );
 
-        m_currentElement = QString::null;
+        m_currentElement = TQString::null;
     }
     else
         m_currentElement = localName;
@@ -173,7 +173,7 @@ bool MetaBundle::XmlLoader::startElement( const QString &, const QString &localN
     return true;
 }
 
-bool MetaBundle::XmlLoader::endElement( const QString &, const QString &localName, const QString & )
+bool MetaBundle::XmlLoader::endElement( const TQString &, const TQString &localName, const TQString & )
 {
     if( localName == "item" )
     {
@@ -184,12 +184,12 @@ bool MetaBundle::XmlLoader::endElement( const QString &, const QString &localNam
             return false;
     }
 
-    m_currentElement = QString::null;
+    m_currentElement = TQString::null;
 
     return true;
 }
 
-bool MetaBundle::XmlLoader::characters( const QString &ch )
+bool MetaBundle::XmlLoader::characters( const TQString &ch )
 {
     if( m_currentElement.isNull() )
         return true;
@@ -207,13 +207,13 @@ bool MetaBundle::XmlLoader::endDocument()
     return !m_aborted;
 }
 
-bool MetaBundle::XmlLoader::fatalError( const QXmlParseException &e )
+bool MetaBundle::XmlLoader::fatalError( const TQXmlParseException &e )
 {
     if( !m_bundle.isEmpty() )
         bundleLoaded();
 
-    m_lastError = QString( "Error loading XML: \"%1\", at line %2, column %3." )
-                  .arg( e.message(), QString::number( e.lineNumber() ), QString::number( e.columnNumber() ) );
+    m_lastError = TQString( "Error loading XML: \"%1\", at line %2, column %3." )
+                  .arg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) );
     errorEncountered( e.message(), e.lineNumber(), e.columnNumber() );
 
     return false;