Remove additional unneeded tq method conversions

(cherry picked from commit cfc8e6815b)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent ace5f8593c
commit 60136760bf

@ -172,7 +172,7 @@
<property name="text"> <property name="text">
<string>Player Window:</string> <string>Player Window:</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
<property name="toolTip" stdset="0"> <property name="toolTip" stdset="0">

@ -137,7 +137,7 @@ void Options2::uninstallPushButton_clicked()
return; return;
if( KMessageBox::warningContinueCancel( 0, if( KMessageBox::warningContinueCancel( 0,
i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).tqarg( name ), i18n( "<p>Are you sure you want to uninstall the theme <strong>%1</strong>?</p>" ).arg( name ),
i18n("Uninstall Theme"), i18n("Uninstall") ) == KMessageBox::Cancel ) i18n("Uninstall Theme"), i18n("Uninstall") ) == KMessageBox::Cancel )
return; return;
@ -152,7 +152,7 @@ void Options2::uninstallPushButton_clicked()
if( !KIO::NetAccess::del( themeDir, 0 ) ) { if( !KIO::NetAccess::del( themeDir, 0 ) ) {
KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this theme.</p>" KMessageBox::sorry( 0, i18n( "<p>Could not uninstall this theme.</p>"
"<p>You may not have sufficient permissions to delete the folder <strong>%1<strong></p>." "<p>You may not have sufficient permissions to delete the folder <strong>%1<strong></p>."
).tqarg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) ); ).arg( themeDir.isLocalFile() ? themeDir.path() : themeDir.url() ) );
return; return;
} }

@ -92,7 +92,7 @@ void Options5::init()
<< "%year " << "%length" << "%track" << "%filename" << "%directory" << "%year " << "%length" << "%track" << "%filename" << "%directory"
<< "%type" << "%comment" << "%score" << "%playcount" << "%discnumber" << "%type" << "%comment" << "%score" << "%playcount" << "%discnumber"
<< "%rating" << "%moodbar" << "%elapsed" << "%rating" << "%moodbar" << "%elapsed"
<< "%title {" + i18n( "Score: %1" ).tqarg( "%score" ) +'}' ) ); << "%title {" + i18n( "Score: %1" ).arg( "%score" ) +'}' ) );
} }
void void

@ -54,7 +54,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -443,7 +443,7 @@
</entry> </entry>
<entry key="Osd Y Offset" type="Int"> <entry key="Osd Y Offset" type="Int">
<label>Y position offset</label> <label>Y position offset</label>
<whatsthis>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.</whatsthis> <whatsthis>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.</whatsthis>
<default>50</default> <default>50</default>
<min>0</min> <min>0</min>
<max>10000</max> <max>10000</max>

@ -120,12 +120,12 @@ namespace Amarok
#endif #endif
body = body.tqarg( AmarokConfig::soundSystem() ) body = body.arg( AmarokConfig::soundSystem() )
.tqarg( qVersion() ) .arg( qVersion() )
.tqarg( TAGLIB_MAJOR_VERSION ) .arg( TAGLIB_MAJOR_VERSION )
.tqarg( TAGLIB_MINOR_VERSION ) .arg( TAGLIB_MINOR_VERSION )
.tqarg( TAGLIB_PATCH_VERSION ) .arg( TAGLIB_PATCH_VERSION )
.tqarg( cpucount ); .arg( cpucount );
#ifdef NDEBUG #ifdef NDEBUG
body += "NDEBUG: true"; body += "NDEBUG: true";
@ -190,10 +190,10 @@ namespace Amarok
if( totalFrames > 0 ) { if( totalFrames > 0 ) {
const double validity = double(validFrames) / totalFrames; 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; 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 ) if( bt.find( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 )
subject += "[line numbers]"; subject += "[line numbers]";
@ -201,7 +201,7 @@ namespace Amarok
else else
useful = false; 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; std::cout << subject.latin1() << std::endl;

@ -21,7 +21,7 @@ class BarAnalyzer : public Analyzer::Base2D
//virtual void transform( Scope& ); //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 * @param e The resize-event
*/ */
void resizeEvent( TQResizeEvent * e); void resizeEvent( TQResizeEvent * e);

@ -430,7 +430,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e )
{ {
const uint v = ids[x]; 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() ); menu.setItemChecked( v, v == timeout() );
} }

@ -675,7 +675,7 @@ void App::applySettings( bool firstTime )
//Set the caption correctly. //Set the caption correctly.
if ( !EngineController::instance()->bundle().prettyTitle().isEmpty() ) 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 else
m_pPlaylistWindow->setCaption( "Amarok" ); m_pPlaylistWindow->setCaption( "Amarok" );
@ -906,7 +906,7 @@ App::applyColorScheme()
Background = 0x002090; Background = 0x002090;
Foreground = 0x80A0FF; Foreground = 0x80A0FF;
//all tqchildren() derive their palette from this //all children() derive their palette from this
playlistWindow()->setPalette( TQPalette( group, group, group ) ); playlistWindow()->setPalette( TQPalette( group, group, group ) );
browserBar->unsetPalette(); browserBar->unsetPalette();
contextBrowser->setPalette( TQPalette( group, group, group ) ); contextBrowser->setPalette( TQPalette( group, group, group ) );
@ -1084,7 +1084,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState )
if ( oldState == Engine::Paused ) if ( oldState == Engine::Paused )
Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) ); Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) );
if ( !bundle.prettyTitle().isEmpty() ) if ( !bundle.prettyTitle().isEmpty() )
m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) ); m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
break; break;
case Engine::Paused: case Engine::Paused:
@ -1106,7 +1106,7 @@ void App::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ )
{ {
Amarok::OSD::instance()->show( bundle ); Amarok::OSD::instance()->show( bundle );
if ( !bundle.prettyTitle().isEmpty() ) 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 ); TrackToolTip::instance()->setTrack( bundle );
} }
@ -1313,7 +1313,7 @@ namespace Amarok
{ {
//URL can be in whatever forms KURL::fromPathOrURL understands - ie most. //URL can be in whatever forms KURL::fromPathOrURL understands - ie most.
const TQString cmd = "%1 \"%2\""; 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 namespace ColorScheme

@ -170,7 +170,7 @@ BrowserBar::polish()
void void
BrowserBar::adjustWidgetSizes() 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 // the browsers are loaded so this isn't called twice
const uint w = width(); const uint w = width();

@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char*
void ClickLineEdit::setClickMessage( const TQString &msg ) void ClickLineEdit::setClickMessage( const TQString &msg )
{ {
mClickMessage = msg; mClickMessage = msg;
tqrepaint(); repaint();
} }
void ClickLineEdit::setText( const TQString &txt ) void ClickLineEdit::setText( const TQString &txt )
{ {
mDrawClickMsg = txt.isEmpty(); mDrawClickMsg = txt.isEmpty();
tqrepaint(); repaint();
KLineEdit::setText( txt ); KLineEdit::setText( txt );
} }
@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
{ {
if ( mDrawClickMsg == true ) { if ( mDrawClickMsg == true ) {
mDrawClickMsg = false; mDrawClickMsg = false;
tqrepaint(); repaint();
} }
TQLineEdit::focusInEvent( ev ); TQLineEdit::focusInEvent( ev );
} }
@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
{ {
if ( text().isEmpty() ) { if ( text().isEmpty() ) {
mDrawClickMsg = true; mDrawClickMsg = true;
tqrepaint(); repaint();
} }
TQLineEdit::focusOutEvent( ev ); TQLineEdit::focusOutEvent( ev );
} }

@ -785,7 +785,7 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT
ensureItemVisible( lastChild() ); ensureItemVisible( lastChild() );
//Create a reverse list of parents, grandparents etc. //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. //This means that the selected item has the most priority as it is done last.
TQValueStack<TQListViewItem*> parents; TQValueStack<TQListViewItem*> parents;
while ( r ) while ( r )
@ -1175,7 +1175,7 @@ CollectionView::slotCollapse( TQListViewItem* item ) //SLOT
TQListViewItem* child = item->firstChild(); TQListViewItem* child = item->firstChild();
TQListViewItem* childTmp; TQListViewItem* childTmp;
//delete all tqchildren //delete all children
while ( child ) while ( child )
{ {
childTmp = 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 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 #ifndef AMAZON_SUPPORT
menu.setItemEnabled( FETCH, false ); menu.setItemEnabled( FETCH, false );
#endif #endif
@ -1698,7 +1698,7 @@ CollectionView::fetchCover() //SLOT
"SELECT DISTINCT artist.name FROM artist, album, tags " "SELECT DISTINCT artist.name FROM artist, album, tags "
"WHERE artist.id = tags.artist AND tags.album = album.id " "WHERE artist.id = tags.artist AND tags.album = album.id "
"AND album.name = '%1';" ) "AND album.name = '%1';" )
.tqarg( CollectionDB::instance()->escapeString( album ) ) ); .arg( CollectionDB::instance()->escapeString( album ) ) );
if ( !values.isEmpty() ) if ( !values.isEmpty() )
CollectionDB::instance()->fetchCover( this, values[0], album, false, static_cast<TQListViewItem*>(item) ); CollectionDB::instance()->fetchCover( this, values[0], album, false, static_cast<TQListViewItem*>(item) );
@ -2220,7 +2220,7 @@ KURL::List
CollectionView::listSelected() CollectionView::listSelected()
{ {
//Here we determine the URLs of all selected items. We use two passes, one for the parent items, //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; KURL::List list;
TQListViewItem* item; TQListViewItem* item;
@ -2266,7 +2266,7 @@ CollectionView::listSelected()
// The iPod selection code is written to resemble the tree mode // The iPod selection code is written to resemble the tree mode
// selection logic, as well as what happens on an actual iPod. If // selection logic, as well as what happens on an actual iPod. If
// we're in track mode, just return the list of tracks selected. // 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 // sorting first by m_cat1, then m_cat2, then m_cat3. Sort by
// track first if one of the categories is Id(VisYear)Album. // track first if one of the categories is Id(VisYear)Album.
// There is a difficulty with compilation albums -- if we're // There is a difficulty with compilation albums -- if we're
@ -2693,7 +2693,7 @@ CollectionView::playlistFromURLs( const KURL::List &urls )
KURL rpath; KURL rpath;
MountPointManager::instance()->getRelativePath( deviceid, *it, rpath ); MountPointManager::instance()->getRelativePath( deviceid, *it, rpath );
const TQString query = TQString("SELECT title, length FROM tags WHERE url = '%1' AND deviceid = %2;") 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; debug() << "media id: " << deviceid << " rpath: " << rpath.path() << endl;
TQStringList result = db->query( query ); TQStringList result = db->query( query );
titles << result[0]; titles << result[0];
@ -3483,7 +3483,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse )
if( reverse ) if( reverse )
{ {
TQString begin = str.left( 3 ); TQString begin = str.left( 3 );
str = TQString(str.append( ", %1" )).tqarg( begin ); str = TQString(str.append( ", %1" )).arg( begin );
str = str.mid( 4 ); str = str.mid( 4 );
return; return;
} }
@ -3492,7 +3492,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse )
return; return;
TQString end = str.right( 3 ); 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; uint newLen = str.length() - end.length() - 2;
@ -4061,7 +4061,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
continue; continue;
couldOpen.push_back( top ); 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 //rows or have expanded everything
for ( TQValueList<TQListViewItem*>::iterator it = couldOpen.begin(); it != couldOpen.end() && totalCount < maxRows; ++it ) for ( TQValueList<TQListViewItem*>::iterator it = couldOpen.begin(); it != couldOpen.end() && totalCount < maxRows; ++it )
{ {
@ -4080,7 +4080,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
} }
else else
{ {
//Prioritize expanding its tqchildren - add it immediately next //Prioritize expanding its children - add it immediately next
TQValueList<TQListViewItem*>::iterator next = it; TQValueList<TQListViewItem*>::iterator next = it;
++next; ++next;
couldOpen.insert( next, j ); couldOpen.insert( next, j );
@ -4131,9 +4131,9 @@ CollectionView::removeDuplicatedHeaders()
{ {
if ( empty ) if ( empty )
{ {
if ( !current->text(0).tqat(0).isLetterOrNumber() if ( !current->text(0).at(0).isLetterOrNumber()
|| ( last->text(0).tqat(0).isLetterOrNumber() || ( last->text(0).at(0).isLetterOrNumber()
&& current->text(0).tqat(0).tqunicode() > last->text(0).tqat(0).tqunicode() ) ) && current->text(0).at(0).tqunicode() > last->text(0).at(0).tqunicode() ) )
toDelete += current; toDelete += current;
else else
{ {

File diff suppressed because it is too large Load Diff

@ -257,13 +257,13 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
inline bool boolFromSql( const TQString &b ) { return ( b == boolT() || b == "t" ); } inline bool boolFromSql( const TQString &b ) { return ( b == boolT() || b == "t" ); }
//textColumnType should be used for normal strings, which need to be compared //textColumnType should be used for normal strings, which need to be compared
//either case-sensitively or -insensitively //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 //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 //as URLs (necessary for holding control chars etc. if present in URL), except for
//trailing spaces. Comparisions should always be done case-sensitively. //trailing spaces. Comparisions should always be done case-sensitively.
//As we create indices on these columns, we have to restrict them to //As we create indices on these columns, we have to restrict them to
//<= 255 chars for mysql < 5.0.3 //<= 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..??? // 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 longTextColumnType() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return "TEXT"; }
TQString randomFunc() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "random()"; else return "RAND()"; } TQString randomFunc() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "random()"; else return "RAND()"; }

@ -264,7 +264,7 @@ void AmarokConfigDialog::updateSettings()
{ {
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) ); OSDPreviewWidget *osd = static_cast<OSDPreviewWidget*>( TQT_TQWIDGET(child( "osdpreview" )) );
AmarokConfig::setOsdAlignment( osd->tqalignment() ); AmarokConfig::setOsdAlignment( osd->alignment() );
AmarokConfig::setOsdYOffset( osd->y() ); AmarokConfig::setOsdYOffset( osd->y() );
Amarok::OSD::instance()->applySettings(); Amarok::OSD::instance()->applySettings();
#endif #endif
@ -357,8 +357,8 @@ bool AmarokConfigDialog::hasChanged()
return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] || return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] ||
#ifdef TQ_WS_X11 #ifdef TQ_WS_X11
osd->tqalignment() != AmarokConfig::osdAlignment() || osd->alignment() != AmarokConfig::osdAlignment() ||
osd->tqalignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() || osd->alignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() ||
#endif #endif
m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() || m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() ||
Amarok::databaseTypeCode( m_opt7->dbSetupFrame->databaseEngine->currentText() ) != AmarokConfig::databaseEngine().toInt() || Amarok::databaseTypeCode( m_opt7->dbSetupFrame->databaseEngine->currentText() ) != AmarokConfig::databaseEngine().toInt() ||
@ -385,7 +385,7 @@ bool AmarokConfigDialog::isDefault()
void AmarokConfigDialog::aboutEngine() //SLOT 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 = EngineController::engine()->configure();
m_engineConfig->view()->reparent( m_engineConfigFrame, TQPoint() ); m_engineConfig->view()->reparent( m_engineConfigFrame, TQPoint() );
m_engineConfig->view()->show(); 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(); m_engineConfigFrame->show();
connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) ); connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) );

@ -97,7 +97,7 @@ namespace Amarok
if( datediff >= 6*7 /*six weeks*/ ) { // return absolute month/year if( datediff >= 6*7 /*six weeks*/ ) { // return absolute month/year
const KCalendarSystem *cal = KGlobal::locale()->calendar(); const KCalendarSystem *cal = KGlobal::locale()->calendar();
const TQDate date = datetime.date(); 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 //TODO "last week" = maybe within 7 days, but prolly before last sunday
@ -175,7 +175,7 @@ static
TQString albumImageTooltip( const TQString &albumImage, int size ) TQString albumImageTooltip( const TQString &albumImage, int size )
{ {
if ( albumImage == CollectionDB::instance()->notAvailCover( false, 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." ) ); 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" ) else if ( url.protocol() == "musicbrainz" )
{ {
const TQString url = "http://www.musicbrainz.org/taglookup.html?artist=%1&album=%2&track=%3"; 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( album, 106 /*utf-8*/ ),
KURL::encode_string_no_slash( track, 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" ) else if( url.protocol() == "ggartist" )
{ {
const TQString url2 = TQString( "http://www.google.com/musicsearch?q=%1&res=artist" ) 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 ); Amarok::invokeBrowser( url2 );
} }
@ -802,7 +802,7 @@ void ContextBrowser::saveHtmlData()
.replace( "<html>", .replace( "<html>",
TQString( "<html><head><style type=\"text/css\">" TQString( "<html><head><style type=\"text/css\">"
"%1</style></head>" ) "%1</style></head>" )
.tqarg( HTMLView::loadStyleSheet() ) ); // and the .arg( HTMLView::loadStyleSheet() ) ); // and the
// stylesheet // stylesheet
// code // code
exportedDocument.close(); exportedDocument.close();
@ -1243,7 +1243,7 @@ void ContextBrowser::showCurrentTrack() //SLOT
debug() << "current browser is not context, aborting showCurrentTrack()" << endl; debug() << "current browser is not context, aborting showCurrentTrack()" << endl;
m_dirtyCurrentTrackPage = true; m_dirtyCurrentTrackPage = true;
m_currentTrackPage->set( TQString( "<html><body><div class='box-body'>%1</div></body></html>" ) m_currentTrackPage->set( TQString( "<html><body><div class='box-body'>%1</div></body></html>" )
.tqarg( i18n( "Updating..." ) ) ); .arg( i18n( "Updating..." ) ) );
return; return;
} }
#endif #endif
@ -1492,7 +1492,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h
<< albumValues[6] << albumValues[6]
<< reqResult[ i + 1 ] //album.id << reqResult[ i + 1 ] //album.id
<< escapeHTMLAttr( discNumber ) << escapeHTMLAttr( discNumber )
<< i18n( "Disc %1" ).tqarg( discNumber ) ) ); << i18n( "Disc %1" ).arg( discNumber ) ) );
} }
TQString track = albumValues[j + 2].stripWhiteSpace(); TQString track = albumValues[j + 2].stripWhiteSpace();
if( track.length() > 0 ) if( track.length() > 0 )
@ -1576,7 +1576,7 @@ CurrentTrackJob::showHomeByAlbums()
date = ep.dateTime().toString(); date = ep.dateTime().toString();
TQString image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), true, 50 ); 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 ( m_HTMLSource.append( QStringx (
"<tr class='" + TQString( (i % 2) ? "box-row-alt" : "box-row" ) + "'>\n" "<tr class='" + TQString( (i % 2) ? "box-row-alt" : "box-row" ) + "'>\n"
@ -1615,7 +1615,7 @@ CurrentTrackJob::showHomeByAlbums()
) )
); );
m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).tqarg( ep.description() ) ); m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).arg( ep.description() ) );
m_HTMLSource.append( m_HTMLSource.append(
"</div>\n" "</div>\n"
@ -1929,7 +1929,7 @@ void CurrentTrackJob::addMetaHistory()
for ( uint i = 0; i < m_metadataHistory.count(); ++i ) for ( uint i = 0; i < m_metadataHistory.count(); ++i )
{ {
const TQString &str = m_metadataHistory[i]; const TQString &str = m_metadataHistory[i];
m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).tqarg( str ) ); m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).arg( str ) );
} }
m_HTMLSource.append( m_HTMLSource.append(
@ -1959,7 +1959,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
image = CollectionDB::instance()->notAvailCover( true ); image = CollectionDB::instance()->notAvailCover( true );
TQString imageAttr = escapeHTMLAttr( pcb.link().isValid() 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." ) : i18n( "No podcast website." )
); );
@ -1994,7 +1994,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
<< imageAttr << imageAttr
<< escapeHTML( peb.author().isEmpty() << escapeHTML( peb.author().isEmpty()
? i18n( "Podcast" ) ? i18n( "Podcast" )
: i18n( "Podcast by %1" ).tqarg( peb.author() ) ) : i18n( "Podcast by %1" ).arg( peb.author() ) )
<< ( peb.localUrl().isValid() << ( peb.localUrl().isValid()
? "<br />\n" + escapeHTML( i18n( "(Cached)" ) ) ? "<br />\n" + escapeHTML( i18n( "(Cached)" ) )
: "" ) : "" )
@ -2011,7 +2011,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
for ( uint i = 0; i < m_metadataHistory.count(); ++i ) for ( uint i = 0; i < m_metadataHistory.count(); ++i )
{ {
const TQString &str = m_metadataHistory[i]; const TQString &str = m_metadataHistory[i];
m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).tqarg( str ) ); m_HTMLSource.append( QStringx( "<tr class='box-row'><td>%1</td></tr>\n" ).arg( str ) );
} }
m_HTMLSource.append( m_HTMLSource.append(
@ -2024,7 +2024,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
"<div id='albums_box-header' class='box-header'>\n" "<div id='albums_box-header' class='box-header'>\n"
"<span id='albums_box-header-title' class='box-header-title'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n"
+ ( channelInDB + ( channelInDB
? i18n( "Episodes from %1" ).tqarg( escapeHTML( pcb.title() ) ) ? i18n( "Episodes from %1" ).arg( escapeHTML( pcb.title() ) )
: i18n( "Episodes from this Channel" ) : i18n( "Episodes from this Channel" )
) )
+ "</span>\n" + "</span>\n"
@ -2072,7 +2072,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
) )
); );
m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).tqarg( ep.description() ) ); m_HTMLSource.append( QStringx ( "<p>%1</p>\n" ).arg( ep.description() ) );
m_HTMLSource.append( m_HTMLSource.append(
"</div>\n" "</div>\n"
@ -2106,9 +2106,9 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist )
"<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n" "<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n"
"</tr></table>\n" "</tr></table>\n"
"</div>\n" ) "</div>\n" )
.tqarg( escapeHTML( artist ) ) .arg( escapeHTML( artist ) )
.tqarg( escapeHTML( i18n( "Browse Artist" ) ) ) .arg( escapeHTML( i18n( "Browse Artist" ) ) )
.tqarg( back ) ); .arg( back ) );
m_HTMLSource.append( m_HTMLSource.append(
"<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n" "<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n"
); );
@ -2126,16 +2126,16 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist )
m_HTMLSource.append( m_HTMLSource.append(
"<tr>\n" "<tr>\n"
"<td id='artist-wikipedia'>\n" "<td id='artist-wikipedia'>\n"
+ TQString( "<a id='artist-wikipedia-a' href='wikipedia:%1'>\n" ).tqarg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) ) + TQString( "<a id='artist-wikipedia-a' href='wikipedia:%1'>\n" ).arg( escapeHTMLAttr( artist + b->wikiArtistPostfix() ) )
+ i18n( "Wikipedia Information for %1" ).tqarg( escapeHTML( artist ) ) + + i18n( "Wikipedia Information for %1" ).arg( escapeHTML( artist ) ) +
"</a>\n" "</a>\n"
"</td>\n" "</td>\n"
"</tr>\n"); "</tr>\n");
m_HTMLSource.append( m_HTMLSource.append(
"<tr>\n" "<tr>\n"
"<td id='artist-google'>\n" "<td id='artist-google'>\n"
+ TQString( "<a id='artist-google-a' href='ggartist:%1'>\n" ).tqarg( escapeHTMLAttr( artist ) ) + TQString( "<a id='artist-google-a' href='ggartist:%1'>\n" ).arg( escapeHTMLAttr( artist ) )
+ i18n( "Google Musicsearch for %1" ).tqarg( escapeHTML( artist ) ) + + i18n( "Google Musicsearch for %1" ).arg( escapeHTML( artist ) ) +
"</a>\n" "</a>\n"
"</td>\n" "</td>\n"
"</tr>\n" "</tr>\n"
@ -2170,9 +2170,9 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label )
"<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n" "<td><div id='current_box-header-nav' class='box-header-nav'>%3</div></td>\n"
"</tr></table>\n" "</tr></table>\n"
"</div>\n" ) "</div>\n" )
.tqarg( escapeHTML( label ) ) .arg( escapeHTML( label ) )
.tqarg( escapeHTML( i18n( "Browse Label" ) ) ) .arg( escapeHTML( i18n( "Browse Label" ) ) )
.tqarg( back ) ); .arg( back ) );
m_HTMLSource.append( m_HTMLSource.append(
"<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n" "<table id='current_box-table' class='box-body' width='100%' cellpadding='0' cellspacing='0'>\n"
); );
@ -2190,8 +2190,8 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label )
m_HTMLSource.append( m_HTMLSource.append(
"<tr>\n" "<tr>\n"
"<td id='label-lastfm'>\n" "<td id='label-lastfm'>\n"
+ TQString( "<a id='label-lastfm-a' href='externalurl://www.last.fm/tag/%1'>\n" ).tqarg( escapeHTMLAttr( label ) ) + TQString( "<a id='label-lastfm-a' href='externalurl://www.last.fm/tag/%1'>\n" ).arg( escapeHTMLAttr( label ) )
+ i18n( "Last.fm Information for %1" ).tqarg( escapeHTML( label ) ) + + i18n( "Last.fm Information for %1" ).arg( escapeHTML( label ) ) +
"</a>\n" "</a>\n"
"</td>\n" "</td>\n"
"</tr>\n"); "</tr>\n");
@ -2281,11 +2281,11 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle &currentTrack )
"</td>\n" "</td>\n"
"<td id='current_box-information-td' align='right'>\n" "<td id='current_box-information-td' align='right'>\n"
) )
.tqarg( escapeHTML( currentTrack.prettyTitle() ) ) .arg( escapeHTML( currentTrack.prettyTitle() ) )
.tqarg( escapeHTMLAttr( currentTrack.artist() ) ) .arg( escapeHTMLAttr( currentTrack.artist() ) )
.tqarg( escapeHTMLAttr( currentTrack.album() ) ) .arg( escapeHTMLAttr( currentTrack.album() ) )
.tqarg( escapeHTMLAttr( albumImage ) ) .arg( escapeHTMLAttr( albumImage ) )
.tqarg( albumImageTitleAttr ) .arg( albumImageTitleAttr )
) ); ) );
if ( !values.isEmpty() && values[2].toInt() ) if ( !values.isEmpty() && values[2].toInt() )
@ -2299,18 +2299,18 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle &currentTrack )
const uint score = static_cast<uint>( values[3].toFloat() ); const uint score = static_cast<uint>( values[3].toFloat() );
const uint rating = values[4].toInt(); const uint rating = values[4].toInt();
//SAFE = .tqarg( x, y ) //SAFE = .arg( x, y )
//UNSAFE = .tqarg( x ).tqarg( y ) //UNSAFE = .arg( x ).arg( y )
m_HTMLSource.append( TQString( m_HTMLSource.append( TQString(
"<span>%1</span><br />\n" "<span>%1</span><br />\n"
"<div>%2</div>\n" "<div>%2</div>\n"
"<span>%3</span><br />\n" "<span>%3</span><br />\n"
"<span>%4</span>\n" "<span>%4</span>\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 ), statsHTML( score, rating, false ),
i18n( "Last played: %1" ).tqarg( Amarok::verboseTimeSince( lastPlay ) ), i18n( "Last played: %1" ).arg( Amarok::verboseTimeSince( lastPlay ) ),
i18n( "First played: %1" ).tqarg( Amarok::verboseTimeSince( firstPlay ) ) ) ); i18n( "First played: %1" ).arg( Amarok::verboseTimeSince( firstPlay ) ) ) );
} }
else else
m_HTMLSource.append( i18n( "Never played before" ) ); m_HTMLSource.append( i18n( "Never played before" ) );
@ -2391,7 +2391,7 @@ void CurrentTrackJob::showRelatedArtists( const TQString &artist, const TQString
"<span id='related_box-header-title' class='box-header-title'>%1</span>\n" "<span id='related_box-header-title' class='box-header-title'>%1</span>\n"
"</div>\n" "</div>\n"
"<table class='box-body' id='T_RA' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" ) "<table class='box-body' id='T_RA' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" )
.tqarg( i18n( "Artists Related to %1" ).tqarg( escapeHTML( artist ) ) ) ); .arg( i18n( "Artists Related to %1" ).arg( escapeHTML( artist ) ) ) );
m_HTMLSource.append( "<tr><td>\n" ); m_HTMLSource.append( "<tr><td>\n" );
for ( uint i = 0; i < relArtists.count(); i += 1 ) for ( uint i = 0; i < relArtists.count(); i += 1 )
{ {
@ -2492,7 +2492,7 @@ CurrentTrackJob::showSongsWithLabel( const TQString &label )
"<div id='suggested_box' class='box'>\n" "<div id='suggested_box' class='box'>\n"
"<div id='suggested_box-header' class='box-header' onClick=\"toggleBlock('T_SS'); window.location.href='togglebox:ss';\" style='cursor: pointer;'>\n" "<div id='suggested_box-header' class='box-header' onClick=\"toggleBlock('T_SS'); window.location.href='togglebox:ss';\" style='cursor: pointer;'>\n"
"<span id='suggested_box-header-title' class='box-header-title'>\n" "<span id='suggested_box-header-title' class='box-header-title'>\n"
+ i18n( "Songs with label %1" ).tqarg( label ) + + i18n( "Songs with label %1" ).arg( label ) +
"</span>\n" "</span>\n"
"</div>\n" "</div>\n"
"<table class='box-body' id='T_' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); "<table class='box-body' id='T_' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" );
@ -2540,7 +2540,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle &currentTrack )
"<div id='songlabels_box' class='box'>\n" "<div id='songlabels_box' class='box'>\n"
"<div id='songlabels-header' class='box-header' onCLick=\"toggleBlock('T_SL');window.location.href='togglebox:sl';\" style='cursor: pointer;'>\n" "<div id='songlabels-header' class='box-header' onCLick=\"toggleBlock('T_SL');window.location.href='togglebox:sl';\" style='cursor: pointer;'>\n"
"<span id='songlabels_box-header-title' class='box-header-title'>\n" "<span id='songlabels_box-header-title' class='box-header-title'>\n"
+ i18n( " Labels for %1 " ).tqarg( escapeHTML( title ) ) + + i18n( " Labels for %1 " ).arg( escapeHTML( title ) ) +
"</span>\n" "</span>\n"
"</div>\n" "</div>\n"
"<table class='box-body' id='T_SL' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" ); "<table class='box-body' id='T_SL' width='100%' border='0' cellspacing='0' cellpadding='1'>\n" );
@ -2555,7 +2555,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle &currentTrack )
} }
} }
m_HTMLSource.append( "</td></tr>\n" ); m_HTMLSource.append( "</td></tr>\n" );
m_HTMLSource.append( "<tr><td><a id='songlabels_box_addlabel' href='show:editLabels'>" + i18n( "Add labels to %1" ).tqarg( escapeHTML( title ) ) + "</a></td></tr>\n" ); m_HTMLSource.append( "<tr><td><a id='songlabels_box_addlabel' href='show:editLabels'>" + i18n( "Add labels to %1" ).arg( escapeHTML( title ) ) + "</a></td></tr>\n" );
m_HTMLSource.append( m_HTMLSource.append(
"</table>\n" "</table>\n"
"</div>\n" ); "</div>\n" );
@ -2588,7 +2588,7 @@ void CurrentTrackJob::showArtistsFaves( const TQString &artist, uint artist_id )
"<div id='favoritesby_box' class='box'>\n" "<div id='favoritesby_box' class='box'>\n"
"<div id='favoritesby-header' class='box-header' onClick=\"toggleBlock('T_FT'); window.location.href='togglebox:ft';\" style='cursor: pointer;'>\n" "<div id='favoritesby-header' class='box-header' onClick=\"toggleBlock('T_FT'); window.location.href='togglebox:ft';\" style='cursor: pointer;'>\n"
"<span id='favoritesby_box-header-title' class='box-header-title'>\n" "<span id='favoritesby_box-header-title' class='box-header-title'>\n"
+ i18n( "Favorite Tracks by %1" ).tqarg( artistName ) + + i18n( "Favorite Tracks by %1" ).arg( artistName ) +
"</span>\n" "</span>\n"
"</div>\n" "</div>\n"
"<table class='box-body' id='T_FT' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); "<table class='box-body' id='T_FT' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" );
@ -2642,7 +2642,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id,
"<div id='albums_box' class='box'>\n" "<div id='albums_box' class='box'>\n"
"<div id='albums_box-header' class='box-header'>\n" "<div id='albums_box-header' class='box-header'>\n"
"<span id='albums_box-header-title' class='box-header-title'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n"
+ i18n( "Albums by %1" ).tqarg( artistName ) + + i18n( "Albums by %1" ).arg( artistName ) +
"</span>\n" "</span>\n"
"</div>\n" "</div>\n"
"<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" );
@ -2744,7 +2744,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id,
<< TQString::number( artist_id ) << TQString::number( artist_id )
<< values[ i + 1 ] //album.id << values[ i + 1 ] //album.id
<< escapeHTMLAttr( discNumber ) << escapeHTMLAttr( discNumber )
<< i18n( "Disc %1" ).tqarg( discNumber ) ) ); << i18n( "Disc %1" ).arg( discNumber ) ) );
} }
TQString track = albumValues[j + 2].stripWhiteSpace(); TQString track = albumValues[j + 2].stripWhiteSpace();
if( track.length() > 0 ) { if( track.length() > 0 ) {
@ -2806,7 +2806,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti
"<div id='albums_box' class='box'>\n" "<div id='albums_box' class='box'>\n"
"<div id='albums_box-header' class='box-header'>\n" "<div id='albums_box-header' class='box-header'>\n"
"<span id='albums_box-header-title' class='box-header-title'>\n" "<span id='albums_box-header-title' class='box-header-title'>\n"
+ i18n( "Compilations with %1" ).tqarg( artistName ) + + i18n( "Compilations with %1" ).arg( artistName ) +
"</span>\n" "</span>\n"
"</div>\n" "</div>\n"
"<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" ); "<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" );
@ -2904,7 +2904,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti
.args( TQStringList() .args( TQStringList()
<< values[ i + 1 ] //album.id << values[ i + 1 ] //album.id
<< escapeHTMLAttr( discNumber ) << escapeHTMLAttr( discNumber )
<< i18n( "Disc %1" ).tqarg( discNumber ) ) ); << i18n( "Disc %1" ).arg( discNumber ) ) );
} }
TQString track = albumValues[j + 2].stripWhiteSpace(); TQString track = albumValues[j + 2].stripWhiteSpace();
@ -2921,7 +2921,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti
TQString tracktitle_formated; TQString tracktitle_formated;
TQString tracktitle; 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 = "<span class='album-song-title'>\n"; tracktitle_formated = "<span class='album-song-title'>\n";
if( i==vectorPlace && albumValues[j + 2].toInt() == m_currentTrack.track() && discNumber.toInt() == m_currentTrack.discNumber() ) if( i==vectorPlace && albumValues[j + 2].toInt() == m_currentTrack.track() && discNumber.toInt() == m_currentTrack.discNumber() )
tracktitle_formated += "<i>\n"; tracktitle_formated += "<i>\n";
@ -2966,11 +2966,11 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
rating = 10; rating = 10;
TQString table = TQString( "<table %1 align='right' border='0' cellspacing='0' cellpadding='0' width='100%'>%2</table>\n" ) TQString table = TQString( "<table %1 align='right' border='0' cellspacing='0' cellpadding='0' width='100%'>%2</table>\n" )
.tqarg( statsbox ? "class='statsBox'" : "" ); .arg( statsbox ? "class='statsBox'" : "" );
TQString contents; TQString contents;
if( AmarokConfig::useScores() ) if( AmarokConfig::useScores() )
contents += TQString( "<tr title='%1'>\n" ).tqarg( i18n( "Score: %1" ).tqarg( score ) ) + contents += TQString( "<tr title='%1'>\n" ).arg( i18n( "Score: %1" ).arg( score ) ) +
"<td class='sbtext' width='100%' align='right'>\n" + TQString::number( score ) + "</td>\n" "<td class='sbtext' width='100%' align='right'>\n" + TQString::number( score ) + "</td>\n"
"<td align='left' width='1'>\n" "<td align='left' width='1'>\n"
"<div class='sbouter'>\n" "<div class='sbouter'>\n"
@ -2982,8 +2982,8 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
if( AmarokConfig::useRatings() ) if( AmarokConfig::useRatings() )
{ {
contents += TQString( "<tr title='%1'>\n" ).tqarg( i18n( "Rating: %1" ) contents += TQString( "<tr title='%1'>\n" ).arg( i18n( "Rating: %1" )
.tqarg( MetaBundle::ratingDescription( rating ) ) ) + .arg( MetaBundle::ratingDescription( rating ) ) ) +
"<td class='ratingBox' align='right' colspan='2'>\n"; "<td class='ratingBox' align='right' colspan='2'>\n";
if( rating ) if( rating )
{ {
@ -3002,7 +3002,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
const TQString img = "<img src='%1' height='13px' class='ratingStar'></img>\n"; const TQString img = "<img src='%1' height='13px' class='ratingStar'></img>\n";
for( int i = 0, n = rating / 2; i < n; ++i ) 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 ) if( rating % 2 )
{ {
TQImageIO halfStarIO; TQImageIO halfStarIO;
@ -3014,7 +3014,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
halfStarIO.write(); halfStarIO.write();
halfStarBuf.close(); halfStarBuf.close();
TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true ); 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 += "</nobr>\n"; contents += "</nobr>\n";
} }
@ -3024,7 +3024,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
"</tr>\n"; "</tr>\n";
} }
return table.tqarg( contents ); return table.arg( contents );
} }
bool CurrentTrackJob::doJob() bool CurrentTrackJob::doJob()
@ -3220,7 +3220,7 @@ ContextBrowser::getEncodedImage( const TQString &imageUrl )
tqApp->lock(); tqApp->lock();
img.save( &buffer, "PNG" ); // writes image into ba in PNG format img.save( &buffer, "PNG" ); // writes image into ba in PNG format
tqApp->unlock(); 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; //debug() << "Encoded imageUrl: " << coverImage << endl;
return coverImage; 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" ) 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*/ ) ); KURL::encode_string_no_slash( '"' + title + '"', 106 /*utf-8*/ ) );
m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false); m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false);
@ -3294,7 +3294,7 @@ void ContextBrowser::showLyrics( const TQString &url )
"<br /><div class='info'>\n"+ "<br /><div class='info'>\n"+
i18n( "Available Lyrics Scripts:" ) + "<br />\n"; i18n( "Available Lyrics Scripts:" ) + "<br />\n";
foreach ( scripts ) { foreach ( scripts ) {
lyrics += TQString( "<a href=\"runscript:%1\">%2</a><br />\n" ).tqarg( *it, *it ); lyrics += TQString( "<a href=\"runscript:%1\">%2</a><br />\n" ).arg( *it, *it );
} }
lyrics += "<br />\n" + i18n( "Click on one of the scripts to run it, or use the Script Manager, to be able" lyrics += "<br />\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." ); " 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 artist = l.item( i ).toElement().attribute( "artist" );
const TQString title = l.item( i ).toElement().attribute( "title" ); const TQString title = l.item( i ).toElement().attribute( "title" );
lyrics += "<a href='show:suggestLyric-" + url + "'>\n" + i18n("%1 - %2").tqarg( artist, title ); lyrics += "<a href='show:suggestLyric-" + url + "'>\n" + i18n("%1 - %2").arg( artist, title );
lyrics += "</a><br/>\n"; lyrics += "</a><br/>\n";
} }
} }
lyrics += i18n( "<p>You can <a href=\"%1\">search for the lyrics</a> on the Web.</p>" ) lyrics += i18n( "<p>You can <a href=\"%1\">search for the lyrics</a> on the Web.</p>" )
.tqarg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) ); .arg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) );
} }
else { else {
lyrics = el.text(); lyrics = el.text();
@ -3444,7 +3444,7 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT
lyrics.prepend( "<font size='2'><b>\n" + title + "</b><br/><u>\n" + artist+ "</font></u></font><br/>\n" ); lyrics.prepend( "<font size='2'><b>\n" + title + "</b><br/><u>\n" + artist+ "</font></u></font><br/>\n" );
if( !cached ) { if( !cached ) {
lyrics.append( "<br/><br/><i>\n" + i18n( "Powered by %1 (%2)" ).tqarg( site, site_url ) + "</i>\n" ); lyrics.append( "<br/><br/><i>\n" + i18n( "Powered by %1 (%2)" ).arg( site, site_url ) + "</i>\n" );
CollectionDB::instance()->setLyrics( EngineController::instance()->bundle().url().path(), xmldoc, EngineController::instance()->bundle().uniqueId() ); 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 // add any special characters to be replaced here
TQString wStr = TQString(item).replace( "/", " " ); 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*/ ); + KURL::encode_string_no_slash( wStr, 106 /*utf-8*/ );
} }
@ -3815,7 +3815,7 @@ ContextBrowser::showLabelsDialog()
showCurrentTrack(); showCurrentTrack();
} }
} }
delete dialog; //deletes tqchildren delete dialog; //deletes children
m_addLabelEdit = 0; m_addLabelEdit = 0;
m_labelListView = 0; m_labelListView = 0;
} }

@ -43,7 +43,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis
menu.insertTitle( i18n( "Cover Image" ) ); menu.insertTitle( i18n( "Cover Image" ) );
menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); 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( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM );
bool disable = !album.isEmpty(); // disable setting covers for unknown albums bool disable = !album.isEmpty(); // disable setting covers for unknown albums
menu.setItemEnabled( FETCH, disable ); 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 //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 const TQString template1 = " ?-? ?[(^{]* ?%1 ?\\d*[)^}\\]]* *$"; //eg album - [disk 1] -> album
foreach( extensions ) { foreach( extensions ) {
TQRegExp regexp( template1.tqarg( *it ) ); TQRegExp regexp( template1.arg( *it ) );
regexp.setCaseSensitive( false ); regexp.setCaseSensitive( false );
album.remove( regexp ); album.remove( regexp );
} }

@ -276,7 +276,7 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album,
{ {
KWin::setType( winId(), NET::Utility ); KWin::setType( winId(), NET::Utility );
kapp->setTopWidget( this ); 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 = new TQHBoxLayout( this );
m_tqlayout->setAutoAdd( true ); 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 //NOTE we MUST show the dialog, otherwise the closeEvents get processed
// in the processEvents() calls below, GRUMBLE! TQt sux0rs // in the processEvents() calls below, GRUMBLE! TQt sux0rs
progress.show(); 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 //this is an extra processEvent call for the sake of init() and aesthetics
//it isn't necessary //it isn't necessary
@ -499,7 +499,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO
} }
else { else {
menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW ); 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( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM );
menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND ); menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );
menu.insertSeparator(); menu.insertSeparator();
@ -817,9 +817,9 @@ void CoverManager::updateStatusBar()
if ( values.count() >= 2 ) if ( values.count() >= 2 )
{ {
if( values[0].isEmpty() ) if( values[0].isEmpty() )
text = i18n( "Fetching cover for %1..." ).tqarg( values[1] ); text = i18n( "Fetching cover for %1..." ).arg( values[1] );
else 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 ) { else if( m_fetchingCovers ) {
@ -851,7 +851,7 @@ void CoverManager::updateStatusBar()
} }
if( !m_filter.isEmpty() ) 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() ) { else if( m_artistView->selectedItem() ) {
text = i18n( "1 album", "%n albums", totalCounter ); text = i18n( "1 album", "%n albums", totalCounter );
if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist
@ -864,7 +864,7 @@ void CoverManager::updateStatusBar()
} }
if( missingCounter ) if( missingCounter )
text += i18n(" - ( <b>%1</b> without cover )" ).tqarg( missingCounter ); text += i18n(" - ( <b>%1</b> without cover )" ).arg( missingCounter );
#ifdef AMAZON_SUPPORT #ifdef AMAZON_SUPPORT
m_fetchButton->setEnabled( missingCounter ); m_fetchButton->setEnabled( missingCounter );
@ -912,7 +912,7 @@ TQDragObject *CoverView::dragObject()
return 0; 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 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; KURL::List urls;
for( TQStringList::ConstIterator it = values.begin(), end = values.end(); it != end; ++it ) 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 //FIXME: Don't rely on other independent code, use an sql query
if( item->artist().isEmpty() ) sampler = true; if( item->artist().isEmpty() ) sampler = true;
TQString tipContent = i18n( "%1 - %2" ).tqarg( sampler ? i18n("Various Artists") : item->artist() ) TQString tipContent = i18n( "%1 - %2" ).arg( sampler ? i18n("Various Artists") : item->artist() )
.tqarg( item->album() ); .arg( item->album() );
CoverManager::instance()->setStatusText( tipContent ); 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_coverImagePath = CollectionDB::instance()->albumImage( m_artist, m_album, false, 1, &m_embedded );
m_coverPixmap = TQPixmap( m_coverImagePath ); //create the scaled cover m_coverPixmap = TQPixmap( m_coverImagePath ); //create the scaled cover
tqrepaint(); repaint();
} }

@ -81,7 +81,7 @@ CollectionDB::CollectionDB()
// Load DBEngine plugin // Load DBEngine plugin
TQString query = "[X-KDE-Amarok-plugintype] == 'dbengine' and [X-KDE-Amarok-name] != '%1'"; 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() ); m_dbEngine = (DBEngine*) PluginManager::createFromService( offers.first() );
//<OPEN DATABASE> //<OPEN DATABASE>
@ -272,8 +272,8 @@ CollectionDB::createTables( DbConnection *conn )
"length INTEGER," "length INTEGER,"
"samplerate INTEGER," "samplerate INTEGER,"
"sampler BOOL );" ) "sampler BOOL );" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ), conn ); .arg( conn ? "_temp" : "" ), conn );
TQString albumAutoIncrement = ""; TQString albumAutoIncrement = "";
TQString artistAutoIncrement = ""; TQString artistAutoIncrement = "";
@ -302,59 +302,59 @@ CollectionDB::createTables( DbConnection *conn )
query( TQString( "CREATE %1 TABLE album%2 (" query( TQString( "CREATE %1 TABLE album%2 ("
"id INTEGER PRIMARY KEY %3," "id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" ) "name " + textColumnType() + ");" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( albumAutoIncrement ), conn ); .arg( albumAutoIncrement ), conn );
//create artist table //create artist table
query( TQString( "CREATE %1 TABLE artist%2 (" query( TQString( "CREATE %1 TABLE artist%2 ("
"id INTEGER PRIMARY KEY %3," "id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" ) "name " + textColumnType() + ");" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( artistAutoIncrement ), conn ); .arg( artistAutoIncrement ), conn );
//create genre table //create genre table
query( TQString( "CREATE %1 TABLE genre%2 (" query( TQString( "CREATE %1 TABLE genre%2 ("
"id INTEGER PRIMARY KEY %3," "id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() +");" ) "name " + textColumnType() +");" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( genreAutoIncrement ), conn ); .arg( genreAutoIncrement ), conn );
//create year table //create year table
query( TQString( "CREATE %1 TABLE year%2 (" query( TQString( "CREATE %1 TABLE year%2 ("
"id INTEGER PRIMARY KEY %3," "id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" ) "name " + textColumnType() + ");" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( yearAutoIncrement ), conn ); .arg( yearAutoIncrement ), conn );
//create images table //create images table
query( TQString( "CREATE %1 TABLE images%2 (" query( TQString( "CREATE %1 TABLE images%2 ("
"path " + textColumnType() + "," "path " + textColumnType() + ","
"artist " + textColumnType() + "," "artist " + textColumnType() + ","
"album " + textColumnType() + ");" ) "album " + textColumnType() + ");" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ), conn ); .arg( conn ? "_temp" : "" ), conn );
// create directory statistics table // create directory statistics table
query( TQString( "CREATE %1 TABLE directories%2 (" query( TQString( "CREATE %1 TABLE directories%2 ("
"dir " + textColumnType() + " UNITQUE," "dir " + textColumnType() + " UNITQUE,"
"changedate INTEGER );" ) "changedate INTEGER );" )
.tqarg( conn ? "TEMPORARY" : "" ) .arg( conn ? "TEMPORARY" : "" )
.tqarg( conn ? "_temp" : "" ), conn ); .arg( conn ? "_temp" : "" ), conn );
//create indexes //create indexes
query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" ) 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 );" ) 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 );" ) 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 );" ) 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 ) if ( !conn )
{ {
@ -385,13 +385,13 @@ CollectionDB::dropTables( DbConnection *conn )
{ {
DEBUG_FUNC_INFO DEBUG_FUNC_INFO
query( TQString( "DROP TABLE tags%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE tags%1;" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "DROP TABLE album%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE album%1;" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "DROP TABLE artist%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE artist%1;" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "DROP TABLE genre%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE genre%1;" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "DROP TABLE year%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE year%1;" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "DROP TABLE images%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE images%1;" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "DROP TABLE directories%1;" ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "DROP TABLE directories%1;" ).arg( conn ? "_temp" : "" ), conn );
if ( !conn ) if ( !conn )
{ {
query( TQString( "DROP TABLE related_artists;" ) ); query( TQString( "DROP TABLE related_artists;" ) );
@ -421,16 +421,16 @@ CollectionDB::clearTables( DbConnection *conn )
clearCommand = "TRUNCATE TABLE"; clearCommand = "TRUNCATE TABLE";
} }
query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn ); query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
if ( !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 = TQStringList values =
query( TQString( query( TQString(
"SELECT id, name FROM %1 WHERE name LIKE '%2';" ) "SELECT id, name FROM %1 WHERE name LIKE '%2';" )
.tqarg( name ) .arg( name )
.tqarg( CollectionDB::instance()->escapeString( value ) ), conn ); .arg( CollectionDB::instance()->escapeString( value ) ), conn );
if ( updateSpelling && !values.isEmpty() && ( values[1] != value ) ) if ( updateSpelling && !values.isEmpty() && ( values[1] != value ) )
{ {
query( TQString( "UPDATE %1 SET id = %2, name = '%3' WHERE id = %4;" ) query( TQString( "UPDATE %1 SET id = %2, name = '%3' WHERE id = %4;" )
.tqarg( name ) .arg( name )
.tqarg( values.first() ) .arg( values.first() )
.tqarg( CollectionDB::instance()->escapeString( value ) ) .arg( CollectionDB::instance()->escapeString( value ) )
.tqarg( values.first() ), conn ); .arg( values.first() ), conn );
} }
//check if item exists. if not, should we autocreate it? //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 ) if ( values.isEmpty() && autocreate )
{ {
id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" ) id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" )
.tqarg( name ) .arg( name )
.tqarg( CollectionDB::instance()->escapeString( value ) ), name, conn ); .arg( CollectionDB::instance()->escapeString( value ) ), name, conn );
return id; return id;
} }
@ -617,8 +617,8 @@ CollectionDB::valueFromID( TQString table, uint id )
TQStringList values = TQStringList values =
query( TQString( query( TQString(
"SELECT name FROM %1 WHERE id=%2;" ) "SELECT name FROM %1 WHERE id=%2;" )
.tqarg( table ) .arg( table )
.tqarg( id ) ); .arg( id ) );
return values.isEmpty() ? 0 : values.first(); return values.isEmpty() ? 0 : values.first();
@ -631,8 +631,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i
TQStringList values = TQStringList values =
query( TQString( query( TQString(
"SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" ) "SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" )
.tqarg( album_id ) .arg( album_id )
.tqarg( artist_id ) ); .arg( artist_id ) );
return values.first(); return values.first();
} }
@ -642,8 +642,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id )
TQStringList values = TQStringList values =
query( TQString( query( TQString(
"SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" ) "SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" )
.tqarg( CollectionDB::instance()->boolT() ) .arg( CollectionDB::instance()->boolT() )
.tqarg( album_id ) ); .arg( album_id ) );
return (values.count() != 0); 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 " 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 " "( tags.sampler = %2 OR tags.artist = %3 ) AND year.id = tags.year "
"ORDER BY tags.track;" ) "ORDER BY tags.track;" )
.tqarg( album_id ) .arg( album_id )
.tqarg( boolT() ) .arg( boolT() )
.tqarg( artist_id ) ); .arg( artist_id ) );
} }
else else
{ {
return query( TQString( "SELECT tags.url FROM tags, year WHERE tags.album = %1 AND " 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 " "( tags.sampler = 1 OR tags.artist = %2 ) AND year.id = tags.year "
"ORDER BY tags.track;" ) "ORDER BY tags.track;" )
.tqarg( album_id ) .arg( album_id )
.tqarg( artist_id ) ); .arg( artist_id ) );
} }
} }
@ -680,10 +680,10 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPair<TQStri
debug() << "Added image for album: " << (*it).first << " - " << (*it).second << ": " << image << endl; debug() << "Added image for album: " << (*it).first << " - " << (*it).second << ": " << image << endl;
insert( TQString( "INSERT INTO images%1 ( path, artist, album ) VALUES ( '%1', '%2', '%3' );" ) insert( TQString( "INSERT INTO images%1 ( path, artist, album ) VALUES ( '%1', '%2', '%3' );" )
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( escapeString( image ) ) .arg( escapeString( image ) )
.tqarg( escapeString( (*it).first ) ) .arg( escapeString( (*it).first ) )
.tqarg( escapeString( (*it).second ) ), NULL, conn ); .arg( escapeString( (*it).second ) ), NULL, conn );
} }
} }
@ -879,8 +879,8 @@ CollectionDB::getImageForAlbum( const TQString& artist, const TQString& album, u
TQStringList values = TQStringList values =
query( TQString( query( TQString(
"SELECT path FROM images WHERE artist LIKE '%1' AND album LIKE '%2' ORDER BY path;" ) "SELECT path FROM images WHERE artist LIKE '%1' AND album LIKE '%2' ORDER BY path;" )
.tqarg( escapeString( artist ) ) .arg( escapeString( artist ) )
.tqarg( escapeString( album ) ) ); .arg( escapeString( album ) ) );
if ( !values.isEmpty() ) if ( !values.isEmpty() )
{ {
@ -1165,7 +1165,7 @@ CollectionDB::bundleForUrl( MetaBundle* bundle )
"FROM tags, album, artist, genre, year " "FROM tags, album, artist, genre, year "
"WHERE album.id = tags.album AND artist.id = tags.artist AND " "WHERE album.id = tags.album AND artist.id = tags.artist AND "
"genre.id = tags.genre AND year.id = tags.year AND tags.url = '%1';" ) "genre.id = tags.genre AND year.id = tags.year AND tags.url = '%1';" )
.tqarg( escapeString( bundle->url().path() ) ) ); .arg( escapeString( bundle->url().path() ) ) );
if ( !values.empty() ) if ( !values.empty() )
fillInBundle( values, *bundle ); fillInBundle( values, *bundle );
@ -1260,10 +1260,10 @@ void
CollectionDB::addAudioproperties( const MetaBundle& bundle ) CollectionDB::addAudioproperties( const MetaBundle& bundle )
{ {
query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%4';" ) query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%4';" )
.tqarg( bundle.bitrate() ) .arg( bundle.bitrate() )
.tqarg( bundle.length() ) .arg( bundle.length() )
.tqarg( bundle.sampleRate() ) .arg( bundle.sampleRate() )
.tqarg( escapeString( bundle.url().path() ) ) ); .arg( escapeString( bundle.url().path() ) ) );
} }
@ -1275,7 +1275,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
query( TQString( query( TQString(
"SELECT playcounter, createdate, percentage FROM statistics " "SELECT playcounter, createdate, percentage FROM statistics "
"WHERE url = '%1';" ) "WHERE url = '%1';" )
.tqarg( escapeString( url ) ) ); .arg( escapeString( url ) ) );
// check boundaries // check boundaries
if ( percentage > 100 ) percentage = 100; if ( percentage > 100 ) percentage = 100;
@ -1288,19 +1288,19 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
query( TQString( "UPDATE statistics SET percentage=%1, playcounter=%2+1 WHERE url='%3';" ) query( TQString( "UPDATE statistics SET percentage=%1, playcounter=%2+1 WHERE url='%3';" )
.tqarg( score ) .arg( score )
.tqarg( values[0] + " + 1" ) .arg( values[0] + " + 1" )
.tqarg( escapeString( url ) ) ); .arg( escapeString( url ) ) );
} }
else else
{ {
query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, %5 );" ) "VALUES ( '%1', %2, %3, %4, %5 );" )
.tqarg( escapeString( url ) ) .arg( escapeString( url ) )
.tqarg( values[1] ) .arg( values[1] )
.tqarg( TQDateTime::currentDateTime().toTime_t() ) .arg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( score ) .arg( score )
.tqarg( values[0] + " + 1" ) ); .arg( values[0] + " + 1" ) );
} }
} }
else else
@ -1310,10 +1310,10 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, 1 );" ) "VALUES ( '%1', %2, %3, %4, 1 );" )
.tqarg( escapeString( url ) ) .arg( escapeString( url ) )
.tqarg( TQDateTime::currentDateTime().toTime_t() ) .arg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() ) .arg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( score ), NULL ); .arg( score ), NULL );
} }
int iscore = getSongPercentage( url ); int iscore = getSongPercentage( url );
@ -1326,7 +1326,7 @@ int
CollectionDB::getSongPercentage( const TQString &url ) CollectionDB::getSongPercentage( const TQString &url )
{ {
TQStringList values = query( TQString( "SELECT round( percentage + 0.4 ) FROM statistics WHERE url = '%1';" ) TQStringList values = query( TQString( "SELECT round( percentage + 0.4 ) FROM statistics WHERE url = '%1';" )
.tqarg( escapeString( url ) ) ); .arg( escapeString( url ) ) );
if( values.count() ) if( values.count() )
return values.first().toInt(); return values.first().toInt();
@ -1341,7 +1341,7 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage )
TQStringList values = TQStringList values =
query( TQString( query( TQString(
"SELECT playcounter, createdate, accessdate FROM statistics WHERE url = '%1';" ) "SELECT playcounter, createdate, accessdate FROM statistics WHERE url = '%1';" )
.tqarg( escapeString( url ) ) ); .arg( escapeString( url ) ) );
// check boundaries // check boundaries
if ( percentage > 100 ) percentage = 100; if ( percentage > 100 ) percentage = 100;
@ -1351,29 +1351,29 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage )
{ {
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%2';" ) query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%2';" )
.tqarg( percentage ) .arg( percentage )
.tqarg( escapeString( url ) ) ); .arg( escapeString( url ) ) );
} }
else else
{ {
// entry exists // entry exists
query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', '%2', '%3', %4, %5 );" ) "VALUES ( '%1', '%2', '%3', %4, %5 );" )
.tqarg( escapeString( url ) ) .arg( escapeString( url ) )
.tqarg( values[1] ) .arg( values[1] )
.tqarg( values[2] ) .arg( values[2] )
.tqarg( percentage ) .arg( percentage )
.tqarg( values[0] ) ); .arg( values[0] ) );
} }
} }
else else
{ {
insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) " insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, 0 );" ) "VALUES ( '%1', %2, %3, %4, 0 );" )
.tqarg( escapeString( url ) ) .arg( escapeString( url ) )
.tqarg( TQDateTime::currentDateTime().toTime_t() ) .arg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( TQDateTime::currentDateTime().toTime_t() ) .arg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( percentage ), NULL ); .arg( percentage ), NULL );
} }
emit scoreChanged( url, percentage ); emit scoreChanged( url, percentage );
@ -1388,16 +1388,16 @@ CollectionDB::updateDirStats( TQString path, const long datetime, DbConnection *
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';") query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';")
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( datetime ) .arg( datetime )
.tqarg( escapeString( path ) ), conn ); .arg( escapeString( path ) ), conn );
} }
else else
{ {
query( TQString( "REPLACE INTO directories%1 ( dir, changedate ) VALUES ( '%3', %2 );" ) query( TQString( "REPLACE INTO directories%1 ( dir, changedate ) VALUES ( '%3', %2 );" )
.tqarg( conn ? "_temp" : "" ) .arg( conn ? "_temp" : "" )
.tqarg( datetime ) .arg( datetime )
.tqarg( escapeString( path ) ), .arg( escapeString( path ) ),
conn ); conn );
} }
} }
@ -1410,7 +1410,7 @@ CollectionDB::removeSongsInDir( TQString path )
path = path.left( path.length() - 1 ); path = path.left( path.length() - 1 );
query( TQString( "DELETE FROM tags WHERE dir = '%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 = TQStringList values =
query( TQString( "SELECT changedate FROM directories WHERE dir = '%1';" ) query( TQString( "SELECT changedate FROM directories WHERE dir = '%1';" )
.tqarg( escapeString( path ) ) ); .arg( escapeString( path ) ) );
return !values.isEmpty(); return !values.isEmpty();
} }
@ -1433,7 +1433,7 @@ CollectionDB::isFileInCollection( const TQString &url )
{ {
TQStringList values = TQStringList values =
query( TQString( "SELECT url FROM tags WHERE url = '%1';" ) query( TQString( "SELECT url FROM tags WHERE url = '%1';" )
.tqarg( escapeString( url ) ) ); .arg( escapeString( url ) ) );
return !values.isEmpty(); 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 ) for( KURL::List::ConstIterator it = urls.begin(), end = urls.end(); it != end; ++it )
{ {
query( TQString( "DELETE FROM tags WHERE url = '%1';" ) 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) { if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' OFFSET 0 LIMIT %2;" ) 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 else
{ {
values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' LIMIT 0, %2;" ) 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() ) if ( values.isEmpty() )
@ -1480,8 +1480,8 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC
TQStringList dirs; 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;" ) 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" : "" ) .arg( temporary ? "_temp" : "" )
.tqarg( escapeString( path ) ), conn ); .arg( escapeString( path ) ), conn );
for ( uint i = 0; i < albums.count(); i++ ) 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 ); 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;" ) 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" : "" ) .arg( temporary ? "_temp" : "" )
.tqarg( album_id ), conn ); .arg( album_id ), conn );
dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" ) 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() ) if ( artists.count() > dirs.count() )
{ {
debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ":" << dirs.count() << endl; debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ":" << dirs.count() << endl;
query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2';" ) 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 ) 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';" ) query( TQString( "UPDATE tags, album SET tags.sampler = %1 WHERE tags.album = album.id AND album.name = '%2';" )
.tqarg( enabled ? "1" : "0" ) .arg( enabled ? "1" : "0" )
.tqarg( escapeString( album ) ) ); .arg( escapeString( album ) ) );
// Update the Collection-Browser view, // Update the Collection-Browser view,
// using TQTimer to make sure we don't manipulate the GUI from a thread // 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 ); path = path.left( path.length() - 1 );
query( TQString( "DELETE FROM directories WHERE dir = '%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() 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 );"; const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );";
foreach( suggestions ) foreach( suggestions )
CollectionDB::instance()->insert( sql CollectionDB::instance()->insert( sql
.tqarg( escapedArtist ) .arg( escapedArtist )
.tqarg( CollectionDB::instance()->escapeString( *it ) ), NULL ); .arg( CollectionDB::instance()->escapeString( *it ) ), NULL );
return true; return true;
} }

@ -216,10 +216,10 @@ QueryBuilder::addMatch( int tables, int value, const TQString& match )
if ( !match.isEmpty() ) if ( !match.isEmpty() )
{ {
m_where += "AND ( true "; 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" ) ) 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 += " ) "; m_where += " ) ";
} }
@ -410,7 +410,7 @@ QueryBuilder::groupBy( int table, int value )
void void
QueryBuilder::setLimit( int startPos, int length ) 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 );
} }

@ -64,7 +64,7 @@
<property name="text"> <property name="text">
<string>Deletion method placeholder, never shown to user.</string> <string>Deletion method placeholder, never shown to user.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignCenter</set> <set>WordBreak|AlignCenter</set>
</property> </property>
</widget> </widget>
@ -93,7 +93,7 @@
<property name="text"> <property name="text">
<string>Placeholder for number of files, not in GUI</string> <string>Placeholder for number of files, not in GUI</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

@ -126,20 +126,20 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m
{ {
TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint "
"FROM devices WHERE type = 'uuid' " "FROM devices WHERE type = 'uuid' "
"AND uuid = '%1';" ).tqarg( m->id() ) ); "AND uuid = '%1';" ).arg( m->id() ) );
if ( ids.size() == 3 ) if ( ids.size() == 3 )
{ {
debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl; debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl;
CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " 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() ); return new MassStorageDeviceHandler( ids[0].toInt(), m->mountPoint(), m->id() );
} }
else else
{ {
int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) " int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) "
"VALUES ( 'uuid', '%1', '%2' );" ) "VALUES ( 'uuid', '%1', '%2' );" )
.tqarg( m->id() ) .arg( m->id() )
.tqarg( m->mountPoint() ), "devices" ); .arg( m->mountPoint() ), "devices" );
if ( id == 0 ) if ( id == 0 )
{ {
warning() << "Inserting into devices failed for type=uuid, uuid=" << m->id() << endl; warning() << "Inserting into devices failed for type=uuid, uuid=" << m->id() << endl;

@ -135,13 +135,13 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const
TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint "
"FROM devices WHERE type = 'nfs' " "FROM devices WHERE type = 'nfs' "
"AND servername = '%1' AND sharename = '%2';" ) "AND servername = '%1' AND sharename = '%2';" )
.tqarg( server ) .arg( server )
.tqarg( share ) ); .arg( share ) );
if ( ids.size() == 3 ) if ( ids.size() == 3 )
{ {
debug() << "Found existing NFS config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; debug() << "Found existing NFS config for ID " << ids[0] << " , server " << server << " ,share " << share << endl;
CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " 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() ); return new NfsDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() );
} }
else else
@ -149,9 +149,9 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const
int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices"
"( type, servername, sharename, lastmountpoint ) " "( type, servername, sharename, lastmountpoint ) "
"VALUES ( 'nfs', '%1', '%2', '%3' );" ) "VALUES ( 'nfs', '%1', '%2', '%3' );" )
.tqarg( server ) .arg( server )
.tqarg( share ) .arg( share )
.tqarg( m->mountPoint() ), "devices" ); .arg( m->mountPoint() ), "devices" );
if ( id == 0 ) if ( id == 0 )
{ {
warning() << "Inserting into devices failed for type=nfs, server=" << server << ", share=" << share << endl; warning() << "Inserting into devices failed for type=nfs, server=" << server << ", share=" << share << endl;

@ -137,13 +137,13 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const
TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint "
"FROM devices WHERE type = 'smb' " "FROM devices WHERE type = 'smb' "
"AND servername = '%1' AND sharename = '%2';" ) "AND servername = '%1' AND sharename = '%2';" )
.tqarg( server ) .arg( server )
.tqarg( share ) ); .arg( share ) );
if ( ids.size() == 3 ) if ( ids.size() == 3 )
{ {
debug() << "Found existing SMB config for ID " << ids[0] << " , server " << server << " ,share " << share << endl; debug() << "Found existing SMB config for ID " << ids[0] << " , server " << server << " ,share " << share << endl;
CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " 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() ); return new SmbDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() );
} }
else else
@ -151,9 +151,9 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const
int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices" int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices"
"( type, servername, sharename, lastmountpoint ) " "( type, servername, sharename, lastmountpoint ) "
"VALUES ( 'smb', '%1', '%2', '%3' );" ) "VALUES ( 'smb', '%1', '%2', '%3' );" )
.tqarg( server ) .arg( server )
.tqarg( share ) .arg( share )
.tqarg( m->mountPoint() ), "devices" ); .arg( m->mountPoint() ), "devices" );
if ( id == 0 ) if ( id == 0 )
{ {
warning() << "Inserting into devices failed for type=smb, server=" << server << ", share=" << share << endl; warning() << "Inserting into devices failed for type=smb, server=" << server << ", share=" << share << endl;

@ -212,8 +212,8 @@ Item::stateChange( bool b )
} }
} }
else { else {
//Deselect item and recurse through tqchildren but only deselect tqchildren if they //Deselect item and recurse through children but only deselect children if they
//do not exist unless we are in recursive mode (where no tqchildren should be //do not exist unless we are in recursive mode (where no children should be
//selected if the parent is being unselected) //selected if the parent is being unselected)
//Note this does not do anything to the checkboxes, but they should be doing //Note this does not do anything to the checkboxes, but they should be doing
//the same thing as we are (hopefully) //the same thing as we are (hopefully)
@ -258,7 +258,7 @@ Item::newItems( const KFileItemList &list ) //SLOT
for( KFileItemListIterator it( list ); *it; ++it ) for( KFileItemListIterator it( list ); *it; ++it )
{ {
//Fully disable (always appears off and grayed-out) if it is "/proc", "/sys" or //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. //might as well show that.
//These match up with the skipped dirs in CollectionScanner::readDir. //These match up with the skipped dirs in CollectionScanner::readDir.
bool fully_disable=false; bool fully_disable=false;

@ -88,7 +88,7 @@ public:
public slots: public slots:
void newItems( const KFileItemList& ); void newItems( const KFileItemList& );
void completed() { if( childCount() == 0 ) { setExpandable( false ); tqrepaint(); } } void completed() { if( childCount() == 0 ) { setExpandable( false ); repaint(); } }
private: private:
KDirLister m_lister; KDirLister m_lister;

@ -274,8 +274,8 @@ DEBUG_BLOCK
{ {
TQRegExp limit( "(LIMIT.*)?;$" ); TQRegExp limit( "(LIMIT.*)?;$" );
sql.replace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") sql.replace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;")
.tqarg( CollectionDB::instance()->randomFunc() ) .arg( CollectionDB::instance()->randomFunc() )
.tqarg( songCount ) ); .arg( songCount ) );
} }
else else
{ {
@ -309,8 +309,8 @@ DEBUG_BLOCK
TQRegExp orderLimit( "(ORDER BY.*)?;$" ); TQRegExp orderLimit( "(ORDER BY.*)?;$" );
sql.replace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;") sql.replace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;")
.tqarg( CollectionDB::instance()->randomFunc() ) .arg( CollectionDB::instance()->randomFunc() )
.tqarg( songCount ) ); .arg( songCount ) );
} }
else // time ordered criteria, only mess with the limits else // time ordered criteria, only mess with the limits
{ {
@ -324,11 +324,11 @@ DEBUG_BLOCK
if( findLocation == -1 ) // there is no limit if( findLocation == -1 ) // there is no limit
{ {
TQRegExp queryEnd( ";$" ); // find the end of the query an add a 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; useDirect = false;
} }
else // there is a limit, so find it and replace it 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 ) );
} }
} }

@ -180,7 +180,7 @@ AkodeEngine::event( TQEvent *e )
case 3002: case 3002:
m_player->stop(); m_player->stop();
emit trackEnded(); emit trackEnded();
emit infoMessage( i18n("Unable to decode <i>%1</i>").tqarg( m_url.prettyURL()) ); emit infoMessage( i18n("Unable to decode <i>%1</i>").arg( m_url.prettyURL()) );
break; break;
default: default:

@ -126,7 +126,7 @@ void HelixEngine::notifyUser(unsigned long code, const char *moreinfo, const cha
{ {
TQString *err = HelixErrors::errorText(code); TQString *err = HelixErrors::errorText(code);
if (err) 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 else
emit statusText(i18n("Helix Core returned error: <unknown>")); emit statusText(i18n("Helix Core returned error: <unknown>"));
} }
@ -135,7 +135,7 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const
{ {
TQString *err = HelixErrors::errorText(code); TQString *err = HelixErrors::errorText(code);
if (err) 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 else
emit infoMessage(i18n("Helix Core returned error: <unknown>")); emit infoMessage(i18n("Helix Core returned error: <unknown>"));
@ -146,13 +146,13 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const
void HelixEngine::onContacting(const char *host) 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) void HelixEngine::onBuffering(int pcnt)
{ {
if (pcnt != 100) // let's not report that... 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 path = url.path();
const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower(); 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; return false;
} }

@ -531,7 +531,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown)
* Returns the count of the number of Properties under the one * Returns the count of the number of Properties under the one
* whose name is specified in "pName". * 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 * retrieved
*/ */
STDMETHOD_(INT32, GetNumPropsByName) (THIS_ STDMETHOD_(INT32, GetNumPropsByName) (THIS_
@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown)
* Returns the count of the number of Properties under the one * Returns the count of the number of Properties under the one
* whose unique id is specified in "ulId". * 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 * to be retrieved
*/ */
STDMETHOD_(INT32, GetNumPropsById) (THIS_ STDMETHOD_(INT32, GetNumPropsById) (THIS_
@ -1594,7 +1594,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Returns the count of the number of Properties under the one * Returns the count of the number of Properties under the one
* whose name is specified in "pName". * 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 * retrieved
*/ */
STDMETHOD_(INT32, GetNumPropsByName) (THIS_ STDMETHOD_(INT32, GetNumPropsByName) (THIS_
@ -1607,7 +1607,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Returns the count of the number of Properties under the one * Returns the count of the number of Properties under the one
* whose unique id is specified in "ulId". * 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 * to be retrieved
*/ */
STDMETHOD_(INT32, GetNumPropsById) (THIS_ STDMETHOD_(INT32, GetNumPropsById) (THIS_
@ -2089,10 +2089,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Method: * Method:
* IHXRegistry2::GetChildIdListByName * IHXRegistry2::GetChildIdListByName
* Purpose: * 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. * 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. * pValues - OUT - array of unique Property id's.
* ulCount - OUT - size of the returned pValues array. * ulCount - OUT - size of the returned pValues array.
* *
@ -2108,10 +2108,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Method: * Method:
* IHXRegistry2::GetChildIdListById * IHXRegistry2::GetChildIdListById
* Purpose: * 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. * 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. * pValues - OUT - array of unique Property id's.
* ulCount - OUT - size of the returned pValues array. * ulCount - OUT - size of the returned pValues array.
* *

@ -835,7 +835,7 @@ HelixSimplePlayer::~HelixSimplePlayer()
{ {
tearDown(); tearDown();
// only now tqinvalidate the device, not whenever we teardown // only now invalidate the device, not whenever we teardown
delete [] m_device; delete [] m_device;
} }

@ -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_inited(false), m_api( HelixSimplePlayer::OSS ), m_device(0), mimehead(0), mimelistlen(0),
m_numPlugins(0), m_pluginInfo(0) m_numPlugins(0), m_pluginInfo(0)
{ {
memset(m_tqchildren, 0, sizeof(m_tqchildren)); memset(m_children, 0, sizeof(m_children));
} }
PlayerControl::~PlayerControl() PlayerControl::~PlayerControl()
@ -100,7 +100,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
return; return;
} }
memset(&m_tqchildren, 0, numPlayers * sizeof(struct playerChildren)); memset(&m_children, 0, numPlayers * sizeof(struct playerChildren));
m_inited = false; m_inited = false;
@ -121,30 +121,30 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
{ {
if (pmapped) if (pmapped)
{ {
m_tqchildren[i].current_time = &(pmapped[i].current_time); m_children[i].current_time = &(pmapped[i].current_time);
m_tqchildren[i].duration = &(pmapped[i].duration); m_children[i].duration = &(pmapped[i].duration);
m_tqchildren[i].md = &(pmapped[i].md); m_children[i].md = &(pmapped[i].md);
m_tqchildren[i].m_current = &(pmapped[i].m_current); m_children[i].m_current = &(pmapped[i].m_current);
m_tqchildren[i].m_consumed = &(pmapped[i].m_consumed); m_children[i].m_consumed = &(pmapped[i].m_consumed);
//m_tqchildren[i].q = pmapped[i].q; //m_children[i].q = pmapped[i].q;
//for (int j=0; j<NUM_SCOPEBUFS; j++) //for (int j=0; j<NUM_SCOPEBUFS; j++)
//{ //{
// m_tqchildren[i].q[j].allocd = false; // m_children[i].q[j].allocd = false;
// m_tqchildren[i].q[j].buf = pmapped[i].b[j]; // m_children[i].q[j].buf = pmapped[i].b[j];
//} //}
} }
err = pipe(m_tqchildren[i].m_pipeA); err = pipe(m_children[i].m_pipeA);
err |= pipe(m_tqchildren[i].m_pipeB); err |= pipe(m_children[i].m_pipeB);
if ( !err && (iamparent = fork()) ) if ( !err && (iamparent = fork()) )
{ {
// parent // parent
print2stderr("%%%%%% parent initializes player %d\n", i); print2stderr("%%%%%% parent initializes player %d\n", i);
// parent's m_pid remains 0 // parent's m_pid remains 0
m_tqchildren[i].m_pid = iamparent; m_children[i].m_pid = iamparent;
close(m_tqchildren[i].m_pipeA[1]); // parent uses A for reading close(m_children[i].m_pipeA[1]); // parent uses A for reading
close(m_tqchildren[i].m_pipeB[0]); // and B for writing close(m_children[i].m_pipeB[0]); // and B for writing
} }
else if (!err) else if (!err)
{ {
@ -153,17 +153,17 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
cerr << "%%%%%% child initializes as player " << i << endl;; cerr << "%%%%%% child initializes as player " << i << endl;;
m_index = i; // child's index is saved m_index = i; // child's index is saved
close(m_tqchildren[i].m_pipeA[0]); // child uses A for writing close(m_children[i].m_pipeA[0]); // child uses A for writing
close(m_tqchildren[i].m_pipeB[1]); // and B for reading close(m_children[i].m_pipeB[1]); // and B for reading
break; break;
} }
} }
if (!iamparent) // tqchildren stay here, parents return if (!iamparent) // children stay here, parents return
{ {
int rfd = m_tqchildren[m_index].m_pipeB[0]; int rfd = m_children[m_index].m_pipeB[0];
int wfd = m_tqchildren[m_index].m_pipeA[1]; int wfd = m_children[m_index].m_pipeA[1];
int n; int n;
struct timeval timeout; struct timeval timeout;
HSPPlayerControlled *player = 0; HSPPlayerControlled *player = 0;
@ -237,7 +237,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
if (m_inited) if (m_inited)
{ {
if (pmapped) if (pmapped)
*m_tqchildren[m_index].current_time = 0; *m_children[m_index].current_time = 0;
if (sz == sizeof(unsigned long) + 1) if (sz == sizeof(unsigned long) + 1)
{ {
@ -397,7 +397,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
{ {
player->clearScopeQ(0); player->clearScopeQ(0);
if (pmapped) 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; break;
case TEARDOWN: case TEARDOWN:
@ -437,36 +437,36 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
playing = false; playing = false;
if (pmapped) if (pmapped)
{ {
*m_tqchildren[m_index].current_time = 0; *m_children[m_index].current_time = 0;
*m_tqchildren[m_index].duration = 0; *m_children[m_index].duration = 0;
} }
} }
if (pmapped) if (pmapped)
{ {
*m_tqchildren[m_index].current_time = player->where(0); *m_children[m_index].current_time = player->where(0);
*m_tqchildren[m_index].duration = player->duration(0); *m_children[m_index].duration = player->duration(0);
HelixSimplePlayer::metaData *md = player->getMetaData(0); HelixSimplePlayer::metaData *md = player->getMetaData(0);
if (md) 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; struct DelayQueue *item;
//int j; //int j;
while ((item = player->getScopeBuf(0))) 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; //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_children[m_index].q[j].len = item->len;
//m_tqchildren[m_index].q[j].time = item->time; //m_children[m_index].q[j].time = item->time;
//m_tqchildren[m_index].q[j].etime = item->etime; //m_children[m_index].q[j].etime = item->etime;
//m_tqchildren[m_index].q[j].nchan = item->nchan; //m_children[m_index].q[j].nchan = item->nchan;
//m_tqchildren[m_index].q[j].bps = item->bps; //m_children[m_index].q[j].bps = item->bps;
//m_tqchildren[m_index].q[j].tps = item->tps; //m_children[m_index].q[j].tps = item->tps;
//m_tqchildren[m_index].q[j].spb = item->spb; //m_children[m_index].q[j].spb = item->spb;
//memcpy((void *)m_tqchildren[m_index].q[j].buf, (void *) item->buf, item->len ); //memcpy((void *)m_children[m_index].q[j].buf, (void *) item->buf, item->len );
//*m_tqchildren[m_index].m_current = j; //*m_children[m_index].m_current = j;
//cerr << "player:" << m_index << " time=" << item->time << " etime=" << item->etime << endl; //cerr << "player:" << m_index << " time=" << item->time << " etime=" << item->etime << endl;
sendscopebuf(wfd, item); sendscopebuf(wfd, item);
delete item; delete item;
@ -488,15 +488,15 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
sendsetdevice(); sendsetdevice();
sendinit(); sendinit();
// wait for ready from tqchildren // wait for ready from children
while (!done && !dead) while (!done && !dead)
{ {
dispatch(); dispatch();
done = true; done = true;
for (i=0; i<numPlayers; i++) for (i=0; i<numPlayers; i++)
{ {
done &= m_tqchildren[i].isready; done &= m_children[i].isready;
dead |= m_tqchildren[i].isdead; dead |= m_children[i].isdead;
} }
} }
@ -540,12 +540,12 @@ void PlayerControl::tearDown()
{ {
if (m_inited) if (m_inited)
{ {
sendteardown(m_tqchildren[i].m_pipeB[1]); sendteardown(m_children[i].m_pipeB[1]);
close(m_tqchildren[i].m_pipeB[1]); close(m_children[i].m_pipeB[1]);
close(m_tqchildren[i].m_pipeA[0]); close(m_children[i].m_pipeA[0]);
cerr << "About to waitpid for pid " << m_tqchildren[i].m_pid << endl; cerr << "About to waitpid for pid " << m_children[i].m_pid << endl;
kill(m_tqchildren[i].m_pid, SIGTERM); kill(m_children[i].m_pid, SIGTERM);
waitpid(m_tqchildren[i].m_pid, &tmp, 0); waitpid(m_children[i].m_pid, &tmp, 0);
} }
} }
} }
@ -553,16 +553,16 @@ void PlayerControl::tearDown()
void PlayerControl::start(int playerIndex, bool fadein, unsigned long fadetime) void PlayerControl::start(int playerIndex, bool fadein, unsigned long fadetime)
{ {
m_tqchildren[playerIndex].isplaying = true; m_children[playerIndex].isplaying = true;
if (pmapped) if (pmapped)
*m_tqchildren[playerIndex].m_consumed = *m_tqchildren[playerIndex].m_current = 0; *m_children[playerIndex].m_consumed = *m_children[playerIndex].m_current = 0;
sendstart(m_tqchildren[playerIndex].m_pipeB[1], fadein, fadetime); sendstart(m_children[playerIndex].m_pipeB[1], fadein, fadetime);
} }
int PlayerControl::setURL(const char *url, int playerIndex, bool islocal) int PlayerControl::setURL(const char *url, int playerIndex, bool islocal)
{ {
m_tqchildren[playerIndex].islocal = islocal; m_children[playerIndex].islocal = islocal;
if (sendsetURL(m_tqchildren[playerIndex].m_pipeB[1], url, islocal)) if (sendsetURL(m_children[playerIndex].m_pipeB[1], url, islocal))
return 0; return 0;
return -1; return -1;
@ -570,7 +570,7 @@ int PlayerControl::setURL(const char *url, int playerIndex, bool islocal)
bool PlayerControl::done(int playerIndex) bool PlayerControl::done(int playerIndex)
{ {
return (!m_tqchildren[playerIndex].isplaying); return (!m_children[playerIndex].isplaying);
} }
void PlayerControl::stop(int playerIndex) void PlayerControl::stop(int playerIndex)
@ -582,30 +582,30 @@ void PlayerControl::stop(int playerIndex)
} }
else else
{ {
m_tqchildren[playerIndex].isplaying = false; m_children[playerIndex].isplaying = false;
sendstop(m_tqchildren[playerIndex].m_pipeB[1]); sendstop(m_children[playerIndex].m_pipeB[1]);
} }
} }
void PlayerControl::pause(int playerIndex) void PlayerControl::pause(int playerIndex)
{ {
sendpause(m_tqchildren[playerIndex].m_pipeB[1]); sendpause(m_children[playerIndex].m_pipeB[1]);
} }
void PlayerControl::resume(int playerIndex) void PlayerControl::resume(int playerIndex)
{ {
sendresume(m_tqchildren[playerIndex].m_pipeB[1]); sendresume(m_children[playerIndex].m_pipeB[1]);
} }
void PlayerControl::seek(unsigned long pos, int playerIndex) void PlayerControl::seek(unsigned long pos, int playerIndex)
{ {
sendmessage(m_tqchildren[playerIndex].m_pipeB[1], SEEK, (unsigned char *) &pos, sizeof(unsigned long)); sendmessage(m_children[playerIndex].m_pipeB[1], SEEK, (unsigned char *) &pos, sizeof(unsigned long));
} }
unsigned long PlayerControl::where(int playerIndex) const unsigned long PlayerControl::where(int playerIndex) const
{ {
if (pmapped) if (pmapped)
return *m_tqchildren[playerIndex].current_time; return *m_children[playerIndex].current_time;
else else
return 0; return 0;
} }
@ -613,7 +613,7 @@ unsigned long PlayerControl::where(int playerIndex) const
unsigned long PlayerControl::duration(int playerIndex) const unsigned long PlayerControl::duration(int playerIndex) const
{ {
if (pmapped) if (pmapped)
return *m_tqchildren[playerIndex].duration; return *m_children[playerIndex].duration;
else else
return 0; return 0;
} }
@ -627,7 +627,7 @@ void PlayerControl::setVolume(unsigned long vol)
{ {
m_volume = vol; m_volume = vol;
for (int i = 0; i < nNumPlayers; i++) for (int i = 0; i < nNumPlayers; i++)
sendsetvolume(m_tqchildren[i].m_pipeB[1], vol); sendsetvolume(m_children[i].m_pipeB[1], vol);
} }
void PlayerControl::dispatch() void PlayerControl::dispatch()
@ -647,8 +647,8 @@ void PlayerControl::dispatch()
for (i=0; i<nNumPlayers; i++) for (i=0; i<nNumPlayers; i++)
{ {
rfd = m_tqchildren[i].m_pipeA[0]; rfd = m_children[i].m_pipeA[0];
wfd = m_tqchildren[i].m_pipeB[1]; wfd = m_children[i].m_pipeB[1];
FD_SET(rfd, &rdset); FD_SET(rfd, &rdset);
FD_SET(wfd, &wrset); // really should check to see if we can write, but not gonna FD_SET(wfd, &wrset); // really should check to see if we can write, but not gonna
if (rfd > n) if (rfd > n)
@ -661,8 +661,8 @@ void PlayerControl::dispatch()
ntot = select(n + 1, &rdset, 0, 0, &timeout); ntot = select(n + 1, &rdset, 0, 0, &timeout);
for (i=0; ntot && i < nNumPlayers; i++) for (i=0; ntot && i < nNumPlayers; i++)
{ {
rfd = m_tqchildren[i].m_pipeA[0]; rfd = m_children[i].m_pipeA[0];
wfd = m_tqchildren[i].m_pipeB[1]; wfd = m_children[i].m_pipeB[1];
if ( FD_ISSET(rfd, &rdset) ) if ( FD_ISSET(rfd, &rdset) )
{ {
msgid m; msgid m;
@ -675,14 +675,14 @@ void PlayerControl::dispatch()
{ {
case READY: case READY:
print2stderr("CHILD %d is READY\n", i); print2stderr("CHILD %d is READY\n", i);
m_tqchildren[i].isready = true;; m_children[i].isready = true;;
break; break;
case DONE: case DONE:
print2stderr("CHILD %d is DONE\n", i); print2stderr("CHILD %d is DONE\n", i);
if (!sz) if (!sz)
{ {
m_tqchildren[i].isplaying = false; m_children[i].isplaying = false;
clearScopeQ(i); clearScopeQ(i);
play_finished(i); play_finished(i);
} }
@ -852,7 +852,7 @@ void PlayerControl::dispatch()
} }
else else
{ {
m_tqchildren[i].isdead = true; m_children[i].isdead = true;
return; // should never happen return; // should never happen
} }
} }
@ -860,16 +860,16 @@ void PlayerControl::dispatch()
for (i=0; pmapped && i<nNumPlayers; i++) for (i=0; pmapped && i<nNumPlayers; i++)
{ {
while (*m_tqchildren[i].m_consumed != *m_tqchildren[i].m_current) while (*m_children[i].m_consumed != *m_children[i].m_current)
{ {
addScopeBuf(&m_tqchildren[i].q[*m_tqchildren[i].m_consumed], i); addScopeBuf(&m_children[i].q[*m_children[i].m_consumed], i);
//cerr << "j=" << *m_tqchildren[i].m_consumed << //cerr << "j=" << *m_children[i].m_consumed <<
// " time=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].time << // " time=" << m_children[i].q[*m_children[i].m_consumed].time <<
// " etime=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].etime << // " etime=" << m_children[i].q[*m_children[i].m_consumed].etime <<
// " len=" << m_tqchildren[i].q[*m_tqchildren[i].m_consumed].len << endl; // " len=" << m_children[i].q[*m_children[i].m_consumed].len << endl;
*m_tqchildren[i].m_consumed = (*m_tqchildren[i].m_consumed + 1) % NUM_SCOPEBUFS; *m_children[i].m_consumed = (*m_children[i].m_consumed + 1) % NUM_SCOPEBUFS;
} }
} }
} }
@ -881,37 +881,37 @@ void PlayerControl::cleanUpStream(int playerIndex)
bool PlayerControl::isPlaying(int playerIndex) const bool PlayerControl::isPlaying(int playerIndex) const
{ {
return m_tqchildren[playerIndex].isplaying; return m_children[playerIndex].isplaying;
} }
bool PlayerControl::isLocal(int playerIndex) const bool PlayerControl::isLocal(int playerIndex) const
{ {
return m_tqchildren[playerIndex].islocal; return m_children[playerIndex].islocal;
} }
void PlayerControl::setFadeout(bool fadeout, unsigned long fadelength, int playerIndex) void PlayerControl::setFadeout(bool fadeout, unsigned long fadelength, int playerIndex)
{ {
sendsetfade(m_tqchildren[playerIndex].m_pipeB[1], fadeout, fadelength); sendsetfade(m_children[playerIndex].m_pipeB[1], fadeout, fadelength);
} }
void PlayerControl::addScopeBuf(struct DelayQueue *item, int playerIndex) void PlayerControl::addScopeBuf(struct DelayQueue *item, int playerIndex)
{ {
if (playerIndex >=0 && playerIndex < nNumPlayers) if (playerIndex >=0 && playerIndex < nNumPlayers)
{ {
if (m_tqchildren[playerIndex].scopebuftail) if (m_children[playerIndex].scopebuftail)
{ {
item->fwd = 0; item->fwd = 0;
m_tqchildren[playerIndex].scopebuftail->fwd = item; m_children[playerIndex].scopebuftail->fwd = item;
m_tqchildren[playerIndex].scopebuftail = item; m_children[playerIndex].scopebuftail = item;
m_tqchildren[playerIndex].scopecount++; m_children[playerIndex].scopecount++;
} }
else else
{ {
item->fwd = 0; item->fwd = 0;
m_tqchildren[playerIndex].scopebufhead = item; m_children[playerIndex].scopebufhead = item;
m_tqchildren[playerIndex].scopebuftail = item; m_children[playerIndex].scopebuftail = item;
m_tqchildren[playerIndex].scopecount = 1; m_children[playerIndex].scopecount = 1;
} }
} }
} }
@ -920,14 +920,14 @@ DelayQueue *PlayerControl::getScopeBuf(int playerIndex)
{ {
if (playerIndex >=0 && playerIndex < nNumPlayers) if (playerIndex >=0 && playerIndex < nNumPlayers)
{ {
struct DelayQueue *item = m_tqchildren[playerIndex].scopebufhead; struct DelayQueue *item = m_children[playerIndex].scopebufhead;
if (item) if (item)
{ {
m_tqchildren[playerIndex].scopebufhead = item->fwd; m_children[playerIndex].scopebufhead = item->fwd;
m_tqchildren[playerIndex].scopecount--; m_children[playerIndex].scopecount--;
if (!m_tqchildren[playerIndex].scopebufhead) if (!m_children[playerIndex].scopebufhead)
m_tqchildren[playerIndex].scopebuftail = 0; m_children[playerIndex].scopebuftail = 0;
} }
return item; return item;
} }
@ -937,15 +937,15 @@ DelayQueue *PlayerControl::getScopeBuf(int playerIndex)
int PlayerControl::getScopeCount(int playerIndex) int PlayerControl::getScopeCount(int playerIndex)
{ {
return (playerIndex >= 0 && playerIndex < nNumPlayers ? m_tqchildren[playerIndex].scopecount : 0); return (playerIndex >= 0 && playerIndex < nNumPlayers ? m_children[playerIndex].scopecount : 0);
} }
int PlayerControl::peekScopeTime(unsigned long &t, int playerIndex) int PlayerControl::peekScopeTime(unsigned long &t, int playerIndex)
{ {
if (playerIndex >=0 && playerIndex < nNumPlayers) if (playerIndex >=0 && playerIndex < nNumPlayers)
{ {
if (m_tqchildren[playerIndex].scopebufhead) if (m_children[playerIndex].scopebufhead)
t = m_tqchildren[playerIndex].scopebufhead->time; t = m_children[playerIndex].scopebufhead->time;
else else
return -1; return -1;
return 0; return 0;
@ -962,7 +962,7 @@ void PlayerControl::clearScopeQ(int playerIndex)
} }
else else
{ {
sendscopeclear(m_tqchildren[playerIndex].m_pipeB[1]); sendscopeclear(m_children[playerIndex].m_pipeB[1]);
struct DelayQueue *item; struct DelayQueue *item;
while ((item = getScopeBuf(playerIndex))) while ((item = getScopeBuf(playerIndex)))
if (item->allocd) if (item->allocd)
@ -976,7 +976,7 @@ void PlayerControl::enableEQ(bool enabled)
unsigned char c = (char) enabled; unsigned char c = (char) enabled;
for (i=0; i<nNumPlayers; i++) for (i=0; i<nNumPlayers; i++)
sendmessage(m_tqchildren[i].m_pipeB[1], ENABLEEQ, (unsigned char *) &c, 1); sendmessage(m_children[i].m_pipeB[1], ENABLEEQ, (unsigned char *) &c, 1);
m_eq_enabled = enabled; m_eq_enabled = enabled;
} }
@ -1021,7 +1021,7 @@ int PlayerControl::getMimeListLen() const
HelixSimplePlayer::metaData *PlayerControl::getMetaData(int playerIndex ) HelixSimplePlayer::metaData *PlayerControl::getMetaData(int playerIndex )
{ {
return m_tqchildren[playerIndex].md; return m_children[playerIndex].md;
} }
bool PlayerControl::sendsetoutputsink() bool PlayerControl::sendsetoutputsink()
@ -1031,7 +1031,7 @@ bool PlayerControl::sendsetoutputsink()
bool ok = false; bool ok = false;
for (i=0; i<nNumPlayers; i++) for (i=0; i<nNumPlayers; i++)
ok |= sendmessage(m_tqchildren[i].m_pipeB[1], OUTPUTSINK, (unsigned char *) &c, 1); ok |= sendmessage(m_children[i].m_pipeB[1], OUTPUTSINK, (unsigned char *) &c, 1);
return ok; return ok;
} }
@ -1045,7 +1045,7 @@ bool PlayerControl::sendsetdevice()
bool ok = false; bool ok = false;
for (i=0; i<nNumPlayers; i++) for (i=0; i<nNumPlayers; i++)
ok |= sendmessage(m_tqchildren[i].m_pipeB[1], DEVICE, (unsigned char *) m_device, len + 1); ok |= sendmessage(m_children[i].m_pipeB[1], DEVICE, (unsigned char *) m_device, len + 1);
return ok; return ok;
} }
@ -1056,7 +1056,7 @@ bool PlayerControl::sendinit()
bool ok = false; bool ok = false;
for (i=0; i<nNumPlayers; i++) for (i=0; i<nNumPlayers; i++)
ok |= sendrequest(m_tqchildren[i].m_pipeB[1], INIT); ok |= sendrequest(m_children[i].m_pipeB[1], INIT);
return ok; return ok;
} }
@ -1077,12 +1077,12 @@ bool PlayerControl::sendupdateeqgains()
memcpy((void *)&buf[ sizeof(m_preamp) + (i+1) * sizeof(int) ], (void *) &bandGain, sizeof(int)); memcpy((void *)&buf[ sizeof(m_preamp) + (i+1) * sizeof(int) ], (void *) &bandGain, sizeof(int));
} }
for ( i = 0; i < (uint) nNumPlayers; i++ ) for ( i = 0; i < (uint) nNumPlayers; i++ )
ok |= sendmessage(m_tqchildren[i].m_pipeB[1], UPDATEETQGAINS, buf, sizeof(m_preamp) + (m_equalizerGains.size()+1) * sizeof(int)); ok |= sendmessage(m_children[i].m_pipeB[1], UPDATEETQGAINS, buf, sizeof(m_preamp) + (m_equalizerGains.size()+1) * sizeof(int));
return ok; return ok;
} }
// tqchildren send this! // children send this!
bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl) bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl)
{ {
int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len; int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len;
@ -1095,10 +1095,10 @@ bool PlayerControl::sendnotifyuser(unsigned long code, const char *moreinfo, con
memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1); memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1);
len += len2 + 1; len += len2 + 1;
return (sendmessage(m_tqchildren[m_index].m_pipeA[1], NOTIFYUSER, buf, len)); return (sendmessage(m_children[m_index].m_pipeA[1], NOTIFYUSER, buf, len));
} }
// tqchildren send this! // children send this!
bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl) bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl)
{ {
int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len; int len1 = strlen(moreinfo), len2 = strlen(moreinfourl), len;
@ -1111,21 +1111,21 @@ bool PlayerControl::sendinterruptuser(unsigned long code, const char *moreinfo,
memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1); memcpy( (void *) &buf[ len ], (void *) moreinfourl, len2 + 1);
len += len2 + 1; len += len2 + 1;
return (sendmessage(m_tqchildren[m_index].m_pipeA[1], INTERRUPTUSER, buf, len)); return (sendmessage(m_children[m_index].m_pipeA[1], INTERRUPTUSER, buf, len));
} }
// tqchildren send this! // children send this!
bool PlayerControl::sendcontacting(const char *host) bool PlayerControl::sendcontacting(const char *host)
{ {
int len = strlen(host); int len = strlen(host);
return (sendmessage(m_tqchildren[m_index].m_pipeA[1], CONTACTING, (unsigned char *) host, len + 1)); return (sendmessage(m_children[m_index].m_pipeA[1], CONTACTING, (unsigned char *) host, len + 1));
} }
// tqchildren send this! // children send this!
bool PlayerControl::sendbuffering(int percentage) bool PlayerControl::sendbuffering(int percentage)
{ {
return (sendmessage(m_tqchildren[m_index].m_pipeA[1], BUFFERING, (unsigned char *) &percentage, sizeof(unsigned long))); return (sendmessage(m_children[m_index].m_pipeA[1], BUFFERING, (unsigned char *) &percentage, sizeof(unsigned long)));
} }

@ -87,7 +87,7 @@ public:
virtual void onContacting(const char */*host*/) {} virtual void onContacting(const char */*host*/) {}
virtual void onBuffering(int /*percentage*/) {} virtual void onBuffering(int /*percentage*/) {}
// tqchildren send functions // children send functions
bool sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl); bool sendnotifyuser(unsigned long code, const char *moreinfo, const char *moreinfourl);
bool sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl); bool sendinterruptuser(unsigned long code, const char *moreinfo, const char *moreinfourl);
bool sendcontacting(const char *host); bool sendcontacting(const char *host);
@ -129,7 +129,7 @@ private:
DelayQueue *q; DelayQueue *q;
int *m_current; int *m_current;
int *m_consumed; int *m_consumed;
} m_tqchildren[2]; } m_children[2];
unsigned long m_volume; unsigned long m_volume;

@ -68,7 +68,7 @@ void HostList::notifyHostError( TQString hostname, int error)
{ {
host->setText( HostListItem::Hostname, hostname ); host->setText( HostListItem::Hostname, hostname );
host->setStatus( error ); host->setStatus( error );
host->tqrepaint(); host->repaint();
return; return;
} }
++it; ++it;

@ -801,7 +801,7 @@ XineEngine::customEvent( TQCustomEvent *e )
break; break;
case 3001: case 3001:
emit infoMessage( (*message).tqarg( m_url.prettyURL() ) ); emit infoMessage( (*message).arg( m_url.prettyURL() ) );
delete message; delete message;
break; break;
@ -818,7 +818,7 @@ XineEngine::customEvent( TQCustomEvent *e )
} break; } break;
case 3004: case 3004:
emit statusText( i18n("Redirecting to: ").tqarg( *message ) ); emit statusText( i18n("Redirecting to: ").arg( *message ) );
load( KURL( *message ), false ); load( KURL( *message ), false );
play(); play();
delete message; delete message;
@ -923,8 +923,8 @@ XineEngine::XineEventListener( void *p, const xine_event_t* xineEvent )
TQString TQString
msg = "%1 %2%"; msg = "%1 %2%";
msg = msg.tqarg( TQString::fromUtf8( pd->description ) ) msg = msg.arg( TQString::fromUtf8( pd->description ) )
.tqarg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) );
TQCustomEvent *e = new TQCustomEvent( 3002 ); TQCustomEvent *e = new TQCustomEvent( 3002 );
e->setData( new TQString( msg ) ); e->setData( new TQString( msg ) );
@ -1102,7 +1102,7 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engine::SimpleMetaBundle &b)
if( b.tracknr.isEmpty() ) if( b.tracknr.isEmpty() )
b.tracknr = url.filename(); b.tracknr = url.filename();
} else { } else {
b.title = TQString(i18n("Track %1")).tqarg(url.filename()); b.title = TQString(i18n("Track %1")).arg(url.filename());
b.album = i18n("AudioCD"); b.album = i18n("AudioCD");
} }
} }

@ -68,7 +68,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignCenter</set> <set>AlignCenter</set>
</property> </property>
</widget> </widget>
@ -129,7 +129,7 @@
<property name="text"> <property name="text">
<string>Sound device may be modified after the output plugin has been changed to ALSA or OSS.</string> <string>Sound device may be modified after the output plugin has been changed to ALSA or OSS.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -646,7 +646,7 @@ yauapEngine::getAudioCDContents(const TQString &device, KURL::List &urls)
KURL url = TQString(TQString("cdda://").append( strtok_r(reply_ptr,"=",&saveptr))); KURL url = TQString(TQString("cdda://").append( strtok_r(reply_ptr,"=",&saveptr)));
urls << url; urls << url;
debug() << url << endl; 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.length = strtok_r(NULL,"=",&saveptr);
b.album = "AudioCD"; b.album = "AudioCD";
b.tracknr = i+1; b.tracknr = i+1;

@ -120,8 +120,8 @@ EngineController::loadEngine() //static
Amarok::StatusBar::instance()->longMessage( i18n( Amarok::StatusBar::instance()->longMessage( i18n(
"Sorry, the '%1' could not be loaded, instead we have loaded the '%2'." ) "Sorry, the '%1' could not be loaded, instead we have loaded the '%2'." )
.tqarg( AmarokConfig::soundSystem() ) .arg( AmarokConfig::soundSystem() )
.tqarg( engineName ), .arg( engineName ),
KDE::StatusBar::Sorry ); KDE::StatusBar::Sorry );
AmarokConfig::setSoundSystem( engineName ); AmarokConfig::setSoundSystem( engineName );
@ -143,7 +143,7 @@ EngineController::loadEngine( const TQString &engineName )
DEBUG_BLOCK DEBUG_BLOCK
TQString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'"; 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 // sort by rank, TQValueList::operator[] is O(n), so this is quite inefficient
#define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt() #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 // this is the actual engine we want
query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] == '%1'"; 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 ) { foreachType( KTrader::OfferList, offers ) {
Amarok::Plugin *plugin = PluginManager::createFromService( *it ); Amarok::Plugin *plugin = PluginManager::createFromService( *it );
@ -265,13 +265,13 @@ void EngineController::unplayableNotification() {
"<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine " "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
"the installation of the multimedia-framework that the current engine uses. " "the installation of the multimedia-framework that the current engine uses. "
"<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." ) "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
.tqarg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error ); .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
} }
bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/) bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/)
{ {
KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall" 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 ) if( service )
{ {
TQString installScript = service->exec(); TQString installScript = service->exec();

@ -103,7 +103,7 @@ EqualizerPresetManager::slotRename()
if ( ok && item->text(0) != title ) { if ( ok && item->text(0) != title ) {
// Check if the new preset title exists // Check if the new preset title exists
if ( m_presets.find( title ) != m_presets.end() ) { 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 ) if ( button != KMessageBox::Yes )
return; return;

@ -370,7 +370,7 @@ EqualizerSetup::addPreset()
if (ok) { if (ok) {
// Check if the new preset title exists // Check if the new preset title exists
if ( m_presets.find( title ) != m_presets.end() ) { 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 ) if ( button != KMessageBox::Yes )
return; return;

@ -123,10 +123,10 @@ HTMLView::loadStyleSheet()
//we have to set the color for body due to a KHTML bug //we have to set the color for body due to a KHTML bug
//KHTML sets the base color but not the text color //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; }" ) styleSheet = TQString( "body { margin: 8px; font-size: %1px; color: %2; background-color: %3; font-family: %4; }" )
.tqarg( pxSize ) .arg( pxSize )
.tqarg( text ) .arg( text )
.tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) )
.tqarg( fontFamily ); .arg( fontFamily );
TQTextStream eCSSts( &ExternalCSS ); TQTextStream eCSSts( &ExternalCSS );
TQString tmpCSS = eCSSts.read(); TQString tmpCSS = eCSSts.read();
@ -188,103 +188,103 @@ HTMLView::loadStyleSheet()
//we have to set the color for body due to a KHTML bug //we have to set the color for body due to a KHTML bug
//KHTML sets the base color but not the text color //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; }" ) 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 ) .arg( pxSize )
.tqarg( text ) .arg( text )
.tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) ) .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) )
.tqarg( m_bgGradientImage->name() ) .arg( m_bgGradientImage->name() )
.tqarg( fontFamily ); .arg( fontFamily );
//text attributes //text attributes
styleSheet += TQString( "h1 { font-size: %1px; }" ).tqarg( pxSize + 8 ); styleSheet += TQString( "h1 { font-size: %1px; }" ).arg( pxSize + 8 );
styleSheet += TQString( "h2 { font-size: %1px; }" ).tqarg( pxSize + 6 ); styleSheet += TQString( "h2 { font-size: %1px; }" ).arg( pxSize + 6 );
styleSheet += TQString( "h3 { font-size: %1px; }" ).tqarg( pxSize + 4 ); styleSheet += TQString( "h3 { font-size: %1px; }" ).arg( pxSize + 4 );
styleSheet += TQString( "h4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); styleSheet += TQString( "h4 { font-size: %1px; }" ).arg( pxSize + 3 );
styleSheet += TQString( "h5 { font-size: %1px; }" ).tqarg( pxSize + 2 ); styleSheet += TQString( "h5 { font-size: %1px; }" ).arg( pxSize + 2 );
styleSheet += TQString( "h6 { font-size: %1px; }" ).tqarg( pxSize + 1 ); styleSheet += TQString( "h6 { font-size: %1px; }" ).arg( pxSize + 1 );
styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).tqarg( pxSize ).tqarg( text ); 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( ".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 { 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-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) //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 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 //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; }" ) 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 ) .arg( fg )
.tqarg( bg ) .arg( bg )
.tqarg( pxSize + 2 ) .arg( pxSize + 2 )
.tqarg( m_headerGradientImage->name() ); .arg( m_headerGradientImage->name() );
styleSheet += TQString( ".box-body { padding: 2px; background-color: %1; background-image: url( %2 ); background-repeat: repeat-x; font-size:%3px; }" ) 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() ) .arg( ContextBrowser::instance()->colorGroup().base().name() )
.tqarg( m_shadowGradientImage->name() ) .arg( m_shadowGradientImage->name() )
.tqarg( pxSize ); .arg( pxSize );
//"Related Artists" related styles //"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; }" ) 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 ) .arg( fg )
.tqarg( bg ) .arg( bg )
.tqarg( pxSize ); .arg( pxSize );
//"Albums by ..." related styles //"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 { color: %1; background-color: %2; cursor: pointer; }" ).arg( fg ).arg( bg );
styleSheet += TQString( ".album-header:hover a { color: %1; }" ).tqarg( fg ); 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; }" ).tqarg( ContextBrowser::instance()->colorGroup().base().name() ).tqarg( bg ).tqarg( bg ); 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-title { font-weight: bold; }" );
styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).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; }" ).tqarg( 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-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 { 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( ".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 { 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%; }" ); styleSheet += TQString( ".button { width: 100%; }" );
//boxes used to display score (sb: score box) //boxes used to display score (sb: score box)
styleSheet += TQString( ".sbtext { text-align: right; padding: 0px 4px; }" ); styleSheet += TQString( ".sbtext { text-align: right; padding: 0px 4px; }" );
styleSheet += TQString( ".sbinner { height: 8px; background-color: %1; border: solid %2 1px; }" ) styleSheet += TQString( ".sbinner { height: 8px; background-color: %1; border: solid %2 1px; }" )
.tqarg( ContextBrowser::instance()->colorGroup().highlight().name() ) .arg( ContextBrowser::instance()->colorGroup().highlight().name() )
.tqarg( ContextBrowser::instance()->colorGroup().highlightedText().name() ); .arg( ContextBrowser::instance()->colorGroup().highlightedText().name() );
styleSheet += TQString( ".sbouter { width: 52px; height: 10px; background-color: %1; border: solid %2 1px; }" ) styleSheet += TQString( ".sbouter { width: 52px; height: 10px; background-color: %1; border: solid %2 1px; }" )
.tqarg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() ) .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() )
.tqarg( ContextBrowser::instance()->colorGroup().highlight().name() ); .arg( ContextBrowser::instance()->colorGroup().highlight().name() );
styleSheet += TQString( ".ratingBox { padding: 0px 4px; }" ); styleSheet += TQString( ".ratingBox { padding: 0px 4px; }" );
styleSheet += TQString( ".ratingStar { height: 0.9em; }" ); styleSheet += TQString( ".ratingStar { height: 0.9em; }" );
styleSheet += TQString( ".statsBox { border-left: solid %1 1px; }" ) 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-header-album { font-weight: normal; }" );
styleSheet += TQString( "#current_box-information-td { text-align: right; vertical-align: bottom; padding: 3px; }" ); 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-td { text-align: left; width: 100px; padding: 0; vertical-align: bottom; }" );
styleSheet += TQString( "#current_box-largecover-image { padding: 4px; 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; }" ); styleSheet += TQString( "#wiki_box-body a:hover { text-decoration: underline; }" );
//labels in tag dialog //labels in tag dialog
styleSheet += ".label a:hover { font-weight: bold; }"; styleSheet += ".label a:hover { font-weight: bold; }";
styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).tqarg( pxSize ); styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).arg( pxSize );
styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).tqarg( pxSize + 1 ); styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).arg( pxSize + 1 );
styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).tqarg( pxSize + 2 ); styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).arg( pxSize + 2 );
styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).tqarg( pxSize + 3 ); styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).arg( pxSize + 3 );
styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).tqarg( pxSize + 4); styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).arg( pxSize + 4);
styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).tqarg( pxSize + 5 ); styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).arg( pxSize + 5 );
styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).tqarg( pxSize + 6 ); styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).arg( pxSize + 6 );
styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).tqarg( pxSize + 7 ); styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).arg( pxSize + 7 );
styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).tqarg( pxSize + 8 ); styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).arg( pxSize + 8 );
styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).tqarg( pxSize + 9 ); styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).arg( pxSize + 9 );
} }
return styleSheet; return styleSheet;

@ -162,7 +162,7 @@ protected:
short port; short port;
tp_GetServer(m_pimp, server, 255, &port); tp_GetServer(m_pimp, server, 255, &port);
TQString tunepimpHost = TQString(server); 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) { for(TQStringList::ConstIterator it = noProxies.constBegin(); it != noProxies.constEnd(); ++it) {
TQString normalizedHost = KNetwork::KResolver::normalizeDomain(*it); TQString normalizedHost = KNetwork::KResolver::normalizeDomain(*it);
@ -731,7 +731,7 @@ void KTRMLookup::puidGenerated()
tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track); tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track);
d->results.clear(); 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 ) Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n( "MusicBrainz Lookup" ) ); .setDescription( i18n( "MusicBrainz Lookup" ) );

@ -61,9 +61,9 @@ int
AmarokHttp::get ( const TQString & path ) AmarokHttp::get ( const TQString & path )
{ {
TQString uri = TQString( "http://%1:%2/%3" ) TQString uri = TQString( "http://%1:%2/%3" )
.tqarg( m_hostname ) .arg( m_hostname )
.tqarg( m_port ) .arg( m_port )
.tqarg( path ); .arg( path );
m_done = false; m_done = false;
m_error = TQHttp::NoError; m_error = TQHttp::NoError;
@ -104,7 +104,7 @@ AmarokHttp::slotData(KIO::Job*, const TQByteArray& data)
else if ( m_result.size() == 0 ) { else if ( m_result.size() == 0 ) {
m_result = data; 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() ); memcpy( m_result.end(), data.data(), data.size() );
} }
} }
@ -308,17 +308,17 @@ Controller::stationDescription( TQString url )
/// TAG RADIOS /// TAG RADIOS
// eg: lastfm://globaltag/rock // eg: lastfm://globaltag/rock
if ( elements[1] == "globaltags" ) if ( elements[1] == "globaltags" )
return i18n( "Global Tag Radio: %1" ).tqarg( elements[2] ); return i18n( "Global Tag Radio: %1" ).arg( elements[2] );
/// ARTIST RADIOS /// ARTIST RADIOS
if ( elements[1] == "artist" ) if ( elements[1] == "artist" )
{ {
// eg: lastfm://artist/Queen/similarartists // eg: lastfm://artist/Queen/similarartists
if ( elements[3] == "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" ) if ( elements[3] == "fans" )
return i18n( "Artist Fan Radio: %1" ).tqarg( elements[2] ); return i18n( "Artist Fan Radio: %1" ).arg( elements[2] );
} }
/// CUSTOM STATION /// CUSTOM STATION
@ -336,7 +336,7 @@ Controller::stationDescription( TQString url )
artists.replace( *it, capitalized ); artists.replace( *it, capitalized );
} }
return i18n( "Custom Station: %1" ).tqarg( artists ); return i18n( "Custom Station: %1" ).arg( artists );
} }
/// USER RADIOS /// USER RADIOS
@ -344,25 +344,25 @@ Controller::stationDescription( TQString url )
{ {
// eg: lastfm://user/sebr/neighbours // eg: lastfm://user/sebr/neighbours
if ( elements[3] == "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 // eg: lastfm://user/sebr/personal
if ( elements[3] == "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 // eg: lastfm://user/sebr/loved
if ( elements[3] == "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 // eg: lastfm://user/sebr/recommended/100 : 100 is number for how obscure the music should be
if ( elements[3] == "recommended" ) if ( elements[3] == "recommended" )
return i18n( "%1's Recommended Radio" ).tqarg( elements[2] ); return i18n( "%1's Recommended Radio" ).arg( elements[2] );
} }
/// GROUP RADIOS /// GROUP RADIOS
//eg: lastfm://group/Amarok%20users //eg: lastfm://group/Amarok%20users
else if ( elements[1] == "group" ) else if ( elements[1] == "group" )
return i18n( "Group Radio: %1" ).tqarg( elements[2] ); return i18n( "Group Radio: %1" ).arg( elements[2] );
/// TRACK RADIOS /// TRACK RADIOS
else if ( elements[1] == "play" ) else if ( elements[1] == "play" )
@ -429,11 +429,11 @@ WebService::handshake( const TQString& username, const TQString& password )
const TQString path = const TQString path =
TQString( "/radio/handshake.php?version=%1&platform=%2&username=%3&passwordmd5=%4&debug=%5" ) 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 .arg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform
.tqarg( TQString("Amarok") ) .arg( TQString("Amarok") )
.tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) )
.tqarg( KMD5( m_password.utf8() ).hexDigest().data() ) .arg( KMD5( m_password.utf8() ).hexDigest().data() )
.tqarg( "0" ); .arg( "0" );
http.get( path ); http.get( path );
@ -478,7 +478,7 @@ WebService::handshake( const TQString& username, const TQString& password )
debug() << "Proxy server using port: " << port << endl; debug() << "Proxy server using port: " << port << endl;
delete socket; 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 = new Amarok::ProcIO();
m_server->setComm( KProcess::Communication( KProcess::AllOutput ) ); m_server->setComm( KProcess::Communication( KProcess::AllOutput ) );
@ -523,8 +523,8 @@ WebService::changeStation( TQString url )
AmarokHttp http( m_baseHost, 80 ); AmarokHttp http( m_baseHost, 80 );
http.get( TQString( m_basePath + "/adjust.php?session=%1&url=%2&debug=0" ) http.get( TQString( m_basePath + "/adjust.php?session=%1&url=%2&debug=0" )
.tqarg( m_session ) .arg( m_session )
.tqarg( url ) ); .arg( url ) );
m_deletionUnsafe = true; m_deletionUnsafe = true;
do do
@ -568,8 +568,8 @@ WebService::requestMetaData() //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) ); connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" ) http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" )
.tqarg( m_session ) .arg( m_session )
.tqarg( "0" ) ); .arg( "0" ) );
} }
@ -655,9 +655,9 @@ WebService::enableScrobbling( bool enabled ) //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( enableScrobblingFinished( int, bool ) ) ); 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" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" )
.tqarg( m_session ) .arg( m_session )
.tqarg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) ) .arg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) )
.tqarg( "0" ) ); .arg( "0" ) );
} }
@ -679,8 +679,8 @@ WebService::love() //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loveFinished( int, bool ) ) ); 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" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" )
.tqarg( m_session ) .arg( m_session )
.tqarg( "0" ) ); .arg( "0" ) );
Amarok::StatusBar::instance()->shortMessage( i18n("love, as in affection", "Loving song...") ); 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 ) ) ); 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" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" )
.tqarg( m_session ) .arg( m_session )
.tqarg( "0" ) ); .arg( "0" ) );
Amarok::StatusBar::instance()->shortMessage( i18n("Skipping song...") ); 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 ) ) ); 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" ) http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" )
.tqarg( m_session ) .arg( m_session )
.tqarg( "0" ) ); .arg( "0" ) );
Amarok::StatusBar::instance()->shortMessage( i18n("Ban, as in dislike", "Banning song...") ); 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 ) ) ); connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( friendsFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/friends.xml" ) 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 ) ) ); connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( neighboursFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/neighbours.xml" ) 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 ) ) ); connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( userTagsFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" ) 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 ) ) ); connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recentTracksFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/recenttracks.xml" ) 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 ) switch ( type )
{ {
case 0: case 0:
modeToken = TQString( "artist_name=%1" ).tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ); modeToken = TQString( "artist_name=%1" ).arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) );
break; break;
case 1: case 1:
modeToken = TQString( "album_artist=%1&album_name=%2" ) modeToken = TQString( "album_artist=%1&album_name=%2" )
.tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) )
.tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) );
break; break;
case 2: case 2:
modeToken = TQString( "track_artist=%1&track_name=%2" ) modeToken = TQString( "track_artist=%1&track_name=%2" )
.tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) ) .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) )
.tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) ); .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) );
break; 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(); TQCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
token = TQString( "user=%1&auth=%2&nonce=%3recipient=%4" ) token = TQString( "user=%1&auth=%2&nonce=%3recipient=%4" )
.tqarg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) ) .arg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) )
.tqarg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) ) .arg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) )
.tqarg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) ) .arg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) )
.tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ); .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) );
TQHttpRequestHeader header( "POST", "/1.0/rw/recommend.php?" + token.utf8() ); TQHttpRequestHeader header( "POST", "/1.0/rw/recommend.php?" + token.utf8() );
header.setValue( "Host", "wsdev.audioscrobbler.com" ); header.setValue( "Host", "wsdev.audioscrobbler.com" );

@ -92,7 +92,7 @@
<property name="text"> <property name="text">
<string>If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection.</string> <string>If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -74,7 +74,7 @@
<property name="text"> <property name="text">
<string>You have chosen to purchase the following album from Magnatune.com</string> <string>You have chosen to purchase the following album from Magnatune.com</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -614,7 +614,7 @@
<property name="text"> <property name="text">
<string>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.</string> <string>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.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -48,9 +48,9 @@ MagnatuneXmlParser::completeJob( )
{ {
Amarok::StatusBar::instance() ->longMessage( Amarok::StatusBar::instance() ->longMessage(
i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" ) i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" )
.tqarg( m_nNumberOfTracks ) .arg( m_nNumberOfTracks )
.tqarg( m_nNumberOfAlbums ) .arg( m_nNumberOfAlbums )
.tqarg( m_nNumberOfArtists ), KDE::StatusBar::Information ); .arg( m_nNumberOfArtists ), KDE::StatusBar::Information );
emit( doneParsing() ); emit( doneParsing() );
} }

@ -97,8 +97,8 @@ private:
void parseElement( TQDomElement e ); void parseElement( TQDomElement e );
/** /**
* Parses all tqchildren of a DOM element * Parses all children of a DOM element
* @param e The element whose tqchildren is to be parsed * @param e The element whose children is to be parsed
*/ */
void parseChildren( TQDomElement e ); void parseChildren( TQDomElement e );

@ -630,11 +630,11 @@ MediaBrowser::updateDevices()
TQString name = (*it)->name(); TQString name = (*it)->name();
if( !(*it)->deviceNode().isEmpty() ) 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() ) 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 ); m_deviceCombo->insertItem( name, i );
if( it == m_currentDevice ) if( it == m_currentDevice )
@ -1127,13 +1127,13 @@ class MediaItemTip : public TQToolTip
{ {
if( b->track() ) if( b->track() )
text = TQString( "%1 - %2 (%3)" ) 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( !b->genre().isEmpty() )
{ {
if( !text.isEmpty() ) if( !text.isEmpty() )
text += "<br>"; text += "<br>";
text += TQString( "<i>Genre: %1</i>" ) text += TQString( "<i>Genre: %1</i>" )
.tqarg( b->genre() ); .arg( b->genre() );
} }
} }
} }
@ -1629,7 +1629,7 @@ MediaBrowser::mediumChanged( const Medium *medium, TQString /*name*/ )
Amarok::StatusBar::instance()->longMessage( Amarok::StatusBar::instance()->longMessage(
i18n( "The device %1 was unmounted before it was synchronized. " i18n( "The device %1 was unmounted before it was synchronized. "
"In order to avoid data loss, press the \"Disconnect\" button " "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 ); KDE::StatusBar::Warning );
//(*it)->disconnectDevice(); //(*it)->disconnectDevice();
} }
@ -1658,7 +1658,7 @@ MediaBrowser::mediumRemoved( const Medium *medium, TQString name )
Amarok::StatusBar::instance()->longMessage( Amarok::StatusBar::instance()->longMessage(
i18n( "The device %1 was removed before it was disconnected. " i18n( "The device %1 was removed before it was disconnected. "
"In order to avoid possible data loss, press the \"Disconnect\" " "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 ); KDE::StatusBar::Warning );
} }
else else
@ -1678,7 +1678,7 @@ MediaBrowser::loadDevicePlugin( const TQString &deviceType )
return 0; return 0;
TQString query = "[X-KDE-Amarok-plugintype] == 'mediadevice' and [X-KDE-Amarok-name] == '%1'"; 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 ) if( plugin )
{ {
@ -1839,13 +1839,13 @@ MediaBrowser::updateStats()
TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() ); TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() );
if(m_queue->childCount() > 0) if(m_queue->childCount() > 0)
{ {
text += i18n(" (%1)").tqarg( KIO::convertSize( queued ) ); text += i18n(" (%1)").arg( KIO::convertSize( queued ) );
} }
KIO::filesize_t total, avail; KIO::filesize_t total, avail;
if( currentDevice() && currentDevice()->getCapacity(&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_used = total-avail;
m_stats->m_total = total; m_stats->m_total = total;
@ -1884,7 +1884,7 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent )
it = dynamic_cast<MediaItem *>(parent->firstChild()); it = dynamic_cast<MediaItem *>(parent->firstChild());
} }
bool tqchildrenVisible = false; bool childrenVisible = false;
for( ; it; it = dynamic_cast<MediaItem *>(it->nextSibling())) for( ; it; it = dynamic_cast<MediaItem *>(it->nextSibling()))
{ {
bool visible = true; bool visible = true;
@ -1929,13 +1929,13 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent )
visible = true; visible = true;
it->setVisible( visible ); it->setVisible( visible );
if(visible) if(visible)
tqchildrenVisible = true; childrenVisible = true;
} }
if( root && m_device ) if( root && m_device )
m_device->updateRootItems(); m_device->updateRootItems();
return tqchildrenVisible; return childrenVisible;
} }
MediaDevice::MediaDevice() MediaDevice::MediaDevice()
@ -2110,7 +2110,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url )
BundleList bundles; BundleList bundles;
if( !PlaylistFile::isPlaylistFile( url ) ) 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 ); KDE::StatusBar::Sorry );
return bundles; return bundles;
} }
@ -2118,7 +2118,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url )
PlaylistFile playlist( url.path() ); PlaylistFile playlist( url.path() );
if( playlist.isError() ) 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 ); KDE::StatusBar::Sorry );
return bundles; return bundles;
} }
@ -2253,7 +2253,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli
if( playlist.isError() ) 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 ); KDE::StatusBar::Sorry );
return; return;
} }
@ -2295,7 +2295,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli
if( it->url() == url ) if( it->url() == url )
{ {
Amarok::StatusBar::instance()->shortMessage( 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; return;
} }
} }
@ -2453,7 +2453,7 @@ int MediaDevice::sysCall( const TQString &command )
sysProc->clearArguments(); sysProc->clearArguments();
(*sysProc) << command; (*sysProc) << command;
if (!sysProc->start( KProcess::Block, KProcess::AllOutput )) 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()); return (sysProc->exitStatus());
} }
@ -2501,7 +2501,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
tryToRemove = true; tryToRemove = true;
Amarok::StatusBar::instance()->longMessage( Amarok::StatusBar::instance()->longMessage(
i18n( "Media Device: Copying %1 to %2 failed" ) i18n( "Media Device: Copying %1 to %2 failed" )
.tqarg( src.prettyURL(), dst.prettyURL() ), .arg( src.prettyURL(), dst.prettyURL() ),
KDE::StatusBar::Error ); KDE::StatusBar::Error );
} }
else else
@ -2512,7 +2512,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
tryToRemove = true; tryToRemove = true;
// probably s.th. went wrong // probably s.th. went wrong
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Error );
} }
} }
@ -3051,7 +3051,7 @@ MediaDevice::transferFiles()
if( !isPlayable( *bundle ) ) 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 ); KDE::StatusBar::Sorry );
unplayable += (*it).url(); unplayable += (*it).url();
transferredItem->setFailed(); transferredItem->setFailed();
@ -3071,7 +3071,7 @@ MediaDevice::transferFiles()
if( !isCanceled() ) if( !isCanceled() )
{ {
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Sorry );
transferredItem->setFailed(); transferredItem->setFailed();
} }

@ -483,7 +483,7 @@ DaapClient::customClicked()
if( dialog.exec() == TQDialog::Accepted ) { if( dialog.exec() == TQDialog::Accepted ) {
TQString ip = resolve( dialog.m_base->m_hostName->text() ); TQString ip = resolve( dialog.m_base->m_hostName->text() );
if( ip == "0" ) 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 else
{ {
TQString key = ServerItem::key( dialog.m_base->m_hostName->text(), dialog.m_base->m_portInput->value() ); 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(); startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); 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, Daap::Reader* reader = new Daap::Reader( m_ip, m_port, this,
TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() ); TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() );
@ -781,7 +781,7 @@ ServerItem::httpError( const TQString& errorString )
{ {
stopAnimation(); stopAnimation();
resetTitle(); resetTitle();
Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:<br>%1").tqarg( errorString ) ); Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:<br>%1").arg( errorString ) );
m_reader->deleteLater(); m_reader->deleteLater();
m_reader = 0; m_reader = 0;
m_loaded = false; m_loaded = false;

@ -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() ); 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 ) ) ); 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") 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; TQ_INT8 patchLevel;
raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel ) raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel )
TQString version("%1.%2.%3"); TQString version("%1.%2.%3");
version.tqarg(major, minor, patchLevel); version.arg(major, minor, patchLevel);
addElement( childMap, tag, TQVariant(version) ); addElement( childMap, tag, TQVariant(version) );
} }
break; break;

@ -71,7 +71,7 @@ DaapServer::readSql()
#if DNSSD_SUPPORT #if DNSSD_SUPPORT
KUser current; KUser current;
if( !m_service ) 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; debug() << "port number: " << line.toInt() << endl;
m_service->publishAsync(); m_service->publishAsync();
#endif #endif

@ -395,11 +395,11 @@ class TarReader
end end
def close def close
tqinvalidate invalidate
end end
private private
def tqinvalidate def invalidate
extend InvalidEntry extend InvalidEntry
end end
end end

@ -56,7 +56,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name)
const int port = socket->port(); const int port = socket->port();
debug() << "Proxy server using port: " << port << endl; debug() << "Proxy server using port: " << port << endl;
delete socket; 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 //start proxy
m_proxy->setComm( KProcess::Communication( KProcess::AllOutput ) ); m_proxy->setComm( KProcess::Communication( KProcess::AllOutput ) );
*m_proxy << "amarok_proxy.rb"; *m_proxy << "amarok_proxy.rb";

@ -113,7 +113,7 @@ class GenericMediaFile
, m_device( device ) , m_device( device )
{ {
m_listed = false; m_listed = false;
m_tqchildren = new MediaFileList(); m_children = new MediaFileList();
if( m_parent ) if( m_parent )
{ {
@ -152,8 +152,8 @@ class GenericMediaFile
m_parent->removeChild( this ); m_parent->removeChild( this );
m_device->getItemMap().erase( m_viewItem ); m_device->getItemMap().erase( m_viewItem );
m_device->getFileMap().erase( m_fullName ); m_device->getFileMap().erase( m_fullName );
if ( m_tqchildren ) if ( m_children )
delete m_tqchildren; delete m_children;
if ( m_viewItem ) if ( m_viewItem )
delete m_viewItem; delete m_viewItem;
} }
@ -174,7 +174,7 @@ class GenericMediaFile
} }
void void
removeChild( GenericMediaFile* childToDelete ) { m_tqchildren->remove( childToDelete ); } removeChild( GenericMediaFile* childToDelete ) { m_children->remove( childToDelete ); }
GenericMediaItem* GenericMediaItem*
getViewItem() { return m_viewItem; } getViewItem() { return m_viewItem; }
@ -209,15 +209,15 @@ class GenericMediaFile
} }
MediaFileList* MediaFileList*
getChildren() { return m_tqchildren; } getChildren() { return m_children; }
void void
deleteAll( bool onlyChildren ) deleteAll( bool onlyChildren )
{ {
GenericMediaFile *vmf; 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 ) while( ( vmf = it.current() ) != 0 )
{ {
++it; ++it;
@ -232,9 +232,9 @@ class GenericMediaFile
renameAllChildren() renameAllChildren()
{ {
GenericMediaFile *vmf; 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(); vmf->renameAllChildren();
} }
setNamesFromBase(); setNamesFromBase();
@ -244,7 +244,7 @@ class GenericMediaFile
TQString m_fullName; TQString m_fullName;
TQString m_baseName; TQString m_baseName;
GenericMediaFile *m_parent; GenericMediaFile *m_parent;
MediaFileList *m_tqchildren; MediaFileList *m_children;
GenericMediaItem *m_viewItem; GenericMediaItem *m_viewItem;
GenericMediaDevice* m_device; GenericMediaDevice* m_device;
bool m_listed; bool m_listed;
@ -626,7 +626,7 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle
TQString name; TQString name;
while ( parent > 0 ) while ( parent > 0 )
{ {
values = CollectionDB::instance()->query( sql.tqarg( parent ) ); values = CollectionDB::instance()->query( sql.arg( parent ) );
name = values.first(); name = values.first();
parent = values.last().toInt(); parent = values.last().toInt();
location += cleanPath( name ) + '/'; location += cleanPath( name ) + '/';

@ -255,10 +255,10 @@ GenericMediaDeviceConfigDialog::buildFormatTip()
continue; continue;
args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); 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["thealbumartist"] = "The Album Artist";
args["theartist"] = "The 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["initial"] = i18n( "Artist's Initial" );
args["filetype"] = i18n( "File Extension of Source" ); args["filetype"] = i18n( "File Extension of Source" );
args["track"] = i18n( "Track Number" ); args["track"] = i18n( "Track Number" );
@ -270,7 +270,7 @@ GenericMediaDeviceConfigDialog::buildFormatTip()
it != args.end(); it != args.end();
++it ) ++it )
{ {
tooltip += TQString( "<li>%1 - %2" ).tqarg( it.data(), "%" + it.key() ); tooltip += TQString( "<li>%1 - %2" ).arg( it.data(), "%" + it.key() );
} }
tooltip += "</ul>"; tooltip += "</ul>";

@ -526,14 +526,14 @@ IfpMediaDevice::deleteItemFromDevice( MediaItem *item, int /*flags*/ )
case MediaItem::DIRECTORY: case MediaItem::DIRECTORY:
err = ifp_delete_dir_recursive( &m_ifpdev, encodedPath ); err = ifp_delete_dir_recursive( &m_ifpdev, encodedPath );
debug() << "Deleting folder: " << encodedPath << endl; 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; break;
default: default:
err = ifp_delete( &m_ifpdev, encodedPath ); err = ifp_delete( &m_ifpdev, encodedPath );
debug() << "Deleting file: " << encodedPath << endl; debug() << "Deleting file: " << encodedPath << endl;
count += 1; 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; break;
} }
if( err == 0 ) //success if( err == 0 ) //success
@ -564,7 +564,7 @@ void
IfpMediaDevice::listDir( const TQString &dir ) IfpMediaDevice::listDir( const TQString &dir )
{ {
int err = ifp_list_dirs( &m_ifpdev, TQFile::encodeName( dir ), listDirCallback, this ); 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' // will be called by 'ifp_list_dirs'

@ -316,13 +316,13 @@ IpodMediaDevice::IpodMediaDevice()
} }
if( info->capacity > 0.f ) if( info->capacity > 0.f )
gen->insertItem( i18n( "%1 GB %2 (x%3)" ) 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 ), itdb_info_get_ipod_model_name_string( info->ipod_model ),
info->model_number ), info->model_number ),
index ); index );
else else
gen->insertItem( i18n( "%1 (x%2)" ) 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 ), info->model_number ),
index ); index );
} }
@ -385,12 +385,12 @@ IpodMediaDevice::slotIpodAction( int id )
g_error_free(err); g_error_free(err);
//FIXME: update i18n files for next message //FIXME: update i18n files for next message
Amarok::StatusBar::instance()->longMessage( 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 //FIXME: update i18n files for next message
Amarok::StatusBar::instance()->shortMessage( Amarok::StatusBar::instance()->shortMessage(
i18n( "Unable to set iPod model to %1 GB %2 (x%3)" ) 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 ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ),
table[index].model_number ) ); table[index].model_number ) );
} }
@ -398,7 +398,7 @@ IpodMediaDevice::slotIpodAction( int id )
{ {
Amarok::StatusBar::instance()->shortMessage( Amarok::StatusBar::instance()->shortMessage(
i18n( "Setting iPod model to %1 GB %2 (x%3)" ) 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 ), itdb_info_get_ipod_model_name_string( table[index].ipod_model ),
table[index].model_number ) ); table[index].model_number ) );
} }
@ -684,7 +684,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle)
if ( !dir.exists() ) if ( !dir.exists() )
{ {
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Error );
return NULL; return NULL;
} }
@ -962,7 +962,7 @@ IpodMediaDevice::deleteItemFromDevice(MediaItem *mediaitem, int flags )
if(!(flags & OnlyPlayed) || item->played() > 0 || item->childCount() == 0) if(!(flags & OnlyPlayed) || item->played() > 0 || item->childCount() == 0)
{ {
if(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 else
delete item; delete item;
} }
@ -992,9 +992,9 @@ IpodMediaDevice::createLockFile( bool silent )
if( m_lockFile->exists() ) if( m_lockFile->exists() )
{ {
ok = false; 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." ) 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 ) if( !silent )
{ {
@ -1003,7 +1003,7 @@ IpodMediaDevice::createLockFile( bool silent )
== KMessageBox::Continue ) == KMessageBox::Continue )
{ {
msg = i18n( "Media Device: removing lockfile %1 failed: %2. " ) msg = i18n( "Media Device: removing lockfile %1 failed: %2. " )
.tqarg( lockFilePath, m_lockFile->errorString() ); .arg( lockFilePath, m_lockFile->errorString() );
ok = m_lockFile->remove(); ok = m_lockFile->remove();
} }
else else
@ -1017,7 +1017,7 @@ IpodMediaDevice::createLockFile( bool silent )
{ {
ok = false; ok = false;
msg = i18n( "Media Device: failed to create lockfile on iPod mounted at %1: %2" ) 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 ) if( ok )
@ -1038,7 +1038,7 @@ IpodMediaDevice::initializeIpod()
if( !dir.exists() ) if( !dir.exists() )
{ {
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Error );
return false; return false;
} }
@ -1091,7 +1091,7 @@ IpodMediaDevice::initializeIpod()
return false; return false;
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Information );
return true; return true;
@ -1113,7 +1113,7 @@ IpodMediaDevice::openDevice( bool silent )
if( m_itdb ) if( m_itdb )
{ {
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Sorry );
return false; return false;
} }
@ -1185,7 +1185,7 @@ IpodMediaDevice::openDevice( bool silent )
if( !m_itdb && canInitialize ) if( !m_itdb && canInitialize )
{ {
TQString msg = i18n( "Media Device: could not find iTunesDB on device mounted at %1. " 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 if( !silent
&& KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ), && KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ),
@ -1200,7 +1200,7 @@ IpodMediaDevice::openDevice( bool silent )
} }
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Sorry );
return false; return false;
@ -1236,7 +1236,7 @@ IpodMediaDevice::openDevice( bool silent )
{ {
debug() << "failed to create hash dir " << real << endl; debug() << "failed to create hash dir " << real << endl;
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Error );
return false; return false;
} }
@ -1364,7 +1364,7 @@ IpodMediaDevice::detectModel()
#endif #endif
} }
if( modelString ) if( modelString )
m_name = TQString( "iPod %1" ).tqarg( TQString::fromUtf8( modelString ) ); m_name = TQString( "iPod %1" ).arg( TQString::fromUtf8( modelString ) );
if( m_needsFirewireGuid ) if( m_needsFirewireGuid )
{ {
@ -1372,7 +1372,7 @@ IpodMediaDevice::detectModel()
if( !fwid ) if( !fwid )
{ {
Amarok::StatusBar::instance()->longMessage( 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 else
g_free( fwid ); g_free( fwid );

@ -756,7 +756,7 @@ MediaItem
} }
} }
uint32_t folderId = checkFolderStructure( bundle, false ); 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 ) if( file != 0 )
return file; return file;
return 0; return 0;
@ -1050,7 +1050,7 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem )
// clear cached filename // clear cached filename
if( deleteItem->type() == MediaItem::TRACK ) 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 // remove from the media view
delete deleteItem; delete deleteItem;
kapp->processEvents( 100 ); kapp->processEvents( 100 );
@ -1454,7 +1454,7 @@ MtpMediaItem
item->setType( MediaItem::TRACK ); item->setType( MediaItem::TRACK );
item->setBundle( track->bundle() ); item->setBundle( track->bundle() );
item->track()->setId( track->id() ); 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; m_idToTrack[ track->id() ] = track;
} }
return item; return item;

@ -804,7 +804,7 @@ void
NjbMediaDevice::expandItem( TQListViewItem *item ) NjbMediaDevice::expandItem( TQListViewItem *item )
{ {
DEBUG_BLOCK DEBUG_BLOCK
// First clear the item's tqchildren to repopulate. // First clear the item's children to repopulate.
while( item->firstChild() ) while( item->firstChild() )
delete item->firstChild(); delete item->firstChild();

@ -295,7 +295,7 @@ playlistValueList::readFromDevice( void)
NJB_Reset_Get_Playlist( NjbMediaDevice::theNjb()); NJB_Reset_Get_Playlist( NjbMediaDevice::theNjb());
while( njb_playlist_t* pl = NJB_Get_Playlist( NjbMediaDevice::theNjb()) ) { while( njb_playlist_t* pl = NJB_Get_Playlist( NjbMediaDevice::theNjb()) ) {
// FIXME (acejones) Make this a signal // FIXME (acejones) Make this a signal
// infoMessage( i18n( "Downloading playlist %1...").tqarg( ++playlists)); // infoMessage( i18n( "Downloading playlist %1...").arg( ++playlists));
++playlists; ++playlists;
append( NjbPlaylist(pl)); append( NjbPlaylist(pl));
NJB_Playlist_Destroy( pl); NJB_Playlist_Destroy( pl);

@ -288,7 +288,7 @@ RioKarmaMediaDevice::openDevice( bool silent )
if( !dir.exists() ) if( !dir.exists() )
{ {
Amarok::StatusBar::instance()->longMessage( 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 ); KDE::StatusBar::Error );
return false; return false;
} }

@ -398,30 +398,30 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr,
const TQString labelTextNone = i18n( "(none)" ); const TQString labelTextNone = i18n( "(none)" );
TQString row = "<tr><td>%1</td><td>%2</td></tr>"; TQString row = "<tr><td>%1</td><td>%2</td></tr>";
TQString table; TQString table;
table += row.tqarg( escapeHTML( i18n( "Autodetected:" ) ), table += row.arg( escapeHTML( i18n( "Autodetected:" ) ),
escapeHTML( medium->isAutodetected() ? i18n("Yes") : i18n("No") ) ); escapeHTML( medium->isAutodetected() ? i18n("Yes") : i18n("No") ) );
table += row.tqarg( escapeHTML( i18n( "ID:" ) ), table += row.arg( escapeHTML( i18n( "ID:" ) ),
escapeHTML( medium->id() ) ); escapeHTML( medium->id() ) );
table += row.tqarg( escapeHTML( i18n( "Name:" ) ), table += row.arg( escapeHTML( i18n( "Name:" ) ),
escapeHTML( medium->name() ) ); escapeHTML( medium->name() ) );
table += row.tqarg( escapeHTML( i18n( "Label:" ) ), table += row.arg( escapeHTML( i18n( "Label:" ) ),
escapeHTML( medium->label().isEmpty() ? labelTextNone : medium->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() ) ); 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() ) ); 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() ) ); 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() ) ); escapeHTML( medium->mimeType().isEmpty() ? labelTextNone : medium->mimeType() ) );
TQString title = escapeHTML( i18n( "Device information for %1").tqarg(medium->name() ) ); TQString title = escapeHTML( i18n( "Device information for %1").arg(medium->name() ) );
TQString details = TQString( "<em>%1</em><br />" "<table>%2</table>" ).tqarg( title, table ); TQString details = TQString( "<em>%1</em><br />" "<table>%2</table>" ).arg( title, table );
(void)new TQLabel( i18n("Name: "), this ); (void)new TQLabel( i18n("Name: "), this );
(void)new TQLabel( medium->name(), this ); (void)new TQLabel( medium->name(), this );
(void)new KActiveLabel( i18n( "(<a href='whatsthis:%1'>Details</a>)" ) (void)new KActiveLabel( i18n( "(<a href='whatsthis:%1'>Details</a>)" )
.tqarg( Amarok::escapeHTMLAttr( details ) ), this ); .arg( Amarok::escapeHTMLAttr( details ) ), this );
(void)new TQLabel( i18n("Plugin:"), this ); (void)new TQLabel( i18n("Plugin:"), this );
m_pluginCombo = new KComboBox( false, this ); m_pluginCombo = new KComboBox( false, this );

@ -1051,7 +1051,7 @@ MetaBundle::prettyTitle() const
if( s.isEmpty() ) if( s.isEmpty() )
s = title(); s = title();
else else
s = i18n("%1 - %2").tqarg( artist(), title() ); s = i18n("%1 - %2").arg( artist(), title() );
if( s.isEmpty() ) s = prettyTitle( filename() ); if( s.isEmpty() ) s = prettyTitle( filename() );
@ -1067,7 +1067,7 @@ MetaBundle::veryNiceTitle() const
if( !title().isEmpty() ) if( !title().isEmpty() )
{ {
if( !artist().isEmpty() ) if( !artist().isEmpty() )
s = i18n( "%1 by %2" ).tqarg( title(), artist() ); s = i18n( "%1 by %2" ).arg( title(), artist() );
else else
s = title(); s = title();
} }
@ -1146,10 +1146,10 @@ MetaBundle::veryPrettyTime( int time )
switch( s.count() ) switch( s.count() )
{ {
case 1: return i18n( "seconds", "%1s" ).tqarg( s[0] ); case 1: return i18n( "seconds", "%1s" ).arg( s[0] );
case 2: return i18n( "minutes, seconds", "%2m %1s" ).tqarg( s[0], s[1] ); case 2: return i18n( "minutes, seconds", "%2m %1s" ).arg( s[0], s[1] );
case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).tqarg( s[0], s[1], s[2] ); 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" ).tqarg( s[0], s[1], s[2], s[3] ); 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!"; default: return "omg bug!";
} }
} }
@ -1208,13 +1208,13 @@ MetaBundle::fuzzyTime( int time )
TQString hours = i18n( "1 hour", "%n hours", hr ); TQString hours = i18n( "1 hour", "%n hours", hr );
if( week ) if( week )
return weeks.tqarg( day ? days.tqarg("") : "" ).simplifyWhiteSpace(); return weeks.arg( day ? days.arg("") : "" ).simplifyWhiteSpace();
else if ( day ) else if ( day )
return days.tqarg( hr ? hours : "" ).simplifyWhiteSpace(); return days.arg( hr ? hours : "" ).simplifyWhiteSpace();
else if ( hr ) else if ( hr )
return i18n( "%1:%2 hours" ).tqarg( hr ).tqarg( zeroPad( min ) ); return i18n( "%1:%2 hours" ).arg( hr ).arg( zeroPad( min ) );
else else
return i18n( "%1:%2").tqarg( min ).tqarg( zeroPad( secs ) ); return i18n( "%1:%2").arg( min ).arg( zeroPad( secs ) );
} }
TQString TQString
@ -1271,7 +1271,7 @@ MetaBundle::ratingList()
TQStringList list; TQStringList list;
list += ratingDescription( 0 ); list += ratingDescription( 0 );
for ( int i = 1; i<=10; i++ ) 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; return list;
} }

@ -420,7 +420,7 @@ private:
static inline TQString prettyGeneric( const TQString &s, const int i ) 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 ); 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 ); 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 inline bool MetaBundle::hasExtendedMetaInformation() const
{ {

@ -104,7 +104,7 @@ namespace TagLib {
/*! /*!
* This will remove all tags. * 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. * as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called * \note In order to make the removal permanent save() still needs to be called
*/ */

@ -154,7 +154,7 @@ namespace TagLib {
* This will remove the tags that match the OR-ed together TagTypes from the * This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags. * 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. * as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called * \note In order to make the removal permanent save() still needs to be called
*/ */

@ -136,7 +136,7 @@ namespace TagLib {
* This will remove the tags that match the OR-ed together TagTypes from the * This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags. * 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. * as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called * \note In order to make the removal permanent save() still needs to be called
*/ */

@ -972,7 +972,7 @@ Moodbar::draw( int width, int height )
m_mutex.lock(); 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 ) if( m_pixmap.width() == width && m_pixmap.height() == height )
{ {
m_mutex.unlock(); m_mutex.unlock();

@ -210,7 +210,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath
m_handlerMapMutex.unlock(); m_handlerMapMutex.unlock();
TQStringList lastMountPoint = CollectionDB::instance()->query( TQStringList lastMountPoint = CollectionDB::instance()->query(
TQString( "SELECT lastmountpoint FROM devices WHERE id = %1" ) TQString( "SELECT lastmountpoint FROM devices WHERE id = %1" )
.tqarg( deviceId ) ); .arg( deviceId ) );
if ( lastMountPoint.count() == 0 ) if ( lastMountPoint.count() == 0 )
{ {
//hmm, no device with that id in the DB...serious problem //hmm, no device with that id in the DB...serious problem
@ -471,10 +471,10 @@ MountPointManager::migrateStatistics()
int deviceid = getIdForUrl( *it ); int deviceid = getIdForUrl( *it );
TQString rpath = getRelativePath( deviceid, *it ); TQString rpath = getRelativePath( deviceid, *it );
TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" )
.tqarg( deviceid ) .arg( deviceid )
.tqarg( CollectionDB::instance()->escapeString( rpath ) ); .arg( CollectionDB::instance()->escapeString( rpath ) );
update += TQString( " WHERE url = '%1' AND deviceid = -2;" ) update += TQString( " WHERE url = '%1' AND deviceid = -2;" )
.tqarg( CollectionDB::instance()->escapeString( *it ) ); .arg( CollectionDB::instance()->escapeString( *it ) );
CollectionDB::instance()->query( update ); CollectionDB::instance()->query( update );
} }
} }
@ -539,15 +539,15 @@ void UrlUpdateJob::updateStatistics( )
int statCount = collDB->query( int statCount = collDB->query(
TQString( "SELECT COUNT( url ) FROM statistics WHERE deviceid = %1 AND url = '%2';" ) TQString( "SELECT COUNT( url ) FROM statistics WHERE deviceid = %1 AND url = '%2';" )
.tqarg( newDeviceid ) .arg( newDeviceid )
.tqarg( collDB->escapeString( newRpath ) ) ).first().toInt(); .arg( collDB->escapeString( newRpath ) ) ).first().toInt();
if( statCount ) if( statCount )
continue; //statistics row with new URL/deviceid values already exists continue; //statistics row with new URL/deviceid values already exists
TQString sql = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" ) 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';" ) sql += TQString( " WHERE deviceid = %1 AND url = '%2';" )
.tqarg( deviceid ).tqarg( collDB->escapeString( rpath ) ); .arg( deviceid ).arg( collDB->escapeString( rpath ) );
collDB->query( sql ); 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 //only update rows if there is not already a row with the new deviceid/rpath and the same labelid
TQStringList labelids = collDB->query( TQStringList labelids = collDB->query(
TQString( "SELECT labelid FROM tags_labels WHERE deviceid = %1 AND url = '%2';" ) 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; TQString existingLabelids;
if( !labelids.isEmpty() ) if( !labelids.isEmpty() )
{ {
@ -591,8 +591,8 @@ void UrlUpdateJob::updateLabels( )
} }
TQString sql = TQString( "UPDATE tags_labels SET deviceid = %1, url = '%2' " TQString sql = TQString( "UPDATE tags_labels SET deviceid = %1, url = '%2' "
"WHERE deviceid = %3 AND url = '%4'%5;" ) "WHERE deviceid = %3 AND url = '%4'%5;" )
.tqarg( newDeviceid ) .arg( newDeviceid )
.tqarg( collDB->escapeString( newRpath ), .arg( collDB->escapeString( newRpath ),
TQString::number( deviceid ), TQString::number( deviceid ),
collDB->escapeString( rpath ), collDB->escapeString( rpath ),
existingLabelids ); existingLabelids );

@ -124,7 +124,7 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style )
mainLayout->setAutoAdd( true ); mainLayout->setAutoAdd( true );
} }
viewport() ->tqrepaint(); viewport() ->repaint();
} }
void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph ) 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 ) void MultiTabBarInternal::resizeEvent( TQResizeEvent *ev )
{ {
/* kdDebug()<<"MultiTabBarInternal::resizeEvent"<<endl; /* kdDebug()<<"MultiTabBarInternal::resizeEvent"<<endl;
kdDebug()<<"MultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl; kdDebug()<<"MultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
kdDebug()<<"MultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/ kdDebug()<<"MultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
if ( ev ) TQScrollView::resizeEvent( ev ); if ( ev ) TQScrollView::resizeEvent( ev );
@ -481,7 +481,7 @@ void MultiTabBarInternal::setPosition( enum MultiTabBar::MultiTabBarPosition pos
m_position = pos; m_position = pos;
for ( uint i = 0;i < m_tabs.count();i++ ) for ( uint i = 0;i < m_tabs.count();i++ )
m_tabs.at( i ) ->setTabsPosition( m_position ); m_tabs.at( i ) ->setTabsPosition( m_position );
viewport() ->tqrepaint(); viewport() ->repaint();
} }
@ -584,13 +584,13 @@ void MultiTabBarButton::slotClicked()
void MultiTabBarButton::setPosition( MultiTabBar::MultiTabBarPosition pos ) void MultiTabBarButton::setPosition( MultiTabBar::MultiTabBarPosition pos )
{ {
m_position = pos; m_position = pos;
tqrepaint(); repaint();
} }
void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style ) void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style )
{ {
m_style = style; m_style = style;
tqrepaint(); repaint();
} }
void MultiTabBarButton::hideEvent( TQHideEvent* he ) void MultiTabBarButton::hideEvent( TQHideEvent* he )
@ -660,12 +660,12 @@ void MultiTabBarButton::slotAnimTimer()
{ {
if ( m_animEnter ) { if ( m_animEnter ) {
m_animCount += 1; m_animCount += 1;
tqrepaint( false ); repaint( false );
if ( m_animCount >= ANIM_MAX ) if ( m_animCount >= ANIM_MAX )
m_animTimer->stop(); m_animTimer->stop();
} else { } else {
m_animCount -= 1; m_animCount -= 1;
tqrepaint( false ); repaint( false );
if ( m_animCount <= 0 ) if ( m_animCount <= 0 )
m_animTimer->stop(); m_animTimer->stop();
} }
@ -754,7 +754,7 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos )
} }
setPosition( pos ); setPosition( pos );
// tqrepaint(); // repaint();
} }
void MultiTabBarTab::setIcon( const TQString& icon ) void MultiTabBarTab::setIcon( const TQString& icon )
@ -785,7 +785,7 @@ void MultiTabBarTab::slotClicked()
if ( m_animTimer->isActive() ) { if ( m_animTimer->isActive() ) {
m_animCount = ANIM_MAX; m_animCount = ANIM_MAX;
m_animTimer->stop(); m_animTimer->stop();
tqrepaint(); repaint();
} }
updateState(); updateState();
@ -1295,7 +1295,7 @@ void MultiTabBar::fontChange( const TQFont& /* oldFont */ )
{ {
for ( uint i = 0;i < tabs() ->count();i++ ) for ( uint i = 0;i < tabs() ->count();i++ )
tabs() ->at( i ) ->resize(); tabs() ->at( i ) ->resize();
tqrepaint(); repaint();
} }
TQPtrList<MultiTabBarTab>* MultiTabBar::tabs() { return m_internal->tabs();} TQPtrList<MultiTabBarTab>* MultiTabBar::tabs() { return m_internal->tabs();}

@ -302,7 +302,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -65,10 +65,10 @@ TQString OrganizeCollectionDialog::buildFormatTip()
continue; continue;
args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i ); 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["thealbumartist"] = i18n( "The Album Artist" );
args["theartist"] = i18n( "The 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["folder"] = i18n( "Collection Base Folder" );
args["initial"] = i18n( "Artist's Initial" ); args["initial"] = i18n( "Artist's Initial" );
args["filetype"] = i18n( "File Extension of Source" ); args["filetype"] = i18n( "File Extension of Source" );
@ -81,7 +81,7 @@ TQString OrganizeCollectionDialog::buildFormatTip()
it != args.end(); it != args.end();
++it ) ++it )
{ {
tooltip += TQString( "<li>%1 - %2" ).tqarg( it.data(), "%" + it.key() ); tooltip += TQString( "<li>%1 - %2" ).arg( it.data(), "%" + it.key() );
} }
tooltip += "</ul>"; tooltip += "</ul>";

@ -52,7 +52,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name )
: TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ) : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop )
, m_duration( 2000 ) , m_duration( 2000 )
, m_timer( new TQTimer( this ) ) , m_timer( new TQTimer( this ) )
, m_tqalignment( Middle ) , m_alignment( Middle )
, m_screen( 0 ) , m_screen( 0 )
, m_y( MARGIN ) , m_y( MARGIN )
, m_drawShadow( false ) , m_drawShadow( false )
@ -118,7 +118,7 @@ OSDWidget::volChanged( unsigned char volume )
{ {
m_volume = true; m_volume = true;
m_newvolume = volume; 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(); show();
} }
@ -247,7 +247,7 @@ OSDWidget::determineMetrics( const uint M )
const TQRect screen = TQApplication::desktop()->screenGeometry( m_screen ); const TQRect screen = TQApplication::desktop()->screenGeometry( m_screen );
TQPoint newPos( MARGIN, m_y ); TQPoint newPos( MARGIN, m_y );
switch( m_tqalignment ) switch( m_alignment )
{ {
case Left: case Left:
break; break;
@ -349,8 +349,8 @@ OSDWidget::render( const uint M, const TQSize &size )
const uint shadowSize = static_cast<uint>( m_scaledCover.width() / 100.0 * 6.0 ); const uint shadowSize = static_cast<uint>( m_scaledCover.width() / 100.0 * 6.0 );
const TQString folder = Amarok::saveLocation( "covershadow-cache/" ); const TQString folder = Amarok::saveLocation( "covershadow-cache/" );
const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( m_scaledCover.width() + shadowSize ) const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( m_scaledCover.width() + shadowSize )
.tqarg( m_scaledCover.height() + shadowSize ); .arg( m_scaledCover.height() + shadowSize );
if ( TQFile::exists( folder + file ) ) if ( TQFile::exists( folder + file ) )
shadow.load( folder + file ); shadow.load( folder + file );
else { else {
@ -670,11 +670,11 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
if( destination.y() > maxY ) destination.ry() = maxY; if( destination.y() > maxY ) destination.ry() = maxY;
if( eGlobalPosX < (hcenter-snapZone) ) { if( eGlobalPosX < (hcenter-snapZone) ) {
m_tqalignment = Left; m_alignment = Left;
destination.rx() = MARGIN; destination.rx() = MARGIN;
} }
else if( eGlobalPosX > (hcenter+snapZone) ) { else if( eGlobalPosX > (hcenter+snapZone) ) {
m_tqalignment = Right; m_alignment = Right;
destination.rx() = screen.width() - MARGIN - width(); destination.rx() = screen.width() - MARGIN - width();
} }
else { else {
@ -685,10 +685,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) ) if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) )
{ {
m_tqalignment = Center; m_alignment = Center;
destination.ry() = vcenter - height()/2; destination.ry() = vcenter - height()/2;
} }
else m_tqalignment = Middle; else m_alignment = Middle;
} }
destination += screen.topLeft(); destination += screen.topLeft();
@ -760,7 +760,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
: ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " " : ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " "
: i18n(" - "); : i18n(" - ");
append += ( parens.contains( column ) ? "(%1)" : "%1" ); append += ( parens.contains( column ) ? "(%1)" : "%1" );
text += append.tqarg( tags.at( column + 1 ) ); text += append.arg( tags.at( column + 1 ) );
} }
} }
else else

@ -57,7 +57,7 @@ class OSDWidget : public TQWidget
void setTextColor( const TQColor &color ) { setPaletteForegroundColor( color ); } void setTextColor( const TQColor &color ) { setPaletteForegroundColor( color ); }
void setBackgroundColor(const TQColor &color ) { setPaletteBackgroundColor( color ); } void setBackgroundColor(const TQColor &color ) { setPaletteBackgroundColor( color ); }
void setOffset( int y ) { m_y = y; } 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 setImage( const TQImage &image ) { m_cover = image; }
void setScreen( int screen ); void setScreen( int screen );
void setText( const TQString &text ) { m_text = text; } void setText( const TQString &text ) { m_text = text; }
@ -88,7 +88,7 @@ class OSDWidget : public TQWidget
int m_duration; int m_duration;
TQTimer *m_timer; TQTimer *m_timer;
Alignment m_tqalignment; Alignment m_alignment;
int m_screen; int m_screen;
uint m_y; uint m_y;
bool m_drawShadow; bool m_drawShadow;
@ -116,7 +116,7 @@ public:
OSDPreviewWidget( TQWidget *parent ); OSDPreviewWidget( TQWidget *parent );
int screen() { return m_screen; } int screen() { return m_screen; }
int tqalignment() { return m_tqalignment; } int alignment() { return m_alignment; }
int y() { return m_y; } int y() { return m_y; }
public slots: public slots:

@ -57,7 +57,7 @@ namespace Amarok
TQString file = !filename.endsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1"; TQString file = !filename.endsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1";
TQPixmap pix; 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 )); if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( img ));
else pix.convertFromImage( img ); else pix.convertFromImage( img );
return pix; return pix;
@ -68,7 +68,7 @@ namespace Amarok
TQString file = !filename.endsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1"; TQString file = !filename.endsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1";
TQPixmap pix; 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 )); if (TQPaintDevice::x11AppDepth() == 32) pix.convertFromImage(KImageEffect::convertToPremultipliedAlpha( img ));
else pix.convertFromImage( img ); else pix.convertFromImage( img );
return pix; return pix;
@ -100,7 +100,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
, m_pAnalyzer( 0 ) , m_pAnalyzer( 0 )
{ {
//the createWidget template function is used here //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) // Sets caption and icon correctly (needed e.g. for GNOME)
kapp->setTopWidget( this ); kapp->setTopWidget( this );
@ -381,7 +381,7 @@ void PlayerWidget::engineNewMetaData( const MetaBundle &bundle, bool )
if( m_rateString.isEmpty() ) if( m_rateString.isEmpty() )
m_rateString = Hz; m_rateString = Hz;
else 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() ); TQStringList list( bundle.prettyTitle() );
@ -774,15 +774,15 @@ void PlayerWidget::mousePressEvent( TQMouseEvent *e )
{ {
//Amarok::Menu::instance()->exec( e->globalPos() ); //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 ); createAnalyzer( e->state() & TQt::ControlButton ? -1 : +1 );
} }
else else
{ {
TQRect TQRect
rect = m_pTimeLabel->tqgeometry(); rect = m_pTimeLabel->geometry();
rect |= m_pTimeSign->tqgeometry(); rect |= m_pTimeSign->geometry();
if ( rect.contains( e->pos() ) ) if ( rect.contains( e->pos() ) )
{ {

@ -1755,7 +1755,7 @@ TQPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos )
text = text.replace( "&", "&amp;" ).replace( "<", "&lt;" ).replace( ">", "&gt;" ); text = text.replace( "&", "&amp;" ).replace( "<", "&lt;" ).replace( ">", "&gt;" );
if( item->isCurrent() ) if( item->isCurrent() )
{ {
text = TQString("<i>%1</i>").tqarg( text ); text = TQString("<i>%1</i>").arg( text );
Amarok::ToolTip::s_hack = 1; //HACK for precise positioning Amarok::ToolTip::s_hack = 1; //HACK for precise positioning
} }
return TQPair<TQString, TQRect>( text, globalRect ); return TQPair<TQString, TQRect>( text, globalRect );
@ -2372,7 +2372,7 @@ Playlist::paletteChange( const TQPalette &p )
KListView::paletteChange( p ); KListView::paletteChange( p );
counter = 0; // reset the counter or apparently the text lacks contrast counter = 0; // reset the counter or apparently the text lacks contrast
slotGlowTimer(); // tqrepaint currentTrack marker slotGlowTimer(); // repaint currentTrack marker
} }
void void
@ -2737,7 +2737,7 @@ Playlist::eventFilter( TQObject *o, TQEvent *e )
KPopupMenu popup; KPopupMenu popup;
if( mouseOverColumn >= 0 ) 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; KPopupMenu sub;
for( int i = 0; i < columns(); ++i ) //columns() references a property 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( "&", "&amp;" ) const TQString title = ( dynamicMode()->title() ).replace( "&", "&amp;" )
.replace( "<", "&lt;" ) .replace( "<", "&lt;" )
.replace( ">", "&gt;" ); .replace( ">", "&gt;" );
dynamic = TQString(" dynamicMode=\"%1\"").tqarg( title ); dynamic = TQString(" dynamicMode=\"%1\"").arg( title );
} }
stream << TQString( "<playlist product=\"%1\" version=\"%2\"%3>\n" ) stream << TQString( "<playlist product=\"%1\" version=\"%2\"%3>\n" )
.tqarg( "Amarok" ).tqarg( Amarok::xmlVersion() ).tqarg( dynamic ); .arg( "Amarok" ).arg( Amarok::xmlVersion() ).arg( dynamic );
for( MyIt it( this, MyIt::All ); *it; ++it ) 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::Clipboard );
TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); 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 )) ); TQImage(CollectionDB::instance()->albumImage(*playlistItem )) );
} }
} }
@ -3594,7 +3594,7 @@ Playlist::changeFromQueueManager(TQPtrList<PlaylistItem> list)
m_nextTracks = list; m_nextTracks = list;
PLItemList in, out; 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() ) for( PlaylistItem* item = oldQueue.first(); item; item = oldQueue.next() )
if( !m_nextTracks.containsRef( item ) ) if( !m_nextTracks.containsRef( item ) )
out << item; out << item;
@ -3604,7 +3604,7 @@ Playlist::changeFromQueueManager(TQPtrList<PlaylistItem> list)
emit queueChanged( in, out ); emit queueChanged( in, out );
// tqrepaint newly queued or altered queue items // repaint newly queued or altered queue items
if( dynamicMode() ) if( dynamicMode() )
sortQueuedItems(); sortQueuedItems();
else else
@ -3777,7 +3777,7 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
Amarok::actionCollection()->action("playlist_shuffle")->plug( &popup ); Amarok::actionCollection()->action("playlist_shuffle")->plug( &popup );
m = PlaylistBrowser::instance()->findDynamicModeByTitle( AmarokConfig::lastDynamicMode() ); m = PlaylistBrowser::instance()->findDynamicModeByTitle( AmarokConfig::lastDynamicMode() );
if( m ) 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)) switch(popup.exec(p))
{ {
@ -3915,11 +3915,11 @@ Playlist::showContextMenu( TQListViewItem *item, const TQPoint &p, int col ) //S
popup.insertItem( trackColumn popup.insertItem( trackColumn
? i18n("Iteratively Assign Track &Numbers") ? i18n("Iteratively Assign Track &Numbers")
: i18n("&Write '%1' for Selected Tracks") : 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 popup.insertItem( SmallIconSet( Amarok::icon( "edit" ) ), (itemCount == 1
? i18n( "&Edit Tag '%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" ) ) popup.insertItem( SmallIconSet( Amarok::icon( "info" ) )
, item->url().isLocalFile() ? , 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 // No need to call moodbar().load(), since that will happen
// automatically next time it's displayed. We do have to // 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 ) for( PlaylistIterator it( this, PlaylistIterator::All ) ; *it ; ++it )
{ {
@ -4700,7 +4700,7 @@ Playlist::slotEraseMarker() //SLOT
{ {
const TQRect spot = drawDropVisualizer( 0, 0, m_marker ); const TQRect spot = drawDropVisualizer( 0, 0, m_marker );
m_marker = 0; 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 // we write a space for some reason I cannot recall
m_item->setExactText( m_tagType, m_oldTagString.isEmpty() ? " " : m_oldTagString ); m_item->setExactText( m_tagType, m_oldTagString.isEmpty() ? " " : m_oldTagString );
Amarok::StatusBar::instance()->longMessage( i18n( 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; break;
case false: case false:

@ -562,21 +562,21 @@ void PlaylistBrowser::loadLastfmStreams( const bool subscriber /*false*/ )
} }
TQString user = AmarokConfig::scrobblerUsername(); 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 = new LastFmEntry( m_lastfmCategory, tagsFolder, url, i18n( "Neighbor Radio" ) );
last->setKept( false ); 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 = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Recommended Radio" ) );
last->setKept( false ); last->setKept( false );
if( subscriber ) 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 = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Personal Radio" ) );
last->setKept( false ); 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 = new LastFmEntry( m_lastfmCategory, last, url, i18n( "Loved Radio" ) );
last->setKept( false ); last->setKept( false );
} }
@ -668,7 +668,7 @@ void PlaylistBrowser::addSmartPlaylist( TQListViewItem *parent ) //SLOT
if ( sp && sp->title() == dialog.name() ) { if ( sp && sp->title() == dialog.name() ) {
if( KMessageBox::warningContinueCancel( if( KMessageBox::warningContinueCancel(
PlaylistWindow::self(), 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 ) i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue )
{ {
delete item; delete item;
@ -773,7 +773,7 @@ void PlaylistBrowser::updateSmartPlaylistElement( TQDomElement& query )
sql.replace( selectFromSearch, "SELECT (*ListOfFields*) FROM" ); sql.replace( selectFromSearch, "SELECT (*ListOfFields*) FROM" );
if ( limitSearch.search( sql ) != -1 ) if ( limitSearch.search( sql ) != -1 )
sql.replace( limitSearch, 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 ); text.setData( sql );
break; break;
@ -817,7 +817,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists()
QueryBuilder qbTemp( qb ); QueryBuilder qbTemp( qb );
qbTemp.addMatch( QueryBuilder::tabArtist, *it ); 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 ); last->setKept( false );
} }
@ -837,7 +837,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists()
QueryBuilder qbTemp( qb ); QueryBuilder qbTemp( qb );
qbTemp.addMatch( QueryBuilder::tabArtist, *it ); 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 ); last->setKept( false );
} }
@ -857,7 +857,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists()
QueryBuilder qbTemp( qb ); QueryBuilder qbTemp( qb );
qbTemp.addMatch( QueryBuilder::tabArtist, *it ); 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 ); last->setKept( false );
} }
@ -903,7 +903,7 @@ void PlaylistBrowser::loadDefaultSmartPlaylists()
QueryBuilder qbTemp( qb ); QueryBuilder qbTemp( qb );
qbTemp.addMatch( QueryBuilder::tabGenre, *it ); 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 ); last->setKept( false );
} }
@ -1179,7 +1179,7 @@ DEBUG_BLOCK
channel = new PodcastChannel( parent, channel, *it ); 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" ) 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; .first().toInt() > 0;
channel->setNew( hasNew ); channel->setNew( hasNew );
@ -1241,7 +1241,7 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder )
if( folder != m_podcastCategory ) if( folder != m_podcastCategory )
{ {
if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration 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<PlaylistCategory*>(folder->parent())->id(); int parentId = static_cast<PlaylistCategory*>(folder->parent())->id();
int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() ); int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() );
folder->setId( newId ); folder->setId( newId );
@ -1314,7 +1314,7 @@ void PlaylistBrowser::configurePodcasts( TQListViewItem *parent )
} }
} }
if( !podcastChannelList.isEmpty() ) 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() void PlaylistBrowser::configureSelectedPodcasts()
@ -1438,7 +1438,7 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent )
{ {
Amarok::StatusBar::instance()->longMessage( Amarok::StatusBar::instance()->longMessage(
i18n( "Already subscribed to feed %1 as %2" ) i18n( "Already subscribed to feed %1 as %2" )
.tqarg( url.prettyURL(), channel->title() ), .arg( url.prettyURL(), channel->title() ),
KDE::StatusBar::Sorry ); KDE::StatusBar::Sorry );
return; return;
} }
@ -1540,7 +1540,7 @@ bool PlaylistBrowser::deletePodcasts( TQPtrList<PodcastChannel> items )
} }
#undef ch #undef ch
/// we don't need to delete from the database, because removing the channel from the database /// 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<PodcastChannel*>(*it) ); m_podcastItemsToScan.remove( static_cast<PodcastChannel*>(*it) );
} }
CollectionDB::instance()->removePodcastChannel( static_cast<PodcastChannel*>(*it)->url() ); CollectionDB::instance()->removePodcastChannel( static_cast<PodcastChannel*>(*it)->url() );
@ -1789,7 +1789,7 @@ bool PlaylistBrowser::savePlaylist( const TQString &path, const TQValueList<KURL
if( !file.open( IO_WriteOnly ) ) if( !file.open( IO_WriteOnly ) )
{ {
KMessageBox::sorry( PlaylistWindow::self(), i18n( "Cannot write playlist (%1).").tqarg(path) ); KMessageBox::sorry( PlaylistWindow::self(), i18n( "Cannot write playlist (%1).").arg(path) );
return false; return false;
} }
@ -2108,7 +2108,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT
// it will be deleted from the parent // it will be deleted from the parent
TQListViewItem *parent = it.current()->parent(); TQListViewItem *parent = it.current()->parent();
if( parent && parent->isSelected() ) //parent will remove tqchildren if( parent && parent->isSelected() ) //parent will remove children
continue; continue;
if (parent) { if (parent) {
@ -2278,7 +2278,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT
if( lastfmCount ) saveLastFm(); 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 ) void PlaylistBrowser::removePodcastFolder( PlaylistCategory *item )
{ {
if( !item ) return; if( !item ) return;
@ -2744,7 +2744,7 @@ void PlaylistBrowserView::eraseMarker() //SLOT
spot = drawDropVisualizer( 0, 0, m_marker ); spot = drawDropVisualizer( 0, 0, m_marker );
m_marker = 0; m_marker = 0;
viewport()->tqrepaint( spot, false ); viewport()->repaint( spot, false );
} }
} }
@ -3006,7 +3006,7 @@ void PlaylistBrowserView::startDrag()
textdrag->setSubtype( "amarok-sql" ); textdrag->setSubtype( "amarok-sql" );
drag->addDragObject( textdrag ); 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); pixText = (*it)->text(0);
} }
@ -3020,7 +3020,7 @@ void PlaylistBrowserView::startDrag()
TQTextDrag *textdrag = new TQTextDrag( str, 0 ); TQTextDrag *textdrag = new TQTextDrag( str, 0 );
textdrag->setSubtype( "dynamic" ); textdrag->setSubtype( "dynamic" );
drag->addDragObject( textdrag ); 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); pixText = (*it)->text(0);
} }
@ -3054,12 +3054,12 @@ TQString PlaylistDialog::getSaveFileName( const TQString &suggestion, bool propo
if( !suggestion.isEmpty() ) if( !suggestion.isEmpty() )
{ {
TQString path = Amarok::saveLocation("playlists/") + "%1" + ".m3u"; TQString path = Amarok::saveLocation("playlists/") + "%1" + ".m3u";
if( TQFileInfo( path.tqarg( suggestion ) ).exists() && !proposeOverwriting ) if( TQFileInfo( path.arg( suggestion ) ).exists() && !proposeOverwriting )
{ {
int n = 2; 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++; n++;
dialog.edit->setText( i18n( "%1 (%2)" ).tqarg( suggestion, TQString::number( n ) ) ); dialog.edit->setText( i18n( "%1 (%2)" ).arg( suggestion, TQString::number( n ) ) );
} }
else else
dialog.edit->setText( suggestion ); dialog.edit->setText( suggestion );
@ -3099,7 +3099,7 @@ void PlaylistDialog::slotOk()
if( !TQFileInfo( result ).exists() || if( !TQFileInfo( result ).exists() ||
KMessageBox::warningContinueCancel( KMessageBox::warningContinueCancel(
PlaylistWindow::self(), 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 ) i18n( "Overwrite Playlist?" ), i18n( "Overwrite" ) ) == KMessageBox::Continue )
{ {
KDialogBase::slotOk(); KDialogBase::slotOk();
@ -3243,7 +3243,7 @@ InfoPane::setInfo( const TQString &title, const TQString &info )
"</td>" "</td>"
"</tr>" "</tr>"
"</table>" "</table>"
"</div>" ).tqarg( title, info_ ) : "</div>" ).arg( title, info_ ) :
TQString() ); TQString() );
} }

@ -514,7 +514,7 @@ PlaylistCategory::showContextMenu( const TQPoint &position )
break; break;
} }
name = i18n("Folder"); 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; if( tracker == firstChild() && !isCategory( tracker ) ) tracker = 0;
newFolder = new PlaylistCategory( this, tracker, name, true ); newFolder = new PlaylistCategory( this, tracker, name, true );
@ -642,7 +642,7 @@ void PlaylistEntry::load()
startAnimation(); startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); 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() ) while( firstChild() )
delete 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 * 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. * 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 else if( !isDynamic() || !m_dynamic ) { //collapse
//delete all tqchildren //delete all children
while( firstChild() ) while( firstChild() )
delete firstChild(); delete firstChild();
@ -855,10 +855,10 @@ void PlaylistEntry::updateInfo()
TQString str = "<html><body><table width=\"100%\" border=\"0\">"; TQString str = "<html><body><table width=\"100%\" border=\"0\">";
str += body.tqarg( i18n( "Playlist" ), text(0) ); str += body.arg( i18n( "Playlist" ), text(0) );
str += body.tqarg( i18n( "Number of tracks" ), TQString::number(m_trackCount) ); str += body.arg( i18n( "Number of tracks" ), TQString::number(m_trackCount) );
str += body.tqarg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) ); str += body.arg( i18n( "Length" ), MetaBundle::prettyTime( m_length ) );
str += body.tqarg( i18n( "Location" ), m_url.prettyURL() ); str += body.arg( i18n( "Location" ), m_url.prettyURL() );
str += "</table></body></html>"; str += "</table></body></html>";
PlaylistBrowser::instance()->setInfo( text(0), 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() ) ) if( p && p->text( 0 ).contains( info->artist() ) )
setText( 0, info->title() ); setText( 0, info->title() );
else 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() const KURL &PlaylistTrackItem::url()
@ -1121,7 +1121,7 @@ void PlaylistTrackItem::showContextMenu( const TQPoint &position )
TagDialog* dialog = new TagDialog( url() ); TagDialog* dialog = new TagDialog( url() );
dialog->show(); 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 = "<html><body><table width=\"100%\" border=\"0\">"; TQString str = "<html><body><table width=\"100%\" border=\"0\">";
str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); str += body.arg( i18n( "URL" ), m_url.prettyURL() );
str += "</table></body></html>"; str += "</table></body></html>";
PlaylistBrowser::instance()->setInfo( text(0), str ); PlaylistBrowser::instance()->setInfo( text(0), str );
@ -2057,7 +2057,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
if( !guid.isEmpty() ) if( !guid.isEmpty() )
{ {
command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") 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 ) ); CollectionDB::instance()->escapeString( guid ) );
TQStringList values = CollectionDB::instance()->query( command ); TQStringList values = CollectionDB::instance()->query( command );
return !values.isEmpty(); return !values.isEmpty();
@ -2066,7 +2066,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
TQString episodeTitle = xml.namedItem( "title" ).toElement().text(); TQString episodeTitle = xml.namedItem( "title" ).toElement().text();
KURL episodeURL = xml.namedItem( "enclosure" ).toElement().attribute( "url" ); KURL episodeURL = xml.namedItem( "enclosure" ).toElement().attribute( "url" );
command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';") 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( episodeURL.url() ),
CollectionDB::instance()->escapeString( episodeTitle ) ); CollectionDB::instance()->escapeString( episodeTitle ) );
TQStringList values = CollectionDB::instance()->query( command ); TQStringList values = CollectionDB::instance()->query( command );
@ -2080,7 +2080,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
if( !guid.isEmpty() ) if( !guid.isEmpty() )
{ {
command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';") 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 ) ); CollectionDB::instance()->escapeString( guid ) );
TQStringList values = CollectionDB::instance()->query( command ); TQStringList values = CollectionDB::instance()->query( command );
return !values.isEmpty(); 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';") 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( episodeURL ),
CollectionDB::instance()->escapeString( episodeTitle ) ); CollectionDB::instance()->escapeString( episodeTitle ) );
TQStringList values = CollectionDB::instance()->query( command ); TQStringList values = CollectionDB::instance()->query( command );
@ -2136,15 +2136,15 @@ PodcastChannel::updateInfo()
TQString str = "<html><body><table width=\"100%\" border=\"0\">"; TQString str = "<html><body><table width=\"100%\" border=\"0\">";
str += body.tqarg( i18n( "Description" ), description() ); str += body.arg( i18n( "Description" ), description() );
str += body.tqarg( i18n( "Website" ), link().prettyURL() ); str += body.arg( i18n( "Website" ), link().prettyURL() );
str += body.tqarg( i18n( "Copyright" ), copyright() ); str += body.arg( i18n( "Copyright" ), copyright() );
str += body.tqarg( i18n( "URL" ), m_url.prettyURL() ); str += body.arg( i18n( "URL" ), m_url.prettyURL() );
str += "</table>"; str += "</table>";
str += i18n( "<p>&nbsp;<b>Episodes</b></p><ul>" ); str += i18n( "<p>&nbsp;<b>Episodes</b></p><ul>" );
for( TQListViewItem *c = firstChild(); c; c = c->nextSibling() ) for( TQListViewItem *c = firstChild(); c; c = c->nextSibling() )
{ {
str += TQString("<li>%1</li>").tqarg( static_cast<PodcastEpisode*>(c)->title() ); str += TQString("<li>%1</li>").arg( static_cast<PodcastEpisode*>(c)->title() );
} }
str += "</ul></body></html>"; str += "</ul></body></html>";
@ -2565,7 +2565,7 @@ PodcastEpisode::downloadMedia()
Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob ) Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob )
.setDescription( title().isEmpty() .setDescription( title().isEmpty()
? i18n( "Downloading Podcast Media" ) ? i18n( "Downloading Podcast Media" )
: i18n( "Downloading Podcast \"%1\"" ).tqarg( title() ) ) : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) )
.setAbortSlot( this, TQT_SLOT( abortDownload()) ) .setAbortSlot( this, TQT_SLOT( abortDownload()) )
.setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) ); .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) );
@ -2794,13 +2794,13 @@ PodcastEpisode::updateInfo()
TQString str = "<html><body><table width=\"100%\" border=\"0\">"; TQString str = "<html><body><table width=\"100%\" border=\"0\">";
//str += body.tqarg( i18n( "Title" ), m_bundle.title() ); //str += body.arg( i18n( "Title" ), m_bundle.title() );
str += body.tqarg( i18n( "Description" ), m_bundle.description() ); str += body.arg( i18n( "Description" ), m_bundle.description() );
str += body.tqarg( i18n( "Date" ), m_bundle.date() ); str += body.arg( i18n( "Date" ), m_bundle.date() );
str += body.tqarg( i18n( "Author" ), m_bundle.author() ); str += body.arg( i18n( "Author" ), m_bundle.author() );
str += body.tqarg( i18n( "Type" ), m_bundle.type() ); str += body.arg( i18n( "Type" ), m_bundle.type() );
str += body.tqarg( i18n( "URL" ), m_bundle.url().prettyURL() ); str += body.arg( i18n( "URL" ), m_bundle.url().prettyURL() );
str += body.tqarg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) ); str += body.arg( i18n( "Local URL" ), isOnDisk() ? localUrl().prettyURL() : i18n( "n/a" ) );
str += "</table></body></html>"; str += "</table></body></html>";
PlaylistBrowser::instance()->setInfo( text(0), str ); PlaylistBrowser::instance()->setInfo( text(0), str );
@ -2977,7 +2977,7 @@ class AssociatePodcastDialog : public KDialogBase
public: public:
AssociatePodcastDialog( PodcastEpisode *item ) 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(); TQVBox* vbox = makeVBoxMainWidget();
vbox->setSpacing( KDialog::spacingHint() ); vbox->setSpacing( KDialog::spacingHint() );
@ -3069,7 +3069,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
static TQStringList years; static TQStringList years;
static TQStringList labels; static TQStringList labels;
//Delete all tqchildren before //Delete all children before
while( firstChild() ) while( firstChild() )
delete firstChild(); delete firstChild();
@ -3086,7 +3086,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
genres = CollectionDB::instance()->genreList(); genres = CollectionDB::instance()->genreList();
} }
foreach( genres ) { 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( TQString(queryChildren).replace(
"(*ExpandString*)", *it) ); "(*ExpandString*)", *it) );
} }
@ -3096,7 +3096,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
artists = CollectionDB::instance()->artistList(); artists = CollectionDB::instance()->artistList();
} }
foreach( artists ) { 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( TQString(queryChildren).replace(
"(*ExpandString*)", *it) ); "(*ExpandString*)", *it) );
} }
@ -3106,7 +3106,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
composers = CollectionDB::instance()->composerList(); composers = CollectionDB::instance()->composerList();
} }
foreach( composers ) { 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( TQString(queryChildren).replace(
"(*ExpandString*)", *it) ); "(*ExpandString*)", *it) );
} }
@ -3116,7 +3116,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
albums = CollectionDB::instance()->albumList(); albums = CollectionDB::instance()->albumList();
} }
foreach( albums ) { 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( TQString(queryChildren).replace(
"(*ExpandString*)", *it) ); "(*ExpandString*)", *it) );
} }
@ -3126,7 +3126,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
years = CollectionDB::instance()->yearList(); years = CollectionDB::instance()->yearList();
} }
foreach( years ) { 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( TQString(queryChildren).replace(
"(*ExpandString*)", *it) ); "(*ExpandString*)", *it) );
} }
@ -3136,7 +3136,7 @@ void SmartPlaylist::setXml( const TQDomElement &xml )
labels = CollectionDB::instance()->labelList(); labels = CollectionDB::instance()->labelList();
} }
foreach( labels ) { 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 // expand by, if needed
if ( forExpand ) { if ( forExpand ) {
// TODO: The most efficient way would be to pass the tqchildren the XML // TODO: The most efficient way would be to pass the children the XML
// and what to expand by, then have the tqchildren compute the query as needed. // 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 // This could save a few megs of RAM for queries, but this patch is getting
// too big already, right now. Ovy // too big already, right now. Ovy
TQDomNodeList expandbyList = xml.elementsByTagName( "expandby" ); TQDomNodeList expandbyList = xml.elementsByTagName( "expandby" );

@ -163,7 +163,7 @@ class PlaylistEntry : public PlaylistBrowserEntry
PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition );
~PlaylistEntry(); ~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(); void load();
@ -361,13 +361,13 @@ class PodcastChannel : public PlaylistBrowserEntry
void setNew( const bool n = true ); void setNew( const bool n = true );
bool hasNew() const { return m_new; } 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. // to. Mark the channel as new/listened after doing this.
void checkAndSetNew(); void checkAndSetNew();
void setListened( const bool n = true ); // over rides each child so it has been listened 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(); void load();
const bool isPolished() const { return m_polished; } const bool isPolished() const { return m_polished; }
@ -555,7 +555,7 @@ class SmartPlaylist : public PlaylistBrowserEntry
bool m_dynamic; bool m_dynamic;
// Build the query for a given xml object. If \p for expand is true, // 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 ); static TQString xmlToQuery( const TQDomElement &xml, bool forExpand = false );
}; };

@ -575,7 +575,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
s_pixmapChanged = false; 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() ) if ( paintCache[column].map.find( colorKey ) == paintCache[column].map.end() )
{ {
// Update painting cache // Update painting cache
@ -934,7 +934,7 @@ void PlaylistItem::moodbarJobEvent( int newState )
{ {
(void) newState; // want to redraw nomatter what the new state is (void) newState; // want to redraw nomatter what the new state is
if( AmarokConfig::showMoodbar() ) if( AmarokConfig::showMoodbar() )
tqrepaint(); repaint();
// Don't automatically resort because it's annoying // Don't automatically resort because it's annoying
} }

@ -324,9 +324,9 @@ UrlLoader::completeJob()
for ( uint it = 0; it < m_badURLs.count(); it++ ) for ( uint it = 0; it < m_badURLs.count(); it++ )
{ {
if( it < 5 ) if( it < 5 )
text += TQString("<br>%1").tqarg( m_badURLs[it].prettyURL() ); text += TQString("<br>%1").arg( m_badURLs[it].prettyURL() );
else if( it == 5 ) else if( it == 5 )
text += TQString("<br>Plus %1 more").tqarg( m_badURLs.count() - it ); text += TQString("<br>Plus %1 more").arg( m_badURLs.count() - it );
debug() << "\t" << m_badURLs[it] << endl; debug() << "\t" << m_badURLs[it] << endl;
} }

@ -562,7 +562,7 @@ void PlaylistWindow::createGUI()
//TEXT ON RIGHT HACK //TEXT ON RIGHT HACK
//KToolBarButtons have independent settings for their appearance. //KToolBarButtons have independent settings for their appearance.
//KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar //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; TQStringList list;
list << "toolbutton_playlist_add" list << "toolbutton_playlist_add"
@ -856,7 +856,7 @@ void PlaylistWindow::savePlaylist() const //SLOT
} }
if( useArtist && useAlbum ) if( useArtist && useAlbum )
title = i18n("%1 - %2").tqarg( artist, album ); title = i18n("%1 - %2").arg( artist, album );
else if( useArtist ) else if( useArtist )
title = artist; title = artist;
else if( useAlbum ) else if( useAlbum )
@ -922,7 +922,7 @@ void PlaylistWindow::playLastfmPersonal() //SLOT
if( !LastFm::Controller::checkCredentials() ) return; if( !LastFm::Controller::checkCredentials() ) return;
const KURL url( TQString( "lastfm://user/%1/personal" ) const KURL url( TQString( "lastfm://user/%1/personal" )
.tqarg( AmarokConfig::scrobblerUsername() ) ); .arg( AmarokConfig::scrobblerUsername() ) );
Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay );
} }
@ -933,7 +933,7 @@ void PlaylistWindow::addLastfmPersonal() //SLOT
if( !LastFm::Controller::checkCredentials() ) return; if( !LastFm::Controller::checkCredentials() ) return;
const KURL url( TQString( "lastfm://user/%1/personal" ) const KURL url( TQString( "lastfm://user/%1/personal" )
.tqarg( AmarokConfig::scrobblerUsername() ) ); .arg( AmarokConfig::scrobblerUsername() ) );
Playlist::instance()->insertMedia( url ); Playlist::instance()->insertMedia( url );
} }
@ -944,7 +944,7 @@ void PlaylistWindow::playLastfmNeighbor() //SLOT
if( !LastFm::Controller::checkCredentials() ) return; if( !LastFm::Controller::checkCredentials() ) return;
const KURL url( TQString( "lastfm://user/%1/neighbours" ) const KURL url( TQString( "lastfm://user/%1/neighbours" )
.tqarg( AmarokConfig::scrobblerUsername() ) ); .arg( AmarokConfig::scrobblerUsername() ) );
Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay ); Playlist::instance()->insertMedia( url, Playlist::Append|Playlist::DirectPlay );
} }
@ -955,7 +955,7 @@ void PlaylistWindow::addLastfmNeighbor() //SLOT
if( !LastFm::Controller::checkCredentials() ) return; if( !LastFm::Controller::checkCredentials() ) return;
const KURL url( TQString( "lastfm://user/%1/neighbours" ) const KURL url( TQString( "lastfm://user/%1/neighbours" )
.tqarg( AmarokConfig::scrobblerUsername() ) ); .arg( AmarokConfig::scrobblerUsername() ) );
Playlist::instance()->insertMedia( url ); Playlist::instance()->insertMedia( url );
} }
@ -1248,7 +1248,7 @@ void DynamicTitle::setTitle(const TQString& newTitle)
void DynamicTitle::paintEvent(TQPaintEvent* /*e*/) void DynamicTitle::paintEvent(TQPaintEvent* /*e*/)
{ {
TQPainter p; TQPainter p;
p.tqbegin( this, false ); p.begin( this, false );
TQPen pen( colorGroup().highlightedText(), 0, TQt::NoPen ); TQPen pen( colorGroup().highlightedText(), 0, TQt::NoPen );
p.setPen( pen ); p.setPen( pen );
p.setBrush( colorGroup().highlight() ); p.setBrush( colorGroup().highlight() );

@ -95,8 +95,8 @@ PluginManager::createFromService( const KService::Ptr service )
if ( !lib ) { if ( !lib ) {
KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>" KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>"
"<p>Error message:<br/><i>%2</i></p>" ) "<p>Error message:<br/><i>%2</i></p>" )
.tqarg( service->library() ) .arg( service->library() )
.tqarg( loader->lastErrorMessage() ) ); .arg( loader->lastErrorMessage() ) );
return 0; return 0;
} }
//look up address of init function and cast it to pointer-to-function //look up address of init function and cast it to pointer-to-function
@ -174,12 +174,12 @@ PluginManager::showAbout( const TQString &constraint )
TQString str = "<html><body><table width=\"100%\" border=\"1\">"; TQString str = "<html><body><table width=\"100%\" border=\"1\">";
str += body.tqarg( i18n( "Name" ), s->name() ); str += body.arg( i18n( "Name" ), s->name() );
str += body.tqarg( i18n( "Library" ), s->library() ); str += body.arg( i18n( "Library" ), s->library() );
str += body.tqarg( i18n( "Authors" ), s->property( "X-KDE-Amarok-authors" ).toStringList().join( "\n" ) ); str += body.arg( 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.arg( 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.arg( 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( "Framework Version" ), s->property( "X-KDE-Amarok-framework-version" ).toString() );
str += "</table></body></html>"; str += "</table></body></html>";

@ -63,7 +63,7 @@ PodcastSettings::PodcastSettings( const TQString &title, const TQString &save, c
} }
PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* parent ) 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::User1|KDialogBase::Ok|KDialogBase::Cancel
, KDialogBase::Ok, true , KDialogBase::Ok, true
, KGuiItem(i18n("Reset"), "reset" ) ) , KGuiItem(i18n("Reset"), "reset" ) )
@ -74,7 +74,7 @@ PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidge
} }
PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* parent ) PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &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::User1|KDialogBase::Ok|KDialogBase::Cancel
, KDialogBase::Ok, true , KDialogBase::Ok, true
, KGuiItem(i18n("Reset"), "reset" ) ) , KGuiItem(i18n("Reset"), "reset" ) )

@ -373,7 +373,7 @@ QueueManager::addItems( TQListViewItem *after )
if( current.find( item ) == current.end() ) //avoid duplication 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 ); after = new QueueItem( m_listview, after, title );
m_map[ after ] = item; m_map[ after ] = item;
@ -416,7 +416,7 @@ QueueManager::addQueuedItem( PlaylistItem *item )
TQValueList<PlaylistItem*> current = m_map.values(); TQValueList<PlaylistItem*> current = m_map.values();
TQValueListIterator<PlaylistItem*> newItem = current.find( item ); TQValueListIterator<PlaylistItem*> 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 if( newItem == current.end() ) //avoid duplication
{ {
@ -434,7 +434,7 @@ QueueManager::removeQueuedItem( PlaylistItem *item )
TQValueList<PlaylistItem*> current = m_map.values(); TQValueList<PlaylistItem*> current = m_map.values();
TQValueListIterator<PlaylistItem*> newItem = current.find( item ); TQValueListIterator<PlaylistItem*> 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 ); TQListViewItem *removableItem = m_listview->findItem( title, 0 );
@ -478,7 +478,7 @@ QueueManager::insertItems()
for( PlaylistItem *item = list.first(); item; item = list.next() ) 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 ); last = new QueueItem( m_listview, last, title );
m_map[ last ] = item; m_map[ last ] = item;

@ -52,9 +52,9 @@ RefreshImages::RefreshImages()
TQString url = TQString url =
TQString("http://webservices.amazon.%1/onca/xml?Service=AWSECommerceService&SubscriptionId=%2&Operation=ItemLookup&ItemId=%3&ResponseGroup=Small,Images") TQString("http://webservices.amazon.%1/onca/xml?Service=AWSECommerceService&SubscriptionId=%2&Operation=ItemLookup&ItemId=%3&ResponseGroup=Small,Images")
.tqarg(localeToTLD(locale)) .arg(localeToTLD(locale))
.tqarg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe .arg("0RTQSQ0B8CRY7VX2VF3G2") //Ian Monroe
.tqarg(asin); .arg(asin);
debug() << url << endl; debug() << url << endl;

@ -189,7 +189,7 @@ ScanController::initIncremental()
const TQStringList values = CollectionDB::instance()->query( const TQStringList values = CollectionDB::instance()->query(
TQString( "SELECT deviceid, dir, changedate FROM directories WHERE deviceid IN (%1);" ) TQString( "SELECT deviceid, dir, changedate FROM directories WHERE deviceid IN (%1);" )
.tqarg( deviceIds ) ); .arg( deviceIds ) );
foreach( values ) foreach( values )
{ {

@ -339,12 +339,12 @@ ScriptManager::requestNewScore( const TQString &url, double prevscore, int playc
m_scripts[script].process->writeStdin( m_scripts[script].process->writeStdin(
TQString( "requestNewScore %6 %1 %2 %3 %4 %5" ) TQString( "requestNewScore %6 %1 %2 %3 %4 %5" )
.tqarg( prevscore ) .arg( prevscore )
.tqarg( playcount ) .arg( playcount )
.tqarg( length ) .arg( length )
.tqarg( percentage ) .arg( percentage )
.tqarg( reason ) .arg( reason )
.tqarg( KURL::encode_string( url ) ) ); //last because it might have %s .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(); const TQString scriptFolder = destination + archiveDir->entries().first();
if( TQFile::exists( scriptFolder ) ) { if( TQFile::exists( scriptFolder ) ) {
KMessageBox::error( 0, i18n( "A script with the name '%1' is already installed. " 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; return false;
} }
@ -512,7 +512,7 @@ ScriptManager::slotUninstallScript()
{ {
const TQString name = m_gui->listView->currentItem()->text( 0 ); 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; return;
if( m_scripts.find( name ) == m_scripts.end() ) if( m_scripts.find( name ) == m_scripts.end() )
@ -610,7 +610,7 @@ ScriptManager::slotRunScript( bool silent )
{ {
if( !silent ) if( !silent )
KMessageBox::sorry( 0, i18n( "<p>Could not start the script <i>%1</i>.</p>" KMessageBox::sorry( 0, i18n( "<p>Could not start the script <i>%1</i>.</p>"
"<p>Please make sure that the file has execute (+x) permissions.</p>" ).tqarg( name ) ); "<p>Please make sure that the file has execute (+x) permissions.</p>" ).arg( name ) );
delete script; delete script;
return false; return false;
} }
@ -674,11 +674,11 @@ ScriptManager::slotAboutScript()
TQString(), TQString(),
KDialogBase::Ok, KDialogBase::Ok, this ); KDialogBase::Ok, KDialogBase::Ok, this );
kapp->setTopWidget( about ); kapp->setTopWidget( about );
about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).tqarg( name ) ) ); about->setCaption( kapp->makeStdCaption( i18n( "About %1" ).arg( name ) ) );
about->setProduct( "", "", "", "" ); about->setProduct( "", "", "", "" );
// Get rid of the confusing KDE version text // Get rid of the confusing KDE version text
TQLabel* product = static_cast<TQLabel*>( TQT_TQWIDGET(about->mainWidget()->child( "version" )) ); TQLabel* product = static_cast<TQLabel*>( 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 ); about->addTextPage( i18n( "About" ), readme.readAll(), true );
if( license.open( IO_ReadOnly ) ) if( license.open( IO_ReadOnly ) )
@ -726,7 +726,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos )
KTextEdit* editor = new KTextEdit( it.data().log ); KTextEdit* editor = new KTextEdit( it.data().log );
kapp->setTopWidget( editor ); 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 ); editor->setReadOnly( true );
TQFont font( "fixed" ); TQFont font( "fixed" );
@ -780,7 +780,7 @@ ScriptManager::scriptFinished( KProcess* process ) //SLOT
// Check if there was an error on exit // Check if there was an error on exit
if( process->normalExit() && process->exitStatus() != 0 ) if( process->normalExit() && process->exitStatus() != 0 )
KMessageBox::detailedError( 0, i18n( "The script '%1' exited with error code: %2" ) 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 ); ,it.data().log );
// Destroy script process // Destroy script process

@ -439,10 +439,10 @@ void ScrobblerSubmitter::performHandshake()
"&c=%2" "&c=%2"
"&v=%3" "&v=%3"
"&u=%4" ) "&u=%4" )
.tqarg( PROTOCOL_VERSION ) .arg( PROTOCOL_VERSION )
.tqarg( CLIENT_ID ) .arg( CLIENT_ID )
.tqarg( CLIENT_VERSION ) .arg( CLIENT_VERSION )
.tqarg( m_username ); .arg( m_username );
} }
else if ( PROTOCOL_VERSION == "1.2" ) else if ( PROTOCOL_VERSION == "1.2" )
@ -464,12 +464,12 @@ void ScrobblerSubmitter::performHandshake()
"&u=%4" "&u=%4"
"&t=%5" "&t=%5"
"&a=%6" ) "&a=%6" )
.tqarg( PROTOCOL_VERSION ) .arg( PROTOCOL_VERSION )
.tqarg( CLIENT_ID ) .arg( CLIENT_ID )
.tqarg( CLIENT_VERSION ) .arg( CLIENT_VERSION )
.tqarg( m_username ) .arg( m_username )
.tqarg( currentTime ) .arg( currentTime )
.tqarg( KMD5( KMD5( m_password.utf8() ).hexDigest() + .arg( KMD5( KMD5( m_password.utf8() ).hexDigest() +
currentTime ).hexDigest().data() ); currentTime ).hexDigest().data() );
} }
@ -1000,7 +1000,7 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ
if ( success ) if ( success )
{ {
if ( tracks == 1 ) if ( tracks == 1 )
_short = i18n( "'%1' submitted to last.fm" ).tqarg( item->title() ); _short = i18n( "'%1' submitted to last.fm" ).arg( item->title() );
else else
{ {
_short = i18n( "Several tracks submitted to last.fm" ); _short = i18n( "Several tracks submitted to last.fm" );
@ -1008,20 +1008,20 @@ void ScrobblerSubmitter::announceSubmit( SubmitItem *item, int tracks, bool succ
_long = "<p>"; _long = "<p>";
_long = i18n( "'%1' and one other track submitted", _long = i18n( "'%1' and one other track submitted",
"'%1' and %n other tracks submitted", tracks-1 ) "'%1' and %n other tracks submitted", tracks-1 )
.tqarg( item->title() ); .arg( item->title() );
} }
} }
else else
{ {
if ( tracks == 1 ) 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 else
{ {
_short = i18n( "Failed to submit several tracks to last.fm" ); _short = i18n( "Failed to submit several tracks to last.fm" );
_long = "<p>"; _long = "<p>";
_long = i18n( "Failed to submit '%1' and one other track", _long = i18n( "Failed to submit '%1' and one other track",
"Failed to submit '%1' and %n other tracks", tracks-1 ) "Failed to submit '%1' and %n other tracks", tracks-1 )
.tqarg( item->title() ); .arg( item->title() );
} }
} }

@ -406,12 +406,12 @@ Amarok::VolumeSlider::slotAnimTimer() //SLOT
{ {
if ( m_animEnter ) { if ( m_animEnter ) {
m_animCount++; m_animCount++;
tqrepaint( false ); repaint( false );
if ( m_animCount == ANIM_MAX - 1 ) if ( m_animCount == ANIM_MAX - 1 )
m_animTimer->stop(); m_animTimer->stop();
} else { } else {
m_animCount--; m_animCount--;
tqrepaint( false ); repaint( false );
if ( m_animCount == 0 ) if ( m_animCount == 0 )
m_animTimer->stop(); m_animTimer->stop();
} }

@ -322,7 +322,7 @@ void SmartPlaylistEditor::updateOrderTypes( int index )
} }
if( currentOrderType < m_orderTypeCombo->count() ) if( currentOrderType < m_orderTypeCombo->count() )
m_orderTypeCombo->setCurrentItem( currentOrderType ); 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(); m_orderTypeCombo->updateGeometry();
} }
@ -641,7 +641,7 @@ TQString CriteriaEditor::getSearchCriteria()
else if( m_dateCombo->currentItem() == 1 ) //months else if( m_dateCombo->currentItem() == 1 ) //months
time=86400*30*n; time=86400*30*n;
else time=86400*365*n; //years else time=86400*365*n; //years
value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").tqarg(time) + "(*CurrentTimeT*)"; value += "(*CurrentTimeT*)" + TQString(" - %1 AND ").arg(time) + "(*CurrentTimeT*)";
} }
else { else {
TQDateTime datetime1( m_dateEdit1->date() ); TQDateTime datetime1( m_dateEdit1->date() );

@ -1551,7 +1551,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** </ul> ** </ul>
** **
** Conversions between UTF-16be and UTF-16le are always done in place and do ** 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 ** 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 ** of conversion are done in place when it is possible, but sometime it is
** not possible and in those cases prior pointers are invalidated. ** not possible and in those cases prior pointers are invalidated.
@ -2045,7 +2045,7 @@ SQLITE_API int sqlite3_sleep(int);
** file directory. ** file directory.
** **
** Once [sqlite3_open()] has been called, changing this variable will ** 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 ** it is not safe to invoke this routine after [sqlite3_open()] has
** been called. ** 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. ** 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 ** 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. ** a different master journal, then this master journal can be deleted.
*/ */
static int pager_delmaster(const char *zMaster){ 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. ** 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 ** 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 ** 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 ** which is stored in the key size entry of the cell header rather than in
** the payload area. ** 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 /* 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) #define ROUND8(x) ((x+7)&~7)
@ -24060,7 +24060,7 @@ SQLITE_PRIVATE int sqlite3BtreeOpen(
#endif #endif
} }
pBt->usableSize = pBt->pageSize - nReserve; 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); sqlite3PagerSetPagesize(pBt->pPager, pBt->pageSize);
#if !defined(SQLITE_OMIT_SHARED_CACHE) && !defined(SQLITE_OMIT_DISKIO) #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){ SQLITE_PRIVATE int sqlite3BtreeClose(Btree *p){
BtShared *pBt = p->pBt; BtShared *pBt = p->pBt;
@ -24571,7 +24571,7 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){
#ifndef SQLITE_OMIT_AUTOVACUUM #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 ** pPage contains cells that point to overflow pages, set the pointer
** map entries for the overflow pages as well. ** 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 ** Once an overflow page-list cache has been allocated, it may be
** invalidated if some other cursor writes to the same table, or if ** invalidated if some other cursor writes to the same table, or if
** the cursor is moved to a different row. Additionally, in auto-vacuum ** 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, ** * An incremental vacuum,
** * A commit in auto_vacuum="full" mode, ** * 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. ** to pPage.
** **
** In other words, for every child of pPage, invoke reparentPage() ** 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 ** the siblings. An attempt is made to find NN siblings on either
** side of pPage. More siblings are taken from one side, however, if ** 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 ** 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; nxDiv = idx - NN;
if( nxDiv + NB > pParent->nCell ){ 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 /* Make nMaxCells a multiple of 2 in order to preserve 8-byte
** tqalignment */ ** alignment */
nMaxCells = (nMaxCells + 1)&~1; nMaxCells = (nMaxCells + 1)&~1;
/* /*
@ -27381,13 +27381,13 @@ static int balance_nonroot(MemPage *pPage){
} }
szCell = (int*)&apCell[nMaxCells]; szCell = (int*)&apCell[nMaxCells];
aCopy[0] = (u8*)&szCell[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; i<NB; i++){ for(i=1; i<NB; i++){
aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))]; aCopy[i] = &aCopy[i-1][pBt->pageSize+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))]; 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 #ifndef SQLITE_OMIT_AUTOVACUUM
if( pBt->autoVacuum ){ if( pBt->autoVacuum ){
aFrom = &aSpace[5*pBt->pageSize]; aFrom = &aSpace[5*pBt->pageSize];
@ -27656,7 +27656,7 @@ static int balance_nonroot(MemPage *pPage){
#ifndef SQLITE_OMIT_AUTOVACUUM #ifndef SQLITE_OMIT_AUTOVACUUM
/* If this is an auto-vacuum database, update the pointer map entries /* If this is an auto-vacuum database, update the pointer map entries
** that point to the siblings that were rearranged. These can be: left ** 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. ** pointed to by cells.
*/ */
if( pBt->autoVacuum ){ 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; i<nNew; i++){ for(i=0; i<nNew; i++){
rc = reparentChildPages(apNew[i]); rc = reparentChildPages(apNew[i]);
@ -28351,7 +28351,7 @@ SQLITE_PRIVATE int sqlite3BtreeCreateTable(Btree *p, int *piTable, int flags){
} }
/* /*
** Erase the given database page and all its tqchildren. Return ** Erase the given database page and all its children. Return
** the page to the freelist. ** the page to the freelist.
*/ */
static int clearDatabasePage( static int clearDatabasePage(
@ -28811,8 +28811,8 @@ static void checkList(
** NO 3. Make sure no key is less than or equal to zLowerBound. ** NO 3. Make sure no key is less than or equal to zLowerBound.
** NO 4. Make sure no key is greater than or equal to zUpperBound. ** NO 4. Make sure no key is greater than or equal to zUpperBound.
** 5. Check the integrity of overflow pages. ** 5. Check the integrity of overflow pages.
** 6. Recursively call checkTreePage on all tqchildren. ** 6. Recursively call checkTreePage on all children.
** 7. Verify that the depth of all tqchildren is the same. ** 7. Verify that the depth of all children is the same.
** 8. Make sure this page is at least 33% full or else it is ** 8. Make sure this page is at least 33% full or else it is
** the root of the tree. ** the root of the tree.
*/ */
@ -39775,7 +39775,7 @@ static void heightOfSelect(Select *p, int *pnHeight){
/* /*
** Set the Expr.nHeight variable in the structure passed as an ** Set the Expr.nHeight variable in the structure passed as an
** argument. An expression with no tqchildren, Expr.pList or ** argument. An expression with no children, Expr.pList or
** Expr.pSelect member has a height of 1. Any other expression ** Expr.pSelect member has a height of 1. Any other expression
** has a height equal to the maximum height of any other ** has a height equal to the maximum height of any other
** referenced Expr plus one. ** referenced Expr plus one.
@ -39821,7 +39821,7 @@ SQLITE_PRIVATE void sqlite3ExprListDelete(ExprList *pList){
** Walk an expression tree. Call xFunc for each node visited. ** Walk an expression tree. Call xFunc for each node visited.
** **
** The return value from xFunc determines whether the tree walk continues. ** The return value from xFunc determines whether the tree walk continues.
** 0 means continue walking the tree. 1 means do not walk tqchildren ** 0 means continue walking the tree. 1 means do not walk children
** of the current node but continue with siblings. 2 means abandon ** of the current node but continue with siblings. 2 means abandon
** the tree walk completely. ** the tree walk completely.
** **
@ -41310,7 +41310,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
*/ */
op = ((pExpr->op+(TK_ISNULL&1))^1)-(TK_ISNULL&1); op = ((pExpr->op+(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_ISNULL || op==OP_NotNull );
assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull ); assert( pExpr->op!=TK_NOTNULL || op==OP_IsNull );
@ -46026,7 +46026,7 @@ SQLITE_PRIVATE void sqlite3CreateIndex(
sqliteFree(zStmt); sqliteFree(zStmt);
/* Fill the index with data and reparse the schema. Code an OP_Expire /* 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 ){ if( pTblName ){
sqlite3RefillIndex(pParse, pIndex, iMem); 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; if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
z2 = (char*)sqlite3_value_text(argv[0]); z2 = (char*)sqlite3_value_text(argv[0]);
n = sqlite3_value_bytes(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]) ); assert( z2==(char*)sqlite3_value_text(argv[0]) );
if( z2 ){ if( z2 ){
z1 = sqlite3_malloc(n+1); 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; if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
z2 = (char*)sqlite3_value_text(argv[0]); z2 = (char*)sqlite3_value_text(argv[0]);
n = sqlite3_value_bytes(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]) ); assert( z2==(char*)sqlite3_value_text(argv[0]) );
if( z2 ){ if( z2 ){
z1 = sqlite3_malloc(n+1); z1 = sqlite3_malloc(n+1);
@ -60019,7 +60019,7 @@ struct WhereTerm {
i16 leftColumn; /* Column number of X in "X <op> <expr>" */ i16 leftColumn; /* Column number of X in "X <op> <expr>" */
u16 eOperator; /* A WO_xx value describing <op> */ u16 eOperator; /* A WO_xx value describing <op> */
u8 flags; /* Bit flags. See below */ 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 */ WhereClause *pWC; /* The clause this term is part of */
Bitmask prereqRight; /* Bitmask of tables used by pRight */ Bitmask prereqRight; /* Bitmask of tables used by pRight */
Bitmask prereqAll; /* Bitmask of tables referenced by p */ 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, /* Check if an existing function is being overridden or deleted. If so,
** and there are active VMs, then return SQLITE_BUSY. If a function ** and there are active VMs, then return SQLITE_BUSY. If a function
** is being overridden/deleted but there are no active VMs, allow the ** 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); p = sqlite3FindFunction(db, zFunctionName, nName, nArg, enc, 0);
if( p && p->iPrefEnc==enc && p->nArg==nArg ){ 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 /* Check if this call is removing or replacing an existing collation
** sequence. If so, and there are active VMs, return busy. If there ** 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); pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, strlen(zName), 0);
if( pColl && pColl->xCmp ){ if( pColl && pColl->xCmp ){

@ -1522,7 +1522,7 @@ int sqlite3_data_count(sqlite3_stmt *pStmt);
** </ul> ** </ul>
** **
** Conversions between UTF-16be and UTF-16le are always done in place and do ** 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 ** 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 ** of conversion are done in place when it is possible, but sometime it is
** not possible and in those cases prior pointers are invalidated. ** not possible and in those cases prior pointers are invalidated.
@ -2016,7 +2016,7 @@ int sqlite3_sleep(int);
** file directory. ** file directory.
** **
** Once [sqlite3_open()] has been called, changing this variable will ** 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 ** it is not safe to invoke this routine after [sqlite3_open()] has
** been called. ** been called.
*/ */

@ -277,7 +277,7 @@ StatisticsList::renderView()
firstPlay.setTime_t( a[0].toUInt() ); firstPlay.setTime_t( a[0].toUInt() );
m_newestItem = new StatisticsItem( i18n("Newest Items"), this, m_genreItem ); 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_trackItem ->setIcon( Amarok::icon("track") );
m_mostplayedItem->setIcon( Amarok::icon("mostplayed") ); 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() ) 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].isEmpty() ? i18n( "Unknown" ) : fave[i],
fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]);
TQString score = locale->formatNumber( fave[i+3].toDouble(), 0 ); 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() ) 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].isEmpty() ? i18n( "Unknown" ) : fave[i],
fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]); fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1]);
double plays = fave[i+3].toDouble(); 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 = new StatisticsDetailedItem( name, subtext, item, m_last );
m_last->setItemType( StatisticsDetailedItem::TRACK ); m_last->setItemType( StatisticsDetailedItem::TRACK );
m_last->setUrl( fave[i+2] ); 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() ) 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] ); fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] );
TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 );
TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 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 = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last );
m_last->setItemType( StatisticsDetailedItem::ARTIST ); m_last->setItemType( StatisticsDetailedItem::ARTIST );
TQString url = TQString("%1").tqarg( fave[i] ); TQString url = TQString("%1").arg( fave[i] );
m_last->setUrl( url ); m_last->setUrl( url );
c++; c++;
} }
@ -461,7 +461,7 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh )
for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) for( uint i=0; i < fave.count(); i += qb.countReturnValues() )
{ {
const bool isSampler = (fave[i+6] == trueValue); 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], fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i],
isSampler ? i18n( "Various Artists" ) : isSampler ? i18n( "Various Artists" ) :
( fave[i+1].isEmpty() ? i18n( "Unknown" ) : fave[i+1] ) ); ( 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 = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last );
m_last->setItemType( StatisticsDetailedItem::ALBUM ); 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 ); m_last->setUrl( url );
c++; c++;
} }
@ -500,14 +500,14 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh )
for( uint i=0; i < fave.count(); i += qb.countReturnValues() ) 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] ); fave[i].isEmpty() ? i18n( "Unknown" ) : fave[i] );
TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 ); TQString score = locale->formatNumber( fave[i+1].toDouble(), 2 );
TQString rating = locale->formatNumber( fave[i+2].toDouble() / 2.0, 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 = new StatisticsDetailedItem( name, subText( score, rating ), item, m_last );
m_last->setItemType( StatisticsDetailedItem::GENRE ); m_last->setItemType( StatisticsDetailedItem::GENRE );
TQString url = TQString("%1").tqarg( fave[i] ); TQString url = TQString("%1").arg( fave[i] );
m_last->setUrl( url ); m_last->setUrl( url );
c++; c++;
} }
@ -541,33 +541,33 @@ StatisticsList::expandInformation( StatisticsItem *item, bool refresh )
for( uint i=0; i < newest.count(); i += qb.countReturnValues() ) 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].isEmpty() ? i18n( "Unknown" ) : newest[i],
newest[i+1].isEmpty() ? i18n( "Unknown" ) : newest[i+1] ); newest[i+1].isEmpty() ? i18n( "Unknown" ) : newest[i+1] );
TQDateTime added = TQDateTime(); TQDateTime added = TQDateTime();
added.setTime_t( newest[i+4].toUInt() ); 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 = new StatisticsDetailedItem( name, subtext, item, m_last );
m_last->setItemType( StatisticsDetailedItem::HISTORY ); 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 ); m_last->setUrl( url );
c++; c++;
} }
} }
item->setExpanded( true ); item->setExpanded( true );
repaintItem( item ); // Better than ::tqrepaint(), flickers less repaintItem( item ); // Better than ::repaint(), flickers less
delete locale; delete locale;
} }
TQString StatisticsList::subText( const TQString &score, const TQString &rating ) //static TQString StatisticsList::subText( const TQString &score, const TQString &rating ) //static
{ {
if( AmarokConfig::useScores() && AmarokConfig::useRatings() ) 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() ) else if( AmarokConfig::useScores() )
return i18n( "Score: %1" ).tqarg( score ); return i18n( "Score: %1" ).arg( score );
else if( AmarokConfig::useRatings() ) else if( AmarokConfig::useRatings() )
return i18n( "Rating: %1" ).tqarg( rating ); return i18n( "Rating: %1" ).arg( rating );
else else
return TQString(); return TQString();
} }
@ -735,7 +735,7 @@ StatisticsItem::slotAnimTimer()
if( m_animEnter ) if( m_animEnter )
{ {
m_animCount += 1; m_animCount += 1;
listView()->repaintItem( this ); // Better than ::tqrepaint(), flickers less listView()->repaintItem( this ); // Better than ::repaint(), flickers less
if( m_animCount >= ANIM_MAX ) if( m_animCount >= ANIM_MAX )
m_animTimer->stop(); m_animTimer->stop();

@ -135,7 +135,7 @@ class StatisticsItem : public TQObject, public KListViewItem
TQString m_subText; 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 class StatisticsDetailedItem : public KListViewItem
{ {
public: public:

@ -213,7 +213,7 @@ void PopupMessage::dissolveMask()
{ {
if( m_stage == 1 ) if( m_stage == 1 )
{ {
tqrepaint( false ); repaint( false );
TQPainter maskPainter(&m_mask); TQPainter maskPainter(&m_mask);
m_mask.fill(TQt::black); m_mask.fill(TQt::black);

@ -175,7 +175,7 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent )
const uint count = queue.count(); const uint count = queue.count();
if( length ) if( length )
menu->insertTitle( i18n( "1 Queued Track (%1)", "%n Queued Tracks (%1)", count ) menu->insertTitle( i18n( "1 Queued Track (%1)", "%n Queued Tracks (%1)", count )
.tqarg( MetaBundle::prettyLength( length, true ) ) ); .arg( MetaBundle::prettyLength( length, true ) ) );
else else
menu->insertTitle( i18n( "1 Queued Track", "%n Queued Tracks", count ) ); menu->insertTitle( i18n( "1 Queued Track", "%n Queued Tracks", count ) );
Amarok::actionCollection()->action( "queue_manager" )->plug( menu ); 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 ) for( uint n = kMin( i + MAX_TO_SHOW - 1, count ); i <= n; ++i, ++it )
menu->insertItem( 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 ) if( i < count )
{ {
@ -264,11 +264,11 @@ void QueueLabel::showToolTip()
} }
if( length ) if( length )
text += TQString("<center>%1</center>") text += TQString("<center>%1</center>")
.tqarg( i18n( "1 track (%1)", "%n tracks (%1)", count ) .arg( i18n( "1 track (%1)", "%n tracks (%1)", count )
.tqarg( MetaBundle::prettyLength( length, true ) ) ); .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 = new KDE::PopupMessage( parentWidget()->parentWidget(), this, 0 );
m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCloseButton( false );
@ -296,9 +296,9 @@ TQString QueueLabel::veryNiceTitle( PlaylistItem* item, bool bold ) const
const TQString artist = item->artist()->stripWhiteSpace(), const TQString artist = item->artist()->stripWhiteSpace(),
title = item->title().stripWhiteSpace(); title = item->title().stripWhiteSpace();
if( !artist.isEmpty() && !title.isEmpty() ) if( !artist.isEmpty() && !title.isEmpty() )
return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).tqarg( title ).tqarg( artist ); return ( bold ? i18n( "<b>%1</b> by <b>%2</b>" ) : i18n( "%1 by %2" ) ).arg( title ).arg( artist );
else else
return TQString( "<b>%1</b>" ).tqarg( MetaBundle::prettyTitle( item->filename() ) ); return TQString( "<b>%1</b>" ).arg( MetaBundle::prettyTitle( item->filename() ) );
} }

@ -126,8 +126,8 @@ class SelectLabel : public TQLabel
m_tooltipShowing = true; m_tooltipShowing = true;
TQString tip = i18n("%1: %2") TQString tip = i18n("%1: %2")
.tqarg( m_action->text().remove( '&' ) ) .arg( m_action->text().remove( '&' ) )
.tqarg( m_action->currentText().remove( '&' ) ); .arg( m_action->currentText().remove( '&' ) );
if( !isEnabled() ) if( !isEnabled() )
tip += i18n("&nbsp;<br>&nbsp;<i>Disabled</i>"); tip += i18n("&nbsp;<br>&nbsp;<i>Disabled</i>");
@ -136,7 +136,7 @@ class SelectLabel : public TQLabel
{ {
KSelectAction *a = static_cast<KSelectAction*>( Amarok::actionCollection()->action( "favor_tracks" ) ); KSelectAction *a = static_cast<KSelectAction*>( Amarok::actionCollection()->action( "favor_tracks" ) );
tip += TQString("<br><br>") + i18n("%1: %2") tip += TQString("<br><br>") + i18n("%1: %2")
.tqarg( a->text().remove( '&' ), a->currentText().remove( '&' ) ); .arg( a->text().remove( '&' ), a->currentText().remove( '&' ) );
} }
tip += "&nbsp;"; tip += "&nbsp;";

@ -127,11 +127,11 @@ void SqueezedTextLabel::squeezeTextToLabel()
} }
} }
void SqueezedTextLabel::setAlignment( int tqalignment ) void SqueezedTextLabel::setAlignment( int alignment )
{ {
// save fullText and restore it // save fullText and restore it
TQString tmpFull(fullText); TQString tmpFull(fullText);
TQLabel::setAlignment(tqalignment); TQLabel::setAlignment(alignment);
fullText = tmpFull; fullText = tmpFull;
} }

@ -183,16 +183,16 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ )
// ugly because of translation requirements // ugly because of translation requirements
if( !title.isEmpty() && !artist.isEmpty() && !album.isEmpty() ) if( !title.isEmpty() && !artist.isEmpty() && !album.isEmpty() )
title = i18n( "track by artist on album", "<b>%1</b> by <b>%2</b> on <b>%3</b>" ) title = i18n( "track by artist on album", "<b>%1</b> by <b>%2</b> on <b>%3</b>" )
.tqarg( title, artist, album ); .arg( title, artist, album );
else if( !title.isEmpty() && !artist.isEmpty() ) else if( !title.isEmpty() && !artist.isEmpty() )
title = i18n( "track by artist", "<b>%1</b> by <b>%2</b>" ) title = i18n( "track by artist", "<b>%1</b> by <b>%2</b>" )
.tqarg( title, artist ); .arg( title, artist );
else if( !album.isEmpty() ) else if( !album.isEmpty() )
// we try for pretty title as it may come out better // we try for pretty title as it may come out better
title = i18n( "track on album", "<b>%1</b> on <b>%2</b>" ) title = i18n( "track on album", "<b>%1</b> on <b>%2</b>" )
.tqarg( prettyTitle, album ); .arg( prettyTitle, album );
else else
title = "<b>" + prettyTitle + "</b>"; title = "<b>" + prettyTitle + "</b>";
@ -206,7 +206,7 @@ StatusBar::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ )
title += ')'; title += ')';
} }
setMainText( i18n( "Playing: %1" ).tqarg( title ) ); setMainText( i18n( "Playing: %1" ).arg( title ) );
m_slider->newBundle( bundle ); m_slider->newBundle( bundle );
engineTrackLengthChanged( bundle.length() ); engineTrackLengthChanged( bundle.length() );
@ -220,10 +220,10 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total
const bool hasSel = ( selCount > 1 ), hasVis = ( visCount != newCount ); const bool hasSel = ( selCount > 1 ), hasVis = ( visCount != newCount );
TQString text = ( hasSel && hasVis ) ? i18n( "%1 selected of %2 visible tracks" ) 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 && newCount == 1 ) ? i18n( "0 visible of 1 track" )
: ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).tqarg( visCount).tqarg( newCount ) : ( hasVis ) ? i18n( "%1 visible of %2 tracks" ).arg( visCount).arg( newCount )
: ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).tqarg( selCount ).tqarg( newCount ) : ( hasSel ) ? i18n( "%1 selected of %2 tracks" ).arg( selCount ).arg( newCount )
: i18n( "1 track", "%n tracks", newCount ); : i18n( "1 track", "%n tracks", newCount );
int getValue = 0; int getValue = 0;
@ -238,11 +238,11 @@ StatusBar::slotItemCountChanged( int newCount, int newLength, //total
getValue = newLength; getValue = newLength;
if( getValue ) 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 else
m_itemCountLabel->setText( text ); 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 void

@ -123,7 +123,7 @@ class ToggleLabel : public TQLabel
m_tooltip->setShowCloseButton( false ); m_tooltip->setShowCloseButton( false );
m_tooltip->setShowCounter( false ); m_tooltip->setShowCounter( false );
m_tooltip->setMaskEffect( KDE::PopupMessage::Plain ); 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->setImage( path );
m_tooltip->reposition(); m_tooltip->reposition();

@ -26,7 +26,7 @@ namespace Amarok
static TQPixmap static TQPixmap
loadOverlay( const char *iconName, int iconWidth ) 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() ) if( AmarokConfig::animateTrayIcon() )
blinkTimerID = startTimer( 1500 ); // start 'blink' timer blinkTimerID = startTimer( 1500 ); // start 'blink' timer
paintIcon( mergeLevel, true ); // tqrepaint the icon paintIcon( mergeLevel, true ); // repaint the icon
break; break;
case Engine::Empty: case Engine::Empty:
overlayVisible = false; overlayVisible = false;
paintIcon( -1, true ); // tqrepaint the icon paintIcon( -1, true ); // repaint the icon
// fall through to default: // fall through to default:
default: default:
setLastFm( false ); setLastFm( false );

@ -38,7 +38,7 @@ private:
// repaints trayIcon showing progress (and overlay if present) // repaints trayIcon showing progress (and overlay if present)
void paintIcon( int mergePixels = -1, bool force = false ); 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 ); void blendOverlay( TQPixmap &sourcePixmap );
long trackLength, mergeLevel; long trackLength, mergeLevel;

@ -309,7 +309,7 @@ TagDialog::queryDone( KTRMResultList results, TQString error ) //SLOT
#if HAVE_TUNEPIMP #if HAVE_TUNEPIMP
if ( !error.isEmpty() ) { 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 { else {
if ( !results.isEmpty() ) if ( !results.isEmpty() )
@ -629,21 +629,21 @@ void TagDialog::readTags()
{ {
bool local = m_bundle.url().isLocalFile(); 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; TQString niceTitle;
if ( m_bundle.album().isEmpty() ) { if ( m_bundle.album().isEmpty() ) {
if( !m_bundle.title().isEmpty() ) { if( !m_bundle.title().isEmpty() ) {
if( !m_bundle.artist().isEmpty() ) if( !m_bundle.artist().isEmpty() )
niceTitle = i18n( "<b>%1</b> by <b>%2</b>" ).tqarg( m_bundle.title(), m_bundle.artist() ); niceTitle = i18n( "<b>%1</b> by <b>%2</b>" ).arg( m_bundle.title(), m_bundle.artist() );
else else
niceTitle = TQString( "<b>%1</b>" ).tqarg( m_bundle.title() ); niceTitle = TQString( "<b>%1</b>" ).arg( m_bundle.title() );
} }
else niceTitle = m_bundle.prettyTitle(); else niceTitle = m_bundle.prettyTitle();
} }
else { else {
niceTitle = i18n( "<b>%1</b> by <b>%2</b> on <b>%3</b>" ) niceTitle = i18n( "<b>%1</b> by <b>%2</b> on <b>%3</b>" )
.tqarg( m_bundle.title(), m_bundle.artist(), m_bundle.album() ); .arg( m_bundle.title(), m_bundle.artist(), m_bundle.album() );
} }
trackArtistAlbumLabel->setText( niceTitle ); trackArtistAlbumLabel->setText( niceTitle );
trackArtistAlbumLabel2->setText( niceTitle ); trackArtistAlbumLabel2->setText( niceTitle );
@ -671,22 +671,22 @@ void TagDialog::readTags()
const TQString emptyLine = "<tr><td colspan=2></td></tr>"; const TQString emptyLine = "<tr><td colspan=2></td></tr>";
summaryText = "<table width=100%><tr><td width=50%><table>"; summaryText = "<table width=100%><tr><td width=50%><table>";
summaryText += body2cols.tqarg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) ); summaryText += body2cols.arg( i18n("Length"), unknownSafe( m_bundle.prettyLength() ) );
summaryText += body2cols.tqarg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) ); summaryText += body2cols.arg( i18n("Bitrate"), unknownSafe( m_bundle.prettyBitrate() ) );
summaryText += body2cols.tqarg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) ); summaryText += body2cols.arg( i18n("Samplerate"), unknownSafe( m_bundle.prettySampleRate() ) );
summaryText += body2cols.tqarg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) ); summaryText += body2cols.arg( i18n("Size"), unknownSafe( m_bundle.prettyFilesize() ) );
summaryText += body2cols.tqarg( i18n("Format"), unknownSafe( m_bundle.type() ) ); summaryText += body2cols.arg( i18n("Format"), unknownSafe( m_bundle.type() ) );
summaryText += "</table></td><td width=50%><table>"; summaryText += "</table></td><td width=50%><table>";
if( AmarokConfig::useScores() ) if( AmarokConfig::useScores() )
summaryText += body2cols.tqarg( i18n("Score"), TQString::number( static_cast<int>( m_bundle.score() ) ) ); summaryText += body2cols.arg( i18n("Score"), TQString::number( static_cast<int>( m_bundle.score() ) ) );
if( AmarokConfig::useRatings() ) 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.arg( i18n("Playcount"), TQString::number( m_bundle.playCount() ) );
summaryText += body2cols.tqarg( i18n("First Played"), summaryText += body2cols.arg( i18n("First Played"),
m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getFirstPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") ); 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") ); m_bundle.playCount() ? KGlobal::locale()->formatDate( CollectionDB::instance()->getLastPlay( m_bundle.url().path() ).date() , true ) : i18n("Never") );
summaryText += "</table></td></tr></table>"; summaryText += "</table></td></tr></table>";
@ -696,7 +696,7 @@ void TagDialog::readTags()
TQStringList sData = statisticsData(); TQStringList sData = statisticsData();
for ( uint i = 0; i<sData.count(); i+=2 ) { for ( uint i = 0; i<sData.count(); i+=2 ) {
statisticsText += body2cols.tqarg( sData[i], sData[i+1] ); statisticsText += body2cols.arg( sData[i], sData[i+1] );
} }
statisticsText += "</table>"; statisticsText += "</table>";
@ -916,15 +916,15 @@ TagDialog::readMultipleTracks()
TQString statisticsText = "<table>"; TQString statisticsText = "<table>";
if( AmarokConfig::useRatings() ) { if( AmarokConfig::useRatings() ) {
statisticsText += body.tqarg( i18n( "Rated Songs" ) , TQString::number( ratingCount ) ); statisticsText += body.arg( i18n( "Rated Songs" ) , TQString::number( ratingCount ) );
if ( ratingCount ) if ( ratingCount )
statisticsText += body.tqarg( i18n( "Average Rating" ) , TQString::number( (float)ratingSum / (float)ratingCount/2.0, 'f', 1 ) ); statisticsText += body.arg( i18n( "Average Rating" ) , TQString::number( (float)ratingSum / (float)ratingCount/2.0, 'f', 1 ) );
} }
if( AmarokConfig::useRatings() ) { if( AmarokConfig::useRatings() ) {
statisticsText += body.tqarg( i18n( "Scored Songs" ) , TQString::number( scoreCount ) ); statisticsText += body.arg( i18n( "Scored Songs" ) , TQString::number( scoreCount ) );
if ( scoreCount ) if ( scoreCount )
statisticsText += body.tqarg( i18n( "Average Score" ) , TQString::number( scoreSum / scoreCount, 'f', 1 ) ); statisticsText += body.arg( i18n( "Average Score" ) , TQString::number( scoreSum / scoreCount, 'f', 1 ) );
} }
@ -1388,7 +1388,7 @@ TagDialog::generateHTML( const TQStringList &labels )
if ( labelUse == 0 ) if ( labelUse == 0 )
labelUse = 1; labelUse = 1;
html.append( TQString( "<span class='label size%1'><a href=\"label:%2\">%3</a></span> " ) html.append( TQString( "<span class='label size%1'><a href=\"label:%2\">%3</a></span> " )
.tqarg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) ); .arg( TQString::number( labelUse ), mapping[key].first, mapping[key].first ) );
} }
html.append( "</html></body>" ); html.append( "</html></body>" );
debug() << "Dumping HTML for label cloud: " << html << endl; 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() ); TQCString path = TQFile::encodeName( mb.url().path() );
if ( !TagLib::File::isWritable( path ) ) { if ( !TagLib::File::isWritable( path ) ) {
Amarok::StatusBar::instance()->longMessage( i18n( 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; return false;
} }
@ -1458,7 +1458,7 @@ TagDialogWriter::doJob()
TQCString path = TQFile::encodeName( m_tags[i].url().path() ); TQCString path = TQFile::encodeName( m_tags[i].url().path() );
if ( !TagLib::File::isWritable( path ) ) { if ( !TagLib::File::isWritable( path ) ) {
Amarok::StatusBar::instance()->longMessageThreadSafe( i18n( 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; m_failed += true;
continue; continue;
} }
@ -1491,7 +1491,7 @@ TagDialogWriter::completeJob()
CollectionView::instance()->databaseChanged(); CollectionView::instance()->databaseChanged();
if ( m_failCount ) if ( m_failCount )
Amarok::StatusBar::instance()->longMessage( i18n( 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 );
} }

@ -189,7 +189,7 @@
<property name="text"> <property name="text">
<string>Track by Artist on Album</string> <string>Track by Artist on Album</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -231,7 +231,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>
@ -627,7 +627,7 @@
<property name="text"> <property name="text">
<string>Track by Artist on Album</string> <string>Track by Artist on Album</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -655,7 +655,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignTop</set> <set>WordBreak|AlignTop</set>
</property> </property>
</widget> </widget>

@ -375,7 +375,7 @@ public:
* *
* It is only safe to have one dependent, if you depend on multiple objects * 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 * 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 * top-most parent or best of all would be to make copies of the data you
* need instead of being dependent. * need instead of being dependent.
*/ */

@ -34,7 +34,7 @@
<property name="title"> <property name="title">
<string>File Name</string> <string>File Name</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
<hbox> <hbox>
@ -53,7 +53,7 @@
<property name="text"> <property name="text">
<string></string> <string></string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignLeft</set> <set>AlignVCenter|AlignLeft</set>
</property> </property>
<property name="indent"> <property name="indent">
@ -79,7 +79,7 @@
<property name="title"> <property name="title">
<string>Select Best Possible Match</string> <string>Select Best Possible Match</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
<vbox> <vbox>

@ -114,14 +114,14 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force )
TQString s; TQString s;
for( int i = 0; i < rating / 2; ++i ) for( int i = 0; i < rating / 2; ++i )
s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
.tqarg( locate( "data", "amarok/images/star.png" ) ) .arg( locate( "data", "amarok/images/star.png" ) )
.tqarg( TQFontMetrics( TQToolTip::font() ).height() ) .arg( TQFontMetrics( TQToolTip::font() ).height() )
.tqarg( TQFontMetrics( TQToolTip::font() ).height() ); .arg( TQFontMetrics( TQToolTip::font() ).height() );
if( rating % 2 ) if( rating % 2 )
s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) s += TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
.tqarg( locate( "data", "amarok/images/smallstar.png" ) ) .arg( locate( "data", "amarok/images/smallstar.png" ) )
.tqarg( TQFontMetrics( TQToolTip::font() ).height() ) .arg( TQFontMetrics( TQToolTip::font() ).height() )
.tqarg( TQFontMetrics( TQToolTip::font() ).height() ); .arg( TQFontMetrics( TQToolTip::font() ).height() );
right << s; right << s;
left << playlist->columnText( column ); left << playlist->columnText( column );
} }
@ -163,7 +163,7 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force )
} }
right << TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" ) right << TQString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
.tqarg( filename ).tqarg( height ).tqarg( MOODBAR_WIDTH ); .arg( filename ).arg( height ).arg( MOODBAR_WIDTH );
} }
break; break;
@ -237,10 +237,10 @@ void TrackToolTip::setTrack( const MetaBundle &tags, bool force )
if (tags.title().isEmpty() || tags.artist().isEmpty()) if (tags.title().isEmpty() || tags.artist().isEmpty())
// no title or no artist, so we add prettyTitle // no title or no artist, so we add prettyTitle
m_tooltip += TQString ("<tr><td align=center colspan='2'>%1</td></tr>") m_tooltip += TQString ("<tr><td align=center colspan='2'>%1</td></tr>")
.tqarg(tags.veryNiceTitle()); .arg(tags.veryNiceTitle());
for( uint x = 0; x < left.count(); ++x ) for( uint x = 0; x < left.count(); ++x )
if ( !right[x].isEmpty() ) if ( !right[x].isEmpty() )
m_tooltip += tableRow.tqarg( left[x] ).tqarg( right[x] ); m_tooltip += tableRow.arg( left[x] ).arg( right[x] );
m_tooltip += "</table></td>"; m_tooltip += "</table></td>";
m_tooltip += "</tr></table></center>"; m_tooltip += "</tr></table></center>";
@ -332,13 +332,13 @@ TQString TrackToolTip::tooltip() const
if( !m_tags.isEmpty() ) if( !m_tags.isEmpty() )
{ {
if( !m_cover.isEmpty() ) if( !m_cover.isEmpty() )
tip = tip.tqarg( TQString( "<td><table cellpadding='0' cellspacing='0'><tr><td>" tip = tip.arg( TQString( "<td><table cellpadding='0' cellspacing='0'><tr><td>"
"<img src='%1'>" "<img src='%1'>"
"</td></tr></table></td>" ).tqarg( m_cover ) ); "</td></tr></table></td>" ).arg( m_cover ) );
else else
tip = tip.tqarg(""); tip = tip.arg("");
if( m_haspos ) if( m_haspos )
tip = tip.tqarg( MetaBundle::prettyLength( m_pos / 1000, true ) ); tip = tip.arg( MetaBundle::prettyLength( m_pos / 1000, true ) );
} }
return tip; return tip;
} }

@ -45,7 +45,7 @@ TransferDialog::TransferDialog( MediaDevice *mdev )
TQGroupBox *location = new TQGroupBox( 1, Qt::Vertical, i18n( "Music Location" ), vbox ); TQGroupBox *location = new TQGroupBox( 1, Qt::Vertical, i18n( "Music Location" ), vbox );
new TQLabel( i18n( "Your music will be transferred to:\n%1" ) new TQLabel( i18n( "Your music will be transferred to:\n%1" )
.tqarg( transferDir ), location ); .arg( transferDir ), location );
TQVBox *vbox2 = new TQVBox( vbox ); TQVBox *vbox2 = new TQVBox( vbox );
TQSpacerItem *spacer = new TQSpacerItem( 0, 25 ); TQSpacerItem *spacer = new TQSpacerItem( 0, 25 );

@ -213,7 +213,7 @@ bool MetaBundle::XmlLoader::fatalError( const TQXmlParseException &e )
bundleLoaded(); bundleLoaded();
m_lastError = TQString( "Error loading XML: \"%1\", at line %2, column %3." ) 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() ); errorEncountered( e.message(), e.lineNumber(), e.columnNumber() );
return false; return false;

Loading…
Cancel
Save