@@ -265,10 +265,10 @@ namespace Amarok
Amarok::CrashHandlerWidget::CrashHandlerWidget()
{
- TQBoxLayout *tqlayout = new TQHBoxLayout( this, 18, 12 );
+ TQBoxLayout *layout = new TQHBoxLayout( this, 18, 12 );
{
- TQBoxLayout *lay = new TQVBoxLayout( tqlayout );
+ TQBoxLayout *lay = new TQVBoxLayout( layout );
TQLabel *label = new TQLabel( this );
label->setPixmap( locate( "data", "drkonqi/pics/konqi.png" ) );
label->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@@ -276,9 +276,9 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
lay->addItem( new TQSpacerItem( 3, 3, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
}
- tqlayout = new TQVBoxLayout( tqlayout, 6 );
+ layout = new TQVBoxLayout( layout, 6 );
- tqlayout->add( new TQLabel( /*i18n*/(
+ layout->add( new TQLabel( /*i18n*/(
"" "Amarok has crashed! We are terribly sorry about this :("
"
" "However you now have an opportunity to help us fix this crash so that it doesn't "
"happen again! Click Send Email and Amarok will prepare an email that you "
@@ -286,11 +286,11 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
"as soon as possible."
"
" "Thanks for choosing Amarok.
" ), this ) );
- tqlayout = new TQHBoxLayout( tqlayout, 6 );
+ layout = new TQHBoxLayout( layout, 6 );
- tqlayout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
- tqlayout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
- tqlayout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
+ layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
+ layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
+ layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
static_cast(child("email"))->setDefault( true );
@@ -298,6 +298,6 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
connect( child( "close" ), TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
setCaption( i18n("Crash Handler") );
- setFixedSize( tqsizeHint() );
+ setFixedSize( sizeHint() );
}
#endif
diff --git a/amarok/src/analyzers/analyzerfactory.cpp b/amarok/src/analyzers/analyzerfactory.cpp
index 2016656b..28d5f7b3 100644
--- a/amarok/src/analyzers/analyzerfactory.cpp
+++ b/amarok/src/analyzers/analyzerfactory.cpp
@@ -73,7 +73,7 @@ TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *parent )
case 5:
#endif
analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
- static_cast(analyzer)->tqsetAlignment( TQt::AlignCenter );
+ static_cast(analyzer)->setAlignment( TQt::AlignCenter );
break;
default:
@@ -114,7 +114,7 @@ TQWidget *Analyzer::Factory::createPlaylistAnalyzer( TQWidget *parent)
case 4:
#endif
analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
- static_cast(analyzer)->tqsetAlignment( TQt::AlignCenter );
+ static_cast(analyzer)->setAlignment( TQt::AlignCenter );
break;
default:
diff --git a/amarok/src/analyzers/baranalyzer.h b/amarok/src/analyzers/baranalyzer.h
index 4bb4e3f3..6eb470c8 100644
--- a/amarok/src/analyzers/baranalyzer.h
+++ b/amarok/src/analyzers/baranalyzer.h
@@ -21,7 +21,7 @@ class BarAnalyzer : public Analyzer::Base2D
//virtual void transform( Scope& );
/**
- * Resizes the widget to a new tqgeometry according to @p e
+ * Resizes the widget to a new geometry according to @p e
* @param e The resize-event
*/
void resizeEvent( TQResizeEvent * e);
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 1ebfdf0f..e6d75dea 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -354,7 +354,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 )
void
BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
{
- const TQColor bg = tqpalette().active().background();
+ const TQColor bg = palette().active().background();
const TQColor fg = ensureContrast( bg, KGlobalSettings::activeTitleColor() );
m_topBarPixmap.fill( fg );
@@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, TQColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) );
{
- const TQColor bg = tqpalette().active().background().dark( 112 );
+ const TQColor bg = palette().active().background().dark( 112 );
//make a complimentary fadebar colour
//TODO dark is not always correct, dumbo!
- int h,s,v; tqpalette().active().background().dark( 150 ).getHsv( &h, &s, &v );
+ int h,s,v; palette().active().background().dark( 150 ).getHsv( &h, &s, &v );
const TQColor fg( h + 120, s, v, TQColor::Hsv );
const double dr = fg.red() - bg.red();
@@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
// Precalculate all fade-bar pixmaps
for( uint y = 0; y < FADE_SIZE; ++y ) {
- m_fade_bars[y].fill( tqpalette().active().background() );
+ m_fade_bars[y].fill( palette().active().background() );
TQPainter f( &m_fade_bars[y] );
for( int z = 0; (uint)z < m_rows; ++z ) {
const double Y = 1.0 - (log10( FADE_SIZE - y ) / log10( FADE_SIZE ));
@@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
void
BlockAnalyzer::drawBackground()
{
- const TQColor bg = tqpalette().active().background();
+ const TQColor bg = palette().active().background();
const TQColor bgdark = bg.dark( 112 );
background()->fill( bg );
@@ -430,7 +430,7 @@ BlockAnalyzer::contextMenuEvent( TQContextMenuEvent *e )
{
const uint v = ids[x];
- menu.insertItem( i18n( "%1 fps" ).tqarg( 1000/v ), v );
+ menu.insertItem( i18n( "%1 fps" ).arg( 1000/v ), v );
menu.setItemChecked( v, v == timeout() );
}
diff --git a/amarok/src/analyzers/boomanalyzer.cpp b/amarok/src/analyzers/boomanalyzer.cpp
index 3505c82c..02f77351 100644
--- a/amarok/src/analyzers/boomanalyzer.cpp
+++ b/amarok/src/analyzers/boomanalyzer.cpp
@@ -5,7 +5,7 @@
#include "boomanalyzer.h"
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index ee726662..b798fdbe 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -72,7 +72,7 @@ email : markey@web.de
#include //applySettings()
#include
#include //applyColorScheme()
-#include //applyColorScheme()
+#include //applyColorScheme()
#include //TQPixmap::setDefaultOptimization()
#include //genericEventHandler
#include //showHyperThreadingWarning()
@@ -96,7 +96,7 @@ int App::mainThreadId = 0;
static AEEventHandlerUPP appleEventProcessorUPP = 0;
-OStqStatus
+OSStatus
appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/)
{
OSType aeID = typeWildCard;
@@ -576,7 +576,7 @@ void App::showHyperThreadingWarning() // SLOT
#include
#include
-#include
+#include
//this class is only used in this module, so I figured I may as well define it
//here and save creating another header/source file combination
@@ -675,7 +675,7 @@ void App::applySettings( bool firstTime )
//Set the caption correctly.
if ( !EngineController::instance()->bundle().prettyTitle().isEmpty() )
- m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( EngineController::instance()->bundle().veryNiceTitle() ) );
+ m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( EngineController::instance()->bundle().veryNiceTitle() ) );
else
m_pPlaylistWindow->setCaption( "Amarok" );
@@ -871,7 +871,7 @@ App::applyColorScheme()
else if( AmarokConfig::schemeAmarok() )
{
- group = TQApplication::tqpalette().active();
+ group = TQApplication::palette().active();
const TQColor bg( Amarok::blue );
AltBase.setRgb( 57, 64, 98 );
@@ -906,7 +906,7 @@ App::applyColorScheme()
Background = 0x002090;
Foreground = 0x80A0FF;
- //all tqchildren() derive their palette from this
+ //all children() derive their palette from this
playlistWindow()->setPalette( TQPalette( group, group, group ) );
browserBar->unsetPalette();
contextBrowser->setPalette( TQPalette( group, group, group ) );
@@ -916,7 +916,7 @@ App::applyColorScheme()
{
// we try to be smart: this code figures out contrasting colors for
// selection and alternate background rows
- group = TQApplication::tqpalette().active();
+ group = TQApplication::palette().active();
const TQColor fg( AmarokConfig::playlistWindowFgColor() );
const TQColor bg( AmarokConfig::playlistWindowBgColor() );
@@ -1084,7 +1084,7 @@ void App::engineStateChanged( Engine::State state, Engine::State oldState )
if ( oldState == Engine::Paused )
Amarok::OSD::instance()->OSDWidget::show( i18n( "state, as in playing", "Play" ) );
if ( !bundle.prettyTitle().isEmpty() )
- m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) );
+ m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
break;
case Engine::Paused:
@@ -1106,7 +1106,7 @@ void App::engineNewMetaData( const MetaBundle &bundle, bool /*trackChanged*/ )
{
Amarok::OSD::instance()->show( bundle );
if ( !bundle.prettyTitle().isEmpty() )
- m_pPlaylistWindow->setCaption( i18n("Amarok - %1").tqarg( bundle.veryNiceTitle() ) );
+ m_pPlaylistWindow->setCaption( i18n("Amarok - %1").arg( bundle.veryNiceTitle() ) );
TrackToolTip::instance()->setTrack( bundle );
}
@@ -1313,7 +1313,7 @@ namespace Amarok
{
//URL can be in whatever forms KURL::fromPathOrURL understands - ie most.
const TQString cmd = "%1 \"%2\"";
- return KRun::runCommand( cmd.tqarg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0;
+ return KRun::runCommand( cmd.arg( AmarokConfig::externalBrowser(), KURL::fromPathOrURL( url ).url() ) ) > 0;
}
namespace ColorScheme
@@ -1325,7 +1325,7 @@ namespace Amarok
TQColor AltBase;
}
- OverrideCursor::OverrideCursor( TQt::tqCursorShape cursor )
+ OverrideCursor::OverrideCursor( TQt::CursorShape cursor )
{
TQApplication::setOverrideCursor( cursor == TQt::WaitCursor ? KCursor::waitCursor() : KCursor::workingCursor() );
}
diff --git a/amarok/src/atomicstring.cpp b/amarok/src/atomicstring.cpp
index ced1b89a..297f5b3c 100644
--- a/amarok/src/atomicstring.cpp
+++ b/amarok/src/atomicstring.cpp
@@ -82,7 +82,7 @@ TQString AtomicString::string() const
TQString AtomicString::deepCopy() const
{
if (m_string)
- return TQString( m_string->tqunicode(), m_string->length() );
+ return TQString( m_string->unicode(), m_string->length() );
return TQString();
}
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index e2c6365b..af3aab2f 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -44,12 +44,12 @@ namespace Amarok
virtual void paintEvent( TQPaintEvent* )
{
TQPainter p( this );
- parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal );
+ parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
}
virtual void styleChange( TQStyle& )
{
- setFixedWidth( tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ) );
+ setFixedWidth( tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ) );
}
virtual void mouseMoveEvent( TQMouseEvent *e )
@@ -81,12 +81,12 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_tabBar = new MultiTabBar( MultiTabBar::Vertical, this );
- m_tabManagementButton->setFixedWidth(m_tabBar->tqsizeHint().width());
- m_tabManagementButton->setFixedHeight(m_tabBar->tqsizeHint().width());
+ m_tabManagementButton->setFixedWidth(m_tabBar->sizeHint().width());
+ m_tabManagementButton->setFixedHeight(m_tabBar->sizeHint().width());
s_instance = this;
- m_pos = m_tabBar->tqsizeHint().width() + 5; //5 = esthetic spacing
+ m_pos = m_tabBar->sizeHint().width() + 5; //5 = esthetic spacing
m_tabBar->setStyle( MultiTabBar::AMAROK );
m_tabBar->setPosition( MultiTabBar::Left );
@@ -94,9 +94,9 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_tabBar->setFixedWidth( m_pos );
m_tabBar->move( 0, 25 );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( m_browserBox );
- tqlayout->addSpacing( 3 ); // aesthetics
- tqlayout->setAutoAdd( true );
+ TQVBoxLayout *layout = new TQVBoxLayout( m_browserBox );
+ layout->addSpacing( 3 ); // aesthetics
+ layout->setAutoAdd( true );
m_browserBox->move( m_pos, 0 );
m_browserBox->hide();
@@ -133,7 +133,7 @@ int
BrowserBar::restoreWidth()
{
const int index = indexForName( Amarok::config( "BrowserBar" )->readEntry( "CurrentPane" ) );
- const int width = Amarok::config( "BrowserBar" )->readNumEntry( "Width", browser( index )->tqsizeHint().width() );
+ const int width = Amarok::config( "BrowserBar" )->readNumEntry( "Width", browser( index )->sizeHint().width() );
m_browserBox->resize( width, height() );
m_pos = m_browserBox->width() + m_tabBar->width();
@@ -170,7 +170,7 @@ BrowserBar::polish()
void
BrowserBar::adjustWidgetSizes()
{
- //TODO set the tqgeometry of the PlaylistWindow before
+ //TODO set the geometry of the PlaylistWindow before
// the browsers are loaded so this isn't called twice
const uint w = width();
diff --git a/amarok/src/clicklineedit.cpp b/amarok/src/clicklineedit.cpp
index 934b7fb9..6e74e6db 100644
--- a/amarok/src/clicklineedit.cpp
+++ b/amarok/src/clicklineedit.cpp
@@ -40,14 +40,14 @@ ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char*
void ClickLineEdit::setClickMessage( const TQString &msg )
{
mClickMessage = msg;
- tqrepaint();
+ repaint();
}
void ClickLineEdit::setText( const TQString &txt )
{
mDrawClickMsg = txt.isEmpty();
- tqrepaint();
+ repaint();
KLineEdit::setText( txt );
}
@@ -86,7 +86,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
{
if ( mDrawClickMsg == true ) {
mDrawClickMsg = false;
- tqrepaint();
+ repaint();
}
TQLineEdit::focusInEvent( ev );
}
@@ -96,7 +96,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
{
if ( text().isEmpty() ) {
mDrawClickMsg = true;
- tqrepaint();
+ repaint();
}
TQLineEdit::focusOutEvent( ev );
}
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 5ff26a78..6d7ab8ec 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -40,7 +40,7 @@
#include
#include
#include
-#include //infobox
+#include //infobox
#include
#include
#include
@@ -128,7 +128,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
m_timeFilter = new KComboBox( m_ipodHbox, "timeFilter" );
m_ipodHbox->setStretchFactor( m_timeFilter, 1 );
// Allow the combobox to shrink so the iPod buttons are still visible
- m_timeFilter->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ m_timeFilter->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
m_timeFilter->insertItem( i18n( "Entire Collection" ) );
m_timeFilter->insertItem( i18n( "Added Today" ) );
m_timeFilter->insertItem( i18n( "Added Within One Week" ) );
@@ -415,7 +415,7 @@ CollectionBrowser::layoutToolbar()
m_configureAction->plug( m_toolbar );
//This would break things if the toolbar is too big, see bug #121915
- //setMinimumWidth( m_toolbar->tqsizeHint().width() + 2 ); //set a reasonable minWidth
+ //setMinimumWidth( m_toolbar->sizeHint().width() + 2 ); //set a reasonable minWidth
}
@@ -785,7 +785,7 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT
ensureItemVisible( lastChild() );
//Create a reverse list of parents, grandparents etc.
- //Later we try to make the grandparents in view, then their tqchildren etc.
+ //Later we try to make the grandparents in view, then their children etc.
//This means that the selected item has the most priority as it is done last.
TQValueStack parents;
while ( r )
@@ -864,7 +864,7 @@ CollectionView::slotExpand( TQListViewItem* item ) //SLOT
}
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
TQString itemText;
bool isUnknown;
@@ -1175,7 +1175,7 @@ CollectionView::slotCollapse( TQListViewItem* item ) //SLOT
TQListViewItem* child = item->firstChild();
TQListViewItem* childTmp;
- //delete all tqchildren
+ //delete all children
while ( child )
{
childTmp = child;
@@ -1471,7 +1471,7 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
if( (cat == IdAlbum || cat == IdVisYearAlbum) && siblingSelection.count() == 1 ) // cover fetch isn't multiselection capable
{
- menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).tqarg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH );
+ menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch Cover From amazon.%1" ).arg( CoverManager::amazonTld() ), this, TQT_SLOT( fetchCover() ), 0, FETCH );
#ifndef AMAZON_SUPPORT
menu.setItemEnabled( FETCH, false );
#endif
@@ -1698,7 +1698,7 @@ CollectionView::fetchCover() //SLOT
"SELECT DISTINCT artist.name FROM artist, album, tags "
"WHERE artist.id = tags.artist AND tags.album = album.id "
"AND album.name = '%1';" )
- .tqarg( CollectionDB::instance()->escapeString( album ) ) );
+ .arg( CollectionDB::instance()->escapeString( album ) ) );
if ( !values.isEmpty() )
CollectionDB::instance()->fetchCover( this, values[0], album, false, static_cast(item) );
@@ -2220,7 +2220,7 @@ KURL::List
CollectionView::listSelected()
{
//Here we determine the URLs of all selected items. We use two passes, one for the parent items,
- //and another one for the tqchildren.
+ //and another one for the children.
KURL::List list;
TQListViewItem* item;
@@ -2266,7 +2266,7 @@ CollectionView::listSelected()
// The iPod selection code is written to resemble the tree mode
// selection logic, as well as what happens on an actual iPod. If
// we're in track mode, just return the list of tracks selected.
- // Otherwise select all tqchildren of all currently selected items,
+ // Otherwise select all children of all currently selected items,
// sorting first by m_cat1, then m_cat2, then m_cat3. Sort by
// track first if one of the categories is Id(VisYear)Album.
// There is a difficulty with compilation albums -- if we're
@@ -2335,7 +2335,7 @@ CollectionView::listSelected()
buildIpodQuery( qb, trackDepth(), filters, filterYear, true, true );
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.setOptions( QueryBuilder::optOnlyCompilations );
qb.setGoogleFilter( tables | QueryBuilder::tabSong, m_filter );
@@ -2350,7 +2350,7 @@ CollectionView::listSelected()
buildIpodQuery( qb, trackDepth(), filters, filterYear, true, false );
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
if( sortByTrackFirst )
qb.setOptions( QueryBuilder::optNoCompilations );
@@ -2385,7 +2385,7 @@ CollectionView::listSelected()
const bool sampler = static_cast( item )->isSampler();
qb.clear();
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
@@ -2461,7 +2461,7 @@ CollectionView::listSelected()
const bool sampler = static_cast( item )->isSampler();
qb.clear();
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
@@ -2565,7 +2565,7 @@ CollectionView::listSelected()
const bool sampler = static_cast( item )->isSampler();
qb.clear();
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.addReturnValue( QueryBuilder::tabSong, QueryBuilder::valURL );
@@ -2693,7 +2693,7 @@ CollectionView::playlistFromURLs( const KURL::List &urls )
KURL rpath;
MountPointManager::instance()->getRelativePath( deviceid, *it, rpath );
const TQString query = TQString("SELECT title, length FROM tags WHERE url = '%1' AND deviceid = %2;")
- .tqarg( db->escapeString( rpath.path() ) ).tqarg( deviceid );
+ .arg( db->escapeString( rpath.path() ) ).arg( deviceid );
debug() << "media id: " << deviceid << " rpath: " << rpath.path() << endl;
TQStringList result = db->query( query );
titles << result[0];
@@ -3483,7 +3483,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse )
if( reverse )
{
TQString begin = str.left( 3 );
- str = TQString(str.append( ", %1" )).tqarg( begin );
+ str = TQString(str.append( ", %1" )).arg( begin );
str = str.mid( 4 );
return;
}
@@ -3492,7 +3492,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse )
return;
TQString end = str.right( 3 );
- str = TQString(str.prepend( "%1 " )).tqarg( end );
+ str = TQString(str.prepend( "%1 " )).arg( end );
uint newLen = str.length() - end.length() - 2;
@@ -3502,7 +3502,7 @@ CollectionView::manipulateThe( TQString &str, bool reverse )
bool
CollectionView::endsInThe( const TQString & text )
{
- return text.tqendsWith( ", the", false );
+ return text.endsWith( ", the", false );
}
// avoid code duplication
@@ -3539,9 +3539,9 @@ CollectionView::viewportPaintEvent( TQPaintEvent *e )
const uint w = t.width() + 20;
const uint h = t.height() + 20;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
- t.draw( &p, 20, 20, TQRect(), tqcolorGroup() );
+ t.draw( &p, 20, 20, TQRect(), colorGroup() );
}
}
@@ -3710,7 +3710,7 @@ CollectionView::renderFlatModeView( bool /*=false*/ )
QueryBuilder qb;
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
if ( translateTimeFilter( timeFilter() ) <= 0
&& (m_filter.length() < 3 || (!m_filter.contains( " " ) && m_filter.endsWith( ":" ) ) ) )
@@ -3883,7 +3883,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
QueryBuilder qb;
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
setSorting( 0 );
int VisYearAlbum = -1;
@@ -3985,7 +3985,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
//Dividers for "The Who" should be created as "W", not "T", because
//that's how we sort it
TQString actualStr = *it;
- if ( m_cat1 == IdArtist && actualStr.tqstartsWith( "the ", false ) )
+ if ( m_cat1 == IdArtist && actualStr.startsWith( "the ", false ) )
manipulateThe( actualStr, true );
TQString headerStr = DividerItem::createGroup( actualStr, m_cat1);
@@ -4020,7 +4020,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
qb.clear();
if ( translateTimeFilter( timeFilter() ) > 0 )
qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate,
- TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() -
+ TQString().setNum( TQDateTime::currentDateTime().toTime_t() -
translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
qb.addReturnValue( q_cat1, QueryBuilder::valName, true );
@@ -4061,7 +4061,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
continue;
couldOpen.push_back( top );
}
- //Expand suggested items and expand or enqueue their tqchildren until we run out of
+ //Expand suggested items and expand or enqueue their children until we run out of
//rows or have expanded everything
for ( TQValueList::iterator it = couldOpen.begin(); it != couldOpen.end() && totalCount < maxRows; ++it )
{
@@ -4080,7 +4080,7 @@ CollectionView::renderTreeModeView( bool /*=false*/ )
}
else
{
- //Prioritize expanding its tqchildren - add it immediately next
+ //Prioritize expanding its children - add it immediately next
TQValueList::iterator next = it;
++next;
couldOpen.insert( next, j );
@@ -4131,9 +4131,9 @@ CollectionView::removeDuplicatedHeaders()
{
if ( empty )
{
- if ( !current->text(0).tqat(0).isLetterOrNumber()
- || ( last->text(0).tqat(0).isLetterOrNumber()
- && current->text(0).tqat(0).tqunicode() > last->text(0).tqat(0).tqunicode() ) )
+ if ( !current->text(0).at(0).isLetterOrNumber()
+ || ( last->text(0).at(0).isLetterOrNumber()
+ && current->text(0).at(0).unicode() > last->text(0).at(0).unicode() ) )
toDelete += current;
else
{
@@ -4174,7 +4174,7 @@ CollectionView::renderIpodModeView( bool /*=false*/ )
QueryBuilder qb;
if ( translateTimeFilter( timeFilter() ) > 0 )
- qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::tqcurrentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
+ qb.addFilter( QueryBuilder::tabSong, QueryBuilder::valCreateDate, TQString().setNum( TQDateTime::currentDateTime().toTime_t() - translateTimeFilter( timeFilter() ) ), QueryBuilder::modeGreater );
int catArr[3] = {m_cat1, m_cat2, m_cat3};
// stillFiltering is true when we're not viewing tracks
@@ -4300,7 +4300,7 @@ CollectionView::renderIpodModeView( bool /*=false*/ )
//because that's how we sort it
TQString actualStr = item->text( 0 );
if ( m_cat == IdArtist &&
- actualStr.tqstartsWith( "the ", false ) )
+ actualStr.startsWith( "the ", false ) )
manipulateThe( actualStr, true );
TQString headerStr = DividerItem::createGroup( actualStr, m_cat );
@@ -4366,7 +4366,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg,
TQPixmap buf( width, height() );
TQPainter p( &buf, true );
- const TQColorGroup _cg = listView()->tqpalette().active();
+ const TQColorGroup _cg = listView()->palette().active();
TQColor bg = isSelected() ? _cg.highlight()
: isAlternate() ? listView()->alternateBackground()
@@ -4510,9 +4510,9 @@ CollectionItem::compare( TQListViewItem* i, int col, bool ascending ) const
return -1;
//For artists, we sort by ignoring "The" eg "The Who" sorts as if it were "Who"
case IdArtist:
- if ( a.tqstartsWith( "the ", false ) )
+ if ( a.startsWith( "the ", false ) )
CollectionView::manipulateThe( a, true );
- if ( b.tqstartsWith( "the ", false ) )
+ if ( b.startsWith( "the ", false ) )
CollectionView::manipulateThe( b, true );
break;
}
@@ -4698,7 +4698,7 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr,
}
case IdArtist:
//"The Who" should count as being in "W" and not "T"
- if ( tmp.tqstartsWith( "the ", false ) )
+ if ( tmp.startsWith( "the ", false ) )
CollectionView::manipulateThe( tmp, true );
//Fall through
default:
@@ -4706,7 +4706,7 @@ DividerItem::shareTheSameGroup(const TQString& itemStr, const TQString& divStr,
if (divStr == "0-9" && TQChar(tmp.at(0)).isDigit()) {
inGroup = true;
}
- else if (tmp.tqstartsWith(divStr, 0)) {
+ else if (tmp.startsWith(divStr, 0)) {
inGroup = true;
}
}
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index e95df956..7d88ef8b 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -47,7 +47,7 @@
#include //setHTMLLyrics()
#include
#include //createDragPixmap()
-#include
+#include
#include //debugging, can be removed later
#include //setHTMLLyrics()
@@ -145,7 +145,7 @@ INotify::doJob()
deviceIds += TQString::number(*it);
}
const TQStringList values = m_parent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" )
- .tqarg( deviceIds ) );
+ .arg( deviceIds ) );
foreach( values )
{
TQString rpath = *it;
@@ -509,7 +509,7 @@ TQString
CollectionDB::adminValue( TQString noption ) {
TQStringList values;
values = query (
- TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg(noption)
+ TQString( "SELECT value FROM admin WHERE noption = '%1';").arg(noption)
);
return values.isEmpty() ? "" : values.first();
}
@@ -518,14 +518,14 @@ CollectionDB::adminValue( TQString noption ) {
void
CollectionDB::setAdminValue( TQString noption, TQString value ) {
- TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").tqarg( noption ));
+ TQStringList values = query( TQString( "SELECT value FROM admin WHERE noption = '%1';").arg( noption ));
if(values.count() > 0)
{
- query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).tqarg( value, noption ) );
+ query( TQString( "UPDATE admin SET value = '%1' WHERE noption = '%2';" ).arg( value, noption ) );
}
else
{
- insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).tqarg( value, noption ),
+ insert( TQString( "INSERT INTO admin (value, noption) values ( '%1', '%2' );" ).arg( value, noption ),
NULL );
}
}
@@ -560,8 +560,8 @@ CollectionDB::createTables( const bool temporary )
"sampler BOOL,"
"bpm FLOAT,"
"deviceid INTEGER);" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" ) );
TQString albumAutoIncrement = "";
TQString artistAutoIncrement = "";
@@ -598,41 +598,41 @@ CollectionDB::createTables( const bool temporary )
query( TQString( "CREATE %1 TABLE album%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( albumAutoIncrement ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" )
+ .arg( albumAutoIncrement ) );
//create artist table
query( TQString( "CREATE %1 TABLE artist%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( artistAutoIncrement ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" )
+ .arg( artistAutoIncrement ) );
//create composer table
query( TQString( "CREATE %1 TABLE composer%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( composerAutoIncrement ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" )
+ .arg( composerAutoIncrement ) );
//create genre table
query( TQString( "CREATE %1 TABLE genre%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() +");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( genreAutoIncrement ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" )
+ .arg( genreAutoIncrement ) );
//create year table
query( TQString( "CREATE %1 TABLE year%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( yearAutoIncrement ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" )
+ .arg( yearAutoIncrement ) );
//create images table
query( TQString( "CREATE %1 TABLE images%2 ("
@@ -640,8 +640,8 @@ CollectionDB::createTables( const bool temporary )
"deviceid INTEGER,"
"artist " + textColumnType() + ","
"album " + textColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" ) );
//create embed table
query( TQString( "CREATE %1 TABLE embed%2 ("
@@ -649,16 +649,16 @@ CollectionDB::createTables( const bool temporary )
"deviceid INTEGER,"
"hash " + exactTextColumnType() + ","
"description " + textColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" ) );
// create directory statistics table
query( TQString( "CREATE %1 TABLE directories%2 ("
"dir " + exactTextColumnType() + ","
"deviceid INTEGER,"
"changedate INTEGER);" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" ) );
//create uniqueid table
query( TQString( "CREATE %1 TABLE uniqueid%2 ("
@@ -666,20 +666,20 @@ CollectionDB::createTables( const bool temporary )
"deviceid INTEGER,"
"uniqueid " + exactTextColumnType(32) + " UNITQUE,"
"dir " + exactTextColumnType() + ");" )
- .tqarg( temporary ? "TEMPORARY" : "" )
- .tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "TEMPORARY" : "" )
+ .arg( temporary ? "_temp" : "" ) );
//create indexes
query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" )
- .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) );
query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" )
- .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) );
query( TQString( "CREATE INDEX composer_idx%1 ON composer%2( name );" )
- .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) );
query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" )
- .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) );
query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" )
- .tqarg( temporary ? "_temp" : "" ).tqarg( temporary ? "_temp" : "" ) );
+ .arg( temporary ? "_temp" : "" ).arg( temporary ? "_temp" : "" ) );
if ( !temporary )
{
@@ -791,16 +791,16 @@ CollectionDB::createPermanentIndices()
void
CollectionDB::dropTables( const bool temporary )
{
- query( TQString( "DROP TABLE tags%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE album%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE artist%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE composer%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE genre%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE year%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE images%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE embed%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE directories%1;" ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "DROP TABLE uniqueid%1;" ).tqarg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE tags%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE album%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE artist%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE composer%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE genre%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE year%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE images%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE embed%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE directories%1;" ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "DROP TABLE uniqueid%1;" ).arg( temporary ? "_temp" : "" ) );
if ( !temporary )
{
query( TQString( "DROP TABLE related_artists;" ) );
@@ -830,21 +830,21 @@ CollectionDB::clearTables( const bool temporary )
clearCommand = "TRUNCATE TABLE";
}
- query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 composer%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 embed%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
- query( TQString( "%1 uniqueid%2;" ).tqarg( clearCommand ).tqarg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 composer%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 embed%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
+ query( TQString( "%1 uniqueid%2;" ).arg( clearCommand ).arg( temporary ? "_temp" : "" ) );
if ( !temporary )
{
- query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) );
+ query( TQString( "%1 related_artists;" ).arg( clearCommand ) );
//debug() << "Clearing media table" << endl;
- //query( TQString( "%1 media;" ).tqarg( clearCommand ) );
+ //query( TQString( "%1 media;" ).arg( clearCommand ) );
}
}
@@ -866,7 +866,7 @@ CollectionDB::copyTempTables( )
albumIds += ',';
albumIds += *it;
}
- insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).tqarg( albumIds ), NULL );
+ insert( TQString ( "INSERT INTO album SELECT * FROM album_temp WHERE album_temp.id NOT IN ( %1 );" ).arg( albumIds ), NULL );
TQStringList artistIdList = query( "SELECT artist.id FROM artist;" );
TQString artistIds = "-1";
@@ -875,7 +875,7 @@ CollectionDB::copyTempTables( )
artistIds += ',';
artistIds += *it;
}
- insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).tqarg( artistIds ), NULL );
+ insert( TQString ( "INSERT INTO artist SELECT * FROM artist_temp WHERE artist_temp.id NOT IN ( %1 );" ).arg( artistIds ), NULL );
TQStringList composerIdList = query( "SELECT composer.id FROM composer;" );
TQString composerIds = "-1";
@@ -884,7 +884,7 @@ CollectionDB::copyTempTables( )
composerIds += ',';
composerIds += *it;
}
- insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).tqarg( composerIds ), NULL );
+ insert( TQString ( "INSERT INTO composer SELECT * FROM composer_temp WHERE composer_temp.id NOT IN ( %1 );" ).arg( composerIds ), NULL );
TQStringList genreIdList = query( "SELECT genre.id FROM genre;" );
TQString genreIds = "-1";
@@ -893,7 +893,7 @@ CollectionDB::copyTempTables( )
genreIds += ',';
genreIds += *it;
}
- insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).tqarg( genreIds ), NULL );
+ insert( TQString ( "INSERT INTO genre SELECT * FROM genre_temp WHERE genre_temp.id NOT IN ( %1 );" ).arg( genreIds ), NULL );
TQStringList yearIdList = query( "SELECT year.id FROM year;" );
TQString yearIds = "-1";
@@ -902,7 +902,7 @@ CollectionDB::copyTempTables( )
yearIds += ',';
yearIds += *it;
}
- insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).tqarg( yearIds ), NULL );
+ insert( TQString ( "INSERT INTO year SELECT * FROM year_temp WHERE year_temp.id NOT IN ( %1 );" ).arg( yearIds ), NULL );
insert( "INSERT INTO images SELECT * FROM images_temp;", NULL );
insert( "INSERT INTO embed SELECT * FROM embed_temp;", NULL );
@@ -943,7 +943,7 @@ CollectionDB::createDevicesTable()
"uuid " + textColumnType() + ","
"servername " + textColumnType() + ","
"sharename " + textColumnType() + ");" )
- .tqarg( deviceAutoIncrement ) );
+ .arg( deviceAutoIncrement ) );
query( "CREATE INDEX devices_type ON devices( type );" );
query( "CREATE INDEX devices_uuid ON devices( uuid );" );
query( "CREATE INDEX devices_rshare ON devices( servername, sharename );" );
@@ -1005,8 +1005,8 @@ CollectionDB::createStatsTableV10( bool temp )
"uniqueid " + exactTextColumnType(32) + " UNITQUE,"
"deleted BOOL DEFAULT " + boolF() + ","
"PRIMARY KEY(url, deviceid) );"
- ).tqarg( temp ? "TEMPORARY" : "" )
- .tqarg( temp ? "_fix_ten" : "" ) );
+ ).arg( temp ? "TEMPORARY" : "" )
+ .arg( temp ? "_fix_ten" : "" ) );
if ( !temp )
{
@@ -1120,18 +1120,18 @@ CollectionDB::createPersistentTablesV14( bool temp )
"asin " + textColumnType(20) + ", "
"locale " + textColumnType(2) + ", "
"filename " + exactTextColumnType(33) + ", "
- "refetchdate INTEGER );" ).tqarg( a,b ) );
+ "refetchdate INTEGER );" ).arg( a,b ) );
// create lyrics table
query( TQString( "CREATE %1 TABLE lyrics%2 ("
"url " + exactTextColumnType() + ", "
"deviceid INTEGER,"
- "lyrics " + longTextColumnType() + ");" ).tqarg( a,b ) );
+ "lyrics " + longTextColumnType() + ");" ).arg( a,b ) );
query( TQString( "CREATE %1 TABLE playlists%2 ("
"playlist " + textColumnType() + ", "
"url " + exactTextColumnType() + ", "
- "tracknum INTEGER );" ).tqarg( a,b ) );
+ "tracknum INTEGER );" ).arg( a,b ) );
if ( !temp )
{
@@ -1190,14 +1190,14 @@ CollectionDB::createPodcastTables()
"length INTEGER,"
"size INTEGER,"
"isNew BOOL );" )
- .tqarg( podcastAutoIncrement ) );
+ .arg( podcastAutoIncrement ) );
// create podcast folders table
query( TQString( "CREATE TABLE podcastfolders ("
"id INTEGER PRIMARY KEY %1, "
"name " + textColumnType() + ","
"parent INTEGER, isOpen BOOL );" )
- .tqarg( podcastFolderAutoInc ) );
+ .arg( podcastFolderAutoInc ) );
query( "CREATE INDEX url_podchannel ON podcastchannels( url );" );
query( "CREATE INDEX url_podepisode ON podcastepisodes( url );" );
@@ -1239,7 +1239,7 @@ CollectionDB::createPodcastTablesV2( bool temp )
"parent INTEGER,"
"directory " + textColumnType() + ","
"autoscan BOOL, fetchtype INTEGER, "
- "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).tqarg( a,b ) );
+ "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).arg( a,b ) );
// create podcast episodes table
query( TQString( "CREATE %2 TABLE podcastepisodes%3 ("
@@ -1257,14 +1257,14 @@ CollectionDB::createPodcastTablesV2( bool temp )
"length INTEGER,"
"size INTEGER,"
"isNew BOOL );" )
- .tqarg( podcastAutoIncrement, a, b ) );
+ .arg( podcastAutoIncrement, a, b ) );
// create podcast folders table
query( TQString( "CREATE %2 TABLE podcastfolders%3 ("
"id INTEGER PRIMARY KEY %1, "
"name " + textColumnType() + ","
"parent INTEGER, isOpen BOOL );" )
- .tqarg( podcastFolderAutoInc, a, b ) );
+ .arg( podcastFolderAutoInc, a, b ) );
if ( !temp )
{
@@ -1475,16 +1475,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const
TQStringList values =
query( TQString(
"SELECT id, name FROM %1 WHERE name %2;" )
- .tqarg( name )
- .tqarg( CollectionDB::likeCondition( value ) ) );
+ .arg( name )
+ .arg( CollectionDB::likeCondition( value ) ) );
//check if item exists. if not, should we autocreate it?
uint id;
if ( values.isEmpty() && autocreate )
{
id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" )
- .tqarg( name )
- .tqarg( CollectionDB::instance()->escapeString( value ) ), name );
+ .arg( name )
+ .arg( CollectionDB::instance()->escapeString( value ) ), name );
return id;
}
@@ -1499,8 +1499,8 @@ CollectionDB::valueFromID( TQString table, uint id )
TQStringList values =
query( TQString(
"SELECT name FROM %1 WHERE id=%2;" )
- .tqarg( table )
- .tqarg( id ) );
+ .arg( table )
+ .arg( id ) );
return values.isEmpty() ? 0 : values.first();
@@ -1513,8 +1513,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i
TQStringList values =
query( TQString(
"SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" )
- .tqarg( album_id )
- .tqarg( artist_id ) );
+ .arg( album_id )
+ .arg( artist_id ) );
return values.first();
}
@@ -1524,8 +1524,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id )
TQStringList values =
query( TQString(
"SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" )
- .tqarg( CollectionDB::instance()->boolT() )
- .tqarg( album_id ) );
+ .arg( CollectionDB::instance()->boolT() )
+ .arg( album_id ) );
return (values.count() != 0);
}
@@ -1562,9 +1562,9 @@ CollectionDB::albumDiscTracks( const TQString &artist_id, const TQString &album_
rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, year WHERE tags.album = %1 AND "
"tags.artist = %2 AND year.id = tags.year AND tags.discnumber = %3 "
+ deviceidSelection() + " ORDER BY tags.track;" )
- .tqarg( album_id )
- .tqarg( artist_id )
- .tqarg( discNumber ) );
+ .arg( album_id )
+ .arg( artist_id )
+ .arg( discNumber ) );
TQStringList result;
foreach( rs )
{
@@ -1580,7 +1580,7 @@ CollectionDB::artistTracks( const TQString &artist_id )
TQStringList rs = query( TQString( "SELECT tags.deviceid, tags.url FROM tags, album "
"WHERE tags.artist = '%1' AND album.id = tags.album " + deviceidSelection() +
"ORDER BY album.name, tags.discnumber, tags.track;" )
- .tqarg( artist_id ) );
+ .arg( artist_id ) );
TQStringList result = TQStringList();
foreach( rs )
{
@@ -1602,11 +1602,11 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPairgetIdForUrl( path );
TQString rpath = MountPointManager::instance()->getRelativePath(deviceid, path );
insert( TQString( "INSERT INTO embed_temp ( url, deviceid, hash, description ) VALUES ( '%2', %1, '%3', '%4' );" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL );
+ .arg( deviceid )
+ .arg( escapeString( rpath ), escapeString( hash ), escapeString( description ) ), NULL );
}
void
@@ -1636,7 +1636,7 @@ CollectionDB::removeOrphanedEmbeddedImages()
TQString deviceid = *it;
TQString rpath = *(++it);
query( TQString( "DELETE FROM embed WHERE embed.deviceid = %1 AND embed.url = '%2';" )
- .tqarg( deviceid, escapeString( rpath ) ) );
+ .arg( deviceid, escapeString( rpath ) ) );
}
}
@@ -1752,11 +1752,11 @@ CollectionDB::createDragPixmap( const KURL::List &urls, TQString textOverRide )
{
if( correctAlbumCount ) {
text = i18n( "X songs from X albums", "%2 from %1" );
- text = text.tqarg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) );
+ text = text.arg( albums == 1 && !album.isEmpty() ? album : i18n( "one album", "%n albums",albums ) );
}
else
text = "%1";
- text = text.tqarg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) );
+ text = text.arg( songs == 1 && !song.isEmpty() ? song : i18n( "One song", "%n songs", songs ) );
}
else if( playlists > 0 )
text = i18n( "One playlist", "%n playlists", playlists );
@@ -2082,7 +2082,7 @@ CollectionDB::makeShadowedImage( const TQString& albumImage, bool cache )
TQImage shadow;
const TQString folder = Amarok::saveLocation( "covershadow-cache/" );
- const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( original.width() + shadowSize ).tqarg( original.height() + shadowSize );
+ const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( original.width() + shadowSize ).arg( original.height() + shadowSize );
if ( TQFile::exists( folder + file ) ) {
tqApp->lock();
shadow.load( folder + file, "PNG" );
@@ -2168,17 +2168,17 @@ CollectionDB::findDirectoryImage( const TQString& artist, const TQString& album,
"AND tags.sampler = %1 "
"AND images.album %2 "
"AND images.deviceid IN (%3) " )
- .tqarg( boolT() )
- .tqarg( CollectionDB::likeCondition( album ) )
- .tqarg( deviceIds ) );
+ .arg( boolT() )
+ .arg( CollectionDB::likeCondition( album ) )
+ .arg( deviceIds ) );
}
else
{
rs = query( TQString(
"SELECT distinct images.deviceid,images.path FROM images WHERE artist %1 AND album %2 AND deviceid IN (%3) ORDER BY path;" )
- .tqarg( CollectionDB::likeCondition( artist ) )
- .tqarg( CollectionDB::likeCondition( album ) )
- .tqarg( deviceIds ) );
+ .arg( CollectionDB::likeCondition( artist ) )
+ .arg( CollectionDB::likeCondition( album ) )
+ .arg( deviceIds ) );
}
TQStringList values = URLsFromQuery( rs );
if ( !values.isEmpty() )
@@ -2234,8 +2234,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album,
"album.name = '%1' "
"AND tags.sampler = %2 "
"ORDER BY modifydate DESC LIMIT 1;" )
- .tqarg( escapeString( album ) )
- .tqarg( boolT() ) );
+ .arg( escapeString( album ) )
+ .arg( boolT() ) );
} else {
rs = query( TQString(
"SELECT embed.hash, embed.deviceid, embed.url FROM "
@@ -2246,8 +2246,8 @@ CollectionDB::findEmbeddedImage( const TQString& artist, const TQString& album,
"artist.name = '%1' "
"AND album.name = '%2' "
"ORDER BY modifydate DESC LIMIT 1;" )
- .tqarg( escapeString( artist ) )
- .tqarg( escapeString( album ) ) );
+ .arg( escapeString( artist ) )
+ .arg( escapeString( album ) ) );
}
TQStringList values = TQStringList();
@@ -2282,7 +2282,7 @@ CollectionDB::findMetaBundleImage( const MetaBundle& trackInformation, uint widt
query( TQString(
"SELECT embed.hash FROM tags LEFT JOIN embed ON tags.url = embed.url "
" AND tags.deviceid = embed.deviceid WHERE tags.url = '%2' AND tags.deviceid = %1 ORDER BY hash DESC LIMIT 1;" )
- .tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( deviceid ).arg( escapeString( rpath ) ) );
if ( values.empty() || !values.first().isEmpty() ) {
TQCString hash;
@@ -2638,7 +2638,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int
//This is a bit of a hack. We have just inserted an item, so it is going to be the one with the
//highest id. Change this if threaded insertions are used in the future.
TQStringList values = query( TQString("SELECT id FROM podcastepisodes WHERE url='%1' ORDER BY id DESC;")
- .tqarg( escapeString( episode.url().url() ) ) );
+ .arg( escapeString( episode.url().url() ) ) );
if( values.isEmpty() ) return -1;
return values[0].toInt();
@@ -2679,12 +2679,12 @@ CollectionDB::getPodcastChannels()
TQValueList
CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit )
{
- TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).tqarg( parent.url() );
+ TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).arg( parent.url() );
if( onlyNew )
- command += TQString( " AND isNew='%1'" ).tqarg( boolT() );
+ command += TQString( " AND isNew='%1'" ).arg( boolT() );
command += " ) ORDER BY id";
if( limit != -1 )
- command += TQString( " DESC LIMIT %1 OFFSET 0" ).tqarg( limit );
+ command += TQString( " DESC LIMIT %1 OFFSET 0" ).arg( limit );
command += ';';
TQStringList values = query( command );
@@ -2722,7 +2722,7 @@ CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit )
PodcastEpisodeBundle
CollectionDB::getPodcastEpisodeById( int id )
{
- TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").tqarg( id );
+ TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").arg( id );
TQStringList values = query( command );
PodcastEpisodeBundle peb;
@@ -2759,7 +2759,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe
{
TQStringList values =
query( TQString( "SELECT id FROM podcastepisodes WHERE localurl = '%1';" )
- .tqarg( escapeString( url.url() ) ) );
+ .arg( escapeString( url.url() ) ) );
if( !values.isEmpty() )
id = values[0].toInt();
}
@@ -2767,7 +2767,7 @@ CollectionDB::getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *pe
{
TQStringList values =
query( TQString( "SELECT id FROM podcastepisodes WHERE url = '%1';" )
- .tqarg( escapeString( url.url() ) ) );
+ .arg( escapeString( url.url() ) ) );
if( !values.isEmpty() )
id = values[0].toInt();
}
@@ -2787,7 +2787,7 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc
TQStringList values = query( TQString(
"SELECT url, title, weblink, image, comment, copyright, parent, directory "
", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels WHERE url = '%1';"
- ).tqarg( escapeString( url.url() ) ) );
+ ).arg( escapeString( url.url() ) ) );
foreach( values )
{
@@ -2822,7 +2822,7 @@ CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const
insert( command, NULL );
command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND parent = '%2';" )
- .tqarg( name, TQString::number(parent_id) );
+ .arg( name, TQString::number(parent_id) );
TQStringList values = query( command );
return values[0].toInt();
@@ -2918,10 +2918,10 @@ CollectionDB::removePodcastChannel( const KURL &url )
{
//remove channel
query( TQString( "DELETE FROM podcastchannels WHERE url = '%1';" )
- .tqarg( escapeString( url.url() ) ) );
- //remove all tqchildren
+ .arg( escapeString( url.url() ) ) );
+ //remove all children
query( TQString( "DELETE FROM podcastepisodes WHERE parent = '%1';" )
- .tqarg( escapeString( url.url() ) ) );
+ .arg( escapeString( url.url() ) ) );
}
@@ -2931,7 +2931,7 @@ CollectionDB::removePodcastEpisode( const int id )
{
if( id < 0 ) return;
query( TQString( "DELETE FROM podcastepisodes WHERE id = '%1';" )
- .tqarg( TQString::number(id) ) );
+ .arg( TQString::number(id) ) );
}
void
@@ -2939,7 +2939,7 @@ CollectionDB::removePodcastFolder( const int id )
{
if( id < 0 ) return;
query( TQString("DELETE FROM podcastfolders WHERE id=%1;")
- .tqarg( TQString::number(id) ) );
+ .arg( TQString::number(id) ) );
}
bool
@@ -3047,7 +3047,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
"SELECT url, uniqueid "
"FROM uniqueid%1 "
"WHERE deviceid = %2 AND url = '%3';" )
- .tqarg( tempTables ? "_temp" : ""
+ .arg( tempTables ? "_temp" : ""
, currdeviceid
, currurl ) );
@@ -3055,20 +3055,20 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
"SELECT url, uniqueid, deviceid "
"FROM uniqueid%1 "
"WHERE uniqueid = '%2';" )
- .tqarg( tempTables ? "_temp" : ""
+ .arg( tempTables ? "_temp" : ""
, currid ) );
TQStringList nonTempIDs = query( TQString(
"SELECT url, uniqueid, deviceid "
"FROM uniqueid "
"WHERE uniqueid = '%1';" )
- .tqarg( currid ) );
+ .arg( currid ) );
TQStringList nonTempURLs = query( TQString(
"SELECT url, uniqueid "
"FROM uniqueid "
"WHERE deviceid = %1 AND url = '%2';" )
- .tqarg( currdeviceid
+ .arg( currdeviceid
, currurl ) );
bool tempTablesAndInPermanent = false;
@@ -3122,7 +3122,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
else //it's a move, not a copy, or a copy and then both files were moved...can't detect that
{
//debug() << "stat was NOT successful, updating tables with: " << endl;
- //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).tqarg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl;
+ //debug() << TQString( "UPDATE uniqueid%1 SET url='%2', dir='%3' WHERE uniqueid='%4';" ).arg( ( tempTables ? "_temp" : "" ), currurl, currdir, currid ) << endl;
query( QStringx( "UPDATE uniqueid%1 SET deviceid = %2, url='%3', dir='%4' WHERE uniqueid='%5';" )
.args( TQStringList()
<< ( tempTables ? "_temp" : "" )
@@ -3142,7 +3142,7 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
{
//debug() << "file exists in same place as before, new uniqueid" << endl;
query( TQString( "UPDATE uniqueid%1 SET uniqueid='%2' WHERE deviceid = %3 AND url='%4';" )
- .tqarg( tempTables ? "_temp" : ""
+ .arg( tempTables ? "_temp" : ""
, currid
, currdeviceid
, currurl ) );
@@ -3161,9 +3161,9 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
{
TQString insertline = TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) "
"VALUES ( %1, '%2'" )
- .tqarg( currdeviceid
+ .arg( currdeviceid
, currurl );
- insertline += TQString( ", '%1', '%2');" ).tqarg( currid ).tqarg( currdir );
+ insertline += TQString( ", '%1', '%2');" ).arg( currid ).arg( currdir );
//debug() << "running command: " << insertline << endl;
insert( insertline, NULL );
//debug() << "aftCheckPermanentTables #2" << endl;
@@ -3187,10 +3187,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
{
//debug() << "stat part 2 was NOT successful, updating tables with: " << endl;
query( TQString( "DELETE FROM uniqueid WHERE uniqueid='%1';" )
- .tqarg( currid ) );
+ .arg( currid ) );
query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) "
"VALUES ( %1, '%2', '%3', '%4')" )
- .tqarg( currdeviceid
+ .arg( currdeviceid
, currurl
, currid
, currdir ) );
@@ -3202,10 +3202,10 @@ CollectionDB::doAFTStuff( MetaBundle* bundle, const bool tempTables )
{
//debug() << "file exists in same place as before, part 2, new uniqueid" << endl;
query( TQString( "DELETE FROM uniqueid WHERE deviceid = %1 AND url='%2';" )
- .tqarg( currdeviceid )
- .tqarg( currurl ) );
+ .arg( currdeviceid )
+ .arg( currurl ) );
query( TQString( "INSERT INTO uniqueid_temp (deviceid, url, uniqueid, dir) VALUES ( %1, '%2', '%3', '%4')" )
- .tqarg( currdeviceid
+ .arg( currdeviceid
, currurl
, currid
, currdir ) );
@@ -3242,15 +3242,15 @@ CollectionDB::urlFromUniqueId( const TQString &id )
"SELECT deviceid, url "
"FROM uniqueid%1 "
"WHERE uniqueid = '%2';" )
- .tqarg( scanning ? "_temp" : TQString() )
- .tqarg( id ), true );
+ .arg( scanning ? "_temp" : TQString() )
+ .arg( id ), true );
if( urls.empty() && scanning )
urls = query( TQString(
"SELECT deviceid, url "
"FROM uniqueid "
"WHERE uniqueid = '%1';" )
- .tqarg( id ) );
+ .arg( id ) );
if( urls.empty() )
return TQString();
@@ -3270,17 +3270,17 @@ CollectionDB::uniqueIdFromUrl( const KURL &url )
"SELECT uniqueid "
"FROM uniqueid%1 "
"WHERE deviceid = %2 AND url = '%3';" )
- .tqarg( scanning ? "_temp" : TQString() )
- .tqarg( currdeviceid )
- .tqarg( currurl ), true );
+ .arg( scanning ? "_temp" : TQString() )
+ .arg( currdeviceid )
+ .arg( currurl ), true );
if( uid.empty() && scanning )
uid = query( TQString(
"SELECT uniqueid "
"FROM uniqueid "
"WHERE deviceid = %1 AND url = '%2';" )
- .tqarg( currdeviceid )
- .tqarg( currurl ) );
+ .arg( currdeviceid )
+ .arg( currurl ) );
if( uid.empty() )
return TQString();
@@ -3303,10 +3303,10 @@ CollectionDB::getURL( const MetaBundle &bundle )
"FROM tags "
"WHERE tags.album = '%1' AND tags.artist = '%2' AND tags.track = '%3' AND tags.title = '%4'" +
deviceidSelection() + ';' )
- .tqarg( albID )
- .tqarg( artID )
- .tqarg( bundle.track() )
- .tqarg( escapeString( bundle.title() ) );
+ .arg( albID )
+ .arg( artID )
+ .arg( bundle.track() )
+ .arg( escapeString( bundle.title() ) );
TQStringList urls = URLsFromQuery( query( q ) );
@@ -3443,8 +3443,8 @@ CollectionDB::bundleForUrl( MetaBundle* bundle )
"album, artist, composer, genre, year "
"WHERE album.id = tags.album AND artist.id = tags.artist AND composer.id = tags.composer AND "
"genre.id = tags.genre AND year.id = tags.year AND tags.url = '%2' AND tags.deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath.path( ) ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath.path( ) ) ) );
bool valid = false;
@@ -3577,7 +3577,7 @@ CollectionDB::bundlesByUrls( const KURL::List& urls )
b.setUrl( url );
// FIXME: more context for i18n after string freeze
b.setTitle( TQString( "%1 %2 %3%4" )
- .tqarg( url.filename(),
+ .arg( url.filename(),
i18n( "from" ),
url.hasHost() ? url.host() : TQString(),
url.directory( false ) ) );
@@ -3633,11 +3633,11 @@ CollectionDB::addAudioproperties( const MetaBundle& bundle )
KURL rpath;
MountPointManager::instance()->getRelativePath( deviceid, bundle.url(), rpath );
query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%5' AND deviceid = %4;" )
- .tqarg( bundle.bitrate() )
- .tqarg( bundle.length() )
- .tqarg( bundle.sampleRate() )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath.path() ) ) );
+ .arg( bundle.bitrate() )
+ .arg( bundle.length() )
+ .arg( bundle.sampleRate() )
+ .arg( deviceid )
+ .arg( escapeString( rpath.path() ) ) );
}
@@ -3655,7 +3655,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage,
query( TQString(
"SELECT playcounter, createdate, percentage, rating FROM statistics "
"WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( statDevId ).tqarg( escapeString( statRPath ) ) );
+ .arg( statDevId ).arg( escapeString( statRPath ) ) );
//handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1
if ( values.isEmpty() )
@@ -3664,7 +3664,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage,
values = query( TQString(
"SELECT playcounter, createdate, percentage, rating FROM statistics "
"WHERE url = '%1' AND deviceid = -1;" )
- .tqarg( escapeString( rpath2 ) ) );
+ .arg( escapeString( rpath2 ) ) );
if ( !values.isEmpty() )
{
statRPath = rpath2;
@@ -3672,7 +3672,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage,
}
}
- uint atime = playtime ? playtime->toTime_t() : TQDateTime::tqcurrentDateTime().toTime_t();
+ uint atime = playtime ? playtime->toTime_t() : TQDateTime::currentDateTime().toTime_t();
// check boundaries
if ( percentage > 100.f ) percentage = 100.f;
@@ -3683,21 +3683,21 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage,
// increment playcounter and update accesstime
query( TQString( "UPDATE statistics SET playcounter=%1, accessdate=%2 WHERE url='%4' AND deviceid= %3;" )
- .tqarg( values[0] + " + 1" )
- .tqarg( atime )
- .tqarg( statDevId )
- .tqarg( escapeString( statRPath ) ) );
+ .arg( values[0] + " + 1" )
+ .arg( atime )
+ .arg( statDevId )
+ .arg( escapeString( statRPath ) ) );
}
else
{
insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) "
"VALUES ( '%6', %5, %1, %2, 0, 1, 0, %3, %4 );" )
- .tqarg( atime )
- .tqarg( atime )
- .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
- .tqarg( boolF() )
- .tqarg( statDevId )
- .tqarg( escapeString( statRPath ) ), 0 );
+ .arg( atime )
+ .arg( atime )
+ .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
+ .arg( boolF() )
+ .arg( statDevId )
+ .arg( escapeString( statRPath ) ), 0 );
}
double prevscore = 50;
@@ -3711,7 +3711,7 @@ CollectionDB::addSongPercentage( const TQString &url, float percentage,
prevscore = values[ 2 ].toDouble();
}
const TQStringList v = query( TQString( "SELECT length FROM tags WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( deviceid ).arg( escapeString( rpath ) ) );
const int length = v.isEmpty() ? 0 : v.first().toInt();
ScriptManager::instance()->requestNewScore( url, prevscore, playcount, length, percentage, reason );
@@ -3756,7 +3756,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage)
TQStringList values =
query( TQString(
"SELECT playcounter, createdate, accessdate, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( deviceid ).arg( escapeString( rpath ) ) );
//handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1
if ( values.isEmpty() )
@@ -3765,7 +3765,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage)
values = query( TQString(
"SELECT playcounter, createdate, accessdate, rating FROM statistics "
"WHERE url = '%1' AND deviceid = -1;" )
- .tqarg( escapeString( rpath2 ) ) );
+ .arg( escapeString( rpath2 ) ) );
if ( !values.isEmpty() )
{
rpath = rpath2;
@@ -3780,20 +3780,20 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage)
if ( !values.isEmpty() )
{
query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%3' AND deviceid = %2;" )
- .tqarg( percentage )
- .tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( percentage )
+ .arg( deviceid ).arg( escapeString( rpath ) ) );
}
else
{
insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, playcounter, rating, uniqueid, deleted ) "
"VALUES ( '%7', %6, %2, %3, %1, 0, 0, %3, %4 );" )
- .tqarg( percentage )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( 0 )
- .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
- .tqarg( boolF() )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ),0 );
+ .arg( percentage )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( 0 )
+ .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
+ .arg( boolF() )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ),0 );
}
emit scoreChanged( url, percentage );
@@ -3807,8 +3807,8 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf )
TQStringList values =
query( TQString(
"SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
//handle corner case: deviceid!=-1 but there is a statistics row for that song with deviceid -1
if( values.isEmpty() )
@@ -3817,7 +3817,7 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf )
values = query( TQString(
"SELECT playcounter, createdate, accessdate, percentage, rating FROM statistics "
"WHERE url = '%1' AND deviceid = -1;" )
- .tqarg( escapeString( rpath2 ) ) );
+ .arg( escapeString( rpath2 ) ) );
if ( !values.isEmpty() )
{
rpath = rpath2;
@@ -3847,21 +3847,21 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf )
if ( !values.isEmpty() )
{
query( TQString( "UPDATE statistics SET rating=%1 WHERE url='%3' AND deviceid = %2;" )
- .tqarg( rating )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( rating )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
else
{
insert( TQString( "INSERT INTO statistics ( url, deviceid, createdate, accessdate, percentage, rating, playcounter, uniqueid, deleted ) "
"VALUES ( '%7', %6, %2, %3, 0, %1, 0, %4, %5 );" )
- .tqarg( rating )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( 0 )
- .tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
- .tqarg( boolF() )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ), NULL );
+ .arg( rating )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( 0 )
+ .arg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
+ .arg( boolF() )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ), NULL );
}
emit ratingChanged( url, rating );
@@ -3923,43 +3923,43 @@ CollectionDB::migrateFile( const TQString &oldURL, const TQString &newURL )
// Ensure destination is clear.
query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) );
+ .arg( newMediaid ).arg( escapeString( newRpath ) ) );
query( TQString( "DELETE FROM statistics WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) );
+ .arg( newMediaid ).arg( escapeString( newRpath ) ) );
query( TQString( "DELETE FROM tags_labels WHERE url = '%2' and deviceid = %1;" )
- .tqarg( newMediaid).tqarg( escapeString( newRpath ) ) );
+ .arg( newMediaid).arg( escapeString( newRpath ) ) );
if ( !getLyrics( oldURL ).isEmpty() )
query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( newMediaid ).tqarg( escapeString( newRpath ) ) );
+ .arg( newMediaid ).arg( escapeString( newRpath ) ) );
// Migrate
//code looks ugly but prevents problems when the URL contains HTTP escaped characters
query( TQString( "UPDATE tags SET url = '%3', deviceid = %1" )
- .tqarg( newMediaid ).tqarg( escapeString( newRpath ) )
+ .arg( newMediaid ).arg( escapeString( newRpath ) )
+ TQString( " WHERE deviceid=%1 AND url = '%2';" )
- .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) );
+ .arg( oldMediaid ).arg( escapeString( oldRpath ) ) );
query( TQString( "UPDATE statistics SET url = '%2', deviceid = %1" )
- .tqarg( newMediaid ).tqarg( escapeString( newRpath ) )
+ .arg( newMediaid ).arg( escapeString( newRpath ) )
+ TQString( " WHERE deviceid=%1 AND url = '%2';" )
- .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) );
+ .arg( oldMediaid ).arg( escapeString( oldRpath ) ) );
query( TQString( "UPDATE lyrics SET url = '%2', deviceid = %1" )
- .tqarg( newMediaid ).tqarg( escapeString( newRpath ) )
+ .arg( newMediaid ).arg( escapeString( newRpath ) )
+ TQString( " WHERE deviceid=%1 AND url = '%2';" )
- .tqarg( oldMediaid ).tqarg( escapeString( oldRpath ) ) );
+ .arg( oldMediaid ).arg( escapeString( oldRpath ) ) );
query( TQString( "UPDATE tags_labels SET url = '%2', deviceid = %1 WHERE deviceid = %3 AND url = '%4';" )
- .tqarg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) );
+ .arg( TQString::number( newMediaid ), escapeString( newRpath ), TQString::number( oldMediaid ), escapeString( oldRpath ) ) );
query( TQString( "UPDATE uniqueid SET url = '%1', deviceid = %2 WHERE url = '%3' AND deviceid = %4;" )
- .tqarg( escapeString( newRpath ), TQString::number( newMediaid ),
+ .arg( escapeString( newRpath ), TQString::number( newMediaid ),
escapeString( oldRpath ), TQString::number( oldMediaid ) ) );
query( TQString( "UPDATE playlists SET url = '%1' WHERE url = '%2';" )
- .tqarg( escapeString( newURL ),
+ .arg( escapeString( newURL ),
escapeString( oldURL ) ) );
}
@@ -4002,7 +4002,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
int count = 0;
do
{
- tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).tqarg( count );
+ tmp = TQString( dialog.folderCombo->currentText() + "/amarok-tmp-%1." + extension ).arg( count );
count++;
} while( TQFile::exists( tmp ) );
tmpSrc = KURL::fromPathOrURL( tmp );
@@ -4024,7 +4024,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
{
disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) );
- TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() );
+ TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() );
job->kill();
TQFile file( partFile );
if( file.exists() ) file.remove();
@@ -4035,7 +4035,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
}
usleep( 10000 );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
if( m_fileOperationFailed )
@@ -4151,7 +4151,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit
{
disconnect( job, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(fileOperationResult( KIO::Job * )) );
- TQString partFile = TQString( "%1.part" ).tqarg( (job->destURL()).path() );
+ TQString partFile = TQString( "%1.part" ).arg( (job->destURL()).path() );
job->kill();
TQFile file( partFile );
if( file.exists() ) file.remove();
@@ -4162,7 +4162,7 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit
}
usleep( 10000 );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
if( !m_fileOperationFailed )
@@ -4215,35 +4215,35 @@ CollectionDB::updateDirStats( TQString path, const long datetime, const bool tem
// REPLACE INTO is not valid SQL for postgres, so we need to check whether we
// should UPDATE() or INSERT()
TQStringList values = query( TQString("SELECT * FROM directories%1 WHERE dir='%3' AND deviceid=%2;")
- .tqarg( temporary ? "_temp" : "")
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( temporary ? "_temp" : "")
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
if(values.count() > 0 )
{
query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%4'AND deviceid=%3;")
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( datetime )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( temporary ? "_temp" : "" )
+ .arg( datetime )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
else
{
query( TQString( "INSERT INTO directories%1 (dir, deviceid,changedate) VALUES ('%4', %3, '%2');")
- .tqarg( temporary ? "_temp" : "")
- .tqarg( datetime )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( temporary ? "_temp" : "")
+ .arg( datetime )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
}
else
{
query( TQString( "REPLACE INTO directories%1 ( dir, deviceid, changedate ) VALUES ( '%4', %3, %2 );" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( datetime )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( temporary ? "_temp" : "" )
+ .arg( datetime )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
INotify::instance()->watchDir( path );
@@ -4266,8 +4266,8 @@ CollectionDB::removeSongsInDir( TQString path, TQMap *tagsRem
"LEFT JOIN uniqueid ON uniqueid.url = tags.url "
"AND uniqueid.deviceid = tags.deviceid "
"WHERE tags.dir = '%2' AND tags.deviceid = %1" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
TQStringList::ConstIterator it = result.begin(), end = result.end();
while( it != end )
{
@@ -4280,12 +4280,12 @@ CollectionDB::removeSongsInDir( TQString path, TQMap *tagsRem
}
query( TQString( "DELETE FROM tags WHERE dir = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
query( TQString( "DELETE FROM uniqueid WHERE dir = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
@@ -4299,8 +4299,8 @@ CollectionDB::isDirInCollection( TQString path )
TQStringList values =
query( TQString( "SELECT changedate FROM directories WHERE dir = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
return !values.isEmpty();
}
@@ -4313,8 +4313,8 @@ CollectionDB::isFileInCollection( const TQString &url )
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url );
TQString sql = TQString( "SELECT url FROM tags WHERE url = '%2' AND deviceid = %1" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) );
if ( deviceid == -1 )
{
sql += ';';
@@ -4323,7 +4323,7 @@ CollectionDB::isFileInCollection( const TQString &url )
{
TQString rpath2 = '.' + url;
sql += TQString( " OR url = '%1' AND deviceid = -1;" )
- .tqarg( escapeString( rpath2 ) );
+ .arg( escapeString( rpath2 ) );
}
TQStringList values = query( sql );
@@ -4340,15 +4340,15 @@ CollectionDB::removeSongs( const KURL::List& urls )
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, (*it).path() );
query( TQString( "DELETE FROM tags WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
query( TQString( "DELETE FROM uniqueid WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
query( TQString( "UPDATE statistics SET deleted = %1 WHERE url = '%3' AND deviceid = %2;" )
- .tqarg( boolT() )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( boolT() )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
}
@@ -4359,7 +4359,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count )
TQStringList values;
values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' ORDER BY %2 LIMIT %3 OFFSET 0;" )
- .tqarg( escapeString( artist ), randomFunc(), TQString::number( count ) ) );
+ .arg( escapeString( artist ), randomFunc(), TQString::number( count ) ) );
if ( values.isEmpty() )
Scrobbler::instance()->similarArtists( artist );
@@ -4371,7 +4371,7 @@ CollectionDB::similarArtists( const TQString &artist, uint count )
void
CollectionDB::sanitizeCompilations()
{
- query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").tqarg( boolF() ) );
+ query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE sampler IS NULL;").arg( boolF() ) );
}
void
@@ -4385,9 +4385,9 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary )
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path );
albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%3' AND tags_temp.deviceid = %2 AND album.id = tags_temp.album AND tags_temp.sampler IS NULL;" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( temporary ? "_temp" : "" )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
for ( uint i = 0; i < albums.count(); i++ )
{
@@ -4395,17 +4395,17 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary )
const uint album_id = albumID( albums[ i ], false, temporary, true );
artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( album_id ) );
+ .arg( temporary ? "_temp" : "" )
+ .arg( album_id ) );
dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" )
- .tqarg( album_id ) );
+ .arg( album_id ) );
if ( artists.count() > dirs.count() )
{
debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ':' << dirs.count() << endl;
}
query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2' AND sampler IS NULL;" )
- .tqarg(artists.count() > dirs.count() ? boolT() : boolF()).tqarg( album_id ) );
+ .arg(artists.count() > dirs.count() ? boolT() : boolF()).arg( album_id ) );
}
}
@@ -4420,7 +4420,7 @@ CollectionDB::setCompilation( const KURL::List &urls, bool enabled, bool updateV
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url );
query( TQString( "UPDATE tags SET sampler = %1 WHERE tags.url = '%2' AND tags.deviceid = %3;" )
- .tqarg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) );
+ .arg( ( enabled ? boolT() : boolF() ), escapeString( rpath ), TQString::number( deviceid ) ) );
}
// Update the Collection-Browser view,
@@ -4439,8 +4439,8 @@ CollectionDB::removeDirFromCollection( TQString path )
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, path );
query( TQString( "DELETE FROM directories WHERE dir = '%2' AND deviceid = %1;" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
}
@@ -4452,14 +4452,14 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate,
table.append( "_temp" );
}
- TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).tqarg( table ) );
+ TQString querystr( TQString( "SELECT id FROM %1 WHERE name " ).arg( table ) );
querystr += exactCondition( value ) + ';';
TQStringList result = query( querystr );
if ( result.isEmpty() )
{
if ( autocreate )
return TQString::number( insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" )
- .tqarg( table, escapeString( value ) ),
+ .arg( table, escapeString( value ) ),
table ) );
else
return 0;
@@ -4475,17 +4475,17 @@ CollectionDB::IDFromExactValue( TQString table, TQString value, bool autocreate,
void
CollectionDB::deleteRedundantName( const TQString &table, const TQString &id )
{
- TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).tqarg( table, id ) );
+ TQString querystr( TQString( "SELECT %1 FROM tags WHERE tags.%1 = %2 LIMIT 1;" ).arg( table, id ) );
TQStringList result = query( querystr );
if ( result.isEmpty() )
- query( TQString( "DELETE FROM %1 WHERE id = %2;" ).tqarg( table,id ) );
+ query( TQString( "DELETE FROM %1 WHERE id = %2;" ).arg( table,id ) );
}
void
CollectionDB::deleteAllRedundant( const TQString &table )
{
//This works with MySQL4. I thought it might not do, due to the comment in copyTempTables
- query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).tqarg( table, table ) );
+ query( TQString( "DELETE FROM %1 WHERE id NOT IN ( SELECT %2 FROM tags )" ).arg( table, table ) );
}
@@ -4630,8 +4630,8 @@ CollectionDB::getUniqueId( const TQString &url )
int deviceid = MountPointManager::instance()->getIdForUrl( url );
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url );
TQStringList values = query( TQString( "SELECT uniqueid FROM uniqueid WHERE deviceid = %1 AND url = '%2';" )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ));
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ));
if( !values.empty() )
return values[0];
else
@@ -4645,20 +4645,20 @@ CollectionDB::setLyrics( const TQString &url, const TQString &lyrics, const TQSt
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url );
TQStringList values = query(TQString("SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;")
- .tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( deviceid ).arg( escapeString( rpath ) ) );
if(values.count() > 0)
{
if ( !lyrics.isEmpty() )
query( TQString( "UPDATE lyrics SET lyrics = '%1' WHERE url = '%3' AND deviceid = %2;" )
- .tqarg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) );
+ .arg( escapeString( lyrics), TQString::number(deviceid), escapeString( rpath ) ) );
else
query( TQString( "DELETE FROM lyrics WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid).tqarg( escapeString( rpath ) ) );
+ .arg( deviceid).arg( escapeString( rpath ) ) );
}
else
{
insert( TQString( "INSERT INTO lyrics (deviceid, url, lyrics, uniqueid) values ( %1, '%2', '%3', '%4' );" )
- .tqarg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL);
+ .arg( TQString::number(deviceid), escapeString( rpath ), escapeString( lyrics ), escapeString( uniqueid ) ), NULL);
}
}
@@ -4669,41 +4669,41 @@ CollectionDB::getLyrics( const TQString &url )
int deviceid = MountPointManager::instance()->getIdForUrl( url );
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, url );
TQStringList values = query( TQString( "SELECT lyrics FROM lyrics WHERE url = '%2' AND deviceid = %1;" )
- .tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( deviceid ).arg( escapeString( rpath ) ) );
return values[0];
}
void CollectionDB::removeInvalidAmazonInfo( const TQString& md5sum )
{
- query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).tqarg( md5sum ) );
+ query( TQString( "DELETE FROM amazon WHERE filename='%1'" ).arg( md5sum ) );
}
void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& locale, const TQString& md5sum)
{
TQStringList values = query(TQString("SELECT filename FROM amazon WHERE filename = '%1'")
- .tqarg(md5sum));
+ .arg(md5sum));
if(values.count() > 0)
{
query( TQString("UPDATE amazon SET asin = '%1', locale = '%2', refetchdate = '%3' WHERE filename = '%4'")
- .tqarg(asin)
- .tqarg(locale)
- .tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t())
- .tqarg(md5sum));
+ .arg(asin)
+ .arg(locale)
+ .arg(TQDateTime::currentDateTime().addDays(80).toTime_t())
+ .arg(md5sum));
}
else
{
insert( TQString( "INSERT INTO amazon ( asin, locale, filename, refetchdate ) VALUES ( '%1', '%2', '%3', '%4');" )
- .tqarg(asin)
- .tqarg(locale)
- .tqarg(md5sum)
- .tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t()), NULL );
+ .arg(asin)
+ .arg(locale)
+ .arg(md5sum)
+ .arg(TQDateTime::currentDateTime().addDays(80).toTime_t()), NULL );
}
}
TQStringList CollectionDB::staleImages()
{
return query(TQString("SELECT asin, locale, filename FROM amazon WHERE refetchdate < %1 ;")
- .tqarg(TQDateTime::tqcurrentDateTime().toTime_t() ));
+ .arg(TQDateTime::currentDateTime().toTime_t() ));
}
void
@@ -5022,12 +5022,12 @@ class SimilarArtistsInsertionJob : public ThreadManager::DependentJob
{
virtual bool doJob()
{
- CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) );
+ CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) );
const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );";
foreach( suggestions )
CollectionDB::instance()->insert( sql
- .tqarg( escapedArtist,
+ .arg( escapedArtist,
CollectionDB::instance()->escapeString( *it ) ), NULL);
return true;
@@ -5071,23 +5071,23 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr
"SELECT url, deviceid "
"FROM %1 "
"WHERE uniqueid = '%2';" )
- .tqarg( escapeString( *it ) )
- .tqarg( currid ) );
+ .arg( escapeString( *it ) )
+ .arg( currid ) );
check2 = query( TQString(
"SELECT url, uniqueid "
"FROM %1 "
"WHERE deviceid = %2 AND url = '%3';" )
- .tqarg( escapeString( *it ) )
- .tqarg( currdeviceid
+ .arg( escapeString( *it ) )
+ .arg( currdeviceid
, currurl ) );
if( !check1.empty() )
{
//debug() << "uniqueid found, updating url" << endl;
query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" )
- .tqarg( escapeString( *it ) )
- .tqarg( currdeviceid
+ .arg( escapeString( *it ) )
+ .arg( currdeviceid
, currid
, currurl ) );
}
@@ -5095,8 +5095,8 @@ CollectionDB::aftCheckPermanentTables( const TQString &currdeviceid, const TQStr
{
//debug() << "url found, updating uniqueid" << endl;
query( TQString( "UPDATE %1 SET uniqueid = '%2' WHERE deviceid = %3 AND url = '%4';" )
- .tqarg( escapeString( *it ) )
- .tqarg( currid
+ .arg( escapeString( *it ) )
+ .arg( currid
, currdeviceid
, currurl ) );
}
@@ -5115,14 +5115,14 @@ CollectionDB::aftMigratePermanentTablesUrl( const TQString& /*oldUrl*/, const TQ
foreach( m_aftEnabledPersistentTables )
{
query( TQString( "DELETE FROM %1 WHERE deviceid = %2 AND url = '%3';" )
- .tqarg( escapeString( *it ) )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) ) );
+ .arg( escapeString( *it ) )
+ .arg( deviceid )
+ .arg( escapeString( rpath ) ) );
query( TQString( "UPDATE %1 SET deviceid = %2, url = '%4' WHERE uniqueid = '%3';" )
- .tqarg( escapeString( *it ) )
- .tqarg( deviceid )
- .tqarg( escapeString( uniqueid ) )
- .tqarg( escapeString( rpath ) ) );
+ .arg( escapeString( *it ) )
+ .arg( deviceid )
+ .arg( escapeString( uniqueid ) )
+ .arg( escapeString( rpath ) ) );
}
}
@@ -5136,12 +5136,12 @@ CollectionDB::aftMigratePermanentTablesUniqueId( const TQString& /*url*/, const
foreach( m_aftEnabledPersistentTables )
{
query( TQString( "DELETE FROM %1 WHERE uniqueid = '%2';" )
- .tqarg( escapeString( *it ) )
- .tqarg( escapeString( newid ) ) );
+ .arg( escapeString( *it ) )
+ .arg( escapeString( newid ) ) );
query( TQString( "UPDATE %1 SET uniqueid = '%1' WHERE uniqueid = '%2';" )
- .tqarg( escapeString( *it ) )
- .tqarg( escapeString( newid ) )
- .tqarg( escapeString( oldid ) ) );
+ .arg( escapeString( *it ) )
+ .arg( escapeString( newid ) )
+ .arg( escapeString( oldid ) ) );
}
}
@@ -5462,11 +5462,11 @@ CollectionDB::updateStatsTables()
//pre somewhere in the 1.3-1.4 timeframe, the version wasn't stored in the DB, so try to guess it
const TQString q = "SELECT COUNT( %1 ) FROM statistics;";
- if( !prev && query( q.tqarg( "url" ) ).first().toInt()
- && query( q.tqarg( "createdate" ) ).first().toInt()
- && query( q.tqarg( "accessdate" ) ).first().toInt()
- && query( q.tqarg( "percentage" ) ).first().toInt()
- && query( q.tqarg( "playcounter" ) ).first().toInt() )
+ if( !prev && query( q.arg( "url" ) ).first().toInt()
+ && query( q.arg( "createdate" ) ).first().toInt()
+ && query( q.arg( "accessdate" ) ).first().toInt()
+ && query( q.arg( "percentage" ) ).first().toInt()
+ && query( q.arg( "playcounter" ) ).first().toInt() )
{
prev = 3;
}
@@ -5533,9 +5533,9 @@ CollectionDB::updateStatsTables()
int deviceid = exists ? MountPointManager::instance()->getIdForUrl( *it ) : -2;
TQString rpath = exists ? MountPointManager::instance()->getRelativePath( deviceid, *it ) : *it;
TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2' WHERE " )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) );
- update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) );
+ update += TQString( "url = '%1';" ).arg( escapeString( *it ) );
query ( update );
}
}
@@ -5642,9 +5642,9 @@ CollectionDB::updatePersistentTables()
int deviceid = MountPointManager::instance()->getIdForUrl( *it );
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid, *it );
TQString update = TQString( "UPDATE lyrics SET deviceid = %1, url = '%2' WHERE " )
- .tqarg( deviceid )
- .tqarg( escapeString( rpath ) );
- update += TQString( "url = '%1';" ).tqarg( escapeString( *it ) );
+ .arg( deviceid )
+ .arg( escapeString( rpath ) );
+ update += TQString( "url = '%1';" ).arg( escapeString( *it ) );
query ( update );
}
}
@@ -5890,7 +5890,7 @@ CollectionDB::getLabels( const TQString &url, const uint type )
return query( TQString( "SELECT labels.name FROM labels "
"LEFT JOIN tags_labels ON labels.id = tags_labels.labelid "
"WHERE labels.type = %1 AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" )
- .tqarg( type ).tqarg( deviceid ).tqarg( escapeString( rpath ) ) );
+ .arg( type ).arg( deviceid ).arg( escapeString( rpath ) ) );
}
void
@@ -5911,7 +5911,7 @@ CollectionDB::cleanLabels()
}
query( TQString( "DELETE FROM labels "
"WHERE labels.id IN ( %1 );" )
- .tqarg( ids ) );
+ .arg( ids ) );
}
}
@@ -5921,7 +5921,7 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const
DEBUG_BLOCK
int deviceid = MountPointManager::instance()->getIdForUrl( url );
TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) );
- TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).tqarg( type ) );
+ TQStringList labelIds = query( TQString( "SELECT id FROM labels WHERE type = %1;" ).arg( type ) );
TQString ids;
if ( !labelIds.isEmpty() )
{
@@ -5934,20 +5934,20 @@ CollectionDB::setLabels( const TQString &url, const TQStringList &labels, const
//TODO: max: add uniqueid handling
query( TQString( "DELETE FROM tags_labels "
"WHERE tags_labels.labelid IN (%1) AND tags_labels.deviceid = %2 AND tags_labels.url = '%3';" )
- .tqarg( ids, TQString::number(deviceid), rpath ) );
+ .arg( ids, TQString::number(deviceid), rpath ) );
}
foreach( labels )
{
int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" )
- .tqarg( type ).tqarg( escapeString( *it ) ) ).first().toInt();
+ .arg( type ).arg( escapeString( *it ) ) ).first().toInt();
if ( !id )
{
id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" )
- .tqarg( type ).tqarg( escapeString( *it ) ), "labels" );
+ .arg( type ).arg( escapeString( *it ) ), "labels" );
}
insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" )
- .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 );
+ .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), 0 );
}
emit labelsChanged( url );
@@ -5962,10 +5962,10 @@ CollectionDB::removeLabels( const TQString &url, const TQStringList &labels, con
TQString sql = TQString( "DELETE FROM tags_labels "
"FROM tags_labels AS t LEFT JOIN labels AS l ON t.labelid = l.id "
"WHERE l.type = %1 AND t.deviceid = %2 AND t.url = '%3' AND ( 0" )
- .tqarg( type ).tqarg( deviceid ).tqarg( rpath );
+ .arg( type ).arg( deviceid ).arg( rpath );
foreach( labels )
{
- sql += TQString( " OR l.name = '%1'" ).tqarg( escapeString( *it ) );
+ sql += TQString( " OR l.name = '%1'" ).arg( escapeString( *it ) );
}
sql += ");";
query( sql );
@@ -5981,23 +5981,23 @@ CollectionDB::addLabel( const TQString &url, const TQString &label, const TQStri
TQString rpath = escapeString( MountPointManager::instance()->getRelativePath( deviceid, url ) );
int id = query( TQString( "SELECT id FROM labels WHERE type = %1 AND name = '%2';" )
- .tqarg( type ).tqarg( escapeString( label ) ) ).first().toInt();
+ .arg( type ).arg( escapeString( label ) ) ).first().toInt();
bool labelAlreadyExists = id > 0;
if ( !id )
{
id = insert( TQString( "INSERT INTO labels( name, type ) VALUES ( '%2', %1 );" )
- .tqarg( type ).tqarg( escapeString( label ) ), "labels" );
+ .arg( type ).arg( escapeString( label ) ), "labels" );
}
if ( labelAlreadyExists )
{
//we can return if the link between the tags row and the labels row already exists
int count = query( TQString( "SELECT COUNT(*) FROM tags_labels WHERE labelid = %1 AND deviceid = %2 AND url = '%3';" )
- .tqarg( id ).tqarg( deviceid ).tqarg( rpath ) ).first().toInt();
+ .arg( id ).arg( deviceid ).arg( rpath ) ).first().toInt();
if ( count )
return false;
}
insert( TQString( "INSERT INTO tags_labels( labelid, deviceid, url, uniqueid ) VALUES ( %1, %2, '%3', '%4' );" )
- .tqarg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" );
+ .arg( TQString::number(id), TQString::number(deviceid), rpath, escapeString( uid ) ), "tags_labels" );
emit labelsChanged( url );
return true;
@@ -6010,7 +6010,7 @@ CollectionDB::favoriteLabels( int type, int count )
"FROM labels LEFT JOIN tags_labels ON labels.id = tags_labels.labelid "
"WHERE labels.type = %1 GROUP BY labels.name "
"ORDER BY count(tags_labels.labelid) DESC LIMIT %2;" )
- .tqarg( TQString::number( type ), TQString::number( count ) ) );
+ .arg( TQString::number( type ), TQString::number( count ) ) );
}
TQDir
@@ -6322,8 +6322,8 @@ void SqliteConnection::sqlite_like_new( sqlite3_context *context, int argc, sqli
int result = 0;
if ( begin && end ) result = ( text.find( pattern, 0, 0 ) != -1);
- else if ( begin ) result = text.tqendsWith( pattern, 0 );
- else if ( end ) result = text.tqstartsWith( pattern, 0 );
+ else if ( begin ) result = text.endsWith( pattern, 0 );
+ else if ( end ) result = text.startsWith( pattern, 0 );
else result = ( text.lower() == pattern.lower() );
sqlite3_result_int( context, result );
@@ -6593,7 +6593,7 @@ int PostgresqlConnection::insert( const TQString& statement, const TQString& tab
TQString _table = table;
if (table.find("_temp") > 0) _table = table.left(table.find("_temp"));
- curvalSql = TQString("SELECT currval('%1_seq');").tqarg(_table);
+ curvalSql = TQString("SELECT currval('%1_seq');").arg(_table);
result = PQexec(m_db, curvalSql.utf8());
if (result == NULL)
{
@@ -6733,7 +6733,7 @@ QueryBuilder::linkTables( int tables )
//if ( !m_url.isEmpty() ) {
// TQString url = TQString( '.' ) + m_url;
// m_tables += TQString( " OR statistics.deviceid = -1 AND statistics.url = '%1'" )
- // .tqarg( CollectionDB::instance()->escapeString( url ) );
+ // .arg( CollectionDB::instance()->escapeString( url ) );
//}
}
if ( tables & tabLyrics )
@@ -6827,7 +6827,7 @@ QueryBuilder::addURLFilters( const TQStringList& filter )
int deviceid = MountPointManager::instance()->getIdForUrl( filter[i] );
TQString rpath = MountPointManager::instance()->getRelativePath( deviceid , filter[i] );
m_where += "OR (tags.url = '" + CollectionDB::instance()->escapeString( rpath ) + "' ";
- m_where += TQString( "AND tags.deviceid = %1 ) " ).tqarg( TQString::number( deviceid ) );
+ m_where += TQString( "AND tags.deviceid = %1 ) " ).arg( TQString::number( deviceid ) );
//TODO MountPointManager fix this
}
@@ -7044,7 +7044,7 @@ QueryBuilder::addFilter( int tables, const TQString& filter )
m_where += "OR tags.title = '' ";
}
if ( ( tables & tabArtist ) && i18n( "Various Artists" ).contains( filter, false ) )
- m_where += TQString( "OR tags.sampler = %1 " ).tqarg( CollectionDB::instance()->boolT() );
+ m_where += TQString( "OR tags.sampler = %1 " ).arg( CollectionDB::instance()->boolT() );
m_where += " ) ";
}
@@ -7080,12 +7080,12 @@ QueryBuilder::addFilter( int tables, TQ_INT64 value, const TQString& filter, int
}
if( coalesceField( tables, value ) )
- m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s;
+ m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s;
else
- m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s;
+ m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s;
if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) )
- m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) );
+ m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) );
m_where += " ) ";
@@ -7217,12 +7217,12 @@ QueryBuilder::excludeFilter( int tables, TQ_INT64 value, const TQString& filter,
}
if( coalesceField( tables, value ) )
- m_where += TQString( "COALESCE(%1.%2,0) " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s;
+ m_where += TQString( "COALESCE(%1.%2,0) " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s;
else
- m_where += TQString( "%1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + s;
+ m_where += TQString( "%1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) ) + s;
if ( !exact && (value & valName) && mode == modeNormal && i18n( "Unknown").contains( filter, false ) )
- m_where += TQString( "AND %1.%2 <> '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) );
+ m_where += TQString( "AND %1.%2 <> '' " ).arg( tableName( tables ) ).arg( valueName( value ) );
m_where += " ) ";
@@ -7283,27 +7283,27 @@ QueryBuilder::addMatch( int tables, TQ_INT64 value, const TQString& match, bool
//which is automatially appended if m_showAll = false
m_showAll = true;
m_where += TQString( "OR %1.%2 " )
- .tqarg( tableName( tables ) )
- .tqarg( valueName( value ) );
+ .arg( tableName( tables ) )
+ .arg( valueName( value ) );
m_where += caseSensitive ? CollectionDB::exactCondition( rpath ) : CollectionDB::likeCondition( rpath );
- m_where += TQString( " AND %1.deviceid = %2 " ).tqarg( tableName( tables ) ).tqarg( deviceid );
+ m_where += TQString( " AND %1.deviceid = %2 " ).arg( tableName( tables ) ).arg( deviceid );
if ( deviceid != -1 )
{
//handle corner case
TQString rpath2( '.' + match );
- m_where += TQString( " OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) );
+ m_where += TQString( " OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) );
m_where += caseSensitive ? CollectionDB::exactCondition( rpath2 ) : CollectionDB::likeCondition( rpath2 );
- m_where += TQString( " AND %1.deviceid = -1 " ).tqarg( tableName( tables ) );
+ m_where += TQString( " AND %1.deviceid = -1 " ).arg( tableName( tables ) );
}
}
else
{
- m_where += TQString( "OR %1.%2 " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) );
+ m_where += TQString( "OR %1.%2 " ).arg( tableName( tables ) ).arg( valueName( value ) );
m_where += caseSensitive ? CollectionDB::exactCondition( match ) : CollectionDB::likeCondition( match );
}
if ( ( value & valName ) && interpretUnknown && match == i18n( "Unknown" ) )
- m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) );
+ m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) );
m_where += " ) ";
@@ -7442,8 +7442,8 @@ QueryBuilder::setOptions( int options )
if ( options & optNoCompilations || options & optOnlyCompilations )
m_linkTables |= tabSong;
- if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolF());
- if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").tqarg(CollectionDB::instance()->boolT());
+ if ( options & optNoCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolF());
+ if ( options & optOnlyCompilations ) m_where += TQString("AND tags.sampler = %1 ").arg(CollectionDB::instance()->boolT());
if (CollectionDB::instance()->getType() == DbConnection::postgresql && options & optRemoveDuplicates && options & optRandomize)
{
@@ -7617,7 +7617,7 @@ QueryBuilder::having( int table, TQ_INT64 value, int function, int mode, const T
void
QueryBuilder::setLimit( int startPos, int length )
{
- m_limit = TQString( " LIMIT %2 OFFSET %1 " ).tqarg( startPos ).tqarg( length );
+ m_limit = TQString( " LIMIT %2 OFFSET %1 " ).arg( startPos ).arg( length );
}
void
@@ -7645,9 +7645,9 @@ QueryBuilder::shuffle( int table, TQ_INT64 value )
// non-zero), and finally POWER(...) is used instead of 1-POWER(...) because it
// only changes the order type.
m_sort += TQString("POWER( %1, 1.0 / (%2.%3 + 1) ) DESC")
- .tqarg( CollectionDB::instance()->randomFunc() )
- .tqarg( tableName( table ) )
- .tqarg( valueName( value ) );
+ .arg( CollectionDB::instance()->randomFunc() )
+ .arg( tableName( table ) )
+ .arg( valueName( value ) );
m_linkTables |= table;
}
@@ -7829,9 +7829,9 @@ QueryBuilder::sortByFavoriteAvg() {
m_having += " (";
if (AmarokConfig::useRatings() )
m_having += TQString("%1(%2.%3) > 0 OR ")
- .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) );
+ .arg( functionName( funcAvg ), tableName(tabStats), valueName(valRating) );
m_having += TQString("%1(%2.%3) > 0")
- .tqarg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) );
+ .arg( functionName( funcAvg ), tableName(tabStats), valueName(valPlayCounter) );
m_having += ")";
}
diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h
index 9b94ad00..a581db88 100644
--- a/amarok/src/collectiondb.h
+++ b/amarok/src/collectiondb.h
@@ -257,13 +257,13 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
inline bool boolFromSql( const TQString &b ) { return ( b == boolT() || b == "t" ); }
//textColumnType should be used for normal strings, which need to be compared
//either case-sensitively or -insensitively
- TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").tqarg(length); }
+ TQString textColumnType( int length=255 ) const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return TQString("VARCHAR(%1)").arg(length); }
//exactTextColumnType should be used for strings that must be stored exactly, such
//as URLs (necessary for holding control chars etc. if present in URL), except for
//trailing spaces. Comparisions should always be done case-sensitively.
//As we create indices on these columns, we have to restrict them to
//<= 255 chars for mysql < 5.0.3
- TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).tqarg( length>255 ? 255 : length ); else return textColumnType( length ); }
+ TQString exactTextColumnType( int length=1024 ) const { if ( getDbConnectionType() == DbConnection::mysql ) return TQString( "VARBINARY(%1)" ).arg( length>255 ? 255 : length ); else return textColumnType( length ); }
// We might consider using LONGTEXT type, as some lyrics could be VERY long..???
TQString longTextColumnType() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "TEXT"; else return "TEXT"; }
TQString randomFunc() const { if ( getDbConnectionType() == DbConnection::postgresql ) return "random()"; else return "RAND()"; }
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 68c8db60..6472c4b0 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -40,14 +40,14 @@ email : markey@web.de
#include
#include
-#include
+#include
#include
#include
#include
#include
#include
#include
-#include
+#include
#include
#include
@@ -153,23 +153,23 @@ AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KCon
TQVBox *topbox = new TQVBox( opt9 );
topbox->setSpacing( KDialog::spacingHint() );
TQGroupBox *mediaBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Media Devices"), topbox );
- mediaBox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+ mediaBox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
TQVBox *vbox = new TQVBox( mediaBox );
vbox->setSpacing( KDialog::spacingHint() );
m_deviceManager = new MediumPluginManager( vbox );
TQHBox *hbox = new TQHBox( topbox );
hbox->setSpacing( KDialog::spacingHint() );
- hbox->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+ hbox->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
KPushButton *autodetect = new KPushButton( i18n( "Autodetect Devices" ), hbox );
- autodetect->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ autodetect->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( autodetect, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(redetectDevices()) );
KPushButton *add = new KPushButton( i18n( "Add Device..." ), hbox );
- add->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ add->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( add, TQT_SIGNAL(clicked()), m_deviceManager, TQT_SLOT(newDevice()) );
TQFrame *frame = new TQFrame( topbox );
- frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
// add pages
addPage( m_opt1, i18n( "General" ), Amarok::icon( "settings_general" ), i18n( "Configure General Options" ) );
@@ -264,7 +264,7 @@ void AmarokConfigDialog::updateSettings()
{
#ifdef TQ_WS_X11
OSDPreviewWidget *osd = static_cast( TQT_TQWIDGET(child( "osdpreview" )) );
- AmarokConfig::setOsdAlignment( osd->tqalignment() );
+ AmarokConfig::setOsdAlignment( osd->alignment() );
AmarokConfig::setOsdYOffset( osd->y() );
Amarok::OSD::instance()->applySettings();
#endif
@@ -357,8 +357,8 @@ bool AmarokConfigDialog::hasChanged()
return m_soundSystem->currentText() != m_pluginAmarokName[AmarokConfig::soundSystem()] ||
#ifdef TQ_WS_X11
- osd->tqalignment() != AmarokConfig::osdAlignment() ||
- osd->tqalignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() ||
+ osd->alignment() != AmarokConfig::osdAlignment() ||
+ osd->alignment() != OSDWidget::Center && osd->y() != AmarokConfig::osdYOffset() ||
#endif
m_opt2->styleComboBox->currentText() != AmarokConfig::contextBrowserStyleSheet() ||
Amarok::databaseTypeCode( m_opt7->dbSetupFrame->databaseEngine->currentText() ) != AmarokConfig::databaseEngine().toInt() ||
@@ -385,7 +385,7 @@ bool AmarokConfigDialog::isDefault()
void AmarokConfigDialog::aboutEngine() //SLOT
{
- PluginManager::showAbout( TQString( "Name == '%1'" ).tqarg( m_soundSystem->currentText() ) );
+ PluginManager::showAbout( TQString( "Name == '%1'" ).arg( m_soundSystem->currentText() ) );
}
@@ -407,7 +407,7 @@ void AmarokConfigDialog::soundSystemChanged()
m_engineConfig = EngineController::engine()->configure();
m_engineConfig->view()->reparent( m_engineConfigFrame, TQPoint() );
m_engineConfig->view()->show();
- m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).tqarg( m_soundSystem->currentText() ) );
+ m_engineConfigFrame->setTitle( i18n( "to change settings", "Configure %1" ).arg( m_soundSystem->currentText() ) );
m_engineConfigFrame->show();
connect( m_engineConfig, TQT_SIGNAL(viewChanged()), TQT_SLOT(updateButtons()) );
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 6e4e9109..c35f8eaa 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -43,10 +43,10 @@
#include
#include
#include
-#include // External CSS reading
+#include // External CSS reading
#include //wiki tab
#include
-#include
+#include
#include
#include
#include
@@ -91,13 +91,13 @@ namespace Amarok
TQString verboseTimeSince( const TQDateTime &datetime )
{
- const TQDateTime now = TQDateTime::tqcurrentDateTime();
+ const TQDateTime now = TQDateTime::currentDateTime();
const int datediff = datetime.daysTo( now );
if( datediff >= 6*7 /*six weeks*/ ) { // return absolute month/year
const KCalendarSystem *cal = KGlobal::locale()->calendar();
const TQDate date = datetime.date();
- return i18n( "monthname year", "%1 %2" ).tqarg( cal->monthName(date), cal->yearString(date, false) );
+ return i18n( "monthname year", "%1 %2" ).arg( cal->monthName(date), cal->yearString(date, false) );
}
//TODO "last week" = maybe within 7 days, but prolly before last sunday
@@ -175,7 +175,7 @@ static
TQString albumImageTooltip( const TQString &albumImage, int size )
{
if ( albumImage == CollectionDB::instance()->notAvailCover( false, size ) )
- return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).tqarg( CoverManager::amazonTld() ) );
+ return escapeHTMLAttr( i18n( "Click to fetch cover from amazon.%1, right-click for menu." ).arg( CoverManager::amazonTld() ) );
return escapeHTMLAttr( i18n( "Click for information from Amazon, right-click for menu." ) );
}
@@ -497,7 +497,7 @@ void ContextBrowser::openURLRequest( const KURL &url )
else if ( url.protocol() == "musicbrainz" )
{
const TQString url = "http://www.musicbrainz.org/taglookup.html?artist=%1&album=%2&track=%3";
- Amarok::invokeBrowser( url.tqarg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ),
+ Amarok::invokeBrowser( url.arg( KURL::encode_string_no_slash( artist, 106 /*utf-8*/ ),
KURL::encode_string_no_slash( album, 106 /*utf-8*/ ),
KURL::encode_string_no_slash( track, 106 /*utf-8*/ ) ) );
}
@@ -547,7 +547,7 @@ void ContextBrowser::openURLRequest( const KURL &url )
else if( url.protocol() == "ggartist" )
{
const TQString url2 = TQString( "http://www.google.com/musicsearch?q=%1&res=artist" )
- .tqarg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) );
+ .arg( KURL::encode_string_no_slash( unescapeHTMLAttr( url.path() ).replace( " ", "+" ), 106 /*utf-8*/ ) );
Amarok::invokeBrowser( url2 );
}
@@ -709,7 +709,7 @@ void ContextBrowser::engineNewMetaData( const MetaBundle& bundle, bool trackChan
{
line = stream.readLine().simplifyWhiteSpace();
- if( line.tqstartsWith( "file", false ) )
+ if( line.startsWith( "file", false ) )
{
line = line.mid( 5 ).remove( '"' );
@@ -802,7 +802,7 @@ void ContextBrowser::saveHtmlData()
.replace( "",
TQString( "" )
- .tqarg( HTMLView::loadStyleSheet() ) ); // and the
+ .arg( HTMLView::loadStyleSheet() ) ); // and the
// stylesheet
// code
exportedDocument.close();
@@ -1243,7 +1243,7 @@ void ContextBrowser::showCurrentTrack() //SLOT
debug() << "current browser is not context, aborting showCurrentTrack()" << endl;
m_dirtyCurrentTrackPage = true;
m_currentTrackPage->set( TQString( "%1
" )
- .tqarg( i18n( "Updating..." ) ) );
+ .arg( i18n( "Updating..." ) ) );
return;
}
#endif
@@ -1492,7 +1492,7 @@ CurrentTrackJob::constructHTMLAlbums( const TQStringList &reqResult, TQString &h
<< albumValues[6]
<< reqResult[ i + 1 ] //album.id
<< escapeHTMLAttr( discNumber )
- << i18n( "Disc %1" ).tqarg( discNumber ) ) );
+ << i18n( "Disc %1" ).arg( discNumber ) ) );
}
TQString track = albumValues[j + 2].stripWhiteSpace();
if( track.length() > 0 )
@@ -1576,7 +1576,7 @@ CurrentTrackJob::showHomeByAlbums()
date = ep.dateTime().toString();
TQString image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), true, 50 );
- TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() ) );
+ TQString imageAttr = escapeHTMLAttr( i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() ) );
m_HTMLSource.append( QStringx (
"\n"
@@ -1615,7 +1615,7 @@ CurrentTrackJob::showHomeByAlbums()
)
);
- m_HTMLSource.append( QStringx ( "%1
\n" ).tqarg( ep.description() ) );
+ m_HTMLSource.append( QStringx ( "%1
\n" ).arg( ep.description() ) );
m_HTMLSource.append(
"\n"
@@ -1929,7 +1929,7 @@ void CurrentTrackJob::addMetaHistory()
for ( uint i = 0; i < m_metadataHistory.count(); ++i )
{
const TQString &str = m_metadataHistory[i];
- m_HTMLSource.append( QStringx( "
| %1 |
\n" ).tqarg( str ) );
+ m_HTMLSource.append( QStringx( "| %1 |
\n" ).arg( str ) );
}
m_HTMLSource.append(
@@ -1959,7 +1959,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack )
image = CollectionDB::instance()->notAvailCover( true );
TQString imageAttr = escapeHTMLAttr( pcb.link().isValid()
- ? i18n( "Click to go to podcast website: %1." ).tqarg( pcb.link().prettyURL() )
+ ? i18n( "Click to go to podcast website: %1." ).arg( pcb.link().prettyURL() )
: i18n( "No podcast website." )
);
@@ -1994,7 +1994,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack )
<< imageAttr
<< escapeHTML( peb.author().isEmpty()
? i18n( "Podcast" )
- : i18n( "Podcast by %1" ).tqarg( peb.author() ) )
+ : i18n( "Podcast by %1" ).arg( peb.author() ) )
<< ( peb.localUrl().isValid()
? "
\n" + escapeHTML( i18n( "(Cached)" ) )
: "" )
@@ -2011,7 +2011,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack )
for ( uint i = 0; i < m_metadataHistory.count(); ++i )
{
const TQString &str = m_metadataHistory[i];
- m_HTMLSource.append( QStringx( "| %1 |
\n" ).tqarg( str ) );
+ m_HTMLSource.append( QStringx( "| %1 |
\n" ).arg( str ) );
}
m_HTMLSource.append(
@@ -2024,7 +2024,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle ¤tTrack )
"\n"
@@ -2106,9 +2106,9 @@ void CurrentTrackJob::showBrowseArtistHeader( const TQString &artist )
" | \n"
"\n"
"\n" )
- .tqarg( escapeHTML( artist ) )
- .tqarg( escapeHTML( i18n( "Browse Artist" ) ) )
- .tqarg( back ) );
+ .arg( escapeHTML( artist ) )
+ .arg( escapeHTML( i18n( "Browse Artist" ) ) )
+ .arg( back ) );
m_HTMLSource.append(
"\n"
"\n" )
- .tqarg( escapeHTML( label ) )
- .tqarg( escapeHTML( i18n( "Browse Label" ) ) )
- .tqarg( back ) );
+ .arg( escapeHTML( label ) )
+ .arg( escapeHTML( i18n( "Browse Label" ) ) )
+ .arg( back ) );
m_HTMLSource.append(
"\n"
);
@@ -2190,8 +2190,8 @@ CurrentTrackJob::showBrowseLabelHeader( const TQString &label )
m_HTMLSource.append(
"\n"
"| \n"
- + TQString( "\n" ).tqarg( escapeHTMLAttr( label ) )
- + i18n( "Last.fm Information for %1" ).tqarg( escapeHTML( label ) ) +
+ + TQString( "\n" ).arg( escapeHTMLAttr( label ) )
+ + i18n( "Last.fm Information for %1" ).arg( escapeHTML( label ) ) +
"\n"
" | \n"
"
\n");
@@ -2281,11 +2281,11 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack )
"\n"
"\n"
)
- .tqarg( escapeHTML( currentTrack.prettyTitle() ) )
- .tqarg( escapeHTMLAttr( currentTrack.artist() ) )
- .tqarg( escapeHTMLAttr( currentTrack.album() ) )
- .tqarg( escapeHTMLAttr( albumImage ) )
- .tqarg( albumImageTitleAttr )
+ .arg( escapeHTML( currentTrack.prettyTitle() ) )
+ .arg( escapeHTMLAttr( currentTrack.artist() ) )
+ .arg( escapeHTMLAttr( currentTrack.album() ) )
+ .arg( escapeHTMLAttr( albumImage ) )
+ .arg( albumImageTitleAttr )
) );
if ( !values.isEmpty() && values[2].toInt() )
@@ -2299,18 +2299,18 @@ void CurrentTrackJob::showCurrentArtistHeader( const MetaBundle ¤tTrack )
const uint score = static_cast( values[3].toFloat() );
const uint rating = values[4].toInt();
- //SAFE = .tqarg( x, y )
- //UNSAFE = .tqarg( x ).tqarg( y )
+ //SAFE = .arg( x, y )
+ //UNSAFE = .arg( x ).arg( y )
m_HTMLSource.append( TQString(
"%1
\n"
"%2 \n"
"%3
\n"
"%4\n"
)
- .tqarg( i18n( "Track played once", "Track played %n times", playtimes ),
+ .arg( i18n( "Track played once", "Track played %n times", playtimes ),
statsHTML( score, rating, false ),
- i18n( "Last played: %1" ).tqarg( Amarok::verboseTimeSince( lastPlay ) ),
- i18n( "First played: %1" ).tqarg( Amarok::verboseTimeSince( firstPlay ) ) ) );
+ i18n( "Last played: %1" ).arg( Amarok::verboseTimeSince( lastPlay ) ),
+ i18n( "First played: %1" ).arg( Amarok::verboseTimeSince( firstPlay ) ) ) );
}
else
m_HTMLSource.append( i18n( "Never played before" ) );
@@ -2391,7 +2391,7 @@ void CurrentTrackJob::showRelatedArtists( const TQString &artist, const TQString
"\n"
"\n"
"\n" )
- .tqarg( i18n( "Artists Related to %1" ).tqarg( escapeHTML( artist ) ) ) );
+ .arg( i18n( "Artists Related to %1" ).arg( escapeHTML( artist ) ) ) );
m_HTMLSource.append( "\n" );
for ( uint i = 0; i < relArtists.count(); i += 1 )
{
@@ -2492,7 +2492,7 @@ CurrentTrackJob::showSongsWithLabel( const TQString &label )
"\n"
"\n"
" \n" );
@@ -2540,7 +2540,7 @@ CurrentTrackJob::showUserLabels( const MetaBundle ¤tTrack )
"\n" );
@@ -2588,7 +2588,7 @@ void CurrentTrackJob::showArtistsFaves( const TQString &artist, uint artist_id )
"\n"
"\n"
" \n" );
@@ -2642,7 +2642,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id,
"\n"
"\n"
" \n" );
@@ -2744,7 +2744,7 @@ void CurrentTrackJob::showArtistsAlbums( const TQString &artist, uint artist_id,
<< TQString::number( artist_id )
<< values[ i + 1 ] //album.id
<< escapeHTMLAttr( discNumber )
- << i18n( "Disc %1" ).tqarg( discNumber ) ) );
+ << i18n( "Disc %1" ).arg( discNumber ) ) );
}
TQString track = albumValues[j + 2].stripWhiteSpace();
if( track.length() > 0 ) {
@@ -2806,7 +2806,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti
"\n"
"\n"
" \n" );
@@ -2904,7 +2904,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti
.args( TQStringList()
<< values[ i + 1 ] //album.id
<< escapeHTMLAttr( discNumber )
- << i18n( "Disc %1" ).tqarg( discNumber ) ) );
+ << i18n( "Disc %1" ).arg( discNumber ) ) );
}
TQString track = albumValues[j + 2].stripWhiteSpace();
@@ -2921,7 +2921,7 @@ void CurrentTrackJob::showArtistsCompilations( const TQString &artist, uint arti
TQString tracktitle_formated;
TQString tracktitle;
- tracktitle = escapeHTML( i18n("%1 - %2").tqarg( albumValues[j + 5], albumValues[j] ) );
+ tracktitle = escapeHTML( i18n("%1 - %2").arg( albumValues[j + 5], albumValues[j] ) );
tracktitle_formated = "\n";
if( i==vectorPlace && albumValues[j + 2].toInt() == m_currentTrack.track() && discNumber.toInt() == m_currentTrack.discNumber() )
tracktitle_formated += "\n";
@@ -2966,11 +2966,11 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
rating = 10;
TQString table = TQString( "\n" )
- .tqarg( statsbox ? "class='statsBox'" : "" );
+ .arg( statsbox ? "class='statsBox'" : "" );
TQString contents;
if( AmarokConfig::useScores() )
- contents += TQString( "\n" ).tqarg( i18n( "Score: %1" ).tqarg( score ) ) +
+ contents += TQString( " \n" ).arg( i18n( "Score: %1" ).arg( score ) ) +
"| \n" + TQString::number( score ) + " | \n"
"\n"
"\n"
@@ -2982,8 +2982,8 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
if( AmarokConfig::useRatings() )
{
- contents += TQString( " \n" ).tqarg( i18n( "Rating: %1" )
- .tqarg( MetaBundle::ratingDescription( rating ) ) ) +
+ contents += TQString( " \n" ).arg( i18n( "Rating: %1" )
+ .arg( MetaBundle::ratingDescription( rating ) ) ) +
"\n";
if( rating )
{
@@ -3002,7 +3002,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
const TQString img = " \n";
for( int i = 0, n = rating / 2; i < n; ++i )
- contents += img.tqarg( TQString("data:image/png;base64," + fullStar) );
+ contents += img.arg( TQString("data:image/png;base64," + fullStar) );
if( rating % 2 )
{
TQImageIO halfStarIO;
@@ -3014,7 +3014,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
halfStarIO.write();
halfStarBuf.close();
TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true );
- contents += img.tqarg( TQString("data:image/png;base64," + halfStar) );
+ contents += img.arg( TQString("data:image/png;base64," + halfStar) );
}
contents += "\n";
}
@@ -3024,7 +3024,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
" | \n";
}
- return table.tqarg( contents );
+ return table.arg( contents );
}
bool CurrentTrackJob::doJob()
@@ -3220,7 +3220,7 @@ ContextBrowser::getEncodedImage( const TQString &imageUrl )
tqApp->lock();
img.save( &buffer, "PNG" ); // writes image into ba in PNG format
tqApp->unlock();
- const TQString coverImage = TQString( "data:image/png;base64,%1" ).tqarg( KCodecs::base64Encode( ba ).data() );
+ const TQString coverImage = TQString( "data:image/png;base64,%1" ).arg( KCodecs::base64Encode( ba ).data() );
//debug() << "Encoded imageUrl: " << coverImage << endl;
return coverImage;
}
@@ -3282,7 +3282,7 @@ void ContextBrowser::showLyrics( const TQString &url )
}
m_lyricSearchUrl = TQString( "http://www.google.com/search?ie=UTF-8&q=lyrics+%1+%2" )
- .tqarg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ),
+ .arg( KURL::encode_string_no_slash( '"' + artist + '"', 106 /*utf-8*/ ),
KURL::encode_string_no_slash( '"' + title + '"', 106 /*utf-8*/ ) );
m_lyricsToolBar->getButton( LYRICS_BROWSER )->setEnabled(false);
@@ -3294,7 +3294,7 @@ void ContextBrowser::showLyrics( const TQString &url )
" \n"+
i18n( "Available Lyrics Scripts:" ) + " \n";
foreach ( scripts ) {
- lyrics += TQString( " %2\n" ).tqarg( *it, *it );
+ lyrics += TQString( " %2\n" ).arg( *it, *it );
}
lyrics += " \n" + i18n( "Click on one of the scripts to run it, or use the Script Manager, to be able"
" to see all the scripts, and download new ones from the Web." );
@@ -3425,12 +3425,12 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT
const TQString artist = l.item( i ).toElement().attribute( "artist" );
const TQString title = l.item( i ).toElement().attribute( "title" );
- lyrics += " \n" + i18n("%1 - %2").tqarg( artist, title );
+ lyrics += "\n" + i18n("%1 - %2").arg( artist, title );
lyrics += "\n";
}
}
lyrics += i18n( " You can search for the lyrics on the Web. " )
- .tqarg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) );
+ .arg( TQString( m_lyricSearchUrl ).replace( TQRegExp( "^http:" ), "externalurl:" ) );
}
else {
lyrics = el.text();
@@ -3444,7 +3444,7 @@ ContextBrowser::lyricsResult( TQCString cXmlDoc, bool cached ) //SLOT
lyrics.prepend( " \n" + title + "
\n" + artist+ "\n" );
if( !cached ) {
- lyrics.append( " \n" + i18n( "Powered by %1 (%2)" ).tqarg( site, site_url ) + "\n" );
+ lyrics.append( " \n" + i18n( "Powered by %1 (%2)" ).arg( site, site_url ) + "\n" );
CollectionDB::instance()->setLyrics( EngineController::instance()->bundle().url().path(), xmldoc, EngineController::instance()->bundle().uniqueId() );
}
}
@@ -3742,7 +3742,7 @@ ContextBrowser::wikiURL( const TQString &item )
// add any special characters to be replaced here
TQString wStr = TQString(item).replace( "/", " " );
- return TQString( "http://%1.wikipedia.org/wiki/" ).tqarg( wikiLocale() )
+ return TQString( "http://%1.wikipedia.org/wiki/" ).arg( wikiLocale() )
+ KURL::encode_string_no_slash( wStr, 106 /*utf-8*/ );
}
@@ -3783,7 +3783,7 @@ ContextBrowser::showLabelsDialog()
m_labelListView = new TQListView( dialog->mainWidget() );
m_labelListView->addColumn( i18n( "Label" ) );
- m_labelListView->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ m_labelListView->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_labelListView->setColumnWidthMode( 0, TQListView::Maximum );
foreach( allLabels )
@@ -3815,7 +3815,7 @@ ContextBrowser::showLabelsDialog()
showCurrentTrack();
}
}
- delete dialog; //deletes tqchildren
+ delete dialog; //deletes children
m_addLabelEdit = 0;
m_labelListView = 0;
}
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 6212e418..13d11812 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -15,7 +15,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -43,7 +43,7 @@ Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artis
menu.insertTitle( i18n( "Cover Image" ) );
menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW );
- menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH );
+ menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH );
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM );
bool disable = !album.isEmpty(); // disable setting covers for unknown albums
menu.setItemEnabled( FETCH, disable );
@@ -143,7 +143,7 @@ CoverFetcher::CoverFetcher( TQWidget *parent, const TQString &artist, TQString a
//the others have the above strings removed with the following regex, as this can increase hit-rate
const TQString template1 = " ?-? ?[(^{]* ?%1 ?\\d*[)^}\\]]* *$"; //eg album - [disk 1] -> album
foreach( extensions ) {
- TQRegExp regexp( template1.tqarg( *it ) );
+ TQRegExp regexp( template1.arg( *it ) );
regexp.setCaseSensitive( false );
album.remove( regexp );
}
@@ -599,13 +599,13 @@ CoverFetcher::getUserQuery( TQString explanation )
KPushButton *nextcover = new KPushButton( i18n( "&Next Cover" ), buttons, "NextCover" );
KPushButton *cancel = new KPushButton( KStdGuiItem::cancel(), buttons );
- labelPix ->tqsetAlignment( TQt::AlignHCenter );
- labelName->tqsetAlignment( TQt::AlignHCenter );
+ labelPix ->setAlignment( TQt::AlignHCenter );
+ labelName->setAlignment( TQt::AlignHCenter );
labelPix ->setPixmap( cover );
labelName->setText( productname );
save->setDefault( true );
- this->setFixedSize( tqsizeHint() );
+ this->setFixedSize( sizeHint() );
this->setCaption( i18n("Cover Found") );
connect( save, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 1ea6a28d..76530133 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -20,10 +20,10 @@
#include //paintItem()
#include
#include
-#include
+#include
#include //used to delete all cover fetchers
#include //paintItem()
-#include //paintItem()
+#include //paintItem()
#include
#include
#include
@@ -73,9 +73,9 @@ class ArtistItem : public KListViewItem
TQString a = text(0);
TQString b = i->text(0);
- if ( a.tqstartsWith( "the ", false ) )
+ if ( a.startsWith( "the ", false ) )
CollectionView::manipulateThe( a, true );
- if ( b.tqstartsWith( "the ", false ) )
+ if ( b.startsWith( "the ", false ) )
CollectionView::manipulateThe( b, true );
return TQString::localeAwareCompare( a.lower(), b.lower() );
@@ -276,10 +276,10 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album,
{
KWin::setType( winId(), NET::Utility );
kapp->setTopWidget( this );
- setCaption( kapp->makeStdCaption( i18n("%1 - %2").tqarg( artist, album ) ) );
+ setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) );
- m_tqlayout = new TQHBoxLayout( this );
- m_tqlayout->setAutoAdd( true );
+ m_layout = new TQHBoxLayout( this );
+ m_layout->setAutoAdd( true );
m_pixmapViewer = new PixmapViewer( this, m_pixmap );
setFixedSize( m_pixmapViewer->maximalSize() );
@@ -396,7 +396,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT
//NOTE we MUST show the dialog, otherwise the closeEvents get processed
// in the processEvents() calls below, GRUMBLE! TQt sux0rs
progress.show();
- progress.tqrepaint( false ); //ensures the dialog isn't blank
+ progress.repaint( false ); //ensures the dialog isn't blank
//this is an extra processEvent call for the sake of init() and aesthetics
//it isn't necessary
@@ -499,7 +499,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO
}
else {
menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW );
- menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH );
+ menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH );
menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM );
menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );
menu.insertSeparator();
@@ -817,9 +817,9 @@ void CoverManager::updateStatusBar()
if ( values.count() >= 2 )
{
if( values[0].isEmpty() )
- text = i18n( "Fetching cover for %1..." ).tqarg( values[1] );
+ text = i18n( "Fetching cover for %1..." ).arg( values[1] );
else
- text = i18n( "Fetching cover for %1 - %2..." ).tqarg( values[0], values[1] );
+ text = i18n( "Fetching cover for %1 - %2..." ).arg( values[0], values[1] );
}
}
else if( m_fetchingCovers ) {
@@ -851,7 +851,7 @@ void CoverManager::updateStatusBar()
}
if( !m_filter.isEmpty() )
- text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).tqarg( m_filter );
+ text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).arg( m_filter );
else if( m_artistView->selectedItem() ) {
text = i18n( "1 album", "%n albums", totalCounter );
if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist
@@ -864,7 +864,7 @@ void CoverManager::updateStatusBar()
}
if( missingCounter )
- text += i18n(" - ( %1 without cover )" ).tqarg( missingCounter );
+ text += i18n(" - ( %1 without cover )" ).arg( missingCounter );
#ifdef AMAZON_SUPPORT
m_fetchButton->setEnabled( missingCounter );
@@ -912,7 +912,7 @@ TQDragObject *CoverView::dragObject()
return 0;
const TQString sql = "SELECT tags.url FROM tags, album WHERE album.name %1 AND tags.album = album.id ORDER BY tags.track;";
- const TQStringList values = CollectionDB::instance()->query( sql.tqarg( CollectionDB::likeCondition( item->album() ) ) );
+ const TQStringList values = CollectionDB::instance()->query( sql.arg( CollectionDB::likeCondition( item->album() ) ) );
KURL::List urls;
for( TQStringList::ConstIterator it = values.begin(), end = values.end(); it != end; ++it )
@@ -939,8 +939,8 @@ void CoverView::setStatusText( TQIconViewItem *item )
//FIXME: Don't rely on other independent code, use an sql query
if( item->artist().isEmpty() ) sampler = true;
- TQString tipContent = i18n( "%1 - %2" ).tqarg( sampler ? i18n("Various Artists") : item->artist() )
- .tqarg( item->album() );
+ TQString tipContent = i18n( "%1 - %2" ).arg( sampler ? i18n("Various Artists") : item->artist() )
+ .arg( item->album() );
CoverManager::instance()->setStatusText( tipContent );
@@ -973,7 +973,7 @@ void CoverViewItem::loadCover()
m_coverImagePath = CollectionDB::instance()->albumImage( m_artist, m_album, false, 1, &m_embedded );
m_coverPixmap = TQPixmap( m_coverImagePath ); //create the scaled cover
- tqrepaint();
+ repaint();
}
@@ -983,27 +983,27 @@ void CoverViewItem::calcRect( const TQString& )
TQFontMetrics fm = iconView()->fontMetrics();
TQRect itemPixmapRect( 5, 1, thumbWidth, thumbWidth );
- TQRect tqitemRect = rect();
- tqitemRect.setWidth( thumbWidth + 10 );
- tqitemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 );
- TQRect itemTextRect( 0, thumbWidth+2, tqitemRect.width(), fm.lineSpacing() );
+ TQRect itemRect = rect();
+ itemRect.setWidth( thumbWidth + 10 );
+ itemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 );
+ TQRect itemTextRect( 0, thumbWidth+2, itemRect.width(), fm.lineSpacing() );
setPixmapRect( itemPixmapRect );
setTextRect( itemTextRect );
- setItemRect( tqitemRect );
+ setItemRect( itemRect );
}
void CoverViewItem::paintItem(TQPainter* p, const TQColorGroup& cg)
{
- TQRect tqitemRect = rect();
+ TQRect itemRect = rect();
p->save();
- p->translate( tqitemRect.x(), tqitemRect.y() );
+ p->translate( itemRect.x(), itemRect.y() );
// draw the border
p->setPen( cg.mid() );
- p->drawRect( 0, 0, tqitemRect.width(), pixmapRect().height()+2 );
+ p->drawRect( 0, 0, itemRect.width(), pixmapRect().height()+2 );
// draw the cover image
if( !m_coverPixmap.isNull() )
diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h
index fc271c65..1c7680eb 100644
--- a/amarok/src/covermanager.h
+++ b/amarok/src/covermanager.h
@@ -136,7 +136,7 @@ class CoverViewItem : public KIconViewItem
TQPixmap coverPixmap() const { return m_coverPixmap; }
protected:
- void paintItem(TQPainter* painter, const TQColorGroup& tqcolorGroup);
+ void paintItem(TQPainter* painter, const TQColorGroup& colorGroup);
void paintFocus(TQPainter *, const TQColorGroup &) { }
void dropped( TQDropEvent *, const TQValueList & );
void dragEntered();
@@ -160,7 +160,7 @@ class CoverViewDialog : public TQDialog {
CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent);
private:
- TQHBoxLayout *m_tqlayout;
+ TQHBoxLayout *m_layout;
TQPixmap m_pixmap;
PixmapViewer *m_pixmapViewer;
TQLabel *m_label;
diff --git a/amarok/src/cuefile.cpp b/amarok/src/cuefile.cpp
index f28788dc..cf109848 100644
--- a/amarok/src/cuefile.cpp
+++ b/amarok/src/cuefile.cpp
@@ -87,7 +87,7 @@ bool CueFile::load(int mediaLength)
{
line = stream.readLine().simplifyWhiteSpace();
- if( line.tqstartsWith( "title", false ) )
+ if( line.startsWith( "title", false ) )
{
title = line.mid( 6 ).remove( '"' );
if( mode == BEGIN )
@@ -100,7 +100,7 @@ bool CueFile::load(int mediaLength)
debug() << "Title: " << title << endl;
}
- else if( line.tqstartsWith( "performer", false ))
+ else if( line.startsWith( "performer", false ))
{
artist = line.mid( 10 ).remove( '"' );
if( mode == BEGIN )
@@ -113,7 +113,7 @@ bool CueFile::load(int mediaLength)
debug() << "Artist: " << artist << endl;
}
- else if( line.tqstartsWith( "track", false ) )
+ else if( line.startsWith( "track", false ) )
{
if( mode == TRACK_FOUND )
{
@@ -139,7 +139,7 @@ bool CueFile::load(int mediaLength)
debug() << "Track: " << track << endl;
mode = TRACK_FOUND;
}
- else if( line.tqstartsWith( "index", false ) )
+ else if( line.startsWith( "index", false ) )
{
if( mode == TRACK_FOUND)
{
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index f6fd7979..980a3dda 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -81,7 +81,7 @@ CollectionDB::CollectionDB()
// Load DBEngine plugin
TQString query = "[X-KDE-Amarok-plugintype] == 'dbengine' and [X-KDE-Amarok-name] != '%1'";
- KTrader::OfferList offers = PluginManager::query( query.tqarg( "sqlite-dbengine" ) );
+ KTrader::OfferList offers = PluginManager::query( query.arg( "sqlite-dbengine" ) );
m_dbEngine = (DBEngine*) PluginManager::createFromService( offers.first() );
//
@@ -272,8 +272,8 @@ CollectionDB::createTables( DbConnection *conn )
"length INTEGER,"
"samplerate INTEGER,"
"sampler BOOL );" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" ), conn );
TQString albumAutoIncrement = "";
TQString artistAutoIncrement = "";
@@ -302,59 +302,59 @@ CollectionDB::createTables( DbConnection *conn )
query( TQString( "CREATE %1 TABLE album%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" )
- .tqarg( albumAutoIncrement ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" )
+ .arg( albumAutoIncrement ), conn );
//create artist table
query( TQString( "CREATE %1 TABLE artist%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" )
- .tqarg( artistAutoIncrement ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" )
+ .arg( artistAutoIncrement ), conn );
//create genre table
query( TQString( "CREATE %1 TABLE genre%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() +");" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" )
- .tqarg( genreAutoIncrement ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" )
+ .arg( genreAutoIncrement ), conn );
//create year table
query( TQString( "CREATE %1 TABLE year%2 ("
"id INTEGER PRIMARY KEY %3,"
"name " + textColumnType() + ");" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" )
- .tqarg( yearAutoIncrement ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" )
+ .arg( yearAutoIncrement ), conn );
//create images table
query( TQString( "CREATE %1 TABLE images%2 ("
"path " + textColumnType() + ","
"artist " + textColumnType() + ","
"album " + textColumnType() + ");" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" ), conn );
// create directory statistics table
query( TQString( "CREATE %1 TABLE directories%2 ("
"dir " + textColumnType() + " UNITQUE,"
"changedate INTEGER );" )
- .tqarg( conn ? "TEMPORARY" : "" )
- .tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "TEMPORARY" : "" )
+ .arg( conn ? "_temp" : "" ), conn );
//create indexes
query( TQString( "CREATE INDEX album_idx%1 ON album%2( name );" )
- .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "CREATE INDEX artist_idx%1 ON artist%2( name );" )
- .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "CREATE INDEX genre_idx%1 ON genre%2( name );" )
- .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn );
query( TQString( "CREATE INDEX year_idx%1 ON year%2( name );" )
- .tqarg( conn ? "_temp" : "" ).tqarg( conn ? "_temp" : "" ), conn );
+ .arg( conn ? "_temp" : "" ).arg( conn ? "_temp" : "" ), conn );
if ( !conn )
{
@@ -385,13 +385,13 @@ CollectionDB::dropTables( DbConnection *conn )
{
DEBUG_FUNC_INFO
- query( TQString( "DROP TABLE tags%1;" ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "DROP TABLE album%1;" ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "DROP TABLE artist%1;" ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "DROP TABLE genre%1;" ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "DROP TABLE year%1;" ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "DROP TABLE images%1;" ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "DROP TABLE directories%1;" ).tqarg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE tags%1;" ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE album%1;" ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE artist%1;" ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE genre%1;" ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE year%1;" ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE images%1;" ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "DROP TABLE directories%1;" ).arg( conn ? "_temp" : "" ), conn );
if ( !conn )
{
query( TQString( "DROP TABLE related_artists;" ) );
@@ -421,16 +421,16 @@ CollectionDB::clearTables( DbConnection *conn )
clearCommand = "TRUNCATE TABLE";
}
- query( TQString( "%1 tags%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "%1 album%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "%1 artist%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "%1 genre%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "%1 year%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "%1 images%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
- query( TQString( "%1 directories%2;" ).tqarg( clearCommand ).tqarg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 tags%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 album%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 artist%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 genre%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 year%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 images%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
+ query( TQString( "%1 directories%2;" ).arg( clearCommand ).arg( conn ? "_temp" : "" ), conn );
if ( !conn )
{
- query( TQString( "%1 related_artists;" ).tqarg( clearCommand ) );
+ query( TQString( "%1 related_artists;" ).arg( clearCommand ) );
}
}
@@ -584,16 +584,16 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const
TQStringList values =
query( TQString(
"SELECT id, name FROM %1 WHERE name LIKE '%2';" )
- .tqarg( name )
- .tqarg( CollectionDB::instance()->escapeString( value ) ), conn );
+ .arg( name )
+ .arg( CollectionDB::instance()->escapeString( value ) ), conn );
if ( updateSpelling && !values.isEmpty() && ( values[1] != value ) )
{
query( TQString( "UPDATE %1 SET id = %2, name = '%3' WHERE id = %4;" )
- .tqarg( name )
- .tqarg( values.first() )
- .tqarg( CollectionDB::instance()->escapeString( value ) )
- .tqarg( values.first() ), conn );
+ .arg( name )
+ .arg( values.first() )
+ .arg( CollectionDB::instance()->escapeString( value ) )
+ .arg( values.first() ), conn );
}
//check if item exists. if not, should we autocreate it?
@@ -601,8 +601,8 @@ CollectionDB::IDFromValue( TQString name, TQString value, bool autocreate, const
if ( values.isEmpty() && autocreate )
{
id = insert( TQString( "INSERT INTO %1 ( name ) VALUES ( '%2' );" )
- .tqarg( name )
- .tqarg( CollectionDB::instance()->escapeString( value ) ), name, conn );
+ .arg( name )
+ .arg( CollectionDB::instance()->escapeString( value ) ), name, conn );
return id;
}
@@ -617,8 +617,8 @@ CollectionDB::valueFromID( TQString table, uint id )
TQStringList values =
query( TQString(
"SELECT name FROM %1 WHERE id=%2;" )
- .tqarg( table )
- .tqarg( id ) );
+ .arg( table )
+ .arg( id ) );
return values.isEmpty() ? 0 : values.first();
@@ -631,8 +631,8 @@ CollectionDB::albumSongCount( const TQString &artist_id, const TQString &album_i
TQStringList values =
query( TQString(
"SELECT COUNT( url ) FROM tags WHERE album = %1 AND artist = %2;" )
- .tqarg( album_id )
- .tqarg( artist_id ) );
+ .arg( album_id )
+ .arg( artist_id ) );
return values.first();
}
@@ -642,8 +642,8 @@ CollectionDB::albumIsCompilation( const TQString &album_id )
TQStringList values =
query( TQString(
"SELECT sampler FROM tags WHERE sampler=%1 AND album=%2" )
- .tqarg( CollectionDB::instance()->boolT() )
- .tqarg( album_id ) );
+ .arg( CollectionDB::instance()->boolT() )
+ .arg( album_id ) );
return (values.count() != 0);
}
@@ -655,17 +655,17 @@ CollectionDB::albumTracks( const TQString &artist_id, const TQString &album_id )
return query( TQString( "SELECT tags.url, tags.track AS __discard FROM tags, year WHERE tags.album = %1 AND "
"( tags.sampler = %2 OR tags.artist = %3 ) AND year.id = tags.year "
"ORDER BY tags.track;" )
- .tqarg( album_id )
- .tqarg( boolT() )
- .tqarg( artist_id ) );
+ .arg( album_id )
+ .arg( boolT() )
+ .arg( artist_id ) );
}
else
{
return query( TQString( "SELECT tags.url FROM tags, year WHERE tags.album = %1 AND "
"( tags.sampler = 1 OR tags.artist = %2 ) AND year.id = tags.year "
"ORDER BY tags.track;" )
- .tqarg( album_id )
- .tqarg( artist_id ) );
+ .arg( album_id )
+ .arg( artist_id ) );
}
}
@@ -680,10 +680,10 @@ CollectionDB::addImageToAlbum( const TQString& image, TQValueList< TQPairurl().path() ) ) );
+ .arg( escapeString( bundle->url().path() ) ) );
if ( !values.empty() )
fillInBundle( values, *bundle );
@@ -1260,10 +1260,10 @@ void
CollectionDB::addAudioproperties( const MetaBundle& bundle )
{
query( TQString( "UPDATE tags SET bitrate='%1', length='%2', samplerate='%3' WHERE url='%4';" )
- .tqarg( bundle.bitrate() )
- .tqarg( bundle.length() )
- .tqarg( bundle.sampleRate() )
- .tqarg( escapeString( bundle.url().path() ) ) );
+ .arg( bundle.bitrate() )
+ .arg( bundle.length() )
+ .arg( bundle.sampleRate() )
+ .arg( escapeString( bundle.url().path() ) ) );
}
@@ -1275,7 +1275,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
query( TQString(
"SELECT playcounter, createdate, percentage FROM statistics "
"WHERE url = '%1';" )
- .tqarg( escapeString( url ) ) );
+ .arg( escapeString( url ) ) );
// check boundaries
if ( percentage > 100 ) percentage = 100;
@@ -1288,19 +1288,19 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
query( TQString( "UPDATE statistics SET percentage=%1, playcounter=%2+1 WHERE url='%3';" )
- .tqarg( score )
- .tqarg( values[0] + " + 1" )
- .tqarg( escapeString( url ) ) );
+ .arg( score )
+ .arg( values[0] + " + 1" )
+ .arg( escapeString( url ) ) );
}
else
{
query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, %5 );" )
- .tqarg( escapeString( url ) )
- .tqarg( values[1] )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( score )
- .tqarg( values[0] + " + 1" ) );
+ .arg( escapeString( url ) )
+ .arg( values[1] )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( score )
+ .arg( values[0] + " + 1" ) );
}
}
else
@@ -1310,10 +1310,10 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, 1 );" )
- .tqarg( escapeString( url ) )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( score ), NULL );
+ .arg( escapeString( url ) )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( score ), NULL );
}
int iscore = getSongPercentage( url );
@@ -1326,7 +1326,7 @@ int
CollectionDB::getSongPercentage( const TQString &url )
{
TQStringList values = query( TQString( "SELECT round( percentage + 0.4 ) FROM statistics WHERE url = '%1';" )
- .tqarg( escapeString( url ) ) );
+ .arg( escapeString( url ) ) );
if( values.count() )
return values.first().toInt();
@@ -1341,7 +1341,7 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage )
TQStringList values =
query( TQString(
"SELECT playcounter, createdate, accessdate FROM statistics WHERE url = '%1';" )
- .tqarg( escapeString( url ) ) );
+ .arg( escapeString( url ) ) );
// check boundaries
if ( percentage > 100 ) percentage = 100;
@@ -1351,29 +1351,29 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage )
{
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
query( TQString( "UPDATE statistics SET percentage=%1 WHERE url='%2';" )
- .tqarg( percentage )
- .tqarg( escapeString( url ) ) );
+ .arg( percentage )
+ .arg( escapeString( url ) ) );
}
else
{
// entry exists
query( TQString( "REPLACE INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', '%2', '%3', %4, %5 );" )
- .tqarg( escapeString( url ) )
- .tqarg( values[1] )
- .tqarg( values[2] )
- .tqarg( percentage )
- .tqarg( values[0] ) );
+ .arg( escapeString( url ) )
+ .arg( values[1] )
+ .arg( values[2] )
+ .arg( percentage )
+ .arg( values[0] ) );
}
}
else
{
insert( TQString( "INSERT INTO statistics ( url, createdate, accessdate, percentage, playcounter ) "
"VALUES ( '%1', %2, %3, %4, 0 );" )
- .tqarg( escapeString( url ) )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
- .tqarg( percentage ), NULL );
+ .arg( escapeString( url ) )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( TQDateTime::currentDateTime().toTime_t() )
+ .arg( percentage ), NULL );
}
emit scoreChanged( url, percentage );
@@ -1388,16 +1388,16 @@ CollectionDB::updateDirStats( TQString path, const long datetime, DbConnection *
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
query( TQString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';")
- .tqarg( conn ? "_temp" : "" )
- .tqarg( datetime )
- .tqarg( escapeString( path ) ), conn );
+ .arg( conn ? "_temp" : "" )
+ .arg( datetime )
+ .arg( escapeString( path ) ), conn );
}
else
{
query( TQString( "REPLACE INTO directories%1 ( dir, changedate ) VALUES ( '%3', %2 );" )
- .tqarg( conn ? "_temp" : "" )
- .tqarg( datetime )
- .tqarg( escapeString( path ) ),
+ .arg( conn ? "_temp" : "" )
+ .arg( datetime )
+ .arg( escapeString( path ) ),
conn );
}
}
@@ -1410,7 +1410,7 @@ CollectionDB::removeSongsInDir( TQString path )
path = path.left( path.length() - 1 );
query( TQString( "DELETE FROM tags WHERE dir = '%1';" )
- .tqarg( escapeString( path ) ) );
+ .arg( escapeString( path ) ) );
}
@@ -1422,7 +1422,7 @@ CollectionDB::isDirInCollection( TQString path )
TQStringList values =
query( TQString( "SELECT changedate FROM directories WHERE dir = '%1';" )
- .tqarg( escapeString( path ) ) );
+ .arg( escapeString( path ) ) );
return !values.isEmpty();
}
@@ -1433,7 +1433,7 @@ CollectionDB::isFileInCollection( const TQString &url )
{
TQStringList values =
query( TQString( "SELECT url FROM tags WHERE url = '%1';" )
- .tqarg( escapeString( url ) ) );
+ .arg( escapeString( url ) ) );
return !values.isEmpty();
}
@@ -1445,7 +1445,7 @@ CollectionDB::removeSongs( const KURL::List& urls )
for( KURL::List::ConstIterator it = urls.begin(), end = urls.end(); it != end; ++it )
{
query( TQString( "DELETE FROM tags WHERE url = '%1';" )
- .tqarg( escapeString( (*it).path() ) ) );
+ .arg( escapeString( (*it).path() ) ) );
}
}
@@ -1457,12 +1457,12 @@ CollectionDB::similarArtists( const TQString &artist, uint count )
if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' OFFSET 0 LIMIT %2;" )
- .tqarg( escapeString( artist ) ).tqarg( count ) );
+ .arg( escapeString( artist ) ).arg( count ) );
}
else
{
values = query( TQString( "SELECT suggestion FROM related_artists WHERE artist = '%1' LIMIT 0, %2;" )
- .tqarg( escapeString( artist ) ).tqarg( count ) );
+ .arg( escapeString( artist ) ).arg( count ) );
}
if ( values.isEmpty() )
@@ -1480,8 +1480,8 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC
TQStringList dirs;
albums = query( TQString( "SELECT DISTINCT album.name FROM tags_temp, album%1 AS album WHERE tags_temp.dir = '%2' AND album.id = tags_temp.album;" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( escapeString( path ) ), conn );
+ .arg( temporary ? "_temp" : "" )
+ .arg( escapeString( path ) ), conn );
for ( uint i = 0; i < albums.count(); i++ )
{
@@ -1489,16 +1489,16 @@ CollectionDB::checkCompilations( const TQString &path, const bool temporary, DbC
const uint album_id = albumID( albums[ i ], false, temporary, false, conn );
artists = query( TQString( "SELECT DISTINCT artist.name FROM tags_temp, artist%1 AS artist WHERE tags_temp.album = '%2' AND tags_temp.artist = artist.id;" )
- .tqarg( temporary ? "_temp" : "" )
- .tqarg( album_id ), conn );
+ .arg( temporary ? "_temp" : "" )
+ .arg( album_id ), conn );
dirs = query( TQString( "SELECT DISTINCT dir FROM tags_temp WHERE album = '%1';" )
- .tqarg( album_id ), conn );
+ .arg( album_id ), conn );
if ( artists.count() > dirs.count() )
{
debug() << "Detected compilation: " << albums[ i ] << " - " << artists.count() << ":" << dirs.count() << endl;
query( TQString( "UPDATE tags_temp SET sampler = %1 WHERE album = '%2';" )
- .tqarg(boolT()).tqarg( album_id ), conn );
+ .arg(boolT()).arg( album_id ), conn );
}
}
}
@@ -1508,8 +1508,8 @@ void
CollectionDB::setCompilation( const TQString &album, const bool enabled, const bool updateView )
{
query( TQString( "UPDATE tags, album SET tags.sampler = %1 WHERE tags.album = album.id AND album.name = '%2';" )
- .tqarg( enabled ? "1" : "0" )
- .tqarg( escapeString( album ) ) );
+ .arg( enabled ? "1" : "0" )
+ .arg( escapeString( album ) ) );
// Update the Collection-Browser view,
// using TQTimer to make sure we don't manipulate the GUI from a thread
@@ -1525,7 +1525,7 @@ CollectionDB::removeDirFromCollection( TQString path )
path = path.left( path.length() - 1 );
query( TQString( "DELETE FROM directories WHERE dir = '%1';" )
- .tqarg( escapeString( path ) ) );
+ .arg( escapeString( path ) ) );
}
@@ -1755,13 +1755,13 @@ class SimilarArtistsInsertionJob : public ThreadWeaver::DependentJob
{
virtual bool doJob()
{
- CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).tqarg( escapedArtist ) );
+ CollectionDB::instance()->query( TQString( "DELETE FROM related_artists WHERE artist = '%1';" ).arg( escapedArtist ) );
const TQString sql = "INSERT INTO related_artists ( artist, suggestion, changedate ) VALUES ( '%1', '%2', 0 );";
foreach( suggestions )
CollectionDB::instance()->insert( sql
- .tqarg( escapedArtist )
- .tqarg( CollectionDB::instance()->escapeString( *it ) ), NULL );
+ .arg( escapedArtist )
+ .arg( CollectionDB::instance()->escapeString( *it ) ), NULL );
return true;
}
diff --git a/amarok/src/database_refactor/dbenginebase.cpp b/amarok/src/database_refactor/dbenginebase.cpp
index 12900a26..ec3a34b5 100644
--- a/amarok/src/database_refactor/dbenginebase.cpp
+++ b/amarok/src/database_refactor/dbenginebase.cpp
@@ -216,10 +216,10 @@ QueryBuilder::addMatch( int tables, int value, const TQString& match )
if ( !match.isEmpty() )
{
m_where += "AND ( true ";
- m_where += TQString( "OR %1.%2 LIKE '" ).tqarg( tableName( tables ) ).tqarg( valueName( value ) ) + escapeString( match ) + "' ";
+ m_where += TQString( "OR %1.%2 LIKE '" ).arg( tableName( tables ) ).arg( valueName( value ) ) + escapeString( match ) + "' ";
if ( ( value & valName ) && match == i18n( "Unknown" ) )
- m_where += TQString( "OR %1.%2 = '' " ).tqarg( tableName( tables ) ).tqarg( valueName( value ) );
+ m_where += TQString( "OR %1.%2 = '' " ).arg( tableName( tables ) ).arg( valueName( value ) );
m_where += " ) ";
}
@@ -410,7 +410,7 @@ QueryBuilder::groupBy( int table, int value )
void
QueryBuilder::setLimit( int startPos, int length )
{
- m_limit = TQString( " LIMIT %1, %2 " ).tqarg( startPos ).tqarg( length );
+ m_limit = TQString( " LIMIT %1, %2 " ).arg( startPos ).arg( length );
}
diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui
index 6625649b..f8186c08 100644
--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@@ -102,7 +102,7 @@
kcfg_MySqlPort
-
+
100
32767
@@ -164,7 +164,7 @@
- tqlayout4
+ layout4
@@ -281,7 +281,7 @@
kcfg_PostgresqlPort
-
+
100
32767
@@ -343,7 +343,7 @@
- tqlayout4
+ layout4
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index b57ba895..49e1d4b0 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -25,7 +25,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui
index 7ca52143..bd4e2a5c 100644
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@@ -12,7 +12,7 @@
374
-
+
420
320
@@ -27,7 +27,7 @@
- tqlayout4
+ layout4
@@ -51,7 +51,7 @@
- tqlayout3
+ layout3
@@ -64,7 +64,7 @@
Deletion method placeholder, never shown to user.
-
+
WordBreak|AlignCenter
@@ -93,7 +93,7 @@
Placeholder for number of files, not in GUI
-
+
AlignVCenter|AlignRight
diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
index a8475796..57b0c3d4 100644
--- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp
+++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp
@@ -126,20 +126,20 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m
{
TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint "
"FROM devices WHERE type = 'uuid' "
- "AND uuid = '%1';" ).tqarg( m->id() ) );
+ "AND uuid = '%1';" ).arg( m->id() ) );
if ( ids.size() == 3 )
{
debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl;
CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE "
- "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) );
+ "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) );
return new MassStorageDeviceHandler( ids[0].toInt(), m->mountPoint(), m->id() );
}
else
{
int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) "
"VALUES ( 'uuid', '%1', '%2' );" )
- .tqarg( m->id() )
- .tqarg( m->mountPoint() ), "devices" );
+ .arg( m->id() )
+ .arg( m->mountPoint() ), "devices" );
if ( id == 0 )
{
warning() << "Inserting into devices failed for type=uuid, uuid=" << m->id() << endl;
diff --git a/amarok/src/device/nfs/nfsdevicehandler.cpp b/amarok/src/device/nfs/nfsdevicehandler.cpp
index ac7a3de3..ac831d7d 100644
--- a/amarok/src/device/nfs/nfsdevicehandler.cpp
+++ b/amarok/src/device/nfs/nfsdevicehandler.cpp
@@ -135,13 +135,13 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const
TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint "
"FROM devices WHERE type = 'nfs' "
"AND servername = '%1' AND sharename = '%2';" )
- .tqarg( server )
- .tqarg( share ) );
+ .arg( server )
+ .arg( share ) );
if ( ids.size() == 3 )
{
debug() << "Found existing NFS config for ID " << ids[0] << " , server " << server << " ,share " << share << endl;
CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE "
- "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) );
+ "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) );
return new NfsDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() );
}
else
@@ -149,9 +149,9 @@ NfsDeviceHandlerFactory::createHandler( const Medium * m ) const
int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices"
"( type, servername, sharename, lastmountpoint ) "
"VALUES ( 'nfs', '%1', '%2', '%3' );" )
- .tqarg( server )
- .tqarg( share )
- .tqarg( m->mountPoint() ), "devices" );
+ .arg( server )
+ .arg( share )
+ .arg( m->mountPoint() ), "devices" );
if ( id == 0 )
{
warning() << "Inserting into devices failed for type=nfs, server=" << server << ", share=" << share << endl;
diff --git a/amarok/src/device/smb/smbdevicehandler.cpp b/amarok/src/device/smb/smbdevicehandler.cpp
index 072c36a8..de5e7cbb 100644
--- a/amarok/src/device/smb/smbdevicehandler.cpp
+++ b/amarok/src/device/smb/smbdevicehandler.cpp
@@ -137,13 +137,13 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const
TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint "
"FROM devices WHERE type = 'smb' "
"AND servername = '%1' AND sharename = '%2';" )
- .tqarg( server )
- .tqarg( share ) );
+ .arg( server )
+ .arg( share ) );
if ( ids.size() == 3 )
{
debug() << "Found existing SMB config for ID " << ids[0] << " , server " << server << " ,share " << share << endl;
CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE "
- "id = %1;" ).tqarg( ids[0] ).tqarg( m->mountPoint() ) );
+ "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) );
return new SmbDeviceHandler( ids[0].toInt(), server, share, m->mountPoint() );
}
else
@@ -151,9 +151,9 @@ SmbDeviceHandlerFactory::createHandler( const Medium * m ) const
int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices"
"( type, servername, sharename, lastmountpoint ) "
"VALUES ( 'smb', '%1', '%2', '%3' );" )
- .tqarg( server )
- .tqarg( share )
- .tqarg( m->mountPoint() ), "devices" );
+ .arg( server )
+ .arg( share )
+ .arg( m->mountPoint() ), "devices" );
if ( id == 0 )
{
warning() << "Inserting into devices failed for type=smb, server=" << server << ", share=" << share << endl;
diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp
index 91c4641c..78cf15d3 100644
--- a/amarok/src/directorylist.cpp
+++ b/amarok/src/directorylist.cpp
@@ -39,7 +39,7 @@ CollectionSetup::CollectionSetup( TQWidget *parent )
(new TQLabel( i18n(
"These folders will be scanned for "
- "media to make up your collection:"), this ))->tqsetAlignment( TQt::WordBreak );
+ "media to make up your collection:"), this ))->setAlignment( TQt::WordBreak );
m_view = new TQFixedListView( this );
m_recursive = new TQCheckBox( i18n("&Scan folders recursively"), this );
@@ -61,7 +61,7 @@ CollectionSetup::CollectionSetup( TQWidget *parent )
m_view->addColumn( TQString() );
m_view->setRootIsDecorated( true );
- m_view->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ m_view->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
m_view->setResizeMode( TQListView::LastColumn );
reinterpret_cast(m_view->header())->hide();
@@ -212,8 +212,8 @@ Item::stateChange( bool b )
}
}
else {
- //Deselect item and recurse through tqchildren but only deselect tqchildren if they
- //do not exist unless we are in recursive mode (where no tqchildren should be
+ //Deselect item and recurse through children but only deselect children if they
+ //do not exist unless we are in recursive mode (where no children should be
//selected if the parent is being unselected)
//Note this does not do anything to the checkboxes, but they should be doing
//the same thing as we are (hopefully)
@@ -258,7 +258,7 @@ Item::newItems( const KFileItemList &list ) //SLOT
for( KFileItemListIterator it( list ); *it; ++it )
{
//Fully disable (always appears off and grayed-out) if it is "/proc", "/sys" or
- //"/dev" or one of their tqchildren. This is because we will never scan them, so we
+ //"/dev" or one of their children. This is because we will never scan them, so we
//might as well show that.
//These match up with the skipped dirs in CollectionScanner::readDir.
bool fully_disable=false;
@@ -294,7 +294,7 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width,
// Figure out if a child folder is activated
for ( TQStringList::const_iterator iter = cs_m_dirs.begin(); iter != cs_m_dirs.end();
++iter )
- if ( ( *iter ).tqstartsWith( m_url.path(1) ) )
+ if ( ( *iter ).startsWith( m_url.path(1) ) )
if ( *iter != "/" ) // "/" should not match as a child of "/"
dirty = true;
@@ -303,13 +303,13 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width,
TQColorGroup _cg = cg;
if ( dirty )
{
- _cg.setColor( TQColorGroup::Text, listView()->tqcolorGroup().link() );
+ _cg.setColor( TQColorGroup::Text, listView()->colorGroup().link() );
TQFont font = p->font();
font.setBold( !font.bold() );
p->setFont( font );
}
- TQCheckListItem::paintCell( p, isDisabled() ? listView()->tqpalette().disabled() : _cg, column, width, align );
+ TQCheckListItem::paintCell( p, isDisabled() ? listView()->palette().disabled() : _cg, column, width, align );
p->setFont( f );
}
diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h
index 0065f04f..8125557a 100644
--- a/amarok/src/directorylist.h
+++ b/amarok/src/directorylist.h
@@ -30,12 +30,12 @@
namespace Collection { class Item; }
class TQFixedListView : public TQListView
-// Reimplement tqsizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions
+// Reimplement sizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions
{
public:
TQFixedListView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
:TQListView(parent, name, f) {};
- TQSize tqsizeHint() const
+ TQSize sizeHint() const
{
return TQSize(400, 100);
}
@@ -88,7 +88,7 @@ public:
public slots:
void newItems( const KFileItemList& );
- void completed() { if( childCount() == 0 ) { setExpandable( false ); tqrepaint(); } }
+ void completed() { if( childCount() == 0 ) { setExpandable( false ); repaint(); } }
private:
KDirLister m_lister;
diff --git a/amarok/src/dynamicmode.cpp b/amarok/src/dynamicmode.cpp
index 6695a273..1bc8aa7b 100644
--- a/amarok/src/dynamicmode.cpp
+++ b/amarok/src/dynamicmode.cpp
@@ -274,8 +274,8 @@ DEBUG_BLOCK
{
TQRegExp limit( "(LIMIT.*)?;$" );
sql.replace( limit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;")
- .tqarg( CollectionDB::instance()->randomFunc() )
- .tqarg( songCount ) );
+ .arg( CollectionDB::instance()->randomFunc() )
+ .arg( songCount ) );
}
else
{
@@ -309,8 +309,8 @@ DEBUG_BLOCK
TQRegExp orderLimit( "(ORDER BY.*)?;$" );
sql.replace( orderLimit, TQString(" ORDER BY %1 LIMIT %2 OFFSET 0;")
- .tqarg( CollectionDB::instance()->randomFunc() )
- .tqarg( songCount ) );
+ .arg( CollectionDB::instance()->randomFunc() )
+ .arg( songCount ) );
}
else // time ordered criteria, only mess with the limits
{
@@ -324,11 +324,11 @@ DEBUG_BLOCK
if( findLocation == -1 ) // there is no limit
{
TQRegExp queryEnd( ";$" ); // find the end of the query an add a limit
- sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount*5 ).tqarg( offset ) );
+ sql.replace( queryEnd, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount*5 ).arg( offset ) );
useDirect = false;
}
else // there is a limit, so find it and replace it
- sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).tqarg( songCount ).tqarg( offset ) );
+ sql.replace( limitSearch, TQString(" LIMIT %1 OFFSET %2;" ).arg( songCount ).arg( offset ) );
}
}
diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp
index f9dd1739..cf172e63 100644
--- a/amarok/src/editfilterdialog.cpp
+++ b/amarok/src/editfilterdialog.cpp
@@ -1,7 +1,7 @@
// (c) 2006 Giovanni Venturi
// See COPYING file for licensing information.
-#include
+#include
#include
#include
#include
@@ -223,7 +223,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
connect(m_spinMax1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxSpinChanged(int)));
TQHBoxLayout *filesizeLayout = new TQHBoxLayout( vertLayout );
- filesizeLayout->tqsetAlignment( AlignLeft );
+ filesizeLayout->setAlignment( AlignLeft );
m_filesizeLabel = new TQLabel( i18n("Unit:"), m_groupBox, "filesizeLabel");
filesizeLayout->addWidget( m_filesizeLabel );
filesizeLayout->addItem( new TQSpacerItem( 5, 10, TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
@@ -243,7 +243,7 @@ EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, c
connect( m_comboCondition, TQT_SIGNAL(activated(int)), TQT_SLOT(chooseCondition(int)) );
TQHBoxLayout *otherOptionsLayout = new TQHBoxLayout( plainPage() );
- otherOptionsLayout->tqsetAlignment( AlignHCenter );
+ otherOptionsLayout->setAlignment( AlignHCenter );
m_mainLay->addLayout( otherOptionsLayout );
// the groupbox to select the action filter
@@ -532,7 +532,7 @@ void EditFilterDialog::selectedKeyword(int index) // SLOT
{
// year: set useful values for the spinboxes
m_spinMin1->setValue( 1900 );
- m_spinMax1->setValue( TQDate::tqcurrentDate().year() );
+ m_spinMax1->setValue( TQDate::currentDate().year() );
valueWanted();
}
else if( key=="track" || key=="disc" || key=="discnumber" )
diff --git a/amarok/src/engine/akode/akode-engine.cpp b/amarok/src/engine/akode/akode-engine.cpp
index f2404012..26840589 100644
--- a/amarok/src/engine/akode/akode-engine.cpp
+++ b/amarok/src/engine/akode/akode-engine.cpp
@@ -180,7 +180,7 @@ AkodeEngine::event( TQEvent *e )
case 3002:
m_player->stop();
emit trackEnded();
- emit infoMessage( i18n("Unable to decode %1").tqarg( m_url.prettyURL()) );
+ emit infoMessage( i18n("Unable to decode %1").arg( m_url.prettyURL()) );
break;
default:
diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp
index 73080389..7a88820e 100644
--- a/amarok/src/engine/helix/helix-configdialog.cpp
+++ b/amarok/src/engine/helix/helix-configdialog.cpp
@@ -12,12 +12,12 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
@@ -53,7 +53,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
, m_valueChanged( false )
, m_stringValue( defaultvalue )
{
- TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
+ TQGridLayout *grid = (TQGridLayout*)parent->layout();
m_w = new KLineEdit( m_stringValue, parent );
connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
@@ -62,7 +62,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
TQToolTip::add( (TQWidget *) m_w, "" + tooltip );
TQLabel* d = new TQLabel( description + ':', parent );
- d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+ d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( (TQWidget *) m_w, row, 1 );
grid->addWidget( d, row, 0 );
@@ -79,7 +79,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
, m_valueChanged( false )
, m_stringValue( defaultvalue )
{
- TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
+ TQGridLayout *grid = (TQGridLayout*)parent->layout();
m_key = str;
@@ -90,7 +90,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
TQToolTip::add( m_w, "" + tooltip );
TQLabel* d = new TQLabel( description + ':', parent );
- d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+ d->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( m_w, row, 1 );
grid->addWidget( d, row, 0 );
@@ -110,7 +110,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
HelixEngine *engine )
: deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine)
{
- TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
+ TQGridLayout *grid = (TQGridLayout*)parent->layout();
deviceComboBox = new KComboBox( false, parent, "deviceComboBox" );
deviceComboBox->insertItem("oss"); // I believe these are not subject to translation (they don't seem to be in xine,
@@ -119,7 +119,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
#endif
deviceComboBox->setCurrentItem(HelixConfig::outputplugin());
TQLabel* op = new TQLabel( i18n("Output plugin:"), parent );
- op->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+ op->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( op, row, 0 );
grid->addWidget( deviceComboBox, row, 1);
connect( (TQWidget *)deviceComboBox, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( slotNewDevice( const TQString& )) );
@@ -128,7 +128,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
++row;
checkBox_outputDevice = new TQCheckBox( parent, "checkBox_outputDevice" );
- checkBox_outputDevice->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) );
+ checkBox_outputDevice->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) );
grid->addWidget( checkBox_outputDevice, row, 0 );
checkBox_outputDevice->setText( i18n( "Device:" ) );
@@ -276,7 +276,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
grid->setColStretch( 1, 1 );
if( sv )
- sv->setMinimumWidth( grid->tqsizeHint().width() + 20 );
+ sv->setMinimumWidth( grid->sizeHint().width() + 20 );
engine->m_coredir = HelixConfig::coreDirectory();
m_core = new HelixConfigEntry( parent, engine->m_coredir,
@@ -349,7 +349,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
TQTextEdit *le = new TQTextEdit( parent );
if( sv )
- sv->setMinimumWidth( le->tqsizeHint().width() );
+ sv->setMinimumWidth( le->sizeHint().width() );
grid = new TQGridLayout( parent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 );
grid->addMultiCellWidget( le, 0, 1, 0, 1, 0 );
diff --git a/amarok/src/engine/helix/helix-engine.cpp b/amarok/src/engine/helix/helix-engine.cpp
index 7d778741..fb4dc695 100644
--- a/amarok/src/engine/helix/helix-engine.cpp
+++ b/amarok/src/engine/helix/helix-engine.cpp
@@ -126,7 +126,7 @@ void HelixEngine::notifyUser(unsigned long code, const char *moreinfo, const cha
{
TQString *err = HelixErrors::errorText(code);
if (err)
- emit statusText(i18n("Helix Core returned error: %1 %2 %3").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl)));
+ emit statusText(i18n("Helix Core returned error: %1 %2 %3").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl)));
else
emit statusText(i18n("Helix Core returned error: "));
}
@@ -135,7 +135,7 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const
{
TQString *err = HelixErrors::errorText(code);
if (err)
- emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").tqarg(TQString(*err)).tqarg(TQString(moreinfo)).tqarg(TQString(moreinfourl)));
+ emit infoMessage(i18n("Helix Core returned error: %1 %1 %1").arg(TQString(*err)).arg(TQString(moreinfo)).arg(TQString(moreinfourl)));
else
emit infoMessage(i18n("Helix Core returned error: "));
@@ -146,13 +146,13 @@ void HelixEngine::interruptUser(unsigned long code, const char *moreinfo, const
void HelixEngine::onContacting(const char *host)
{
- emit statusText( i18n("Contacting: %1").tqarg( TQString(host) ) );
+ emit statusText( i18n("Contacting: %1").arg( TQString(host) ) );
}
void HelixEngine::onBuffering(int pcnt)
{
if (pcnt != 100) // let's not report that...
- emit statusText( i18n( "Buffering %1%" ).tqarg( pcnt ) );
+ emit statusText( i18n( "Buffering %1%" ).arg( pcnt ) );
}
@@ -289,7 +289,7 @@ HelixEngine::load( const KURL &url, bool isStream )
{
const TQString path = url.path();
const TQString ext = path.mid( path.findRev( '.' ) + 1 ).lower();
- emit statusText( i18n("No plugin found for the %1 format").tqarg(ext) );
+ emit statusText( i18n("No plugin found for the %1 format").arg(ext) );
return false;
}
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
index 6789f26f..4d6d7178 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
@@ -224,7 +224,7 @@ DECLARE_INTERFACE_(IHXStream, IUnknown)
/************************************************************************
* Method:
- * IHXStream::ReportRebuffertqStatus
+ * IHXStream::ReportRebufferStatus
* Purpose:
* Call this method to report to the playback context that the
* available data has dropped to a critically low level, and that
@@ -235,12 +235,12 @@ DECLARE_INTERFACE_(IHXStream, IUnknown)
* NOTE: The values of unNeeded and unAvailable are used to indicate
* the general status of the rebuffering effort. For example, if a
* renderer has "run dry" and needs 5 data packets to play smoothly
- * again, it should call ReportRebuffertqStatus() with 5,0 then as
+ * again, it should call ReportRebufferStatus() with 5,0 then as
* packet arrive it should call again with 5,1; 5,2... and eventually
* 5,5.
*
*/
- STDTQT_METHOD(ReportRebuffertqStatus) (THIS_
+ STDTQT_METHOD(ReportRebufferStatus) (THIS_
UINT8 unNeeded,
UINT8 unAvailable) PURE;
@@ -302,20 +302,20 @@ DECLARE_INTERFACE_(IHXStream2, IHXStream)
{
/************************************************************************
* Method:
- * IHXStream2::ReportAudioRebuffertqStatus
+ * IHXStream2::ReportAudioRebufferStatus
* Purpose:
* For audio only, when it's called, the rebuffer will only occur when
* there aren't any packets in the transport and the amount of audio in
* audio device falls below the minimum startup audio pushdown(1000ms
* by default)
*
- * Non-audio renderers should still call ReportRebuffertqStatus(), the
+ * Non-audio renderers should still call ReportRebufferStatus(), the
* rebuffer will occur when the core drains out all the packets from
* the transport buffer
*
* The rest semantic are the same between the 2 calls.
*/
- STDTQT_METHOD(ReportAudioRebuffertqStatus) (THIS_
+ STDTQT_METHOD(ReportAudioRebufferStatus) (THIS_
UINT8 unNeeded,
UINT8 unAvailable) PURE;
};
@@ -1129,7 +1129,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown)
* Method:
* IHXLayoutStream::GetProperty
* Purpose:
- * Get tqlayout stream property
+ * Get layout stream property
*
*
*/
@@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown)
* Method:
* IHXLayoutStream::SetProperty
* Purpose:
- * Set tqlayout stream property
+ * Set layout stream property
*
*/
STDTQT_METHOD(SetProperties) (THIS_
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
index ccbcb0a2..6e0e6cd6 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxengin.h
@@ -2252,7 +2252,7 @@ typedef enum
NI_OPER_STATUS_CONNECTING,
NI_OPER_STATUS_CONNECTED,
NI_OPER_STATUS_OPERATIONAL
-} NItqStatus;
+} NIStatus;
typedef enum
{
@@ -2290,7 +2290,7 @@ struct NIInfo
{
NIType type;
IHXBuffer* pDescription;
- NItqStatus status;
+ NIStatus status;
UINT32 ulIPv4Index;
UINT32 ulIPv6Index;
UINT32 ulMTU;
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
index 6557e510..883d50e3 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxiids.h
@@ -695,10 +695,10 @@ DEFINE_GUID_ENUM(IID_IHXSourceHandler, 0xb2646da0, 0x410a, 0x11d6,
* Description:
* Interfaces related to get pending status from objects
* Interfaces:
- * IHXPendingtqStatus: {00001100-0901-11d1-8B06-00A024406D59}
+ * IHXPendingStatus: {00001100-0901-11d1-8B06-00A024406D59}
*/
#ifndef _HXPENDS_H_
-DEFINE_GUID_ENUM(IID_IHXPendingtqStatus, 0x00001100, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
+DEFINE_GUID_ENUM(IID_IHXPendingStatus, 0x00001100, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
#endif
/*
* File:
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
index 775d287c..e29fe874 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
@@ -531,7 +531,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown)
* Returns the count of the number of Properties under the one
* whose name is specified in "pName".
*
- * pName - IN - name of the Property whose number of tqchildren is to be
+ * pName - IN - name of the Property whose number of children is to be
* retrieved
*/
STDMETHOD_(INT32, GetNumPropsByName) (THIS_
@@ -544,7 +544,7 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown)
* Returns the count of the number of Properties under the one
* whose unique id is specified in "ulId".
*
- * ulId - IN - unique id of the Property whose number of tqchildren is
+ * ulId - IN - unique id of the Property whose number of children is
* to be retrieved
*/
STDMETHOD_(INT32, GetNumPropsById) (THIS_
@@ -1594,7 +1594,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Returns the count of the number of Properties under the one
* whose name is specified in "pName".
*
- * pName - IN - name of the Property whose number of tqchildren is to be
+ * pName - IN - name of the Property whose number of children is to be
* retrieved
*/
STDMETHOD_(INT32, GetNumPropsByName) (THIS_
@@ -1607,7 +1607,7 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Returns the count of the number of Properties under the one
* whose unique id is specified in "ulId".
*
- * ulId - IN - unique id of the Property whose number of tqchildren is
+ * ulId - IN - unique id of the Property whose number of children is
* to be retrieved
*/
STDMETHOD_(INT32, GetNumPropsById) (THIS_
@@ -2089,10 +2089,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Method:
* IHXRegistry2::GetChildIdListByName
* Purpose:
- * Get a array which enumerates all of the tqchildren under a
+ * Get a array which enumerates all of the children under a
* property by id.
*
- * pName - IN - name of the Property whose tqchildren are to be enumerated.
+ * pName - IN - name of the Property whose children are to be enumerated.
* pValues - OUT - array of unique Property id's.
* ulCount - OUT - size of the returned pValues array.
*
@@ -2108,10 +2108,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Method:
* IHXRegistry2::GetChildIdListById
* Purpose:
- * Get a array which enumerates all of the tqchildren under a
+ * Get a array which enumerates all of the children under a
* property by id.
*
- * ulId - IN - unique id of the Property whose tqchildren are to be enumerated.
+ * ulId - IN - unique id of the Property whose children are to be enumerated.
* pValues - OUT - array of unique Property id's.
* ulCount - OUT - size of the returned pValues array.
*
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
index a436c63e..b3921e04 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
@@ -740,7 +740,7 @@ DEFINE_GUID_ENUM(IID_IHXMMSResendResponse, 0xa581f3a4, 0xc508, 0x4800, 0xba, 0xd
*
*/
DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequester, 0x00005702, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
-DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequesttqStatus, 0x00005703, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
+DEFINE_GUID_ENUM(IID_IHXDistributedLicenseRequestStatus, 0x00005703, 0x901, 0x11d1, 0x8b, 0x6, 0x0, 0xa0, 0x24, 0x40, 0x6d, 0x59)
/*
* File: hxauto.h
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
index 180c5e5d..e9ce4dcc 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxresult.h
@@ -27,8 +27,8 @@ typedef LONG32 HX_RESULT;
# define MAKE_HRESULT(sev,fac,code) \
((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | \
((unsigned long)(code))) )
-# define SUCCEEDED(tqStatus) (((unsigned long)(tqStatus)>>31) == 0)
-# define FAILED(tqStatus) (((unsigned long)(tqStatus)>>31) != 0)
+# define SUCCEEDED(Status) (((unsigned long)(Status)>>31) == 0)
+# define FAILED(Status) (((unsigned long)(Status)>>31) != 0)
#else
# ifndef _HRESULT_DEFINED
typedef LONG32 HRESULT;
@@ -120,7 +120,7 @@ typedef LONG32 HX_RESULT;
#define HXR_WM_OPL_NOT_SUPPORTED MAKE_HX_RESULT(1,SS_GLO,36) // 80040024
// $Private:
-/* tqStatus Code for backup/restore*/
+/* Status Code for backup/restore*/
#define HXR_RESTORATION_COMPLETE MAKE_HX_RESULT(1,SS_GLO,27) // 8004001b
#define HXR_BACKUP_COMPLETE MAKE_HX_RESULT(1,SS_GLO,28) // 8004001c
#define HXR_TLC_NOT_CERTIFIED MAKE_HX_RESULT(1,SS_GLO,29) // 8004001d
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
index 42afd584..1ccba13b 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
@@ -614,9 +614,9 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
* Method:
* IHXSiteSupplier::BeginChangeLayout
* Purpose:
- * Called to inform the site supplier a tqlayout change has beginning
+ * Called to inform the site supplier a layout change has beginning
* it can expect to receive SitesNeeded() and SitesNotNeeded() calls
- * while a tqlayout change is in progress,
+ * while a layout change is in progress,
*/
STDTQT_METHOD(BeginChangeLayout) (THIS) PURE;
@@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
* Method:
* IHXSiteSupplier::DoneChangeLayout
* Purpose:
- * Called to inform the site supplier the tqlayout change has been
+ * Called to inform the site supplier the layout change has been
* completed.
*/
STDTQT_METHOD(DoneChangeLayout) (THIS) PURE;
@@ -642,7 +642,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
*
* Interface implemented by the client core. This interface is called
* by users of the client core to inform it of IHXSite's which are
- * available for tqlayout of renderers
+ * available for layout of renderers
*
* IID_IHXSiteManager:
*
@@ -923,7 +923,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown)
*
* Purpose:
*
- * Allow tqlayout site groups to be added and removed
+ * Allow layout site groups to be added and removed
*
* IID_IHXLayoutSiteGroupManager:
*
@@ -1091,7 +1091,7 @@ DECLARE_INTERFACE_(IHXStatusMessage, IUnknown)
* IHXStatusMessage methods
*/
- STDTQT_METHOD(SettqStatus) (THIS_ const char* pText) PURE;
+ STDTQT_METHOD(SetStatus) (THIS_ const char* pText) PURE;
};
// $Private:
diff --git a/amarok/src/engine/helix/helix-sp/helix-sp.cpp b/amarok/src/engine/helix/helix-sp/helix-sp.cpp
index 4cb58bb7..41c84a1d 100644
--- a/amarok/src/engine/helix/helix-sp/helix-sp.cpp
+++ b/amarok/src/engine/helix/helix-sp/helix-sp.cpp
@@ -835,7 +835,7 @@ HelixSimplePlayer::~HelixSimplePlayer()
{
tearDown();
- // only now tqinvalidate the device, not whenever we teardown
+ // only now invalidate the device, not whenever we teardown
delete [] m_device;
}
diff --git a/amarok/src/engine/helix/hxplayercontrol.cpp b/amarok/src/engine/helix/hxplayercontrol.cpp
index fabc8a0d..8cb26939 100644
--- a/amarok/src/engine/helix/hxplayercontrol.cpp
+++ b/amarok/src/engine/helix/hxplayercontrol.cpp
@@ -69,7 +69,7 @@ PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iam
m_inited(false), m_api( HelixSimplePlayer::OSS ), m_device(0), mimehead(0), mimelistlen(0),
m_numPlugins(0), m_pluginInfo(0)
{
- memset(m_tqchildren, 0, sizeof(m_tqchildren));
+ memset(m_children, 0, sizeof(m_children));
}
PlayerControl::~PlayerControl()
@@ -100,7 +100,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
return;
}
- memset(&m_tqchildren, 0, numPlayers * sizeof(struct playerChildren));
+ memset(&m_children, 0, numPlayers * sizeof(struct playerChildren));
m_inited = false;
@@ -121,30 +121,30 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
{
if (pmapped)
{
- m_tqchildren[i].current_time = &(pmapped[i].current_time);
- m_tqchildren[i].duration = &(pmapped[i].duration);
- m_tqchildren[i].md = &(pmapped[i].md);
+ m_children[i].current_time = &(pmapped[i].current_time);
+ m_children[i].duration = &(pmapped[i].duration);
+ m_children[i].md = &(pmapped[i].md);
- m_tqchildren[i].m_current = &(pmapped[i].m_current);
- m_tqchildren[i].m_consumed = &(pmapped[i].m_consumed);
- //m_tqchildren[i].q = pmapped[i].q;
+ m_children[i].m_current = &(pmapped[i].m_current);
+ m_children[i].m_consumed = &(pmapped[i].m_consumed);
+ //m_children[i].q = pmapped[i].q;
//for (int j=0; jclearScopeQ(0);
if (pmapped)
- *m_tqchildren[m_index].m_consumed = *m_tqchildren[m_index].m_current = 0;
+ *m_children[m_index].m_consumed = *m_children[m_index].m_current = 0;
}
break;
case TEARDOWN:
@@ -437,36 +437,36 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
playing = false;
if (pmapped)
{
- *m_tqchildren[m_index].current_time = 0;
- *m_tqchildren[m_index].duration = 0;
+ *m_children[m_index].current_time = 0;
+ *m_children[m_index].duration = 0;
}
}
if (pmapped)
{
- *m_tqchildren[m_index].current_time = player->where(0);
- *m_tqchildren[m_index].duration = player->duration(0);
+ *m_children[m_index].current_time = player->where(0);
+ *m_children[m_index].duration = player->duration(0);
HelixSimplePlayer::metaData *md = player->getMetaData(0);
if (md)
- memcpy((void *) m_tqchildren[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData));
+ memcpy((void *) m_children[m_index].md, (void *) md, sizeof(HelixSimplePlayer::metaData));
struct DelayQueue *item;
//int j;
while ((item = player->getScopeBuf(0)))
{
- //j = (*m_tqchildren[m_index].m_current + 1) % NUM_SCOPEBUFS;
+ //j = (*m_children[m_index].m_current + 1) % NUM_SCOPEBUFS;
//cerr << "player:" << m_index << " j=" << j << " time=" << item->time << " etime=" << item->etime << " len=" << item->len << endl;
- //m_tqchildren[m_index].q[j].len = item->len;
- //m_tqchildren[m_index].q[j].time = item->time;
- //m_tqchildren[m_index].q[j].etime = item->etime;
- //m_tqchildren[m_index].q[j].nchan = item->nchan;
- //m_tqchildren[m_index].q[j].bps = item->bps;
- //m_tqchildren[m_index].q[j].tps = item->tps;
- //m_tqchildren[m_index].q[j].spb = item->spb;
- //memcpy((void *)m_tqchildren[m_index].q[j].buf, (void *) item->buf, item->len );
- //*m_tqchildren[m_index].m_current = j;
+ //m_children[m_index].q[j].len = item->len;
+ //m_children[m_index].q[j].time = item->time;
+ //m_children[m_index].q[j].etime = item->etime;
+ //m_children[m_index].q[j].nchan = item->nchan;
+ //m_children[m_index].q[j].bps = item->bps;
+ //m_children[m_index].q[j].tps = item->tps;
+ //m_children[m_index].q[j].spb = item->spb;
+ //memcpy((void *)m_children[m_index].q[j].buf, (void *) item->buf, item->len );
+ //*m_children[m_index].m_current = j;
//cerr << "player:" << m_index << " time=" << item->time << " etime=" << item->etime << endl;
sendscopebuf(wfd, item);
delete item;
@@ -488,15 +488,15 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
sendsetdevice();
sendinit();
- // wait for ready from tqchildren
+ // wait for ready from children
while (!done && !dead)
{
dispatch();
done = true;
for (i=0; i n)
@@ -661,8 +661,8 @@ void PlayerControl::dispatch()
ntot = select(n + 1, &rdset, 0, 0, &timeout);
for (i=0; ntot && i < nNumPlayers; i++)
{
- rfd = m_tqchildren[i].m_pipeA[0];
- wfd = m_tqchildren[i].m_pipeB[1];
+ rfd = m_children[i].m_pipeA[0];
+ wfd = m_children[i].m_pipeB[1];
if ( FD_ISSET(rfd, &rdset) )
{
msgid m;
@@ -675,14 +675,14 @@ void PlayerControl::dispatch()
{
case READY:
print2stderr("CHILD %d is READY\n", i);
- m_tqchildren[i].isready = true;;
+ m_children[i].isready = true;;
break;
case DONE:
print2stderr("CHILD %d is DONE\n", i);
if (!sz)
{
- m_tqchildren[i].isplaying = false;
+ m_children[i].isplaying = false;
clearScopeQ(i);
play_finished(i);
}
@@ -852,7 +852,7 @@ void PlayerControl::dispatch()
}
else
{
- m_tqchildren[i].isdead = true;
+ m_children[i].isdead = true;
return; // should never happen
}
}
@@ -860,16 +860,16 @@ void PlayerControl::dispatch()
for (i=0; pmapped && itext(HostListItem::Hostname) == hostname )
{
host->setText( HostListItem::Hostname, hostname );
- host->settqStatus( error );
- host->tqrepaint();
+ host->setStatus( error );
+ host->repaint();
return;
}
++it;
@@ -101,8 +101,8 @@ void HostList::contentsMousePressEvent( TQMouseEvent *e)
}
// status column
else
- if( e->pos().x() > header()->sectionPos( HostListItem::tqStatus ) &&
- e->pos().x() < header()->sectionPos( HostListItem::tqStatus ) + header()->sectionSize( HostListItem::tqStatus ) )
+ if( e->pos().x() > header()->sectionPos( HostListItem::Status ) &&
+ e->pos().x() < header()->sectionPos( HostListItem::Status ) + header()->sectionSize( HostListItem::Status ) )
{
item->statusToolTip();
}
diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp
index cb8e61f0..f7a8e83a 100644
--- a/amarok/src/engine/nmm/HostListItem.cpp
+++ b/amarok/src/engine/nmm/HostListItem.cpp
@@ -51,8 +51,8 @@ HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, b
{
setText( HostListItem::Hostname, hostname);
- setPixmap( HostListItem::tqStatus, SmallIcon("info") );
- setText( HostListItem::tqStatus, i18n("Unknown") );
+ setPixmap( HostListItem::Status, SmallIcon("info") );
+ setText( HostListItem::Status, i18n("Unknown") );
setPixmap( HostListItem::Playback, SmallIcon("info") );
setText( HostListItem::Playback, i18n("Unknown") );
@@ -77,7 +77,7 @@ int HostListItem::volumeAtPosition( int x )
void HostListItem::updateColumn( int column ) const
{
- const TQRect r = listView()->tqitemRect( this );
+ const TQRect r = listView()->itemRect( this );
if( !r.isValid() )
return;
@@ -88,10 +88,10 @@ void HostListItem::updateColumn( int column ) const
void HostListItem::statusToolTip()
{
- TQWhatsThis::display( prettytqStatus( m_status ) );
+ TQWhatsThis::display( prettyStatus( m_status ) );
}
-TQString HostListItem::prettytqStatus( int error )
+TQString HostListItem::prettyStatus( int error )
{
TQString st;
@@ -146,24 +146,24 @@ void HostListItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column,
if( ! m_read_only)
setPixmap( HostListItem::Audio, SmallIcon("nmm_option_off") );
}
- else if( column == HostListItem::tqStatus )
+ else if( column == HostListItem::Status )
{
TQFont font( p->font() );
if( ! m_status ) // Unknown
{
font.setBold( false );
- setText( HostListItem::tqStatus , i18n("Unknown") );
+ setText( HostListItem::Status , i18n("Unknown") );
}
else if( m_status == NmmEngine::STATUS_OK )
{
font.setBold( false );
m_cg.setColor( TQColorGroup::Text, TQt::darkGreen );
- setText( HostListItem::tqStatus , i18n("OK") );
+ setText( HostListItem::Status , i18n("OK") );
}
else { // error
font.setBold( true );
m_cg.setColor( TQColorGroup::Text, TQt::red );
- setText( HostListItem::tqStatus , i18n("Failed") );
+ setText( HostListItem::Status , i18n("Failed") );
}
p->setFont( font );
}
@@ -257,9 +257,9 @@ TQPixmap HostListItem::generateGradient( int type )
KPixmap result = TQPixmap( 113, 24 );
if( type == PixRight)
- KPixmapEffect::gradient( result, listView()->tqcolorGroup().background(), listView()->tqcolorGroup().highlight(), KPixmapEffect::HorizontalGradient );
+ KPixmapEffect::gradient( result, listView()->colorGroup().background(), listView()->colorGroup().highlight(), KPixmapEffect::HorizontalGradient );
else
- KPixmapEffect::gradient( result, listView()->tqcolorGroup().highlight(), listView()->tqcolorGroup().background(), KPixmapEffect::HorizontalGradient );
+ KPixmapEffect::gradient( result, listView()->colorGroup().highlight(), listView()->colorGroup().background(), KPixmapEffect::HorizontalGradient );
result.setMask( mask);
return result;
diff --git a/amarok/src/engine/nmm/HostListItem.h b/amarok/src/engine/nmm/HostListItem.h
index ae3c9bcd..2a3b649e 100644
--- a/amarok/src/engine/nmm/HostListItem.h
+++ b/amarok/src/engine/nmm/HostListItem.h
@@ -36,7 +36,7 @@ class HostListItem : public KListViewItem {
Video,
Audio,
Volume,
- tqStatus,
+ Status,
Playback
};
@@ -49,7 +49,7 @@ class HostListItem : public KListViewItem {
bool isAudioEnabled() const { return m_audio; }
void toggleAudio() { m_audio = !m_audio; }
- void settqStatus( int s ) { m_status = s; }
+ void setStatus( int s ) { m_status = s; }
int status() const { return m_status; }
void setVolume( int v ) { m_volume = v; }
@@ -69,7 +69,7 @@ class HostListItem : public KListViewItem {
* \todo make it user friendly/understandable
* \todo right place for this method?
*/
- static TQString prettytqStatus( int );
+ static TQString prettyStatus( int );
protected:
void paintCell( TQPainter * painter, const TQColorGroup & cg, int column, int width, int align );
diff --git a/amarok/src/engine/nmm/NmmLocation.h b/amarok/src/engine/nmm/NmmLocation.h
index 2c628602..a1bc693d 100644
--- a/amarok/src/engine/nmm/NmmLocation.h
+++ b/amarok/src/engine/nmm/NmmLocation.h
@@ -46,7 +46,7 @@ class NmmLocation {
int volume() const { return m_volume; }
void setVolume( int v ) { m_volume = v; }
- void settqStatus( int s ) { m_status = s; }
+ void setStatus( int s ) { m_status = s; }
int status() const { return m_status; }
private:
diff --git a/amarok/src/engine/nmm/nmm_configdialog.cpp b/amarok/src/engine/nmm/nmm_configdialog.cpp
index 712e98ea..e670c823 100644
--- a/amarok/src/engine/nmm/nmm_configdialog.cpp
+++ b/amarok/src/engine/nmm/nmm_configdialog.cpp
@@ -31,7 +31,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/amarok/src/engine/nmm/nmm_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui
index bef5c7e0..c716be9c 100644
--- a/amarok/src/engine/nmm/nmm_configdialogbase.ui
+++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui
@@ -21,7 +21,7 @@
- tqlayout6
+ layout6
@@ -68,7 +68,7 @@
Fixed
-
+
16
16
@@ -130,7 +130,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
- tqlayout5
+ layout5
@@ -159,7 +159,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
- tqlayout13
+ layout13
@@ -191,7 +191,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
Expanding
-
+
20
1
@@ -214,7 +214,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
Minimum
-
+
20
16
diff --git a/amarok/src/engine/nmm/nmm_engine.cpp b/amarok/src/engine/nmm/nmm_engine.cpp
index 43b065de..f370974a 100644
--- a/amarok/src/engine/nmm/nmm_engine.cpp
+++ b/amarok/src/engine/nmm/nmm_engine.cpp
@@ -155,14 +155,14 @@ void NmmEngine::notifyHostError( TQString hostname, int error )
for( TQValueList::Iterator it = tmp_user_list.begin(); it != tmp_user_list.end(); ++it ) {
if( (*it).hostname() == hostname ) {
- (*it).settqStatus( error );
+ (*it).setStatus( error );
break;
}
}
for( TQValueList::Iterator it = tmp_environment_list.begin(); it != tmp_environment_list.end(); ++it ) {
if( (*it).hostname() == hostname ) {
- (*it).settqStatus( error );
+ (*it).setStatus( error );
break;
}
}
@@ -368,7 +368,7 @@ bool NmmEngine::load(const KURL& url, bool stream)
if( NmmKDEConfig::location() == NmmKDEConfig::EnumLocation::LocalhostOnly )
{
m_localhostonly_errordialog = true;
- TQString detailed_status = HostListItem::prettytqStatus( error );
+ TQString detailed_status = HostListItem::prettyStatus( error );
KMessageBox::detailedError( 0, i18n("Local NMM playback failed."), detailed_status, i18n("Error"), KMessageBox::AllowLink );
m_localhostonly_errordialog = false;
}
diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h
index 2b78b610..f2238fef 100644
--- a/amarok/src/engine/nmm/nmm_engine.h
+++ b/amarok/src/engine/nmm/nmm_engine.h
@@ -245,7 +245,7 @@ private:
static NmmEngine* s_instance;
public:
- enum HosttqStatus {
+ enum HostStatus {
STATUS_UNKNOWN = 0,
STATUS_OK = 1 << 0,
ERROR_PLAYBACKNODE = 1 << 1,
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp
index 581923be..48353ac3 100644
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/amarok/src/engine/xine/xine-engine.cpp
@@ -801,7 +801,7 @@ XineEngine::customEvent( TQCustomEvent *e )
break;
case 3001:
- emit infoMessage( (*message).tqarg( m_url.prettyURL() ) );
+ emit infoMessage( (*message).arg( m_url.prettyURL() ) );
delete message;
break;
@@ -818,7 +818,7 @@ XineEngine::customEvent( TQCustomEvent *e )
} break;
case 3004:
- emit statusText( i18n("Redirecting to: ").tqarg( *message ) );
+ emit statusText( i18n("Redirecting to: ").arg( *message ) );
load( KURL( *message ), false );
play();
delete message;
@@ -923,8 +923,8 @@ XineEngine::XineEventListener( void *p, const xine_event_t* xineEvent )
TQString
msg = "%1 %2%";
- msg = msg.tqarg( TQString::fromUtf8( pd->description ) )
- .tqarg( KGlobal::locale()->formatNumber( pd->percent, 0 ) );
+ msg = msg.arg( TQString::fromUtf8( pd->description ) )
+ .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) );
TQCustomEvent *e = new TQCustomEvent( 3002 );
e->setData( new TQString( msg ) );
@@ -1102,7 +1102,7 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engine::SimpleMetaBundle &b)
if( b.tracknr.isEmpty() )
b.tracknr = url.filename();
} else {
- b.title = TQString(i18n("Track %1")).tqarg(url.filename());
+ b.title = TQString(i18n("Track %1")).arg(url.filename());
b.album = i18n("AudioCD");
}
}
diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui
index a280f3e3..50e87bbf 100644
--- a/amarok/src/engine/xine/xineconfigbase.ui
+++ b/amarok/src/engine/xine/xineconfigbase.ui
@@ -32,7 +32,7 @@
- tqlayout11
+ layout11
@@ -68,13 +68,13 @@
-
+
AlignCenter
- tqlayout10
+ layout10
@@ -82,7 +82,7 @@
- tqlayout10
+ layout10
@@ -90,7 +90,7 @@
- tqlayout2
+ layout2
@@ -129,7 +129,7 @@
Sound device may be modified after the output plugin has been changed to ALSA or OSS.
-
+
WordBreak|AlignVCenter
@@ -241,7 +241,7 @@
- tqlayout5
+ layout5
@@ -278,7 +278,7 @@
- tqlayout4
+ layout4
@@ -318,7 +318,7 @@
- tqlayout2
+ layout2
@@ -376,7 +376,7 @@
- tqlayout11
+ layout11
@@ -419,7 +419,7 @@
- tqlayout12
+ layout12
@@ -435,7 +435,7 @@
- tqlayout10
+ layout10
@@ -486,7 +486,7 @@
Expanding
-
+
20
16
diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp
index e9fef143..b3e8f0cd 100644
--- a/amarok/src/engine/yauap/yauap-engine.cpp
+++ b/amarok/src/engine/yauap/yauap-engine.cpp
@@ -646,7 +646,7 @@ yauapEngine::getAudioCDContents(const TQString &device, KURL::List &urls)
KURL url = TQString(TQString("cdda://").append( strtok_r(reply_ptr,"=",&saveptr)));
urls << url;
debug() << url << endl;
- b.title = TQString( i18n( "Track %1" ) ).tqarg( i+1 );
+ b.title = TQString( i18n( "Track %1" ) ).arg( i+1 );
b.length = strtok_r(NULL,"=",&saveptr);
b.album = "AudioCD";
b.tracknr = i+1;
diff --git a/amarok/src/enginecontroller.cpp b/amarok/src/enginecontroller.cpp
index d41f5c75..200722e0 100644
--- a/amarok/src/enginecontroller.cpp
+++ b/amarok/src/enginecontroller.cpp
@@ -120,8 +120,8 @@ EngineController::loadEngine() //static
Amarok::StatusBar::instance()->longMessage( i18n(
"Sorry, the '%1' could not be loaded, instead we have loaded the '%2'." )
- .tqarg( AmarokConfig::soundSystem() )
- .tqarg( engineName ),
+ .arg( AmarokConfig::soundSystem() )
+ .arg( engineName ),
KDE::StatusBar::Sorry );
AmarokConfig::setSoundSystem( engineName );
@@ -143,7 +143,7 @@ EngineController::loadEngine( const TQString &engineName )
DEBUG_BLOCK
TQString query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] != '%1'";
- KTrader::OfferList offers = PluginManager::query( query.tqarg( engineName ) );
+ KTrader::OfferList offers = PluginManager::query( query.arg( engineName ) );
// sort by rank, TQValueList::operator[] is O(n), so this is quite inefficient
#define rank( x ) (x)->property( "X-KDE-Amarok-rank" ).toInt()
@@ -155,7 +155,7 @@ EngineController::loadEngine( const TQString &engineName )
// this is the actual engine we want
query = "[X-KDE-Amarok-plugintype] == 'engine' and [X-KDE-Amarok-name] == '%1'";
- offers = PluginManager::query( query.tqarg( engineName ) ) + offers;
+ offers = PluginManager::query( query.arg( engineName ) ) + offers;
foreachType( KTrader::OfferList, offers ) {
Amarok::Plugin *plugin = PluginManager::createFromService( *it );
@@ -265,13 +265,13 @@ void EngineController::unplayableNotification() {
"You may want to choose a different engine from the Configure Dialog, or examine "
"the installation of the multimedia-framework that the current engine uses. "
" You may find useful information in the FAQ section of the Amarok HandBook." )
- .tqarg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+ .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
}
bool EngineController::installDistroCodec( const TQString& engine /*Filetype type*/)
{
KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
- , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").tqarg(engine) ).first();
+ , TQString("[X-KDE-Amarok-codec] == 'mp3' and [X-KDE-Amarok-engine] == '%1'").arg(engine) ).first();
if( service )
{
TQString installScript = service->exec();
diff --git a/amarok/src/equalizergraph.cpp b/amarok/src/equalizergraph.cpp
index 7f4d2951..d1849a1f 100644
--- a/amarok/src/equalizergraph.cpp
+++ b/amarok/src/equalizergraph.cpp
@@ -51,7 +51,7 @@ EqualizerGraph::resizeEvent( TQResizeEvent* )
}
TQSize
-EqualizerGraph::tqsizeHint() const
+EqualizerGraph::sizeHint() const
{
return TQSize( 100, 60 );
}
@@ -65,11 +65,11 @@ EqualizerGraph::paintEvent( TQPaintEvent* )
// Draw middle line
int middleLineY = (int) ( ( height() - 1 ) / 2.0 + AmarokConfig::equalizerPreamp() * ( height() - 1 ) / 200.0 );
- TQPen pen( tqcolorGroup().dark(), 0, TQt::DotLine);
+ TQPen pen( colorGroup().dark(), 0, TQt::DotLine);
p.setPen( pen );
p.drawLine( 8, middleLineY, width() - 1, middleLineY );
- TQColor color( tqcolorGroup().highlight() );
+ TQColor color( colorGroup().highlight() );
int h, s, v;
color.getHsv( &h, &s, &v );
@@ -141,14 +141,14 @@ EqualizerGraph::drawBackground()
m_backgroundPixmap->resize( size() );
m_composePixmap->resize( size() );
- m_backgroundPixmap->fill( tqcolorGroup().background().dark( 105 ) );
+ m_backgroundPixmap->fill( colorGroup().background().dark( 105 ) );
TQPainter p( m_backgroundPixmap );
// Erase background for scale
- p.fillRect( 0, 0, 7, height() -1, tqcolorGroup().background());
+ p.fillRect( 0, 0, 7, height() -1, colorGroup().background());
// Draw scale
- p.setPen( tqcolorGroup().shadow() );
+ p.setPen( colorGroup().shadow() );
p.drawLine( 7, 0, 7, height() - 1 );
p.drawLine( 0, 0, 7, 0 );
p.drawLine( 0, height() / 2 - 1, 7, height() / 2 - 1 );
diff --git a/amarok/src/equalizergraph.h b/amarok/src/equalizergraph.h
index de9cea6c..fbbf1e48 100644
--- a/amarok/src/equalizergraph.h
+++ b/amarok/src/equalizergraph.h
@@ -28,7 +28,7 @@ class EqualizerGraph : public TQWidget
public:
EqualizerGraph( TQWidget* parent );
~EqualizerGraph();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
void resizeEvent( TQResizeEvent* );
diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp
index 02e9a8d4..bc1e94e9 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -21,7 +21,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -63,7 +63,7 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na
updateButtonState();
- resize( TQSize(300, 250).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(300, 250).expandedTo(minimumSizeHint()) );
}
@@ -103,7 +103,7 @@ EqualizerPresetManager::slotRename()
if ( ok && item->text(0) != title ) {
// Check if the new preset title exists
if ( m_presets.find( title ) != m_presets.end() ) {
- int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) );
+ int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) );
if ( button != KMessageBox::Yes )
return;
diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp
index ade7fead..23e0ecbf 100644
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@@ -29,10 +29,10 @@
#include
#include
#include
-#include
+#include
#include
#include
-#include //presets
+#include //presets
#include
#include
@@ -73,7 +73,7 @@ EqualizerSetup::EqualizerSetup()
new TQLabel( i18n("Presets:"), presetBox );
m_presetCombo = new KComboBox( presetBox );
- m_presetCombo->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ m_presetCombo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
TQPushButton* presetAdd = new TQPushButton( presetBox );
presetAdd->setIconSet( SmallIconSet( Amarok::icon( "add_playlist" ) ) );
@@ -98,7 +98,7 @@ EqualizerSetup::EqualizerSetup()
// Helper widget for layouting inside the groupbox
TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders );
- slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ slidersLayoutWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() );
// END GroupBox
@@ -149,12 +149,12 @@ EqualizerSetup::EqualizerSetup()
TQLabel* graphLabel1 = new TQLabel("+20 db", graphVBox);
TQLabel* graphLabel2 = new TQLabel("0 db", graphVBox);
TQLabel* graphLabel3 = new TQLabel("-20 db", graphVBox);
- graphLabel1->tqsetAlignment( TQt::AlignRight | TQt::AlignTop );
- graphLabel2->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
- graphLabel3->tqsetAlignment( TQt::AlignRight | TQt::AlignBottom );
+ graphLabel1->setAlignment( TQt::AlignRight | TQt::AlignTop );
+ graphLabel2->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
+ graphLabel3->setAlignment( TQt::AlignRight | TQt::AlignBottom );
m_equalizerGraph = new EqualizerGraph( graphGBox );
- m_equalizerGraph->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
+ m_equalizerGraph->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
// END Graph Widget
// Fill the combobox
@@ -370,7 +370,7 @@ EqualizerSetup::addPreset()
if (ok) {
// Check if the new preset title exists
if ( m_presets.find( title ) != m_presets.end() ) {
- int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).tqarg( title ) );
+ int button = KMessageBox::warningYesNo( this, i18n( "A preset with the name %1 already exists. Overwrite?" ).arg( title ) );
if ( button != KMessageBox::Yes )
return;
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index df79b622..424ed23b 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -145,7 +145,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
m_dir->setOnlyDoubleClickSelectsFiles( true ); //Amarok type settings
m_dir->readConfig( Amarok::config( "Filebrowser" ) );
m_dir->setView( KFile::Default ); //will set userconfigured view, will load URL
- m_dir->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
+ m_dir->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
m_dir->setAcceptDrops( true );
//Automatically open folder after hovering above it...probably a good thing
//but easily disabled by commenting this line out
@@ -264,7 +264,7 @@ FileBrowser::FileBrowser( const char * name, Medium * medium )
setSpacing( 4 );
setFocusProxy( m_dir ); //so the dirOperator is focused when we get focus events
// Toolbar is more than 250px wide, BrowserBar doesn't allow that. -> Resizing issues.
- setMinimumWidth( 250 /* toolbar->tqsizeHint().width() */ );
+ setMinimumWidth( 250 /* toolbar->sizeHint().width() */ );
}
@@ -575,9 +575,9 @@ public:
const uint w = t.width() + 20;
const uint h = t.height() + 20;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
- t.draw( &p, 20, 20, TQRect(), tqcolorGroup() );
+ t.draw( &p, 20, 20, TQRect(), colorGroup() );
}
else {
p.setPen( palette().color( TQPalette::Disabled, TQColorGroup::Text ) );
diff --git a/amarok/src/firstrunwizard.ui b/amarok/src/firstrunwizard.ui
index 3ab4cc92..d5885635 100644
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@@ -74,7 +74,7 @@
Expanding
-
+
40
20
@@ -130,7 +130,7 @@
Expanding
-
+
20
257
@@ -147,7 +147,7 @@
Expanding
-
+
20
194
@@ -197,7 +197,7 @@
0
-
+
32767
32767
@@ -221,7 +221,7 @@
Expanding
-
+
21
294
diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp
index a9c6db44..5247766d 100644
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@@ -10,7 +10,7 @@
#include "htmlview.h"
#include "playlist.h" //appendMedia()
-#include
+#include
#include // External CSS opening
#include // External CSS opening
@@ -83,8 +83,8 @@ HTMLView::copyText()
TQString text = selectedText();
// Copy both to clipboard and X11-selection
- TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard );
- TQApplication::tqclipboard()->setText( text, TQClipboard::Selection );
+ TQApplication::clipboard()->setText( text, TQClipboard::Clipboard );
+ TQApplication::clipboard()->setText( text, TQClipboard::Selection );
}
void HTMLView::paletteChange() {
@@ -112,21 +112,21 @@ HTMLView::loadStyleSheet()
const TQString fontFamily = AmarokConfig::useCustomFonts() ?
AmarokConfig::contextBrowserFont().family() :
TQApplication::font().family();
- const TQString text = ContextBrowser::instance()->tqcolorGroup().text().name();
- const TQString link = ContextBrowser::instance()->tqcolorGroup().link().name();
- const TQString fg = ContextBrowser::instance()->tqcolorGroup().highlightedText().name();
- const TQString bg = ContextBrowser::instance()->tqcolorGroup().highlight().name();
- const TQString base = ContextBrowser::instance()->tqcolorGroup().base().name();
- const TQColor bgColor = ContextBrowser::instance()->tqcolorGroup().highlight();
+ const TQString text = ContextBrowser::instance()->colorGroup().text().name();
+ const TQString link = ContextBrowser::instance()->colorGroup().link().name();
+ const TQString fg = ContextBrowser::instance()->colorGroup().highlightedText().name();
+ const TQString bg = ContextBrowser::instance()->colorGroup().highlight().name();
+ const TQString base = ContextBrowser::instance()->colorGroup().base().name();
+ const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight();
TQColor gradientColor = bgColor;
//we have to set the color for body due to a KHTML bug
//KHTML sets the base color but not the text color
styleSheet = TQString( "body { margin: 8px; font-size: %1px; color: %2; background-color: %3; font-family: %4; }" )
- .tqarg( pxSize )
- .tqarg( text )
- .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) )
- .tqarg( fontFamily );
+ .arg( pxSize )
+ .arg( text )
+ .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) )
+ .arg( fontFamily );
TQTextStream eCSSts( &ExternalCSS );
TQString tmpCSS = eCSSts.read();
@@ -142,7 +142,7 @@ HTMLView::loadStyleSheet()
tmpCSS.replace( "AMAROK_BGCOLOR", bg );
tmpCSS.replace( "AMAROK_FGCOLOR", fg );
tmpCSS.replace( "AMAROK_BASECOLOR", base );
- tmpCSS.replace( "AMAROK_DARKBASECOLOR", ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() );
+ tmpCSS.replace( "AMAROK_DARKBASECOLOR", ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() );
tmpCSS.replace( "AMAROK_GRADIENTCOLOR", gradientColor.name() );
styleSheet += tmpCSS;
@@ -151,12 +151,12 @@ HTMLView::loadStyleSheet()
{
int pxSize = ContextBrowser::instance()->fontMetrics().height() - 4;
const TQString fontFamily = AmarokConfig::useCustomFonts() ? AmarokConfig::contextBrowserFont().family() : TQApplication::font().family();
- const TQString text = ContextBrowser::instance()->tqcolorGroup().text().name();
- const TQString link = ContextBrowser::instance()->tqcolorGroup().link().name();
- const TQString fg = ContextBrowser::instance()->tqcolorGroup().highlightedText().name();
- const TQString bg = ContextBrowser::instance()->tqcolorGroup().highlight().name();
- const TQColor baseColor = ContextBrowser::instance()->tqcolorGroup().base();
- const TQColor bgColor = ContextBrowser::instance()->tqcolorGroup().highlight();
+ const TQString text = ContextBrowser::instance()->colorGroup().text().name();
+ const TQString link = ContextBrowser::instance()->colorGroup().link().name();
+ const TQString fg = ContextBrowser::instance()->colorGroup().highlightedText().name();
+ const TQString bg = ContextBrowser::instance()->colorGroup().highlight().name();
+ const TQColor baseColor = ContextBrowser::instance()->colorGroup().base();
+ const TQColor bgColor = ContextBrowser::instance()->colorGroup().highlight();
const TQColor gradientColor = bgColor;
if ( !m_bgGradientImage ) {
@@ -188,103 +188,103 @@ HTMLView::loadStyleSheet()
//we have to set the color for body due to a KHTML bug
//KHTML sets the base color but not the text color
styleSheet = TQString( "body { margin: 4px; font-size: %1px; color: %2; background-color: %3; background-image: url( %4 ); background-repeat: repeat; font-family: %5; }" )
- .tqarg( pxSize )
- .tqarg( text )
- .tqarg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) )
- .tqarg( m_bgGradientImage->name() )
- .tqarg( fontFamily );
+ .arg( pxSize )
+ .arg( text )
+ .arg( AmarokConfig::schemeAmarok() ? fg : TQString(gradientColor.name()) )
+ .arg( m_bgGradientImage->name() )
+ .arg( fontFamily );
//text attributes
- styleSheet += TQString( "h1 { font-size: %1px; }" ).tqarg( pxSize + 8 );
- styleSheet += TQString( "h2 { font-size: %1px; }" ).tqarg( pxSize + 6 );
- styleSheet += TQString( "h3 { font-size: %1px; }" ).tqarg( pxSize + 4 );
- styleSheet += TQString( "h4 { font-size: %1px; }" ).tqarg( pxSize + 3 );
- styleSheet += TQString( "h5 { font-size: %1px; }" ).tqarg( pxSize + 2 );
- styleSheet += TQString( "h6 { font-size: %1px; }" ).tqarg( pxSize + 1 );
- styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).tqarg( pxSize ).tqarg( text );
+ styleSheet += TQString( "h1 { font-size: %1px; }" ).arg( pxSize + 8 );
+ styleSheet += TQString( "h2 { font-size: %1px; }" ).arg( pxSize + 6 );
+ styleSheet += TQString( "h3 { font-size: %1px; }" ).arg( pxSize + 4 );
+ styleSheet += TQString( "h4 { font-size: %1px; }" ).arg( pxSize + 3 );
+ styleSheet += TQString( "h5 { font-size: %1px; }" ).arg( pxSize + 2 );
+ styleSheet += TQString( "h6 { font-size: %1px; }" ).arg( pxSize + 1 );
+ styleSheet += TQString( "a { font-size: %1px; color: %2; }" ).arg( pxSize ).arg( text );
styleSheet += TQString( ".info { display: block; margin-left: 4px; font-weight: normal; }" );
styleSheet += TQString( ".song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" );
- styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg );
+ styleSheet += TQString( ".song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg );
styleSheet += TQString( ".song-title { font-weight: bold; }" );
- styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).tqarg( pxSize + 3 );
+ styleSheet += TQString( ".song-place { font-size: %1px; font-weight: bold; }" ).arg( pxSize + 3 );
//box: the base container for every block (border hilighted on hover, 'A' without underlining)
- styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).tqarg( bg );
+ styleSheet += TQString( ".box { border: solid %1 1px; text-align: left; margin-bottom: 10px; }" ).arg( bg );
styleSheet += TQString( ".box a { text-decoration: none; }" );
- styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).tqarg( text );
+ styleSheet += TQString( ".box:hover { border: solid %1 1px; }" ).arg( text );
//box contents: header, body, rows and alternate-rows
styleSheet += TQString( ".box-header { color: %1; background-color: %2; background-image: url( %4 ); background-repeat: repeat-x; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; }" )
- .tqarg( fg )
- .tqarg( bg )
- .tqarg( pxSize + 2 )
- .tqarg( m_headerGradientImage->name() );
+ .arg( fg )
+ .arg( bg )
+ .arg( pxSize + 2 )
+ .arg( m_headerGradientImage->name() );
styleSheet += TQString( ".box-body { padding: 2px; background-color: %1; background-image: url( %2 ); background-repeat: repeat-x; font-size:%3px; }" )
- .tqarg( ContextBrowser::instance()->tqcolorGroup().base().name() )
- .tqarg( m_shadowGradientImage->name() )
- .tqarg( pxSize );
+ .arg( ContextBrowser::instance()->colorGroup().base().name() )
+ .arg( m_shadowGradientImage->name() )
+ .arg( pxSize );
//"Related Artists" related styles
styleSheet += TQString( ".box-header-nav { color: %1; background-color: %2; font-size: %3px; font-weight: bold; padding: 1px 0.5em; border-bottom: 1px solid #000; text-align: right; }" )
- .tqarg( fg )
- .tqarg( bg )
- .tqarg( pxSize );
+ .arg( fg )
+ .arg( bg )
+ .arg( pxSize );
//"Albums by ..." related styles
- styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).tqarg( fg ).tqarg( bg );
- styleSheet += TQString( ".album-header:hover a { color: %1; }" ).tqarg( fg );
- styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).tqarg( ContextBrowser::instance()->tqcolorGroup().base().name() ).tqarg( bg ).tqarg( bg );
+ styleSheet += TQString( ".album-header:hover { color: %1; background-color: %2; cursor: pointer; }" ).arg( fg ).arg( bg );
+ styleSheet += TQString( ".album-header:hover a { color: %1; }" ).arg( fg );
+ styleSheet += TQString( ".album-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).arg( ContextBrowser::instance()->colorGroup().base().name() ).arg( bg ).arg( bg );
styleSheet += TQString( ".album-title { font-weight: bold; }" );
- styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).tqarg( pxSize );
- styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).tqarg( pxSize );
+ styleSheet += TQString( ".album-info { float:right; padding-right:4px; font-size: %1px }" ).arg( pxSize );
+ styleSheet += TQString( ".album-length { float:right; padding-right:4px; font-size: %1px; clear:right; }" ).arg( pxSize );
styleSheet += TQString( ".album-image { padding-right: 4px; }" );
styleSheet += TQString( ".album-song a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" );
- styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg );
+ styleSheet += TQString( ".album-song a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg );
styleSheet += TQString( ".album-song-trackno { font-weight: bold; }" );
- styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).tqarg( bg ).tqarg( bg );
+ styleSheet += TQString( ".disc-separator { color: %1; border-bottom: 1px solid %2; }" ).arg( bg ).arg( bg );
styleSheet += TQString( ".disc-separator a { display: block; padding: 1px 2px; font-weight: normal; text-decoration: none; }" );
- styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).tqarg( fg ).tqarg( bg );
+ styleSheet += TQString( ".disc-separator a:hover { color: %1; background-color: %2; }" ).arg( fg ).arg( bg );
styleSheet += TQString( ".button { width: 100%; }" );
//boxes used to display score (sb: score box)
styleSheet += TQString( ".sbtext { text-align: right; padding: 0px 4px; }" );
styleSheet += TQString( ".sbinner { height: 8px; background-color: %1; border: solid %2 1px; }" )
- .tqarg( ContextBrowser::instance()->tqcolorGroup().highlight().name() )
- .tqarg( ContextBrowser::instance()->tqcolorGroup().highlightedText().name() );
+ .arg( ContextBrowser::instance()->colorGroup().highlight().name() )
+ .arg( ContextBrowser::instance()->colorGroup().highlightedText().name() );
styleSheet += TQString( ".sbouter { width: 52px; height: 10px; background-color: %1; border: solid %2 1px; }" )
- .tqarg( ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() )
- .tqarg( ContextBrowser::instance()->tqcolorGroup().highlight().name() );
+ .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() )
+ .arg( ContextBrowser::instance()->colorGroup().highlight().name() );
styleSheet += TQString( ".ratingBox { padding: 0px 4px; }" );
styleSheet += TQString( ".ratingStar { height: 0.9em; }" );
styleSheet += TQString( ".statsBox { border-left: solid %1 1px; }" )
- .tqarg( ContextBrowser::instance()->tqcolorGroup().base().dark( 120 ).name() );
+ .arg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() );
styleSheet += TQString( "#current_box-header-album { font-weight: normal; }" );
styleSheet += TQString( "#current_box-information-td { text-align: right; vertical-align: bottom; padding: 3px; }" );
styleSheet += TQString( "#current_box-largecover-td { text-align: left; width: 100px; padding: 0; vertical-align: bottom; }" );
styleSheet += TQString( "#current_box-largecover-image { padding: 4px; vertical-align: bottom; }" );
- styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).tqarg( link );
+ styleSheet += TQString( "#wiki_box-body a { color: %1; }" ).arg( link );
styleSheet += TQString( "#wiki_box-body a:hover { text-decoration: underline; }" );
//labels in tag dialog
styleSheet += ".label a:hover { font-weight: bold; }";
- styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).tqarg( pxSize );
- styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).tqarg( pxSize + 1 );
- styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).tqarg( pxSize + 2 );
- styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).tqarg( pxSize + 3 );
- styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).tqarg( pxSize + 4);
- styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).tqarg( pxSize + 5 );
- styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).tqarg( pxSize + 6 );
- styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).tqarg( pxSize + 7 );
- styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).tqarg( pxSize + 8 );
- styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).tqarg( pxSize + 9 );
+ styleSheet += TQString( ".label.size1 { font-size: %1px; }" ).arg( pxSize );
+ styleSheet += TQString( ".label.size2 { font-size: %1px; }" ).arg( pxSize + 1 );
+ styleSheet += TQString( ".label.size3 { font-size: %1px; }" ).arg( pxSize + 2 );
+ styleSheet += TQString( ".label.size4 { font-size: %1px; }" ).arg( pxSize + 3 );
+ styleSheet += TQString( ".label.size5 { font-size: %1px; }" ).arg( pxSize + 4);
+ styleSheet += TQString( ".label.size6 { font-size: %1px; }" ).arg( pxSize + 5 );
+ styleSheet += TQString( ".label.size7 { font-size: %1px; }" ).arg( pxSize + 6 );
+ styleSheet += TQString( ".label.size8 { font-size: %1px; }" ).arg( pxSize + 7 );
+ styleSheet += TQString( ".label.size9 { font-size: %1px; }" ).arg( pxSize + 8 );
+ styleSheet += TQString( ".label.size10 { font-size: %1px; }" ).arg( pxSize + 9 );
}
return styleSheet;
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 083b6b40..78c5437b 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -123,7 +123,7 @@ UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widg
fileInfo = new TQFileInfo(HTML_FILE);
TQTimer *t = new TQTimer( this );
- connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updatetqStatus() ) );
+ connect( t, TQT_SIGNAL(timeout()), TQT_SLOT(updateStatus() ) );
t->start( 2000, false );
kdDebug() << "Connecting widget signal" << endl;
@@ -208,9 +208,9 @@ void UniversalAmarok::updateBrowser(const TQString& file)
/*!
- \fn UniversalAmarok::updatetqStatus()
+ \fn UniversalAmarok::updateStatus()
*/
-void UniversalAmarok::updatetqStatus()
+void UniversalAmarok::updateStatus()
{
checkForAmarok();
vol_slider->setValue( playerStub->getVolume() );
diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h
index f033101d..9c2ee242 100644
--- a/amarok/src/konquisidebar/universalamarok.h
+++ b/amarok/src/konquisidebar/universalamarok.h
@@ -84,7 +84,7 @@ private:
public slots:
void updateBrowser(const TQString&);
- void updatetqStatus();
+ void updateStatus();
void sendPrev() { checkForAmarok(); playerStub->prev(); }
void sendPlay() { checkForAmarok(); playerStub->play(); }
void sendPause() { checkForAmarok(); playerStub->pause(); }
diff --git a/amarok/src/ktrm.cpp b/amarok/src/ktrm.cpp
index cc6e86bf..57d3a545 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -162,7 +162,7 @@ protected:
short port;
tp_GetServer(m_pimp, server, 255, &port);
TQString tunepimpHost = TQString(server);
- TQString tunepimpHostWithPort = (tunepimpHost + ":%1").tqarg(port);
+ TQString tunepimpHostWithPort = (tunepimpHost + ":%1").arg(port);
for(TQStringList::ConstIterator it = noProxies.constBegin(); it != noProxies.constEnd(); ++it) {
TQString normalizedHost = KNetwork::KResolver::normalizeDomain(*it);
@@ -212,7 +212,7 @@ private:
class KTRMEvent : public TQCustomEvent
{
public:
- enum tqStatus {
+ enum Status {
Recognized,
Unrecognized,
Collision,
@@ -220,7 +220,7 @@ public:
Error
};
- KTRMEvent(int fileId, tqStatus status) :
+ KTRMEvent(int fileId, Status status) :
TQCustomEvent(id),
m_fileId(fileId),
m_status(status) {}
@@ -230,7 +230,7 @@ public:
return m_fileId;
}
- tqStatus status() const
+ Status status() const
{
return m_status;
}
@@ -239,7 +239,7 @@ public:
private:
int m_fileId;
- tqStatus m_status;
+ Status m_status;
};
/**
@@ -250,7 +250,7 @@ private:
class KTRMEventHandler : public TQObject
{
public:
- static void send(int fileId, KTRMEvent::tqStatus status)
+ static void send(int fileId, KTRMEvent::Status status)
{
KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
}
@@ -324,7 +324,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void */*data*/, TPCallbackEnum ty
#if HAVE_TUNEPIMP < 4
track_t track = tp_GetTrack(pimp, fileId);
- TPFiletqStatus status = tr_GettqStatus(track);
+ TPFileStatus status = tr_GetStatus(track);
#endif
//debug() << "Status is: " << status << endl;
@@ -731,7 +731,7 @@ void KTRMLookup::puidGenerated()
tp_ReleaseTrack(KTRMRequestHandler::instance()->tunePimp(), track);
d->results.clear();
- KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).tqarg( puid ) , false, false );
+ KIO::Job *job = KIO::storedGet( TQString( "http://musicbrainz.org/ws/1/track/?type=xml&puid=%1" ).arg( puid ) , false, false );
Amarok::StatusBar::instance()->newProgressOperation( job )
.setDescription( i18n( "MusicBrainz Lookup" ) );
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 9fb03845..0d5f3937 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -61,9 +61,9 @@ int
AmarokHttp::get ( const TQString & path )
{
TQString uri = TQString( "http://%1:%2/%3" )
- .tqarg( m_hostname )
- .tqarg( m_port )
- .tqarg( path );
+ .arg( m_hostname )
+ .arg( m_port )
+ .arg( path );
m_done = false;
m_error = TQHttp::NoError;
@@ -104,7 +104,7 @@ AmarokHttp::slotData(KIO::Job*, const TQByteArray& data)
else if ( m_result.size() == 0 ) {
m_result = data;
}
- else if ( m_result.tqresize( m_result.size() + data.size() ) ) {
+ else if ( m_result.resize( m_result.size() + data.size() ) ) {
memcpy( m_result.end(), data.data(), data.size() );
}
}
@@ -308,17 +308,17 @@ Controller::stationDescription( TQString url )
/// TAG RADIOS
// eg: lastfm://globaltag/rock
if ( elements[1] == "globaltags" )
- return i18n( "Global Tag Radio: %1" ).tqarg( elements[2] );
+ return i18n( "Global Tag Radio: %1" ).arg( elements[2] );
/// ARTIST RADIOS
if ( elements[1] == "artist" )
{
// eg: lastfm://artist/Queen/similarartists
if ( elements[3] == "similarartists" )
- return i18n( "Similar Artists to %1" ).tqarg( elements[2] );
+ return i18n( "Similar Artists to %1" ).arg( elements[2] );
if ( elements[3] == "fans" )
- return i18n( "Artist Fan Radio: %1" ).tqarg( elements[2] );
+ return i18n( "Artist Fan Radio: %1" ).arg( elements[2] );
}
/// CUSTOM STATION
@@ -336,7 +336,7 @@ Controller::stationDescription( TQString url )
artists.replace( *it, capitalized );
}
- return i18n( "Custom Station: %1" ).tqarg( artists );
+ return i18n( "Custom Station: %1" ).arg( artists );
}
/// USER RADIOS
@@ -344,25 +344,25 @@ Controller::stationDescription( TQString url )
{
// eg: lastfm://user/sebr/neighbours
if ( elements[3] == "neighbours" )
- return i18n( "%1's Neighbor Radio" ).tqarg( elements[2] );
+ return i18n( "%1's Neighbor Radio" ).arg( elements[2] );
// eg: lastfm://user/sebr/personal
if ( elements[3] == "personal" )
- return i18n( "%1's Personal Radio" ).tqarg( elements[2] );
+ return i18n( "%1's Personal Radio" ).arg( elements[2] );
// eg: lastfm://user/sebr/loved
if ( elements[3] == "loved" )
- return i18n( "%1's Loved Radio" ).tqarg( elements[2] );
+ return i18n( "%1's Loved Radio" ).arg( elements[2] );
// eg: lastfm://user/sebr/recommended/100 : 100 is number for how obscure the music should be
if ( elements[3] == "recommended" )
- return i18n( "%1's Recommended Radio" ).tqarg( elements[2] );
+ return i18n( "%1's Recommended Radio" ).arg( elements[2] );
}
/// GROUP RADIOS
//eg: lastfm://group/Amarok%20users
else if ( elements[1] == "group" )
- return i18n( "Group Radio: %1" ).tqarg( elements[2] );
+ return i18n( "Group Radio: %1" ).arg( elements[2] );
/// TRACK RADIOS
else if ( elements[1] == "play" )
@@ -429,11 +429,11 @@ WebService::handshake( const TQString& username, const TQString& password )
const TQString path =
TQString( "/radio/handshake.php?version=%1&platform=%2&username=%3&passwordmd5=%4&debug=%5" )
- .tqarg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform
- .tqarg( TQString("Amarok") )
- .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) )
- .tqarg( KMD5( m_password.utf8() ).hexDigest().data() )
- .tqarg( "0" );
+ .arg( APP_VERSION ) //Muesli-approved: Amarok version, and Amarok-as-platform
+ .arg( TQString("Amarok") )
+ .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) )
+ .arg( KMD5( m_password.utf8() ).hexDigest().data() )
+ .arg( "0" );
http.get( path );
@@ -478,7 +478,7 @@ WebService::handshake( const TQString& username, const TQString& password )
debug() << "Proxy server using port: " << port << endl;
delete socket;
- m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).tqarg( port );
+ m_proxyUrl = TQString( "http://localhost:%1/lastfm.mp3" ).arg( port );
m_server = new Amarok::ProcIO();
m_server->setComm( KProcess::Communication( KProcess::AllOutput ) );
@@ -523,8 +523,8 @@ WebService::changeStation( TQString url )
AmarokHttp http( m_baseHost, 80 );
http.get( TQString( m_basePath + "/adjust.php?session=%1&url=%2&debug=0" )
- .tqarg( m_session )
- .tqarg( url ) );
+ .arg( m_session )
+ .arg( url ) );
m_deletionUnsafe = true;
do
@@ -568,8 +568,8 @@ WebService::requestMetaData() //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( metaDataFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/np.php?session=%1&debug=%2" )
- .tqarg( m_session )
- .tqarg( "0" ) );
+ .arg( m_session )
+ .arg( "0" ) );
}
@@ -655,9 +655,9 @@ WebService::enableScrobbling( bool enabled ) //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( enableScrobblingFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=%2&debug=%3" )
- .tqarg( m_session )
- .tqarg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) )
- .tqarg( "0" ) );
+ .arg( m_session )
+ .arg( enabled ? TQString( "rtp" ) : TQString( "nortp" ) )
+ .arg( "0" ) );
}
@@ -679,8 +679,8 @@ WebService::love() //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( loveFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=love&debug=%2" )
- .tqarg( m_session )
- .tqarg( "0" ) );
+ .arg( m_session )
+ .arg( "0" ) );
Amarok::StatusBar::instance()->shortMessage( i18n("love, as in affection", "Loving song...") );
}
@@ -692,8 +692,8 @@ WebService::skip() //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( skipFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=skip&debug=%2" )
- .tqarg( m_session )
- .tqarg( "0" ) );
+ .arg( m_session )
+ .arg( "0" ) );
Amarok::StatusBar::instance()->shortMessage( i18n("Skipping song...") );
}
@@ -705,8 +705,8 @@ WebService::ban() //SLOT
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( banFinished( int, bool ) ) );
http->get( TQString( m_basePath + "/control.php?session=%1&command=ban&debug=%2" )
- .tqarg( m_session )
- .tqarg( "0" ) );
+ .arg( m_session )
+ .arg( "0" ) );
Amarok::StatusBar::instance()->shortMessage( i18n("Ban, as in dislike", "Banning song...") );
}
@@ -763,7 +763,7 @@ WebService::friends( TQString username )
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( friendsFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/friends.xml" )
- .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
+ .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
}
@@ -805,7 +805,7 @@ WebService::neighbours( TQString username )
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( neighboursFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/neighbours.xml" )
- .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
+ .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
}
@@ -847,7 +847,7 @@ WebService::userTags( TQString username )
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( userTagsFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/tags.xml?debug=%2" )
- .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
+ .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
}
@@ -889,7 +889,7 @@ WebService::recentTracks( TQString username )
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recentTracksFinished( bool ) ) );
http->get( TQString( "/1.0/user/%1/recenttracks.xml" )
- .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
+ .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) ) );
}
@@ -931,35 +931,35 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to
switch ( type )
{
case 0:
- modeToken = TQString( "artist_name=%1" ).tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) );
+ modeToken = TQString( "artist_name=%1" ).arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) );
break;
case 1:
modeToken = TQString( "album_artist=%1&album_name=%2" )
- .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) )
- .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) );
+ .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) )
+ .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) );
break;
case 2:
modeToken = TQString( "track_artist=%1&track_name=%2" )
- .tqarg( TQString( TQUrl( artist ).encodedPathAndQuery() ) )
- .tqarg( TQString( TQUrl( token ).encodedPathAndQuery() ) );
+ .arg( TQString( TQUrl( artist ).encodedPathAndQuery() ) )
+ .arg( TQString( TQUrl( token ).encodedPathAndQuery() ) );
break;
}
TQHttp *http = new TQHttp( "wsdev.audioscrobbler.com", 80, this );
connect( http, TQT_SIGNAL( requestFinished( bool ) ), this, TQT_SLOT( recommendFinished( bool ) ) );
- uint currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
TQString challenge = TQString::number( currentTime );
TQCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
token = TQString( "user=%1&auth=%2&nonce=%3recipient=%4" )
- .tqarg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) )
- .tqarg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) )
- .tqarg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) )
- .tqarg( TQString( TQUrl( username ).encodedPathAndQuery() ) );
+ .arg( TQString( TQUrl( currentUsername() ).encodedPathAndQuery() ) )
+ .arg( TQString( TQUrl( md5pass ).encodedPathAndQuery() ) )
+ .arg( TQString( TQUrl( challenge ).encodedPathAndQuery() ) )
+ .arg( TQString( TQUrl( username ).encodedPathAndQuery() ) );
TQHttpRequestHeader header( "POST", "/1.0/rw/recommend.php?" + token.utf8() );
header.setValue( "Host", "wsdev.audioscrobbler.com" );
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
index 6959139e..6a2b3fe2 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
@@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA.
#include
#include
-#include
+#include
MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *parent, const char *name, bool modal, WFlags fl )
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
index 012aff43..4e1b02c2 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
@@ -92,7 +92,7 @@
If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection.
-
+
WordBreak|AlignVCenter
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
index 71e66458..801226f3 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
@@ -48,13 +48,13 @@
0
-
+
200
201
-
+
200
201
@@ -74,7 +74,7 @@
You have chosen to purchase the following album from Magnatune.com
-
+
WordBreak|AlignVCenter
@@ -158,7 +158,7 @@
- tqlayout2
+ layout2
@@ -180,7 +180,7 @@
Expanding
-
+
41
21
@@ -614,7 +614,7 @@
The amount you choose to pay will be split 50/50 between the artist and Magnatune.com. Your credit card information is sent directly to Magnatune.com using SSL encryption and is not stored by Amarok.
-
+
WordBreak|AlignVCenter
@@ -656,7 +656,7 @@
Minimum
-
+
20
20
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
index cfa248fa..7026bd58 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@@ -53,7 +53,7 @@
Expanding
-
+
170
20
diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp
index 0e760495..ea17966c 100644
--- a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp
+++ b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp
@@ -48,9 +48,9 @@ MagnatuneXmlParser::completeJob( )
{
Amarok::StatusBar::instance() ->longMessage(
i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" )
- .tqarg( m_nNumberOfTracks )
- .tqarg( m_nNumberOfAlbums )
- .tqarg( m_nNumberOfArtists ), KDE::StatusBar::Information );
+ .arg( m_nNumberOfTracks )
+ .arg( m_nNumberOfAlbums )
+ .arg( m_nNumberOfArtists ), KDE::StatusBar::Information );
emit( doneParsing() );
}
diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h
index 801e8fd7..f3d8346b 100644
--- a/amarok/src/magnatunebrowser/magnatunexmlparser.h
+++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h
@@ -97,8 +97,8 @@ private:
void parseElement( TQDomElement e );
/**
- * Parses all tqchildren of a DOM element
- * @param e The element whose tqchildren is to be parsed
+ * Parses all children of a DOM element
+ * @param e The element whose children is to be parsed
*/
void parseChildren( TQDomElement e );
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index 967ace1f..5a89e560 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -122,7 +122,7 @@ class SpaceLabel : public TQLabel {
void paintEvent(TQPaintEvent *e)
{
TQPainter p(this);
- p.fillRect(e->rect(), tqcolorGroup().brush(TQColorGroup::Background));
+ p.fillRect(e->rect(), colorGroup().brush(TQColorGroup::Background));
if(m_total > 0)
{
@@ -165,7 +165,7 @@ class SpaceLabel : public TQLabel {
if(scheduled > left)
left = scheduled;
int right = e->rect().right();
- p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, tqcolorGroup().brush(TQColorGroup::Background));
+ p.fillRect(left, e->rect().top(), right, e->rect().bottom()+1, colorGroup().brush(TQColorGroup::Background));
}
}
TQLabel::paintEvent(e);
@@ -630,11 +630,11 @@ MediaBrowser::updateDevices()
TQString name = (*it)->name();
if( !(*it)->deviceNode().isEmpty() )
{
- name = i18n( "%1 at %2" ).tqarg( name, (*it)->deviceNode() );
+ name = i18n( "%1 at %2" ).arg( name, (*it)->deviceNode() );
}
if( (*it)->hasMountPoint() && !(*it)->mountPoint().isEmpty() )
{
- name += i18n( " (mounted at %1)" ).tqarg( (*it)->mountPoint() );
+ name += i18n( " (mounted at %1)" ).arg( (*it)->mountPoint() );
}
m_deviceCombo->insertItem( name, i );
if( it == m_currentDevice )
@@ -721,7 +721,7 @@ MediaBrowser::transcode( const KURL &src, const TQString &filetype )
while( m_waitForTranscode && sm->transcodeScriptRunning() != TQString() )
{
usleep( 10000 );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
return m_transcodedUrl;
@@ -1090,10 +1090,10 @@ MediaItem::compare( TQListViewItem *i, int col, bool ascending ) const
else if( item && item->type() == MediaItem::ARTIST )
{
TQString key1 = key( col, ascending );
- if( key1.tqstartsWith( "the ", false ) )
+ if( key1.startsWith( "the ", false ) )
key1 = key1.mid( 4 );
TQString key2 = i->key( col, ascending );
- if( key2.tqstartsWith( "the ", false ) )
+ if( key2.startsWith( "the ", false ) )
key2 = key2.mid( 4 );
return key1.localeAwareCompare( key2 );
@@ -1127,13 +1127,13 @@ class MediaItemTip : public TQToolTip
{
if( b->track() )
text = TQString( "%1 - %2 (%3)" )
- .tqarg( TQString::number(b->track()), b->title(), b->prettyLength() );
+ .arg( TQString::number(b->track()), b->title(), b->prettyLength() );
if( !b->genre().isEmpty() )
{
if( !text.isEmpty() )
text += "
";
text += TQString( "Genre: %1" )
- .tqarg( b->genre() );
+ .arg( b->genre() );
}
}
}
@@ -1164,7 +1164,7 @@ class MediaItemTip : public TQToolTip
}
if( !text.isEmpty() && !text.isNull() )
- tip( m_view->tqitemRect( i ), text );
+ tip( m_view->itemRect( i ), text );
}
TQListView *m_view;
@@ -1498,9 +1498,9 @@ MediaView::viewportPaintEvent( TQPaintEvent *e )
const uint w = t.width() + 20;
const uint h = t.height() + 20;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
- t.draw( &p, 20, 20, TQRect(), tqcolorGroup() );
+ t.draw( &p, 20, 20, TQRect(), colorGroup() );
}
MediaBrowser::instance()->updateButtons();
}
@@ -1629,7 +1629,7 @@ MediaBrowser::mediumChanged( const Medium *medium, TQString /*name*/ )
Amarok::StatusBar::instance()->longMessage(
i18n( "The device %1 was unmounted before it was synchronized. "
"In order to avoid data loss, press the \"Disconnect\" button "
- "before unmounting the device." ).tqarg( name ),
+ "before unmounting the device." ).arg( name ),
KDE::StatusBar::Warning );
//(*it)->disconnectDevice();
}
@@ -1658,7 +1658,7 @@ MediaBrowser::mediumRemoved( const Medium *medium, TQString name )
Amarok::StatusBar::instance()->longMessage(
i18n( "The device %1 was removed before it was disconnected. "
"In order to avoid possible data loss, press the \"Disconnect\" "
- "button before disconnecting the device." ).tqarg( name ),
+ "button before disconnecting the device." ).arg( name ),
KDE::StatusBar::Warning );
}
else
@@ -1678,7 +1678,7 @@ MediaBrowser::loadDevicePlugin( const TQString &deviceType )
return 0;
TQString query = "[X-KDE-Amarok-plugintype] == 'mediadevice' and [X-KDE-Amarok-name] == '%1'";
- Amarok::Plugin *plugin = PluginManager::createFromQuery( query.tqarg( deviceType ) );
+ Amarok::Plugin *plugin = PluginManager::createFromQuery( query.arg( deviceType ) );
if( plugin )
{
@@ -1839,13 +1839,13 @@ MediaBrowser::updateStats()
TQString text = i18n( "1 track in queue", "%n tracks in queue", m_queue->childCount() );
if(m_queue->childCount() > 0)
{
- text += i18n(" (%1)").tqarg( KIO::convertSize( queued ) );
+ text += i18n(" (%1)").arg( KIO::convertSize( queued ) );
}
KIO::filesize_t total, avail;
if( currentDevice() && currentDevice()->getCapacity(&total, &avail) )
{
- text += i18n( " - %1 of %2 available" ).tqarg( KIO::convertSize( avail ) ).tqarg( KIO::convertSize( total ) );
+ text += i18n( " - %1 of %2 available" ).arg( KIO::convertSize( avail ) ).arg( KIO::convertSize( total ) );
m_stats->m_used = total-avail;
m_stats->m_total = total;
@@ -1884,7 +1884,7 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent )
it = dynamic_cast(parent->firstChild());
}
- bool tqchildrenVisible = false;
+ bool childrenVisible = false;
for( ; it; it = dynamic_cast(it->nextSibling()))
{
bool visible = true;
@@ -1929,13 +1929,13 @@ MediaView::setFilter( const TQString &filter, MediaItem *parent )
visible = true;
it->setVisible( visible );
if(visible)
- tqchildrenVisible = true;
+ childrenVisible = true;
}
if( root && m_device )
m_device->updateRootItems();
- return tqchildrenVisible;
+ return childrenVisible;
}
MediaDevice::MediaDevice()
@@ -2110,7 +2110,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url )
BundleList bundles;
if( !PlaylistFile::isPlaylistFile( url ) )
{
- Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).tqarg( url.path() ),
+ Amarok::StatusBar::instance()->longMessage( i18n( "Not a playlist file: %1" ).arg( url.path() ),
KDE::StatusBar::Sorry );
return bundles;
}
@@ -2118,7 +2118,7 @@ MediaDevice::bundlesToSync( const TQString &name, const KURL &url )
PlaylistFile playlist( url.path() );
if( playlist.isError() )
{
- Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ),
+ Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ),
KDE::StatusBar::Sorry );
return bundles;
}
@@ -2253,7 +2253,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli
if( playlist.isError() )
{
- Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).tqarg( url.path() ),
+ Amarok::StatusBar::instance()->longMessage( i18n( "Failed to load playlist: %1" ).arg( url.path() ),
KDE::StatusBar::Sorry );
return;
}
@@ -2295,7 +2295,7 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli
if( it->url() == url )
{
Amarok::StatusBar::instance()->shortMessage(
- i18n( "Track already queued for transfer: %1" ).tqarg( url.url() ) );
+ i18n( "Track already queued for transfer: %1" ).arg( url.url() ) );
return;
}
}
@@ -2453,7 +2453,7 @@ int MediaDevice::sysCall( const TQString &command )
sysProc->clearArguments();
(*sysProc) << command;
if (!sysProc->start( KProcess::Block, KProcess::AllOutput ))
- kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl;
+ kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl;
return (sysProc->exitStatus());
}
@@ -2490,7 +2490,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
else
{
usleep(10000);
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
}
@@ -2501,7 +2501,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
tryToRemove = true;
Amarok::StatusBar::instance()->longMessage(
i18n( "Media Device: Copying %1 to %2 failed" )
- .tqarg( src.prettyURL(), dst.prettyURL() ),
+ .arg( src.prettyURL(), dst.prettyURL() ),
KDE::StatusBar::Error );
}
else
@@ -2512,7 +2512,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
tryToRemove = true;
// probably s.th. went wrong
Amarok::StatusBar::instance()->longMessage(
- i18n( "Media Device: Reading tags from %1 failed" ).tqarg( dst.prettyURL() ),
+ i18n( "Media Device: Reading tags from %1 failed" ).arg( dst.prettyURL() ),
KDE::StatusBar::Error );
}
}
@@ -2783,7 +2783,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root )
it = static_cast( root->firstChild() );
}
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
for( ; it; it = static_cast( it->nextSibling() ) )
{
@@ -2885,7 +2885,7 @@ MediaDevice::syncStatsToDevice( MediaItem *root )
it = static_cast( root->firstChild() );
}
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
for( ; it; it = static_cast( it->nextSibling() ) )
{
@@ -2958,7 +2958,7 @@ MediaDevice::transferFiles()
delete transferredItem;
setProgress( progress() + 1 );
m_parent->m_queue->itemCountChanged();
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
continue;
}
@@ -3051,7 +3051,7 @@ MediaDevice::transferFiles()
if( !isPlayable( *bundle ) )
{
- Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).tqarg( bundle->url().path() ),
+ Amarok::StatusBar::instance()->shortMessage( i18n( "Track not playable on media device: %1" ).arg( bundle->url().path() ),
KDE::StatusBar::Sorry );
unplayable += (*it).url();
transferredItem->setFailed();
@@ -3071,7 +3071,7 @@ MediaDevice::transferFiles()
if( !isCanceled() )
{
Amarok::StatusBar::instance()->longMessage(
- i18n( "Failed to copy track to media device: %1" ).tqarg( bundle->url().path() ),
+ i18n( "Failed to copy track to media device: %1" ).arg( bundle->url().path() ),
KDE::StatusBar::Sorry );
transferredItem->setFailed();
}
@@ -3132,7 +3132,7 @@ MediaDevice::transferFiles()
}
m_parent->updateStats();
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
synchronizeDevice();
unlockDevice();
diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui
index 7d7489a0..3df6bb40 100644
--- a/amarok/src/mediadevice/daap/addhostbase.ui
+++ b/amarok/src/mediadevice/daap/addhostbase.ui
@@ -24,7 +24,7 @@
- tqlayout4
+ layout4
@@ -42,7 +42,7 @@
0
-
+
64
64
@@ -84,7 +84,7 @@
Expanding
-
+
20
130
@@ -95,7 +95,7 @@
- tqlayout5
+ layout5
@@ -124,7 +124,7 @@
Fixed
-
+
30
20
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index d73a1f89..df78bf80 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -483,7 +483,7 @@ DaapClient::customClicked()
if( dialog.exec() == TQDialog::Accepted ) {
TQString ip = resolve( dialog.m_base->m_hostName->text() );
if( ip == "0" )
- Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").tqarg( dialog.m_base->m_hostName->text() ) );
+ Amarok::StatusBar::instance()->shortMessage( i18n("Could not resolve %1.").arg( dialog.m_base->m_hostName->text() ) );
else
{
TQString key = ServerItem::key( dialog.m_base->m_hostName->text(), dialog.m_base->m_portInput->value() );
@@ -735,7 +735,7 @@ ServerItem::setOpen( bool o )
startAnimation();
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) );
- setText( 0, i18n( "Loading %1").tqarg( text( 0 ) ) );
+ setText( 0, i18n( "Loading %1").arg( text( 0 ) ) );
Daap::Reader* reader = new Daap::Reader( m_ip, m_port, this,
TQString(), m_daapClient, ( m_ip + ":3689" ).ascii() );
@@ -781,7 +781,7 @@ ServerItem::httpError( const TQString& errorString )
{
stopAnimation();
resetTitle();
- Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:
%1").tqarg( errorString ) );
+ Amarok::StatusBar::instance()->longMessage( i18n( "The following error occurred while trying to connect to the remote server:
%1").arg( errorString ) );
m_reader->deleteLater();
m_reader = 0;
m_loaded = false;
diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp
index b0629c9d..38848ec6 100644
--- a/amarok/src/mediadevice/daap/daapreader/reader.cpp
+++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp
@@ -258,7 +258,7 @@ Reader::databaseIdFinished( int /*id*/, bool error )
m_databaseId = TQString::number( dbIdResults["avdb"].asList()[0].asMap()["mlcl"].asList()[0].asMap()["mlit"].asList()[0].asMap()["miid"].asList()[0].asInt() );
connect( http, TQT_SIGNAL( requestFinished( int, bool ) ), this, TQT_SLOT( songListFinished( int, bool ) ) );
http->getDaap( TQString("/databases/%1/items?type=music&meta=dmap.itemid,dmap.itemname,daap.songformat,daap.songartist,daap.songalbum,daap.songtime,daap.songtracknumber,daap.songcomment,daap.songyear,daap.songgenre&%2")
- .tqarg( m_databaseId, m_loginString ) );
+ .arg( m_databaseId, m_loginString ) );
}
@@ -388,7 +388,7 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first )
TQ_INT8 patchLevel;
raw >> major >> minor >> patchLevel; DEBUGTAG( patchLevel )
TQString version("%1.%2.%3");
- version.tqarg(major, minor, patchLevel);
+ version.arg(major, minor, patchLevel);
addElement( childMap, tag, TQVariant(version) );
}
break;
diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp
index af0fe7f9..1c987c8e 100644
--- a/amarok/src/mediadevice/daap/daapserver.cpp
+++ b/amarok/src/mediadevice/daap/daapserver.cpp
@@ -71,7 +71,7 @@ DaapServer::readSql()
#if DNSSD_SUPPORT
KUser current;
if( !m_service )
- m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").tqarg( current.fullName() ), "_daap._tcp", line.toInt() );
+ m_service = new DNSSD::PublicService( i18n("%1's Amarok Share").arg( current.fullName() ), "_daap._tcp", line.toInt() );
debug() << "port number: " << line.toInt() << endl;
m_service->publishAsync();
#endif
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
index 3f7b7e85..fa5c9c4e 100644
--- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/cgi.rb
@@ -73,7 +73,7 @@ module Mongrel
@head['Server'] = options['server'] || env_table['SERVER_SOFTWARE']
# remaining possible options they can give
- @head['tqStatus'] = options['status'] if options['status']
+ @head['Status'] = options['status'] if options['status']
@head['Content-Language'] = options['language'] if options['language']
@head['Expires'] = options['expires'] if options['expires']
@@ -117,7 +117,7 @@ module Mongrel
# The dumb thing is people can call header or this or both and in any order.
# So, we just reuse header and then finalize the HttpResponse the right way.
- # tqStatus is taken from the various options and converted to what Mongrel needs
+ # Status is taken from the various options and converted to what Mongrel needs
# via the CGIWrapper.status function.
#
# We also prevent Rails from actually doing the final send by adding a
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
index cce1f36a..be7860a9 100644
--- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
@@ -399,7 +399,7 @@ module Mongrel
def process(request, response)
response.start do |head,out|
out.write <<-END
- Mongrel Server tqStatus
+ Mongrel Server Status
#{describe_listener}
END
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb
index 2778fc77..8067d1ef 100644
--- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb
@@ -395,11 +395,11 @@ class TarReader
end
def close
- tqinvalidate
+ invalidate
end
private
- def tqinvalidate
+ def invalidate
extend InvalidEntry
end
end
diff --git a/amarok/src/mediadevice/daap/proxy.cpp b/amarok/src/mediadevice/daap/proxy.cpp
index 8bf5cc0f..b1095cd4 100644
--- a/amarok/src/mediadevice/daap/proxy.cpp
+++ b/amarok/src/mediadevice/daap/proxy.cpp
@@ -56,7 +56,7 @@ Proxy::Proxy(KURL stream, DaapClient* client, const char* name)
const int port = socket->port();
debug() << "Proxy server using port: " << port << endl;
delete socket;
- m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").tqarg( port ) );
+ m_proxyUrl = KURL( TQString("http://localhost:%1/daap.mp3").arg( port ) );
//start proxy
m_proxy->setComm( KProcess::Communication( KProcess::AllOutput ) );
*m_proxy << "amarok_proxy.rb";
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 7a13253a..04c7f018 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -113,7 +113,7 @@ class GenericMediaFile
, m_device( device )
{
m_listed = false;
- m_tqchildren = new MediaFileList();
+ m_children = new MediaFileList();
if( m_parent )
{
@@ -152,8 +152,8 @@ class GenericMediaFile
m_parent->removeChild( this );
m_device->getItemMap().erase( m_viewItem );
m_device->getFileMap().erase( m_fullName );
- if ( m_tqchildren )
- delete m_tqchildren;
+ if ( m_children )
+ delete m_children;
if ( m_viewItem )
delete m_viewItem;
}
@@ -174,7 +174,7 @@ class GenericMediaFile
}
void
- removeChild( GenericMediaFile* childToDelete ) { m_tqchildren->remove( childToDelete ); }
+ removeChild( GenericMediaFile* childToDelete ) { m_children->remove( childToDelete ); }
GenericMediaItem*
getViewItem() { return m_viewItem; }
@@ -209,15 +209,15 @@ class GenericMediaFile
}
MediaFileList*
- getChildren() { return m_tqchildren; }
+ getChildren() { return m_children; }
void
deleteAll( bool onlyChildren )
{
GenericMediaFile *vmf;
- if( m_tqchildren && !m_tqchildren->isEmpty() )
+ if( m_children && !m_children->isEmpty() )
{
- MediaFileListIterator it( *m_tqchildren );
+ MediaFileListIterator it( *m_children );
while( ( vmf = it.current() ) != 0 )
{
++it;
@@ -232,9 +232,9 @@ class GenericMediaFile
renameAllChildren()
{
GenericMediaFile *vmf;
- if( m_tqchildren && !m_tqchildren->isEmpty() )
+ if( m_children && !m_children->isEmpty() )
{
- for( vmf = m_tqchildren->first(); vmf; vmf = m_tqchildren->next() )
+ for( vmf = m_children->first(); vmf; vmf = m_children->next() )
vmf->renameAllChildren();
}
setNamesFromBase();
@@ -244,7 +244,7 @@ class GenericMediaFile
TQString m_fullName;
TQString m_baseName;
GenericMediaFile *m_parent;
- MediaFileList *m_tqchildren;
+ MediaFileList *m_children;
GenericMediaItem *m_viewItem;
GenericMediaDevice* m_device;
bool m_listed;
@@ -626,7 +626,7 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle
TQString name;
while ( parent > 0 )
{
- values = CollectionDB::instance()->query( sql.tqarg( parent ) );
+ values = CollectionDB::instance()->query( sql.arg( parent ) );
name = values.first();
parent = values.last().toInt();
location += cleanPath( name ) + '/';
@@ -653,7 +653,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle )
const KURL desturl = KURL::fromPathOrURL( path );
- //kapp->tqprocessEvents( 100 );
+ //kapp->processEvents( 100 );
if( !kioCopyTrack( bundle.url(), desturl ) )
{
@@ -667,7 +667,7 @@ GenericMediaDevice::copyTrackToDevice( const MetaBundle& bundle )
//other than to see if it is NULL or not
//if we're here the transfer shouldn't have failed, so we shouldn't get into a loop by waiting...
while( !m_view->firstChild() )
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
return static_cast(m_view->firstChild());
}
@@ -774,7 +774,7 @@ GenericMediaDevice::expandItem( TQListViewItem *item ) // SLOT
while( !m_dirListerComplete )
{
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
usleep(10000);
}
}
@@ -866,10 +866,10 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ )
//or just update the list in the plugin as appropriate
else if( type == MediaItem::TRACK ) //file
{
- if( baseName.tqendsWith( "mp3", false ) || baseName.tqendsWith( "wma", false ) ||
- baseName.tqendsWith( "wav", false ) || baseName.tqendsWith( "ogg", false ) ||
- baseName.tqendsWith( "asf", false ) || baseName.tqendsWith( "flac", false ) ||
- baseName.tqendsWith( "aac", false ) || baseName.tqendsWith( "m4a", false ) )
+ if( baseName.endsWith( "mp3", false ) || baseName.endsWith( "wma", false ) ||
+ baseName.endsWith( "wav", false ) || baseName.endsWith( "ogg", false ) ||
+ baseName.endsWith( "asf", false ) || baseName.endsWith( "flac", false ) ||
+ baseName.endsWith( "aac", false ) || baseName.endsWith( "m4a", false ) )
newItem->getViewItem()->setType( MediaItem::TRACK );
@@ -898,7 +898,7 @@ GenericMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *availa
while( m_kBSize == 0 && m_kBAvail == 0){
usleep( 10000 );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
count++;
if (count > 120){
debug() << "KDiskFreeSp taking too long. Returning false from getCapacity()" << endl;
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
index 8a305909..e3468e17 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -35,7 +35,7 @@
- tqlayout88
+ layout88
@@ -88,7 +88,7 @@
- tqlayout24
+ layout24
@@ -96,7 +96,7 @@
- tqlayout23
+ layout23
@@ -133,7 +133,7 @@
- tqlayout19
+ layout19
@@ -171,7 +171,7 @@
Expanding
-
+
20
93
@@ -221,7 +221,7 @@
- tqlayout120
+ layout120
@@ -229,7 +229,7 @@
- tqlayout119
+ layout119
@@ -277,7 +277,7 @@
- tqlayout96
+ layout96
@@ -293,7 +293,7 @@
- tqlayout86
+ layout86
diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
index 43a06603..64d1d0fe 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h
@@ -255,10 +255,10 @@ GenericMediaDeviceConfigDialog::buildFormatTip()
continue;
args[MetaBundle::exactColumnName( i ).lower()] = MetaBundle::prettyColumnName( i );
}
- args["albumartist"] = i18n( "%1 or %2" ).tqarg( "Album Artist, The" , "The Album Artist" );
+ args["albumartist"] = i18n( "%1 or %2" ).arg( "Album Artist, The" , "The Album Artist" );
args["thealbumartist"] = "The Album Artist";
args["theartist"] = "The Artist";
- args["artist"] = i18n( "%1 or %2" ).tqarg( "Artist, The" , "The Artist" );
+ args["artist"] = i18n( "%1 or %2" ).arg( "Artist, The" , "The Artist" );
args["initial"] = i18n( "Artist's Initial" );
args["filetype"] = i18n( "File Extension of Source" );
args["track"] = i18n( "Track Number" );
@@ -270,7 +270,7 @@ GenericMediaDeviceConfigDialog::buildFormatTip()
it != args.end();
++it )
{
- tooltip += TQString( "%1 - %2" ).tqarg( it.data(), "%" + it.key() );
+ tooltip += TQString( "%1 - %2" ).arg( it.data(), "%" + it.key() );
}
tooltip += "";
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index f1df4e76..7a010f4f 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -419,7 +419,7 @@ IfpMediaDevice::copyTrackToDevice( const MetaBundle& bundle )
const TQCString dest = TQFile::encodeName( cleanPath(directory + newFilename) );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
int result = uploadTrack( src, dest );
if( !result ) //success
@@ -486,7 +486,7 @@ IfpMediaDevice::filetransferCallback( void *pData, struct ifp_transfer_status *p
{
// will be called by 'ifp_upload_file' by callback
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
IfpMediaDevice *that = static_cast(pData);
@@ -526,14 +526,14 @@ IfpMediaDevice::deleteItemFromDevice( MediaItem *item, int /*flags*/ )
case MediaItem::DIRECTORY:
err = ifp_delete_dir_recursive( &m_ifpdev, encodedPath );
debug() << "Deleting folder: " << encodedPath << endl;
- checkResult( err, i18n("Directory cannot be deleted: '%1'").tqarg(encodedPath.data()) );
+ checkResult( err, i18n("Directory cannot be deleted: '%1'").arg(encodedPath.data()) );
break;
default:
err = ifp_delete( &m_ifpdev, encodedPath );
debug() << "Deleting file: " << encodedPath << endl;
count += 1;
- checkResult( err, i18n("File does not exist: '%1'").tqarg(encodedPath.data()) );
+ checkResult( err, i18n("File does not exist: '%1'").arg(encodedPath.data()) );
break;
}
if( err == 0 ) //success
@@ -564,7 +564,7 @@ void
IfpMediaDevice::listDir( const TQString &dir )
{
int err = ifp_list_dirs( &m_ifpdev, TQFile::encodeName( dir ), listDirCallback, this );
- checkResult( err, i18n("Cannot enter directory: '%1'").tqarg(dir) );
+ checkResult( err, i18n("Cannot enter directory: '%1'").arg(dir) );
}
// will be called by 'ifp_list_dirs'
@@ -587,9 +587,9 @@ IfpMediaDevice::addTrackToList( int type, TQString name, int /*size*/ )
else if( type == IFP_FILE ) //file
{
- if( name.tqendsWith( "mp3", false ) || name.tqendsWith( "wma", false ) ||
- name.tqendsWith( "wav", false ) || name.tqendsWith( "ogg", false ) ||
- name.tqendsWith( "asf", false ) )
+ if( name.endsWith( "mp3", false ) || name.endsWith( "wma", false ) ||
+ name.endsWith( "wav", false ) || name.endsWith( "ogg", false ) ||
+ name.endsWith( "asf", false ) )
m_last->setType( MediaItem::TRACK );
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index 2dd6e8c5..b68e819c 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -316,13 +316,13 @@ IpodMediaDevice::IpodMediaDevice()
}
if( info->capacity > 0.f )
gen->insertItem( i18n( "%1 GB %2 (x%3)" )
- .tqarg( TQString::number( info->capacity ),
+ .arg( TQString::number( info->capacity ),
itdb_info_get_ipod_model_name_string( info->ipod_model ),
info->model_number ),
index );
else
gen->insertItem( i18n( "%1 (x%2)" )
- .tqarg( itdb_info_get_ipod_model_name_string( info->ipod_model ),
+ .arg( itdb_info_get_ipod_model_name_string( info->ipod_model ),
info->model_number ),
index );
}
@@ -385,12 +385,12 @@ IpodMediaDevice::slotIpodAction( int id )
g_error_free(err);
//FIXME: update i18n files for next message
Amarok::StatusBar::instance()->longMessage(
- i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).tqarg( itunesDir( "Device:SysInfo" ) ) );
+ i18n( "Could not write SysInfo file to iPod (check the permissions of the file \"%1\" on your iPod)" ).arg( itunesDir( "Device:SysInfo" ) ) );
//FIXME: update i18n files for next message
Amarok::StatusBar::instance()->shortMessage(
i18n( "Unable to set iPod model to %1 GB %2 (x%3)" )
- .tqarg( TQString::number( table[index].capacity ),
+ .arg( TQString::number( table[index].capacity ),
itdb_info_get_ipod_model_name_string( table[index].ipod_model ),
table[index].model_number ) );
}
@@ -398,7 +398,7 @@ IpodMediaDevice::slotIpodAction( int id )
{
Amarok::StatusBar::instance()->shortMessage(
i18n( "Setting iPod model to %1 GB %2 (x%3)" )
- .tqarg( TQString::number( table[index].capacity ),
+ .arg( TQString::number( table[index].capacity ),
itdb_info_get_ipod_model_name_string( table[index].ipod_model ),
table[index].model_number ) );
}
@@ -515,7 +515,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname,
TQString genre = metaBundle.genre();
- if( genre.tqstartsWith("audiobook", false) )
+ if( genre.startsWith("audiobook", false) )
audiobook = true;
if( audiobook )
{
@@ -684,7 +684,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle)
if ( !dir.exists() )
{
Amarok::StatusBar::instance()->longMessage(
- i18n( "Media Device: Creating directory for file %1 failed" ).tqarg( url.path() ),
+ i18n( "Media Device: Creating directory for file %1 failed" ).arg( url.path() ),
KDE::StatusBar::Error );
return NULL;
}
@@ -962,7 +962,7 @@ IpodMediaDevice::deleteItemFromDevice(MediaItem *mediaitem, int flags )
if(!(flags & OnlyPlayed) || item->played() > 0 || item->childCount() == 0)
{
if(item->childCount() > 0)
- debug() << "recursive deletion should have removed all tqchildren from " << item << "(" << item->text(0) << ")" << endl;
+ debug() << "recursive deletion should have removed all children from " << item << "(" << item->text(0) << ")" << endl;
else
delete item;
}
@@ -992,9 +992,9 @@ IpodMediaDevice::createLockFile( bool silent )
if( m_lockFile->exists() )
{
ok = false;
- msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).tqarg( mountPoint() );
+ msg = i18n( "Media Device: iPod mounted at %1 already locked. " ).arg( mountPoint() );
msg += i18n( "If you are sure that this is an error, then remove the file %1 and try again." )
- .tqarg( lockFilePath );
+ .arg( lockFilePath );
if( !silent )
{
@@ -1003,7 +1003,7 @@ IpodMediaDevice::createLockFile( bool silent )
== KMessageBox::Continue )
{
msg = i18n( "Media Device: removing lockfile %1 failed: %2. " )
- .tqarg( lockFilePath, m_lockFile->errorString() );
+ .arg( lockFilePath, m_lockFile->errorString() );
ok = m_lockFile->remove();
}
else
@@ -1017,7 +1017,7 @@ IpodMediaDevice::createLockFile( bool silent )
{
ok = false;
msg = i18n( "Media Device: failed to create lockfile on iPod mounted at %1: %2" )
- .tqarg(mountPoint(), m_lockFile->errorString());
+ .arg(mountPoint(), m_lockFile->errorString());
}
if( ok )
@@ -1038,7 +1038,7 @@ IpodMediaDevice::initializeIpod()
if( !dir.exists() )
{
Amarok::StatusBar::instance()->longMessage(
- i18n("Media device: Mount point %1 does not exist").tqarg(mountPoint()),
+ i18n("Media device: Mount point %1 does not exist").arg(mountPoint()),
KDE::StatusBar::Error );
return false;
}
@@ -1091,7 +1091,7 @@ IpodMediaDevice::initializeIpod()
return false;
Amarok::StatusBar::instance()->longMessage(
- i18n("Media Device: Initialized iPod mounted at %1").tqarg(mountPoint()),
+ i18n("Media Device: Initialized iPod mounted at %1").arg(mountPoint()),
KDE::StatusBar::Information );
return true;
@@ -1113,7 +1113,7 @@ IpodMediaDevice::openDevice( bool silent )
if( m_itdb )
{
Amarok::StatusBar::instance()->longMessage(
- i18n("Media Device: iPod at %1 already opened").tqarg(mountPoint()),
+ i18n("Media Device: iPod at %1 already opened").arg(mountPoint()),
KDE::StatusBar::Sorry );
return false;
}
@@ -1185,7 +1185,7 @@ IpodMediaDevice::openDevice( bool silent )
if( !m_itdb && canInitialize )
{
TQString msg = i18n( "Media Device: could not find iTunesDB on device mounted at %1. "
- "Should I try to initialize your iPod?" ).tqarg( mountPoint() );
+ "Should I try to initialize your iPod?" ).arg( mountPoint() );
if( !silent
&& KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ),
@@ -1200,7 +1200,7 @@ IpodMediaDevice::openDevice( bool silent )
}
Amarok::StatusBar::instance()->longMessage(
- i18n("Media Device: Failed to initialize iPod mounted at %1").tqarg(mountPoint()),
+ i18n("Media Device: Failed to initialize iPod mounted at %1").arg(mountPoint()),
KDE::StatusBar::Sorry );
return false;
@@ -1236,7 +1236,7 @@ IpodMediaDevice::openDevice( bool silent )
{
debug() << "failed to create hash dir " << real << endl;
Amarok::StatusBar::instance()->longMessage(
- i18n("Media device: Failed to create directory %1").tqarg(real),
+ i18n("Media device: Failed to create directory %1").arg(real),
KDE::StatusBar::Error );
return false;
}
@@ -1244,7 +1244,7 @@ IpodMediaDevice::openDevice( bool silent )
}
if( !silent )
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
initView();
GList *cur = m_itdb->playlists;
@@ -1255,7 +1255,7 @@ IpodMediaDevice::openDevice( bool silent )
}
if( !silent )
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
for( cur = m_itdb->tracks; cur; cur = cur->next )
{
@@ -1264,7 +1264,7 @@ IpodMediaDevice::openDevice( bool silent )
}
if( !silent )
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
updateRootItems();
m_customAction->setEnabled( true );
@@ -1364,7 +1364,7 @@ IpodMediaDevice::detectModel()
#endif
}
if( modelString )
- m_name = TQString( "iPod %1" ).tqarg( TQString::fromUtf8( modelString ) );
+ m_name = TQString( "iPod %1" ).arg( TQString::fromUtf8( modelString ) );
if( m_needsFirewireGuid )
{
@@ -1372,7 +1372,7 @@ IpodMediaDevice::detectModel()
if( !fwid )
{
Amarok::StatusBar::instance()->longMessage(
- i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").tqarg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) );
+ i18n("Your iPod's Firewire GUID is required for correctly updating its music database, but it is not known. See %1 for more information.").arg( "http://amarok.kde.org/wiki/Media_Device:IPod" ) );
}
else
g_free( fwid );
@@ -2693,7 +2693,7 @@ IpodMediaDevice::deleteFile( const KURL &url )
this, TQT_SLOT( fileDeleted( KIO::Job * ) ) );
do
{
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
if( isCanceled() )
break;
usleep( 10000 );
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index 97952ce4..8e0fa969 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -139,7 +139,7 @@ MtpMediaDevice::progressCallback( uint64_t const sent, uint64_t const total, voi
Q_UNUSED( sent );
Q_UNUSED( total );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
MtpMediaDevice *dev = (MtpMediaDevice*)(data);
@@ -321,7 +321,7 @@ MediaItem
LIBMTP_destroy_track_t( trackmeta );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
// add track to view and to new tracks list
MediaItem *newItem = addTrackToView( taggedTrack );
@@ -436,7 +436,7 @@ MtpMediaDevice::updateAlbumArt( TQPtrList *items )
setCanceled( false );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
TQMap< TQString, TQPtrList > albumList;
for( MtpMediaItem *it = dynamic_cast(items->first()); it && !(m_canceled); it = dynamic_cast(items->next()) )
@@ -453,14 +453,14 @@ MtpMediaDevice::updateAlbumArt( TQPtrList *items )
}
int i = 0;
setProgress( i, albumList.count() );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
TQMap< TQString, TQPtrList >::Iterator it;
for( it = albumList.begin(); it != albumList.end(); ++it )
{
sendAlbumArt( &it.data() );
setProgress( ++i );
if( i % 20 == 0 )
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
hideProgress();
}
@@ -756,7 +756,7 @@ MediaItem
}
}
uint32_t folderId = checkFolderStructure( bundle, false );
- MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).tqarg( folderId ).tqarg( bundle.filename() ) ];
+ MediaItem *file = m_fileNameToItem[ TQString( "%1/%2" ).arg( folderId ).arg( bundle.filename() ) ];
if( file != 0 )
return file;
return 0;
@@ -1050,10 +1050,10 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem )
// clear cached filename
if( deleteItem->type() == MediaItem::TRACK )
- m_fileNameToItem.remove( TQString( "%1/%2" ).tqarg( deleteItem->track()->folderId() ).tqarg( deleteItem->bundle()->filename() ) );
+ m_fileNameToItem.remove( TQString( "%1/%2" ).arg( deleteItem->track()->folderId() ).arg( deleteItem->bundle()->filename() ) );
// remove from the media view
delete deleteItem;
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
return 1;
}
@@ -1454,7 +1454,7 @@ MtpMediaItem
item->setType( MediaItem::TRACK );
item->setBundle( track->bundle() );
item->track()->setId( track->id() );
- m_fileNameToItem[ TQString( "%1/%2" ).tqarg( track->folderId() ).tqarg( track->bundle()->filename() ) ] = item;
+ m_fileNameToItem[ TQString( "%1/%2" ).arg( track->folderId() ).arg( track->bundle()->filename() ) ] = item;
m_idToTrack[ track->id() ] = track;
}
return item;
@@ -1478,7 +1478,7 @@ MtpMediaDevice::readMtpMusic()
int progress = 0;
setProgress( progress, total ); // we don't know how many tracks. fake progress bar.
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
LIBMTP_track_t *tracks = LIBMTP_Get_Tracklisting_With_Callback( m_device, progressCallback, this );
@@ -1512,7 +1512,7 @@ MtpMediaDevice::readMtpMusic()
progress++;
setProgress( progress );
if( progress % 50 == 0 )
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
}
@@ -1562,7 +1562,7 @@ MtpMediaDevice::readPlaylists()
tmp = playlists;
playlists = playlists->next;
LIBMTP_destroy_playlist_t( tmp );
- kapp->tqprocessEvents( 50 );
+ kapp->processEvents( 50 );
}
}
}
@@ -1585,7 +1585,7 @@ MtpMediaDevice::readAlbums()
tmp = albums;
albums = albums->next;
LIBMTP_destroy_album_t( tmp );
- kapp->tqprocessEvents( 50 );
+ kapp->processEvents( 50 );
}
}
}
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index ea07df5f..04d4ce05 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -452,7 +452,7 @@ NjbMediaDevice::copyTrackToDevice(const MetaBundle& bundle)
njb_songid_t* songid = NJB_Songid_New();
taggedTrack->writeToSongid( songid );
m_busy = true;
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
if(NJB_Send_Track (m_njb, bundle.url().path().utf8(), songid, progressCallback, this, &id) != NJB_SUCCESS)
{
debug() << ": NJB_Send_Track failed\n";
@@ -687,7 +687,7 @@ NjbMediaDevice::runTransferDialog()
int
NjbMediaDevice::progressCallback( u_int64_t sent, u_int64_t total, const char* /*buf*/, unsigned /*len*/, void* data)
{
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
NjbMediaDevice *njb_media = reinterpret_cast(data);
@@ -733,7 +733,7 @@ NjbMediaDevice::readJukeboxMusic( void )
m_playlistItem->m_order = -5;
m_playlistItem->setType( MediaItem::PLAYLISTSROOT );*/
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
for( trackValueList::iterator it = trackList.begin(); it != trackList.end(); it++ )
{
@@ -804,7 +804,7 @@ void
NjbMediaDevice::expandItem( TQListViewItem *item )
{
DEBUG_BLOCK
- // First clear the item's tqchildren to repopulate.
+ // First clear the item's children to repopulate.
while( item->firstChild() )
delete item->firstChild();
@@ -886,7 +886,7 @@ NjbMediaDevice::customClicked()
{
TQString Information;
TQString tracksFound;
- TQString powertqStatus;
+ TQString powerStatus;
TQString batteryLevel;
TQString batteryCharging;
@@ -894,12 +894,12 @@ NjbMediaDevice::customClicked()
{
tracksFound = i18n( "1 track found on device",
"%n tracks found on device ", trackList.size() );
- powertqStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary power") : i18n("On main power") );
+ powerStatus = ( (NJB_Get_Auxpower( m_njb ) == 1) ? i18n("On auxiliary power") : i18n("On main power") );
batteryCharging = ( (NJB_Get_Battery_Charging( m_njb ) == 1) ? i18n("Battery charging") : i18n("Battery not charging") );
batteryLevel = (i18n("Battery level: ") + TQString::number( NJB_Get_Battery_Level( m_njb ) ) );
Information = ( i18n("Player Information for ") + m_name +'\n' +
- i18n("Power status: ") + powertqStatus + '\n' +
+ i18n("Power status: ") + powerStatus + '\n' +
i18n("Battery status: ") + batteryLevel + " (" +
batteryCharging + ')' );
}
diff --git a/amarok/src/mediadevice/njb/playlist.cpp b/amarok/src/mediadevice/njb/playlist.cpp
index 7afeffd6..6f82dd7f 100644
--- a/amarok/src/mediadevice/njb/playlist.cpp
+++ b/amarok/src/mediadevice/njb/playlist.cpp
@@ -295,7 +295,7 @@ playlistValueList::readFromDevice( void)
NJB_Reset_Get_Playlist( NjbMediaDevice::theNjb());
while( njb_playlist_t* pl = NJB_Get_Playlist( NjbMediaDevice::theNjb()) ) {
// FIXME (acejones) Make this a signal
- // infoMessage( i18n( "Downloading playlist %1...").tqarg( ++playlists));
+ // infoMessage( i18n( "Downloading playlist %1...").arg( ++playlists));
++playlists;
append( NjbPlaylist(pl));
NJB_Playlist_Destroy( pl);
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
index 7dc83c33..df55f032 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
@@ -288,7 +288,7 @@ RioKarmaMediaDevice::openDevice( bool silent )
if( !dir.exists() )
{
Amarok::StatusBar::instance()->longMessage(
- i18n( "Media device: Mount point %1 does not exist" ).tqarg( mountPoint() ),
+ i18n( "Media device: Mount point %1 does not exist" ).arg( mountPoint() ),
KDE::StatusBar::Error );
return false;
}
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index d2f3ba1a..3c83ede4 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -25,7 +25,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -52,22 +52,22 @@ MediumPluginManagerDialog::MediumPluginManagerDialog()
TQVBox* vbox = makeVBoxMainWidget();
vbox->setSpacing( KDialog::spacingHint() );
- vbox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ vbox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
m_location = new TQGroupBox( 1, Qt::Vertical, i18n( "Devices" ), vbox );
- m_location->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ m_location->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
m_devicesBox = new TQVBox( m_location );
- m_devicesBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ m_devicesBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
m_manager = new MediumPluginManager( m_devicesBox );
TQHBox *hbox = new TQHBox( vbox );
KPushButton *detectDevices = new KPushButton( i18n( "Autodetect Devices" ), hbox);
- detectDevices->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ detectDevices->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( detectDevices, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( redetectDevices() ) );
KPushButton *addButton = new KPushButton( i18n( "Add Device..." ), hbox );
- addButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ addButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
connect( addButton, TQT_SIGNAL( clicked() ), m_manager, TQT_SLOT( newDevice() ) );
}
@@ -392,36 +392,36 @@ MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr,
if( !m_oldPlugin.isEmpty() )
m_new = false;
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
setSpacing( 5 );
const TQString labelTextNone = i18n( "(none)" );
TQString row = "| %1 | %2 | ";
TQString table;
- table += row.tqarg( escapeHTML( i18n( "Autodetected:" ) ),
+ table += row.arg( escapeHTML( i18n( "Autodetected:" ) ),
escapeHTML( medium->isAutodetected() ? i18n("Yes") : i18n("No") ) );
- table += row.tqarg( escapeHTML( i18n( "ID:" ) ),
+ table += row.arg( escapeHTML( i18n( "ID:" ) ),
escapeHTML( medium->id() ) );
- table += row.tqarg( escapeHTML( i18n( "Name:" ) ),
+ table += row.arg( escapeHTML( i18n( "Name:" ) ),
escapeHTML( medium->name() ) );
- table += row.tqarg( escapeHTML( i18n( "Label:" ) ),
+ table += row.arg( escapeHTML( i18n( "Label:" ) ),
escapeHTML( medium->label().isEmpty() ? labelTextNone : medium->label() ) );
- table += row.tqarg( escapeHTML( i18n( "User Label:" ) ),
+ table += row.arg( escapeHTML( i18n( "User Label:" ) ),
escapeHTML( medium->userLabel().isEmpty() ? labelTextNone : medium->userLabel() ) );
- table += row.tqarg( escapeHTML( i18n( "Device Node:" ) ),
+ table += row.arg( escapeHTML( i18n( "Device Node:" ) ),
escapeHTML( medium->deviceNode().isEmpty() ? labelTextNone : medium->deviceNode() ) );
- table += row.tqarg( escapeHTML( i18n( "Mount Point:" ) ),
+ table += row.arg( escapeHTML( i18n( "Mount Point:" ) ),
escapeHTML( medium->mountPoint().isEmpty() ? labelTextNone : medium->mountPoint() ) );
- table += row.tqarg( escapeHTML( i18n( "Mime Type:" ) ),
+ table += row.arg( escapeHTML( i18n( "Mime Type:" ) ),
escapeHTML( medium->mimeType().isEmpty() ? labelTextNone : medium->mimeType() ) );
- TQString title = escapeHTML( i18n( "Device information for %1").tqarg(medium->name() ) );
- TQString details = TQString( "%1
" "" ).tqarg( title, table );
+ TQString title = escapeHTML( i18n( "Device information for %1").arg(medium->name() ) );
+ TQString details = TQString( "%1
" "" ).arg( title, table );
(void)new TQLabel( i18n("Name: "), this );
(void)new TQLabel( medium->name(), this );
(void)new KActiveLabel( i18n( "(Details)" )
- .tqarg( Amarok::escapeHTMLAttr( details ) ), this );
+ .arg( Amarok::escapeHTMLAttr( details ) ), this );
(void)new TQLabel( i18n("Plugin:"), this );
m_pluginCombo = new KComboBox( false, this );
diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h
index 4e1461d8..152e90a4 100644
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@@ -16,7 +16,7 @@
#include "hintlineedit.h"
#include "plugin/pluginconfig.h"
-#include
+#include
#include
#include
diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp
index be64494b..8ac01799 100644
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@@ -1051,7 +1051,7 @@ MetaBundle::prettyTitle() const
if( s.isEmpty() )
s = title();
else
- s = i18n("%1 - %2").tqarg( artist(), title() );
+ s = i18n("%1 - %2").arg( artist(), title() );
if( s.isEmpty() ) s = prettyTitle( filename() );
@@ -1067,7 +1067,7 @@ MetaBundle::veryNiceTitle() const
if( !title().isEmpty() )
{
if( !artist().isEmpty() )
- s = i18n( "%1 by %2" ).tqarg( title(), artist() );
+ s = i18n( "%1 by %2" ).arg( title(), artist() );
else
s = title();
}
@@ -1146,10 +1146,10 @@ MetaBundle::veryPrettyTime( int time )
switch( s.count() )
{
- case 1: return i18n( "seconds", "%1s" ).tqarg( s[0] );
- case 2: return i18n( "minutes, seconds", "%2m %1s" ).tqarg( s[0], s[1] );
- case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).tqarg( s[0], s[1], s[2] );
- case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).tqarg( s[0], s[1], s[2], s[3] );
+ case 1: return i18n( "seconds", "%1s" ).arg( s[0] );
+ case 2: return i18n( "minutes, seconds", "%2m %1s" ).arg( s[0], s[1] );
+ case 3: return i18n( "hours, minutes, seconds", "%3h %2m %1s" ).arg( s[0], s[1], s[2] );
+ case 4: return i18n( "days, hours, minutes, seconds", "%4d %3h %2m %1s" ).arg( s[0], s[1], s[2], s[3] );
default: return "omg bug!";
}
}
@@ -1208,13 +1208,13 @@ MetaBundle::fuzzyTime( int time )
TQString hours = i18n( "1 hour", "%n hours", hr );
if( week )
- return weeks.tqarg( day ? days.tqarg("") : "" ).simplifyWhiteSpace();
+ return weeks.arg( day ? days.arg("") : "" ).simplifyWhiteSpace();
else if ( day )
- return days.tqarg( hr ? hours : "" ).simplifyWhiteSpace();
+ return days.arg( hr ? hours : "" ).simplifyWhiteSpace();
else if ( hr )
- return i18n( "%1:%2 hours" ).tqarg( hr ).tqarg( zeroPad( min ) );
+ return i18n( "%1:%2 hours" ).arg( hr ).arg( zeroPad( min ) );
else
- return i18n( "%1:%2").tqarg( min ).tqarg( zeroPad( secs ) );
+ return i18n( "%1:%2").arg( min ).arg( zeroPad( secs ) );
}
TQString
@@ -1271,7 +1271,7 @@ MetaBundle::ratingList()
TQStringList list;
list += ratingDescription( 0 );
for ( int i = 1; i<=10; i++ )
- list += s.tqarg( prettyRating( i, true ) ).tqarg( ratingDescription( i ) );
+ list += s.arg( prettyRating( i, true ) ).arg( ratingDescription( i ) );
return list;
}
@@ -1509,7 +1509,7 @@ MetaBundle::save( TagLib::FileRef* fileref )
// QT's version encodeAttr is 1) private to TQDom, and 2) a litte slow. This
// one can be made public if needed. It happens to be on a critical path
// (each char of playlist / undo save). TQStyleSheet::escape does not deal with
-// tqunicode chars illegal for XML. There's a lot of junk in those tags
+// unicode chars illegal for XML. There's a lot of junk in those tags
static inline void xmlEncode(TQTextStream &stream, const TQString &str)
{
TQString tmp;
@@ -1517,7 +1517,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str)
uint i = 0;
while ( i < cur->length() )
{
- uint uc = (*cur)[i].tqunicode();
+ uint uc = (*cur)[i].unicode();
// we try to accumulate unescaped chars before writing to stream
const char *escaped;
// careful about the order of tests, common before less common
@@ -1530,7 +1530,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str)
else if ( uc == '"' ) escaped = """;
else
{
- // see if it's a XML-valid tqunicode char at all
+ // see if it's a XML-valid unicode char at all
if ( (0x20 <= uc && uc <= 0xD7FF || 0xE000 <= uc && uc <= 0xFFFD
|| uc == 0x9 || uc == 0xA || uc == 0xD) )
// fairly common, other ascii chars
diff --git a/amarok/src/metabundle.h b/amarok/src/metabundle.h
index 5a8a9dbc..a6a217ce 100644
--- a/amarok/src/metabundle.h
+++ b/amarok/src/metabundle.h
@@ -420,7 +420,7 @@ private:
static inline TQString prettyGeneric( const TQString &s, const int i )
{
- return (i > 0) ? s.tqarg( i ) : (i == Undetermined) ? "?" : "-";
+ return (i > 0) ? s.arg( i ) : (i == Undetermined) ? "?" : "-";
}
void init( TagLib::AudioProperties *ap = 0 );
@@ -533,7 +533,7 @@ inline TQString MetaBundle::prettySampleRate( bool shortened ) const
return prettyGeneric( i18n( "SampleRate", "%1 Hz" ), m_sampleRate );
}
-inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).tqarg( i ) : TQString::number( i ); }
+inline TQString MetaBundle::zeroPad( uint i ) { return ( i < 10 ) ? TQString( "0%1" ).arg( i ) : TQString::number( i ); }
inline bool MetaBundle::hasExtendedMetaInformation() const
{
diff --git a/amarok/src/metadata/m4a/mp4file.h b/amarok/src/metadata/m4a/mp4file.h
index c1da43d6..9e40dbc9 100644
--- a/amarok/src/metadata/m4a/mp4file.h
+++ b/amarok/src/metadata/m4a/mp4file.h
@@ -104,7 +104,7 @@ namespace TagLib {
/*!
* This will remove all tags.
*
- * \note This will also tqinvalidate pointers to the tags
+ * \note This will also invalidate pointers to the tags
* as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called
*/
diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.cpp b/amarok/src/metadata/m4a/mp4mvhdbox.cpp
index 894f7f89..36053e4b 100644
--- a/amarok/src/metadata/m4a/mp4mvhdbox.cpp
+++ b/amarok/src/metadata/m4a/mp4mvhdbox.cpp
@@ -39,7 +39,7 @@ public:
TagLib::uint timescale;
//! duration of presentation
TagLib::ulonglong duration;
- //! ptqlayout speed
+ //! playout speed
TagLib::uint rate;
//! volume for entire presentation
TagLib::uint volume;
diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.h b/amarok/src/metadata/m4a/mp4mvhdbox.h
index 31e3d740..b133485e 100644
--- a/amarok/src/metadata/m4a/mp4mvhdbox.h
+++ b/amarok/src/metadata/m4a/mp4mvhdbox.h
@@ -44,7 +44,7 @@ namespace TagLib
uint timescale() const;
//! function to get the presentation duration in the mp4 file
ulonglong duration() const;
- //! function to get the rate (ptqlayout speed) - typically 1.0;
+ //! function to get the rate (playout speed) - typically 1.0;
uint rate() const;
//! function to get volume level for presentation - typically 1.0;
uint volume() const;
diff --git a/amarok/src/metadata/trueaudio/ttafile.h b/amarok/src/metadata/trueaudio/ttafile.h
index 3a97a9ef..2cb07856 100644
--- a/amarok/src/metadata/trueaudio/ttafile.h
+++ b/amarok/src/metadata/trueaudio/ttafile.h
@@ -154,7 +154,7 @@ namespace TagLib {
* This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags.
*
- * \note This will also tqinvalidate pointers to the tags
+ * \note This will also invalidate pointers to the tags
* as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called
*/
diff --git a/amarok/src/metadata/wavpack/wvfile.h b/amarok/src/metadata/wavpack/wvfile.h
index 18f2316e..6c57f6d7 100644
--- a/amarok/src/metadata/wavpack/wvfile.h
+++ b/amarok/src/metadata/wavpack/wvfile.h
@@ -136,7 +136,7 @@ namespace TagLib {
* This will remove the tags that match the OR-ed together TagTypes from the
* file. By default it removes all tags.
*
- * \note This will also tqinvalidate pointers to the tags
+ * \note This will also invalidate pointers to the tags
* as their memory will be freed.
* \note In order to make the removal permanent save() still needs to be called
*/
diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp
index ac1d51f0..a67e31cc 100644
--- a/amarok/src/moodbar.cpp
+++ b/amarok/src/moodbar.cpp
@@ -514,11 +514,11 @@ MoodServer::slotJobCompleted( KProcess *proc )
if( proc != m_currentProcess )
warning() << "MoodServer::slotJobCompleted: proc != m_currentProcess!" << endl;
- ReturntqStatus returnval;
+ ReturnStatus returnval;
if( !m_currentProcess->normalExit() )
returnval = Crash;
else
- returnval = (ReturntqStatus) m_currentProcess->exitStatus();
+ returnval = (ReturnStatus) m_currentProcess->exitStatus();
bool success = (returnval == Success);
KURL url = m_currentData.m_url;
@@ -972,7 +972,7 @@ Moodbar::draw( int width, int height )
m_mutex.lock();
- // Do we have to tqrepaint, or can we use the cache?
+ // Do we have to repaint, or can we use the cache?
if( m_pixmap.width() == width && m_pixmap.height() == height )
{
m_mutex.unlock();
diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h
index c71495b8..85ea4a63 100644
--- a/amarok/src/moodbar.h
+++ b/amarok/src/moodbar.h
@@ -166,7 +166,7 @@ private:
NoPlugin = 1,
NoFile = 2,
CommandLine = 3
- } ReturntqStatus;
+ } ReturnStatus;
MoodServer( void );
void setMoodbarBroken( void );
diff --git a/amarok/src/mountpointmanager.cpp b/amarok/src/mountpointmanager.cpp
index 00a6e4d0..4520bf4a 100644
--- a/amarok/src/mountpointmanager.cpp
+++ b/amarok/src/mountpointmanager.cpp
@@ -210,7 +210,7 @@ MountPointManager::getAbsolutePath( const int deviceId, const KURL& relativePath
m_handlerMapMutex.unlock();
TQStringList lastMountPoint = CollectionDB::instance()->query(
TQString( "SELECT lastmountpoint FROM devices WHERE id = %1" )
- .tqarg( deviceId ) );
+ .arg( deviceId ) );
if ( lastMountPoint.count() == 0 )
{
//hmm, no device with that id in the DB...serious problem
@@ -471,10 +471,10 @@ MountPointManager::migrateStatistics()
int deviceid = getIdForUrl( *it );
TQString rpath = getRelativePath( deviceid, *it );
TQString update = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" )
- .tqarg( deviceid )
- .tqarg( CollectionDB::instance()->escapeString( rpath ) );
+ .arg( deviceid )
+ .arg( CollectionDB::instance()->escapeString( rpath ) );
update += TQString( " WHERE url = '%1' AND deviceid = -2;" )
- .tqarg( CollectionDB::instance()->escapeString( *it ) );
+ .arg( CollectionDB::instance()->escapeString( *it ) );
CollectionDB::instance()->query( update );
}
}
@@ -539,15 +539,15 @@ void UrlUpdateJob::updateStatistics( )
int statCount = collDB->query(
TQString( "SELECT COUNT( url ) FROM statistics WHERE deviceid = %1 AND url = '%2';" )
- .tqarg( newDeviceid )
- .tqarg( collDB->escapeString( newRpath ) ) ).first().toInt();
+ .arg( newDeviceid )
+ .arg( collDB->escapeString( newRpath ) ) ).first().toInt();
if( statCount )
continue; //statistics row with new URL/deviceid values already exists
TQString sql = TQString( "UPDATE statistics SET deviceid = %1, url = '%2'" )
- .tqarg( newDeviceid ).tqarg( collDB->escapeString( newRpath ) );
+ .arg( newDeviceid ).arg( collDB->escapeString( newRpath ) );
sql += TQString( " WHERE deviceid = %1 AND url = '%2';" )
- .tqarg( deviceid ).tqarg( collDB->escapeString( rpath ) );
+ .arg( deviceid ).arg( collDB->escapeString( rpath ) );
collDB->query( sql );
}
}
@@ -576,7 +576,7 @@ void UrlUpdateJob::updateLabels( )
//only update rows if there is not already a row with the new deviceid/rpath and the same labelid
TQStringList labelids = collDB->query(
TQString( "SELECT labelid FROM tags_labels WHERE deviceid = %1 AND url = '%2';" )
- .tqarg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) );
+ .arg( TQString::number( newDeviceid ), collDB->escapeString( newRpath ) ) );
TQString existingLabelids;
if( !labelids.isEmpty() )
{
@@ -591,8 +591,8 @@ void UrlUpdateJob::updateLabels( )
}
TQString sql = TQString( "UPDATE tags_labels SET deviceid = %1, url = '%2' "
"WHERE deviceid = %3 AND url = '%4'%5;" )
- .tqarg( newDeviceid )
- .tqarg( collDB->escapeString( newRpath ),
+ .arg( newDeviceid )
+ .arg( collDB->escapeString( newRpath ),
TQString::number( deviceid ),
collDB->escapeString( rpath ),
existingLabelids );
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index b11b3a67..5e2bc629 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -33,7 +33,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -124,7 +124,7 @@ void MultiTabBarInternal::setStyle( enum MultiTabBar::MultiTabBarStyle style )
mainLayout->setAutoAdd( true );
}
- viewport() ->tqrepaint();
+ viewport() ->repaint();
}
void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@@ -133,32 +133,32 @@ void MultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy
if ( m_position == MultiTabBar::Right ) {
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 0, 0, viewport() ->height() );
- paint->setPen( tqcolorGroup().background().dark( 120 ) );
+ paint->setPen( colorGroup().background().dark( 120 ) );
paint->drawLine( 1, 0, 1, viewport() ->height() );
} else
if ( m_position == MultiTabBar::Left ) {
- paint->setPen( tqcolorGroup().light() );
+ paint->setPen( colorGroup().light() );
paint->drawLine( 23, 0, 23, viewport() ->height() );
paint->drawLine( 22, 0, 22, viewport() ->height() );
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 0, 0, viewport() ->height() );
} else
if ( m_position == MultiTabBar::Bottom ) {
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 0, viewport() ->width(), 0 );
- paint->setPen( tqcolorGroup().background().dark( 120 ) );
+ paint->setPen( colorGroup().background().dark( 120 ) );
paint->drawLine( 0, 1, viewport() ->width(), 1 );
} else {
- paint->setPen( tqcolorGroup().light() );
+ paint->setPen( colorGroup().light() );
paint->drawLine( 0, 23, viewport() ->width(), 23 );
paint->drawLine( 0, 22, viewport() ->width(), 22 );
- /* paint->setPen(tqcolorGroup().shadow());
+ /* paint->setPen(colorGroup().shadow());
paint->drawLine(0,0,0,viewport()->height());*/
}
}
@@ -219,8 +219,8 @@ void MultiTabBarInternal::mousePressEvent( TQMouseEvent *ev )
void MultiTabBarInternal::resizeEvent( TQResizeEvent *ev )
{
/* kdDebug()<<"MultiTabBarInternal::resizeEvent"<tqgeometry()<geometry()<setTabsPosition( m_position );
- viewport() ->tqrepaint();
+ viewport() ->repaint();
}
@@ -584,13 +584,13 @@ void MultiTabBarButton::slotClicked()
void MultiTabBarButton::setPosition( MultiTabBar::MultiTabBarPosition pos )
{
m_position = pos;
- tqrepaint();
+ repaint();
}
void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style )
{
m_style = style;
- tqrepaint();
+ repaint();
}
void MultiTabBarButton::hideEvent( TQHideEvent* he )
@@ -660,18 +660,18 @@ void MultiTabBarButton::slotAnimTimer()
{
if ( m_animEnter ) {
m_animCount += 1;
- tqrepaint( false );
+ repaint( false );
if ( m_animCount >= ANIM_MAX )
m_animTimer->stop();
} else {
m_animCount -= 1;
- tqrepaint( false );
+ repaint( false );
if ( m_animCount <= 0 )
m_animTimer->stop();
}
}
-TQSize MultiTabBarButton::tqsizeHint() const
+TQSize MultiTabBarButton::sizeHint() const
{
constPolish();
@@ -687,7 +687,7 @@ TQSize MultiTabBarButton::tqsizeHint() const
}
#endif
if ( isMenuButton() )
- w += tqstyle().tqpixelMetric( TQStyle::PM_MenuButtonIndicator, this );
+ w += tqstyle().pixelMetric( TQStyle::PM_MenuButtonIndicator, this );
if ( pixmap() ) {
TQPixmap * pm = const_cast< TQPixmap * >( pixmap() );
@@ -697,7 +697,7 @@ TQSize MultiTabBarButton::tqsizeHint() const
TQString s( text() );
bool empty = s.isEmpty();
if ( empty )
- s = TQString::tqfromLatin1( "XXXX" );
+ s = TQString::fromLatin1( "XXXX" );
TQFontMetrics fm = fontMetrics();
TQSize sz = fm.size( ShowPrefix, s );
if ( !empty || !w )
@@ -754,7 +754,7 @@ void MultiTabBarTab::setTabsPosition( MultiTabBar::MultiTabBarPosition pos )
}
setPosition( pos );
- // tqrepaint();
+ // repaint();
}
void MultiTabBarTab::setIcon( const TQString& icon )
@@ -785,7 +785,7 @@ void MultiTabBarTab::slotClicked()
if ( m_animTimer->isActive() ) {
m_animCount = ANIM_MAX;
m_animTimer->stop();
- tqrepaint();
+ repaint();
}
updateState();
@@ -812,12 +812,12 @@ void MultiTabBarTab::updateState()
if ( ( m_position == MultiTabBar::Right || m_position == MultiTabBar::Left ) ) {
setFixedWidth( 24 );
if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) {
- setFixedHeight( MultiTabBarButton::tqsizeHint().width() );
+ setFixedHeight( MultiTabBarButton::sizeHint().width() );
} else setFixedHeight( 36 );
} else {
setFixedHeight( 24 );
if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) {
- setFixedWidth( MultiTabBarButton::tqsizeHint().width() );
+ setFixedWidth( MultiTabBarButton::sizeHint().width() );
} else setFixedWidth( 36 );
}
} else {
@@ -870,7 +870,7 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint )
const int height = 24;
if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) {
if ( ( m_position == MultiTabBar::Left ) || ( m_position == MultiTabBar::Right ) )
- sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::tqsizeHint();
+ sh = TQSize( this->height(), this->width() ); //MultiTabBarButton::sizeHint();
else
sh = TQSize( this->width(), this->height() );
} else
@@ -887,8 +887,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint )
if ( isOn() ) st |= TQStyle::Style_On;
- tqstyle().tqdrawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), tqcolorGroup(), st );
- tqstyle().tqdrawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), tqcolorGroup(), st );
+ tqstyle().drawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st );
+ tqstyle().drawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st );
switch ( m_position ) {
case MultiTabBar::Left:
@@ -904,8 +904,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint )
paint->drawPixmap( 0, 0, pixmap );
break;
}
- // style().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
- // tqcolorGroup(),TQStyle::Style_Enabled);
+ // style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+ // colorGroup(),TQStyle::Style_Enabled);
}
void MultiTabBarTab::drawButtonClassic( TQPainter *paint )
@@ -913,52 +913,52 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint )
TQPixmap pixmap;
if ( iconSet() )
pixmap = iconSet() ->pixmap( TQIconSet::Small, TQIconSet::Normal );
- paint->fillRect( 0, 0, 24, 24, tqcolorGroup().background() );
+ paint->fillRect( 0, 0, 24, 24, colorGroup().background() );
if ( !isOn() ) {
if ( m_position == MultiTabBar::Right ) {
- paint->fillRect( 0, 0, 21, 21, TQBrush( tqcolorGroup().background() ) );
+ paint->fillRect( 0, 0, 21, 21, TQBrush( colorGroup().background() ) );
- paint->setPen( tqcolorGroup().background().dark( 150 ) );
+ paint->setPen( colorGroup().background().dark( 150 ) );
paint->drawLine( 0, 22, 23, 22 );
paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap );
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 0, 0, 23 );
- paint->setPen( tqcolorGroup().background().dark( 120 ) );
+ paint->setPen( colorGroup().background().dark( 120 ) );
paint->drawLine( 1, 0, 1, 23 );
} else
if ( ( m_position == MultiTabBar::Bottom ) || ( m_position == MultiTabBar::Top ) ) {
- paint->fillRect( 0, 1, 23, 22, TQBrush( tqcolorGroup().background() ) );
+ paint->fillRect( 0, 1, 23, 22, TQBrush( colorGroup().background() ) );
paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap );
- paint->setPen( tqcolorGroup().background().dark( 120 ) );
+ paint->setPen( colorGroup().background().dark( 120 ) );
paint->drawLine( 23, 0, 23, 23 );
- paint->setPen( tqcolorGroup().light() );
+ paint->setPen( colorGroup().light() );
paint->drawLine( 0, 22, 23, 22 );
paint->drawLine( 0, 23, 23, 23 );
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 0, 23, 0 );
- paint->setPen( tqcolorGroup().background().dark( 120 ) );
+ paint->setPen( colorGroup().background().dark( 120 ) );
paint->drawLine( 0, 1, 23, 1 );
} else {
- paint->setPen( tqcolorGroup().background().dark( 120 ) );
+ paint->setPen( colorGroup().background().dark( 120 ) );
paint->drawLine( 0, 23, 23, 23 );
- paint->fillRect( 0, 0, 23, 21, TQBrush( tqcolorGroup().background() ) );
+ paint->fillRect( 0, 0, 23, 21, TQBrush( colorGroup().background() ) );
paint->drawPixmap( 12 - pixmap.width() / 2, 12 - pixmap.height() / 2, pixmap );
- paint->setPen( tqcolorGroup().light() );
+ paint->setPen( colorGroup().light() );
paint->drawLine( 23, 0, 23, 23 );
paint->drawLine( 22, 0, 22, 23 );
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 0, 0, 23 );
}
@@ -966,12 +966,12 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint )
} else {
if ( m_position == MultiTabBar::Right ) {
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, height() - 1, 23, height() - 1 );
paint->drawLine( 0, height() - 2, 23, height() - 2 );
paint->drawLine( 23, 0, 23, height() - 1 );
paint->drawLine( 22, 0, 22, height() - 1 );
- paint->fillRect( 0, 0, 21, height() - 3, TQBrush( tqcolorGroup().light() ) );
+ paint->fillRect( 0, 0, 21, height() - 3, TQBrush( colorGroup().light() ) );
paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap );
if ( m_showActiveTabText ) {
@@ -980,9 +980,9 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint )
TQPixmap tpixmap( height() - 25 - 3, width() - 2 );
TQPainter painter( &tpixmap );
- painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( tqcolorGroup().light() ) );
+ painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) );
- painter.setPen( tqcolorGroup().text() );
+ painter.setPen( colorGroup().text() );
painter.drawText( 0, + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text );
paint->rotate( 90 );
@@ -992,31 +992,31 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint )
} else
if ( m_position == MultiTabBar::Top ) {
- paint->fillRect( 0, 0, width() - 1, 23, TQBrush( tqcolorGroup().light() ) );
+ paint->fillRect( 0, 0, width() - 1, 23, TQBrush( colorGroup().light() ) );
paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap );
if ( m_showActiveTabText ) {
- paint->setPen( tqcolorGroup().text() );
+ paint->setPen( colorGroup().text() );
paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text );
}
} else
if ( m_position == MultiTabBar::Bottom ) {
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, 23, width() - 1, 23 );
paint->drawLine( 0, 22, width() - 1, 22 );
- paint->fillRect( 0, 0, width() - 1, 21, TQBrush( tqcolorGroup().light() ) );
+ paint->fillRect( 0, 0, width() - 1, 21, TQBrush( colorGroup().light() ) );
paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap );
if ( m_showActiveTabText ) {
- paint->setPen( tqcolorGroup().text() );
+ paint->setPen( colorGroup().text() );
paint->drawText( 25, height() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text );
}
} else {
- paint->setPen( tqcolorGroup().shadow() );
+ paint->setPen( colorGroup().shadow() );
paint->drawLine( 0, height() - 1, 23, height() - 1 );
paint->drawLine( 0, height() - 2, 23, height() - 2 );
- paint->fillRect( 0, 0, 23, height() - 3, TQBrush( tqcolorGroup().light() ) );
+ paint->fillRect( 0, 0, 23, height() - 3, TQBrush( colorGroup().light() ) );
paint->drawPixmap( 10 - pixmap.width() / 2, 10 - pixmap.height() / 2, pixmap );
if ( m_showActiveTabText ) {
@@ -1025,9 +1025,9 @@ void MultiTabBarTab::drawButtonClassic( TQPainter *paint )
TQPixmap tpixmap( height() - 25 - 3, width() - 2 );
TQPainter painter( &tpixmap );
- painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( tqcolorGroup().light() ) );
+ painter.fillRect( 0, 0, tpixmap.width(), tpixmap.height(), TQBrush( colorGroup().light() ) );
- painter.setPen( tqcolorGroup().text() );
+ painter.setPen( colorGroup().text() );
painter.drawText( tpixmap.width() - TQFontMetrics( TQFont() ).width( m_text ), + width() / 2 + TQFontMetrics( TQFont() ).height() / 2, m_text );
paint->rotate( -90 );
@@ -1046,14 +1046,14 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint )
{
TQColor fillColor, textColor;
if ( isOn() ) {
- fillColor = blendColors( tqcolorGroup().highlight(), tqcolorGroup().background(), static_cast( m_animCount * 3.5 ) );
- textColor = blendColors( tqcolorGroup().highlightedText(), tqcolorGroup().text(), static_cast( m_animCount * 4.5 ) );
+ fillColor = blendColors( colorGroup().highlight(), colorGroup().background(), static_cast( m_animCount * 3.5 ) );
+ textColor = blendColors( colorGroup().highlightedText(), colorGroup().text(), static_cast( m_animCount * 4.5 ) );
} else if ( isEnabled() ) {
- fillColor = blendColors( tqcolorGroup().background(), tqcolorGroup().highlight(), static_cast( m_animCount * 3.5 ) );
- textColor = blendColors( tqcolorGroup().text(), tqcolorGroup().highlightedText(), static_cast( m_animCount * 4.5 ) );
+ fillColor = blendColors( colorGroup().background(), colorGroup().highlight(), static_cast( m_animCount * 3.5 ) );
+ textColor = blendColors( colorGroup().text(), colorGroup().highlightedText(), static_cast( m_animCount * 4.5 ) );
} else {
- fillColor = tqcolorGroup().background();
- textColor = tqcolorGroup().text();
+ fillColor = colorGroup().background();
+ textColor = colorGroup().text();
}
#ifndef TQT_NO_ICONSET
@@ -1071,7 +1071,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint )
TQPainter painter( &pixmap );
// Draw the frame
- painter.setPen( tqcolorGroup().mid() );
+ painter.setPen( colorGroup().mid() );
/*if ( m_id != bar->visibleTabCount() - 1 )*/ painter.drawLine( 0, 0, 0, pixmap.height() - 1 );
painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 );
@@ -1099,7 +1099,7 @@ void MultiTabBarTab::drawButtonAmarok( TQPainter *paint )
TQPainter painter( &pixmap );
// Draw the frame
- painter.setPen( tqcolorGroup().mid() );
+ painter.setPen( colorGroup().mid() );
/*if ( m_id != bar->visibleTabCount() - 1 )*/ painter.drawLine( 0, 0, 0, pixmap.height() - 1 );
painter.drawLine( 0, pixmap.height() - 1, pixmap.width() - 1, pixmap.height() - 1 );
@@ -1147,11 +1147,11 @@ MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name
m_buttons.setAutoDelete( false );
if ( bm == Vertical ) {
m_l = new TQVBoxLayout( this );
- tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true );
+ setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding, true );
// setFixedWidth(24);
} else {
m_l = new TQHBoxLayout( this );
- tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true );
+ setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true );
// setFixedHeight(24);
}
m_l->setMargin( 0 );
@@ -1295,7 +1295,7 @@ void MultiTabBar::fontChange( const TQFont& /* oldFont */ )
{
for ( uint i = 0;i < tabs() ->count();i++ )
tabs() ->at( i ) ->resize();
- tqrepaint();
+ repaint();
}
TQPtrList* MultiTabBar::tabs() { return m_internal->tabs();}
diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h
index b63d90ae..1689baf0 100644
--- a/amarok/src/multitabbar.h
+++ b/amarok/src/multitabbar.h
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -205,7 +205,7 @@ class MultiTabBarButton: public TQPushButton
*/
void proxyDrops( DropProxyTarget *finalDropTarget );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
protected:
static const int ANIM_INTERVAL = 18;
diff --git a/amarok/src/mydirlister.h b/amarok/src/mydirlister.h
index 391e45e5..eeb8c55a 100644
--- a/amarok/src/mydirlister.h
+++ b/amarok/src/mydirlister.h
@@ -21,15 +21,15 @@ protected:
EngineController::canDecode( item->url() ) ||
item->url().protocol() == "audiocd" ||
PlaylistFile::isPlaylistFile( item->name() ) ||
- item->name().tqendsWith( ".mp3", false ) || //for now this is less confusing for the user
- item->name().tqendsWith( ".aa", false ) || //for adding to iPod
- item->name().tqendsWith( ".mp4", false ) || //for adding to iPod
- item->name().tqendsWith( ".m4v", false ) || //for adding to iPod
- item->name().tqendsWith( ".m4b", false ) || //for adding to iPod
- item->name().tqendsWith( ".ogg", false ) ||
- item->name().tqendsWith( ".flac", false ) ||
- item->name().tqendsWith( ".wma", false ) ||
- item->name().tqendsWith( ".asf", false );
+ item->name().endsWith( ".mp3", false ) || //for now this is less confusing for the user
+ item->name().endsWith( ".aa", false ) || //for adding to iPod
+ item->name().endsWith( ".mp4", false ) || //for adding to iPod
+ item->name().endsWith( ".m4v", false ) || //for adding to iPod
+ item->name().endsWith( ".m4b", false ) || //for adding to iPod
+ item->name().endsWith( ".ogg", false ) ||
+ item->name().endsWith( ".flac", false ) ||
+ item->name().endsWith( ".wma", false ) ||
+ item->name().endsWith( ".asf", false );
}
};
diff --git a/amarok/src/mydiroperator.cpp b/amarok/src/mydiroperator.cpp
index e00878d9..3e353f5b 100644
--- a/amarok/src/mydiroperator.cpp
+++ b/amarok/src/mydiroperator.cpp
@@ -24,7 +24,7 @@ void
MyDirOperator::myCdUp()
{
KURL tmp( url() );
- tmp.cd( TQString::tqfromLatin1(".."));
+ tmp.cd( TQString::fromLatin1(".."));
if( m_medium && !tmp.path().startsWith( m_medium->mountPoint() ) )
tmp.setPath( m_medium->mountPoint() );
setURL(tmp, true);
diff --git a/amarok/src/newdynamic.ui b/amarok/src/newdynamic.ui
index 7c49c2dd..af4ea8b1 100644
--- a/amarok/src/newdynamic.ui
+++ b/amarok/src/newdynamic.ui
@@ -43,7 +43,7 @@
MinimumExpanding
-
+
21
5
@@ -60,7 +60,7 @@
Preferred
-
+
80
21
@@ -146,7 +146,7 @@
Preferred
-
+
110
21
@@ -165,7 +165,7 @@
0
-
+
60
0
@@ -203,7 +203,7 @@
Preferred
-
+
| | |