diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h
index 0bda6b20..b24517f9 100644
--- a/amarok/src/Options5.ui.h
+++ b/amarok/src/Options5.ui.h
@@ -56,7 +56,7 @@ void Options5::init()
connect( kcfg_OsdEnabled, TQT_SIGNAL( toggled(bool) ),
m_pOSDPreview, TQT_SLOT( setShown(bool) ) );
- Amarok::TQStringx text = i18n(
+ Amarok::QStringx text = i18n(
"
Tags Displayed in OSD
"
"You can use the following tokens:"
""
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index 6f936e9e..c2a7ab0f 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -90,7 +90,7 @@
#include "inotify/inotify-syscalls.h"
#endif
-using Amarok::TQStringx;
+using Amarok::QStringx;
#define DEBUG 0
@@ -2833,7 +2833,7 @@ CollectionDB::updatePodcastChannel( const PodcastChannelBundle &b )
{
if( getDbConnectionType() == DbConnection::postgresql )
{
- query( TQStringx( "UPDATE podcastchannels SET title='%1', weblink='%2', comment='%3', "
+ query( QStringx( "UPDATE podcastchannels SET title='%1', weblink='%2', comment='%3', "
"copyright='%4', tqparent=%5, directory='%6', autoscan=%7, fetchtype=%8, "
"autotransfer=%9, haspurge=%10, purgecount=%11 WHERE url='%12';" )
.args ( TQStringList()
@@ -2862,7 +2862,7 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b
{
if( getDbConnectionType() == DbConnection::postgresql )
{
- query( TQStringx( "UPDATE podcastepisodes SET url='%1', localurl='%2', tqparent='%3', title='%4', subtitle='%5', composer='%6', comment='%7', "
+ query( QStringx( "UPDATE podcastepisodes SET url='%1', localurl='%2', tqparent='%3', title='%4', subtitle='%5', composer='%6', comment='%7', "
"filetype='%8', createdate='%9', guid='%10', length=%11, size=%12, isNew=%13 WHERE id=%14;" )
.args( TQStringList()
<< escapeString( b.url().url() )
@@ -2891,7 +2891,7 @@ void
CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id, const bool isOpen )
{
if( getDbConnectionType() == DbConnection::postgresql ) {
- query( TQStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" )
+ query( QStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" )
.args( TQStringList()
<< escapeString(name)
<< TQString::number(parent_id)
@@ -2901,7 +2901,7 @@ CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, co
);
}
else {
- query( TQStringx( "REPLACE INTO podcastfolders ( id, name, tqparent, isOpen ) "
+ query( QStringx( "REPLACE INTO podcastfolders ( id, name, tqparent, isOpen ) "
"VALUES ( %1, '%2', %3, %4 );" )
.args( TQStringList()
<< TQString::number(folder_id)
@@ -3090,7 +3090,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
if( !tempTablesAndInPermanent && urls.empty() && uniqueids.empty() )
{
//debug() << "first case" << endl;
- TQString insertline = TQStringx( "INSERT INTO uniqueid%1 (deviceid, url, uniqueid, dir) "
+ TQString insertline = QStringx( "INSERT INTO uniqueid%1 (deviceid, url, uniqueid, dir) "
"VALUES ( %2,'%3', '%4', '%5');" )
.args( TQStringList()
<< ( tempTables ? "_temp" : "" )
@@ -3123,7 +3123,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
{
//debug() << "stat was NOT successful, updating tables with: " << endl;
//debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).tqarg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl;
- query( TQStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" )
+ query( QStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" )
.args( TQStringList()
<< ( tempTables ? "_temp" : "" )
<< currdeviceid
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index ee3b30bc..f44bee6e 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -165,7 +165,7 @@ namespace Amarok
}
-using Amarok::TQStringx;
+using Amarok::QStringx;
using Amarok::escapeHTML;
using Amarok::escapeHTMLAttr;
using Amarok::unescapeHTMLAttr;
@@ -1325,7 +1325,7 @@ void CurrentTrackJob::showHome()
TQString playTime = MetaBundle::fuzzyTime( a[0].toInt() );
m_HTMLSource.append(
- TQStringx(
+ QStringx(
"\n"
"\n"
@@ -1482,7 +1482,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h
if( discNumber != newDiscNumber && newDiscNumber.toInt() > 0)
{
discNumber = newDiscNumber;
- htmlCode.append( TQStringx (
+ htmlCode.append( QStringx (
"