From cfc8e6815b1ebe8f8c05168cfe98cb31d2e6f86c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:34:55 -0600 Subject: Remove additional unneeded tq method conversions --- amarok/src/Options2.ui | 2 +- amarok/src/Options2.ui.h | 4 +- amarok/src/Options5.ui.h | 2 +- amarok/src/Options8.ui | 2 +- amarok/src/amarokcore/amarok.kcfg | 2 +- amarok/src/amarokcore/crashhandler.cpp | 18 +- amarok/src/analyzers/baranalyzer.h | 2 +- amarok/src/analyzers/blockanalyzer.cpp | 2 +- amarok/src/app.cpp | 10 +- amarok/src/browserbar.cpp | 2 +- amarok/src/clicklineedit.cpp | 8 +- amarok/src/collectionbrowser.cpp | 28 +- amarok/src/collectiondb.cpp | 698 ++++++++++----------- amarok/src/collectiondb.h | 4 +- amarok/src/configdialog.cpp | 10 +- amarok/src/contextbrowser.cpp | 124 ++-- amarok/src/coverfetcher.cpp | 4 +- amarok/src/covermanager.cpp | 22 +- amarok/src/database_refactor/collectiondb.cpp | 236 +++---- amarok/src/database_refactor/dbenginebase.cpp | 6 +- amarok/src/deletedialogbase.ui | 4 +- .../massstorage/massstoragedevicehandler.cpp | 8 +- amarok/src/device/nfs/nfsdevicehandler.cpp | 12 +- amarok/src/device/smb/smbdevicehandler.cpp | 12 +- amarok/src/directorylist.cpp | 6 +- amarok/src/directorylist.h | 2 +- amarok/src/dynamicmode.cpp | 12 +- amarok/src/engine/akode/akode-engine.cpp | 2 +- amarok/src/engine/helix/helix-engine.cpp | 10 +- .../helix-sp/helix-include/common/include/hxmon.h | 16 +- amarok/src/engine/helix/helix-sp/helix-sp.cpp | 2 +- amarok/src/engine/helix/hxplayercontrol.cpp | 214 +++---- amarok/src/engine/helix/hxplayercontrol.h | 4 +- amarok/src/engine/nmm/HostList.cpp | 2 +- amarok/src/engine/xine/xine-engine.cpp | 10 +- amarok/src/engine/xine/xineconfigbase.ui | 4 +- amarok/src/engine/yauap/yauap-engine.cpp | 2 +- amarok/src/enginecontroller.cpp | 12 +- amarok/src/equalizerpresetmanager.cpp | 2 +- amarok/src/equalizersetup.cpp | 2 +- amarok/src/htmlview.cpp | 108 ++-- amarok/src/ktrm.cpp | 4 +- amarok/src/lastfm.cpp | 90 +-- .../magnatunedownloaddialogbase.ui | 2 +- .../magnatunepurchasedialogbase.ui | 4 +- amarok/src/magnatunebrowser/magnatunexmlparser.cpp | 6 +- amarok/src/magnatunebrowser/magnatunexmlparser.h | 4 +- amarok/src/mediabrowser.cpp | 42 +- amarok/src/mediadevice/daap/daapclient.cpp | 6 +- amarok/src/mediadevice/daap/daapreader/reader.cpp | 4 +- amarok/src/mediadevice/daap/daapserver.cpp | 2 +- .../daap/mongrel/lib/rubygems/package.rb | 4 +- amarok/src/mediadevice/daap/proxy.cpp | 2 +- .../src/mediadevice/generic/genericmediadevice.cpp | 22 +- .../generic/genericmediadeviceconfigdialog.ui.h | 6 +- amarok/src/mediadevice/ifp/ifpmediadevice.cpp | 6 +- amarok/src/mediadevice/ipod/ipodmediadevice.cpp | 38 +- amarok/src/mediadevice/mtp/mtpmediadevice.cpp | 6 +- amarok/src/mediadevice/njb/njbmediadevice.cpp | 2 +- amarok/src/mediadevice/njb/playlist.cpp | 2 +- .../mediadevice/riokarma/riokarmamediadevice.cpp | 2 +- amarok/src/mediumpluginmanager.cpp | 22 +- amarok/src/metabundle.cpp | 22 +- amarok/src/metabundle.h | 4 +- amarok/src/metadata/m4a/mp4file.h | 2 +- amarok/src/metadata/trueaudio/ttafile.h | 2 +- amarok/src/metadata/wavpack/wvfile.h | 2 +- amarok/src/moodbar.cpp | 2 +- amarok/src/mountpointmanager.cpp | 22 +- amarok/src/multitabbar.cpp | 22 +- amarok/src/newdynamic.ui | 2 +- amarok/src/organizecollectiondialog.ui.h | 6 +- amarok/src/osd.cpp | 20 +- amarok/src/osd.h | 6 +- amarok/src/playerwindow.cpp | 14 +- amarok/src/playlist.cpp | 28 +- amarok/src/playlistbrowser.cpp | 52 +- amarok/src/playlistbrowseritem.cpp | 76 +-- amarok/src/playlistbrowseritem.h | 8 +- amarok/src/playlistitem.cpp | 4 +- amarok/src/playlistloader.cpp | 4 +- amarok/src/playlistwindow.cpp | 14 +- amarok/src/pluginmanager.cpp | 16 +- amarok/src/podcastsettings.cpp | 4 +- amarok/src/queuemanager.cpp | 8 +- amarok/src/refreshimages.cpp | 6 +- amarok/src/scancontroller.cpp | 2 +- amarok/src/scriptmanager.cpp | 26 +- amarok/src/scrobbler.cpp | 28 +- amarok/src/sliderwidget.cpp | 4 +- amarok/src/smartplaylisteditor.cpp | 4 +- amarok/src/sqlite/sqlite3.c | 58 +- amarok/src/sqlite/sqlite3.h | 4 +- amarok/src/statistics.cpp | 36 +- amarok/src/statistics.h | 2 +- amarok/src/statusbar/popupMessage.cpp | 2 +- amarok/src/statusbar/queueLabel.cpp | 14 +- amarok/src/statusbar/selectLabel.h | 6 +- amarok/src/statusbar/squeezedtextlabel.cpp | 4 +- amarok/src/statusbar/statusbar.cpp | 18 +- amarok/src/statusbar/toggleLabel.h | 2 +- amarok/src/systray.cpp | 6 +- amarok/src/systray.h | 2 +- amarok/src/tagdialog.cpp | 48 +- amarok/src/tagdialogbase.ui | 8 +- amarok/src/threadmanager.h | 2 +- amarok/src/trackpickerdialogbase.ui | 6 +- amarok/src/tracktooltip.cpp | 26 +- amarok/src/transferdialog.cpp | 2 +- amarok/src/xmlloader.cpp | 2 +- 110 files changed, 1283 insertions(+), 1283 deletions(-) diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index 4299ef0f..c29a6cb6 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -172,7 +172,7 @@ Player Window: - + AlignVCenter diff --git a/amarok/src/Options2.ui.h b/amarok/src/Options2.ui.h index 5aedc187..16b4d6a7 100644 --- a/amarok/src/Options2.ui.h +++ b/amarok/src/Options2.ui.h @@ -137,7 +137,7 @@ void Options2::uninstallPushButton_clicked() return; if( KMessageBox::warningContinueCancel( 0, - i18n( "

Are you sure you want to uninstall the theme %1?

" ).tqarg( name ), + i18n( "

Are you sure you want to uninstall the theme %1?

" ).arg( name ), i18n("Uninstall Theme"), i18n("Uninstall") ) == KMessageBox::Cancel ) return; @@ -152,7 +152,7 @@ void Options2::uninstallPushButton_clicked() if( !KIO::NetAccess::del( themeDir, 0 ) ) { KMessageBox::sorry( 0, i18n( "

Could not uninstall this theme.

" "

You may not have sufficient permissions to delete the folder %1

." - ).tqarg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); + ).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); return; } diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h index 0383bd8d..deb86fe6 100644 --- a/amarok/src/Options5.ui.h +++ b/amarok/src/Options5.ui.h @@ -92,7 +92,7 @@ void Options5::init() << "%year " << "%length" << "%track" << "%filename" << "%directory" << "%type" << "%comment" << "%score" << "%playcount" << "%discnumber" << "%rating" << "%moodbar" << "%elapsed" - << "%title {" + i18n( "Score: %1" ).tqarg( "%score" ) +'}' ) ); + << "%title {" + i18n( "Score: %1" ).arg( "%score" ) +'}' ) ); } void diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index 14199194..b4d9c1dc 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -54,7 +54,7 @@ - + AlignVCenter diff --git a/amarok/src/amarokcore/amarok.kcfg b/amarok/src/amarokcore/amarok.kcfg index 94d026e0..4a4d6327 100644 --- a/amarok/src/amarokcore/amarok.kcfg +++ b/amarok/src/amarokcore/amarok.kcfg @@ -443,7 +443,7 @@ - The Y position of the OSD relative to the chosen screen and OSD tqalignment. If Top tqalignment is chosen the Y offset is the space between the upper part of the OSD and the top of the screen. If Bottom tqalignment is chosen the Y offset is the space between the bottom part of the OSD and the bottom of the screen. + The Y position of the OSD relative to the chosen screen and OSD alignment. If Top alignment is chosen the Y offset is the space between the upper part of the OSD and the top of the screen. If Bottom alignment is chosen the Y offset is the space between the bottom part of the OSD and the bottom of the screen. 50 0 10000 diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp index b9f84e1b..6e34a770 100644 --- a/amarok/src/amarokcore/crashhandler.cpp +++ b/amarok/src/amarokcore/crashhandler.cpp @@ -120,12 +120,12 @@ namespace Amarok #endif - body = body.tqarg( AmarokConfig::soundSystem() ) - .tqarg( qVersion() ) - .tqarg( TAGLIB_MAJOR_VERSION ) - .tqarg( TAGLIB_MINOR_VERSION ) - .tqarg( TAGLIB_PATCH_VERSION ) - .tqarg( cpucount ); + body = body.arg( AmarokConfig::soundSystem() ) + .arg( qVersion() ) + .arg( TAGLIB_MAJOR_VERSION ) + .arg( TAGLIB_MINOR_VERSION ) + .arg( TAGLIB_PATCH_VERSION ) + .arg( cpucount ); #ifdef NDEBUG body += "NDEBUG: true"; @@ -190,10 +190,10 @@ namespace Amarok if( totalFrames > 0 ) { const double validity = double(validFrames) / totalFrames; - subject += TQString("[validity: %1]").tqarg( validity, 0, 'f', 2 ); + subject += TQString("[validity: %1]").arg( validity, 0, 'f', 2 ); if( validity <= 0.5 ) useful = false; } - subject += TQString("[frames: %1]").tqarg( totalFrames, 3 /*padding*/ ); + subject += TQString("[frames: %1]").arg( totalFrames, 3 /*padding*/ ); if( bt.find( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 ) subject += "[line numbers]"; @@ -201,7 +201,7 @@ namespace Amarok else useful = false; - subject += TQString("[%1]").tqarg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) ); + subject += TQString("[%1]").arg( AmarokConfig::soundSystem().remove( TQRegExp("-?engine") ) ); std::cout << subject.latin1() << std::endl; diff --git a/amarok/src/analyzers/baranalyzer.h b/amarok/src/analyzers/baranalyzer.h index 4bb4e3f3..6eb470c8 100644 --- a/amarok/src/analyzers/baranalyzer.h +++ b/amarok/src/analyzers/baranalyzer.h @@ -21,7 +21,7 @@ class BarAnalyzer : public Analyzer::Base2D //virtual void transform( Scope& ); /** - * Resizes the widget to a new tqgeometry according to @p e + * Resizes the widget to a new geometry according to @p e * @param e The resize-event */ void resizeEvent( TQResizeEvent * e); diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp index 1ebfdf0f..953a1d15 100644 --- a/amarok/src/analyzers/blockanalyzer.cpp +++ b/amarok/src/analyzers/blockanalyzer.cpp @@ -430,7 +430,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e ) { const uint v = ids[x]; - menu.insertItem( i18n( "%1 fps" ).tqarg( 1000/v ), v ); + menu.insertItem( i18n( "%1 fps" ).arg( 1000/v ), v ); menu.setItemChecked( v, v == timeout() ); } diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index 9a0992ca..e4e6d873 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -675,7 +675,7 @@ void App::applySettings( bool firstTime ) //Set the caption correctly. if ( !EngineController::instance()->bundle().prettyTitle().isEmpty() ) - m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( EngineController::instance()->bundle().veryNiceTitle() ) ); + m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( EngineController::instance()->bundle().veryNiceTitle() ) ); else m_pPlaylistWindow->setCaption( "Amarok" ); @@ -906,7 +906,7 @@ App::applyColorScheme() Background = 0x002090; Foreground = 0x80A0FF; - //all tqchildren() derive their palette from this + //all children() derive their palette from this playlistWindow()->setPalette( TQPalette( group, group, group ) ); browserBar->unsetPalette(); contextBrowser->setPalette( TQPalette( group, group, group ) ); @@ -1084,7 +1084,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState ) if ( oldState == Engine::Paused ) Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) ); if ( !bundle.prettyTitle().isEmpty() ) - m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) ); + m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) ); break; case Engine::Paused: @@ -1106,7 +1106,7 @@ void App::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) { Amarok::OSD::instance()->show( bundle ); if ( !bundle.prettyTitle().isEmpty() ) - m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) ); + m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) ); TrackToolTip::instance()->setTrack( bundle ); } @@ -1313,7 +1313,7 @@ namespace Amarok { //URL can be in whatever forms KURL::fromPathOrURL understands - ie most. const TQString cmd = "%1 \"%2\""; - return KRun::runCommand( cmd.tqarg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0; + return KRun::runCommand( cmd.arg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0; } namespace ColorScheme diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp index 2444cb4a..6018d087 100644 --- a/amarok/src/browserbar.cpp +++ b/amarok/src/browserbar.cpp @@ -170,7 +170,7 @@ BrowserBar::polish() void BrowserBar::adjustWidgetSizes() { - //TODO set the tqgeometry of the PlaylistWindow before + //TODO set the geometry of the PlaylistWindow before // the browsers are loaded so this isn't called twice const uint w = width(); diff --git a/amarok/src/clicklineedit.cpp b/amarok/src/clicklineedit.cpp index 934b7fb9..6e74e6db 100644 --- a/amarok/src/clicklineedit.cpp +++ b/amarok/src/clicklineedit.cpp @@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char* void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - tqrepaint(); + repaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText( txt ); } @@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) { if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent( ev ); } @@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) { if ( text().isEmpty() ) { mDrawClickMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 5dab5ff7..02f49d55 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -785,7 +785,7 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT ensureItemVisible( lastChild() ); //Create a reverse list of parents, grandparents etc. - //Later we try to make the grandparents in view, then their tqchildren etc. + //Later we try to make the grandparents in view, then their children etc. //This means that the selected item has the most priority as it is done last. TQValueStack parents; while ( r ) @@ -1175,7 +1175,7 @@ CollectionView::slotCollapse( TQListViewItem* item ) //SLOT TQListViewItem* child = item->firstChild(); TQListViewItem* childTmp; - //delete all tqchildren + //delete all children while ( child ) { childTmp = child; @@ -1471,7 +1471,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) // if( (cat == IdAlbum || cat == IdVisYearAlbum) && siblingSelection.count() == 1 ) // cover fetch isn't multiselection capable { - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).tqarg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).arg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH ); #ifndef AMAZON_SUPPORT menu.setItemEnabled( FETCH, false ); #endif @@ -1698,7 +1698,7 @@ CollectionView::fetchCover() //SLOT "SELECT DISTINCT artist.name FROM artist, album, tags " "WHERE artist.id = tags.artist AND tags.album = album.id " "AND album.name = '%1';" ) - .tqarg( CollectionDB::instance()->escapeString( album ) ) ); + .arg( CollectionDB::instance()->escapeString( album ) ) ); if ( !values.isEmpty() ) CollectionDB::instance()->fetchCover( this, values[0], album, false, static_cast(item) ); @@ -2220,7 +2220,7 @@ KURL::List CollectionView::listSelected() { //Here we determine the URLs of all selected items. We use two passes, one for the parent items, - //and another one for the tqchildren. + //and another one for the children. KURL::List list; TQListViewItem* item; @@ -2266,7 +2266,7 @@ CollectionView::listSelected() // The iPod selection code is written to resemble the tree mode // selection logic, as well as what happens on an actual iPod. If // we're in track mode, just return the list of tracks selected. - // Otherwise select all tqchildren of all currently selected items, + // Otherwise select all children of all currently selected items, // sorting first by m_cat1, then m_cat2, then m_cat3. Sort by // track first if one of the categories is Id(VisYear)Album. // There is a difficulty with compilation albums -- if we're @@ -2693,7 +2693,7 @@ CollectionView::playlistFromURLs( const KURL::List &urls ) KURL rpath; MountPointManager::instance()->getRelativePath( deviceid, *it, rpath ); const TQString query = TQString("SELECT title, length FROM tags WHERE url = '%1' AND deviceid = %2;") - .tqarg( db->escapeString( rpath.path() ) ).tqarg( deviceid ); + .arg( db->escapeString( rpath.path() ) ).arg( deviceid ); debug() << "media id: " << deviceid << " rpath: " << rpath.path() << endl; TQStringList result = db->query( query ); titles << result[0]; @@ -3483,7 +3483,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) if( reverse ) { TQString begin = str.left( 3 ); - str = TQString(str.append( ", %1" )).tqarg( begin ); + str = TQString(str.append( ", %1" )).arg( begin ); str = str.mid( 4 ); return; } @@ -3492,7 +3492,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse ) return; TQString end = str.right( 3 ); - str = TQString(str.prepend( "%1 " )).tqarg( end ); + str = TQString(str.prepend( "%1 " )).arg( end ); uint newLen = str.length() - end.length() - 2; @@ -4061,7 +4061,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) continue; couldOpen.push_back( top ); } - //Expand suggested items and expand or enqueue their tqchildren until we run out of + //Expand suggested items and expand or enqueue their children until we run out of //rows or have expanded everything for ( TQValueList::iterator it = couldOpen.begin(); it != couldOpen.end() && totalCount < maxRows; ++it ) { @@ -4080,7 +4080,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ ) } else { - //Prioritize expanding its tqchildren - add it immediately next + //Prioritize expanding its children - add it immediately next TQValueList::iterator next = it; ++next; couldOpen.insert( next, j ); @@ -4131,9 +4131,9 @@ CollectionView::removeDuplicatedHeaders() { if ( empty ) { - if ( !current->text(0).tqat(0).isLetterOrNumber() - || ( last->text(0).tqat(0).isLetterOrNumber() - && current->text(0).tqat(0).tqunicode() > last->text(0).tqat(0).tqunicode() ) ) + if ( !current->text(0).at(0).isLetterOrNumber() + || ( last->text(0).at(0).isLetterOrNumber() + && current->text(0).at(0).tqunicode() > last->text(0).at(0).tqunicode() ) ) toDelete += current; else { diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index e4464a8a..6799ee9d 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -145,7 +145,7 @@ INotify::doJob() deviceIds += TQString::number(*it); } const TQStringList values = m_parent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" ) - .tqarg( deviceIds ) ); + .arg( deviceIds ) ); foreach( values ) { TQString rpath = *it; @@ -509,7 +509,7 @@ TQString CollectionDB::adminValue( TQString noption ) { TQStringList values; values = query ( - TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg(noption) + TQString( "SELECT value FROM admin WHERE noption = '%1';").arg(noption) ); return values.isEmpty() ? "" : values.first(); } @@ -518,14 +518,14 @@ CollectionDB::adminValue( TQString noption ) { void CollectionDB::setAdminValue( TQString noption, TQString value ) { - TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg( noption )); + TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").arg( noption )); if(values.count() > 0) { - query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).tqarg( value, noption ) ); + query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).arg( value, noption ) ); } else { - insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).tqarg( value, noption ), + insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).arg( value, noption ), NULL ); } } @@ -560,8 +560,8 @@ CollectionDB::createTables( const bool temporary ) "sampler BOOL," "bpm FLOAT," "deviceid INTEGER);" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); TQString albumAutoIncrement = ""; TQString artistAutoIncrement = ""; @@ -598,41 +598,41 @@ CollectionDB::createTables( const bool temporary ) query( TQString( "CREATE %1 TABLE album%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( albumAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( albumAutoIncrement ) ); //create artist table query( TQString( "CREATE %1 TABLE artist%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( artistAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( artistAutoIncrement ) ); //create composer table query( TQString( "CREATE %1 TABLE composer%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( composerAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( composerAutoIncrement ) ); //create genre table query( TQString( "CREATE %1 TABLE genre%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() +");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( genreAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( genreAutoIncrement ) ); //create year table query( TQString( "CREATE %1 TABLE year%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( yearAutoIncrement ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) + .arg( yearAutoIncrement ) ); //create images table query( TQString( "CREATE %1 TABLE images%2 (" @@ -640,8 +640,8 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "artist " + textColumnType() + "," "album " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); //create embed table query( TQString( "CREATE %1 TABLE embed%2 (" @@ -649,16 +649,16 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "hash " + exactTextColumnType() + "," "description " + textColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" "dir " + exactTextColumnType() + "," "deviceid INTEGER," "changedate INTEGER);" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); //create uniqueid table query( TQString( "CREATE %1 TABLE uniqueid%2 (" @@ -666,20 +666,20 @@ CollectionDB::createTables( const bool temporary ) "deviceid INTEGER," "uniqueid " + exactTextColumnType(32) + " UNITQUE," "dir " + exactTextColumnType() + ");" ) - .tqarg( temporary ? "TEMPORARY" : "" ) - .tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "TEMPORARY" : "" ) + .arg( temporary ? "_temp" : "" ) ); //create indexes query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX composer_idx%1 ON composer%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" ) - .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) ); + .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) ); if ( !temporary ) { @@ -791,16 +791,16 @@ CollectionDB::createPermanentIndices() void CollectionDB::dropTables( const bool temporary ) { - query( TQString( "DROP TABLE tags%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE album%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE artist%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE composer%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE genre%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE year%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE images%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE embed%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE directories%1;" ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "DROP TABLE uniqueid%1;" ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE tags%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE album%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE artist%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE composer%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE genre%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE year%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE images%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE embed%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE directories%1;" ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "DROP TABLE uniqueid%1;" ).arg( temporary ? "_temp" : "" ) ); if ( !temporary ) { query( TQString( "DROP TABLE related_artists;" ) ); @@ -830,21 +830,21 @@ CollectionDB::clearTables( const bool temporary ) clearCommand = "TRUNCATE TABLE"; } - query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 composer%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 embed%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); - query( TQString( "%1 uniqueid%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 composer%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 embed%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); + query( TQString( "%1 uniqueid%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) ); if ( !temporary ) { - query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) ); + query( TQString( "%1 related_artists;" ).arg( clearCommand ) ); //debug() << "Clearing media table" << endl; - //query( TQString( "%1 media;" ).tqarg( clearCommand ) ); + //query( TQString( "%1 media;" ).arg( clearCommand ) ); } } @@ -866,7 +866,7 @@ CollectionDB::copyTempTables( ) albumIds += ','; albumIds += *it; } - insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).tqarg( albumIds ), NULL ); + insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).arg( albumIds ), NULL ); TQStringList artistIdList = query( "SELECT artist.id FROM artist;" ); TQString artistIds = "-1"; @@ -875,7 +875,7 @@ CollectionDB::copyTempTables( ) artistIds += ','; artistIds += *it; } - insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).tqarg( artistIds ), NULL ); + insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).arg( artistIds ), NULL ); TQStringList composerIdList = query( "SELECT composer.id FROM composer;" ); TQString composerIds = "-1"; @@ -884,7 +884,7 @@ CollectionDB::copyTempTables( ) composerIds += ','; composerIds += *it; } - insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).tqarg( composerIds ), NULL ); + insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).arg( composerIds ), NULL ); TQStringList genreIdList = query( "SELECT genre.id FROM genre;" ); TQString genreIds = "-1"; @@ -893,7 +893,7 @@ CollectionDB::copyTempTables( ) genreIds += ','; genreIds += *it; } - insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).tqarg( genreIds ), NULL ); + insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).arg( genreIds ), NULL ); TQStringList yearIdList = query( "SELECT year.id FROM year;" ); TQString yearIds = "-1"; @@ -902,7 +902,7 @@ CollectionDB::copyTempTables( ) yearIds += ','; yearIds += *it; } - insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).tqarg( yearIds ), NULL ); + insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).arg( yearIds ), NULL ); insert( "INSERT INTO images SELECT * FROM images_temp;", NULL ); insert( "INSERT INTO embed SELECT * FROM embed_temp;", NULL ); @@ -943,7 +943,7 @@ CollectionDB::createDevicesTable() "uuid " + textColumnType() + "," "servername " + textColumnType() + "," "sharename " + textColumnType() + ");" ) - .tqarg( deviceAutoIncrement ) ); + .arg( deviceAutoIncrement ) ); query( "CREATE INDEX devices_type ON devices( type );" ); query( "CREATE INDEX devices_uuid ON devices( uuid );" ); query( "CREATE INDEX devices_rshare ON devices( servername, sharename );" ); @@ -1005,8 +1005,8 @@ CollectionDB::createStatsTableV10( bool temp ) "uniqueid " + exactTextColumnType(32) + " UNITQUE," "deleted BOOL DEFAULT " + boolF() + "," "PRIMARY KEY(url, deviceid) );" - ).tqarg( temp ? "TEMPORARY" : "" ) - .tqarg( temp ? "_fix_ten" : "" ) ); + ).arg( temp ? "TEMPORARY" : "" ) + .arg( temp ? "_fix_ten" : "" ) ); if ( !temp ) { @@ -1120,18 +1120,18 @@ CollectionDB::createPersistentTablesV14( bool temp ) "asin " + textColumnType(20) + ", " "locale " + textColumnType(2) + ", " "filename " + exactTextColumnType(33) + ", " - "refetchdate INTEGER );" ).tqarg( a,b ) ); + "refetchdate INTEGER );" ).arg( a,b ) ); // create lyrics table query( TQString( "CREATE %1 TABLE lyrics%2 (" "url " + exactTextColumnType() + ", " "deviceid INTEGER," - "lyrics " + longTextColumnType() + ");" ).tqarg( a,b ) ); + "lyrics " + longTextColumnType() + ");" ).arg( a,b ) ); query( TQString( "CREATE %1 TABLE playlists%2 (" "playlist " + textColumnType() + ", " "url " + exactTextColumnType() + ", " - "tracknum INTEGER );" ).tqarg( a,b ) ); + "tracknum INTEGER );" ).arg( a,b ) ); if ( !temp ) { @@ -1190,14 +1190,14 @@ CollectionDB::createPodcastTables() "length INTEGER," "size INTEGER," "isNew BOOL );" ) - .tqarg( podcastAutoIncrement ) ); + .arg( podcastAutoIncrement ) ); // create podcast folders table query( TQString( "CREATE TABLE podcastfolders (" "id INTEGER PRIMARY KEY %1, " "name " + textColumnType() + "," "parent INTEGER, isOpen BOOL );" ) - .tqarg( podcastFolderAutoInc ) ); + .arg( podcastFolderAutoInc ) ); query( "CREATE INDEX url_podchannel ON podcastchannels( url );" ); query( "CREATE INDEX url_podepisode ON podcastepisodes( url );" ); @@ -1239,7 +1239,7 @@ CollectionDB::createPodcastTablesV2( bool temp ) "parent INTEGER," "directory " + textColumnType() + "," "autoscan BOOL, fetchtype INTEGER, " - "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).tqarg( a,b ) ); + "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).arg( a,b ) ); // create podcast episodes table query( TQString( "CREATE %2 TABLE podcastepisodes%3 (" @@ -1257,14 +1257,14 @@ CollectionDB::createPodcastTablesV2( bool temp ) "length INTEGER," "size INTEGER," "isNew BOOL );" ) - .tqarg( podcastAutoIncrement, a, b ) ); + .arg( podcastAutoIncrement, a, b ) ); // create podcast folders table query( TQString( "CREATE %2 TABLE podcastfolders%3 (" "id INTEGER PRIMARY KEY %1, " "name " + textColumnType() + "," "parent INTEGER, isOpen BOOL );" ) - .tqarg( podcastFolderAutoInc, a, b ) ); + .arg( podcastFolderAutoInc, a, b ) ); if ( !temp ) { @@ -1475,16 +1475,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const TQStringList values = query( TQString( "SELECT id, name FROM %1 WHERE name %2;" ) - .tqarg( name ) - .tqarg( CollectionDB::likeCondition( value ) ) ); + .arg( name ) + .arg( CollectionDB::likeCondition( value ) ) ); //check if item exists. if not, should we autocreate it? uint id; if ( values.isEmpty() && autocreate ) { id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .tqarg( name ) - .tqarg( CollectionDB::instance()->escapeString( value ) ), name ); + .arg( name ) + .arg( CollectionDB::instance()->escapeString( value ) ), name ); return id; } @@ -1499,8 +1499,8 @@ CollectionDB::valueFromID( TQString table, uint id ) TQStringList values = query( TQString( "SELECT name FROM %1 WHERE id=%2;" ) - .tqarg( table ) - .tqarg( id ) ); + .arg( table ) + .arg( id ) ); return values.isEmpty() ? 0 : values.first(); @@ -1513,8 +1513,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i TQStringList values = query( TQString( "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) - .tqarg( album_id ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( artist_id ) ); return values.first(); } @@ -1524,8 +1524,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id ) TQStringList values = query( TQString( "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) - .tqarg( CollectionDB::instance()->boolT() ) - .tqarg( album_id ) ); + .arg( CollectionDB::instance()->boolT() ) + .arg( album_id ) ); return (values.count() != 0); } @@ -1562,9 +1562,9 @@ CollectionDB::albumDiscTracks( const TQString &artist_id, const TQString &album_ rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, year WHERE tags.album = %1 AND " "tags.artist = %2 AND year.id = tags.year AND tags.discnumber = %3 " + deviceidSelection() + " ORDER BY tags.track;" ) - .tqarg( album_id ) - .tqarg( artist_id ) - .tqarg( discNumber ) ); + .arg( album_id ) + .arg( artist_id ) + .arg( discNumber ) ); TQStringList result; foreach( rs ) { @@ -1580,7 +1580,7 @@ CollectionDB::artistTracks( const TQString &artist_id ) TQStringList rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, album " "WHERE tags.artist = '%1' AND album.id = tags.album " + deviceidSelection() + "ORDER BY album.name, tags.discnumber, tags.track;" ) - .tqarg( artist_id ) ); + .arg( artist_id ) ); TQStringList result = TQStringList(); foreach( rs ) { @@ -1602,11 +1602,11 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPairgetIdForUrl( path ); TQString rpath = MountPointManager::instance()->getRelativePath(deviceid, path ); insert( TQString( "INSERT INTO embed_temp ( url, deviceid, hash, description ) VALUES ( '%2', %1, '%3', '%4' );" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL ); + .arg( deviceid ) + .arg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL ); } void @@ -1636,7 +1636,7 @@ CollectionDB::removeOrphanedEmbeddedImages() TQString deviceid = *it; TQString rpath = *(++it); query( TQString( "DELETE FROM embed WHERE embed.deviceid = %1 AND embed.url = '%2';" ) - .tqarg( deviceid, escapeString( rpath ) ) ); + .arg( deviceid, escapeString( rpath ) ) ); } } @@ -1752,11 +1752,11 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide ) { if( correctAlbumCount ) { text = i18n( "X songs from X albums", "%2 from %1" ); - text = text.tqarg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) ); + text = text.arg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) ); } else text = "%1"; - text = text.tqarg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) ); + text = text.arg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) ); } else if( playlists > 0 ) text = i18n( "One playlist", "%n playlists", playlists ); @@ -2082,7 +2082,7 @@ CollectionDB::makeShadowedImage( const TQString& albumImage, bool cache ) TQImage shadow; const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); - const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( original.width() + shadowSize ).tqarg( original.height() + shadowSize ); + const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( original.width() + shadowSize ).arg( original.height() + shadowSize ); if ( TQFile::exists( folder + file ) ) { tqApp->lock(); shadow.load( folder + file, "PNG" ); @@ -2168,17 +2168,17 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album, "AND tags.sampler = %1 " "AND images.album %2 " "AND images.deviceid IN (%3) " ) - .tqarg( boolT() ) - .tqarg( CollectionDB::likeCondition( album ) ) - .tqarg( deviceIds ) ); + .arg( boolT() ) + .arg( CollectionDB::likeCondition( album ) ) + .arg( deviceIds ) ); } else { rs = query( TQString( "SELECT distinct images.deviceid,images.path FROM images WHERE artist %1 AND album %2 AND deviceid IN (%3) ORDER BY path;" ) - .tqarg( CollectionDB::likeCondition( artist ) ) - .tqarg( CollectionDB::likeCondition( album ) ) - .tqarg( deviceIds ) ); + .arg( CollectionDB::likeCondition( artist ) ) + .arg( CollectionDB::likeCondition( album ) ) + .arg( deviceIds ) ); } TQStringList values = URLsFromQuery( rs ); if ( !values.isEmpty() ) @@ -2234,8 +2234,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, "album.name = '%1' " "AND tags.sampler = %2 " "ORDER BY modifydate DESC LIMIT 1;" ) - .tqarg( escapeString( album ) ) - .tqarg( boolT() ) ); + .arg( escapeString( album ) ) + .arg( boolT() ) ); } else { rs = query( TQString( "SELECT embed.hash, embed.deviceid, embed.url FROM " @@ -2246,8 +2246,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album, "artist.name = '%1' " "AND album.name = '%2' " "ORDER BY modifydate DESC LIMIT 1;" ) - .tqarg( escapeString( artist ) ) - .tqarg( escapeString( album ) ) ); + .arg( escapeString( artist ) ) + .arg( escapeString( album ) ) ); } TQStringList values = TQStringList(); @@ -2282,7 +2282,7 @@ CollectionDB::findMetaBundleImage( const MetaBundle& trackInformation, uint widt query( TQString( "SELECT embed.hash FROM tags LEFT JOIN embed ON tags.url = embed.url " " AND tags.deviceid = embed.deviceid WHERE tags.url = '%2' AND tags.deviceid = %1 ORDER BY hash DESC LIMIT 1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); if ( values.empty() || !values.first().isEmpty() ) { TQCString hash; @@ -2638,7 +2638,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int //This is a bit of a hack. We have just inserted an item, so it is going to be the one with the //highest id. Change this if threaded insertions are used in the future. TQStringList values = query( TQString("SELECT id FROM podcastepisodes WHERE url='%1' ORDER BY id DESC;") - .tqarg( escapeString( episode.url().url() ) ) ); + .arg( escapeString( episode.url().url() ) ) ); if( values.isEmpty() ) return -1; return values[0].toInt(); @@ -2679,12 +2679,12 @@ CollectionDB::getPodcastChannels() TQValueList CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit ) { - TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).tqarg( parent.url() ); + TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).arg( parent.url() ); if( onlyNew ) - command += TQString( " AND isNew='%1'" ).tqarg( boolT() ); + command += TQString( " AND isNew='%1'" ).arg( boolT() ); command += " ) ORDER BY id"; if( limit != -1 ) - command += TQString( " DESC LIMIT %1 OFFSET 0" ).tqarg( limit ); + command += TQString( " DESC LIMIT %1 OFFSET 0" ).arg( limit ); command += ';'; TQStringList values = query( command ); @@ -2722,7 +2722,7 @@ CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit ) PodcastEpisodeBundle CollectionDB::getPodcastEpisodeById( int id ) { - TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").tqarg( id ); + TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").arg( id ); TQStringList values = query( command ); PodcastEpisodeBundle peb; @@ -2759,7 +2759,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe { TQStringList values = query( TQString( "SELECT id FROM podcastepisodes WHERE localurl = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); + .arg( escapeString( url.url() ) ) ); if( !values.isEmpty() ) id = values[0].toInt(); } @@ -2767,7 +2767,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe { TQStringList values = query( TQString( "SELECT id FROM podcastepisodes WHERE url = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); + .arg( escapeString( url.url() ) ) ); if( !values.isEmpty() ) id = values[0].toInt(); } @@ -2787,7 +2787,7 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc TQStringList values = query( TQString( "SELECT url, title, weblink, image, comment, copyright, parent, directory " ", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels WHERE url = '%1';" - ).tqarg( escapeString( url.url() ) ) ); + ).arg( escapeString( url.url() ) ) ); foreach( values ) { @@ -2822,7 +2822,7 @@ CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const insert( command, NULL ); command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND parent = '%2';" ) - .tqarg( name, TQString::number(parent_id) ); + .arg( name, TQString::number(parent_id) ); TQStringList values = query( command ); return values[0].toInt(); @@ -2918,10 +2918,10 @@ CollectionDB::removePodcastChannel( const KURL &url ) { //remove channel query( TQString( "DELETE FROM podcastchannels WHERE url = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); - //remove all tqchildren + .arg( escapeString( url.url() ) ) ); + //remove all children query( TQString( "DELETE FROM podcastepisodes WHERE parent = '%1';" ) - .tqarg( escapeString( url.url() ) ) ); + .arg( escapeString( url.url() ) ) ); } @@ -2931,7 +2931,7 @@ CollectionDB::removePodcastEpisode( const int id ) { if( id < 0 ) return; query( TQString( "DELETE FROM podcastepisodes WHERE id = '%1';" ) - .tqarg( TQString::number(id) ) ); + .arg( TQString::number(id) ) ); } void @@ -2939,7 +2939,7 @@ CollectionDB::removePodcastFolder( const int id ) { if( id < 0 ) return; query( TQString("DELETE FROM podcastfolders WHERE id=%1;") - .tqarg( TQString::number(id) ) ); + .arg( TQString::number(id) ) ); } bool @@ -3047,7 +3047,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) "SELECT url, uniqueid " "FROM uniqueid%1 " "WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( tempTables ? "_temp" : "" + .arg( tempTables ? "_temp" : "" , currdeviceid , currurl ) ); @@ -3055,20 +3055,20 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) "SELECT url, uniqueid, deviceid " "FROM uniqueid%1 " "WHERE uniqueid = '%2';" ) - .tqarg( tempTables ? "_temp" : "" + .arg( tempTables ? "_temp" : "" , currid ) ); TQStringList nonTempIDs = query( TQString( "SELECT url, uniqueid, deviceid " "FROM uniqueid " "WHERE uniqueid = '%1';" ) - .tqarg( currid ) ); + .arg( currid ) ); TQStringList nonTempURLs = query( TQString( "SELECT url, uniqueid " "FROM uniqueid " "WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl ) ); bool tempTablesAndInPermanent = false; @@ -3122,7 +3122,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) else //it's a move, not a copy, or a copy and then both files were moved...can't detect that { //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; + //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).arg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl; query( QStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" ) .args( TQStringList() << ( tempTables ? "_temp" : "" ) @@ -3142,7 +3142,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "file exists in same place as before, new uniqueid" << endl; query( TQString( "UPDATE uniqueid%1 SET uniqueid='%2' WHERE deviceid = %3 AND url='%4';" ) - .tqarg( tempTables ? "_temp" : "" + .arg( tempTables ? "_temp" : "" , currid , currdeviceid , currurl ) ); @@ -3161,9 +3161,9 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { TQString insertline = TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) " "VALUES ( %1, '%2'" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl ); - insertline += TQString( ", '%1', '%2');" ).tqarg( currid ).tqarg( currdir ); + insertline += TQString( ", '%1', '%2');" ).arg( currid ).arg( currdir ); //debug() << "running command: " << insertline << endl; insert( insertline, NULL ); //debug() << "aftCheckPermanentTables #2" << endl; @@ -3187,10 +3187,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "stat part 2 was NOT successful, updating tables with: " << endl; query( TQString( "DELETE FROM uniqueid WHERE uniqueid='%1';" ) - .tqarg( currid ) ); + .arg( currid ) ); query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) " "VALUES ( %1, '%2', '%3', '%4')" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl , currid , currdir ) ); @@ -3202,10 +3202,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables ) { //debug() << "file exists in same place as before, part 2, new uniqueid" << endl; query( TQString( "DELETE FROM uniqueid WHERE deviceid = %1 AND url='%2';" ) - .tqarg( currdeviceid ) - .tqarg( currurl ) ); + .arg( currdeviceid ) + .arg( currurl ) ); query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) VALUES ( %1, '%2', '%3', '%4')" ) - .tqarg( currdeviceid + .arg( currdeviceid , currurl , currid , currdir ) ); @@ -3242,15 +3242,15 @@ CollectionDB::urlFromUniqueId( const TQString &id ) "SELECT deviceid, url " "FROM uniqueid%1 " "WHERE uniqueid = '%2';" ) - .tqarg( scanning ? "_temp" : TQString() ) - .tqarg( id ), true ); + .arg( scanning ? "_temp" : TQString() ) + .arg( id ), true ); if( urls.empty() && scanning ) urls = query( TQString( "SELECT deviceid, url " "FROM uniqueid " "WHERE uniqueid = '%1';" ) - .tqarg( id ) ); + .arg( id ) ); if( urls.empty() ) return TQString(); @@ -3270,17 +3270,17 @@ CollectionDB::uniqueIdFromUrl( const KURL &url ) "SELECT uniqueid " "FROM uniqueid%1 " "WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( scanning ? "_temp" : TQString() ) - .tqarg( currdeviceid ) - .tqarg( currurl ), true ); + .arg( scanning ? "_temp" : TQString() ) + .arg( currdeviceid ) + .arg( currurl ), true ); if( uid.empty() && scanning ) uid = query( TQString( "SELECT uniqueid " "FROM uniqueid " "WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( currdeviceid ) - .tqarg( currurl ) ); + .arg( currdeviceid ) + .arg( currurl ) ); if( uid.empty() ) return TQString(); @@ -3303,10 +3303,10 @@ CollectionDB::getURL( const MetaBundle &bundle ) "FROM tags " "WHERE tags.album = '%1' AND tags.artist = '%2' AND tags.track = '%3' AND tags.title = '%4'" + deviceidSelection() + ';' ) - .tqarg( albID ) - .tqarg( artID ) - .tqarg( bundle.track() ) - .tqarg( escapeString( bundle.title() ) ); + .arg( albID ) + .arg( artID ) + .arg( bundle.track() ) + .arg( escapeString( bundle.title() ) ); TQStringList urls = URLsFromQuery( query( q ) ); @@ -3443,8 +3443,8 @@ CollectionDB::bundleForUrl( MetaBundle* bundle ) "album, artist, composer, genre, year " "WHERE album.id = tags.album AND artist.id = tags.artist AND composer.id = tags.composer AND " "genre.id = tags.genre AND year.id = tags.year AND tags.url = '%2' AND tags.deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath.path( ) ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath.path( ) ) ) ); bool valid = false; @@ -3577,7 +3577,7 @@ CollectionDB::bundlesByUrls( const KURL::List& urls ) b.setUrl( url ); // FIXME: more context for i18n after string freeze b.setTitle( TQString( "%1 %2 %3%4" ) - .tqarg( url.filename(), + .arg( url.filename(), i18n( "from" ), url.hasHost() ? url.host() : TQString(), url.directory( false ) ) ); @@ -3633,11 +3633,11 @@ CollectionDB::addAudioproperties( const MetaBundle& bundle ) KURL rpath; MountPointManager::instance()->getRelativePath( deviceid, bundle.url(), rpath ); query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%5' AND deviceid = %4;" ) - .tqarg( bundle.bitrate() ) - .tqarg( bundle.length() ) - .tqarg( bundle.sampleRate() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath.path() ) ) ); + .arg( bundle.bitrate() ) + .arg( bundle.length() ) + .arg( bundle.sampleRate() ) + .arg( deviceid ) + .arg( escapeString( rpath.path() ) ) ); } @@ -3655,7 +3655,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, query( TQString( "SELECT playcounter, createdate, percentage, rating FROM statistics " "WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( statDevId ).tqarg( escapeString( statRPath ) ) ); + .arg( statDevId ).arg( escapeString( statRPath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if ( values.isEmpty() ) @@ -3664,7 +3664,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, values = query( TQString( "SELECT playcounter, createdate, percentage, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ) ); + .arg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { statRPath = rpath2; @@ -3683,21 +3683,21 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, // increment playcounter and update accesstime query( TQString( "UPDATE statistics SET playcounter=%1, accessdate=%2 WHERE url='%4' AND deviceid= %3;" ) - .tqarg( values[0] + " + 1" ) - .tqarg( atime ) - .tqarg( statDevId ) - .tqarg( escapeString( statRPath ) ) ); + .arg( values[0] + " + 1" ) + .arg( atime ) + .arg( statDevId ) + .arg( escapeString( statRPath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) " "VALUES ( '%6', %5, %1, %2, 0, 1, 0, %3, %4 );" ) - .tqarg( atime ) - .tqarg( atime ) - .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .tqarg( boolF() ) - .tqarg( statDevId ) - .tqarg( escapeString( statRPath ) ), 0 ); + .arg( atime ) + .arg( atime ) + .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .arg( boolF() ) + .arg( statDevId ) + .arg( escapeString( statRPath ) ), 0 ); } double prevscore = 50; @@ -3711,7 +3711,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage, prevscore = values[ 2 ].toDouble(); } const TQStringList v = query( TQString( "SELECT length FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); const int length = v.isEmpty() ? 0 : v.first().toInt(); ScriptManager::instance()->requestNewScore( url, prevscore, playcount, length, percentage, reason ); @@ -3756,7 +3756,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if ( values.isEmpty() ) @@ -3765,7 +3765,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) values = query( TQString( "SELECT playcounter, createdate, accessdate, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ) ); + .arg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { rpath = rpath2; @@ -3780,20 +3780,20 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage) if ( !values.isEmpty() ) { query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%3' AND deviceid = %2;" ) - .tqarg( percentage ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( percentage ) + .arg( deviceid ).arg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) " "VALUES ( '%7', %6, %2, %3, %1, 0, 0, %3, %4 );" ) - .tqarg( percentage ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( 0 ) - .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .tqarg( boolF() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ),0 ); + .arg( percentage ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( 0 ) + .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .arg( boolF() ) + .arg( deviceid ) + .arg( escapeString( rpath ) ),0 ); } emit scoreChanged( url, percentage ); @@ -3807,8 +3807,8 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); //handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1 if( values.isEmpty() ) @@ -3817,7 +3817,7 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) values = query( TQString( "SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics " "WHERE url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ) ); + .arg( escapeString( rpath2 ) ) ); if ( !values.isEmpty() ) { rpath = rpath2; @@ -3847,21 +3847,21 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf ) if ( !values.isEmpty() ) { query( TQString( "UPDATE statistics SET rating=%1 WHERE url='%3' AND deviceid = %2;" ) - .tqarg( rating ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( rating ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, rating, playcounter, uniqueid, deleted ) " "VALUES ( '%7', %6, %2, %3, 0, %1, 0, %4, %5 );" ) - .tqarg( rating ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( 0 ) - .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) - .tqarg( boolF() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ), NULL ); + .arg( rating ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( 0 ) + .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) ) + .arg( boolF() ) + .arg( deviceid ) + .arg( escapeString( rpath ) ), NULL ); } emit ratingChanged( url, rating ); @@ -3923,43 +3923,43 @@ CollectionDB::migrateFile( const TQString &oldURL, const TQString &newURL ) // Ensure destination is clear. query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid ).arg( escapeString( newRpath ) ) ); query( TQString( "DELETE FROM statistics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid ).arg( escapeString( newRpath ) ) ); query( TQString( "DELETE FROM tags_labels WHERE url = '%2' and deviceid = %1;" ) - .tqarg( newMediaid).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid).arg( escapeString( newRpath ) ) ); if ( !getLyrics( oldURL ).isEmpty() ) query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) ); + .arg( newMediaid ).arg( escapeString( newRpath ) ) ); // Migrate //code looks ugly but prevents problems when the URL contains HTTP escaped characters query( TQString( "UPDATE tags SET url = '%3', deviceid = %1" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + .arg( newMediaid ).arg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); + .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE statistics SET url = '%2', deviceid = %1" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + .arg( newMediaid ).arg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); + .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE lyrics SET url = '%2', deviceid = %1" ) - .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) + .arg( newMediaid ).arg( escapeString( newRpath ) ) + TQString( " WHERE deviceid=%1 AND url = '%2';" ) - .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) ); + .arg( oldMediaid ).arg( escapeString( oldRpath ) ) ); query( TQString( "UPDATE tags_labels SET url = '%2', deviceid = %1 WHERE deviceid = %3 AND url = '%4';" ) - .tqarg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) ); + .arg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) ); query( TQString( "UPDATE uniqueid SET url = '%1', deviceid = %2 WHERE url = '%3' AND deviceid = %4;" ) - .tqarg( escapeString( newRpath ), TQString::number( newMediaid ), + .arg( escapeString( newRpath ), TQString::number( newMediaid ), escapeString( oldRpath ), TQString::number( oldMediaid ) ) ); query( TQString( "UPDATE playlists SET url = '%1' WHERE url = '%2';" ) - .tqarg( escapeString( newURL ), + .arg( escapeString( newURL ), escapeString( oldURL ) ) ); } @@ -4002,7 +4002,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b int count = 0; do { - tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).tqarg( count ); + tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).arg( count ); count++; } while( TQFile::exists( tmp ) ); tmpSrc = KURL::fromPathOrURL( tmp ); @@ -4024,7 +4024,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b { disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) ); - TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() ); + TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); job->kill(); TQFile file( partFile ); if( file.exists() ) file.remove(); @@ -4151,7 +4151,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit { disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) ); - TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() ); + TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() ); job->kill(); TQFile file( partFile ); if( file.exists() ) file.remove(); @@ -4215,35 +4215,35 @@ CollectionDB::updateDirStats( TQString path, const long datetime, const bool tem // REPLACE INTO is not valid SQL for postgres, so we need to check whether we // should UPDATE() or INSERT() TQStringList values = query( TQString("SELECT * FROM directories%1 WHERE dir='%3' AND deviceid=%2;") - .tqarg( temporary ? "_temp" : "") - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "") + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); if(values.count() > 0 ) { query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%4'AND deviceid=%3;") - .tqarg( temporary ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "" ) + .arg( datetime ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } else { query( TQString( "INSERT INTO directories%1 (dir, deviceid,changedate) VALUES ('%4', %3, '%2');") - .tqarg( temporary ? "_temp" : "") - .tqarg( datetime ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "") + .arg( datetime ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } } else { query( TQString( "REPLACE INTO directories%1 ( dir, deviceid, changedate ) VALUES ( '%4', %3, %2 );" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "" ) + .arg( datetime ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } INotify::instance()->watchDir( path ); @@ -4266,8 +4266,8 @@ CollectionDB::removeSongsInDir( TQString path, TQMap *tagsRem "LEFT JOIN uniqueid ON uniqueid.url = tags.url " "AND uniqueid.deviceid = tags.deviceid " "WHERE tags.dir = '%2' AND tags.deviceid = %1" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); TQStringList::ConstIterator it = result.begin(), end = result.end(); while( it != end ) { @@ -4280,12 +4280,12 @@ CollectionDB::removeSongsInDir( TQString path, TQMap *tagsRem } query( TQString( "DELETE FROM tags WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "DELETE FROM uniqueid WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } @@ -4299,8 +4299,8 @@ CollectionDB::isDirInCollection( TQString path ) TQStringList values = query( TQString( "SELECT changedate FROM directories WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); return !values.isEmpty(); } @@ -4313,8 +4313,8 @@ CollectionDB::isFileInCollection( const TQString &url ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQString sql = TQString( "SELECT url FROM tags WHERE url = '%2' AND deviceid = %1" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ); if ( deviceid == -1 ) { sql += ';'; @@ -4323,7 +4323,7 @@ CollectionDB::isFileInCollection( const TQString &url ) { TQString rpath2 = '.' + url; sql += TQString( " OR url = '%1' AND deviceid = -1;" ) - .tqarg( escapeString( rpath2 ) ); + .arg( escapeString( rpath2 ) ); } TQStringList values = query( sql ); @@ -4340,15 +4340,15 @@ CollectionDB::removeSongs( const KURL::List& urls ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, (*it).path() ); query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "DELETE FROM uniqueid WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "UPDATE statistics SET deleted = %1 WHERE url = '%3' AND deviceid = %2;" ) - .tqarg( boolT() ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( boolT() ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } } @@ -4359,7 +4359,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) TQStringList values; values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' ORDER BY %2 LIMIT %3 OFFSET 0;" ) - .tqarg( escapeString( artist ), randomFunc(), TQString::number( count ) ) ); + .arg( escapeString( artist ), randomFunc(), TQString::number( count ) ) ); if ( values.isEmpty() ) Scrobbler::instance()->similarArtists( artist ); @@ -4371,7 +4371,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) void CollectionDB::sanitizeCompilations() { - query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").tqarg( boolF() ) ); + query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").arg( boolF() ) ); } void @@ -4385,9 +4385,9 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path ); albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%3' AND tags_temp.deviceid = %2 AND album.id = tags_temp.album AND tags_temp.sampler IS NULL;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( temporary ? "_temp" : "" ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); for ( uint i = 0; i < albums.count(); i++ ) { @@ -4395,17 +4395,17 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary ) const uint album_id = albumID( albums[ i ], false, temporary, true ); artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( album_id ) ); + .arg( temporary ? "_temp" : "" ) + .arg( album_id ) ); dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) - .tqarg( album_id ) ); + .arg( album_id ) ); if ( artists.count() > dirs.count() ) { debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ':' << dirs.count() << endl; } query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2' AND sampler IS NULL;" ) - .tqarg(artists.count() > dirs.count() ? boolT() : boolF()).tqarg( album_id ) ); + .arg(artists.count() > dirs.count() ? boolT() : boolF()).arg( album_id ) ); } } @@ -4420,7 +4420,7 @@ CollectionDB::setCompilation( const KURL::List &urls, bool enabled, bool updateV TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); query( TQString( "UPDATE tags SET sampler = %1 WHERE tags.url = '%2' AND tags.deviceid = %3;" ) - .tqarg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) ); + .arg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) ); } // Update the Collection-Browser view, @@ -4439,8 +4439,8 @@ CollectionDB::removeDirFromCollection( TQString path ) TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path ); query( TQString( "DELETE FROM directories WHERE dir = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); } @@ -4452,14 +4452,14 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, table.append( "_temp" ); } - TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).tqarg( table ) ); + TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).arg( table ) ); querystr += exactCondition( value ) + ';'; TQStringList result = query( querystr ); if ( result.isEmpty() ) { if ( autocreate ) return TQString::number( insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .tqarg( table, escapeString( value ) ), + .arg( table, escapeString( value ) ), table ) ); else return 0; @@ -4475,17 +4475,17 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate, void CollectionDB::deleteRedundantName( const TQString &table, const TQString &id ) { - TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).tqarg( table, id ) ); + TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).arg( table, id ) ); TQStringList result = query( querystr ); if ( result.isEmpty() ) - query( TQString( "DELETE FROM %1 WHERE id = %2;" ).tqarg( table,id ) ); + query( TQString( "DELETE FROM %1 WHERE id = %2;" ).arg( table,id ) ); } void CollectionDB::deleteAllRedundant( const TQString &table ) { //This works with MySQL4. I thought it might not do, due to the comment in copyTempTables - query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).tqarg( table, table ) ); + query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).arg( table, table ) ); } @@ -4630,8 +4630,8 @@ CollectionDB::getUniqueId( const TQString &url ) int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query( TQString( "SELECT uniqueid FROM uniqueid WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) )); + .arg( deviceid ) + .arg( escapeString( rpath ) )); if( !values.empty() ) return values[0]; else @@ -4645,20 +4645,20 @@ CollectionDB::setLyrics( const TQString &url, const TQString &lyrics, const TQSt TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query(TQString("SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;") - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); if(values.count() > 0) { if ( !lyrics.isEmpty() ) query( TQString( "UPDATE lyrics SET lyrics = '%1' WHERE url = '%3' AND deviceid = %2;" ) - .tqarg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) ); + .arg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) ); else query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid).tqarg( escapeString( rpath ) ) ); + .arg( deviceid).arg( escapeString( rpath ) ) ); } else { insert( TQString( "INSERT INTO lyrics (deviceid, url, lyrics, uniqueid) values ( %1, '%2', '%3', '%4' );" ) - .tqarg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL); + .arg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL); } } @@ -4669,41 +4669,41 @@ CollectionDB::getLyrics( const TQString &url ) int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url ); TQStringList values = query( TQString( "SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;" ) - .tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( deviceid ).arg( escapeString( rpath ) ) ); return values[0]; } void CollectionDB::removeInvalidAmazonInfo( const TQString& md5sum ) { - query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).tqarg( md5sum ) ); + query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).arg( md5sum ) ); } void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& locale, const TQString& md5sum) { TQStringList values = query(TQString("SELECT filename FROM amazon WHERE filename = '%1'") - .tqarg(md5sum)); + .arg(md5sum)); if(values.count() > 0) { query( TQString("UPDATE amazon SET asin = '%1', locale = '%2', refetchdate = '%3' WHERE filename = '%4'") - .tqarg(asin) - .tqarg(locale) - .tqarg(TQDateTime::currentDateTime().addDays(80).toTime_t()) - .tqarg(md5sum)); + .arg(asin) + .arg(locale) + .arg(TQDateTime::currentDateTime().addDays(80).toTime_t()) + .arg(md5sum)); } else { insert( TQString( "INSERT INTO amazon ( asin, locale, filename, refetchdate ) VALUES ( '%1', '%2', '%3', '%4');" ) - .tqarg(asin) - .tqarg(locale) - .tqarg(md5sum) - .tqarg(TQDateTime::currentDateTime().addDays(80).toTime_t()), NULL ); + .arg(asin) + .arg(locale) + .arg(md5sum) + .arg(TQDateTime::currentDateTime().addDays(80).toTime_t()), NULL ); } } TQStringList CollectionDB::staleImages() { return query(TQString("SELECT asin, locale, filename FROM amazon WHERE refetchdate < %1 ;") - .tqarg(TQDateTime::currentDateTime().toTime_t() )); + .arg(TQDateTime::currentDateTime().toTime_t() )); } void @@ -5022,12 +5022,12 @@ class SimilarArtistsInsertionJob : public ThreadManager::DependentJob { virtual bool doJob() { - CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) ); + CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) ); const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );"; foreach( suggestions ) CollectionDB::instance()->insert( sql - .tqarg( escapedArtist, + .arg( escapedArtist, CollectionDB::instance()->escapeString( *it ) ), NULL); return true; @@ -5071,23 +5071,23 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr "SELECT url, deviceid " "FROM %1 " "WHERE uniqueid = '%2';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currid ) ); + .arg( escapeString( *it ) ) + .arg( currid ) ); check2 = query( TQString( "SELECT url, uniqueid " "FROM %1 " "WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currdeviceid + .arg( escapeString( *it ) ) + .arg( currdeviceid , currurl ) ); if( !check1.empty() ) { //debug() << "uniqueid found, updating url" << endl; query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currdeviceid + .arg( escapeString( *it ) ) + .arg( currdeviceid , currid , currurl ) ); } @@ -5095,8 +5095,8 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr { //debug() << "url found, updating uniqueid" << endl; query( TQString( "UPDATE %1 SET uniqueid = '%2' WHERE deviceid = %3 AND url = '%4';" ) - .tqarg( escapeString( *it ) ) - .tqarg( currid + .arg( escapeString( *it ) ) + .arg( currid , currdeviceid , currurl ) ); } @@ -5115,14 +5115,14 @@ CollectionDB::aftMigratePermanentTablesUrl( const TQString& /*oldUrl*/, const TQ foreach( m_aftEnabledPersistentTables ) { query( TQString( "DELETE FROM %1 WHERE deviceid = %2 AND url = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ) ); + .arg( escapeString( *it ) ) + .arg( deviceid ) + .arg( escapeString( rpath ) ) ); query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" ) - .tqarg( escapeString( *it ) ) - .tqarg( deviceid ) - .tqarg( escapeString( uniqueid ) ) - .tqarg( escapeString( rpath ) ) ); + .arg( escapeString( *it ) ) + .arg( deviceid ) + .arg( escapeString( uniqueid ) ) + .arg( escapeString( rpath ) ) ); } } @@ -5136,12 +5136,12 @@ CollectionDB::aftMigratePermanentTablesUniqueId( const TQString& /*url*/, const foreach( m_aftEnabledPersistentTables ) { query( TQString( "DELETE FROM %1 WHERE uniqueid = '%2';" ) - .tqarg( escapeString( *it ) ) - .tqarg( escapeString( newid ) ) ); + .arg( escapeString( *it ) ) + .arg( escapeString( newid ) ) ); query( TQString( "UPDATE %1 SET uniqueid = '%1' WHERE uniqueid = '%2';" ) - .tqarg( escapeString( *it ) ) - .tqarg( escapeString( newid ) ) - .tqarg( escapeString( oldid ) ) ); + .arg( escapeString( *it ) ) + .arg( escapeString( newid ) ) + .arg( escapeString( oldid ) ) ); } } @@ -5462,11 +5462,11 @@ CollectionDB::updateStatsTables() //pre somewhere in the 1.3-1.4 timeframe, the version wasn't stored in the DB, so try to guess it const TQString q = "SELECT COUNT( %1 ) FROM statistics;"; - if( !prev && query( q.tqarg( "url" ) ).first().toInt() - && query( q.tqarg( "createdate" ) ).first().toInt() - && query( q.tqarg( "accessdate" ) ).first().toInt() - && query( q.tqarg( "percentage" ) ).first().toInt() - && query( q.tqarg( "playcounter" ) ).first().toInt() ) + if( !prev && query( q.arg( "url" ) ).first().toInt() + && query( q.arg( "createdate" ) ).first().toInt() + && query( q.arg( "accessdate" ) ).first().toInt() + && query( q.arg( "percentage" ) ).first().toInt() + && query( q.arg( "playcounter" ) ).first().toInt() ) { prev = 3; } @@ -5533,9 +5533,9 @@ CollectionDB::updateStatsTables() int deviceid = exists ? MountPointManager::instance()->getIdForUrl( *it ) : -2; TQString rpath = exists ? MountPointManager::instance()->getRelativePath( deviceid, *it ) : *it; TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2' WHERE " ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); - update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ); + update += TQString( "url = '%1';" ).arg( escapeString( *it ) ); query ( update ); } } @@ -5642,9 +5642,9 @@ CollectionDB::updatePersistentTables() int deviceid = MountPointManager::instance()->getIdForUrl( *it ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, *it ); TQString update = TQString( "UPDATE lyrics SET deviceid = %1, url = '%2' WHERE " ) - .tqarg( deviceid ) - .tqarg( escapeString( rpath ) ); - update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) ); + .arg( deviceid ) + .arg( escapeString( rpath ) ); + update += TQString( "url = '%1';" ).arg( escapeString( *it ) ); query ( update ); } } @@ -5890,7 +5890,7 @@ CollectionDB::getLabels( const TQString &url, const uint type ) return query( TQString( "SELECT labels.name FROM labels " "LEFT JOIN tags_labels ON labels.id = tags_labels.labelid " "WHERE labels.type = %1 AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" ) - .tqarg( type ).tqarg( deviceid ).tqarg( escapeString( rpath ) ) ); + .arg( type ).arg( deviceid ).arg( escapeString( rpath ) ) ); } void @@ -5911,7 +5911,7 @@ CollectionDB::cleanLabels() } query( TQString( "DELETE FROM labels " "WHERE labels.id IN ( %1 );" ) - .tqarg( ids ) ); + .arg( ids ) ); } } @@ -5921,7 +5921,7 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const DEBUG_BLOCK int deviceid = MountPointManager::instance()->getIdForUrl( url ); TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) ); - TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).tqarg( type ) ); + TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).arg( type ) ); TQString ids; if ( !labelIds.isEmpty() ) { @@ -5934,20 +5934,20 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const //TODO: max: add uniqueid handling query( TQString( "DELETE FROM tags_labels " "WHERE tags_labels.labelid IN (%1) AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" ) - .tqarg( ids, TQString::number(deviceid), rpath ) ); + .arg( ids, TQString::number(deviceid), rpath ) ); } foreach( labels ) { int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" ) - .tqarg( type ).tqarg( escapeString( *it ) ) ).first().toInt(); + .arg( type ).arg( escapeString( *it ) ) ).first().toInt(); if ( !id ) { id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" ) - .tqarg( type ).tqarg( escapeString( *it ) ), "labels" ); + .arg( type ).arg( escapeString( *it ) ), "labels" ); } insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" ) - .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 ); + .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 ); } emit labelsChanged( url ); @@ -5962,10 +5962,10 @@ CollectionDB::removeLabels( const TQString &url, const TQStringList &labels, con TQString sql = TQString( "DELETE FROM tags_labels " "FROM tags_labels AS t LEFT JOIN labels AS l ON t.labelid = l.id " "WHERE l.type = %1 AND t.deviceid = %2 AND t.url = '%3' AND ( 0" ) - .tqarg( type ).tqarg( deviceid ).tqarg( rpath ); + .arg( type ).arg( deviceid ).arg( rpath ); foreach( labels ) { - sql += TQString( " OR l.name = '%1'" ).tqarg( escapeString( *it ) ); + sql += TQString( " OR l.name = '%1'" ).arg( escapeString( *it ) ); } sql += ");"; query( sql ); @@ -5981,23 +5981,23 @@ CollectionDB::addLabel( const TQString &url, const TQString &label, const TQStri TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) ); int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" ) - .tqarg( type ).tqarg( escapeString( label ) ) ).first().toInt(); + .arg( type ).arg( escapeString( label ) ) ).first().toInt(); bool labelAlreadyExists = id > 0; if ( !id ) { id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" ) - .tqarg( type ).tqarg( escapeString( label ) ), "labels" ); + .arg( type ).arg( escapeString( label ) ), "labels" ); } if ( labelAlreadyExists ) { //we can return if the link between the tags row and the labels row already exists int count = query( TQString( "SELECT COUNT(*) FROM tags_labels WHERE labelid = %1 AND deviceid = %2 AND url = '%3';" ) - .tqarg( id ).tqarg( deviceid ).tqarg( rpath ) ).first().toInt(); + .arg( id ).arg( deviceid ).arg( rpath ) ).first().toInt(); if ( count ) return false; } insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" ) - .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" ); + .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" ); emit labelsChanged( url ); return true; @@ -6010,7 +6010,7 @@ CollectionDB::favoriteLabels( int type, int count ) "FROM labels LEFT JOIN tags_labels ON labels.id = tags_labels.labelid " "WHERE labels.type = %1 GROUP BY labels.name " "ORDER BY count(tags_labels.labelid) DESC LIMIT %2;" ) - .tqarg( TQString::number( type ), TQString::number( count ) ) ); + .arg( TQString::number( type ), TQString::number( count ) ) ); } TQDir @@ -6593,7 +6593,7 @@ int PostgresqlConnection::insert( const TQString& statement, const TQString& tab TQString _table = table; if (table.find("_temp") > 0) _table = table.left(table.find("_temp")); - curvalSql = TQString("SELECT currval('%1_seq');").tqarg(_table); + curvalSql = TQString("SELECT currval('%1_seq');").arg(_table); result = PQexec(m_db, curvalSql.utf8()); if (result == NULL) { @@ -6733,7 +6733,7 @@ QueryBuilder::linkTables( int tables ) //if ( !m_url.isEmpty() ) { // TQString url = TQString( '.' ) + m_url; // m_tables += TQString( " OR statistics.deviceid = -1 AND statistics.url = '%1'" ) - // .tqarg( CollectionDB::instance()->escapeString( url ) ); + // .arg( CollectionDB::instance()->escapeString( url ) ); //} } if ( tables & tabLyrics ) @@ -6827,7 +6827,7 @@ QueryBuilder::addURLFilters( const TQStringList& filter ) int deviceid = MountPointManager::instance()->getIdForUrl( filter[i] ); TQString rpath = MountPointManager::instance()->getRelativePath( deviceid , filter[i] ); m_where += "OR (tags.url = '" + CollectionDB::instance()->escapeString( rpath ) + "' "; - m_where += TQString( "AND tags.deviceid = %1 ) " ).tqarg( TQString::number( deviceid ) ); + m_where += TQString( "AND tags.deviceid = %1 ) " ).arg( TQString::number( deviceid ) ); //TODO MountPointManager fix this } @@ -7044,7 +7044,7 @@ QueryBuilder::addFilter( int tables, const TQString& filter ) m_where += "OR tags.title = '' "; } if ( ( tables & tabArtist ) && i18n( "Various Artists" ).contains( filter, false ) ) - m_where += TQString( "OR tags.sampler = %1 " ).tqarg( CollectionDB::instance()->boolT() ); + m_where += TQString( "OR tags.sampler = %1 " ).arg( CollectionDB::instance()->boolT() ); m_where += " ) "; } @@ -7080,12 +7080,12 @@ QueryBuilder::addFilter( int tables, TQ_INT64 value, const TQString& filter, int } if( coalesceField( tables, value ) ) - m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; else - m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) ) - m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; @@ -7217,12 +7217,12 @@ QueryBuilder::excludeFilter( int tables, TQ_INT64 value, const TQString& filter, } if( coalesceField( tables, value ) ) - m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; else - m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s; + m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s; if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) ) - m_where += TQString( "AND %1.%2 <> '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "AND %1.%2 <> '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; @@ -7283,27 +7283,27 @@ QueryBuilder::addMatch( int tables, TQ_INT64 value, const TQString& match, bool //which is automatially appended if m_showAll = false m_showAll = true; m_where += TQString( "OR %1.%2 " ) - .tqarg( tableName( tables ) ) - .tqarg( valueName( value ) ); + .arg( tableName( tables ) ) + .arg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( rpath ) : CollectionDB::likeCondition( rpath ); - m_where += TQString( " AND %1.deviceid = %2 " ).tqarg( tableName( tables ) ).tqarg( deviceid ); + m_where += TQString( " AND %1.deviceid = %2 " ).arg( tableName( tables ) ).arg( deviceid ); if ( deviceid != -1 ) { //handle corner case TQString rpath2( '.' + match ); - m_where += TQString( " OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( " OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( rpath2 ) : CollectionDB::likeCondition( rpath2 ); - m_where += TQString( " AND %1.deviceid = -1 " ).tqarg( tableName( tables ) ); + m_where += TQString( " AND %1.deviceid = -1 " ).arg( tableName( tables ) ); } } else { - m_where += TQString( "OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += caseSensitive ? CollectionDB::exactCondition( match ) : CollectionDB::likeCondition( match ); } if ( ( value & valName ) && interpretUnknown && match == i18n( "Unknown" ) ) - m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; @@ -7442,8 +7442,8 @@ QueryBuilder::setOptions( int options ) if ( options & optNoCompilations || options & optOnlyCompilations ) m_linkTables |= tabSong; - if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolF()); - if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolT()); + if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolF()); + if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolT()); if (CollectionDB::instance()->getType() == DbConnection::postgresql && options & optRemoveDuplicates && options & optRandomize) { @@ -7617,7 +7617,7 @@ QueryBuilder::having( int table, TQ_INT64 value, int function, int mode, const T void QueryBuilder::setLimit( int startPos, int length ) { - m_limit = TQString( " LIMIT %2 OFFSET %1 " ).tqarg( startPos ).tqarg( length ); + m_limit = TQString( " LIMIT %2 OFFSET %1 " ).arg( startPos ).arg( length ); } void @@ -7645,9 +7645,9 @@ QueryBuilder::shuffle( int table, TQ_INT64 value ) // non-zero), and finally POWER(...) is used instead of 1-POWER(...) because it // only changes the order type. m_sort += TQString("POWER( %1, 1.0 / (%2.%3 + 1) ) DESC") - .tqarg( CollectionDB::instance()->randomFunc() ) - .tqarg( tableName( table ) ) - .tqarg( valueName( value ) ); + .arg( CollectionDB::instance()->randomFunc() ) + .arg( tableName( table ) ) + .arg( valueName( value ) ); m_linkTables |= table; } @@ -7829,9 +7829,9 @@ QueryBuilder::sortByFavoriteAvg() { m_having += " ("; if (AmarokConfig::useRatings() ) m_having += TQString("%1(%2.%3) > 0 OR ") - .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) ); + .arg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) ); m_having += TQString("%1(%2.%3) > 0") - .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) ); + .arg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) ); m_having += ")"; } diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h index 9b94ad00..a581db88 100644 --- a/amarok/src/collectiondb.h +++ b/amarok/src/collectiondb.h @@ -257,13 +257,13 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver inline bool boolFromSql( const TQString &b ) { return ( b == boolT() || b == "t" ); } //textColumnType should be used for normal strings, which need to be compared //either case-sensitively or -insensitively - TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").tqarg(length); } + TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").arg(length); } //exactTextColumnType should be used for strings that must be stored exactly, such //as URLs (necessary for holding control chars etc. if present in URL), except for //trailing spaces. Comparisions should always be done case-sensitively. //As we create indices on these columns, we have to restrict them to //<= 255 chars for mysql < 5.0.3 - TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).tqarg( length>255 ? 255 : length ); else return textColumnType( length ); } + TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).arg( length>255 ? 255 : length ); else return textColumnType( length ); } // We might consider using LONGTEXT type, as some lyrics could be VERY long..??? TQString longTextColumnType() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return "TEXT"; } TQString randomFunc() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "random()"; else return "RAND()"; } diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp index 8451ac4f..4495be71 100644 --- a/amarok/src/configdialog.cpp +++ b/amarok/src/configdialog.cpp @@ -264,7 +264,7 @@ void AmarokConfigDialog::updateSettings() { #ifdef TQ_WS_X11 OSDPreviewWidget *osd = static_cast( TQT_TQWIDGET(child( "osdpreview" )) ); - AmarokConfig::setOsdAlignment( osd->tqalignment() ); + AmarokConfig::setOsdAlignment( osd->alignment() ); AmarokConfig::setOsdYOffset( osd->y() ); Amarok::OSD::instance()->applySettings(); #endif @@ -357,8 +357,8 @@ bool AmarokConfigDialog::hasChanged() return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] || #ifdef TQ_WS_X11 - osd->tqalignment() != AmarokConfig::osdAlignment() || - osd->tqalignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || + osd->alignment() != AmarokConfig::osdAlignment() || + osd->alignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || #endif m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() || Amarok::databaseTypeCode( m_opt7->dbSetupFrame->databaseEngine->currentText() ) != AmarokConfig::databaseEngine().toInt() || @@ -385,7 +385,7 @@ bool AmarokConfigDialog::isDefault() void AmarokConfigDialog::aboutEngine() //SLOT { - PluginManager::showAbout( TQString( "Name == '%1'" ).tqarg( m_soundSystem->currentText() ) ); + PluginManager::showAbout( TQString( "Name == '%1'" ).arg( m_soundSystem->currentText() ) ); } @@ -407,7 +407,7 @@ void AmarokConfigDialog::soundSystemChanged() m_engineConfig = EngineController::engine()->configure(); m_engineConfig->view()->reparent( m_engineConfigFrame, TQPoint() ); m_engineConfig->view()->show(); - m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).tqarg( m_soundSystem->currentText() ) ); + m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) ); m_engineConfigFrame->show(); connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) ); diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp index 661a8fe6..27bde5c7 100644 --- a/amarok/src/contextbrowser.cpp +++ b/amarok/src/contextbrowser.cpp @@ -97,7 +97,7 @@ namespace Amarok if( datediff >= 6*7 /*six weeks*/ ) { // return absolute month/year const KCalendarSystem *cal = KGlobal::locale()->calendar(); const TQDate date = datetime.date(); - return i18n( "monthname year", "%1 %2" ).tqarg( cal->monthName(date), cal->yearString(date, false) ); + return i18n( "monthname year", "%1 %2" ).arg( cal->monthName(date), cal->yearString(date, false) ); } //TODO "last week" = maybe within 7 days, but prolly before last sunday @@ -175,7 +175,7 @@ static TQString albumImageTooltip( const TQString &albumImage, int size ) { if ( albumImage == CollectionDB::instance()->notAvailCover( false, size ) ) - return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).tqarg( CoverManager::amazonTld() ) ); + return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).arg( CoverManager::amazonTld() ) ); return escapeHTMLAttr( i18n( "Click for information from Amazon, right-click for menu." ) ); } @@ -497,7 +497,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if ( url.protocol() == "musicbrainz" ) { const TQString url = "http://www.musicbrainz.org/taglookup.html?artist=%1&album=%2&track=%3"; - Amarok::invokeBrowser( url.tqarg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ), + Amarok::invokeBrowser( url.arg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ), KURL::encode_string_no_slash( album, 106 /*utf-8*/ ), KURL::encode_string_no_slash( track, 106 /*utf-8*/ ) ) ); } @@ -547,7 +547,7 @@ void ContextBrowser::openURLRequest( const KURL &url ) else if( url.protocol() == "ggartist" ) { const TQString url2 = TQString( "http://www.google.com/musicsearch?q=%1&res=artist" ) - .tqarg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) ); + .arg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) ); Amarok::invokeBrowser( url2 ); } @@ -802,7 +802,7 @@ void ContextBrowser::saveHtmlData() .replace( "", TQString( "" ) - .tqarg( HTMLView::loadStyleSheet() ) ); // and the + .arg( HTMLView::loadStyleSheet() ) ); // and the // stylesheet // code exportedDocument.close(); @@ -1243,7 +1243,7 @@ void ContextBrowser::showCurrentTrack() //SLOT debug() << "current browser is not context, aborting showCurrentTrack()" << endl; m_dirtyCurrentTrackPage = true; m_currentTrackPage->set( TQString( "
%1
" ) - .tqarg( i18n( "Updating..." ) ) ); + .arg( i18n( "Updating..." ) ) ); return; } #endif @@ -1492,7 +1492,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h << albumValues[6] << reqResult[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).tqarg( discNumber ) ) ); + << i18n( "Disc %1" ).arg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); if( track.length() > 0 ) @@ -1576,7 +1576,7 @@ CurrentTrackJob::showHomeByAlbums() date = ep.dateTime().toString(); TQString image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), true, 50 ); - TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) ); + TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) ); m_HTMLSource.append( QStringx ( "\n" @@ -1615,7 +1615,7 @@ CurrentTrackJob::showHomeByAlbums() ) ); - m_HTMLSource.append( QStringx ( "

%1

\n" ).tqarg( ep.description() ) ); + m_HTMLSource.append( QStringx ( "

%1

\n" ).arg( ep.description() ) ); m_HTMLSource.append( "\n" @@ -1929,7 +1929,7 @@ void CurrentTrackJob::addMetaHistory() for ( uint i = 0; i < m_metadataHistory.count(); ++i ) { const TQString &str = m_metadataHistory[i]; - m_HTMLSource.append( QStringx( "%1\n" ).tqarg( str ) ); + m_HTMLSource.append( QStringx( "%1\n" ).arg( str ) ); } m_HTMLSource.append( @@ -1959,7 +1959,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) image = CollectionDB::instance()->notAvailCover( true ); TQString imageAttr = escapeHTMLAttr( pcb.link().isValid() - ? i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) + ? i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) : i18n( "No podcast website." ) ); @@ -1994,7 +1994,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) << imageAttr << escapeHTML( peb.author().isEmpty() ? i18n( "Podcast" ) - : i18n( "Podcast by %1" ).tqarg( peb.author() ) ) + : i18n( "Podcast by %1" ).arg( peb.author() ) ) << ( peb.localUrl().isValid() ? "
\n" + escapeHTML( i18n( "(Cached)" ) ) : "" ) @@ -2011,7 +2011,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) for ( uint i = 0; i < m_metadataHistory.count(); ++i ) { const TQString &str = m_metadataHistory[i]; - m_HTMLSource.append( QStringx( "%1\n" ).tqarg( str ) ); + m_HTMLSource.append( QStringx( "%1\n" ).arg( str ) ); } m_HTMLSource.append( @@ -2024,7 +2024,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) "
\n" "\n" + ( channelInDB - ? i18n( "Episodes from %1" ).tqarg( escapeHTML( pcb.title() ) ) + ? i18n( "Episodes from %1" ).arg( escapeHTML( pcb.title() ) ) : i18n( "Episodes from this Channel" ) ) + "\n" @@ -2072,7 +2072,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack ) ) ); - m_HTMLSource.append( QStringx ( "

%1

\n" ).tqarg( ep.description() ) ); + m_HTMLSource.append( QStringx ( "

%1

\n" ).arg( ep.description() ) ); m_HTMLSource.append( "
\n" @@ -2106,9 +2106,9 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist ) "
%3
\n" "\n" "\n" ) - .tqarg( escapeHTML( artist ) ) - .tqarg( escapeHTML( i18n( "Browse Artist" ) ) ) - .tqarg( back ) ); + .arg( escapeHTML( artist ) ) + .arg( escapeHTML( i18n( "Browse Artist" ) ) ) + .arg( back ) ); m_HTMLSource.append( "\n" ); @@ -2126,16 +2126,16 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist ) m_HTMLSource.append( "\n" "\n" "\n"); m_HTMLSource.append( "\n" "\n" "\n" @@ -2170,9 +2170,9 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label ) "\n" "
\n" - + TQString( "\n" ).tqarg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) - + i18n( "Wikipedia Information for %1" ).tqarg( escapeHTML( artist ) ) + + + TQString( "\n" ).arg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) + + i18n( "Wikipedia Information for %1" ).arg( escapeHTML( artist ) ) + "\n" "
\n" - + TQString( "\n" ).tqarg( escapeHTMLAttr( artist ) ) - + i18n( "Google Musicsearch for %1" ).tqarg( escapeHTML( artist ) ) + + + TQString( "\n" ).arg( escapeHTMLAttr( artist ) ) + + i18n( "Google Musicsearch for %1" ).arg( escapeHTML( artist ) ) + "\n" "
%3
\n" "\n" ) - .tqarg( escapeHTML( label ) ) - .tqarg( escapeHTML( i18n( "Browse Label" ) ) ) - .tqarg( back ) ); + .arg( escapeHTML( label ) ) + .arg( escapeHTML( i18n( "Browse Label" ) ) ) + .arg( back ) ); m_HTMLSource.append( "\n" ); @@ -2190,8 +2190,8 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label ) m_HTMLSource.append( "\n" "\n" "\n"); @@ -2281,11 +2281,11 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) "\n" "" "" "
\n" - + TQString( "\n" ).tqarg( escapeHTMLAttr( label ) ) - + i18n( "Last.fm Information for %1" ).tqarg( escapeHTML( label ) ) + + + TQString( "\n" ).arg( escapeHTMLAttr( label ) ) + + i18n( "Last.fm Information for %1" ).arg( escapeHTML( label ) ) + "\n" "
\n" ) - .tqarg( escapeHTML( currentTrack.prettyTitle() ) ) - .tqarg( escapeHTMLAttr( currentTrack.artist() ) ) - .tqarg( escapeHTMLAttr( currentTrack.album() ) ) - .tqarg( escapeHTMLAttr( albumImage ) ) - .tqarg( albumImageTitleAttr ) + .arg( escapeHTML( currentTrack.prettyTitle() ) ) + .arg( escapeHTMLAttr( currentTrack.artist() ) ) + .arg( escapeHTMLAttr( currentTrack.album() ) ) + .arg( escapeHTMLAttr( albumImage ) ) + .arg( albumImageTitleAttr ) ) ); if ( !values.isEmpty() && values[2].toInt() ) @@ -2299,18 +2299,18 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack ) const uint score = static_cast( values[3].toFloat() ); const uint rating = values[4].toInt(); - //SAFE = .tqarg( x, y ) - //UNSAFE = .tqarg( x ).tqarg( y ) + //SAFE = .arg( x, y ) + //UNSAFE = .arg( x ).arg( y ) m_HTMLSource.append( TQString( "%1
\n" "
%2
\n" "%3
\n" "%4\n" ) - .tqarg( i18n( "Track played once", "Track played %n times", playtimes ), + .arg( i18n( "Track played once", "Track played %n times", playtimes ), statsHTML( score, rating, false ), - i18n( "Last played: %1" ).tqarg( Amarok::verboseTimeSince( lastPlay ) ), - i18n( "First played: %1" ).tqarg( Amarok::verboseTimeSince( firstPlay ) ) ) ); + i18n( "Last played: %1" ).arg( Amarok::verboseTimeSince( lastPlay ) ), + i18n( "First played: %1" ).arg( Amarok::verboseTimeSince( firstPlay ) ) ) ); } else m_HTMLSource.append( i18n( "Never played before" ) ); @@ -2391,7 +2391,7 @@ void CurrentTrackJob::showRelatedArtists( const TQString &artist, const TQString "%1\n" "\n" "\n" ) - .tqarg( i18n( "Artists Related to %1" ).tqarg( escapeHTML( artist ) ) ) ); + .arg( i18n( "Artists Related to %1" ).arg( escapeHTML( artist ) ) ) ); m_HTMLSource.append( "\n" ).tqarg( i18n( "Score: %1" ).tqarg( score ) ) + + contents += TQString( "\n" ).arg( i18n( "Score: %1" ).arg( score ) ) + "\n" "\n" ).tqarg( i18n( "Rating: %1" ) - .tqarg( MetaBundle::ratingDescription( rating ) ) ) + + contents += TQString( "\n" ).arg( i18n( "Rating: %1" ) + .arg( MetaBundle::ratingDescription( rating ) ) ) + "\n"; } - return table.tqarg( contents ); + return table.arg( contents ); } bool CurrentTrackJob::doJob() @@ -3220,7 +3220,7 @@ ContextBrowser::getEncodedImage( const TQString &imageUrl ) tqApp->lock(); img.save( &buffer, "PNG" ); // writes image into ba in PNG format tqApp->unlock(); - const TQString coverImage = TQString( "data:image/png;base64,%1" ).tqarg( KCodecs::base64Encode( ba ).data() ); + const TQString coverImage = TQString( "data:image/png;base64,%1" ).arg( KCodecs::base64Encode( ba ).data() ); //debug() << "Encoded imageUrl: " << coverImage << endl; return coverImage; } @@ -3282,7 +3282,7 @@ void ContextBrowser::showLyrics( const TQString &url ) } m_lyricSearchUrl = TQString( "http://www.google.com/search?ie=UTF-8&q=lyrics+%1+%2" ) - .tqarg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ), + .arg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ), KURL::encode_string_no_slash( '"' + title + '"', 106 /*utf-8*/ ) ); m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false); @@ -3294,7 +3294,7 @@ void ContextBrowser::showLyrics( const TQString &url ) "
\n"+ i18n( "Available Lyrics Scripts:" ) + "
\n"; foreach ( scripts ) { - lyrics += TQString( "%2
\n" ).tqarg( *it, *it ); + lyrics += TQString( "%2
\n" ).arg( *it, *it ); } lyrics += "
\n" + i18n( "Click on one of the scripts to run it, or use the Script Manager, to be able" " to see all the scripts, and download new ones from the Web." ); @@ -3425,12 +3425,12 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT const TQString artist = l.item( i ).toElement().attribute( "artist" ); const TQString title = l.item( i ).toElement().attribute( "title" ); - lyrics += "\n" + i18n("%1 - %2").tqarg( artist, title ); + lyrics += "\n" + i18n("%1 - %2").arg( artist, title ); lyrics += "
\n"; } } lyrics += i18n( "

You can search for the lyrics on the Web.

" ) - .tqarg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) ); + .arg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) ); } else { lyrics = el.text(); @@ -3444,7 +3444,7 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT lyrics.prepend( "\n" + title + "
\n" + artist+ "
\n" ); if( !cached ) { - lyrics.append( "

\n" + i18n( "Powered by %1 (%2)" ).tqarg( site, site_url ) + "\n" ); + lyrics.append( "

\n" + i18n( "Powered by %1 (%2)" ).arg( site, site_url ) + "\n" ); CollectionDB::instance()->setLyrics( EngineController::instance()->bundle().url().path(), xmldoc, EngineController::instance()->bundle().uniqueId() ); } } @@ -3742,7 +3742,7 @@ ContextBrowser::wikiURL( const TQString &item ) // add any special characters to be replaced here TQString wStr = TQString(item).replace( "/", " " ); - return TQString( "http://%1.wikipedia.org/wiki/" ).tqarg( wikiLocale() ) + return TQString( "http://%1.wikipedia.org/wiki/" ).arg( wikiLocale() ) + KURL::encode_string_no_slash( wStr, 106 /*utf-8*/ ); } @@ -3815,7 +3815,7 @@ ContextBrowser::showLabelsDialog() showCurrentTrack(); } } - delete dialog; //deletes tqchildren + delete dialog; //deletes children m_addLabelEdit = 0; m_labelListView = 0; } diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp index e8cd6d1e..b067b239 100644 --- a/amarok/src/coverfetcher.cpp +++ b/amarok/src/coverfetcher.cpp @@ -43,7 +43,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis menu.insertTitle( i18n( "Cover Image" ) ); menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM ); bool disable = !album.isEmpty(); // disable setting covers for unknown albums menu.setItemEnabled( FETCH, disable ); @@ -143,7 +143,7 @@ CoverFetcher::CoverFetcher( TQWidget *parent, const TQString &artist, TQString a //the others have the above strings removed with the following regex, as this can increase hit-rate const TQString template1 = " ?-? ?[(^{]* ?%1 ?\\d*[)^}\\]]* *$"; //eg album - [disk 1] -> album foreach( extensions ) { - TQRegExp regexp( template1.tqarg( *it ) ); + TQRegExp regexp( template1.arg( *it ) ); regexp.setCaseSensitive( false ); album.remove( regexp ); } diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp index 92594167..d736b64e 100644 --- a/amarok/src/covermanager.cpp +++ b/amarok/src/covermanager.cpp @@ -276,7 +276,7 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, { KWin::setType( winId(), NET::Utility ); kapp->setTopWidget( this ); - setCaption( kapp->makeStdCaption( i18n("%1 - %2").tqarg( artist, album ) ) ); + setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) ); m_tqlayout = new TQHBoxLayout( this ); m_tqlayout->setAutoAdd( true ); @@ -396,7 +396,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT //NOTE we MUST show the dialog, otherwise the closeEvents get processed // in the processEvents() calls below, GRUMBLE! TQt sux0rs progress.show(); - progress.tqrepaint( false ); //ensures the dialog isn't blank + progress.repaint( false ); //ensures the dialog isn't blank //this is an extra processEvent call for the sake of init() and aesthetics //it isn't necessary @@ -499,7 +499,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO } else { menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); - menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH ); + menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH ); menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); menu.insertSeparator(); @@ -817,9 +817,9 @@ void CoverManager::updateStatusBar() if ( values.count() >= 2 ) { if( values[0].isEmpty() ) - text = i18n( "Fetching cover for %1..." ).tqarg( values[1] ); + text = i18n( "Fetching cover for %1..." ).arg( values[1] ); else - text = i18n( "Fetching cover for %1 - %2..." ).tqarg( values[0], values[1] ); + text = i18n( "Fetching cover for %1 - %2..." ).arg( values[0], values[1] ); } } else if( m_fetchingCovers ) { @@ -851,7 +851,7 @@ void CoverManager::updateStatusBar() } if( !m_filter.isEmpty() ) - text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).tqarg( m_filter ); + text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).arg( m_filter ); else if( m_artistView->selectedItem() ) { text = i18n( "1 album", "%n albums", totalCounter ); if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist @@ -864,7 +864,7 @@ void CoverManager::updateStatusBar() } if( missingCounter ) - text += i18n(" - ( %1 without cover )" ).tqarg( missingCounter ); + text += i18n(" - ( %1 without cover )" ).arg( missingCounter ); #ifdef AMAZON_SUPPORT m_fetchButton->setEnabled( missingCounter ); @@ -912,7 +912,7 @@ TQDragObject *CoverView::dragObject() return 0; const TQString sql = "SELECT tags.url FROM tags, album WHERE album.name %1 AND tags.album = album.id ORDER BY tags.track;"; - const TQStringList values = CollectionDB::instance()->query( sql.tqarg( CollectionDB::likeCondition( item->album() ) ) ); + const TQStringList values = CollectionDB::instance()->query( sql.arg( CollectionDB::likeCondition( item->album() ) ) ); KURL::List urls; for( TQStringList::ConstIterator it = values.begin(), end = values.end(); it != end; ++it ) @@ -939,8 +939,8 @@ void CoverView::setStatusText( TQIconViewItem *item ) //FIXME: Don't rely on other independent code, use an sql query if( item->artist().isEmpty() ) sampler = true; - TQString tipContent = i18n( "%1 - %2" ).tqarg( sampler ? i18n("Various Artists") : item->artist() ) - .tqarg( item->album() ); + TQString tipContent = i18n( "%1 - %2" ).arg( sampler ? i18n("Various Artists") : item->artist() ) + .arg( item->album() ); CoverManager::instance()->setStatusText( tipContent ); @@ -973,7 +973,7 @@ void CoverViewItem::loadCover() m_coverImagePath = CollectionDB::instance()->albumImage( m_artist, m_album, false, 1, &m_embedded ); m_coverPixmap = TQPixmap( m_coverImagePath ); //create the scaled cover - tqrepaint(); + repaint(); } diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp index 57c51101..980a3dda 100644 --- a/amarok/src/database_refactor/collectiondb.cpp +++ b/amarok/src/database_refactor/collectiondb.cpp @@ -81,7 +81,7 @@ CollectionDB::CollectionDB() // Load DBEngine plugin TQString query = "[X-KDE-Amarok-plugintype] == 'dbengine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.tqarg( "sqlite-dbengine" ) ); + KTrader::OfferList offers = PluginManager::query( query.arg( "sqlite-dbengine" ) ); m_dbEngine = (DBEngine*) PluginManager::createFromService( offers.first() ); // @@ -272,8 +272,8 @@ CollectionDB::createTables( DbConnection *conn ) "length INTEGER," "samplerate INTEGER," "sampler BOOL );" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ), conn ); TQString albumAutoIncrement = ""; TQString artistAutoIncrement = ""; @@ -302,59 +302,59 @@ CollectionDB::createTables( DbConnection *conn ) query( TQString( "CREATE %1 TABLE album%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( albumAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( albumAutoIncrement ), conn ); //create artist table query( TQString( "CREATE %1 TABLE artist%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( artistAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( artistAutoIncrement ), conn ); //create genre table query( TQString( "CREATE %1 TABLE genre%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() +");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( genreAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( genreAutoIncrement ), conn ); //create year table query( TQString( "CREATE %1 TABLE year%2 (" "id INTEGER PRIMARY KEY %3," "name " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( yearAutoIncrement ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ) + .arg( yearAutoIncrement ), conn ); //create images table query( TQString( "CREATE %1 TABLE images%2 (" "path " + textColumnType() + "," "artist " + textColumnType() + "," "album " + textColumnType() + ");" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ), conn ); // create directory statistics table query( TQString( "CREATE %1 TABLE directories%2 (" "dir " + textColumnType() + " UNITQUE," "changedate INTEGER );" ) - .tqarg( conn ? "TEMPORARY" : "" ) - .tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "TEMPORARY" : "" ) + .arg( conn ? "_temp" : "" ), conn ); //create indexes query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" ) - .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn ); + .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn ); if ( !conn ) { @@ -385,13 +385,13 @@ CollectionDB::dropTables( DbConnection *conn ) { DEBUG_FUNC_INFO - query( TQString( "DROP TABLE tags%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE album%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE artist%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE genre%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE year%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE images%1;" ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "DROP TABLE directories%1;" ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE tags%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE album%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE artist%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE genre%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE year%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE images%1;" ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "DROP TABLE directories%1;" ).arg( conn ? "_temp" : "" ), conn ); if ( !conn ) { query( TQString( "DROP TABLE related_artists;" ) ); @@ -421,16 +421,16 @@ CollectionDB::clearTables( DbConnection *conn ) clearCommand = "TRUNCATE TABLE"; } - query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); - query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); + query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn ); if ( !conn ) { - query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) ); + query( TQString( "%1 related_artists;" ).arg( clearCommand ) ); } } @@ -584,16 +584,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const TQStringList values = query( TQString( "SELECT id, name FROM %1 WHERE name LIKE '%2';" ) - .tqarg( name ) - .tqarg( CollectionDB::instance()->escapeString( value ) ), conn ); + .arg( name ) + .arg( CollectionDB::instance()->escapeString( value ) ), conn ); if ( updateSpelling && !values.isEmpty() && ( values[1] != value ) ) { query( TQString( "UPDATE %1 SET id = %2, name = '%3' WHERE id = %4;" ) - .tqarg( name ) - .tqarg( values.first() ) - .tqarg( CollectionDB::instance()->escapeString( value ) ) - .tqarg( values.first() ), conn ); + .arg( name ) + .arg( values.first() ) + .arg( CollectionDB::instance()->escapeString( value ) ) + .arg( values.first() ), conn ); } //check if item exists. if not, should we autocreate it? @@ -601,8 +601,8 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const if ( values.isEmpty() && autocreate ) { id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) - .tqarg( name ) - .tqarg( CollectionDB::instance()->escapeString( value ) ), name, conn ); + .arg( name ) + .arg( CollectionDB::instance()->escapeString( value ) ), name, conn ); return id; } @@ -617,8 +617,8 @@ CollectionDB::valueFromID( TQString table, uint id ) TQStringList values = query( TQString( "SELECT name FROM %1 WHERE id=%2;" ) - .tqarg( table ) - .tqarg( id ) ); + .arg( table ) + .arg( id ) ); return values.isEmpty() ? 0 : values.first(); @@ -631,8 +631,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i TQStringList values = query( TQString( "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) - .tqarg( album_id ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( artist_id ) ); return values.first(); } @@ -642,8 +642,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id ) TQStringList values = query( TQString( "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) - .tqarg( CollectionDB::instance()->boolT() ) - .tqarg( album_id ) ); + .arg( CollectionDB::instance()->boolT() ) + .arg( album_id ) ); return (values.count() != 0); } @@ -655,17 +655,17 @@ CollectionDB::albumTracks( const TQString &artist_id, const TQString &album_id ) return query( TQString( "SELECT tags.url, tags.track AS __discard FROM tags, year WHERE tags.album = %1 AND " "( tags.sampler = %2 OR tags.artist = %3 ) AND year.id = tags.year " "ORDER BY tags.track;" ) - .tqarg( album_id ) - .tqarg( boolT() ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( boolT() ) + .arg( artist_id ) ); } else { return query( TQString( "SELECT tags.url FROM tags, year WHERE tags.album = %1 AND " "( tags.sampler = 1 OR tags.artist = %2 ) AND year.id = tags.year " "ORDER BY tags.track;" ) - .tqarg( album_id ) - .tqarg( artist_id ) ); + .arg( album_id ) + .arg( artist_id ) ); } } @@ -680,10 +680,10 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPairurl().path() ) ) ); + .arg( escapeString( bundle->url().path() ) ) ); if ( !values.empty() ) fillInBundle( values, *bundle ); @@ -1260,10 +1260,10 @@ void CollectionDB::addAudioproperties( const MetaBundle& bundle ) { query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%4';" ) - .tqarg( bundle.bitrate() ) - .tqarg( bundle.length() ) - .tqarg( bundle.sampleRate() ) - .tqarg( escapeString( bundle.url().path() ) ) ); + .arg( bundle.bitrate() ) + .arg( bundle.length() ) + .arg( bundle.sampleRate() ) + .arg( escapeString( bundle.url().path() ) ) ); } @@ -1275,7 +1275,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) query( TQString( "SELECT playcounter, createdate, percentage FROM statistics " "WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); // check boundaries if ( percentage > 100 ) percentage = 100; @@ -1288,19 +1288,19 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE statistics SET percentage=%1, playcounter=%2+1 WHERE url='%3';" ) - .tqarg( score ) - .tqarg( values[0] + " + 1" ) - .tqarg( escapeString( url ) ) ); + .arg( score ) + .arg( values[0] + " + 1" ) + .arg( escapeString( url ) ) ); } else { query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, %5 );" ) - .tqarg( escapeString( url ) ) - .tqarg( values[1] ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( score ) - .tqarg( values[0] + " + 1" ) ); + .arg( escapeString( url ) ) + .arg( values[1] ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( score ) + .arg( values[0] + " + 1" ) ); } } else @@ -1310,10 +1310,10 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage ) insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, 1 );" ) - .tqarg( escapeString( url ) ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( score ), NULL ); + .arg( escapeString( url ) ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( score ), NULL ); } int iscore = getSongPercentage( url ); @@ -1326,7 +1326,7 @@ int CollectionDB::getSongPercentage( const TQString &url ) { TQStringList values = query( TQString( "SELECT round( percentage + 0.4 ) FROM statistics WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); if( values.count() ) return values.first().toInt(); @@ -1341,7 +1341,7 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage ) TQStringList values = query( TQString( "SELECT playcounter, createdate, accessdate FROM statistics WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); // check boundaries if ( percentage > 100 ) percentage = 100; @@ -1351,29 +1351,29 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage ) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%2';" ) - .tqarg( percentage ) - .tqarg( escapeString( url ) ) ); + .arg( percentage ) + .arg( escapeString( url ) ) ); } else { // entry exists query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', '%2', '%3', %4, %5 );" ) - .tqarg( escapeString( url ) ) - .tqarg( values[1] ) - .tqarg( values[2] ) - .tqarg( percentage ) - .tqarg( values[0] ) ); + .arg( escapeString( url ) ) + .arg( values[1] ) + .arg( values[2] ) + .arg( percentage ) + .arg( values[0] ) ); } } else { insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " "VALUES ( '%1', %2, %3, %4, 0 );" ) - .tqarg( escapeString( url ) ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( TQDateTime::currentDateTime().toTime_t() ) - .tqarg( percentage ), NULL ); + .arg( escapeString( url ) ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( TQDateTime::currentDateTime().toTime_t() ) + .arg( percentage ), NULL ); } emit scoreChanged( url, percentage ); @@ -1388,16 +1388,16 @@ CollectionDB::updateDirStats( TQString path, const long datetime, DbConnection * if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';") - .tqarg( conn ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( escapeString( path ) ), conn ); + .arg( conn ? "_temp" : "" ) + .arg( datetime ) + .arg( escapeString( path ) ), conn ); } else { query( TQString( "REPLACE INTO directories%1 ( dir, changedate ) VALUES ( '%3', %2 );" ) - .tqarg( conn ? "_temp" : "" ) - .tqarg( datetime ) - .tqarg( escapeString( path ) ), + .arg( conn ? "_temp" : "" ) + .arg( datetime ) + .arg( escapeString( path ) ), conn ); } } @@ -1410,7 +1410,7 @@ CollectionDB::removeSongsInDir( TQString path ) path = path.left( path.length() - 1 ); query( TQString( "DELETE FROM tags WHERE dir = '%1';" ) - .tqarg( escapeString( path ) ) ); + .arg( escapeString( path ) ) ); } @@ -1422,7 +1422,7 @@ CollectionDB::isDirInCollection( TQString path ) TQStringList values = query( TQString( "SELECT changedate FROM directories WHERE dir = '%1';" ) - .tqarg( escapeString( path ) ) ); + .arg( escapeString( path ) ) ); return !values.isEmpty(); } @@ -1433,7 +1433,7 @@ CollectionDB::isFileInCollection( const TQString &url ) { TQStringList values = query( TQString( "SELECT url FROM tags WHERE url = '%1';" ) - .tqarg( escapeString( url ) ) ); + .arg( escapeString( url ) ) ); return !values.isEmpty(); } @@ -1445,7 +1445,7 @@ CollectionDB::removeSongs( const KURL::List& urls ) for( KURL::List::ConstIterator it = urls.begin(), end = urls.end(); it != end; ++it ) { query( TQString( "DELETE FROM tags WHERE url = '%1';" ) - .tqarg( escapeString( (*it).path() ) ) ); + .arg( escapeString( (*it).path() ) ) ); } } @@ -1457,12 +1457,12 @@ CollectionDB::similarArtists( const TQString &artist, uint count ) if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' OFFSET 0 LIMIT %2;" ) - .tqarg( escapeString( artist ) ).tqarg( count ) ); + .arg( escapeString( artist ) ).arg( count ) ); } else { values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' LIMIT 0, %2;" ) - .tqarg( escapeString( artist ) ).tqarg( count ) ); + .arg( escapeString( artist ) ).arg( count ) ); } if ( values.isEmpty() ) @@ -1480,8 +1480,8 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC TQStringList dirs; albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%2' AND album.id = tags_temp.album;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( escapeString( path ) ), conn ); + .arg( temporary ? "_temp" : "" ) + .arg( escapeString( path ) ), conn ); for ( uint i = 0; i < albums.count(); i++ ) { @@ -1489,16 +1489,16 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC const uint album_id = albumID( albums[ i ], false, temporary, false, conn ); artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" ) - .tqarg( temporary ? "_temp" : "" ) - .tqarg( album_id ), conn ); + .arg( temporary ? "_temp" : "" ) + .arg( album_id ), conn ); dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) - .tqarg( album_id ), conn ); + .arg( album_id ), conn ); if ( artists.count() > dirs.count() ) { debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ":" << dirs.count() << endl; query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2';" ) - .tqarg(boolT()).tqarg( album_id ), conn ); + .arg(boolT()).arg( album_id ), conn ); } } } @@ -1508,8 +1508,8 @@ void CollectionDB::setCompilation( const TQString &album, const bool enabled, const bool updateView ) { query( TQString( "UPDATE tags, album SET tags.sampler = %1 WHERE tags.album = album.id AND album.name = '%2';" ) - .tqarg( enabled ? "1" : "0" ) - .tqarg( escapeString( album ) ) ); + .arg( enabled ? "1" : "0" ) + .arg( escapeString( album ) ) ); // Update the Collection-Browser view, // using TQTimer to make sure we don't manipulate the GUI from a thread @@ -1525,7 +1525,7 @@ CollectionDB::removeDirFromCollection( TQString path ) path = path.left( path.length() - 1 ); query( TQString( "DELETE FROM directories WHERE dir = '%1';" ) - .tqarg( escapeString( path ) ) ); + .arg( escapeString( path ) ) ); } @@ -1755,13 +1755,13 @@ class SimilarArtistsInsertionJob : public ThreadWeaver::DependentJob { virtual bool doJob() { - CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) ); + CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) ); const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );"; foreach( suggestions ) CollectionDB::instance()->insert( sql - .tqarg( escapedArtist ) - .tqarg( CollectionDB::instance()->escapeString( *it ) ), NULL ); + .arg( escapedArtist ) + .arg( CollectionDB::instance()->escapeString( *it ) ), NULL ); return true; } diff --git a/amarok/src/database_refactor/dbenginebase.cpp b/amarok/src/database_refactor/dbenginebase.cpp index 12900a26..ec3a34b5 100644 --- a/amarok/src/database_refactor/dbenginebase.cpp +++ b/amarok/src/database_refactor/dbenginebase.cpp @@ -216,10 +216,10 @@ QueryBuilder::addMatch( int tables, int value, const TQString& match ) if ( !match.isEmpty() ) { m_where += "AND ( true "; - m_where += TQString( "OR %1.%2 LIKE '" ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + escapeString( match ) + "' "; + m_where += TQString( "OR %1.%2 LIKE '" ).arg( tableName( tables ) ).arg( valueName( value ) ) + escapeString( match ) + "' "; if ( ( value & valName ) && match == i18n( "Unknown" ) ) - m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ); + m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) ); m_where += " ) "; } @@ -410,7 +410,7 @@ QueryBuilder::groupBy( int table, int value ) void QueryBuilder::setLimit( int startPos, int length ) { - m_limit = TQString( " LIMIT %1, %2 " ).tqarg( startPos ).tqarg( length ); + m_limit = TQString( " LIMIT %1, %2 " ).arg( startPos ).arg( length ); } diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index 71fdf81d..7d0c9590 100644 --- a/amarok/src/deletedialogbase.ui +++ b/amarok/src/deletedialogbase.ui @@ -64,7 +64,7 @@ Deletion method placeholder, never shown to user. - + WordBreak|AlignCenter @@ -93,7 +93,7 @@ Placeholder for number of files, not in GUI - + AlignVCenter|AlignRight diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp index a8475796..57b0c3d4 100644 --- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp +++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp @@ -126,20 +126,20 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m { TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'uuid' " - "AND uuid = '%1';" ).tqarg( m->id() ) ); + "AND uuid = '%1';" ).arg( m->id() ) ); if ( ids.size() == 3 ) { debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); + "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new MassStorageDeviceHandler( ids[0].toInt(), m->mountPoint(), m->id() ); } else { int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) " "VALUES ( 'uuid', '%1', '%2' );" ) - .tqarg( m->id() ) - .tqarg( m->mountPoint() ), "devices" ); + .arg( m->id() ) + .arg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=uuid, uuid=" << m->id() << endl; diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp index ac7a3de3..ac831d7d 100644 --- a/amarok/src/device/nfs/nfsdevicehandler.cpp +++ b/amarok/src/device/nfs/nfsdevicehandler.cpp @@ -135,13 +135,13 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'nfs' " "AND servername = '%1' AND sharename = '%2';" ) - .tqarg( server ) - .tqarg( share ) ); + .arg( server ) + .arg( share ) ); if ( ids.size() == 3 ) { debug() << "Found existing NFS config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); + "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new NfsDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() ); } else @@ -149,9 +149,9 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" "( type, servername, sharename, lastmountpoint ) " "VALUES ( 'nfs', '%1', '%2', '%3' );" ) - .tqarg( server ) - .tqarg( share ) - .tqarg( m->mountPoint() ), "devices" ); + .arg( server ) + .arg( share ) + .arg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=nfs, server=" << server << ", share=" << share << endl; diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp index 072c36a8..de5e7cbb 100644 --- a/amarok/src/device/smb/smbdevicehandler.cpp +++ b/amarok/src/device/smb/smbdevicehandler.cpp @@ -137,13 +137,13 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'smb' " "AND servername = '%1' AND sharename = '%2';" ) - .tqarg( server ) - .tqarg( share ) ); + .arg( server ) + .arg( share ) ); if ( ids.size() == 3 ) { debug() << "Found existing SMB config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " - "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) ); + "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new SmbDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() ); } else @@ -151,9 +151,9 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" "( type, servername, sharename, lastmountpoint ) " "VALUES ( 'smb', '%1', '%2', '%3' );" ) - .tqarg( server ) - .tqarg( share ) - .tqarg( m->mountPoint() ), "devices" ); + .arg( server ) + .arg( share ) + .arg( m->mountPoint() ), "devices" ); if ( id == 0 ) { warning() << "Inserting into devices failed for type=smb, server=" << server << ", share=" << share << endl; diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp index 05b3e302..4eaab516 100644 --- a/amarok/src/directorylist.cpp +++ b/amarok/src/directorylist.cpp @@ -212,8 +212,8 @@ Item::stateChange( bool b ) } } else { - //Deselect item and recurse through tqchildren but only deselect tqchildren if they - //do not exist unless we are in recursive mode (where no tqchildren should be + //Deselect item and recurse through children but only deselect children if they + //do not exist unless we are in recursive mode (where no children should be //selected if the parent is being unselected) //Note this does not do anything to the checkboxes, but they should be doing //the same thing as we are (hopefully) @@ -258,7 +258,7 @@ Item::newItems( const KFileItemList &list ) //SLOT for( KFileItemListIterator it( list ); *it; ++it ) { //Fully disable (always appears off and grayed-out) if it is "/proc", "/sys" or - //"/dev" or one of their tqchildren. This is because we will never scan them, so we + //"/dev" or one of their children. This is because we will never scan them, so we //might as well show that. //These match up with the skipped dirs in CollectionScanner::readDir. bool fully_disable=false; diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h index 5e734aed..8125557a 100644 --- a/amarok/src/directorylist.h +++ b/amarok/src/directorylist.h @@ -88,7 +88,7 @@ public: public slots: void newItems( const KFileItemList& ); - void completed() { if( childCount() == 0 ) { setExpandable( false ); tqrepaint(); } } + void completed() { if( childCount() == 0 ) { setExpandable( false ); repaint(); } } private: KDirLister m_lister; diff --git a/amarok/src/dynamicmode.cpp b/amarok/src/dynamicmode.cpp index 6695a273..1bc8aa7b 100644 --- a/amarok/src/dynamicmode.cpp +++ b/amarok/src/dynamicmode.cpp @@ -274,8 +274,8 @@ DEBUG_BLOCK { TQRegExp limit( "(LIMIT.*)?;$" ); sql.replace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") - .tqarg( CollectionDB::instance()->randomFunc() ) - .tqarg( songCount ) ); + .arg( CollectionDB::instance()->randomFunc() ) + .arg( songCount ) ); } else { @@ -309,8 +309,8 @@ DEBUG_BLOCK TQRegExp orderLimit( "(ORDER BY.*)?;$" ); sql.replace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") - .tqarg( CollectionDB::instance()->randomFunc() ) - .tqarg( songCount ) ); + .arg( CollectionDB::instance()->randomFunc() ) + .arg( songCount ) ); } else // time ordered criteria, only mess with the limits { @@ -324,11 +324,11 @@ DEBUG_BLOCK if( findLocation == -1 ) // there is no limit { TQRegExp queryEnd( ";$" ); // find the end of the query an add a limit - sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount*5 ).tqarg( offset ) ); + sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount*5 ).arg( offset ) ); useDirect = false; } else // there is a limit, so find it and replace it - sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount ).tqarg( offset ) ); + sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount ).arg( offset ) ); } } diff --git a/amarok/src/engine/akode/akode-engine.cpp b/amarok/src/engine/akode/akode-engine.cpp index f2404012..26840589 100644 --- a/amarok/src/engine/akode/akode-engine.cpp +++ b/amarok/src/engine/akode/akode-engine.cpp @@ -180,7 +180,7 @@ AkodeEngine::event( TQEvent *e ) case 3002: m_player->stop(); emit trackEnded(); - emit infoMessage( i18n("Unable to decode %1").tqarg( m_url.prettyURL()) ); + emit infoMessage( i18n("Unable to decode %1").arg( m_url.prettyURL()) ); break; default: diff --git a/amarok/src/engine/helix/helix-engine.cpp b/amarok/src/engine/helix/helix-engine.cpp index 7d778741..fb4dc695 100644 --- a/amarok/src/engine/helix/helix-engine.cpp +++ b/amarok/src/engine/helix/helix-engine.cpp @@ -126,7 +126,7 @@ void HelixEngine::notifyUser(unsigned long code, const char *moreinfo, const cha { TQString *err = HelixErrors::errorText(code); if (err) - emit statusText(i18n("Helix Core returned error: %1 %2 %3").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl))); + emit statusText(i18n("Helix Core returned error: %1 %2 %3").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl))); else emit statusText(i18n("Helix Core returned error: ")); } @@ -135,7 +135,7 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const { TQString *err = HelixErrors::errorText(code); if (err) - emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl))); + emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl))); else emit infoMessage(i18n("Helix Core returned error: ")); @@ -146,13 +146,13 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const void HelixEngine::onContacting(const char *host) { - emit statusText( i18n("Contacting: %1").tqarg( TQString(host) ) ); + emit statusText( i18n("Contacting: %1").arg( TQString(host) ) ); } void HelixEngine::onBuffering(int pcnt) { if (pcnt != 100) // let's not report that... - emit statusText( i18n( "Buffering %1%" ).tqarg( pcnt ) ); + emit statusText( i18n( "Buffering %1%" ).arg( pcnt ) ); } @@ -289,7 +289,7 @@ HelixEngine::load( const KURL &url, bool isStream ) { const TQString path = url.path(); const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower(); - emit statusText( i18n("No plugin found for the %1 format").tqarg(ext) ); + emit statusText( i18n("No plugin found for the %1 format").arg(ext) ); return false; } diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h index 775d287c..e29fe874 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h @@ -531,7 +531,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Returns the count of the number of Properties under the one * whose name is specified in "pName". * - * pName - IN - name of the Property whose number of tqchildren is to be + * pName - IN - name of the Property whose number of children is to be * retrieved */ STDMETHOD_(INT32, GetNumPropsByName) (THIS_ @@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown) * Returns the count of the number of Properties under the one * whose unique id is specified in "ulId". * - * ulId - IN - unique id of the Property whose number of tqchildren is + * ulId - IN - unique id of the Property whose number of children is * to be retrieved */ STDMETHOD_(INT32, GetNumPropsById) (THIS_ @@ -1594,7 +1594,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Returns the count of the number of Properties under the one * whose name is specified in "pName". * - * pName - IN - name of the Property whose number of tqchildren is to be + * pName - IN - name of the Property whose number of children is to be * retrieved */ STDMETHOD_(INT32, GetNumPropsByName) (THIS_ @@ -1607,7 +1607,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Returns the count of the number of Properties under the one * whose unique id is specified in "ulId". * - * ulId - IN - unique id of the Property whose number of tqchildren is + * ulId - IN - unique id of the Property whose number of children is * to be retrieved */ STDMETHOD_(INT32, GetNumPropsById) (THIS_ @@ -2089,10 +2089,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::GetChildIdListByName * Purpose: - * Get a array which enumerates all of the tqchildren under a + * Get a array which enumerates all of the children under a * property by id. * - * pName - IN - name of the Property whose tqchildren are to be enumerated. + * pName - IN - name of the Property whose children are to be enumerated. * pValues - OUT - array of unique Property id's. * ulCount - OUT - size of the returned pValues array. * @@ -2108,10 +2108,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown) * Method: * IHXRegistry2::GetChildIdListById * Purpose: - * Get a array which enumerates all of the tqchildren under a + * Get a array which enumerates all of the children under a * property by id. * - * ulId - IN - unique id of the Property whose tqchildren are to be enumerated. + * ulId - IN - unique id of the Property whose children are to be enumerated. * pValues - OUT - array of unique Property id's. * ulCount - OUT - size of the returned pValues array. * diff --git a/amarok/src/engine/helix/helix-sp/helix-sp.cpp b/amarok/src/engine/helix/helix-sp/helix-sp.cpp index 4cb58bb7..41c84a1d 100644 --- a/amarok/src/engine/helix/helix-sp/helix-sp.cpp +++ b/amarok/src/engine/helix/helix-sp/helix-sp.cpp @@ -835,7 +835,7 @@ HelixSimplePlayer::~HelixSimplePlayer() { tearDown(); - // only now tqinvalidate the device, not whenever we teardown + // only now invalidate the device, not whenever we teardown delete [] m_device; } diff --git a/amarok/src/engine/helix/hxplayercontrol.cpp b/amarok/src/engine/helix/hxplayercontrol.cpp index fabc8a0d..8cb26939 100644 --- a/amarok/src/engine/helix/hxplayercontrol.cpp +++ b/amarok/src/engine/helix/hxplayercontrol.cpp @@ -69,7 +69,7 @@ PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iam m_inited(false), m_api( HelixSimplePlayer::OSS ), m_device(0), mimehead(0), mimelistlen(0), m_numPlugins(0), m_pluginInfo(0) { - memset(m_tqchildren, 0, sizeof(m_tqchildren)); + memset(m_children, 0, sizeof(m_children)); } PlayerControl::~PlayerControl() @@ -100,7 +100,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co return; } - memset(&m_tqchildren, 0, numPlayers * sizeof(struct playerChildren)); + memset(&m_children, 0, numPlayers * sizeof(struct playerChildren)); m_inited = false; @@ -121,30 +121,30 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co { if (pmapped) { - m_tqchildren[i].current_time = &(pmapped[i].current_time); - m_tqchildren[i].duration = &(pmapped[i].duration); - m_tqchildren[i].md = &(pmapped[i].md); + m_children[i].current_time = &(pmapped[i].current_time); + m_children[i].duration = &(pmapped[i].duration); + m_children[i].md = &(pmapped[i].md); - m_tqchildren[i].m_current = &(pmapped[i].m_current); - m_tqchildren[i].m_consumed = &(pmapped[i].m_consumed); - //m_tqchildren[i].q = pmapped[i].q; + m_children[i].m_current = &(pmapped[i].m_current); + m_children[i].m_consumed = &(pmapped[i].m_consumed); + //m_children[i].q = pmapped[i].q; //for (int j=0; jclearScopeQ(0); if (pmapped) - *m_tqchildren[m_index].m_consumed = *m_tqchildren[m_index].m_current = 0; + *m_children[m_index].m_consumed = *m_children[m_index].m_current = 0; } break; case TEARDOWN: @@ -437,36 +437,36 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co playing = false; if (pmapped) { - *m_tqchildren[m_index].current_time = 0; - *m_tqchildren[m_index].duration = 0; + *m_children[m_index].current_time = 0; + *m_children[m_index].duration = 0; } } if (pmapped) { - *m_tqchildren[m_index].current_time = player->where(0); - *m_tqchildren[m_index].duration = player->duration(0); + *m_children[m_index].current_time = player->where(0); + *m_children[m_index].duration = player->duration(0); HelixSimplePlayer::metaData *md = player->getMetaData(0); if (md) - memcpy((void *) m_tqchildren[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData)); + memcpy((void *) m_children[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData)); struct DelayQueue *item; //int j; while ((item = player->getScopeBuf(0))) { - //j = (*m_tqchildren[m_index].m_current + 1) % NUM_SCOPEBUFS; + //j = (*m_children[m_index].m_current + 1) % NUM_SCOPEBUFS; //cerr << "player:" << m_index << " j=" << j << " time=" << item->time << " etime=" << item->etime << " len=" << item->len << endl; - //m_tqchildren[m_index].q[j].len = item->len; - //m_tqchildren[m_index].q[j].time = item->time; - //m_tqchildren[m_index].q[j].etime = item->etime; - //m_tqchildren[m_index].q[j].nchan = item->nchan; - //m_tqchildren[m_index].q[j].bps = item->bps; - //m_tqchildren[m_index].q[j].tps = item->tps; - //m_tqchildren[m_index].q[j].spb = item->spb; - //memcpy((void *)m_tqchildren[m_index].q[j].buf, (void *) item->buf, item->len ); - //*m_tqchildren[m_index].m_current = j; + //m_children[m_index].q[j].len = item->len; + //m_children[m_index].q[j].time = item->time; + //m_children[m_index].q[j].etime = item->etime; + //m_children[m_index].q[j].nchan = item->nchan; + //m_children[m_index].q[j].bps = item->bps; + //m_children[m_index].q[j].tps = item->tps; + //m_children[m_index].q[j].spb = item->spb; + //memcpy((void *)m_children[m_index].q[j].buf, (void *) item->buf, item->len ); + //*m_children[m_index].m_current = j; //cerr << "player:" << m_index << " time=" << item->time << " etime=" << item->etime << endl; sendscopebuf(wfd, item); delete item; @@ -488,15 +488,15 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co sendsetdevice(); sendinit(); - // wait for ready from tqchildren + // wait for ready from children while (!done && !dead) { dispatch(); done = true; for (i=0; i n) @@ -661,8 +661,8 @@ void PlayerControl::dispatch() ntot = select(n + 1, &rdset, 0, 0, &timeout); for (i=0; ntot && i < nNumPlayers; i++) { - rfd = m_tqchildren[i].m_pipeA[0]; - wfd = m_tqchildren[i].m_pipeB[1]; + rfd = m_children[i].m_pipeA[0]; + wfd = m_children[i].m_pipeB[1]; if ( FD_ISSET(rfd, &rdset) ) { msgid m; @@ -675,14 +675,14 @@ void PlayerControl::dispatch() { case READY: print2stderr("CHILD %d is READY\n", i); - m_tqchildren[i].isready = true;; + m_children[i].isready = true;; break; case DONE: print2stderr("CHILD %d is DONE\n", i); if (!sz) { - m_tqchildren[i].isplaying = false; + m_children[i].isplaying = false; clearScopeQ(i); play_finished(i); } @@ -852,7 +852,7 @@ void PlayerControl::dispatch() } else { - m_tqchildren[i].isdead = true; + m_children[i].isdead = true; return; // should never happen } } @@ -860,16 +860,16 @@ void PlayerControl::dispatch() for (i=0; pmapped && idescription ) ) - .tqarg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); + msg = msg.arg( TQString::fromUtf8( pd->description ) ) + .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); TQCustomEvent *e = new TQCustomEvent( 3002 ); e->setData( new TQString( msg ) ); @@ -1102,7 +1102,7 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engine::SimpleMetaBundle &b) if( b.tracknr.isEmpty() ) b.tracknr = url.filename(); } else { - b.title = TQString(i18n("Track %1")).tqarg(url.filename()); + b.title = TQString(i18n("Track %1")).arg(url.filename()); b.album = i18n("AudioCD"); } } diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui index d7826100..7e55162a 100644 --- a/amarok/src/engine/xine/xineconfigbase.ui +++ b/amarok/src/engine/xine/xineconfigbase.ui @@ -68,7 +68,7 @@ - + AlignCenter @@ -129,7 +129,7 @@ Sound device may be modified after the output plugin has been changed to ALSA or OSS. - + WordBreak|AlignVCenter diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp index e9fef143..b3e8f0cd 100644 --- a/amarok/src/engine/yauap/yauap-engine.cpp +++ b/amarok/src/engine/yauap/yauap-engine.cpp @@ -646,7 +646,7 @@ yauapEngine::getAudioCDContents(const TQString &device, KURL::List &urls) KURL url = TQString(TQString("cdda://").append( strtok_r(reply_ptr,"=",&saveptr))); urls << url; debug() << url << endl; - b.title = TQString( i18n( "Track %1" ) ).tqarg( i+1 ); + b.title = TQString( i18n( "Track %1" ) ).arg( i+1 ); b.length = strtok_r(NULL,"=",&saveptr); b.album = "AudioCD"; b.tracknr = i+1; diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp index d41f5c75..200722e0 100644 --- a/amarok/src/enginecontroller.cpp +++ b/amarok/src/enginecontroller.cpp @@ -120,8 +120,8 @@ EngineController::loadEngine() //static Amarok::StatusBar::instance()->longMessage( i18n( "Sorry, the '%1' could not be loaded, instead we have loaded the '%2'." ) - .tqarg( AmarokConfig::soundSystem() ) - .tqarg( engineName ), + .arg( AmarokConfig::soundSystem() ) + .arg( engineName ), KDE::StatusBar::Sorry ); AmarokConfig::setSoundSystem( engineName ); @@ -143,7 +143,7 @@ EngineController::loadEngine( const TQString &engineName ) DEBUG_BLOCK TQString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'"; - KTrader::OfferList offers = PluginManager::query( query.tqarg( engineName ) ); + KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) ); // sort by rank, TQValueList::operator[] is O(n), so this is quite inefficient #define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt() @@ -155,7 +155,7 @@ EngineController::loadEngine( const TQString &engineName ) // this is the actual engine we want query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] == '%1'"; - offers = PluginManager::query( query.tqarg( engineName ) ) + offers; + offers = PluginManager::query( query.arg( engineName ) ) + offers; foreachType( KTrader::OfferList, offers ) { Amarok::Plugin *plugin = PluginManager::createFromService( *it ); @@ -265,13 +265,13 @@ void EngineController::unplayableNotification() { "

You may want to choose a different engine from the Configure Dialog, or examine " "the installation of the multimedia-framework that the current engine uses. " "

You may find useful information in the FAQ section of the Amarok HandBook." ) - .tqarg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); + .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); } bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/) { KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall" - , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").tqarg(engine) ).first(); + , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").arg(engine) ).first(); if( service ) { TQString installScript = service->exec(); diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp index 2c1993f6..d7b9c973 100644 --- a/amarok/src/equalizerpresetmanager.cpp +++ b/amarok/src/equalizerpresetmanager.cpp @@ -103,7 +103,7 @@ EqualizerPresetManager::slotRename() if ( ok && item->text(0) != title ) { // Check if the new preset title exists if ( m_presets.find( title ) != m_presets.end() ) { - int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) ); + int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) ); if ( button != KMessageBox::Yes ) return; diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp index 2ef25cd1..f20b67ae 100644 --- a/amarok/src/equalizersetup.cpp +++ b/amarok/src/equalizersetup.cpp @@ -370,7 +370,7 @@ EqualizerSetup::addPreset() if (ok) { // Check if the new preset title exists if ( m_presets.find( title ) != m_presets.end() ) { - int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) ); + int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) ); if ( button != KMessageBox::Yes ) return; diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index 11053245..4f63a5d6 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -123,10 +123,10 @@ HTMLView::loadStyleSheet() //we have to set the color for body due to a KHTML bug //KHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 8px; font-size: %1px; color: %2; background-color: %3; font-family: %4; }" ) - .tqarg( pxSize ) - .tqarg( text ) - .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) - .tqarg( fontFamily ); + .arg( pxSize ) + .arg( text ) + .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) + .arg( fontFamily ); TQTextStream eCSSts( &ExternalCSS ); TQString tmpCSS = eCSSts.read(); @@ -188,103 +188,103 @@ HTMLView::loadStyleSheet() //we have to set the color for body due to a KHTML bug //KHTML sets the base color but not the text color styleSheet = TQString( "body { margin: 4px; font-size: %1px; color: %2; background-color: %3; background-image: url( %4 ); background-repeat: repeat; font-family: %5; }" ) - .tqarg( pxSize ) - .tqarg( text ) - .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) - .tqarg( m_bgGradientImage->name() ) - .tqarg( fontFamily ); + .arg( pxSize ) + .arg( text ) + .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) + .arg( m_bgGradientImage->name() ) + .arg( fontFamily ); //text attributes - styleSheet += TQString( "h1 { font-size: %1px; }" ).tqarg( pxSize + 8 ); - styleSheet += TQString( "h2 { font-size: %1px; }" ).tqarg( pxSize + 6 ); - styleSheet += TQString( "h3 { font-size: %1px; }" ).tqarg( pxSize + 4 ); - styleSheet += TQString( "h4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); - styleSheet += TQString( "h5 { font-size: %1px; }" ).tqarg( pxSize + 2 ); - styleSheet += TQString( "h6 { font-size: %1px; }" ).tqarg( pxSize + 1 ); - styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).tqarg( pxSize ).tqarg( text ); + styleSheet += TQString( "h1 { font-size: %1px; }" ).arg( pxSize + 8 ); + styleSheet += TQString( "h2 { font-size: %1px; }" ).arg( pxSize + 6 ); + styleSheet += TQString( "h3 { font-size: %1px; }" ).arg( pxSize + 4 ); + styleSheet += TQString( "h4 { font-size: %1px; }" ).arg( pxSize + 3 ); + styleSheet += TQString( "h5 { font-size: %1px; }" ).arg( pxSize + 2 ); + styleSheet += TQString( "h6 { font-size: %1px; }" ).arg( pxSize + 1 ); + styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).arg( pxSize ).arg( text ); styleSheet += TQString( ".info { display: block; margin-left: 4px; font-weight: normal; }" ); styleSheet += TQString( ".song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); styleSheet += TQString( ".song-title { font-weight: bold; }" ); - styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).tqarg( pxSize + 3 ); + styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).arg( pxSize + 3 ); //box: the base container for every block (border hilighted on hover, 'A' without underlining) - styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).tqarg( bg ); + styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).arg( bg ); styleSheet += TQString( ".box a { text-decoration: none; }" ); - styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).tqarg( text ); + styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).arg( text ); //box contents: header, body, rows and alternate-rows styleSheet += TQString( ".box-header { color: %1; background-color: %2; background-image: url( %4 ); background-repeat: repeat-x; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; }" ) - .tqarg( fg ) - .tqarg( bg ) - .tqarg( pxSize + 2 ) - .tqarg( m_headerGradientImage->name() ); + .arg( fg ) + .arg( bg ) + .arg( pxSize + 2 ) + .arg( m_headerGradientImage->name() ); styleSheet += TQString( ".box-body { padding: 2px; background-color: %1; background-image: url( %2 ); background-repeat: repeat-x; font-size:%3px; }" ) - .tqarg( ContextBrowser::instance()->colorGroup().base().name() ) - .tqarg( m_shadowGradientImage->name() ) - .tqarg( pxSize ); + .arg( ContextBrowser::instance()->colorGroup().base().name() ) + .arg( m_shadowGradientImage->name() ) + .arg( pxSize ); //"Related Artists" related styles styleSheet += TQString( ".box-header-nav { color: %1; background-color: %2; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; text-align: right; }" ) - .tqarg( fg ) - .tqarg( bg ) - .tqarg( pxSize ); + .arg( fg ) + .arg( bg ) + .arg( pxSize ); //"Albums by ..." related styles - styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).tqarg( fg ).tqarg( bg ); - styleSheet += TQString( ".album-header:hover a { color: %1; }" ).tqarg( fg ); - styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).tqarg( ContextBrowser::instance()->colorGroup().base().name() ).tqarg( bg ).tqarg( bg ); + styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).arg( fg ).arg( bg ); + styleSheet += TQString( ".album-header:hover a { color: %1; }" ).arg( fg ); + styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).arg( ContextBrowser::instance()->colorGroup().base().name() ).arg( bg ).arg( bg ); styleSheet += TQString( ".album-title { font-weight: bold; }" ); - styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).tqarg( pxSize ); - styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).tqarg( pxSize ); + styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).arg( pxSize ); + styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).arg( pxSize ); styleSheet += TQString( ".album-image { padding-right: 4px; }" ); styleSheet += TQString( ".album-song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); styleSheet += TQString( ".album-song-trackno { font-weight: bold; }" ); - styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).tqarg( bg ).tqarg( bg ); + styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).arg( bg ).arg( bg ); styleSheet += TQString( ".disc-separator a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" ); - styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg ); + styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg ); styleSheet += TQString( ".button { width: 100%; }" ); //boxes used to display score (sb: score box) styleSheet += TQString( ".sbtext { text-align: right; padding: 0px 4px; }" ); styleSheet += TQString( ".sbinner { height: 8px; background-color: %1; border: solid %2 1px; }" ) - .tqarg( ContextBrowser::instance()->colorGroup().highlight().name() ) - .tqarg( ContextBrowser::instance()->colorGroup().highlightedText().name() ); + .arg( ContextBrowser::instance()->colorGroup().highlight().name() ) + .arg( ContextBrowser::instance()->colorGroup().highlightedText().name() ); styleSheet += TQString( ".sbouter { width: 52px; height: 10px; background-color: %1; border: solid %2 1px; }" ) - .tqarg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ) - .tqarg( ContextBrowser::instance()->colorGroup().highlight().name() ); + .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ) + .arg( ContextBrowser::instance()->colorGroup().highlight().name() ); styleSheet += TQString( ".ratingBox { padding: 0px 4px; }" ); styleSheet += TQString( ".ratingStar { height: 0.9em; }" ); styleSheet += TQString( ".statsBox { border-left: solid %1 1px; }" ) - .tqarg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ); + .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ); styleSheet += TQString( "#current_box-header-album { font-weight: normal; }" ); styleSheet += TQString( "#current_box-information-td { text-align: right; vertical-align: bottom; padding: 3px; }" ); styleSheet += TQString( "#current_box-largecover-td { text-align: left; width: 100px; padding: 0; vertical-align: bottom; }" ); styleSheet += TQString( "#current_box-largecover-image { padding: 4px; vertical-align: bottom; }" ); - styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).tqarg( link ); + styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).arg( link ); styleSheet += TQString( "#wiki_box-body a:hover { text-decoration: underline; }" ); //labels in tag dialog styleSheet += ".label a:hover { font-weight: bold; }"; - styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).tqarg( pxSize ); - styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).tqarg( pxSize + 1 ); - styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).tqarg( pxSize + 2 ); - styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); - styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).tqarg( pxSize + 4); - styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).tqarg( pxSize + 5 ); - styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).tqarg( pxSize + 6 ); - styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).tqarg( pxSize + 7 ); - styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).tqarg( pxSize + 8 ); - styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).tqarg( pxSize + 9 ); + styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).arg( pxSize ); + styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).arg( pxSize + 1 ); + styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).arg( pxSize + 2 ); + styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).arg( pxSize + 3 ); + styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).arg( pxSize + 4); + styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).arg( pxSize + 5 ); + styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).arg( pxSize + 6 ); + styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).arg( pxSize + 7 ); + styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).arg( pxSize + 8 ); + styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).arg( pxSize + 9 ); } return styleSheet; diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp index 42934862..57d3a545 100644 --- a/amarok/src/ktrm.cpp +++ b/amarok/src/ktrm.cpp @@ -162,7 +162,7 @@ protected: short port; tp_GetServer(m_pimp, server, 255, &port); TQString tunepimpHost = TQString(server); - TQString tunepimpHostWithPort = (tunepimpHost + ":%1").tqarg(port); + TQString tunepimpHostWithPort = (tunepimpHost + ":%1").arg(port); for(TQStringList::ConstIterator it = noProxies.constBegin(); it != noProxies.constEnd(); ++it) { TQString normalizedHost = KNetwork::KResolver::normalizeDomain(*it); @@ -731,7 +731,7 @@ void KTRMLookup::puidGenerated() tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track); d->results.clear(); - KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).tqarg( puid ) , false, false ); + KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , false, false ); Amarok::StatusBar::instance()->newProgressOperation( job ) .setDescription( i18n( "MusicBrainz Lookup" ) ); diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp index a7bc1d66..0d5f3937 100644 --- a/amarok/src/lastfm.cpp +++ b/amarok/src/lastfm.cpp @@ -61,9 +61,9 @@ int AmarokHttp::get ( const TQString & path ) { TQString uri = TQString( "http://%1:%2/%3" ) - .tqarg( m_hostname ) - .tqarg( m_port ) - .tqarg( path ); + .arg( m_hostname ) + .arg( m_port ) + .arg( path ); m_done = false; m_error = TQHttp::NoError; @@ -104,7 +104,7 @@ AmarokHttp::slotData(KIO::Job*, const TQByteArray& data) else if ( m_result.size() == 0 ) { m_result = data; } - else if ( m_result.tqresize( m_result.size() + data.size() ) ) { + else if ( m_result.resize( m_result.size() + data.size() ) ) { memcpy( m_result.end(), data.data(), data.size() ); } } @@ -308,17 +308,17 @@ Controller::stationDescription( TQString url ) /// TAG RADIOS // eg: lastfm://globaltag/rock if ( elements[1] == "globaltags" ) - return i18n( "Global Tag Radio: %1" ).tqarg( elements[2] ); + return i18n( "Global Tag Radio: %1" ).arg( elements[2] ); /// ARTIST RADIOS if ( elements[1] == "artist" ) { // eg: lastfm://artist/Queen/similarartists if ( elements[3] == "similarartists" ) - return i18n( "Similar Artists to %1" ).tqarg( elements[2] ); + return i18n( "Similar Artists to %1" ).arg( elements[2] ); if ( elements[3] == "fans" ) - return i18n( "Artist Fan Radio: %1" ).tqarg( elements[2] ); + return i18n( "Artist Fan Radio: %1" ).arg( elements[2] ); } /// CUSTOM STATION @@ -336,7 +336,7 @@ Controller::stationDescription( TQString url ) artists.replace( *it, capitalized ); } - return i18n( "Custom Station: %1" ).tqarg( artists ); + return i18n( "Custom Station: %1" ).arg( artists ); } /// USER RADIOS @@ -344,25 +344,25 @@ Controller::stationDescription( TQString url ) { // eg: lastfm://user/sebr/neighbours if ( elements[3] == "neighbours" ) - return i18n( "%1's Neighbor Radio" ).tqarg( elements[2] ); + return i18n( "%1's Neighbor Radio" ).arg( elements[2] ); // eg: lastfm://user/sebr/personal if ( elements[3] == "personal" ) - return i18n( "%1's Personal Radio" ).tqarg( elements[2] ); + return i18n( "%1's Personal Radio" ).arg( elements[2] ); // eg: lastfm://user/sebr/loved if ( elements[3] == "loved" ) - return i18n( "%1's Loved Radio" ).tqarg( elements[2] ); + return i18n( "%1's Loved Radio" ).arg( elements[2] ); // eg: lastfm://user/sebr/recommended/100 : 100 is number for how obscure the music should be if ( elements[3] == "recommended" ) - return i18n( "%1's Recommended Radio" ).tqarg( elements[2] ); + return i18n( "%1's Recommended Radio" ).arg( elements[2] ); } /// GROUP RADIOS //eg: lastfm://group/Amarok%20users else if ( elements[1] == "group" ) - return i18n( "Group Radio: %1" ).tqarg( elements[2] ); + return i18n( "Group Radio: %1" ).arg( elements[2] ); /// TRACK RADIOS else if ( elements[1] == "play" ) @@ -429,11 +429,11 @@ WebService::handshake( const TQString& username, const TQString& password ) const TQString path = TQString( "/radio/handshake.php?version=%1&platform=%2&username=%3&passwordmd5=%4&debug=%5" ) - .tqarg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform - .tqarg( TQString("Amarok") ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) - .tqarg( KMD5( m_password.utf8() ).hexDigest().data() ) - .tqarg( "0" ); + .arg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform + .arg( TQString("Amarok") ) + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) + .arg( KMD5( m_password.utf8() ).hexDigest().data() ) + .arg( "0" ); http.get( path ); @@ -478,7 +478,7 @@ WebService::handshake( const TQString& username, const TQString& password ) debug() << "Proxy server using port: " << port << endl; delete socket; - m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).tqarg( port ); + m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).arg( port ); m_server = new Amarok::ProcIO(); m_server->setComm( KProcess::Communication( KProcess::AllOutput ) ); @@ -523,8 +523,8 @@ WebService::changeStation( TQString url ) AmarokHttp http( m_baseHost, 80 ); http.get( TQString( m_basePath + "/adjust.php?session=%1&url=%2&debug=0" ) - .tqarg( m_session ) - .tqarg( url ) ); + .arg( m_session ) + .arg( url ) ); m_deletionUnsafe = true; do @@ -568,8 +568,8 @@ WebService::requestMetaData() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); } @@ -655,9 +655,9 @@ WebService::enableScrobbling( bool enabled ) //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( enableScrobblingFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" ) - .tqarg( m_session ) - .tqarg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) + .arg( "0" ) ); } @@ -679,8 +679,8 @@ WebService::love() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loveFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("love, as in affection", "Loving song...") ); } @@ -692,8 +692,8 @@ WebService::skip() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( skipFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("Skipping song...") ); } @@ -705,8 +705,8 @@ WebService::ban() //SLOT connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( banFinished( int, bool ) ) ); http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" ) - .tqarg( m_session ) - .tqarg( "0" ) ); + .arg( m_session ) + .arg( "0" ) ); Amarok::StatusBar::instance()->shortMessage( i18n("Ban, as in dislike", "Banning song...") ); } @@ -763,7 +763,7 @@ WebService::friends( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( friendsFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/friends.xml" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -805,7 +805,7 @@ WebService::neighbours( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( neighboursFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/neighbours.xml" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -847,7 +847,7 @@ WebService::userTags( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( userTagsFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -889,7 +889,7 @@ WebService::recentTracks( TQString username ) connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recentTracksFinished( bool ) ) ); http->get( TQString( "/1.0/user/%1/recenttracks.xml" ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) ); } @@ -931,19 +931,19 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to switch ( type ) { case 0: - modeToken = TQString( "artist_name=%1" ).tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); + modeToken = TQString( "artist_name=%1" ).arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); break; case 1: modeToken = TQString( "album_artist=%1&album_name=%2" ) - .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); + .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); break; case 2: modeToken = TQString( "track_artist=%1&track_name=%2" ) - .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); + .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); break; } @@ -956,10 +956,10 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to TQCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest(); token = TQString( "user=%1&auth=%2&nonce=%3recipient=%4" ) - .tqarg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) - .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); + .arg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) + .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); TQHttpRequestHeader header( "POST", "/1.0/rw/recommend.php?" + token.utf8() ); header.setValue( "Host", "wsdev.audioscrobbler.com" ); diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui index 012aff43..4e1b02c2 100644 --- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui @@ -92,7 +92,7 @@ If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection. - + WordBreak|AlignVCenter diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui index 56a4b2e7..1b8dba3b 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui @@ -74,7 +74,7 @@ You have chosen to purchase the following album from Magnatune.com - + WordBreak|AlignVCenter @@ -614,7 +614,7 @@ The amount you choose to pay will be split 50/50 between the artist and Magnatune.com. Your credit card information is sent directly to Magnatune.com using SSL encryption and is not stored by Amarok. - + WordBreak|AlignVCenter diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp index 0e760495..ea17966c 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp @@ -48,9 +48,9 @@ MagnatuneXmlParser::completeJob( ) { Amarok::StatusBar::instance() ->longMessage( i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" ) - .tqarg( m_nNumberOfTracks ) - .tqarg( m_nNumberOfAlbums ) - .tqarg( m_nNumberOfArtists ), KDE::StatusBar::Information ); + .arg( m_nNumberOfTracks ) + .arg( m_nNumberOfAlbums ) + .arg( m_nNumberOfArtists ), KDE::StatusBar::Information ); emit( doneParsing() ); } diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h index 801e8fd7..f3d8346b 100644 --- a/amarok/src/magnatunebrowser/magnatunexmlparser.h +++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h @@ -97,8 +97,8 @@ private: void parseElement( TQDomElement e ); /** - * Parses all tqchildren of a DOM element - * @param e The element whose tqchildren is to be parsed + * Parses all children of a DOM element + * @param e The element whose children is to be parsed */ void parseChildren( TQDomElement e ); diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index 8cc67f39..5a89e560 100644 --- a/amarok/src/mediabrowser.cpp +++ b/amarok/src/mediabrowser.cpp @@ -630,11 +630,11 @@ MediaBrowser::updateDevices() TQString name = (*it)->name(); if( !(*it)->deviceNode().isEmpty() ) { - name = i18n( "%1 at %2" ).tqarg( name, (*it)->deviceNode() ); + name = i18n( "%1 at %2" ).arg( name, (*it)->deviceNode() ); } if( (*it)->hasMountPoint() && !(*it)->mountPoint().isEmpty() ) { - name += i18n( " (mounted at %1)" ).tqarg( (*it)->mountPoint() ); + name += i18n( " (mounted at %1)" ).arg( (*it)->mountPoint() ); } m_deviceCombo->insertItem( name, i ); if( it == m_currentDevice ) @@ -1127,13 +1127,13 @@ class MediaItemTip : public TQToolTip { if( b->track() ) text = TQString( "%1 - %2 (%3)" ) - .tqarg( TQString::number(b->track()), b->title(), b->prettyLength() ); + .arg( TQString::number(b->track()), b->title(), b->prettyLength() ); if( !b->genre().isEmpty() ) { if( !text.isEmpty() ) text += "
"; text += TQString( "Genre: %1" ) - .tqarg( b->genre() ); + .arg( b->genre() ); } } } @@ -1629,7 +1629,7 @@ MediaBrowser::mediumChanged( const Medium *medium, TQString /*name*/ ) Amarok::StatusBar::instance()->longMessage( i18n( "The device %1 was unmounted before it was synchronized. " "In order to avoid data loss, press the \"Disconnect\" button " - "before unmounting the device." ).tqarg( name ), + "before unmounting the device." ).arg( name ), KDE::StatusBar::Warning ); //(*it)->disconnectDevice(); } @@ -1658,7 +1658,7 @@ MediaBrowser::mediumRemoved( const Medium *medium, TQString name ) Amarok::StatusBar::instance()->longMessage( i18n( "The device %1 was removed before it was disconnected. " "In order to avoid possible data loss, press the \"Disconnect\" " - "button before disconnecting the device." ).tqarg( name ), + "button before disconnecting the device." ).arg( name ), KDE::StatusBar::Warning ); } else @@ -1678,7 +1678,7 @@ MediaBrowser::loadDevicePlugin( const TQString &deviceType ) return 0; TQString query = "[X-KDE-Amarok-plugintype] == 'mediadevice' and [X-KDE-Amarok-name] == '%1'"; - Amarok::Plugin *plugin = PluginManager::createFromQuery( query.tqarg( deviceType ) ); + Amarok::Plugin *plugin = PluginManager::createFromQuery( query.arg( deviceType ) ); if( plugin ) { @@ -1839,13 +1839,13 @@ MediaBrowser::updateStats() TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() ); if(m_queue->childCount() > 0) { - text += i18n(" (%1)").tqarg( KIO::convertSize( queued ) ); + text += i18n(" (%1)").arg( KIO::convertSize( queued ) ); } KIO::filesize_t total, avail; if( currentDevice() && currentDevice()->getCapacity(&total, &avail) ) { - text += i18n( " - %1 of %2 available" ).tqarg( KIO::convertSize( avail ) ).tqarg( KIO::convertSize( total ) ); + text += i18n( " - %1 of %2 available" ).arg( KIO::convertSize( avail ) ).arg( KIO::convertSize( total ) ); m_stats->m_used = total-avail; m_stats->m_total = total; @@ -1884,7 +1884,7 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) it = dynamic_cast(parent->firstChild()); } - bool tqchildrenVisible = false; + bool childrenVisible = false; for( ; it; it = dynamic_cast(it->nextSibling())) { bool visible = true; @@ -1929,13 +1929,13 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent ) visible = true; it->setVisible( visible ); if(visible) - tqchildrenVisible = true; + childrenVisible = true; } if( root && m_device ) m_device->updateRootItems(); - return tqchildrenVisible; + return childrenVisible; } MediaDevice::MediaDevice() @@ -2110,7 +2110,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url ) BundleList bundles; if( !PlaylistFile::isPlaylistFile( url ) ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).tqarg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).arg( url.path() ), KDE::StatusBar::Sorry ); return bundles; } @@ -2118,7 +2118,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url ) PlaylistFile playlist( url.path() ); if( playlist.isError() ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ), KDE::StatusBar::Sorry ); return bundles; } @@ -2253,7 +2253,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli if( playlist.isError() ) { - Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ), + Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ), KDE::StatusBar::Sorry ); return; } @@ -2295,7 +2295,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli if( it->url() == url ) { Amarok::StatusBar::instance()->shortMessage( - i18n( "Track already queued for transfer: %1" ).tqarg( url.url() ) ); + i18n( "Track already queued for transfer: %1" ).arg( url.url() ) ); return; } } @@ -2453,7 +2453,7 @@ int MediaDevice::sysCall( const TQString &command ) sysProc->clearArguments(); (*sysProc) << command; if (!sysProc->start( KProcess::Block, KProcess::AllOutput )) - kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl; + kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl; return (sysProc->exitStatus()); } @@ -2501,7 +2501,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) tryToRemove = true; Amarok::StatusBar::instance()->longMessage( i18n( "Media Device: Copying %1 to %2 failed" ) - .tqarg( src.prettyURL(), dst.prettyURL() ), + .arg( src.prettyURL(), dst.prettyURL() ), KDE::StatusBar::Error ); } else @@ -2512,7 +2512,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst ) tryToRemove = true; // probably s.th. went wrong Amarok::StatusBar::instance()->longMessage( - i18n( "Media Device: Reading tags from %1 failed" ).tqarg( dst.prettyURL() ), + i18n( "Media Device: Reading tags from %1 failed" ).arg( dst.prettyURL() ), KDE::StatusBar::Error ); } } @@ -3051,7 +3051,7 @@ MediaDevice::transferFiles() if( !isPlayable( *bundle ) ) { - Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).tqarg( bundle->url().path() ), + Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).arg( bundle->url().path() ), KDE::StatusBar::Sorry ); unplayable += (*it).url(); transferredItem->setFailed(); @@ -3071,7 +3071,7 @@ MediaDevice::transferFiles() if( !isCanceled() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Failed to copy track to media device: %1" ).tqarg( bundle->url().path() ), + i18n( "Failed to copy track to media device: %1" ).arg( bundle->url().path() ), KDE::StatusBar::Sorry ); transferredItem->setFailed(); } diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index d73a1f89..df78bf80 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -483,7 +483,7 @@ DaapClient::customClicked() if( dialog.exec() == TQDialog::Accepted ) { TQString ip = resolve( dialog.m_base->m_hostName->text() ); if( ip == "0" ) - Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").tqarg( dialog.m_base->m_hostName->text() ) ); + Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").arg( dialog.m_base->m_hostName->text() ) ); else { TQString key = ServerItem::key( dialog.m_base->m_hostName->text(), dialog.m_base->m_portInput->value() ); @@ -735,7 +735,7 @@ ServerItem::setOpen( bool o ) startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - setText( 0, i18n( "Loading %1").tqarg( text( 0 ) ) ); + setText( 0, i18n( "Loading %1").arg( text( 0 ) ) ); Daap::Reader* reader = new Daap::Reader( m_ip, m_port, this, TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() ); @@ -781,7 +781,7 @@ ServerItem::httpError( const TQString& errorString ) { stopAnimation(); resetTitle(); - Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:
%1").tqarg( errorString ) ); + Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:
%1").arg( errorString ) ); m_reader->deleteLater(); m_reader = 0; m_loaded = false; diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp index b0629c9d..38848ec6 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.cpp +++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp @@ -258,7 +258,7 @@ Reader::databaseIdFinished( int /*id*/, bool error ) m_databaseId = TQString::number( dbIdResults["avdb"].asList()[0].asMap()["mlcl"].asList()[0].asMap()["mlit"].asList()[0].asMap()["miid"].asList()[0].asInt() ); connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( songListFinished( int, bool ) ) ); http->getDaap( TQString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2") - .tqarg( m_databaseId, m_loginString ) ); + .arg( m_databaseId, m_loginString ) ); } @@ -388,7 +388,7 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) TQ_INT8 patchLevel; raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel ) TQString version("%1.%2.%3"); - version.tqarg(major, minor, patchLevel); + version.arg(major, minor, patchLevel); addElement( childMap, tag, TQVariant(version) ); } break; diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp index af0fe7f9..1c987c8e 100644 --- a/amarok/src/mediadevice/daap/daapserver.cpp +++ b/amarok/src/mediadevice/daap/daapserver.cpp @@ -71,7 +71,7 @@ DaapServer::readSql() #if DNSSD_SUPPORT KUser current; if( !m_service ) - m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").tqarg( current.fullName() ), "_daap._tcp", line.toInt() ); + m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").arg( current.fullName() ), "_daap._tcp", line.toInt() ); debug() << "port number: " << line.toInt() << endl; m_service->publishAsync(); #endif diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb index 2778fc77..8067d1ef 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb @@ -395,11 +395,11 @@ class TarReader end def close - tqinvalidate + invalidate end private - def tqinvalidate + def invalidate extend InvalidEntry end end diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp index 8bf5cc0f..b1095cd4 100644 --- a/amarok/src/mediadevice/daap/proxy.cpp +++ b/amarok/src/mediadevice/daap/proxy.cpp @@ -56,7 +56,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name) const int port = socket->port(); debug() << "Proxy server using port: " << port << endl; delete socket; - m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").tqarg( port ) ); + m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").arg( port ) ); //start proxy m_proxy->setComm( KProcess::Communication( KProcess::AllOutput ) ); *m_proxy << "amarok_proxy.rb"; diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index dead8cdc..04c7f018 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -113,7 +113,7 @@ class GenericMediaFile , m_device( device ) { m_listed = false; - m_tqchildren = new MediaFileList(); + m_children = new MediaFileList(); if( m_parent ) { @@ -152,8 +152,8 @@ class GenericMediaFile m_parent->removeChild( this ); m_device->getItemMap().erase( m_viewItem ); m_device->getFileMap().erase( m_fullName ); - if ( m_tqchildren ) - delete m_tqchildren; + if ( m_children ) + delete m_children; if ( m_viewItem ) delete m_viewItem; } @@ -174,7 +174,7 @@ class GenericMediaFile } void - removeChild( GenericMediaFile* childToDelete ) { m_tqchildren->remove( childToDelete ); } + removeChild( GenericMediaFile* childToDelete ) { m_children->remove( childToDelete ); } GenericMediaItem* getViewItem() { return m_viewItem; } @@ -209,15 +209,15 @@ class GenericMediaFile } MediaFileList* - getChildren() { return m_tqchildren; } + getChildren() { return m_children; } void deleteAll( bool onlyChildren ) { GenericMediaFile *vmf; - if( m_tqchildren && !m_tqchildren->isEmpty() ) + if( m_children && !m_children->isEmpty() ) { - MediaFileListIterator it( *m_tqchildren ); + MediaFileListIterator it( *m_children ); while( ( vmf = it.current() ) != 0 ) { ++it; @@ -232,9 +232,9 @@ class GenericMediaFile renameAllChildren() { GenericMediaFile *vmf; - if( m_tqchildren && !m_tqchildren->isEmpty() ) + if( m_children && !m_children->isEmpty() ) { - for( vmf = m_tqchildren->first(); vmf; vmf = m_tqchildren->next() ) + for( vmf = m_children->first(); vmf; vmf = m_children->next() ) vmf->renameAllChildren(); } setNamesFromBase(); @@ -244,7 +244,7 @@ class GenericMediaFile TQString m_fullName; TQString m_baseName; GenericMediaFile *m_parent; - MediaFileList *m_tqchildren; + MediaFileList *m_children; GenericMediaItem *m_viewItem; GenericMediaDevice* m_device; bool m_listed; @@ -626,7 +626,7 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle TQString name; while ( parent > 0 ) { - values = CollectionDB::instance()->query( sql.tqarg( parent ) ); + values = CollectionDB::instance()->query( sql.arg( parent ) ); name = values.first(); parent = values.last().toInt(); location += cleanPath( name ) + '/'; diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h index 43a06603..64d1d0fe 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h @@ -255,10 +255,10 @@ GenericMediaDeviceConfigDialog::buildFormatTip() continue; args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); } - args["albumartist"] = i18n( "%1 or %2" ).tqarg( "Album Artist, The" , "The Album Artist" ); + args["albumartist"] = i18n( "%1 or %2" ).arg( "Album Artist, The" , "The Album Artist" ); args["thealbumartist"] = "The Album Artist"; args["theartist"] = "The Artist"; - args["artist"] = i18n( "%1 or %2" ).tqarg( "Artist, The" , "The Artist" ); + args["artist"] = i18n( "%1 or %2" ).arg( "Artist, The" , "The Artist" ); args["initial"] = i18n( "Artist's Initial" ); args["filetype"] = i18n( "File Extension of Source" ); args["track"] = i18n( "Track Number" ); @@ -270,7 +270,7 @@ GenericMediaDeviceConfigDialog::buildFormatTip() it != args.end(); ++it ) { - tooltip += TQString( "

  • %1 - %2" ).tqarg( it.data(), "%" + it.key() ); + tooltip += TQString( "
  • %1 - %2" ).arg( it.data(), "%" + it.key() ); } tooltip += ""; diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp index 03ac3094..7a010f4f 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp @@ -526,14 +526,14 @@ IfpMediaDevice::deleteItemFromDevice( MediaItem *item, int /*flags*/ ) case MediaItem::DIRECTORY: err = ifp_delete_dir_recursive( &m_ifpdev, encodedPath ); debug() << "Deleting folder: " << encodedPath << endl; - checkResult( err, i18n("Directory cannot be deleted: '%1'").tqarg(encodedPath.data()) ); + checkResult( err, i18n("Directory cannot be deleted: '%1'").arg(encodedPath.data()) ); break; default: err = ifp_delete( &m_ifpdev, encodedPath ); debug() << "Deleting file: " << encodedPath << endl; count += 1; - checkResult( err, i18n("File does not exist: '%1'").tqarg(encodedPath.data()) ); + checkResult( err, i18n("File does not exist: '%1'").arg(encodedPath.data()) ); break; } if( err == 0 ) //success @@ -564,7 +564,7 @@ void IfpMediaDevice::listDir( const TQString &dir ) { int err = ifp_list_dirs( &m_ifpdev, TQFile::encodeName( dir ), listDirCallback, this ); - checkResult( err, i18n("Cannot enter directory: '%1'").tqarg(dir) ); + checkResult( err, i18n("Cannot enter directory: '%1'").arg(dir) ); } // will be called by 'ifp_list_dirs' diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index 8729a3e9..b68e819c 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -316,13 +316,13 @@ IpodMediaDevice::IpodMediaDevice() } if( info->capacity > 0.f ) gen->insertItem( i18n( "%1 GB %2 (x%3)" ) - .tqarg( TQString::number( info->capacity ), + .arg( TQString::number( info->capacity ), itdb_info_get_ipod_model_name_string( info->ipod_model ), info->model_number ), index ); else gen->insertItem( i18n( "%1 (x%2)" ) - .tqarg( itdb_info_get_ipod_model_name_string( info->ipod_model ), + .arg( itdb_info_get_ipod_model_name_string( info->ipod_model ), info->model_number ), index ); } @@ -385,12 +385,12 @@ IpodMediaDevice::slotIpodAction( int id ) g_error_free(err); //FIXME: update i18n files for next message Amarok::StatusBar::instance()->longMessage( - i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).tqarg( itunesDir( "Device:SysInfo" ) ) ); + i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).arg( itunesDir( "Device:SysInfo" ) ) ); //FIXME: update i18n files for next message Amarok::StatusBar::instance()->shortMessage( i18n( "Unable to set iPod model to %1 GB %2 (x%3)" ) - .tqarg( TQString::number( table[index].capacity ), + .arg( TQString::number( table[index].capacity ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ), table[index].model_number ) ); } @@ -398,7 +398,7 @@ IpodMediaDevice::slotIpodAction( int id ) { Amarok::StatusBar::instance()->shortMessage( i18n( "Setting iPod model to %1 GB %2 (x%3)" ) - .tqarg( TQString::number( table[index].capacity ), + .arg( TQString::number( table[index].capacity ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ), table[index].model_number ) ); } @@ -684,7 +684,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) if ( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Media Device: Creating directory for file %1 failed" ).tqarg( url.path() ), + i18n( "Media Device: Creating directory for file %1 failed" ).arg( url.path() ), KDE::StatusBar::Error ); return NULL; } @@ -962,7 +962,7 @@ IpodMediaDevice::deleteItemFromDevice(MediaItem *mediaitem, int flags ) if(!(flags & OnlyPlayed) || item->played() > 0 || item->childCount() == 0) { if(item->childCount() > 0) - debug() << "recursive deletion should have removed all tqchildren from " << item << "(" << item->text(0) << ")" << endl; + debug() << "recursive deletion should have removed all children from " << item << "(" << item->text(0) << ")" << endl; else delete item; } @@ -992,9 +992,9 @@ IpodMediaDevice::createLockFile( bool silent ) if( m_lockFile->exists() ) { ok = false; - msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).tqarg( mountPoint() ); + msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).arg( mountPoint() ); msg += i18n( "If you are sure that this is an error, then remove the file %1 and try again." ) - .tqarg( lockFilePath ); + .arg( lockFilePath ); if( !silent ) { @@ -1003,7 +1003,7 @@ IpodMediaDevice::createLockFile( bool silent ) == KMessageBox::Continue ) { msg = i18n( "Media Device: removing lockfile %1 failed: %2. " ) - .tqarg( lockFilePath, m_lockFile->errorString() ); + .arg( lockFilePath, m_lockFile->errorString() ); ok = m_lockFile->remove(); } else @@ -1017,7 +1017,7 @@ IpodMediaDevice::createLockFile( bool silent ) { ok = false; msg = i18n( "Media Device: failed to create lockfile on iPod mounted at %1: %2" ) - .tqarg(mountPoint(), m_lockFile->errorString()); + .arg(mountPoint(), m_lockFile->errorString()); } if( ok ) @@ -1038,7 +1038,7 @@ IpodMediaDevice::initializeIpod() if( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n("Media device: Mount point %1 does not exist").tqarg(mountPoint()), + i18n("Media device: Mount point %1 does not exist").arg(mountPoint()), KDE::StatusBar::Error ); return false; } @@ -1091,7 +1091,7 @@ IpodMediaDevice::initializeIpod() return false; Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: Initialized iPod mounted at %1").tqarg(mountPoint()), + i18n("Media Device: Initialized iPod mounted at %1").arg(mountPoint()), KDE::StatusBar::Information ); return true; @@ -1113,7 +1113,7 @@ IpodMediaDevice::openDevice( bool silent ) if( m_itdb ) { Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: iPod at %1 already opened").tqarg(mountPoint()), + i18n("Media Device: iPod at %1 already opened").arg(mountPoint()), KDE::StatusBar::Sorry ); return false; } @@ -1185,7 +1185,7 @@ IpodMediaDevice::openDevice( bool silent ) if( !m_itdb && canInitialize ) { TQString msg = i18n( "Media Device: could not find iTunesDB on device mounted at %1. " - "Should I try to initialize your iPod?" ).tqarg( mountPoint() ); + "Should I try to initialize your iPod?" ).arg( mountPoint() ); if( !silent && KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ), @@ -1200,7 +1200,7 @@ IpodMediaDevice::openDevice( bool silent ) } Amarok::StatusBar::instance()->longMessage( - i18n("Media Device: Failed to initialize iPod mounted at %1").tqarg(mountPoint()), + i18n("Media Device: Failed to initialize iPod mounted at %1").arg(mountPoint()), KDE::StatusBar::Sorry ); return false; @@ -1236,7 +1236,7 @@ IpodMediaDevice::openDevice( bool silent ) { debug() << "failed to create hash dir " << real << endl; Amarok::StatusBar::instance()->longMessage( - i18n("Media device: Failed to create directory %1").tqarg(real), + i18n("Media device: Failed to create directory %1").arg(real), KDE::StatusBar::Error ); return false; } @@ -1364,7 +1364,7 @@ IpodMediaDevice::detectModel() #endif } if( modelString ) - m_name = TQString( "iPod %1" ).tqarg( TQString::fromUtf8( modelString ) ); + m_name = TQString( "iPod %1" ).arg( TQString::fromUtf8( modelString ) ); if( m_needsFirewireGuid ) { @@ -1372,7 +1372,7 @@ IpodMediaDevice::detectModel() if( !fwid ) { Amarok::StatusBar::instance()->longMessage( - i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").tqarg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) ); + i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").arg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) ); } else g_free( fwid ); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index 3363ef9d..8e0fa969 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -756,7 +756,7 @@ MediaItem } } uint32_t folderId = checkFolderStructure( bundle, false ); - MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).tqarg( folderId ).tqarg( bundle.filename() ) ]; + MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).arg( folderId ).arg( bundle.filename() ) ]; if( file != 0 ) return file; return 0; @@ -1050,7 +1050,7 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem ) // clear cached filename if( deleteItem->type() == MediaItem::TRACK ) - m_fileNameToItem.remove( TQString( "%1/%2" ).tqarg( deleteItem->track()->folderId() ).tqarg( deleteItem->bundle()->filename() ) ); + m_fileNameToItem.remove( TQString( "%1/%2" ).arg( deleteItem->track()->folderId() ).arg( deleteItem->bundle()->filename() ) ); // remove from the media view delete deleteItem; kapp->processEvents( 100 ); @@ -1454,7 +1454,7 @@ MtpMediaItem item->setType( MediaItem::TRACK ); item->setBundle( track->bundle() ); item->track()->setId( track->id() ); - m_fileNameToItem[ TQString( "%1/%2" ).tqarg( track->folderId() ).tqarg( track->bundle()->filename() ) ] = item; + m_fileNameToItem[ TQString( "%1/%2" ).arg( track->folderId() ).arg( track->bundle()->filename() ) ] = item; m_idToTrack[ track->id() ] = track; } return item; diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp index 815f44ce..04d4ce05 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.cpp +++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp @@ -804,7 +804,7 @@ void NjbMediaDevice::expandItem( TQListViewItem *item ) { DEBUG_BLOCK - // First clear the item's tqchildren to repopulate. + // First clear the item's children to repopulate. while( item->firstChild() ) delete item->firstChild(); diff --git a/amarok/src/mediadevice/njb/playlist.cpp b/amarok/src/mediadevice/njb/playlist.cpp index 7afeffd6..6f82dd7f 100644 --- a/amarok/src/mediadevice/njb/playlist.cpp +++ b/amarok/src/mediadevice/njb/playlist.cpp @@ -295,7 +295,7 @@ playlistValueList::readFromDevice( void) NJB_Reset_Get_Playlist( NjbMediaDevice::theNjb()); while( njb_playlist_t* pl = NJB_Get_Playlist( NjbMediaDevice::theNjb()) ) { // FIXME (acejones) Make this a signal - // infoMessage( i18n( "Downloading playlist %1...").tqarg( ++playlists)); + // infoMessage( i18n( "Downloading playlist %1...").arg( ++playlists)); ++playlists; append( NjbPlaylist(pl)); NJB_Playlist_Destroy( pl); diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp index 7dc83c33..df55f032 100644 --- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp +++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp @@ -288,7 +288,7 @@ RioKarmaMediaDevice::openDevice( bool silent ) if( !dir.exists() ) { Amarok::StatusBar::instance()->longMessage( - i18n( "Media device: Mount point %1 does not exist" ).tqarg( mountPoint() ), + i18n( "Media device: Mount point %1 does not exist" ).arg( mountPoint() ), KDE::StatusBar::Error ); return false; } diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp index 1c1018fc..5df195ac 100644 --- a/amarok/src/mediumpluginmanager.cpp +++ b/amarok/src/mediumpluginmanager.cpp @@ -398,30 +398,30 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const TQString labelTextNone = i18n( "(none)" ); TQString row = "
    • "; TQString table; - table += row.tqarg( escapeHTML( i18n( "Autodetected:" ) ), + table += row.arg( escapeHTML( i18n( "Autodetected:" ) ), escapeHTML( medium->isAutodetected() ? i18n("Yes") : i18n("No") ) ); - table += row.tqarg( escapeHTML( i18n( "ID:" ) ), + table += row.arg( escapeHTML( i18n( "ID:" ) ), escapeHTML( medium->id() ) ); - table += row.tqarg( escapeHTML( i18n( "Name:" ) ), + table += row.arg( escapeHTML( i18n( "Name:" ) ), escapeHTML( medium->name() ) ); - table += row.tqarg( escapeHTML( i18n( "Label:" ) ), + table += row.arg( escapeHTML( i18n( "Label:" ) ), escapeHTML( medium->label().isEmpty() ? labelTextNone : medium->label() ) ); - table += row.tqarg( escapeHTML( i18n( "User Label:" ) ), + table += row.arg( escapeHTML( i18n( "User Label:" ) ), escapeHTML( medium->userLabel().isEmpty() ? labelTextNone : medium->userLabel() ) ); - table += row.tqarg( escapeHTML( i18n( "Device Node:" ) ), + table += row.arg( escapeHTML( i18n( "Device Node:" ) ), escapeHTML( medium->deviceNode().isEmpty() ? labelTextNone : medium->deviceNode() ) ); - table += row.tqarg( escapeHTML( i18n( "Mount Point:" ) ), + table += row.arg( escapeHTML( i18n( "Mount Point:" ) ), escapeHTML( medium->mountPoint().isEmpty() ? labelTextNone : medium->mountPoint() ) ); - table += row.tqarg( escapeHTML( i18n( "Mime Type:" ) ), + table += row.arg( escapeHTML( i18n( "Mime Type:" ) ), escapeHTML( medium->mimeType().isEmpty() ? labelTextNone : medium->mimeType() ) ); - TQString title = escapeHTML( i18n( "Device information for %1").tqarg(medium->name() ) ); - TQString details = TQString( "%1
    " "
    \n" ); for ( uint i = 0; i < relArtists.count(); i += 1 ) { @@ -2492,7 +2492,7 @@ CurrentTrackJob::showSongsWithLabel( const TQString &label ) "
    \n" "
    \n" "\n" - + i18n( "Songs with label %1" ).tqarg( label ) + + + i18n( "Songs with label %1" ).arg( label ) + "\n" "
    \n" "\n" ); @@ -2540,7 +2540,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack ) "
    \n" "
    \n" "\n" - + i18n( " Labels for %1 " ).tqarg( escapeHTML( title ) ) + + + i18n( " Labels for %1 " ).arg( escapeHTML( title ) ) + "\n" "
    \n" "
    \n" ); @@ -2555,7 +2555,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack ) } } m_HTMLSource.append( "\n" ); - m_HTMLSource.append( "\n" ); + m_HTMLSource.append( "\n" ); m_HTMLSource.append( "
    " + i18n( "Add labels to %1" ).tqarg( escapeHTML( title ) ) + "
    " + i18n( "Add labels to %1" ).arg( escapeHTML( title ) ) + "
    \n" "
    \n" ); @@ -2588,7 +2588,7 @@ void CurrentTrackJob::showArtistsFaves( const TQString &artist, uint artist_id ) "
    \n" "
    \n" "\n" - + i18n( "Favorite Tracks by %1" ).tqarg( artistName ) + + + i18n( "Favorite Tracks by %1" ).arg( artistName ) + "\n" "
    \n" "\n" ); @@ -2642,7 +2642,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, "
    \n" "
    \n" "\n" - + i18n( "Albums by %1" ).tqarg( artistName ) + + + i18n( "Albums by %1" ).arg( artistName ) + "\n" "
    \n" "
    \n" ); @@ -2744,7 +2744,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id, << TQString::number( artist_id ) << values[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).tqarg( discNumber ) ) ); + << i18n( "Disc %1" ).arg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); if( track.length() > 0 ) { @@ -2806,7 +2806,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti "
    \n" "
    \n" "\n" - + i18n( "Compilations with %1" ).tqarg( artistName ) + + + i18n( "Compilations with %1" ).arg( artistName ) + "\n" "
    \n" "
    \n" ); @@ -2904,7 +2904,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti .args( TQStringList() << values[ i + 1 ] //album.id << escapeHTMLAttr( discNumber ) - << i18n( "Disc %1" ).tqarg( discNumber ) ) ); + << i18n( "Disc %1" ).arg( discNumber ) ) ); } TQString track = albumValues[j + 2].stripWhiteSpace(); @@ -2921,7 +2921,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti TQString tracktitle_formated; TQString tracktitle; - tracktitle = escapeHTML( i18n("%1 - %2").tqarg( albumValues[j + 5], albumValues[j] ) ); + tracktitle = escapeHTML( i18n("%1 - %2").arg( albumValues[j + 5], albumValues[j] ) ); tracktitle_formated = "\n"; if( i==vectorPlace && albumValues[j + 2].toInt() == m_currentTrack.track() && discNumber.toInt() == m_currentTrack.discNumber() ) tracktitle_formated += "\n"; @@ -2966,11 +2966,11 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st rating = 10; TQString table = TQString( "
    %2
    \n" ) - .tqarg( statsbox ? "class='statsBox'" : "" ); + .arg( statsbox ? "class='statsBox'" : "" ); TQString contents; if( AmarokConfig::useScores() ) - contents += TQString( "
    \n" + TQString::number( score ) + "\n" "
    \n" @@ -2982,8 +2982,8 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st if( AmarokConfig::useRatings() ) { - contents += TQString( "
    \n"; if( rating ) { @@ -3002,7 +3002,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st const TQString img = "\n"; for( int i = 0, n = rating / 2; i < n; ++i ) - contents += img.tqarg( TQString("data:image/png;base64," + fullStar) ); + contents += img.arg( TQString("data:image/png;base64," + fullStar) ); if( rating % 2 ) { TQImageIO halfStarIO; @@ -3014,7 +3014,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st halfStarIO.write(); halfStarBuf.close(); TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true ); - contents += img.tqarg( TQString("data:image/png;base64," + halfStar) ); + contents += img.arg( TQString("data:image/png;base64," + halfStar) ); } contents += "\n"; } @@ -3024,7 +3024,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st "
    %1%2
    %2
    " ).tqarg( title, table ); + TQString title = escapeHTML( i18n( "Device information for %1").arg(medium->name() ) ); + TQString details = TQString( "%1
    " "%2
    " ).arg( title, table ); (void)new TQLabel( i18n("Name: "), this ); (void)new TQLabel( medium->name(), this ); (void)new KActiveLabel( i18n( "(Details)" ) - .tqarg( Amarok::escapeHTMLAttr( details ) ), this ); + .arg( Amarok::escapeHTMLAttr( details ) ), this ); (void)new TQLabel( i18n("Plugin:"), this ); m_pluginCombo = new KComboBox( false, this ); diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp index be64494b..1159fe20 100644 --- a/amarok/src/metabundle.cpp +++ b/amarok/src/metabundle.cpp @@ -1051,7 +1051,7 @@ MetaBundle::prettyTitle() const if( s.isEmpty() ) s = title(); else - s = i18n("%1 - %2").tqarg( artist(), title() ); + s = i18n("%1 - %2").arg( artist(), title() ); if( s.isEmpty() ) s = prettyTitle( filename() ); @@ -1067,7 +1067,7 @@ MetaBundle::veryNiceTitle() const if( !title().isEmpty() ) { if( !artist().isEmpty() ) - s = i18n( "%1 by %2" ).tqarg( title(), artist() ); + s = i18n( "%1 by %2" ).arg( title(), artist() ); else s = title(); } @@ -1146,10 +1146,10 @@ MetaBundle::veryPrettyTime( int time ) switch( s.count() ) { - case 1: return i18n( "seconds", "%1s" ).tqarg( s[0] ); - case 2: return i18n( "minutes, seconds", "%2m %1s" ).tqarg( s[0], s[1] ); - case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).tqarg( s[0], s[1], s[2] ); - case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).tqarg( s[0], s[1], s[2], s[3] ); + case 1: return i18n( "seconds", "%1s" ).arg( s[0] ); + case 2: return i18n( "minutes, seconds", "%2m %1s" ).arg( s[0], s[1] ); + case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).arg( s[0], s[1], s[2] ); + case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).arg( s[0], s[1], s[2], s[3] ); default: return "omg bug!"; } } @@ -1208,13 +1208,13 @@ MetaBundle::fuzzyTime( int time ) TQString hours = i18n( "1 hour", "%n hours", hr ); if( week ) - return weeks.tqarg( day ? days.tqarg("") : "" ).simplifyWhiteSpace(); + return weeks.arg( day ? days.arg("") : "" ).simplifyWhiteSpace(); else if ( day ) - return days.tqarg( hr ? hours : "" ).simplifyWhiteSpace(); + return days.arg( hr ? hours : "" ).simplifyWhiteSpace(); else if ( hr ) - return i18n( "%1:%2 hours" ).tqarg( hr ).tqarg( zeroPad( min ) ); + return i18n( "%1:%2 hours" ).arg( hr ).arg( zeroPad( min ) ); else - return i18n( "%1:%2").tqarg( min ).tqarg( zeroPad( secs ) ); + return i18n( "%1:%2").arg( min ).arg( zeroPad( secs ) ); } TQString @@ -1271,7 +1271,7 @@ MetaBundle::ratingList() TQStringList list; list += ratingDescription( 0 ); for ( int i = 1; i<=10; i++ ) - list += s.tqarg( prettyRating( i, true ) ).tqarg( ratingDescription( i ) ); + list += s.arg( prettyRating( i, true ) ).arg( ratingDescription( i ) ); return list; } diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h index 5a8a9dbc..a6a217ce 100644 --- a/amarok/src/metabundle.h +++ b/amarok/src/metabundle.h @@ -420,7 +420,7 @@ private: static inline TQString prettyGeneric( const TQString &s, const int i ) { - return (i > 0) ? s.tqarg( i ) : (i == Undetermined) ? "?" : "-"; + return (i > 0) ? s.arg( i ) : (i == Undetermined) ? "?" : "-"; } void init( TagLib::AudioProperties *ap = 0 ); @@ -533,7 +533,7 @@ inline TQString MetaBundle::prettySampleRate( bool shortened ) const return prettyGeneric( i18n( "SampleRate", "%1 Hz" ), m_sampleRate ); } -inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).tqarg( i ) : TQString::number( i ); } +inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).arg( i ) : TQString::number( i ); } inline bool MetaBundle::hasExtendedMetaInformation() const { diff --git a/amarok/src/metadata/m4a/mp4file.h b/amarok/src/metadata/m4a/mp4file.h index c1da43d6..9e40dbc9 100644 --- a/amarok/src/metadata/m4a/mp4file.h +++ b/amarok/src/metadata/m4a/mp4file.h @@ -104,7 +104,7 @@ namespace TagLib { /*! * This will remove all tags. * - * \note This will also tqinvalidate pointers to the tags + * \note This will also invalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/metadata/trueaudio/ttafile.h b/amarok/src/metadata/trueaudio/ttafile.h index 3a97a9ef..2cb07856 100644 --- a/amarok/src/metadata/trueaudio/ttafile.h +++ b/amarok/src/metadata/trueaudio/ttafile.h @@ -154,7 +154,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also tqinvalidate pointers to the tags + * \note This will also invalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/metadata/wavpack/wvfile.h b/amarok/src/metadata/wavpack/wvfile.h index 18f2316e..6c57f6d7 100644 --- a/amarok/src/metadata/wavpack/wvfile.h +++ b/amarok/src/metadata/wavpack/wvfile.h @@ -136,7 +136,7 @@ namespace TagLib { * This will remove the tags that match the OR-ed together TagTypes from the * file. By default it removes all tags. * - * \note This will also tqinvalidate pointers to the tags + * \note This will also invalidate pointers to the tags * as their memory will be freed. * \note In order to make the removal permanent save() still needs to be called */ diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp index 36748064..a67e31cc 100644 --- a/amarok/src/moodbar.cpp +++ b/amarok/src/moodbar.cpp @@ -972,7 +972,7 @@ Moodbar::draw( int width, int height ) m_mutex.lock(); - // Do we have to tqrepaint, or can we use the cache? + // Do we have to repaint, or can we use the cache? if( m_pixmap.width() == width && m_pixmap.height() == height ) { m_mutex.unlock(); diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp index 00a6e4d0..4520bf4a 100644 --- a/amarok/src/mountpointmanager.cpp +++ b/amarok/src/mountpointmanager.cpp @@ -210,7 +210,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath m_handlerMapMutex.unlock(); TQStringList lastMountPoint = CollectionDB::instance()->query( TQString( "SELECT lastmountpoint FROM devices WHERE id = %1" ) - .tqarg( deviceId ) ); + .arg( deviceId ) ); if ( lastMountPoint.count() == 0 ) { //hmm, no device with that id in the DB...serious problem @@ -471,10 +471,10 @@ MountPointManager::migrateStatistics() int deviceid = getIdForUrl( *it ); TQString rpath = getRelativePath( deviceid, *it ); TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) - .tqarg( deviceid ) - .tqarg( CollectionDB::instance()->escapeString( rpath ) ); + .arg( deviceid ) + .arg( CollectionDB::instance()->escapeString( rpath ) ); update += TQString( " WHERE url = '%1' AND deviceid = -2;" ) - .tqarg( CollectionDB::instance()->escapeString( *it ) ); + .arg( CollectionDB::instance()->escapeString( *it ) ); CollectionDB::instance()->query( update ); } } @@ -539,15 +539,15 @@ void UrlUpdateJob::updateStatistics( ) int statCount = collDB->query( TQString( "SELECT COUNT( url ) FROM statistics WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( newDeviceid ) - .tqarg( collDB->escapeString( newRpath ) ) ).first().toInt(); + .arg( newDeviceid ) + .arg( collDB->escapeString( newRpath ) ) ).first().toInt(); if( statCount ) continue; //statistics row with new URL/deviceid values already exists TQString sql = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) - .tqarg( newDeviceid ).tqarg( collDB->escapeString( newRpath ) ); + .arg( newDeviceid ).arg( collDB->escapeString( newRpath ) ); sql += TQString( " WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( deviceid ).tqarg( collDB->escapeString( rpath ) ); + .arg( deviceid ).arg( collDB->escapeString( rpath ) ); collDB->query( sql ); } } @@ -576,7 +576,7 @@ void UrlUpdateJob::updateLabels( ) //only update rows if there is not already a row with the new deviceid/rpath and the same labelid TQStringList labelids = collDB->query( TQString( "SELECT labelid FROM tags_labels WHERE deviceid = %1 AND url = '%2';" ) - .tqarg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) ); + .arg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) ); TQString existingLabelids; if( !labelids.isEmpty() ) { @@ -591,8 +591,8 @@ void UrlUpdateJob::updateLabels( ) } TQString sql = TQString( "UPDATE tags_labels SET deviceid = %1, url = '%2' " "WHERE deviceid = %3 AND url = '%4'%5;" ) - .tqarg( newDeviceid ) - .tqarg( collDB->escapeString( newRpath ), + .arg( newDeviceid ) + .arg( collDB->escapeString( newRpath ), TQString::number( deviceid ), collDB->escapeString( rpath ), existingLabelids ); diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 97f8d31b..2f2082d0 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -124,7 +124,7 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style ) mainLayout->setAutoAdd( true ); } - viewport() ->tqrepaint(); + viewport() ->repaint(); } void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) @@ -219,8 +219,8 @@ void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev ) void MultiTabBarInternal::resizeEvent( TQResizeEvent *ev ) { /* kdDebug()<<"MultiTabBarInternal::resizeEvent"<tqgeometry()<geometry()<setTabsPosition( m_position ); - viewport() ->tqrepaint(); + viewport() ->repaint(); } @@ -584,13 +584,13 @@ void MultiTabBarButton::slotClicked() void MultiTabBarButton::setPosition( MultiTabBar::MultiTabBarPosition pos ) { m_position = pos; - tqrepaint(); + repaint(); } void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style ) { m_style = style; - tqrepaint(); + repaint(); } void MultiTabBarButton::hideEvent( TQHideEvent* he ) @@ -660,12 +660,12 @@ void MultiTabBarButton::slotAnimTimer() { if ( m_animEnter ) { m_animCount += 1; - tqrepaint( false ); + repaint( false ); if ( m_animCount >= ANIM_MAX ) m_animTimer->stop(); } else { m_animCount -= 1; - tqrepaint( false ); + repaint( false ); if ( m_animCount <= 0 ) m_animTimer->stop(); } @@ -754,7 +754,7 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos ) } setPosition( pos ); - // tqrepaint(); + // repaint(); } void MultiTabBarTab::setIcon( const TQString& icon ) @@ -785,7 +785,7 @@ void MultiTabBarTab::slotClicked() if ( m_animTimer->isActive() ) { m_animCount = ANIM_MAX; m_animTimer->stop(); - tqrepaint(); + repaint(); } updateState(); @@ -1295,7 +1295,7 @@ void MultiTabBar::fontChange( const TQFont& /* oldFont */ ) { for ( uint i = 0;i < tabs() ->count();i++ ) tabs() ->at( i ) ->resize(); - tqrepaint(); + repaint(); } TQPtrList* MultiTabBar::tabs() { return m_internal->tabs();} diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui index 934adaf7..af4ea8b1 100644 --- a/amarok/src/newdynamic.ui +++ b/amarok/src/newdynamic.ui @@ -302,7 +302,7 @@ - + AlignVCenter diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h index 1d2f517b..a86a217b 100644 --- a/amarok/src/organizecollectiondialog.ui.h +++ b/amarok/src/organizecollectiondialog.ui.h @@ -65,10 +65,10 @@ TQString OrganizeCollectionDialog::buildFormatTip() continue; args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); } - args["albumartist"] = i18n( "%1 or %2" ).tqarg( i18n("This feature only works with \"The\", so either don't translate it at all, or only translate artist and album", "Album Artist, The") , i18n("The Album Artist") ); + args["albumartist"] = i18n( "%1 or %2" ).arg( i18n("This feature only works with \"The\", so either don't translate it at all, or only translate artist and album", "Album Artist, The") , i18n("The Album Artist") ); args["thealbumartist"] = i18n( "The Album Artist" ); args["theartist"] = i18n( "The Artist" ); - args["artist"] = i18n( "%1 or %2" ).tqarg( i18n( "This feature only works with \"The\", so either don't translate it at all, or only translate Artist", "Artist, The") , i18n( "The Artist") ); + args["artist"] = i18n( "%1 or %2" ).arg( i18n( "This feature only works with \"The\", so either don't translate it at all, or only translate Artist", "Artist, The") , i18n( "The Artist") ); args["folder"] = i18n( "Collection Base Folder" ); args["initial"] = i18n( "Artist's Initial" ); args["filetype"] = i18n( "File Extension of Source" ); @@ -81,7 +81,7 @@ TQString OrganizeCollectionDialog::buildFormatTip() it != args.end(); ++it ) { - tooltip += TQString( "
  • %1 - %2" ).tqarg( it.data(), "%" + it.key() ); + tooltip += TQString( "
  • %1 - %2" ).arg( it.data(), "%" + it.key() ); } tooltip += ""; diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index ed5cab0d..d4da12bf 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -52,7 +52,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) , m_duration( 2000 ) , m_timer( new TQTimer( this ) ) - , m_tqalignment( Middle ) + , m_alignment( Middle ) , m_screen( 0 ) , m_y( MARGIN ) , m_drawShadow( false ) @@ -118,7 +118,7 @@ OSDWidget::volChanged( unsigned char volume ) { m_volume = true; m_newvolume = volume; - m_text = m_newvolume ? i18n("Volume: %1%").tqarg( m_newvolume ) : i18n("Mute"); + m_text = m_newvolume ? i18n("Volume: %1%").arg( m_newvolume ) : i18n("Mute"); show(); } @@ -247,7 +247,7 @@ OSDWidget::determineMetrics( const uint M ) const TQRect screen = TQApplication::desktop()->screenGeometry( m_screen ); TQPoint newPos( MARGIN, m_y ); - switch( m_tqalignment ) + switch( m_alignment ) { case Left: break; @@ -349,8 +349,8 @@ OSDWidget::render( const uint M, const TQSize &size ) const uint shadowSize = static_cast( m_scaledCover.width() / 100.0 * 6.0 ); const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); - const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( m_scaledCover.width() + shadowSize ) - .tqarg( m_scaledCover.height() + shadowSize ); + const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( m_scaledCover.width() + shadowSize ) + .arg( m_scaledCover.height() + shadowSize ); if ( TQFile::exists( folder + file ) ) shadow.load( folder + file ); else { @@ -670,11 +670,11 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) if( destination.y() > maxY ) destination.ry() = maxY; if( eGlobalPosX < (hcenter-snapZone) ) { - m_tqalignment = Left; + m_alignment = Left; destination.rx() = MARGIN; } else if( eGlobalPosX > (hcenter+snapZone) ) { - m_tqalignment = Right; + m_alignment = Right; destination.rx() = screen.width() - MARGIN - width(); } else { @@ -685,10 +685,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e ) if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) ) { - m_tqalignment = Center; + m_alignment = Center; destination.ry() = vcenter - height()/2; } - else m_tqalignment = Middle; + else m_alignment = Middle; } destination += screen.topLeft(); @@ -760,7 +760,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot : ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " " : i18n(" - "); append += ( parens.contains( column ) ? "(%1)" : "%1" ); - text += append.tqarg( tags.at( column + 1 ) ); + text += append.arg( tags.at( column + 1 ) ); } } else diff --git a/amarok/src/osd.h b/amarok/src/osd.h index eaf0a4f4..c79b419e 100644 --- a/amarok/src/osd.h +++ b/amarok/src/osd.h @@ -57,7 +57,7 @@ class OSDWidget : public TQWidget void setTextColor( const TQColor &color ) { setPaletteForegroundColor( color ); } void setBackgroundColor(const TQColor &color ) { setPaletteBackgroundColor( color ); } void setOffset( int y ) { m_y = y; } - void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; } + void setAlignment( Alignment alignment ) { m_alignment = alignment; } void setImage( const TQImage &image ) { m_cover = image; } void setScreen( int screen ); void setText( const TQString &text ) { m_text = text; } @@ -88,7 +88,7 @@ class OSDWidget : public TQWidget int m_duration; TQTimer *m_timer; - Alignment m_tqalignment; + Alignment m_alignment; int m_screen; uint m_y; bool m_drawShadow; @@ -116,7 +116,7 @@ public: OSDPreviewWidget( TQWidget *parent ); int screen() { return m_screen; } - int tqalignment() { return m_tqalignment; } + int alignment() { return m_alignment; } int y() { return m_y; } public slots: diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index 0c17e6da..cccc85ca 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -57,7 +57,7 @@ namespace Amarok TQString file = !filename.endsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1"; TQPixmap pix; - TQImage img( locate( "data", file.tqarg( filename ) ), "PNG" ); + TQImage img( locate( "data", file.arg( filename ) ), "PNG" ); if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( img )); else pix.convertFromImage( img ); return pix; @@ -68,7 +68,7 @@ namespace Amarok TQString file = !filename.endsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1"; TQPixmap pix; - TQImage img( locate( "data", TQString( "amarok/images/%1.jpg" ).tqarg( filename ) ), "JPEG" ); + TQImage img( locate( "data", TQString( "amarok/images/%1.jpg" ).arg( filename ) ), "JPEG" ); if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( img )); else pix.convertFromImage( img ); return pix; @@ -100,7 +100,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl , m_pAnalyzer( 0 ) { //the createWidget template function is used here - //createWidget just creates a widget which has it's tqgeometry set too + //createWidget just creates a widget which has it's geometry set too // Sets caption and icon correctly (needed e.g. for GNOME) kapp->setTopWidget( this ); @@ -381,7 +381,7 @@ void PlayerWidget::engineNewMetaData( const MetaBundle &bundle, bool ) if( m_rateString.isEmpty() ) m_rateString = Hz; else - m_rateString = i18n("%1 kBit - %2").tqarg( m_rateString, Hz ); + m_rateString = i18n("%1 kBit - %2").arg( m_rateString, Hz ); } TQStringList list( bundle.prettyTitle() ); @@ -774,15 +774,15 @@ void PlayerWidget::mousePressEvent( TQMouseEvent *e ) { //Amarok::Menu::instance()->exec( e->globalPos() ); } - else if ( m_pAnalyzer->tqgeometry().contains( e->pos() ) ) + else if ( m_pAnalyzer->geometry().contains( e->pos() ) ) { createAnalyzer( e->state() & TQt::ControlButton ? -1 : +1 ); } else { TQRect - rect = m_pTimeLabel->tqgeometry(); - rect |= m_pTimeSign->tqgeometry(); + rect = m_pTimeLabel->geometry(); + rect |= m_pTimeSign->geometry(); if ( rect.contains( e->pos() ) ) { diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index 3f36e2cd..99ac390c 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -1755,7 +1755,7 @@ TQPair Playlist::toolTipText( TQWidget*, const TQPoint &pos ) text = text.replace( "&", "&" ).replace( "<", "<" ).replace( ">", ">" ); if( item->isCurrent() ) { - text = TQString("%1").tqarg( text ); + text = TQString("%1").arg( text ); Amarok::ToolTip::s_hack = 1; //HACK for precise positioning } return TQPair( text, globalRect ); @@ -2372,7 +2372,7 @@ Playlist::paletteChange( const TQPalette &p ) KListView::paletteChange( p ); counter = 0; // reset the counter or apparently the text lacks contrast - slotGlowTimer(); // tqrepaint currentTrack marker + slotGlowTimer(); // repaint currentTrack marker } void @@ -2737,7 +2737,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e ) KPopupMenu popup; if( mouseOverColumn >= 0 ) - popup.insertItem( i18n("&Hide %1").tqarg( columnText( mouseOverColumn ) ), HIDE ); //TODO + popup.insertItem( i18n("&Hide %1").arg( columnText( mouseOverColumn ) ), HIDE ); //TODO KPopupMenu sub; for( int i = 0; i < columns(); ++i ) //columns() references a property @@ -3124,10 +3124,10 @@ Playlist::saveXML( const TQString &path ) const TQString title = ( dynamicMode()->title() ).replace( "&", "&" ) .replace( "<", "<" ) .replace( ">", ">" ); - dynamic = TQString(" dynamicMode=\"%1\"").tqarg( title ); + dynamic = TQString(" dynamicMode=\"%1\"").arg( title ); } stream << TQString( "\n" ) - .tqarg( "Amarok" ).tqarg( Amarok::xmlVersion() ).tqarg( dynamic ); + .arg( "Amarok" ).arg( Amarok::xmlVersion() ).arg( dynamic ); for( MyIt it( this, MyIt::All ); *it; ++it ) { @@ -3529,7 +3529,7 @@ Playlist::copyToClipboard( const TQListViewItem *item ) const //SLOT TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); - Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).tqarg( text ), + Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).arg( text ), TQImage(CollectionDB::instance()->albumImage(*playlistItem )) ); } } @@ -3594,7 +3594,7 @@ Playlist::changeFromQueueManager(TQPtrList list) m_nextTracks = list; PLItemList in, out; - // make sure we tqrepaint items no longer queued + // make sure we repaint items no longer queued for( PlaylistItem* item = oldQueue.first(); item; item = oldQueue.next() ) if( !m_nextTracks.containsRef( item ) ) out << item; @@ -3604,7 +3604,7 @@ Playlist::changeFromQueueManager(TQPtrList list) emit queueChanged( in, out ); - // tqrepaint newly queued or altered queue items + // repaint newly queued or altered queue items if( dynamicMode() ) sortQueuedItems(); else @@ -3777,7 +3777,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S Amarok::actionCollection()->action("playlist_shuffle")->plug( &popup ); m = PlaylistBrowser::instance()->findDynamicModeByTitle( AmarokConfig::lastDynamicMode() ); if( m ) - popup.insertItem( SmallIconSet( Amarok::icon( "dynamic" ) ), i18n("L&oad %1").tqarg( m->title().replace( '&', "&&" ) ), ENABLEDYNAMIC); + popup.insertItem( SmallIconSet( Amarok::icon( "dynamic" ) ), i18n("L&oad %1").arg( m->title().replace( '&', "&&" ) ), ENABLEDYNAMIC); } switch(popup.exec(p)) { @@ -3915,11 +3915,11 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S popup.insertItem( trackColumn ? i18n("Iteratively Assign Track &Numbers") : i18n("&Write '%1' for Selected Tracks") - .tqarg( KStringHandler::rsqueeze( tag, 30 ).replace( "&", "&&" ) ), FILL_DOWN ); + .arg( KStringHandler::rsqueeze( tag, 30 ).replace( "&", "&&" ) ), FILL_DOWN ); popup.insertItem( SmallIconSet( Amarok::icon( "edit" ) ), (itemCount == 1 ? i18n( "&Edit Tag '%1'" ) - : i18n( "&Edit '%1' Tag for Selected Tracks" )).tqarg( tagName ), EDIT ); + : i18n( "&Edit '%1' Tag for Selected Tracks" )).arg( tagName ), EDIT ); popup.insertItem( SmallIconSet( Amarok::icon( "info" ) ) , item->url().isLocalFile() ? @@ -4646,7 +4646,7 @@ Playlist::slotMoodbarPrefs( bool show, bool moodier, int alter, bool withMusic ) { // No need to call moodbar().load(), since that will happen // automatically next time it's displayed. We do have to - // tqrepaint so that they get displayed though. + // repaint so that they get displayed though. for( PlaylistIterator it( this, PlaylistIterator::All ) ; *it ; ++it ) { @@ -4700,7 +4700,7 @@ Playlist::slotEraseMarker() //SLOT { const TQRect spot = drawDropVisualizer( 0, 0, m_marker ); m_marker = 0; - viewport()->tqrepaint( spot, false ); + viewport()->repaint( spot, false ); } } @@ -4960,7 +4960,7 @@ TagWriter::completeJob() // we write a space for some reason I cannot recall m_item->setExactText( m_tagType, m_oldTagString.isEmpty() ? " " : m_oldTagString ); Amarok::StatusBar::instance()->longMessage( i18n( - "Sorry, the tag for %1 could not be changed." ).tqarg( m_item->url().fileName() ), KDE::StatusBar::Sorry ); + "Sorry, the tag for %1 could not be changed." ).arg( m_item->url().fileName() ), KDE::StatusBar::Sorry ); break; case false: diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp index ae60a990..8819e1b4 100644 --- a/amarok/src/playlistbrowser.cpp +++ b/amarok/src/playlistbrowser.cpp @@ -562,21 +562,21 @@ void PlaylistBrowser::loadLastfmStreams( const bool subscriber /*false*/ ) } TQString user = AmarokConfig::scrobblerUsername(); - KURL url( TQString("lastfm://user/%1/neighbours").tqarg( user ) ); + KURL url( TQString("lastfm://user/%1/neighbours").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, tagsFolder, url, i18n( "Neighbor Radio" ) ); last->setKept( false ); - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/recommended/100").tqarg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/recommended/100").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Recommended Radio" ) ); last->setKept( false ); if( subscriber ) { - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/personal").tqarg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/personal").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Personal Radio" ) ); last->setKept( false ); - url = KURL::fromPathOrURL( TQString("lastfm://user/%1/loved").tqarg( user ) ); + url = KURL::fromPathOrURL( TQString("lastfm://user/%1/loved").arg( user ) ); last = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Loved Radio" ) ); last->setKept( false ); } @@ -668,7 +668,7 @@ void PlaylistBrowser::addSmartPlaylist( TQListViewItem *parent ) //SLOT if ( sp && sp->title() == dialog.name() ) { if( KMessageBox::warningContinueCancel( PlaylistWindow::self(), - i18n( "A Smart Playlist named \"%1\" already exists. Do you want to overwrite it?" ).tqarg( dialog.name() ), + i18n( "A Smart Playlist named \"%1\" already exists. Do you want to overwrite it?" ).arg( dialog.name() ), i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue ) { delete item; @@ -773,7 +773,7 @@ void PlaylistBrowser::updateSmartPlaylistElement( TQDomElement& query ) sql.replace( selectFromSearch, "SELECT (*ListOfFields*) FROM" ); if ( limitSearch.search( sql ) != -1 ) sql.replace( limitSearch, - TQString( "LIMIT %1 OFFSET %2").tqarg( limitSearch.capturedTexts()[2].toInt() ).tqarg( limitSearch.capturedTexts()[1].toInt() ) ); + TQString( "LIMIT %1 OFFSET %2").arg( limitSearch.capturedTexts()[2].toInt() ).arg( limitSearch.capturedTexts()[1].toInt() ) ); text.setData( sql ); break; @@ -817,7 +817,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query() ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query() ); last->setKept( false ); } @@ -837,7 +837,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query() ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query() ); last->setKept( false ); } @@ -857,7 +857,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabArtist, *it ); - last = new SmartPlaylist( item, last, i18n( "By %1" ).tqarg( *it ), qbTemp.query( true ) ); + last = new SmartPlaylist( item, last, i18n( "By %1" ).arg( *it ), qbTemp.query( true ) ); last->setKept( false ); } @@ -903,7 +903,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists() QueryBuilder qbTemp( qb ); qbTemp.addMatch( QueryBuilder::tabGenre, *it ); - last = new SmartPlaylist( item, last, i18n( "%1" ).tqarg( *it ), qbTemp.query( true ) ); + last = new SmartPlaylist( item, last, i18n( "%1" ).arg( *it ), qbTemp.query( true ) ); last->setKept( false ); } @@ -1179,7 +1179,7 @@ DEBUG_BLOCK channel = new PodcastChannel( parent, channel, *it ); bool hasNew = CollectionDB::instance()->query( TQString("SELECT COUNT(parent) FROM podcastepisodes WHERE ( parent='%1' AND isNew=%2 ) LIMIT 1" ) - .tqarg( (*it).url().url(), CollectionDB::instance()->boolT() ) ) + .arg( (*it).url().url(), CollectionDB::instance()->boolT() ) ) .first().toInt() > 0; channel->setNew( hasNew ); @@ -1241,7 +1241,7 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder ) if( folder != m_podcastCategory ) { if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration - { // we add the folder to the db, set the id and then update all the tqchildren + { // we add the folder to the db, set the id and then update all the children int parentId = static_cast(folder->parent())->id(); int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() ); folder->setId( newId ); @@ -1314,7 +1314,7 @@ void PlaylistBrowser::configurePodcasts( TQListViewItem *parent ) } } if( !podcastChannelList.isEmpty() ) - configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").tqarg( parent->text( 0 ) ) ); + configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").arg( parent->text( 0 ) ) ); } void PlaylistBrowser::configureSelectedPodcasts() @@ -1438,7 +1438,7 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent ) { Amarok::StatusBar::instance()->longMessage( i18n( "Already subscribed to feed %1 as %2" ) - .tqarg( url.prettyURL(), channel->title() ), + .arg( url.prettyURL(), channel->title() ), KDE::StatusBar::Sorry ); return; } @@ -1540,7 +1540,7 @@ bool PlaylistBrowser::deletePodcasts( TQPtrList items ) } #undef ch /// we don't need to delete from the database, because removing the channel from the database - /// automatically removes the tqchildren as well. + /// automatically removes the children as well. m_podcastItemsToScan.remove( static_cast(*it) ); } CollectionDB::instance()->removePodcastChannel( static_cast(*it)->url() ); @@ -1789,7 +1789,7 @@ bool PlaylistBrowser::savePlaylist( const TQString &path, const TQValueListparent(); - if( parent && parent->isSelected() ) //parent will remove tqchildren + if( parent && parent->isSelected() ) //parent will remove children continue; if (parent) { @@ -2278,7 +2278,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT if( lastfmCount ) saveLastFm(); } -// remove podcast folders. we need to do this recursively to ensure all tqchildren are removed from the db +// remove podcast folders. we need to do this recursively to ensure all children are removed from the db void PlaylistBrowser::removePodcastFolder( PlaylistCategory *item ) { if( !item ) return; @@ -2744,7 +2744,7 @@ void PlaylistBrowserView::eraseMarker() //SLOT spot = drawDropVisualizer( 0, 0, m_marker ); m_marker = 0; - viewport()->tqrepaint( spot, false ); + viewport()->repaint( spot, false ); } } @@ -3006,7 +3006,7 @@ void PlaylistBrowserView::startDrag() textdrag->setSubtype( "amarok-sql" ); drag->addDragObject( textdrag ); } - itemList += KURL::fromPathOrURL( TQString("smartplaylist://%1").tqarg( item->text(0) ) ); + itemList += KURL::fromPathOrURL( TQString("smartplaylist://%1").arg( item->text(0) ) ); pixText = (*it)->text(0); } @@ -3020,7 +3020,7 @@ void PlaylistBrowserView::startDrag() TQTextDrag *textdrag = new TQTextDrag( str, 0 ); textdrag->setSubtype( "dynamic" ); drag->addDragObject( textdrag ); - itemList += KURL::fromPathOrURL( TQString("dynamic://%1").tqarg( item->text(0) ) ); + itemList += KURL::fromPathOrURL( TQString("dynamic://%1").arg( item->text(0) ) ); pixText = (*it)->text(0); } @@ -3054,12 +3054,12 @@ TQString PlaylistDialog::getSaveFileName( const TQString &suggestion, bool propo if( !suggestion.isEmpty() ) { TQString path = Amarok::saveLocation("playlists/") + "%1" + ".m3u"; - if( TQFileInfo( path.tqarg( suggestion ) ).exists() && !proposeOverwriting ) + if( TQFileInfo( path.arg( suggestion ) ).exists() && !proposeOverwriting ) { int n = 2; - while( TQFileInfo( path.tqarg( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ) ).exists() ) + while( TQFileInfo( path.arg( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) ) ).exists() ) n++; - dialog.edit->setText( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ); + dialog.edit->setText( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) ); } else dialog.edit->setText( suggestion ); @@ -3099,7 +3099,7 @@ void PlaylistDialog::slotOk() if( !TQFileInfo( result ).exists() || KMessageBox::warningContinueCancel( PlaylistWindow::self(), - i18n( "A playlist named \"%1\" already exists. Do you want to overwrite it?" ).tqarg( edit->text() ), + i18n( "A playlist named \"%1\" already exists. Do you want to overwrite it?" ).arg( edit->text() ), i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue ) { KDialogBase::slotOk(); @@ -3243,7 +3243,7 @@ InfoPane::setInfo( const TQString &title, const TQString &info ) "
    • " - "" ).tqarg( title, info_ ) : + "" ).arg( title, info_ ) : TQString() ); } diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 05270649..2297d5a9 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -514,7 +514,7 @@ PlaylistCategory::showContextMenu( const TQPoint &position ) break; } name = i18n("Folder"); - if( c ) name = i18n("Folder %1").tqarg(c); + if( c ) name = i18n("Folder %1").arg(c); if( tracker == firstChild() && !isCategory( tracker ) ) tracker = 0; newFolder = new PlaylistCategory( this, tracker, name, true ); @@ -642,7 +642,7 @@ void PlaylistEntry::load() startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - //delete all tqchildren, so that we don't duplicate things + //delete all children, so that we don't duplicate things while( firstChild() ) delete firstChild(); @@ -791,7 +791,7 @@ void PlaylistEntry::customEvent( TQCustomEvent *e ) /** * We destroy the tracks on collapsing the entry. However, if we are using dynamic mode, then we leave them - * because adding from a custom list is problematic if the entry has no tqchildren. Using load() is not effective + * because adding from a custom list is problematic if the entry has no children. Using load() is not effective * since this is a threaded operation and would require pulling apart the entire class to make it work. */ @@ -814,7 +814,7 @@ void PlaylistEntry::setOpen( bool open ) } else if( !isDynamic() || !m_dynamic ) { //collapse - //delete all tqchildren + //delete all children while( firstChild() ) delete firstChild(); @@ -855,10 +855,10 @@ void PlaylistEntry::updateInfo() TQString str = ""; - str += body.tqarg( i18n( "Playlist" ), text(0) ); - str += body.tqarg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); - str += body.tqarg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); - str += body.tqarg( i18n( "Location" ), m_url.prettyURL() ); + str += body.arg( i18n( "Playlist" ), text(0) ); + str += body.arg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); + str += body.arg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); + str += body.arg( i18n( "Location" ), m_url.prettyURL() ); str += "
    "; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -1065,7 +1065,7 @@ PlaylistTrackItem::PlaylistTrackItem( TQListViewItem *parent, TQListViewItem *af if( p && p->text( 0 ).contains( info->artist() ) ) setText( 0, info->title() ); else - setText( 0, i18n("%1 - %2").tqarg( info->artist(), info->title() ) ); + setText( 0, i18n("%1 - %2").arg( info->artist(), info->title() ) ); } const KURL &PlaylistTrackItem::url() @@ -1121,7 +1121,7 @@ void PlaylistTrackItem::showContextMenu( const TQPoint &position ) TagDialog* dialog = new TagDialog( url() ); dialog->show(); } - else KMessageBox::sorry( PlaylistBrowser::instance(), i18n( "This file does not exist: %1" ).tqarg( url().path() ) ); + else KMessageBox::sorry( PlaylistBrowser::instance(), i18n( "This file does not exist: %1" ).arg( url().path() ) ); } } @@ -1212,7 +1212,7 @@ void StreamEntry::updateInfo() TQString str = ""; - str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); + str += body.arg( i18n( "URL" ), m_url.prettyURL() ); str += "
    "; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -2057,7 +2057,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) if( !guid.isEmpty() ) { command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( guid ) ); TQStringList values = CollectionDB::instance()->query( command ); return !values.isEmpty(); @@ -2066,7 +2066,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) TQString episodeTitle = xml.namedItem( "title" ).toElement().text(); KURL episodeURL = xml.namedItem( "enclosure" ).toElement().attribute( "url" ); command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( episodeURL.url() ), CollectionDB::instance()->escapeString( episodeTitle ) ); TQStringList values = CollectionDB::instance()->query( command ); @@ -2080,7 +2080,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) if( !guid.isEmpty() ) { command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( guid ) ); TQStringList values = CollectionDB::instance()->query( command ); return !values.isEmpty(); @@ -2099,7 +2099,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType ) } command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") - .tqarg( CollectionDB::instance()->escapeString( url().url() ), + .arg( CollectionDB::instance()->escapeString( url().url() ), CollectionDB::instance()->escapeString( episodeURL ), CollectionDB::instance()->escapeString( episodeTitle ) ); TQStringList values = CollectionDB::instance()->query( command ); @@ -2136,15 +2136,15 @@ PodcastChannel::updateInfo() TQString str = ""; - str += body.tqarg( i18n( "Description" ), description() ); - str += body.tqarg( i18n( "Website" ), link().prettyURL() ); - str += body.tqarg( i18n( "Copyright" ), copyright() ); - str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); + str += body.arg( i18n( "Description" ), description() ); + str += body.arg( i18n( "Website" ), link().prettyURL() ); + str += body.arg( i18n( "Copyright" ), copyright() ); + str += body.arg( i18n( "URL" ), m_url.prettyURL() ); str += "
    "; str += i18n( "

     Episodes

      " ); for( TQListViewItem *c = firstChild(); c; c = c->nextSibling() ) { - str += TQString("
    • %1
      • ").tqarg( static_cast(c)->title() ); + str += TQString("
    • %1
      • ").arg( static_cast(c)->title() ); } str += "
    "; @@ -2565,7 +2565,7 @@ PodcastEpisode::downloadMedia() Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob ) .setDescription( title().isEmpty() ? i18n( "Downloading Podcast Media" ) - : i18n( "Downloading Podcast \"%1\"" ).tqarg( title() ) ) + : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) ) .setAbortSlot( this, TQT_SLOT( abortDownload()) ) .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) ); @@ -2794,13 +2794,13 @@ PodcastEpisode::updateInfo() TQString str = ""; - //str += body.tqarg( i18n( "Title" ), m_bundle.title() ); - str += body.tqarg( i18n( "Description" ), m_bundle.description() ); - str += body.tqarg( i18n( "Date" ), m_bundle.date() ); - str += body.tqarg( i18n( "Author" ), m_bundle.author() ); - str += body.tqarg( i18n( "Type" ), m_bundle.type() ); - str += body.tqarg( i18n( "URL" ), m_bundle.url().prettyURL() ); - str += body.tqarg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); + //str += body.arg( i18n( "Title" ), m_bundle.title() ); + str += body.arg( i18n( "Description" ), m_bundle.description() ); + str += body.arg( i18n( "Date" ), m_bundle.date() ); + str += body.arg( i18n( "Author" ), m_bundle.author() ); + str += body.arg( i18n( "Type" ), m_bundle.type() ); + str += body.arg( i18n( "URL" ), m_bundle.url().prettyURL() ); + str += body.arg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); str += "
    "; PlaylistBrowser::instance()->setInfo( text(0), str ); @@ -2977,7 +2977,7 @@ class AssociatePodcastDialog : public KDialogBase public: AssociatePodcastDialog( PodcastEpisode *item ) - : KDialogBase( Amarok::mainWindow(), "associatepodcastdialog", true, i18n("Select Local File for %1").tqarg(item->title()), Ok|Cancel, Ok, false ) + : KDialogBase( Amarok::mainWindow(), "associatepodcastdialog", true, i18n("Select Local File for %1").arg(item->title()), Ok|Cancel, Ok, false ) { TQVBox* vbox = makeVBoxMainWidget(); vbox->setSpacing( KDialog::spacingHint() ); @@ -3069,7 +3069,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) static TQStringList years; static TQStringList labels; - //Delete all tqchildren before + //Delete all children before while( firstChild() ) delete firstChild(); @@ -3086,7 +3086,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) genres = CollectionDB::instance()->genreList(); } foreach( genres ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3096,7 +3096,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) artists = CollectionDB::instance()->artistList(); } foreach( artists ) { - m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3106,7 +3106,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) composers = CollectionDB::instance()->composerList(); } foreach( composers ) { - m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "By %1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3116,7 +3116,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) albums = CollectionDB::instance()->albumList(); } foreach( albums ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3126,7 +3126,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) years = CollectionDB::instance()->yearList(); } foreach( years ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace( "(*ExpandString*)", *it) ); } @@ -3136,7 +3136,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml ) labels = CollectionDB::instance()->labelList(); } foreach( labels ) { - m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).tqarg( *it ), TQString(queryChildren).replace("(*ExpandString*)", *it) ); + m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), TQString(queryChildren).replace("(*ExpandString*)", *it) ); } } } @@ -3328,8 +3328,8 @@ SmartPlaylist::xmlToQuery(const TQDomElement &xml, bool forExpand /* = false */) // expand by, if needed if ( forExpand ) { - // TODO: The most efficient way would be to pass the tqchildren the XML - // and what to expand by, then have the tqchildren compute the query as needed. + // TODO: The most efficient way would be to pass the children the XML + // and what to expand by, then have the children compute the query as needed. // This could save a few megs of RAM for queries, but this patch is getting // too big already, right now. Ovy TQDomNodeList expandbyList = xml.elementsByTagName( "expandby" ); diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h index 3f0ae8db..6a711625 100644 --- a/amarok/src/playlistbrowseritem.h +++ b/amarok/src/playlistbrowseritem.h @@ -163,7 +163,7 @@ class PlaylistEntry : public PlaylistBrowserEntry PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); ~PlaylistEntry(); - void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its tqchildren */ }; //reimplemented + void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its children */ }; //reimplemented void load(); @@ -361,13 +361,13 @@ class PodcastChannel : public PlaylistBrowserEntry void setNew( const bool n = true ); bool hasNew() const { return m_new; } - // iterate over all tqchildren and explicitly check if there are any episodes which have not been listened + // iterate over all children and explicitly check if there are any episodes which have not been listened // to. Mark the channel as new/listened after doing this. void checkAndSetNew(); void setListened( const bool n = true ); // over rides each child so it has been listened - void setOpen( bool open ); // if !m_polished, load the tqchildren. Lazy loading to improve start times + void setOpen( bool open ); // if !m_polished, load the children. Lazy loading to improve start times void load(); const bool isPolished() const { return m_polished; } @@ -555,7 +555,7 @@ class SmartPlaylist : public PlaylistBrowserEntry bool m_dynamic; // Build the query for a given xml object. If \p for expand is true, - // insert (*ExpandString*) as placeholders for tqchildrens' filters + // insert (*ExpandString*) as placeholders for childrens' filters static TQString xmlToQuery( const TQDomElement &xml, bool forExpand = false ); }; diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index 0bed908e..7515ef6c 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -575,7 +575,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co s_pixmapChanged = false; } - // Determine if we need to tqrepaint the pixmap, or paint from cache + // Determine if we need to repaint the pixmap, or paint from cache if ( paintCache[column].map.find( colorKey ) == paintCache[column].map.end() ) { // Update painting cache @@ -934,7 +934,7 @@ void PlaylistItem::moodbarJobEvent( int newState ) { (void) newState; // want to redraw nomatter what the new state is if( AmarokConfig::showMoodbar() ) - tqrepaint(); + repaint(); // Don't automatically resort because it's annoying } diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp index 7ec0a255..657cfd40 100644 --- a/amarok/src/playlistloader.cpp +++ b/amarok/src/playlistloader.cpp @@ -324,9 +324,9 @@ UrlLoader::completeJob() for ( uint it = 0; it < m_badURLs.count(); it++ ) { if( it < 5 ) - text += TQString("
    %1").tqarg( m_badURLs[it].prettyURL() ); + text += TQString("
    %1").arg( m_badURLs[it].prettyURL() ); else if( it == 5 ) - text += TQString("
    Plus %1 more").tqarg( m_badURLs.count() - it ); + text += TQString("
    Plus %1 more").arg( m_badURLs.count() - it ); debug() << "\t" << m_badURLs[it] << endl; } diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp index 8035dcaa..bc5f9503 100644 --- a/amarok/src/playlistwindow.cpp +++ b/amarok/src/playlistwindow.cpp @@ -562,7 +562,7 @@ void PlaylistWindow::createGUI() //TEXT ON RIGHT HACK //KToolBarButtons have independent settings for their appearance. //KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar - //KToolBar::setIconText() calls modeChange() for tqchildren, unless 2nd param is false + //KToolBar::setIconText() calls modeChange() for children, unless 2nd param is false TQStringList list; list << "toolbutton_playlist_add" @@ -856,7 +856,7 @@ void PlaylistWindow::savePlaylist() const //SLOT } if( useArtist && useAlbum ) - title = i18n("%1 - %2").tqarg( artist, album ); + title = i18n("%1 - %2").arg( artist, album ); else if( useArtist ) title = artist; else if( useAlbum ) @@ -922,7 +922,7 @@ void PlaylistWindow::playLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -933,7 +933,7 @@ void PlaylistWindow::addLastfmPersonal() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/personal" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -944,7 +944,7 @@ void PlaylistWindow::playLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); } @@ -955,7 +955,7 @@ void PlaylistWindow::addLastfmNeighbor() //SLOT if( !LastFm::Controller::checkCredentials() ) return; const KURL url( TQString( "lastfm://user/%1/neighbours" ) - .tqarg( AmarokConfig::scrobblerUsername() ) ); + .arg( AmarokConfig::scrobblerUsername() ) ); Playlist::instance()->insertMedia( url ); } @@ -1248,7 +1248,7 @@ void DynamicTitle::setTitle(const TQString& newTitle) void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) { TQPainter p; - p.tqbegin( this, false ); + p.begin( this, false ); TQPen pen( colorGroup().highlightedText(), 0, TQt::NoPen ); p.setPen( pen ); p.setBrush( colorGroup().highlight() ); diff --git a/amarok/src/pluginmanager.cpp b/amarok/src/pluginmanager.cpp index 9164bc12..fbbce323 100644 --- a/amarok/src/pluginmanager.cpp +++ b/amarok/src/pluginmanager.cpp @@ -95,8 +95,8 @@ PluginManager::createFromService( const KService::Ptr service ) if ( !lib ) { KMessageBox::error( 0, i18n( "

    KLibLoader could not load the plugin:
    %1

    " "

    Error message:
    %2

    " ) - .tqarg( service->library() ) - .tqarg( loader->lastErrorMessage() ) ); + .arg( service->library() ) + .arg( loader->lastErrorMessage() ) ); return 0; } //look up address of init function and cast it to pointer-to-function @@ -174,12 +174,12 @@ PluginManager::showAbout( const TQString &constraint ) TQString str = ""; - str += body.tqarg( i18n( "Name" ), s->name() ); - str += body.tqarg( i18n( "Library" ), s->library() ); - str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) ); - str += body.tqarg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() ); - str += body.tqarg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() ); + str += body.arg( i18n( "Name" ), s->name() ); + str += body.arg( i18n( "Library" ), s->library() ); + str += body.arg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Email" ), s->property( "X-KDE-Amarok-email" ).toStringList().join( "\n" ) ); + str += body.arg( i18n( "Version" ), s->property( "X-KDE-Amarok-version" ).toString() ); + str += body.arg( i18n( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() ); str += "
    "; diff --git a/amarok/src/podcastsettings.cpp b/amarok/src/podcastsettings.cpp index 84f8f1f2..700ce186 100644 --- a/amarok/src/podcastsettings.cpp +++ b/amarok/src/podcastsettings.cpp @@ -63,7 +63,7 @@ PodcastSettings::PodcastSettings( const TQString &title, const TQString &save, c } PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* parent ) - : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").tqarg( settings->m_title ) + : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").arg( settings->m_title ) , KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel , KDialogBase::Ok, true , KGuiItem(i18n("Reset"), "reset" ) ) @@ -74,7 +74,7 @@ PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidge } PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList &list, const TQString &caption, TQWidget* parent ) - : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").tqarg( caption ) + : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").arg( caption ) , KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel , KDialogBase::Ok, true , KGuiItem(i18n("Reset"), "reset" ) ) diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp index f76c3fa7..cec41390 100644 --- a/amarok/src/queuemanager.cpp +++ b/amarok/src/queuemanager.cpp @@ -373,7 +373,7 @@ QueueManager::addItems( TQListViewItem *after ) if( current.find( item ) == current.end() ) //avoid duplication { - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); after = new QueueItem( m_listview, after, title ); m_map[ after ] = item; @@ -416,7 +416,7 @@ QueueManager::addQueuedItem( PlaylistItem *item ) TQValueList current = m_map.values(); TQValueListIterator newItem = current.find( item ); - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); if( newItem == current.end() ) //avoid duplication { @@ -434,7 +434,7 @@ QueueManager::removeQueuedItem( PlaylistItem *item ) TQValueList current = m_map.values(); TQValueListIterator newItem = current.find( item ); - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); TQListViewItem *removableItem = m_listview->findItem( title, 0 ); @@ -478,7 +478,7 @@ QueueManager::insertItems() for( PlaylistItem *item = list.first(); item; item = list.next() ) { - TQString title = i18n("%1 - %2").tqarg( item->artist(), item->title() ); + TQString title = i18n("%1 - %2").arg( item->artist(), item->title() ); last = new QueueItem( m_listview, last, title ); m_map[ last ] = item; diff --git a/amarok/src/refreshimages.cpp b/amarok/src/refreshimages.cpp index 8967f978..cc81b341 100644 --- a/amarok/src/refreshimages.cpp +++ b/amarok/src/refreshimages.cpp @@ -52,9 +52,9 @@ RefreshImages::RefreshImages() TQString url = TQString("http://webservices.amazon.%1/onca/xml?Service=AWSECommerceService&SubscriptionId=%2&Operation=ItemLookup&ItemId=%3&ResponseGroup=Small,Images") - .tqarg(localeToTLD(locale)) - .tqarg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe - .tqarg(asin); + .arg(localeToTLD(locale)) + .arg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe + .arg(asin); debug() << url << endl; diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp index cb68dc58..fee95fd1 100644 --- a/amarok/src/scancontroller.cpp +++ b/amarok/src/scancontroller.cpp @@ -189,7 +189,7 @@ ScanController::initIncremental() const TQStringList values = CollectionDB::instance()->query( TQString( "SELECT deviceid, dir, changedate FROM directories WHERE deviceid IN (%1);" ) - .tqarg( deviceIds ) ); + .arg( deviceIds ) ); foreach( values ) { diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp index 0eee095f..a1af8b02 100644 --- a/amarok/src/scriptmanager.cpp +++ b/amarok/src/scriptmanager.cpp @@ -339,12 +339,12 @@ ScriptManager::requestNewScore( const TQString &url, double prevscore, int playc m_scripts[script].process->writeStdin( TQString( "requestNewScore %6 %1 %2 %3 %4 %5" ) - .tqarg( prevscore ) - .tqarg( playcount ) - .tqarg( length ) - .tqarg( percentage ) - .tqarg( reason ) - .tqarg( KURL::encode_string( url ) ) ); //last because it might have %s + .arg( prevscore ) + .arg( playcount ) + .arg( length ) + .arg( percentage ) + .arg( reason ) + .arg( KURL::encode_string( url ) ) ); //last because it might have %s } //////////////////////////////////////////////////////////////////////////////// @@ -435,7 +435,7 @@ ScriptManager::slotInstallScript( const TQString& path ) const TQString scriptFolder = destination + archiveDir->entries().first(); if( TQFile::exists( scriptFolder ) ) { KMessageBox::error( 0, i18n( "A script with the name '%1' is already installed. " - "Please uninstall it first." ).tqarg( archiveDir->entries().first() ) ); + "Please uninstall it first." ).arg( archiveDir->entries().first() ) ); return false; } @@ -512,7 +512,7 @@ ScriptManager::slotUninstallScript() { const TQString name = m_gui->listView->currentItem()->text( 0 ); - if( KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to uninstall the script '%1'?" ).tqarg( name ), i18n("Uninstall Script"), i18n("Uninstall") ) == KMessageBox::Cancel ) + if( KMessageBox::warningContinueCancel( 0, i18n( "Are you sure you want to uninstall the script '%1'?" ).arg( name ), i18n("Uninstall Script"), i18n("Uninstall") ) == KMessageBox::Cancel ) return; if( m_scripts.find( name ) == m_scripts.end() ) @@ -610,7 +610,7 @@ ScriptManager::slotRunScript( bool silent ) { if( !silent ) KMessageBox::sorry( 0, i18n( "

    Could not start the script %1.

    " - "

    Please make sure that the file has execute (+x) permissions.

    " ).tqarg( name ) ); + "

    Please make sure that the file has execute (+x) permissions.

    " ).arg( name ) ); delete script; return false; } @@ -674,11 +674,11 @@ ScriptManager::slotAboutScript() TQString(), KDialogBase::Ok, KDialogBase::Ok, this ); kapp->setTopWidget( about ); - about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).tqarg( name ) ) ); + about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) ); about->setProduct( "", "", "", "" ); // Get rid of the confusing KDE version text TQLabel* product = static_cast( TQT_TQWIDGET(about->mainWidget()->child( "version" )) ); - if( product ) product->setText( i18n( "%1 Amarok Script" ).tqarg( name ) ); + if( product ) product->setText( i18n( "%1 Amarok Script" ).arg( name ) ); about->addTextPage( i18n( "About" ), readme.readAll(), true ); if( license.open( IO_ReadOnly ) ) @@ -726,7 +726,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos ) KTextEdit* editor = new KTextEdit( it.data().log ); kapp->setTopWidget( editor ); - editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).tqarg( it.key() ) ) ); + editor->setCaption( kapp->makeStdCaption( i18n( "Output Log for %1" ).arg( it.key() ) ) ); editor->setReadOnly( true ); TQFont font( "fixed" ); @@ -780,7 +780,7 @@ ScriptManager::scriptFinished( KProcess* process ) //SLOT // Check if there was an error on exit if( process->normalExit() && process->exitStatus() != 0 ) KMessageBox::detailedError( 0, i18n( "The script '%1' exited with error code: %2" ) - .tqarg( it.key() ).tqarg( process->exitStatus() ) + .arg( it.key() ).arg( process->exitStatus() ) ,it.data().log ); // Destroy script process diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp index d3a49e51..131ac63b 100644 --- a/amarok/src/scrobbler.cpp +++ b/amarok/src/scrobbler.cpp @@ -439,10 +439,10 @@ void ScrobblerSubmitter::performHandshake() "&c=%2" "&v=%3" "&u=%4" ) - .tqarg( PROTOCOL_VERSION ) - .tqarg( CLIENT_ID ) - .tqarg( CLIENT_VERSION ) - .tqarg( m_username ); + .arg( PROTOCOL_VERSION ) + .arg( CLIENT_ID ) + .arg( CLIENT_VERSION ) + .arg( m_username ); } else if ( PROTOCOL_VERSION == "1.2" ) @@ -464,12 +464,12 @@ void ScrobblerSubmitter::performHandshake() "&u=%4" "&t=%5" "&a=%6" ) - .tqarg( PROTOCOL_VERSION ) - .tqarg( CLIENT_ID ) - .tqarg( CLIENT_VERSION ) - .tqarg( m_username ) - .tqarg( currentTime ) - .tqarg( KMD5( KMD5( m_password.utf8() ).hexDigest() + + .arg( PROTOCOL_VERSION ) + .arg( CLIENT_ID ) + .arg( CLIENT_VERSION ) + .arg( m_username ) + .arg( currentTime ) + .arg( KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest().data() ); } @@ -1000,7 +1000,7 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ if ( success ) { if ( tracks == 1 ) - _short = i18n( "'%1' submitted to last.fm" ).tqarg( item->title() ); + _short = i18n( "'%1' submitted to last.fm" ).arg( item->title() ); else { _short = i18n( "Several tracks submitted to last.fm" ); @@ -1008,20 +1008,20 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ _long = "

    "; _long = i18n( "'%1' and one other track submitted", "'%1' and %n other tracks submitted", tracks-1 ) - .tqarg( item->title() ); + .arg( item->title() ); } } else { if ( tracks == 1 ) - _short = i18n( "Failed to submit '%1' to last.fm" ).tqarg( item->title() ); + _short = i18n( "Failed to submit '%1' to last.fm" ).arg( item->title() ); else { _short = i18n( "Failed to submit several tracks to last.fm" ); _long = "

    "; _long = i18n( "Failed to submit '%1' and one other track", "Failed to submit '%1' and %n other tracks", tracks-1 ) - .tqarg( item->title() ); + .arg( item->title() ); } } diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp index 67d6f3b1..7295f368 100644 --- a/amarok/src/sliderwidget.cpp +++ b/amarok/src/sliderwidget.cpp @@ -406,12 +406,12 @@ Amarok::VolumeSlider::slotAnimTimer() //SLOT { if ( m_animEnter ) { m_animCount++; - tqrepaint( false ); + repaint( false ); if ( m_animCount == ANIM_MAX - 1 ) m_animTimer->stop(); } else { m_animCount--; - tqrepaint( false ); + repaint( false ); if ( m_animCount == 0 ) m_animTimer->stop(); } diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp index a49052ac..bd94b520 100644 --- a/amarok/src/smartplaylisteditor.cpp +++ b/amarok/src/smartplaylisteditor.cpp @@ -322,7 +322,7 @@ void SmartPlaylistEditor::updateOrderTypes( int index ) } if( currentOrderType < m_orderTypeCombo->count() ) m_orderTypeCombo->setCurrentItem( currentOrderType ); - m_orderTypeCombo->setFont(m_orderTypeCombo->font()); // tqinvalidate size hint + m_orderTypeCombo->setFont(m_orderTypeCombo->font()); // invalidate size hint m_orderTypeCombo->updateGeometry(); } @@ -641,7 +641,7 @@ TQString CriteriaEditor::getSearchCriteria() else if( m_dateCombo->currentItem() == 1 ) //months time=86400*30*n; else time=86400*365*n; //years - value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").tqarg(time) + "(*CurrentTimeT*)"; + value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").arg(time) + "(*CurrentTimeT*)"; } else { TQDateTime datetime1( m_dateEdit1->date() ); diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index 280b55e1..be0650c1 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -1551,7 +1551,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** ** Conversions between UTF-16be and UTF-16le are always done in place and do -** not tqinvalidate a prior pointer, though of course the content of the buffer +** not invalidate a prior pointer, though of course the content of the buffer ** that the prior pointer points to will have been modified. Other kinds ** of conversion are done in place when it is possible, but sometime it is ** not possible and in those cases prior pointers are invalidated. @@ -2045,7 +2045,7 @@ SQLITE_API int sqlite3_sleep(int); ** file directory. ** ** Once [sqlite3_open()] has been called, changing this variable will -** tqinvalidate the current temporary database, if any. Generally speaking, +** invalidate the current temporary database, if any. Generally speaking, ** it is not safe to invoke this routine after [sqlite3_open()] has ** been called. */ @@ -19084,7 +19084,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ ** ** The master journal file contains the names of all child journals. ** To tell if a master journal can be deleted, check to each of the -** tqchildren. If all tqchildren are either missing or do not refer to +** children. If all children are either missing or do not refer to ** a different master journal, then this master journal can be deleted. */ static int pager_delmaster(const char *zMaster){ @@ -22474,7 +22474,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ ** 8 4 Right child (the Ptr(N) value). Omitted on leaves. ** ** The flags define the format of this btree page. The leaf flag means that -** this page has no tqchildren. The zerodata flag means that this page carries +** this page has no children. The zerodata flag means that this page carries ** only keys and no data. The intkey flag means that the key is a integer ** which is stored in the key size entry of the cell header rather than in ** the payload area. @@ -22555,7 +22555,7 @@ SQLITE_PRIVATE void sqlite3PagerRefdump(Pager *pPager){ */ /* Round up a number to the next larger multiple of 8. This is used -** to force 8-byte tqalignment on 64-bit architectures. +** to force 8-byte alignment on 64-bit architectures. */ #define ROUND8(x) ((x+7)&~7) @@ -24060,7 +24060,7 @@ SQLITE_PRIVATE int sqlite3BtreeOpen( #endif } pBt->usableSize = pBt->pageSize - nReserve; - assert( (pBt->pageSize & 7)==0 ); /* 8-byte tqalignment of pageSize */ + assert( (pBt->pageSize & 7)==0 ); /* 8-byte alignment of pageSize */ sqlite3PagerSetPagesize(pBt->pPager, pBt->pageSize); #if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO) @@ -24090,7 +24090,7 @@ btree_open_out: } /* -** Close an open database and tqinvalidate all cursors. +** Close an open database and invalidate all cursors. */ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){ BtShared *pBt = p->pBt; @@ -24571,7 +24571,7 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){ #ifndef SQLITE_OMIT_AUTOVACUUM /* -** Set the pointer-map entries for all tqchildren of page pPage. Also, if +** Set the pointer-map entries for all children of page pPage. Also, if ** pPage contains cells that point to overflow pages, set the pointer ** map entries for the overflow pages as well. */ @@ -25611,7 +25611,7 @@ static int copyPayload( ** Once an overflow page-list cache has been allocated, it may be ** invalidated if some other cursor writes to the same table, or if ** the cursor is moved to a different row. Additionally, in auto-vacuum -** mode, the following events may tqinvalidate an overflow page-list cache. +** mode, the following events may invalidate an overflow page-list cache. ** ** * An incremental vacuum, ** * A commit in auto_vacuum="full" mode, @@ -26888,7 +26888,7 @@ static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){ /* -** Change the pParent pointer of all tqchildren of pPage to point back +** Change the pParent pointer of all children of pPage to point back ** to pPage. ** ** In other words, for every child of pPage, invoke reparentPage() @@ -27331,7 +27331,7 @@ static int balance_nonroot(MemPage *pPage){ ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent - ** has NB or fewer tqchildren then all tqchildren of pParent are taken. + ** has NB or fewer children then all children of pParent are taken. */ nxDiv = idx - NN; if( nxDiv + NB > pParent->nCell ){ @@ -27362,7 +27362,7 @@ static int balance_nonroot(MemPage *pPage){ } /* Make nMaxCells a multiple of 2 in order to preserve 8-byte - ** tqalignment */ + ** alignment */ nMaxCells = (nMaxCells + 1)&~1; /* @@ -27381,13 +27381,13 @@ static int balance_nonroot(MemPage *pPage){ } szCell = (int*)&apCell[nMaxCells]; aCopy[0] = (u8*)&szCell[nMaxCells]; - assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aCopy[0] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ for(i=1; ipageSize+ROUND8(sizeof(MemPage))]; - assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aCopy[i] - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ } aSpace = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; - assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte tqalignment required */ + assert( ((aSpace - (u8*)apCell) & 7)==0 ); /* 8-byte alignment required */ #ifndef SQLITE_OMIT_AUTOVACUUM if( pBt->autoVacuum ){ aFrom = &aSpace[5*pBt->pageSize]; @@ -27656,7 +27656,7 @@ static int balance_nonroot(MemPage *pPage){ #ifndef SQLITE_OMIT_AUTOVACUUM /* If this is an auto-vacuum database, update the pointer map entries ** that point to the siblings that were rearranged. These can be: left - ** tqchildren of cells, the right-child of the page, or overflow pages + ** children of cells, the right-child of the page, or overflow pages ** pointed to by cells. */ if( pBt->autoVacuum ){ @@ -27758,7 +27758,7 @@ static int balance_nonroot(MemPage *pPage){ } /* - ** Reparent tqchildren of all cells. + ** Reparent children of all cells. */ for(i=0; iop+(TK_ISNULL&1))^1)-(TK_ISNULL&1); - /* Verify correct tqalignment of TK_ and OP_ constants + /* Verify correct alignment of TK_ and OP_ constants */ assert( pExpr->op!=TK_ISNULL || op==OP_NotNull ); assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull ); @@ -46026,7 +46026,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex( sqliteFree(zStmt); /* Fill the index with data and reparse the schema. Code an OP_Expire - ** to tqinvalidate all pre-compiled statements. + ** to invalidate all pre-compiled statements. */ if( pTblName ){ sqlite3RefillIndex(pParse, pIndex, iMem); @@ -48125,7 +48125,7 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); - /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */ + /* Verify that the call to _bytes() does not invalidate the _text() pointer */ assert( z2==(char*)sqlite3_value_text(argv[0]) ); if( z2 ){ z1 = sqlite3_malloc(n+1); @@ -48145,7 +48145,7 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return; z2 = (char*)sqlite3_value_text(argv[0]); n = sqlite3_value_bytes(argv[0]); - /* Verify that the call to _bytes() does not tqinvalidate the _text() pointer */ + /* Verify that the call to _bytes() does not invalidate the _text() pointer */ assert( z2==(char*)sqlite3_value_text(argv[0]) ); if( z2 ){ z1 = sqlite3_malloc(n+1); @@ -60019,7 +60019,7 @@ struct WhereTerm { i16 leftColumn; /* Column number of X in "X " */ u16 eOperator; /* A WO_xx value describing */ u8 flags; /* Bit flags. See below */ - u8 nChild; /* Number of tqchildren that must disable us */ + u8 nChild; /* Number of children that must disable us */ WhereClause *pWC; /* The clause this term is part of */ Bitmask prereqRight; /* Bitmask of tables used by pRight */ Bitmask prereqAll; /* Bitmask of tables referenced by p */ @@ -66935,7 +66935,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc( /* Check if an existing function is being overridden or deleted. If so, ** and there are active VMs, then return SQLITE_BUSY. If a function ** is being overridden/deleted but there are no active VMs, allow the - ** operation to continue but tqinvalidate all precompiled statements. + ** operation to continue but invalidate all precompiled statements. */ p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0); if( p && p->iPrefEnc==enc && p->nArg==nArg ){ @@ -67292,7 +67292,7 @@ static int createCollation( /* Check if this call is removing or replacing an existing collation ** sequence. If so, and there are active VMs, return busy. If there - ** are no active VMs, tqinvalidate any pre-compiled statements. + ** are no active VMs, invalidate any pre-compiled statements. */ pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, strlen(zName), 0); if( pColl && pColl->xCmp ){ diff --git a/amarok/src/sqlite/sqlite3.h b/amarok/src/sqlite/sqlite3.h index 474b8936..cb1fdb6c 100644 --- a/amarok/src/sqlite/sqlite3.h +++ b/amarok/src/sqlite/sqlite3.h @@ -1522,7 +1522,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt); ** ** ** Conversions between UTF-16be and UTF-16le are always done in place and do -** not tqinvalidate a prior pointer, though of course the content of the buffer +** not invalidate a prior pointer, though of course the content of the buffer ** that the prior pointer points to will have been modified. Other kinds ** of conversion are done in place when it is possible, but sometime it is ** not possible and in those cases prior pointers are invalidated. @@ -2016,7 +2016,7 @@ int sqlite3_sleep(int); ** file directory. ** ** Once [sqlite3_open()] has been called, changing this variable will -** tqinvalidate the current temporary database, if any. Generally speaking, +** invalidate the current temporary database, if any. Generally speaking, ** it is not safe to invoke this routine after [sqlite3_open()] has ** been called. */ diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index f97ca23c..aaa08bc9 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -277,7 +277,7 @@ StatisticsList::renderView() firstPlay.setTime_t( a[0].toUInt() ); m_newestItem = new StatisticsItem( i18n("Newest Items"), this, m_genreItem ); - m_newestItem->setSubtext( i18n("First played %1").tqarg( Amarok::verboseTimeSince( firstPlay ) ) ); + m_newestItem->setSubtext( i18n("First played %1").arg( Amarok::verboseTimeSince( firstPlay ) ) ); m_trackItem ->setIcon( Amarok::icon("track") ); m_mostplayedItem->setIcon( Amarok::icon("mostplayed") ); @@ -344,7 +344,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); TQString score = locale->formatNumber( fave[i+3].toDouble(), 0 ); @@ -378,11 +378,11 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); double plays = fave[i+3].toDouble(); - TQString subtext = i18n("%1: %2").tqarg( i18n( "Playcount" ) ).tqarg( plays ); + TQString subtext = i18n("%1: %2").arg( i18n( "Playcount" ) ).arg( plays ); m_last = new StatisticsDetailedItem( name, subtext, item, m_last ); m_last->setItemType( StatisticsDetailedItem::TRACK ); m_last->setUrl( fave[i+2] ); @@ -413,13 +413,13 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2").tqarg( TQString::number(c), + TQString name = i18n("%1. %2").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 2 ); m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::ARTIST ); - TQString url = TQString("%1").tqarg( fave[i] ); + TQString url = TQString("%1").arg( fave[i] ); m_last->setUrl( url ); c++; } @@ -461,7 +461,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { const bool isSampler = (fave[i+6] == trueValue); - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i], isSampler ? i18n( "Various Artists" ) : ( fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1] ) ); @@ -470,7 +470,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::ALBUM ); - TQString url = TQString("%1 @@@ %2").tqarg( isSampler ? "0" : fave[i+2], fave[i+3] ); + TQString url = TQString("%1 @@@ %2").arg( isSampler ? "0" : fave[i+2], fave[i+3] ); m_last->setUrl( url ); c++; } @@ -500,14 +500,14 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2").tqarg( TQString::number(c), + TQString name = i18n("%1. %2").arg( TQString::number(c), fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 2 ); m_last = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last ); m_last->setItemType( StatisticsDetailedItem::GENRE ); - TQString url = TQString("%1").tqarg( fave[i] ); + TQString url = TQString("%1").arg( fave[i] ); m_last->setUrl( url ); c++; } @@ -541,33 +541,33 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh ) for( uint i=0; i < newest.count(); i += qb.countReturnValues() ) { - TQString name = i18n("%1. %2 - %3").tqarg( TQString::number(c), + TQString name = i18n("%1. %2 - %3").arg( TQString::number(c), newest[i].isEmpty() ? i18n( "Unknown" ) : newest[i], newest[i+1].isEmpty() ? i18n( "Unknown" ) : newest[i+1] ); TQDateTime added = TQDateTime(); added.setTime_t( newest[i+4].toUInt() ); - TQString subtext = i18n("Added: %1").tqarg( Amarok::verboseTimeSince( added ) ); + TQString subtext = i18n("Added: %1").arg( Amarok::verboseTimeSince( added ) ); m_last = new StatisticsDetailedItem( name, subtext, item, m_last ); m_last->setItemType( StatisticsDetailedItem::HISTORY ); - TQString url = TQString("%1 @@@ %2").tqarg( newest[i+2] ).tqarg( newest[i+3] ); + TQString url = TQString("%1 @@@ %2").arg( newest[i+2] ).arg( newest[i+3] ); m_last->setUrl( url ); c++; } } item->setExpanded( true ); - repaintItem( item ); // Better than ::tqrepaint(), flickers less + repaintItem( item ); // Better than ::repaint(), flickers less delete locale; } TQString StatisticsList::subText( const TQString &score, const TQString &rating ) //static { if( AmarokConfig::useScores() && AmarokConfig::useRatings() ) - return i18n( "Score: %1 Rating: %2" ).tqarg( score ).tqarg( rating ); + return i18n( "Score: %1 Rating: %2" ).arg( score ).arg( rating ); else if( AmarokConfig::useScores() ) - return i18n( "Score: %1" ).tqarg( score ); + return i18n( "Score: %1" ).arg( score ); else if( AmarokConfig::useRatings() ) - return i18n( "Rating: %1" ).tqarg( rating ); + return i18n( "Rating: %1" ).arg( rating ); else return TQString(); } @@ -735,7 +735,7 @@ StatisticsItem::slotAnimTimer() if( m_animEnter ) { m_animCount += 1; - listView()->repaintItem( this ); // Better than ::tqrepaint(), flickers less + listView()->repaintItem( this ); // Better than ::repaint(), flickers less if( m_animCount >= ANIM_MAX ) m_animTimer->stop(); diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h index 4c043bec..0161e3a3 100644 --- a/amarok/src/statistics.h +++ b/amarok/src/statistics.h @@ -135,7 +135,7 @@ class StatisticsItem : public TQObject, public KListViewItem TQString m_subText; }; -/// Listview items for the tqchildren of expanded items (the actual results) +/// Listview items for the children of expanded items (the actual results) class StatisticsDetailedItem : public KListViewItem { public: diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp index aa150af2..0450b86a 100644 --- a/amarok/src/statusbar/popupMessage.cpp +++ b/amarok/src/statusbar/popupMessage.cpp @@ -213,7 +213,7 @@ void PopupMessage::dissolveMask() { if( m_stage == 1 ) { - tqrepaint( false ); + repaint( false ); TQPainter maskPainter(&m_mask); m_mask.fill(TQt::black); diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp index edd36d15..c25431f2 100644 --- a/amarok/src/statusbar/queueLabel.cpp +++ b/amarok/src/statusbar/queueLabel.cpp @@ -175,7 +175,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) const uint count = queue.count(); if( length ) menu->insertTitle( i18n( "1 Queued Track (%1)", "%n Queued Tracks (%1)", count ) - .tqarg( MetaBundle::prettyLength( length, true ) ) ); + .arg( MetaBundle::prettyLength( length, true ) ) ); else menu->insertTitle( i18n( "1 Queued Track", "%n Queued Tracks", count ) ); Amarok::actionCollection()->action( "queue_manager" )->plug( menu ); @@ -191,7 +191,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent ) { for( uint n = kMin( i + MAX_TO_SHOW - 1, count ); i <= n; ++i, ++it ) menu->insertItem( - KStringHandler::rsqueeze( i18n( "%1. %2" ).tqarg( i ).tqarg( veryNiceTitle( *it ) ), 50 ), i ); + KStringHandler::rsqueeze( i18n( "%1. %2" ).arg( i ).arg( veryNiceTitle( *it ) ), 50 ), i ); if( i < count ) { @@ -264,11 +264,11 @@ void QueueLabel::showToolTip() } if( length ) text += TQString("

    %1
    ") - .tqarg( i18n( "1 track (%1)", "%n tracks (%1)", count ) - .tqarg( MetaBundle::prettyLength( length, true ) ) ); + .arg( i18n( "1 track (%1)", "%n tracks (%1)", count ) + .arg( MetaBundle::prettyLength( length, true ) ) ); } - text += i18n( "Next: %1" ).tqarg( veryNiceTitle( item, true /*bold*/ ) ); + text += i18n( "Next: %1" ).arg( veryNiceTitle( item, true /*bold*/ ) ); m_tooltip = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 ); m_tooltip->setShowCloseButton( false ); @@ -296,9 +296,9 @@ TQString QueueLabel::veryNiceTitle( PlaylistItem* item, bool bold ) const const TQString artist = item->artist()->stripWhiteSpace(), title = item->title().stripWhiteSpace(); if( !artist.isEmpty() && !title.isEmpty() ) - return ( bold ? i18n( "%1 by %2" ) : i18n( "%1 by %2" ) ).tqarg( title ).tqarg( artist ); + return ( bold ? i18n( "%1 by %2" ) : i18n( "%1 by %2" ) ).arg( title ).arg( artist ); else - return TQString( "%1" ).tqarg( MetaBundle::prettyTitle( item->filename() ) ); + return TQString( "%1" ).arg( MetaBundle::prettyTitle( item->filename() ) ); } diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index 596834a4..6e819a1c 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -126,8 +126,8 @@ class SelectLabel : public TQLabel m_tooltipShowing = true; TQString tip = i18n("%1: %2") - .tqarg( m_action->text().remove( '&' ) ) - .tqarg( m_action->currentText().remove( '&' ) ); + .arg( m_action->text().remove( '&' ) ) + .arg( m_action->currentText().remove( '&' ) ); if( !isEnabled() ) tip += i18n(" 
     Disabled"); @@ -136,7 +136,7 @@ class SelectLabel : public TQLabel { KSelectAction *a = static_cast( Amarok::actionCollection()->action( "favor_tracks" ) ); tip += TQString("

    ") + i18n("%1: %2") - .tqarg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); + .arg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); } tip += " "; diff --git a/amarok/src/statusbar/squeezedtextlabel.cpp b/amarok/src/statusbar/squeezedtextlabel.cpp index e0c17455..4d6c842c 100644 --- a/amarok/src/statusbar/squeezedtextlabel.cpp +++ b/amarok/src/statusbar/squeezedtextlabel.cpp @@ -127,11 +127,11 @@ void SqueezedTextLabel::squeezeTextToLabel() } } -void SqueezedTextLabel::setAlignment( int tqalignment ) +void SqueezedTextLabel::setAlignment( int alignment ) { // save fullText and restore it TQString tmpFull(fullText); - TQLabel::setAlignment(tqalignment); + TQLabel::setAlignment(alignment); fullText = tmpFull; } diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp index b611c0f8..0430829e 100644 --- a/amarok/src/statusbar/statusbar.cpp +++ b/amarok/src/statusbar/statusbar.cpp @@ -183,16 +183,16 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) // ugly because of translation requirements if( !title.isEmpty() && !artist.isEmpty() && !album.isEmpty() ) title = i18n( "track by artist on album", "%1 by %2 on %3" ) - .tqarg( title, artist, album ); + .arg( title, artist, album ); else if( !title.isEmpty() && !artist.isEmpty() ) title = i18n( "track by artist", "%1 by %2" ) - .tqarg( title, artist ); + .arg( title, artist ); else if( !album.isEmpty() ) // we try for pretty title as it may come out better title = i18n( "track on album", "%1 on %2" ) - .tqarg( prettyTitle, album ); + .arg( prettyTitle, album ); else title = "" + prettyTitle + ""; @@ -206,7 +206,7 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ ) title += ')'; } - setMainText( i18n( "Playing: %1" ).tqarg( title ) ); + setMainText( i18n( "Playing: %1" ).arg( title ) ); m_slider->newBundle( bundle ); engineTrackLengthChanged( bundle.length() ); @@ -220,10 +220,10 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total const bool hasSel = ( selCount > 1 ), hasVis = ( visCount != newCount ); TQString text = ( hasSel && hasVis ) ? i18n( "%1 selected of %2 visible tracks" ) - .tqarg( selCount ).tqarg( visCount ) + .arg( selCount ).arg( visCount ) : ( hasVis && newCount == 1 ) ? i18n( "0 visible of 1 track" ) - : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).tqarg( visCount).tqarg( newCount ) - : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).tqarg( selCount ).tqarg( newCount ) + : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).arg( visCount).arg( newCount ) + : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).arg( selCount ).arg( newCount ) : i18n( "1 track", "%n tracks", newCount ); int getValue = 0; @@ -238,11 +238,11 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total getValue = newLength; if( getValue ) - m_itemCountLabel->setText( i18n( "X visible/selected tracks (time) ", "%1 (%2)" ).tqarg( text, MetaBundle::fuzzyTime( getValue ) ) ); + m_itemCountLabel->setText( i18n( "X visible/selected tracks (time) ", "%1 (%2)" ).arg( text, MetaBundle::fuzzyTime( getValue ) ) ); else m_itemCountLabel->setText( text ); - TQToolTip::add( m_itemCountLabel, i18n( "Play-time: %1" ).tqarg( MetaBundle::veryPrettyTime( getValue ) ) ); + TQToolTip::add( m_itemCountLabel, i18n( "Play-time: %1" ).arg( MetaBundle::veryPrettyTime( getValue ) ) ); } void diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index f1ba257a..0ff74243 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -123,7 +123,7 @@ class ToggleLabel : public TQLabel m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCounter( false ); m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); - m_tooltip->setText( tip.tqarg(m_action->text().remove('&') ) ); + m_tooltip->setText( tip.arg(m_action->text().remove('&') ) ); m_tooltip->setImage( path ); m_tooltip->reposition(); diff --git a/amarok/src/systray.cpp b/amarok/src/systray.cpp index 81e80f78..026db38b 100644 --- a/amarok/src/systray.cpp +++ b/amarok/src/systray.cpp @@ -26,7 +26,7 @@ namespace Amarok static TQPixmap loadOverlay( const char *iconName, int iconWidth ) { - return TQImage( locate( "data", TQString( "amarok/images/b_%1.png" ).tqarg( iconName ) ), "PNG" ).smoothScale( ((iconWidth/2)-(iconWidth/20)), ((iconWidth/2)-(iconWidth/20)) ); + return TQImage( locate( "data", TQString( "amarok/images/b_%1.png" ).arg( iconName ) ), "PNG" ).smoothScale( ((iconWidth/2)-(iconWidth/20)), ((iconWidth/2)-(iconWidth/20)) ); } } @@ -146,12 +146,12 @@ Amarok::TrayIcon::engineStateChanged( Engine::State state, Engine::State /*oldSt if( AmarokConfig::animateTrayIcon() ) blinkTimerID = startTimer( 1500 ); // start 'blink' timer - paintIcon( mergeLevel, true ); // tqrepaint the icon + paintIcon( mergeLevel, true ); // repaint the icon break; case Engine::Empty: overlayVisible = false; - paintIcon( -1, true ); // tqrepaint the icon + paintIcon( -1, true ); // repaint the icon // fall through to default: default: setLastFm( false ); diff --git a/amarok/src/systray.h b/amarok/src/systray.h index 63383733..fe9380d8 100644 --- a/amarok/src/systray.h +++ b/amarok/src/systray.h @@ -38,7 +38,7 @@ private: // repaints trayIcon showing progress (and overlay if present) void paintIcon( int mergePixels = -1, bool force = false ); - // blend an overlay icon over 'sourcePixmap' and tqrepaint trayIcon + // blend an overlay icon over 'sourcePixmap' and repaint trayIcon void blendOverlay( TQPixmap &sourcePixmap ); long trackLength, mergeLevel; diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index 19e5a7fe..f4e7bfb4 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -309,7 +309,7 @@ TagDialog::queryDone( KTRMResultList results, TQString error ) //SLOT #if HAVE_TUNEPIMP if ( !error.isEmpty() ) { - KMessageBox::sorry( this, i18n( "Tunepimp (MusicBrainz tagging library) returned the following error: \"%1\"." ).tqarg(error) ); + KMessageBox::sorry( this, i18n( "Tunepimp (MusicBrainz tagging library) returned the following error: \"%1\"." ).arg(error) ); } else { if ( !results.isEmpty() ) @@ -629,21 +629,21 @@ void TagDialog::readTags() { bool local = m_bundle.url().isLocalFile(); - setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").tqarg( m_bundle.title(), m_bundle.artist() ) ) ); + setCaption( kapp->makeStdCaption( i18n("Track Information: %1 by %2").arg( m_bundle.title(), m_bundle.artist() ) ) ); TQString niceTitle; if ( m_bundle.album().isEmpty() ) { if( !m_bundle.title().isEmpty() ) { if( !m_bundle.artist().isEmpty() ) - niceTitle = i18n( "%1 by %2" ).tqarg( m_bundle.title(), m_bundle.artist() ); + niceTitle = i18n( "%1 by %2" ).arg( m_bundle.title(), m_bundle.artist() ); else - niceTitle = TQString( "%1" ).tqarg( m_bundle.title() ); + niceTitle = TQString( "%1" ).arg( m_bundle.title() ); } else niceTitle = m_bundle.prettyTitle(); } else { niceTitle = i18n( "%1 by %2 on %3" ) - .tqarg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); + .arg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); } trackArtistAlbumLabel->setText( niceTitle ); trackArtistAlbumLabel2->setText( niceTitle ); @@ -671,22 +671,22 @@ void TagDialog::readTags() const TQString emptyLine = ""; summaryText = "
    "; - summaryText += body2cols.tqarg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); - summaryText += body2cols.tqarg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); - summaryText += body2cols.tqarg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); - summaryText += body2cols.tqarg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); - summaryText += body2cols.tqarg( i18n("Format"), unknownSafe( m_bundle.type() ) ); + summaryText += body2cols.arg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); + summaryText += body2cols.arg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); + summaryText += body2cols.arg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); + summaryText += body2cols.arg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); + summaryText += body2cols.arg( i18n("Format"), unknownSafe( m_bundle.type() ) ); summaryText += "
    		"; if( AmarokConfig::useScores() ) - summaryText += body2cols.tqarg( i18n("Score"), TQString::number( static_cast( m_bundle.score() ) ) ); + summaryText += body2cols.arg( i18n("Score"), TQString::number( static_cast( m_bundle.score() ) ) ); if( AmarokConfig::useRatings() ) - summaryText += body2cols.tqarg( i18n("Rating"), m_bundle.prettyRating() ); + summaryText += body2cols.arg( i18n("Rating"), m_bundle.prettyRating() ); - summaryText += body2cols.tqarg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) ); - summaryText += body2cols.tqarg( i18n("First Played"), + summaryText += body2cols.arg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) ); + summaryText += body2cols.arg( i18n("First Played"), m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getFirstPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); - summaryText += body2cols.tqarg( i18n("a single item (singular)", "Last Played"), + summaryText += body2cols.arg( i18n("a single item (singular)", "Last Played"), m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getLastPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); summaryText += "
    "; @@ -696,7 +696,7 @@ void TagDialog::readTags() TQStringList sData = statisticsData(); for ( uint i = 0; i%3 " ) - .tqarg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); + .arg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); } html.append( "" ); debug() << "Dumping HTML for label cloud: " << html << endl; @@ -1418,7 +1418,7 @@ TagDialog::writeTag( MetaBundle &mb, bool updateCB ) TQCString path = TQFile::encodeName( mb.url().path() ); if ( !TagLib::File::isWritable( path ) ) { Amarok::StatusBar::instance()->longMessage( i18n( - "The file %1 is not writable." ).tqarg( mb.url().fileName() ), KDE::StatusBar::Error ); + "The file %1 is not writable." ).arg( mb.url().fileName() ), KDE::StatusBar::Error ); return false; } @@ -1458,7 +1458,7 @@ TagDialogWriter::doJob() TQCString path = TQFile::encodeName( m_tags[i].url().path() ); if ( !TagLib::File::isWritable( path ) ) { Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( - "The file %1 is not writable." ).tqarg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); + "The file %1 is not writable." ).arg( m_tags[i].url().fileName() ), KDE::StatusBar::Error ); m_failed += true; continue; } @@ -1491,7 +1491,7 @@ TagDialogWriter::completeJob() CollectionView::instance()->databaseChanged(); if ( m_failCount ) Amarok::StatusBar::instance()->longMessage( i18n( - "Sorry, the tag for the following files could not be changed:\n" ).tqarg( m_failedURLs.join( ";\n" ) ), KDE::StatusBar::Error ); + "Sorry, the tag for the following files could not be changed:\n" ).arg( m_failedURLs.join( ";\n" ) ), KDE::StatusBar::Error ); } diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui index 0e256497..1e71f065 100644 --- a/amarok/src/tagdialogbase.ui +++ b/amarok/src/tagdialogbase.ui @@ -189,7 +189,7 @@ Track by Artist on Album - + WordBreak|AlignVCenter @@ -231,7 +231,7 @@ - + WordBreak|AlignTop @@ -627,7 +627,7 @@ Track by Artist on Album - + WordBreak|AlignVCenter @@ -655,7 +655,7 @@ - + WordBreak|AlignTop diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index 22e2b5b4..0cd39a51 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -375,7 +375,7 @@ public: * * It is only safe to have one dependent, if you depend on multiple objects * that might get deleted while you are running you should instead try to - * make the multiple objects tqchildren of one TQObject and depend on the + * make the multiple objects children of one TQObject and depend on the * top-most parent or best of all would be to make copies of the data you * need instead of being dependent. */ diff --git a/amarok/src/trackpickerdialogbase.ui b/amarok/src/trackpickerdialogbase.ui index 6ab2e7e7..4352b51b 100644 --- a/amarok/src/trackpickerdialogbase.ui +++ b/amarok/src/trackpickerdialogbase.ui @@ -34,7 +34,7 @@ File Name - + AlignTop @@ -53,7 +53,7 @@ - + AlignVCenter|AlignLeft @@ -79,7 +79,7 @@ Select Best Possible Match - + AlignTop diff --git a/amarok/src/tracktooltip.cpp b/amarok/src/tracktooltip.cpp index c345e22e..08cae102 100644 --- a/amarok/src/tracktooltip.cpp +++ b/amarok/src/tracktooltip.cpp @@ -114,14 +114,14 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) TQString s; for( int i = 0; i < rating / 2; ++i ) s += TQString( "" ) - .tqarg( locate( "data", "amarok/images/star.png" ) ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ); + .arg( locate( "data", "amarok/images/star.png" ) ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ); if( rating % 2 ) s += TQString( "" ) - .tqarg( locate( "data", "amarok/images/smallstar.png" ) ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ) - .tqarg( TQFontMetrics( TQToolTip::font() ).height() ); + .arg( locate( "data", "amarok/images/smallstar.png" ) ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ) + .arg( TQFontMetrics( TQToolTip::font() ).height() ); right << s; left << playlist->columnText( column ); } @@ -163,7 +163,7 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) } right << TQString( "" ) - .tqarg( filename ).tqarg( height ).tqarg( MOODBAR_WIDTH ); + .arg( filename ).arg( height ).arg( MOODBAR_WIDTH ); } break; @@ -237,10 +237,10 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force ) if (tags.title().isEmpty() || tags.artist().isEmpty()) // no title or no artist, so we add prettyTitle m_tooltip += TQString ("%1") - .tqarg(tags.veryNiceTitle()); + .arg(tags.veryNiceTitle()); for( uint x = 0; x < left.count(); ++x ) if ( !right[x].isEmpty() ) - m_tooltip += tableRow.tqarg( left[x] ).tqarg( right[x] ); + m_tooltip += tableRow.arg( left[x] ).arg( right[x] ); m_tooltip += ""; m_tooltip += ""; @@ -332,13 +332,13 @@ TQString TrackToolTip::tooltip() const if( !m_tags.isEmpty() ) { if( !m_cover.isEmpty() ) - tip = tip.tqarg( TQString( "" ).tqarg( m_cover ) ); + "
    " + tip = tip.arg( TQString( "
    " "" - "
    " ).arg( m_cover ) ); else - tip = tip.tqarg(""); + tip = tip.arg(""); if( m_haspos ) - tip = tip.tqarg( MetaBundle::prettyLength( m_pos / 1000, true ) ); + tip = tip.arg( MetaBundle::prettyLength( m_pos / 1000, true ) ); } return tip; } diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp index 3a044315..e52b98e2 100644 --- a/amarok/src/transferdialog.cpp +++ b/amarok/src/transferdialog.cpp @@ -45,7 +45,7 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQGroupBox *location = new TQGroupBox( 1, Qt::Vertical, i18n( "Music Location" ), vbox ); new TQLabel( i18n( "Your music will be transferred to:\n%1" ) - .tqarg( transferDir ), location ); + .arg( transferDir ), location ); TQVBox *vbox2 = new TQVBox( vbox ); TQSpacerItem *spacer = new TQSpacerItem( 0, 25 ); diff --git a/amarok/src/xmlloader.cpp b/amarok/src/xmlloader.cpp index 9313cb3b..2ff72b21 100644 --- a/amarok/src/xmlloader.cpp +++ b/amarok/src/xmlloader.cpp @@ -213,7 +213,7 @@ bool MetaBundle::XmlLoader::fatalError( const TQXmlParseException &e ) bundleLoaded(); m_lastError = TQString( "Error loading XML: \"%1\", at line %2, column %3." ) - .tqarg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) ); + .arg( e.message(), TQString::number( e.lineNumber() ), TQString::number( e.columnNumber() ) ); errorEncountered( e.message(), e.lineNumber(), e.columnNumber() ); return false; -- cgit v1.2.1