Finish TQt4 porting of Amarok

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/amarok/src/atomicstring.cpp b/amarok/src/atomicstring.cpp
index 2de299af..a384ee72 100644
--- a/amarok/src/atomicstring.cpp
+++ b/amarok/src/atomicstring.cpp
@@ -27,7 +27,7 @@
 
 #include "atomicstring.h"
 
-class AtomicString::Data: public QString
+class AtomicString::Data: public TQString
 {
 public:
     uint refcount;
@@ -82,7 +82,7 @@ TQString AtomicString::string() const
 TQString AtomicString::deepCopy() const
 {
     if (m_string)
-	return TQString( m_string->unicode(), m_string->length() );
+	return TQString( m_string->tqunicode(), m_string->length() );
     return TQString();
 }
 
@@ -95,7 +95,7 @@ const TQString *AtomicString::ptr() const
 {
     if( m_string )
         return m_string;
-    return &TQString::null;
+    return &TQString();
 }
 
 uint AtomicString::refcount() const
@@ -150,10 +150,10 @@ inline void AtomicString::ref( Data *s )
 bool AtomicString::isMainThread()
 {
     // For isMainThread(), we could use TQThread::currentThread(), except the
-    // docs say it's unreliable. And in general QThreads don't like to be called from
+    // docs say it's unreliable. And in general TQThreads don't like to be called from
     // app destructors. Good old pthreads will serve us well. As for Windows, these
     // two calls surely have equivalents; better yet we'll have QT4 and thread safe
-    // QStrings by then.
+    // TQStrings by then.
     // Note that the the static local init is thread safe.
     static pthread_t main_thread = pthread_self();
     return pthread_equal(pthread_self(), main_thread);