diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 06:08:18 +0000 |
| commit | 1dbf3ff1cbb6d82a451bc319301bf38816c2c232 (patch) | |
| tree | 3b5b9c88a3b91163735d364681b930369e039e69 /amarok/src/database_refactor | |
| parent | 54e817557b3e95bc4b93fd7daa26b808c021515e (diff) | |
| download | amarok-1dbf3ff1cbb6d82a451bc319301bf38816c2c232.tar.gz amarok-1dbf3ff1cbb6d82a451bc319301bf38816c2c232.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'amarok/src/database_refactor')
| -rw-r--r-- | amarok/src/database_refactor/collectiondb.cpp | 6 | ||||
| -rw-r--r-- | amarok/src/database_refactor/dbenginebase.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp index 341783da..82fcbb77 100644 --- a/amarok/src/database_refactor/collectiondb.cpp +++ b/amarok/src/database_refactor/collectiondb.cpp @@ -889,7 +889,7 @@ CollectionDB::getImageForAlbum( const TQString& artist, const TQString& album, u uint maxmatches = 0; for ( uint i = 0; i < values.count(); i++ ) { - matches = values[i].tqcontains( "front", false ) + values[i].tqcontains( "cover", false ) + values[i].tqcontains( "folder", false ); + matches = values[i].contains( "front", false ) + values[i].contains( "cover", false ) + values[i].contains( "folder", false ); if ( matches > maxmatches ) { image = values[i]; @@ -1094,11 +1094,11 @@ CollectionDB::addSong( MetaBundle* bundle, const bool incremental, DbConnection if ( title.isEmpty() ) { title = bundle->url().fileName(); - if ( bundle->url().fileName().tqfind( '-' ) > 0 ) + if ( bundle->url().fileName().find( '-' ) > 0 ) { if ( artist.isEmpty() ) artist = bundle->url().fileName().section( '-', 0, 0 ).stripWhiteSpace(); title = bundle->url().fileName().section( '-', 1 ).stripWhiteSpace(); - title = title.left( title.tqfindRev( '.' ) ).stripWhiteSpace(); + title = title.left( title.findRev( '.' ) ).stripWhiteSpace(); if ( title.isEmpty() ) title = bundle->url().fileName(); } } diff --git a/amarok/src/database_refactor/dbenginebase.h b/amarok/src/database_refactor/dbenginebase.h index 9e459faa..b4600849 100644 --- a/amarok/src/database_refactor/dbenginebase.h +++ b/amarok/src/database_refactor/dbenginebase.h @@ -72,10 +72,10 @@ class QueryBuilder #ifdef USE_MYSQL // We have to escape "\" for mysql, but can't do so for sqlite (m_dbConnType == DbConnection::mysql) - ? string.tqreplace("\\", "\\\\").tqreplace( '\'', "''" ) + ? string.replace("\\", "\\\\").replace( '\'', "''" ) : #endif - string.tqreplace( '\'', "''" ); + string.replace( '\'', "''" ); } void addReturnValue( int table, int value ); |