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, 8 insertions, 8 deletions

diff --git a/amarok/src/expression.cpp b/amarok/src/expression.cpp
index 143b6601..ddf47848 100644
--- a/amarok/src/expression.cpp
+++ b/amarok/src/expression.cpp
@@ -45,11 +45,11 @@ ParsedExpression ExpressionParser::parse( const TQString &expression ) //static
 
 bool ExpressionParser::isAdvancedExpression( const TQString &expression ) //static
 {
-    return ( expression.contains( '"'   ) ||
-             expression.contains( ':'   ) ||
-             expression.contains( '-'   ) ||
-             expression.contains( "AND" ) ||
-             expression.contains( "OR"  ) );
+    return ( expression.tqcontains( '"'   ) ||
+             expression.tqcontains( ':'   ) ||
+             expression.tqcontains( '-'   ) ||
+             expression.tqcontains( "AND" ) ||
+             expression.tqcontains( "OR"  ) );
 }
 
 /* PRIVATE */
@@ -94,7 +94,7 @@ void ExpressionParser::handleColon( const TQChar &c )
     if( m_state <= ExpectField && !m_string.isEmpty() )
     {
         m_element.field = m_string;
-        m_string = TQString::null;
+        m_string = TQString();
         m_state = ExpectMod;
     }
     else
@@ -161,7 +161,7 @@ void ExpressionParser::finishedToken()
         else
             finishedOrGroup();
 
-        m_string = TQString::null;
+        m_string = TQString();
         m_state = ExpectMinus;
     }
 }
@@ -172,7 +172,7 @@ void ExpressionParser::finishedElement()
         finishedOrGroup();
     m_inOrGroup = m_haveGroup = false;
     m_element.text = m_string;
-    m_string = TQString::null;
+    m_string = TQString();
 
     if( !m_element.text.isEmpty() || !m_element.field.isEmpty() )
         m_or.append( m_element );