diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-18 03:28:57 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-18 03:28:57 +0000 |
| commit | 1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6 (patch) | |
| tree | 728d80ad748a95d7aa27ee020706dbe985e0e8cb /amarok/src/qstringx.h | |
| parent | e9db3e45ed0189bbe18125b120da394a5bc8a832 (diff) | |
| download | amarok-1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6.tar.gz amarok-1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6.zip | |
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
Diffstat (limited to 'amarok/src/qstringx.h')
| -rw-r--r-- | amarok/src/qstringx.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/amarok/src/qstringx.h b/amarok/src/qstringx.h index 36752fe1..a70ffae4 100644 --- a/amarok/src/qstringx.h +++ b/amarok/src/qstringx.h @@ -2,8 +2,8 @@ // Copyright (C) 2006 Martin Aumueller <aumuell@reserv.at> // See COPYING file for licensing information -#ifndef AMAROK_QSTRINGX_H -#define AMAROK_QSTRINGX_H +#ifndef AMAROK_TQSTRINGX_H +#define AMAROK_TQSTRINGX_H #include <tqglobal.h> #include <tqregexp.h> @@ -14,16 +14,16 @@ namespace Amarok { -class QStringx : public QString +class TQStringx : public TQString { public: - QStringx() {}; - QStringx( TQChar ch ) : TQString( ch ) {}; - QStringx( const TQString& s ) : TQString( s ) {}; - QStringx( const TQByteArray& ba ) : TQString( ba ) {}; - QStringx( const TQChar* unicode, uint length ) : TQString( unicode, length ) {}; - QStringx( const char* str ) : TQString( str ) {}; - virtual ~QStringx() {}; + TQStringx() {}; + TQStringx( TQChar ch ) : TQString( ch ) {}; + TQStringx( const TQString& s ) : TQString( s ) {}; + TQStringx( const TQByteArray& ba ) : TQString( ba ) {}; + TQStringx( const TQChar* tqunicode, uint length ) : TQString( tqunicode, length ) {}; + TQStringx( const char* str ) : TQString( str ) {}; + virtual ~TQStringx() {}; // the numbers following % obviously are not taken into account TQString args( const TQStringList& args ) const @@ -61,7 +61,7 @@ public: TQString p = rxArg.capturedTexts()[0].mid(1, len-1); result += mid( start, pos-start ); - if( args[p] != TQString::null ) + if( args[p] != TQString() ) result += args[p]; else if( opt ) return TQString(); @@ -88,14 +88,14 @@ public: pos = rxOptArg.search( *this, start ) ) { int len = rxOptArg.matchedLength(); - QStringx opt = rxOptArg.capturedTexts()[0].mid(1, len-2); + TQStringx opt = TQString(rxOptArg.capturedTexts()[0].mid(1, len-2)); - result += QStringx(mid( start, pos-start )).namedArgs( args ); + result += TQStringx(mid( start, pos-start )).namedArgs( args ); result += opt.namedArgs( args, true ); start = pos + len; } - result += QStringx( mid( start ) ).namedArgs( args ); + result += TQStringx( mid( start ) ).namedArgs( args ); return result; } @@ -103,4 +103,4 @@ public: } // namespace Amarok -#endif // AMAROK_QSTRINGX_H +#endif // AMAROK_TQSTRINGX_H |