diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui
index 29a95d5d..db15d0d3 100644
--- a/amarok/src/Options1.ui
+++ b/amarok/src/Options1.ui
@@ -90,7 +90,7 @@
Fixed
-
+
16
21
@@ -188,7 +188,7 @@
Expanding
-
+
30
20
@@ -209,7 +209,7 @@
textLabel1_2
-
+
150
0
@@ -234,7 +234,7 @@
0
-
+
150
0
@@ -254,7 +254,7 @@
Expanding
-
+
50
21
@@ -278,7 +278,7 @@
true
-
+
150
0
@@ -303,7 +303,7 @@
0
-
+
150
0
@@ -323,7 +323,7 @@
Expanding
-
+
50
21
@@ -459,7 +459,7 @@
Fixed
-
+
16
21
@@ -516,7 +516,7 @@
Expanding
-
+
130
20
@@ -543,7 +543,7 @@
Fixed
-
+
16
21
@@ -641,7 +641,7 @@
Expanding
-
+
20
30
diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui
index ec244783..4299ef0f 100644
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@@ -349,7 +349,7 @@
0
-
+
0
0
@@ -443,13 +443,13 @@
0
-
+
0
0
-
+
192
32767
@@ -660,7 +660,7 @@
Expanding
-
+
40
20
@@ -695,7 +695,7 @@
Expanding
-
+
20
30
diff --git a/amarok/src/Options4.ui b/amarok/src/Options4.ui
index 6baab8ed..23bd8271 100644
--- a/amarok/src/Options4.ui
+++ b/amarok/src/Options4.ui
@@ -36,7 +36,7 @@
0
-
+
0
180
@@ -93,7 +93,7 @@
0
-
+
150
0
@@ -118,7 +118,7 @@
0
-
+
160
0
@@ -187,7 +187,7 @@
0
-
+
150
0
@@ -215,7 +215,7 @@
0
-
+
150
0
@@ -253,7 +253,7 @@
0
-
+
50
0
@@ -308,7 +308,7 @@
0
-
+
50
0
@@ -338,7 +338,7 @@
Fixed
-
+
16
20
@@ -379,7 +379,7 @@
Expanding
-
+
31
30
@@ -398,7 +398,7 @@
0
-
+
0
120
@@ -445,7 +445,7 @@
Fixed
-
+
16
20
@@ -483,7 +483,7 @@
0
-
+
150
0
@@ -521,7 +521,7 @@
0
-
+
50
0
diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui
index d0c7b32a..afea6452 100644
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@@ -54,7 +54,7 @@
Fixed
-
+
16
20
@@ -183,7 +183,7 @@
Fixed
-
+
16
20
diff --git a/amarok/src/Options5.ui.h b/amarok/src/Options5.ui.h
index a9d5c050..0383bd8d 100644
--- a/amarok/src/Options5.ui.h
+++ b/amarok/src/Options5.ui.h
@@ -33,7 +33,7 @@ email : fh@ez.no
void Options5::init()
{
m_pOSDPreview = new OSDPreviewWidget( this ); //must be child!!!
- m_pOSDPreview->tqsetAlignment( static_cast( AmarokConfig::osdAlignment() ) );
+ m_pOSDPreview->setAlignment( static_cast( AmarokConfig::osdAlignment() ) );
m_pOSDPreview->setOffset( AmarokConfig::osdYOffset() );
connect( m_pOSDPreview, TQT_SIGNAL( positionChanged() ), TQT_SLOT( slotPositionChanged() ) );
diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 66524775..14199194 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -12,7 +12,7 @@
418
-
+
1
1
@@ -70,7 +70,7 @@
0
-
+
-1
-1
@@ -271,7 +271,7 @@
Expanding
-
+
20
30
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index cdaa3ff6..9bea26d4 100644
--- a/amarok/src/actionclasses.cpp
+++ b/amarok/src/actionclasses.cpp
@@ -434,7 +434,7 @@ VolumeAction::plug( TQWidget *w, int index )
m_slider = new Amarok::VolumeSlider( w, Amarok::VOLUME_MAX );
m_slider->setName( "ToolBarVolume" );
m_slider->setValue( AmarokConfig::masterVolume() );
- m_slider->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored );
+ m_slider->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Ignored );
TQToolTip::add( m_slider, i18n( "Volume control" ) );
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index af7c37ee..960e567c 100644
--- a/amarok/src/amarok.h
+++ b/amarok/src/amarok.h
@@ -111,7 +111,7 @@ namespace Amarok
*/
class OverrideCursor { //defined in app.cpp
public:
- OverrideCursor( TQt::tqCursorShape cursor = TQt::WaitCursor );
+ OverrideCursor( TQt::CursorShape cursor = TQt::WaitCursor );
~OverrideCursor();
};
diff --git a/amarok/src/amarokcore/amarokdcophandler.cpp b/amarok/src/amarokcore/amarokdcophandler.cpp
index ab3ec320..b8e4f496 100644
--- a/amarok/src/amarokcore/amarokdcophandler.cpp
+++ b/amarok/src/amarokcore/amarokdcophandler.cpp
@@ -72,7 +72,7 @@ namespace Amarok
return APP_VERSION;
}
- bool DcopPlayerHandler::dynamicModetqStatus()
+ bool DcopPlayerHandler::dynamicModeStatus()
{
return Amarok::dynamicMode();
}
@@ -95,17 +95,17 @@ namespace Amarok
return EngineController::engine()->state() == Engine::Playing;
}
- bool DcopPlayerHandler::randomModetqStatus()
+ bool DcopPlayerHandler::randomModeStatus()
{
return AmarokConfig::randomMode();
}
- bool DcopPlayerHandler::repeatPlaylisttqStatus()
+ bool DcopPlayerHandler::repeatPlaylistStatus()
{
return Amarok::repeatPlaylist();
}
- bool DcopPlayerHandler::repeatTracktqStatus()
+ bool DcopPlayerHandler::repeatTrackStatus()
{
return Amarok::repeatTrack();
}
diff --git a/amarok/src/amarokcore/amarokdcophandler.h b/amarok/src/amarokcore/amarokdcophandler.h
index 028bb4c9..c86edda0 100644
--- a/amarok/src/amarokcore/amarokdcophandler.h
+++ b/amarok/src/amarokcore/amarokdcophandler.h
@@ -37,13 +37,13 @@ class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface
public:
virtual TQString version();
- virtual bool dynamicModetqStatus();
+ virtual bool dynamicModeStatus();
virtual bool equalizerEnabled();
virtual bool osdEnabled();
virtual bool isPlaying();
- virtual bool randomModetqStatus();
- virtual bool repeatPlaylisttqStatus();
- virtual bool repeatTracktqStatus();
+ virtual bool randomModeStatus();
+ virtual bool repeatPlaylistStatus();
+ virtual bool repeatTrackStatus();
virtual int getVolume();
virtual int sampleRate();
virtual float score ();
diff --git a/amarok/src/amarokcore/amarokdcopiface.h b/amarok/src/amarokcore/amarokdcopiface.h
index 1ce3849b..32b330a7 100644
--- a/amarok/src/amarokcore/amarokdcopiface.h
+++ b/amarok/src/amarokcore/amarokdcopiface.h
@@ -36,13 +36,13 @@ class AmarokPlayerInterface : virtual public DCOPObject
k_dcop:
virtual TQString version() = 0; ///< returns amarok version string
- virtual bool dynamicModetqStatus() = 0; ///< Return dynamic mode status.
+ virtual bool dynamicModeStatus() = 0; ///< Return dynamic mode status.
virtual bool equalizerEnabled() = 0; ///< Return the equalizer status.
virtual bool osdEnabled() = 0; ///< Return the OSD display status.
virtual bool isPlaying() = 0; ///< Return true if something is playing now.
- virtual bool randomModetqStatus() = 0; ///< Return random mode status.
- virtual bool repeatPlaylisttqStatus() = 0; ///< Return repeat playlist status.
- virtual bool repeatTracktqStatus() = 0; ///< Return repeat track status.
+ virtual bool randomModeStatus() = 0; ///< Return random mode status.
+ virtual bool repeatPlaylistStatus() = 0; ///< Return repeat playlist status.
+ virtual bool repeatTrackStatus() = 0; ///< Return repeat track status.
virtual int getVolume() = 0; ///< Return volume in range 0-100%.
virtual int sampleRate() = 0; ///< Return the sample rate of the currently playing track.
virtual float score() = 0; ///< Return the score of the currently playing track.
diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp
index 122c080e..310d3f65 100644
--- a/amarok/src/amarokcore/crashhandler.cpp
+++ b/amarok/src/amarokcore/crashhandler.cpp
@@ -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/app.cpp b/amarok/src/app.cpp
index ee726662..9a0992ca 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -96,7 +96,7 @@ int App::mainThreadId = 0;
static AEEventHandlerUPP appleEventProcessorUPP = 0;
-OStqStatus
+OSStatus
appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/)
{
OSType aeID = typeWildCard;
@@ -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/browserbar.cpp b/amarok/src/browserbar.cpp
index e2c6365b..2444cb4a 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 );
@@ -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();
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index b2721e40..99c93651 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -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
}
@@ -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;
@@ -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 );
@@ -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 );
@@ -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 );
@@ -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..e4464a8a 100644
--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@@ -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;
@@ -3788,7 +3788,7 @@ CollectionDB::setSongPercentage( const TQString &url , float percentage)
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( TQDateTime::currentDateTime().toTime_t() )
.tqarg( 0 )
.tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
.tqarg( boolF() )
@@ -3856,7 +3856,7 @@ CollectionDB::setSongRating( const TQString &url, int rating, bool toggleHalf )
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( TQDateTime::currentDateTime().toTime_t() )
.tqarg( 0 )
.tqarg( ( getUniqueId( url ).isNull() ? "NULL" : '\'' + escapeString( getUniqueId( url ) ) + '\'' ) )
.tqarg( boolF() )
@@ -4035,7 +4035,7 @@ CollectionDB::organizeFile( const KURL &src, OrganizeCollectionDialog &dialog, b
}
usleep( 10000 );
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
if( m_fileOperationFailed )
@@ -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 )
@@ -4687,7 +4687,7 @@ void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& lo
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(TQDateTime::currentDateTime().addDays(80).toTime_t())
.tqarg(md5sum));
}
else
@@ -4696,14 +4696,14 @@ void CollectionDB::newAmazonReloadDate( const TQString& asin, const TQString& lo
.tqarg(asin)
.tqarg(locale)
.tqarg(md5sum)
- .tqarg(TQDateTime::tqcurrentDateTime().addDays(80).toTime_t()), NULL );
+ .tqarg(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() ));
+ .tqarg(TQDateTime::currentDateTime().toTime_t() ));
}
void
@@ -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 );
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index 68c8db60..8451ac4f 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -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" ) );
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 6e4e9109..661a8fe6 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -91,7 +91,7 @@ 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
@@ -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( '"' );
@@ -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 )
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 4947fd8a..db532939 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -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 63804794..8daabdb3 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -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() );
@@ -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..704bb342 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();
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..57c51101 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -1298,7 +1298,7 @@ CollectionDB::addSongPercentage( const TQString &url, int percentage )
"VALUES ( '%1', %2, %3, %4, %5 );" )
.tqarg( escapeString( url ) )
.tqarg( values[1] )
- .tqarg( TQDateTime::tqcurrentDateTime().toTime_t() )
+ .tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( score )
.tqarg( values[0] + " + 1" ) );
}
@@ -1311,8 +1311,8 @@ 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( TQDateTime::currentDateTime().toTime_t() )
+ .tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( score ), NULL );
}
@@ -1371,8 +1371,8 @@ CollectionDB::setSongPercentage( const TQString &url , int percentage )
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( TQDateTime::currentDateTime().toTime_t() )
+ .tqarg( TQDateTime::currentDateTime().toTime_t() )
.tqarg( percentage ), NULL );
}
diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui
index 6625649b..586dc4ad 100644
--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@@ -102,7 +102,7 @@
kcfg_MySqlPort
-
+
100
32767
@@ -281,7 +281,7 @@
kcfg_PostgresqlPort
-
+
100
32767
diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui
index 7ca52143..71fdf81d 100644
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@@ -12,7 +12,7 @@
374
-
+
420
320
diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp
index 91c4641c..05b3e302 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();
@@ -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,7 +303,7 @@ 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 );
diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h
index 0065f04f..5e734aed 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);
}
diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp
index f9dd1739..04f3a19b 100644
--- a/amarok/src/editfilterdialog.cpp
+++ b/amarok/src/editfilterdialog.cpp
@@ -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/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp
index 73080389..3c8a1668 100644
--- a/amarok/src/engine/helix/helix-configdialog.cpp
+++ b/amarok/src/engine/helix/helix-configdialog.cpp
@@ -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 );
@@ -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 );
@@ -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-sp/helix-include/common/include/hxcore.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
index 6789f26f..80cdc30b 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;
};
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/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..c70a3cb1 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
@@ -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/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index f06c1a03..027f485e 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/amarok/src/engine/mas/masengine.cpp
@@ -401,7 +401,7 @@ bool MasEngine::masinit()
warning() << "MAS daemon not running. Starting! Please provide password..." << endl;
// masd seems not to be running, let's try to run it
TQCString cmdline;
- cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::tqfromLatin1( "kdesu" ) ) );
+ cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::fromLatin1( "kdesu" ) ) );
// TODO !!!hardcoded path
cmdline += " -n -f /usr/local/mas/log/mas-1.log -c ";
cmdline += "/usr/local/mas/bin/mas-launch";
diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp
index 32fb19c8..5c7e4d08 100644
--- a/amarok/src/engine/nmm/HostList.cpp
+++ b/amarok/src/engine/nmm/HostList.cpp
@@ -52,7 +52,7 @@ HostList::HostList( TQWidget *parent, const char *name )
setColumnAlignment( HostListItem::Video, TQt::AlignCenter );
setColumnAlignment( HostListItem::Audio, TQt::AlignCenter );
setColumnAlignment( HostListItem::Volume, TQt::AlignCenter );
- setColumnAlignment( HostListItem::tqStatus, TQt::AlignLeft );
+ setColumnAlignment( HostListItem::Status, TQt::AlignLeft );
}
HostList::~HostList()
@@ -67,7 +67,7 @@ void HostList::notifyHostError( TQString hostname, int error)
if( host->text(HostListItem::Hostname) == hostname )
{
host->setText( HostListItem::Hostname, hostname );
- host->settqStatus( error );
+ host->setStatus( error );
host->tqrepaint();
return;
}
@@ -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_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui
index bef5c7e0..ca8a7b92 100644
--- a/amarok/src/engine/nmm/nmm_configdialogbase.ui
+++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui
@@ -68,7 +68,7 @@
Fixed
-
+
16
16
@@ -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/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui
index a280f3e3..d7826100 100644
--- a/amarok/src/engine/xine/xineconfigbase.ui
+++ b/amarok/src/engine/xine/xineconfigbase.ui
@@ -486,7 +486,7 @@
Expanding
-
+
20
16
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..2c1993f6 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -63,7 +63,7 @@ EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *na
updateButtonState();
- resize( TQSize(300, 250).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(300, 250).expandedTo(minimumSizeHint()) );
}
diff --git a/amarok/src/equalizersetup.cpp b/amarok/src/equalizersetup.cpp
index 56a4bd62..93dd2f62 100644
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@@ -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
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 31ebb7d3..a7137120 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..11053245 100644
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@@ -112,12 +112,12 @@ 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
@@ -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 ) {
@@ -222,7 +222,7 @@ HTMLView::loadStyleSheet()
.tqarg( 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( ContextBrowser::instance()->colorGroup().base().name() )
.tqarg( m_shadowGradientImage->name() )
.tqarg( pxSize );
@@ -235,7 +235,7 @@ HTMLView::loadStyleSheet()
//"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-body { background-color: %1; border-bottom: solid %2 1px; border-top: solid %3 1px; }" ).tqarg( ContextBrowser::instance()->colorGroup().base().name() ).tqarg( bg ).tqarg( bg );
styleSheet += TQString( ".album-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 );
@@ -253,17 +253,17 @@ HTMLView::loadStyleSheet()
//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() );
+ .tqarg( ContextBrowser::instance()->colorGroup().highlight().name() )
+ .tqarg( 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() );
+ .tqarg( ContextBrowser::instance()->colorGroup().base().dark( 120 ).name() )
+ .tqarg( 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() );
+ .tqarg( 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; }" );
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index 72ab2f74..9883b108 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -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..42934862 100644
--- a/amarok/src/ktrm.cpp
+++ b/amarok/src/ktrm.cpp
@@ -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;
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 9fb03845..a7bc1d66 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -950,7 +950,7 @@ WebService::recommend( int type, TQString username, TQString artist, TQString to
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();
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
index 71e66458..56a4b2e7 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
@@ -48,13 +48,13 @@
0
-
+
200
201
-
+
200
201
@@ -180,7 +180,7 @@
Expanding
-
+
41
21
@@ -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/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index 967ace1f..8cc67f39 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);
@@ -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 );
@@ -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();
}
@@ -2490,7 +2490,7 @@ MediaDevice::kioCopyTrack( const KURL &src, const KURL &dst )
else
{
usleep(10000);
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
}
}
@@ -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;
}
@@ -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..1f1566ca 100644
--- a/amarok/src/mediadevice/daap/addhostbase.ui
+++ b/amarok/src/mediadevice/daap/addhostbase.ui
@@ -42,7 +42,7 @@
0
-
+
64
64
@@ -84,7 +84,7 @@
Expanding
-
+
20
130
@@ -124,7 +124,7 @@
Fixed
-
+
30
20
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/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 7a13253a..dead8cdc 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -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..38e52848 100644
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -171,7 +171,7 @@
Expanding
-
+
20
93
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index f1df4e76..03ac3094 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);
@@ -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..8729a3e9 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -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 )
{
@@ -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 );
@@ -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..3363ef9d 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();
}
@@ -1053,7 +1053,7 @@ MtpMediaDevice::deleteObject( MtpMediaItem *deleteItem )
m_fileNameToItem.remove( TQString( "%1/%2" ).tqarg( deleteItem->track()->folderId() ).tqarg( deleteItem->bundle()->filename() ) );
// remove from the media view
delete deleteItem;
- kapp->tqprocessEvents( 100 );
+ kapp->processEvents( 100 );
return 1;
}
@@ -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..815f44ce 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++ )
{
@@ -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/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index d2f3ba1a..1c1018fc 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -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,7 +392,7 @@ 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)" );
diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp
index ac1d51f0..36748064 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;
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/multitabbar.cpp b/amarok/src/multitabbar.cpp
index b11b3a67..97f8d31b 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -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());*/
}
}
@@ -671,7 +671,7 @@ void MultiTabBarButton::slotAnimTimer()
}
}
-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 )
@@ -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 );
diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h
index b63d90ae..4067f0ad 100644
--- a/amarok/src/multitabbar.h
+++ b/amarok/src/multitabbar.h
@@ -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..934adaf7 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
-
+
90
21
@@ -239,7 +239,7 @@
0
-
+
250
250
diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui
index c094a216..96cc8f15 100644
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@@ -118,7 +118,7 @@
Expanding
-
+
20
16
@@ -238,7 +238,7 @@
Expanding
-
+
20
16
@@ -357,7 +357,7 @@
Expanding
-
+
20
16
@@ -420,7 +420,7 @@
Expanding
-
+
347
20
@@ -450,7 +450,7 @@
Expanding
-
+
20
16
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index 88fdbd97..03e1757c 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -395,8 +395,8 @@ OSDWidget::render( const uint M, const TQSize &size )
p.end();
pixmapGradient = TQPixmap( vol.size() );
- KPixmapEffect::gradient( pixmapGradient, tqcolorGroup().background(),
- tqcolorGroup().highlight(), KPixmapEffect::EllipticGradient );
+ KPixmapEffect::gradient( pixmapGradient, colorGroup().background(),
+ colorGroup().highlight(), KPixmapEffect::EllipticGradient );
pixmapGradient.setMask( mask );
}
@@ -849,7 +849,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
void
Amarok::OSD::applySettings()
{
- tqsetAlignment( static_cast( AmarokConfig::osdAlignment() ) );
+ setAlignment( static_cast( AmarokConfig::osdAlignment() ) );
setDuration( AmarokConfig::osdDuration() );
#ifdef TQ_WS_X11
setEnabled( AmarokConfig::osdEnabled() );
diff --git a/amarok/src/osd.h b/amarok/src/osd.h
index 625145d3..eaf0a4f4 100644
--- a/amarok/src/osd.h
+++ b/amarok/src/osd.h
@@ -57,7 +57,7 @@ class OSDWidget : public TQWidget
void setTextColor( const TQColor &color ) { setPaletteForegroundColor( color ); }
void setBackgroundColor(const TQColor &color ) { setPaletteBackgroundColor( color ); }
void setOffset( int y ) { m_y = y; }
- void tqsetAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
+ void setAlignment( Alignment tqalignment ) { m_tqalignment = tqalignment; }
void setImage( const TQImage &image ) { m_cover = image; }
void setScreen( int screen );
void setText( const TQString &text ) { m_text = text; }
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 0e42eff0..0f526c23 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -54,7 +54,7 @@ namespace Amarok
TQPixmap getPNG( const TQString &filename )
{
- TQString file = !filename.tqendsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1";
+ TQString file = !filename.endsWith( ".png", false ) ? "amarok/images/%1.png" : "amarok/images/%1";
TQPixmap pix;
TQImage img( locate( "data", file.tqarg( filename ) ), "PNG" );
@@ -65,7 +65,7 @@ namespace Amarok
TQPixmap getJPG( const TQString &filename )
{
- TQString file = !filename.tqendsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1";
+ TQString file = !filename.endsWith( ".jpg", false ) ? "amarok/images/%1.jpg" : "amarok/images/%1";
TQPixmap pix;
TQImage img( locate( "data", TQString( "amarok/images/%1.jpg" ).tqarg( filename ) ), "JPEG" );
@@ -140,7 +140,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl
new NavButton( m_pFrameButtons, "next", ac->action( "next" ) );
KPushButton *switchView = new KPushButton( KGuiItem( "", "mini_dock" ), m_pFrameButtons );
- switchView->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big!
+ switchView->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ); // too big!
switchView->setFocusPolicy( TQ_NoFocus );
connect( switchView, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleView() ) );
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 4e2b0070..272cf343 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -166,7 +166,7 @@ Playlist *Playlist::s_instance = 0;
Playlist::Playlist( TQWidget *parent )
: KListView( parent, "ThePlaylist" )
, EngineObserver( EngineController::instance() )
- , m_startupTime_t( TQDateTime::tqcurrentDateTime().toTime_t() )
+ , m_startupTime_t( TQDateTime::currentDateTime().toTime_t() )
, m_oldestTime_t( CollectionDB::instance()->query( "SELECT MIN( createdate ) FROM statistics;" ).first().toInt() )
, m_currentTrack( 0 )
, m_marker( 0 )
@@ -958,7 +958,7 @@ Playlist::playNextTrack( bool forceNext )
if( !AmarokConfig::randomMode() ) {
item = MyIt::nextVisible( item );
- while( item && ( !checkFiletqStatus( item ) || !item->exists() ) )
+ while( item && ( !checkFileStatus( item ) || !item->exists() ) )
item = MyIt::nextVisible( item );
setCurrentTrack( item );
}
@@ -1002,7 +1002,7 @@ Playlist::playNextTrack( bool forceNext )
}
else
for( MyIt it( this ); *it; ++it )
- if ( !m_prevTracks.containsRef( *it ) && checkFiletqStatus( *it ) && (*it)->exists() )
+ if ( !m_prevTracks.containsRef( *it ) && checkFileStatus( *it ) && (*it)->exists() )
tracks.push_back( *it );
if( tracks.isEmpty() )
{
@@ -1082,7 +1082,7 @@ Playlist::playNextTrack( bool forceNext )
item = tracks.at( KApplication::random() % tracks.count() ); //is O(1)
else
{
- const uint currenttime_t = TQDateTime::tqcurrentDateTime().toTime_t();
+ const uint currenttime_t = TQDateTime::currentDateTime().toTime_t();
TQValueVector weights( tracks.size() );
TQ_INT64 total = m_total;
if( Amarok::randomAlbums() )
@@ -1131,13 +1131,13 @@ Playlist::playNextTrack( bool forceNext )
else if( item )
{
item = MyIt::nextVisible( item );
- while( item && ( !checkFiletqStatus( item ) || !item->exists() ) )
+ while( item && ( !checkFileStatus( item ) || !item->exists() ) )
item = MyIt::nextVisible( item );
}
else
{
item = *MyIt( this ); //ie. first visible item
- while( item && ( !checkFiletqStatus( item ) || !item->exists() ) )
+ while( item && ( !checkFileStatus( item ) || !item->exists() ) )
item = item->nextSibling();
}
@@ -1227,7 +1227,7 @@ Playlist::playPrevTrack()
if( !item )
{
item = *static_cast(--MyIt( item ));
- while( item && !checkFiletqStatus( item ) )
+ while( item && !checkFileStatus( item ) )
item = *static_cast(--MyIt( item ));
}
}
@@ -1241,13 +1241,13 @@ Playlist::playPrevTrack()
if( item )
{
item = MyIt::prevVisible( item );
- while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) )
+ while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) )
item = MyIt::prevVisible( item );
}
else
{
item = *MyIt( this ); //ie. first visible item
- while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) )
+ while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) )
item = item->nextSibling();
}
}
@@ -1562,7 +1562,7 @@ Playlist::slotCountChanged()
}
bool
-Playlist::checkFiletqStatus( PlaylistItem * item )
+Playlist::checkFileStatus( PlaylistItem * item )
{
//DEBUG_BLOCK
//debug() << "uniqueid of item = " << item->uniqueId() << ", url = " << item->url().path() << endl;
@@ -1622,7 +1622,7 @@ Playlist::activate( TQListViewItem *item )
#define item static_cast(item)
- if ( !checkFiletqStatus( item ) )
+ if ( !checkFileStatus( item ) )
{
Amarok::StatusBar::instance()->shortMessage( i18n("Local file does not exist.") );
return;
@@ -1712,7 +1712,7 @@ TQPair Playlist::toolTipText( TQWidget*, const TQPoint &pos )
else
text = item->text( col );
- TQRect irect = tqitemRect( item );
+ TQRect irect = itemRect( item );
const int headerPos = header()->sectionPos( col );
irect.setLeft( headerPos - 1 );
irect.setRight( headerPos + header()->sectionSize( col ) );
@@ -2277,7 +2277,7 @@ Playlist::writeTag( TQListViewItem *qitem, const TQString &, int column ) //SLOT
for( PlaylistItem *item = m_itemsToChangeTagsFor.first(); item; item = m_itemsToChangeTagsFor.next() )
{
- if( !checkFiletqStatus( item ) )
+ if( !checkFileStatus( item ) )
continue;
const TQString oldTag = item == qitem ? m_editOldTag : item->exactText(column);
@@ -2340,8 +2340,8 @@ Playlist::paletteChange( const TQPalette &p )
const uint steps = STEPS+5+5; //so we don't fade all the way to base, and all the way up to highlight either
- fg = tqcolorGroup().highlight();
- bg = tqcolorGroup().base();
+ fg = colorGroup().highlight();
+ bg = colorGroup().base();
dr = double(bg.red() - fg.red()) / steps;
dg = double(bg.green() - fg.green()) / steps;
@@ -2357,8 +2357,8 @@ Playlist::paletteChange( const TQPalette &p )
const uint steps = STEPS + 5; //so we don't fade all the way to base
- fg = tqcolorGroup().highlightedText();
- bg = tqcolorGroup().text();
+ fg = colorGroup().highlightedText();
+ bg = colorGroup().text();
dr = double(bg.red() - fg.red()) / steps;
dg = double(bg.green() - fg.green()) / steps;
@@ -2404,7 +2404,7 @@ Playlist::contentsDragMoveEvent( TQDragMoveEvent* e )
const TQPoint p = contentsToViewport( e->pos() );
TQListViewItem *item = itemAt( p );
if( !item || ctrlPressed ) item = lastItem();
- else if( p.y() - tqitemRect( item ).top() < (item->height()/2) ) item = item->itemAbove();
+ else if( p.y() - itemRect( item ).top() < (item->height()/2) ) item = item->itemAbove();
if( item != m_marker ) {
//NOTE this if block prevents flicker
@@ -2532,7 +2532,7 @@ Playlist::viewportPaintEvent( TQPaintEvent *e )
TQPainter p( viewport() );
p.fillRect(
drawDropVisualizer( 0, 0, m_marker ),
- TQBrush( tqcolorGroup().highlight().dark(), TQBrush::Dense4Pattern ) );
+ TQBrush( colorGroup().highlight().dark(), TQBrush::Dense4Pattern ) );
}
else if( m_showHelp && isEmpty() ) {
TQPainter p( viewport() );
@@ -2569,9 +2569,9 @@ Playlist::viewportPaintEvent( TQPaintEvent *e )
const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
- t->draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+ t->draw( &p, x+15, y+15, TQRect(), colorGroup() );
delete t;
}
}
@@ -4734,7 +4734,7 @@ Playlist::showTagDialog( TQPtrList items )
TagDialog *dialog = new TagDialog( *item, item, instance() );
dialog->show();
}
- else if ( checkFiletqStatus( item ) )
+ else if ( checkFileStatus( item ) )
{
TagDialog *dialog = new TagDialog( *item, item, instance() );
dialog->show();
diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h
index 66ad6aa0..75321957 100644
--- a/amarok/src/playlist.h
+++ b/amarok/src/playlist.h
@@ -175,7 +175,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi
void restoreLayout(KConfig *config, const TQString &group);
//AFT-related functions
- bool checkFiletqStatus( PlaylistItem * item );
+ bool checkFileStatus( PlaylistItem * item );
void addToUniqueMap( const TQString uniqueid, PlaylistItem* item );
void removeFromUniqueMap( const TQString uniqueid, PlaylistItem* item );
@@ -351,7 +351,7 @@ class Playlist : private KListView, public EngineObserver, public Amarok::ToolTi
typedef TQMap AlbumMap;
typedef TQMap ArtistAlbumMap;
ArtistAlbumMap m_albums;
- uint m_startupTime_t; //TQDateTime::tqcurrentDateTime().toTime_t as of startup
+ uint m_startupTime_t; //TQDateTime::currentDateTime().toTime_t as of startup
uint m_oldestTime_t; //the createdate of the oldest song in the collection
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 279f0c89..ae60a990 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -213,7 +213,7 @@ PlaylistBrowser::PlaylistBrowser( const char *name )
this, TQT_SLOT( currentItemChanged( TQListViewItem * ) ) );
connect( CollectionDB::instance(), TQT_SIGNAL( scanDone( bool ) ), TQT_SLOT( collectionScanDone() ) );
- setMinimumWidth( m_toolbar->tqsizeHint().width() );
+ setMinimumWidth( m_toolbar->sizeHint().width() );
m_infoPane = new InfoPane( m_splitter );
@@ -2759,7 +2759,7 @@ void PlaylistBrowserView::viewportPaintEvent( TQPaintEvent *e )
drawItemHighlighter( &painter, m_marker );
else //when dragging on a track we draw a line marker
painter.fillRect( drawDropVisualizer( 0, 0, m_marker ),
- TQBrush( tqcolorGroup().highlight(), TQBrush::Dense4Pattern ) );
+ TQBrush( colorGroup().highlight(), TQBrush::Dense4Pattern ) );
}
}
@@ -2775,7 +2775,7 @@ void PlaylistBrowserView::mousePressed( int button, TQListViewItem *item, const
TQPoint p = mapFromGlobal( pnt );
p.setY( p.y() - header()->height() );
- TQRect itemrect = tqitemRect( item );
+ TQRect itemrect = itemRect( item );
TQRect expandRect = TQRect( 4, itemrect.y() + (item->height()/2) - 5, 15, 15 );
if( expandRect.contains( p ) ) { //expand symbol clicked
@@ -2876,7 +2876,7 @@ void PlaylistBrowserView::rename( TQListViewItem *item, int c )
{
KListView::rename( item, c );
- TQRect rect( tqitemRect( item ) );
+ TQRect rect( itemRect( item ) );
int fieldX = rect.x() + treeStepSize() + 2;
int fieldW = rect.width() - treeStepSize() - 2;
@@ -3151,7 +3151,7 @@ InfoPane::InfoPane( TQWidget *parent )
connect( m_pushButton, TQT_SIGNAL(toggled( bool )), TQT_SLOT(toggle( bool )) );
//Set the height to fixed. The button shouldn't be resized.
- setFixedHeight( m_pushButton->tqsizeHint().height() );
+ setFixedHeight( m_pushButton->sizeHint().height() );
}
InfoPane::~InfoPane()
@@ -3190,7 +3190,7 @@ InfoPane::toggle( bool toggled )
setStoredHeight( splitter->sizes().last() );
//Set the height to fixed. The button shouldn't be resized.
- setFixedHeight( m_pushButton->tqsizeHint().height() );
+ setFixedHeight( m_pushButton->sizeHint().height() );
//Now the info pane is not shown, we can disable the button if necessary
m_pushButton->setEnabled( m_enable );
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index c64644c0..784a27d8 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -3149,7 +3149,7 @@ TQString SmartPlaylist::query()
// duplicate string, thread-safely (TQDeepCopy is not thread-safe)
return TQString( m_sqlForTags.tqunicode(), m_sqlForTags.length() )
.replace( "(*CurrentTimeT*)" ,
- TQString::number(TQDateTime::tqcurrentDateTime().toTime_t()) )
+ TQString::number(TQDateTime::currentDateTime().toTime_t()) )
.replace( "(*ListOfFields*)" , QueryBuilder::dragSQLFields() )
.replace( "(*MountedDeviceSelection*)" ,
CollectionDB::instance()->deviceidSelection() );
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index def2f6e6..90353657 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -384,7 +384,7 @@ void PlaylistItem::update() const
void PlaylistItem::updateColumn( int column ) const
{
- const TQRect r = listView()->tqitemRect( this );
+ const TQRect r = listView()->itemRect( this );
if( !r.isValid() )
return;
@@ -507,9 +507,9 @@ PlaylistItem::compare( TQListViewItem *i, int col, bool ascending ) const
return compare( i, Album, ascending );
else
{
- if( a.tqstartsWith( "the ", false ) )
+ if( a.startsWith( "the ", false ) )
a = a.mid( 4 );
- if( b.tqstartsWith( "the ", false ) )
+ if( b.startsWith( "the ", false ) )
b = b.mid( 4 );
}
break;
@@ -588,7 +588,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
TQColor bg;
if( isSelected() )
- bg = listView()->tqcolorGroup().highlight();
+ bg = listView()->colorGroup().highlight();
else
bg = isAlternate() ? listView()->alternateBackground() :
listView()->viewport()->backgroundColor();
@@ -596,7 +596,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
buf.fill( bg );
// Draw column divider line
- p.setPen( listView()->viewport()->tqcolorGroup().mid() );
+ p.setPen( listView()->viewport()->colorGroup().mid() );
p.drawLine( width - 1, 0, width - 1, height() - 1 );
// Here we draw the background bar graphics for the current track:
@@ -724,7 +724,7 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co
// Draw column divider line
if( !isSelected() )
{
- p.setPen( listView()->viewport()->tqcolorGroup().mid() );
+ p.setPen( listView()->viewport()->colorGroup().mid() );
p.drawLine( width - 1, 0, width - 1, height() - 1 );
}
diff --git a/amarok/src/playlistloader.cpp b/amarok/src/playlistloader.cpp
index c9e5d00d..7ec0a255 100644
--- a/amarok/src/playlistloader.cpp
+++ b/amarok/src/playlistloader.cpp
@@ -94,7 +94,7 @@ UrlLoader::UrlLoader( const KURL::List &urls, TQListViewItem *after, int options
Amarok::StatusBar::instance()->newProgressOperation( this )
.setDescription( m_description )
- .settqStatus( i18n("Preparing") )
+ .setStatus( i18n("Preparing") )
.setAbortSlot( this, TQT_SLOT(abort()) )
.setTotalSteps( 100 );
diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp
index 881667b0..76e10a8b 100644
--- a/amarok/src/playlistselection.cpp
+++ b/amarok/src/playlistselection.cpp
@@ -82,7 +82,7 @@ namespace ConfigDynamic
NewDynamic* nd = new NewDynamic( dialog, "new dynamic");
//TQSizePolicy policy;
//policy.setHorData(TQSizePolicy::Maximum);
- //dialog->tqsetSizePolicy(policy);
+ //dialog->setSizePolicy(policy);
dialog->setMainWidget( nd );
return dialog;
}
@@ -138,7 +138,7 @@ namespace ConfigDynamic
}
nd->updateGeometry();
- dialog->resize( nd->tqminimumSizeHint() );
+ dialog->resize( nd->minimumSizeHint() );
if( dialog->exec() == TQDialog::Accepted )
{
diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h
index da65d54d..31f755fc 100644
--- a/amarok/src/playlistselection.h
+++ b/amarok/src/playlistselection.h
@@ -23,9 +23,9 @@ class PlaylistSelection : public KListView
TQ_OBJECT
public:
PlaylistSelection(TQWidget* parent, const char* name);
- virtual TQSize tqsizeHint() const
+ virtual TQSize sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
private:
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index 8a71fdb0..ee61d5a9 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -227,7 +227,7 @@ PlaylistWindow::PlaylistWindow()
new Amarok::BurnMenuAction( ac );
if( AmarokConfig::playlistWindowSize().isValid() ) {
- // if first ever run, use tqsizeHint(), and let
+ // if first ever run, use sizeHint(), and let
// KWin place us otherwise use the stored values
resize( AmarokConfig::playlistWindowSize() );
move( AmarokConfig::playlistWindowPos() );
@@ -258,7 +258,7 @@ void PlaylistWindow::init()
m_browsers = new BrowserBar( this );
- //
+ //
DynamicBar *dynamicBar = new DynamicBar( m_browsers->container());
TQFrame *playlist;
@@ -282,7 +282,7 @@ void PlaylistWindow::init()
filter_label->setBuddy( m_lineEdit );
bar->setStretchableWidget( m_lineEdit );
KPushButton *filterButton = new KPushButton("...", bar, "filter");
- filterButton->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
+ filterButton->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
m_lineEdit->setFrame( TQFrame::Sunken );
m_lineEdit->installEventFilter( this ); //we intercept keyEvents
@@ -819,7 +819,7 @@ void PlaylistWindow::showEvent( TQShowEvent* )
}
#include
-TQSize PlaylistWindow::tqsizeHint() const
+TQSize PlaylistWindow::sizeHint() const
{
return TQApplication::desktop()->screenGeometry( (TQWidget*)this ).size() / 1.5;
}
@@ -1249,9 +1249,9 @@ void DynamicTitle::paintEvent(TQPaintEvent* /*e*/)
{
TQPainter p;
p.tqbegin( this, false );
- TQPen pen( tqcolorGroup().highlightedText(), 0, TQt::NoPen );
+ TQPen pen( colorGroup().highlightedText(), 0, TQt::NoPen );
p.setPen( pen );
- p.setBrush( tqcolorGroup().highlight() );
+ p.setBrush( colorGroup().highlight() );
p.setFont(m_font);
TQFontMetrics fm(m_font);
@@ -1266,7 +1266,7 @@ void DynamicTitle::paintEvent(TQPaintEvent* /*e*/)
p.drawEllipse( 0, yStart, s_curveWidth * 2, textHeight);
p.drawEllipse( s_curveWidth + textWidth + s_imageSize, yStart, s_curveWidth*2, textHeight);
p.fillRect( s_curveWidth, yStart, textWidth + s_imageSize + s_curveWidth, textHeight
- , TQBrush( tqcolorGroup().highlight()) );
+ , TQBrush( colorGroup().highlight()) );
p.drawPixmap( s_curveWidth, yStart + ((textHeight - s_imageSize) /2), SmallIcon("dynamic") );
//not sure why first arg of Rect shouldn't add @curveWidth
p.drawText( TQRect(s_imageSize, yStart, s_curveWidth + textWidth +s_imageSize, textHeight), TQt::AlignCenter, m_title);
diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h
index 83d4d816..6e03df2b 100644
--- a/amarok/src/playlistwindow.h
+++ b/amarok/src/playlistwindow.h
@@ -100,7 +100,7 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient
protected:
virtual void closeEvent( TQCloseEvent* );
virtual void showEvent( TQShowEvent* );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private:
enum MenuId { ID_SHOW_TOOLBAR = 2000, ID_SHOW_PLAYERWINDOW };
diff --git a/amarok/src/podcastsettingsbase.ui b/amarok/src/podcastsettingsbase.ui
index 8027f273..c503b4e7 100644
--- a/amarok/src/podcastsettingsbase.ui
+++ b/amarok/src/podcastsettingsbase.ui
@@ -116,7 +116,7 @@
Expanding
-
+
111
21
@@ -185,7 +185,7 @@
MinimumExpanding
-
+
20
5
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index 5fe1bbe4..eb4ee1ee 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -65,7 +65,7 @@ PrettyPopupMenu::generateSidePixmap()
TQRect
PrettyPopupMenu::sideImageRect() const
{
- return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), s_sidePixmap.width(),
+ return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), s_sidePixmap.width(),
height() - 2*frameWidth() ), this );
}
@@ -138,14 +138,14 @@ void PrettyPopupMenu::resizeEvent(TQResizeEvent * e)
{
KPopupMenu::resizeEvent( e );
- setFrameRect( TQStyle::tqvisualRect( TQRect( s_sidePixmap.width(), 0,
+ setFrameRect( TQStyle::visualRect( TQRect( s_sidePixmap.width(), 0,
width() - s_sidePixmap.width(), height() ), this ) );
}
//Workaround TQt3.3.x sizing bug, by ensuring we're always wide enough.
void PrettyPopupMenu::resize( int width, int height )
{
- width = kMax(width, tqmaximumSize().width());
+ width = kMax(width, maximumSize().width());
KPopupMenu::resize(width, height);
}
@@ -176,7 +176,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e )
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ),
- tqcolorGroup(), TQStyle::Style_Default,
+ colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) );
}
diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp
index cb656662..b7be0302 100644
--- a/amarok/src/queuemanager.cpp
+++ b/amarok/src/queuemanager.cpp
@@ -105,9 +105,9 @@ QueueList::viewportPaintEvent( TQPaintEvent *e )
const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
- t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+ t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
}
}
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index 121ea853..5ab52c20 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -88,7 +88,7 @@ namespace Amarok {
TQString proxy;
if ( KProtocolManager::proxyForURL( kurl ) !=
- TQString::tqfromLatin1( "DIRECT" ) ) {
+ TQString::fromLatin1( "DIRECT" ) ) {
KProtocolManager::slaveProtocol ( kurl, proxy );
}
@@ -199,9 +199,9 @@ ScriptManager::ScriptManager( TQWidget *parent, const char *name )
m_gui->configureButton->setIconSet( SmallIconSet( Amarok::icon( "configure" ) ) );
m_gui->aboutButton ->setIconSet( SmallIconSet( Amarok::icon( "info" ) ) );
- TQSize sz = tqsizeHint();
+ TQSize sz = sizeHint();
setMinimumSize( kMax( 350, sz.width() ), kMax( 250, sz.height() ) );
- resize( tqsizeHint() );
+ resize( sizeHint() );
connect( this, TQT_SIGNAL(lyricsScriptChanged()), ContextBrowser::instance(), TQT_SLOT( lyricsScriptChanged() ) );
@@ -746,7 +746,7 @@ ScriptManager::slotShowContextMenu( TQListViewItem* item, const TQPoint& pos )
void
ScriptManager::slotReceivedStdout( KProcess*, char* buf, int len )
{
- debug() << TQString::tqfromLatin1( buf, len ) << endl;
+ debug() << TQString::fromLatin1( buf, len ) << endl;
}
@@ -759,7 +759,7 @@ ScriptManager::slotReceivedStderr( KProcess* process, char* buf, int len )
for( it = m_scripts.begin(); it != end; ++it )
if( it.data().process == process ) break;
- const TQString text = TQString::tqfromLatin1( buf, len );
+ const TQString text = TQString::fromLatin1( buf, len );
error() << it.key() << ":\n" << text << endl;
if( it.data().log.length() > 20000 )
diff --git a/amarok/src/scriptmanagerbase.ui b/amarok/src/scriptmanagerbase.ui
index 4fe50c2f..52a5b4b3 100644
--- a/amarok/src/scriptmanagerbase.ui
+++ b/amarok/src/scriptmanagerbase.ui
@@ -48,7 +48,7 @@
Expanding
-
+
20
30
diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb
index d2b5d162..7a5a4c39 100644
--- a/amarok/src/scripts/databasescripts/databaseScripts.rb
+++ b/amarok/src/scripts/databasescripts/databaseScripts.rb
@@ -79,7 +79,7 @@ class DatabaseScriptChooser < Qt::Dialog
@Form1Layout.addLayout(@tqlayout3, 0, 0)
languageChange()
- resize( Qt::Size.new(356, 137).expandedTo(tqminimumSizeHint()) )
+ resize( Qt::Size.new(356, 137).expandedTo(minimumSizeHint()) )
clearWState( WState_Polished )
end
diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui
index af027a99..11ec9e57 100644
--- a/amarok/src/scripts/graphequalizer/eqdialog.ui
+++ b/amarok/src/scripts/graphequalizer/eqdialog.ui
@@ -94,7 +94,7 @@
Maximum
-
+
20
20
@@ -125,7 +125,7 @@
Maximum
-
+
20
20
@@ -148,13 +148,13 @@
canvasView
-
+
404
200
-
+
404
200
diff --git a/amarok/src/scripts/webcontrol/RequestHandler.py b/amarok/src/scripts/webcontrol/RequestHandler.py
index cf6e87fe..8519ef35 100644
--- a/amarok/src/scripts/webcontrol/RequestHandler.py
+++ b/amarok/src/scripts/webcontrol/RequestHandler.py
@@ -28,11 +28,11 @@ PLIST = None
REQ_IDS = {}
#
-# Holding current AmaroktqStatus. A bunch of init_XXX functions in
+# Holding current AmarokStatus. A bunch of init_XXX functions in
# order to begin dcop requests as early as possible to avoid too
# much latency
#
-class AmaroktqStatus:
+class AmarokStatus:
EngineEmpty = 1
EngineIdle = 2
@@ -90,19 +90,19 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
our server."""
def _amarokPlay(self):
- AmaroktqStatus.playState = AmaroktqStatus.EnginePlay
+ AmarokStatus.playState = AmarokStatus.EnginePlay
Globals._dcopCallPlayer("play")
def _amarokPause(self):
- AmaroktqStatus.playState = AmaroktqStatus.EnginePause
+ AmarokStatus.playState = AmarokStatus.EnginePause
Globals._dcopCallPlayer("pause")
def _amarokNext(self):
Globals._dcopCallPlayer("next")
def _amarokGoto(self,index):
- AmaroktqStatus.playState = AmaroktqStatus.EnginePlay
- AmaroktqStatus.currentTrackIndex = int(index)
+ AmarokStatus.playState = AmarokStatus.EnginePlay
+ AmarokStatus.currentTrackIndex = int(index)
Globals._dcopCallPlaylistArg("playByIndex",index)
def _amarokPrev(self):
@@ -110,7 +110,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
def _amarokStop(self):
Globals._dcopCallPlayer("stop")
- AmaroktqStatus.playState = AmaroktqStatus.EngineStop
+ AmarokStatus.playState = AmarokStatus.EngineStop
def _amarokSetVolume(self, val):
Globals._dcopCallPlayerArg("setVolume",val)
@@ -165,8 +165,8 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
self._amarokSetVolume(qmap["value"])
return 1
- def _amaroktqStatus(self):
- status = AmaroktqStatus()
+ def _amarokStatus(self):
+ status = AmarokStatus()
return status
def _sendFile(self, path):
@@ -219,7 +219,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
qmap = self._parseQueryVars()
session_id, last_req_id = self._getSessionInfo(qmap)
- if AmaroktqStatus.allowControl and self._handleAction(qmap):
+ if AmarokStatus.allowControl and self._handleAction(qmap):
last_req_id = last_req_id + 1
REQ_IDS[session_id] = last_req_id
@@ -242,7 +242,7 @@ class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
self.end_headers()
self._sendFile(self.path)
else:
- status = self._amaroktqStatus()
+ status = self._amarokStatus()
status.dcop_volume.init()
status.dcop_trackcurrenttime.init()
status.dcop_tracktotaltime.init()
diff --git a/amarok/src/scripts/webcontrol/WebControl.py b/amarok/src/scripts/webcontrol/WebControl.py
index a6eb91cc..e172a157 100755
--- a/amarok/src/scripts/webcontrol/WebControl.py
+++ b/amarok/src/scripts/webcontrol/WebControl.py
@@ -60,8 +60,8 @@ class ConfigDialog( QDialog ):
self.config = ConfigParser.ConfigParser()
- allowControl = RequestHandler.AmaroktqStatus.allowControl
- publish = RequestHandler.AmaroktqStatus.publish
+ allowControl = RequestHandler.AmarokStatus.allowControl
+ publish = RequestHandler.AmarokStatus.publish
try:
config = ConfigParser.ConfigParser()
config.read( "webcontrolrc" )
@@ -159,8 +159,8 @@ class WebControl( QApplication ):
config.read( "webcontrolrc" )
try:
- RequestHandler.AmaroktqStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0
- RequestHandler.AmaroktqStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0
+ RequestHandler.AmarokStatus.allowControl = string.find(config.get( "General", "allowcontrol" ), "True") >= 0
+ RequestHandler.AmarokStatus.publish = string.find(config.get( "General", "publish" ), "True") >= 0
except:
debug( "No config file found, using defaults." )
@@ -170,7 +170,7 @@ class WebControl( QApplication ):
self.zeroconfPublishing()
def zeroconfPublishing( self ):
- if RequestHandler.AmaroktqStatus.publish:
+ if RequestHandler.AmarokStatus.publish:
if not publisher.active:
threading.Thread(target = publisher.run).start()
else:
@@ -234,32 +234,32 @@ class WebControl( QApplication ):
def engineStatePlay( self ):
""" Called when Engine state changes to Play """
- RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
- RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result()
- RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
- RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result()
- RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePlay
+ RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
+ RequestHandler.AmarokStatus.dcop_trackcurrenttime.result()
+ RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
+ RequestHandler.AmarokStatus.dcop_tracktotaltime.result()
+ RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePlay
def engineStateIdle( self ):
""" Called when Engine state changes to Idle """
- RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineIdle
+ RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineIdle
def engineStatePause( self ):
""" Called when Engine state changes to Pause """
- RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EnginePause
+ RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EnginePause
def engineStateEmpty( self ):
""" Called when Engine state changes to Empty """
- RequestHandler.AmaroktqStatus.playState = RequestHandler.AmaroktqStatus.EngineEmpty
+ RequestHandler.AmarokStatus.playState = RequestHandler.AmarokStatus.EngineEmpty
def trackChange( self ):
""" Called when a new track starts """
- RequestHandler.AmaroktqStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex")
- RequestHandler.AmaroktqStatus.dcop_trackcurrentindex.result()
- RequestHandler.AmaroktqStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
- RequestHandler.AmaroktqStatus.dcop_trackcurrenttime.result()
- RequestHandler.AmaroktqStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
- RequestHandler.AmaroktqStatus.dcop_tracktotaltime.result()
+ RequestHandler.AmarokStatus.dcop_trackcurrentindex = Globals.PlaylistDcop("getActiveIndex")
+ RequestHandler.AmarokStatus.dcop_trackcurrentindex.result()
+ RequestHandler.AmarokStatus.dcop_trackcurrenttime = Globals.PlayerDcop("trackCurrentTime")
+ RequestHandler.AmarokStatus.dcop_trackcurrenttime.result()
+ RequestHandler.AmarokStatus.dcop_tracktotaltime = Globals.PlayerDcop("trackTotalTime")
+ RequestHandler.AmarokStatus.dcop_tracktotaltime.result()
diff --git a/amarok/src/scrobbler.cpp b/amarok/src/scrobbler.cpp
index 3edcdaf0..d3a49e51 100644
--- a/amarok/src/scrobbler.cpp
+++ b/amarok/src/scrobbler.cpp
@@ -270,7 +270,7 @@ SubmitItem::SubmitItem(
m_album = album;
m_title = title;
m_length = length;
- m_playStartTime = now ? TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t() : 0;
+ m_playStartTime = now ? TQDateTime::currentDateTime( Qt::UTC ).toTime_t() : 0;
}
@@ -422,7 +422,7 @@ ScrobblerSubmitter::~ScrobblerSubmitter()
void ScrobblerSubmitter::performHandshake()
{
TQString handshakeUrl = TQString();
- uint currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ uint currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
if ( PROTOCOL_VERSION == "1.1" )
{
@@ -665,7 +665,7 @@ void ScrobblerSubmitter::scheduledTimeReached()
*/
void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT
{
- m_prevSubmitTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
m_inProgress = false;
if ( job->error() ) {
@@ -745,7 +745,7 @@ void ScrobblerSubmitter::audioScrobblerHandshakeResult( KIO::Job* job ) //SLOT
*/
void ScrobblerSubmitter::audioScrobblerSubmitResult( KIO::Job* job ) //SLOT
{
- m_prevSubmitTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ m_prevSubmitTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
m_inProgress = false;
if ( job->error() ) {
@@ -891,7 +891,7 @@ SubmitItem* ScrobblerSubmitter::dequeueItem()
SubmitItem* item = 0;
if( m_lastSubmissionFinishTime > 0 && !m_holdFakeQueue && m_fakeQueue.getFirst() )
{
- uint limit = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ uint limit = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
if ( m_submitQueue.getFirst() )
if ( m_submitQueue.getFirst()->playStartTime() <= limit )
@@ -1047,7 +1047,7 @@ void ScrobblerSubmitter::saveSubmitQueue()
}
if ( m_lastSubmissionFinishTime == 0 )
- m_lastSubmissionFinishTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ m_lastSubmissionFinishTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
TQDomDocument newdoc;
TQDomElement submitQueue = newdoc.createElement( "submit" );
@@ -1127,7 +1127,7 @@ bool ScrobblerSubmitter::schedule( bool failure )
if ( m_inProgress || !canSubmit() )
return false;
- uint when, currentTime = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t();
+ uint when, currentTime = TQDateTime::currentDateTime( Qt::UTC ).toTime_t();
if ( currentTime - m_prevSubmitTime > m_interval )
when = 0;
else
diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp
index f0b347ad..67d6f3b1 100644
--- a/amarok/src/sliderwidget.cpp
+++ b/amarok/src/sliderwidget.cpp
@@ -330,13 +330,13 @@ Amarok::PrettySlider::newBundle( const MetaBundle &bundle )
but they may become useful one day **/
TQSize
-Amarok::PrettySlider::tqminimumSizeHint() const
+Amarok::PrettySlider::minimumSizeHint() const
{
- return tqsizeHint();
+ return sizeHint();
}
TQSize
-Amarok::PrettySlider::tqsizeHint() const
+Amarok::PrettySlider::sizeHint() const
{
constPolish();
@@ -390,13 +390,13 @@ void
Amarok::VolumeSlider::generateGradient()
{
//TQImage temp( locate( "data","amarok/images/volumeslider-gradient.png" ) );
- //KIconEffect::colorize( temp, tqcolorGroup().highlight(), 1.0 );
+ //KIconEffect::colorize( temp, colorGroup().highlight(), 1.0 );
const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) );
const TQBitmap mask( temp.createHeuristicMask() );
m_pixmapGradient = TQPixmap( m_pixmapInset.size() );
- KPixmapEffect::gradient( m_pixmapGradient, tqcolorGroup().background(), tqcolorGroup().highlight(),
+ KPixmapEffect::gradient( m_pixmapGradient, colorGroup().background(), colorGroup().highlight(),
KPixmapEffect::HorizontalGradient );
m_pixmapGradient.setMask( mask );
}
@@ -477,7 +477,7 @@ Amarok::VolumeSlider::paintEvent( TQPaintEvent * )
if( parentWidget()->backgroundPixmap() )
buf.fill( parentWidget(), pos() );
else {
- buf.fill( tqcolorGroup().background() );
+ buf.fill( colorGroup().background() );
// TQPainter p( &buf );
// p.fillRect( rect(), tqApp->palette().brush( TQPalette::Active, TQColorGroup::Background ) );
}
diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp
index 5ca0242f..a49052ac 100644
--- a/amarok/src/smartplaylisteditor.cpp
+++ b/amarok/src/smartplaylisteditor.cpp
@@ -290,7 +290,7 @@ void SmartPlaylistEditor::removeCriteriaAny( CriteriaEditor *criteria )
{
m_criteriaEditorAnyList.remove( criteria );
criteria->deleteLater();
- resize( size().width(), tqsizeHint().height() );
+ resize( size().width(), sizeHint().height() );
if( m_criteriaEditorAnyList.count() == 1 )
m_criteriaEditorAnyList.first()->enableRemove( false );
@@ -300,7 +300,7 @@ void SmartPlaylistEditor::removeCriteriaAll( CriteriaEditor *criteria )
{
m_criteriaEditorAllList.remove( criteria );
criteria->deleteLater();
- resize( size().width(), tqsizeHint().height() );
+ resize( size().width(), sizeHint().height() );
if( m_criteriaEditorAllList.count() == 1 )
m_criteriaEditorAllList.first()->enableRemove( false );
@@ -896,7 +896,7 @@ void CriteriaEditor::loadEditWidgets()
m_intSpinBox1 = new KIntSpinBox( m_editBox );
int maxValue = 1000;
if( yearField ) {
- maxValue = TQDate::tqcurrentDate().year();
+ maxValue = TQDate::currentDate().year();
m_intSpinBox1->setValue( maxValue );
}
m_intSpinBox1->setMaxValue( maxValue );
@@ -905,11 +905,11 @@ void CriteriaEditor::loadEditWidgets()
if( m_criteriaCombo->currentText() == i18n("is between") ) {
m_rangeLabel = new TQLabel( i18n("and"), m_editBox );
- m_rangeLabel->tqsetAlignment( AlignCenter );
+ m_rangeLabel->setAlignment( AlignCenter );
m_rangeLabel->show();
m_intSpinBox2 = new KIntSpinBox( m_editBox );
if( yearField ) {
- maxValue = TQDate::tqcurrentDate().year();
+ maxValue = TQDate::currentDate().year();
m_intSpinBox2->setValue( maxValue );
}
m_intSpinBox2->setMaxValue( maxValue );
@@ -927,7 +927,7 @@ void CriteriaEditor::loadEditWidgets()
if( m_criteriaCombo->currentText() == i18n("is between") ) {
m_rangeLabel = new TQLabel( i18n("and"), m_editBox );
- m_rangeLabel->tqsetAlignment( AlignCenter );
+ m_rangeLabel->setAlignment( AlignCenter );
m_rangeLabel->show();
m_comboBox2 = new KComboBox( false, m_editBox );
m_comboBox2->insertStringList( list );
@@ -950,14 +950,14 @@ void CriteriaEditor::loadEditWidgets()
m_dateCombo->show();
}
else {
- m_dateEdit1 = new TQDateEdit( TQDate::tqcurrentDate(), m_editBox);
+ m_dateEdit1 = new TQDateEdit( TQDate::currentDate(), m_editBox);
m_dateEdit1->setFocus();
m_dateEdit1->show();
if( m_criteriaCombo->currentText() == i18n("is between") ) {
m_rangeLabel = new TQLabel( i18n("and"), m_editBox );
- m_rangeLabel->tqsetAlignment( AlignCenter );
+ m_rangeLabel->setAlignment( AlignCenter );
m_rangeLabel->show();
- m_dateEdit2 = new TQDateEdit( TQDate::tqcurrentDate(), m_editBox);
+ m_dateEdit2 = new TQDateEdit( TQDate::currentDate(), m_editBox);
m_dateEdit2->show();
}
}
@@ -974,7 +974,7 @@ void CriteriaEditor::loadEditWidgets()
m_intSpinBox1->show();
if( m_criteriaCombo->currentText() == i18n("is between") ) {
m_rangeLabel = new TQLabel( i18n("and"), m_editBox );
- m_rangeLabel->tqsetAlignment( AlignCenter );
+ m_rangeLabel->setAlignment( AlignCenter );
m_rangeLabel->show();
m_intSpinBox2 = new KIntSpinBox( m_editBox );
m_intSpinBox2->setMaxValue( maxValue );
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index 5d4e473c..fd4acac1 100644
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
@@ -187,7 +187,7 @@ Vis::Selector::Selector( TQWidget *parent )
for( TQStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it )
new Item( this, "amarok_libvisual", *it, "libvisual" );
- resize( tqsizeHint() + TQSize(20,0) );
+ resize( sizeHint() + TQSize(20,0) );
// Center the widget on screen
move( parentWidget()->width()/2 - width()/2, parentWidget()->height()/2 - height()/2 );
}
@@ -204,7 +204,7 @@ Vis::Selector::processExited( KProcess *proc )
void
Vis::Selector::receivedStdout( KProcess */*proc*/, char* buffer, int length )
{
- debug() << TQString::tqfromLatin1( buffer, length ) << endl;
+ debug() << TQString::fromLatin1( buffer, length ) << endl;
}
void
diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
index aa85d2ed..280b55e1 100644
--- a/amarok/src/sqlite/sqlite3.c
+++ b/amarok/src/sqlite/sqlite3.c
@@ -9412,7 +9412,7 @@ struct Cursor {
** aRow might point to (ephemeral) data for the current row, or it might
** be NULL.
*/
- int cachetqStatus; /* Cache is valid if this matches Vdbe.cacheCtr */
+ int cacheStatus; /* Cache is valid if this matches Vdbe.cacheCtr */
int payloadSize; /* Total number of bytes in the record */
u32 *aType; /* Type values for all entries in the record */
u32 *aOffset; /* Cached offsets to the start of each columns data */
@@ -32090,7 +32090,7 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(Cursor *p){
sqlite3_search_count++;
#endif
p->deferredMoveto = 0;
- p->cachetqStatus = CACHE_STALE;
+ p->cacheStatus = CACHE_STALE;
}
return SQLITE_OK;
}
@@ -35529,7 +35529,7 @@ case OP_Column: {
pCrsr = pC->pCursor;
if( pC->nullRow ){
payloadSize = 0;
- }else if( pC->cachetqStatus==p->cacheCtr ){
+ }else if( pC->cacheStatus==p->cacheCtr ){
payloadSize = pC->payloadSize;
zRec = (char*)pC->aRow;
}else if( pC->isIndex ){
@@ -35544,7 +35544,7 @@ case OP_Column: {
/* The record is the sole entry of a pseudo-table */
payloadSize = pC->nData;
zRec = pC->pData;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
assert( payloadSize==0 || zRec!=0 );
nField = pC->nField;
pCrsr = 0;
@@ -35569,7 +35569,7 @@ case OP_Column: {
/* Read and parse the table header. Store the results of the parse
** into the record header cache fields of the cursor.
*/
- if( pC && pC->cachetqStatus==p->cacheCtr ){
+ if( pC && pC->cacheStatus==p->cacheCtr ){
aType = pC->aType;
aOffset = pC->aOffset;
}else{
@@ -35588,7 +35588,7 @@ case OP_Column: {
}
pC->aOffset = aOffset = &aType[nField];
pC->payloadSize = payloadSize;
- pC->cachetqStatus = p->cacheCtr;
+ pC->cacheStatus = p->cacheCtr;
/* Figure out how many bytes are in the header */
if( zRec ){
@@ -36485,7 +36485,7 @@ case OP_MoveGt: { /* no-push */
pC->rowidIsValid = 0;
}
pC->deferredMoveto = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
*pC->pIncrKey = 0;
#ifdef SQLITE_TEST
sqlite3_search_count++;
@@ -36589,7 +36589,7 @@ case OP_Found: { /* no-push */
rx = sqlite3BtreeMoveto(pC->pCursor, pTos->z, pTos->n, 0, &res);
alreadyExists = rx==SQLITE_OK && res==0;
pC->deferredMoveto = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
}
if( pOp->opcode==OP_Found ){
if( alreadyExists ) pc = pOp->p2 - 1;
@@ -36664,7 +36664,7 @@ case OP_IsUnique: { /* no-push */
** If there is no such entry, jump immediately to P2.
*/
assert( pCx->deferredMoveto==0 );
- pCx->cachetqStatus = CACHE_STALE;
+ pCx->cacheStatus = CACHE_STALE;
rc = sqlite3BtreeMoveto(pCrsr, zKey, len, 0, &res);
if( rc!=SQLITE_OK ){
goto abort_due_to_error;
@@ -36739,7 +36739,7 @@ case OP_NotExists: { /* no-push */
pC->lastRowid = pTos->u.i;
pC->rowidIsValid = res==0;
pC->nullRow = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
/* res might be uninitialized if rc!=SQLITE_OK. But if rc!=SQLITE_OK
** processing is about to abort so we really do not care whether or not
** the following jump is taken. (In other words, do not stress over
@@ -36920,7 +36920,7 @@ case OP_NewRowid: {
}
pC->rowidIsValid = 0;
pC->deferredMoveto = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
}
pTos++;
pTos->u.i = v;
@@ -37002,7 +37002,7 @@ case OP_Insert: { /* no-push */
pC->rowidIsValid = 0;
pC->deferredMoveto = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
/* Invoke the update-hook if required. */
if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){
@@ -37062,7 +37062,7 @@ case OP_Delete: { /* no-push */
if( rc ) goto abort_due_to_error;
rc = sqlite3BtreeDelete(pC->pCursor);
pC->nextRowidValid = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
/* Invoke the update-hook if required. */
if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p3 ){
@@ -37245,7 +37245,7 @@ case OP_Last: { /* no-push */
rc = sqlite3BtreeLast(pCrsr, &res);
pC->nullRow = res;
pC->deferredMoveto = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
if( res && pOp->p2>0 ){
pc = pOp->p2 - 1;
}
@@ -37296,7 +37296,7 @@ case OP_Rewind: { /* no-push */
rc = sqlite3BtreeFirst(pCrsr, &res);
pC->atFirst = res==0;
pC->deferredMoveto = 0;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
}else{
res = 1;
}
@@ -37343,7 +37343,7 @@ case OP_Next: { /* no-push */
rc = pOp->opcode==OP_Next ? sqlite3BtreeNext(pCrsr, &res) :
sqlite3BtreePrevious(pCrsr, &res);
pC->nullRow = res;
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
}
if( res==0 ){
pc = pOp->p2 - 1;
@@ -37386,7 +37386,7 @@ case OP_IdxInsert: { /* no-push */
const char *zKey = pTos->z;
rc = sqlite3BtreeInsert(pCrsr, zKey, nKey, "", 0, 0, pOp->p2);
assert( pC->deferredMoveto==0 );
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
}
}
Release(pTos);
@@ -37415,7 +37415,7 @@ case OP_IdxDelete: { /* no-push */
rc = sqlite3BtreeDelete(pCrsr);
}
assert( pC->deferredMoveto==0 );
- pC->cachetqStatus = CACHE_STALE;
+ pC->cacheStatus = CACHE_STALE;
}
Release(pTos);
pTos--;
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index ae48d512..b41e0ce0 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -272,7 +272,7 @@ StatisticsList::renderView()
qb.addReturnFunctionValue( QueryBuilder::funcMin, QueryBuilder::tabStats, QueryBuilder::valCreateDate );
qb.setOptions( QueryBuilder::optRemoveDuplicates );
a = qb.run();
- TQDateTime firstPlay = TQDateTime::tqcurrentDateTime();
+ TQDateTime firstPlay = TQDateTime::currentDateTime();
if ( a[0].toUInt() )
firstPlay.setTime_t( a[0].toUInt() );
@@ -623,9 +623,9 @@ StatisticsList::viewportPaintEvent( TQPaintEvent *e )
const uint x = (viewport()->width() - w - 30) / 2 ;
const uint y = (viewport()->height() - h - 30) / 2 ;
- p.setBrush( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
- t.draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+ t.draw( &p, x+15, y+15, TQRect(), colorGroup() );
}
}
diff --git a/amarok/src/statusbar/overlayWidget.cpp b/amarok/src/statusbar/overlayWidget.cpp
index 3298056f..7f120a53 100644
--- a/amarok/src/statusbar/overlayWidget.cpp
+++ b/amarok/src/statusbar/overlayWidget.cpp
@@ -49,10 +49,10 @@ OverlayWidget::reposition()
p.setY( -height() );
// Position in the toplevelwidget's coordinates
- TQPoint pTopLevel = m_anchor->mapTo( tqtopLevelWidget(), p );
+ TQPoint pTopLevel = m_anchor->mapTo( topLevelWidget(), p );
// Position in the widget's parentWidget coordinates
- TQPoint pParent = parentWidget() ->mapFrom( tqtopLevelWidget(), pTopLevel );
+ TQPoint pParent = parentWidget() ->mapFrom( topLevelWidget(), pTopLevel );
// keep it on the screen
if( pParent.x() < 0 )
pParent.rx() = 0;
diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp
index 58855c14..aa150af2 100644
--- a/amarok/src/statusbar/popupMessage.cpp
+++ b/amarok/src/statusbar/popupMessage.cpp
@@ -76,7 +76,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con
alabel = new KActiveLabel( this, "label" );
alabel->setTextFormat( TQt::RichText );
- alabel->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+ alabel->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
alabel->setPalette( p );
hbox->add( alabel );
diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp
index 2e69bf19..9b6d1415 100644
--- a/amarok/src/statusbar/progressBar.cpp
+++ b/amarok/src/statusbar/progressBar.cpp
@@ -38,7 +38,7 @@ ProgressBar::ProgressBar( TQWidget *parent, TQLabel *label )
{
DEBUG_FUNC_INFO
- m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
+ m_label->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
m_abort = new KPushButton( KStdGuiItem::cancel(), parent );
m_abort->hide();
m_abort->setText( i18n("Abort") );
@@ -61,7 +61,7 @@ ProgressBar::setDescription( const TQString &text )
}
ProgressBar&
-ProgressBar::settqStatus( const TQString &text )
+ProgressBar::setStatus( const TQString &text )
{
TQString s = m_description;
s += " [";
@@ -100,11 +100,11 @@ ProgressBar::setDone()
if( !m_done ) {
m_done = true;
m_abort->setEnabled( false );
- settqStatus( i18n("Done") );
+ setStatus( i18n("Done") );
}
else
// then we we're aborted
- settqStatus( i18n("Aborted") );
+ setStatus( i18n("Aborted") );
}
void
@@ -114,7 +114,7 @@ ProgressBar::hide()
m_done = true;
m_abort->setEnabled( false );
- settqStatus( i18n("Aborting...") );
+ setStatus( i18n("Aborting...") );
}
}
diff --git a/amarok/src/statusbar/progressBar.h b/amarok/src/statusbar/progressBar.h
index a3f5f1b7..fdb8ad85 100644
--- a/amarok/src/statusbar/progressBar.h
+++ b/amarok/src/statusbar/progressBar.h
@@ -44,7 +44,7 @@ namespace KDE
ProgressBar &setDescription( const TQString &text );
/** @param text eg. Scanning, Reading. The state of the operation */
- ProgressBar &settqStatus( const TQString &text );
+ ProgressBar &setStatus( const TQString &text );
/** set the recipient slot for the abort button */
ProgressBar &setAbortSlot( TQObject *receiver, const char *slot );
diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp
index d78869a0..edd36d15 100644
--- a/amarok/src/statusbar/queueLabel.cpp
+++ b/amarok/src/statusbar/queueLabel.cpp
@@ -99,27 +99,27 @@ void QueueLabel::setNum( int num )
TQPixmap pix( w, h );
TQPainter p( &pix );
- p.setBrush( tqcolorGroup().background() );
- p.setPen( tqcolorGroup().background() );
+ p.setBrush( colorGroup().background() );
+ p.setPen( colorGroup().background() );
p.drawRect( pix.rect() );
- p.setBrush( tqcolorGroup().highlight() );
- p.setPen( tqcolorGroup().highlight().dark() );
+ p.setBrush( colorGroup().highlight() );
+ p.setPen( colorGroup().highlight().dark() );
if( w > h )
{
p.drawPie( 0, 0, h, h, 90*16, 180*16 );
p.drawPie( w-1 -h, 0, h, h, -90*16, 180*16 );
p.drawLine( h/2-1, 0, w-1 - h/2, 0 );
p.drawLine( h/2-1, h-1, w-1 - h/2, h-1 );
- p.setPen( tqcolorGroup().highlight() );
+ p.setPen( colorGroup().highlight() );
p.drawRect( h/2-1, 1, w - h + 1, h-2 );
}
else
p.drawEllipse( pix.rect() );
p.setFont( f );
- p.setPen( tqcolorGroup().highlightedText() );
- p.setBrush( tqcolorGroup().highlight().dark() );
+ p.setPen( colorGroup().highlightedText() );
+ p.setBrush( colorGroup().highlight().dark() );
p.drawText( pix.rect(), TQt::AlignCenter | TQt::SingleLine, text );
p.end();
@@ -205,8 +205,8 @@ void QueueLabel::mousePressEvent( TQMouseEvent* mouseEvent )
menu = menus.getFirst();
int mx, my;
- const int mw = menu->tqsizeHint().width(),
- mh = menu->tqsizeHint().height(),
+ const int mw = menu->sizeHint().width(),
+ mh = menu->sizeHint().height(),
sy = mapFrom( Amarok::StatusBar::instance(), TQPoint( 0, 0 ) ).y(),
sheight = Amarok::StatusBar::instance()->height();
const TQRect dr = TQApplication::desktop()->availableGeometry( this );
diff --git a/amarok/src/statusbar/squeezedtextlabel.cpp b/amarok/src/statusbar/squeezedtextlabel.cpp
index caca939a..e0c17455 100644
--- a/amarok/src/statusbar/squeezedtextlabel.cpp
+++ b/amarok/src/statusbar/squeezedtextlabel.cpp
@@ -28,30 +28,30 @@ namespace KDE {
SqueezedTextLabel::SqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
fullText = text;
squeezeTextToLabel();
}
SqueezedTextLabel::SqueezedTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+ setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
}
void SqueezedTextLabel::resizeEvent( TQResizeEvent * ) {
squeezeTextToLabel();
}
-TQSize SqueezedTextLabel::tqminimumSizeHint() const
+TQSize SqueezedTextLabel::minimumSizeHint() const
{
- TQSize sh = TQLabel::tqminimumSizeHint();
+ TQSize sh = TQLabel::minimumSizeHint();
sh.setWidth(-1);
return sh;
}
-TQSize SqueezedTextLabel::tqsizeHint() const
+TQSize SqueezedTextLabel::sizeHint() const
{
- return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height());
+ return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
}
void SqueezedTextLabel::setText( const TQString &text ) {
@@ -127,11 +127,11 @@ void SqueezedTextLabel::squeezeTextToLabel()
}
}
-void SqueezedTextLabel::tqsetAlignment( int tqalignment )
+void SqueezedTextLabel::setAlignment( int tqalignment )
{
// save fullText and restore it
TQString tmpFull(fullText);
- TQLabel::tqsetAlignment(tqalignment);
+ TQLabel::setAlignment(tqalignment);
fullText = tmpFull;
}
diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h
index a5cdbb0c..121c18ab 100644
--- a/amarok/src/statusbar/squeezedtextlabel.h
+++ b/amarok/src/statusbar/squeezedtextlabel.h
@@ -35,9 +35,9 @@ public:
SqueezedTextLabel( TQWidget *parent, const char *name = 0 );
SqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
- virtual TQSize tqminimumSizeHint() const;
- virtual TQSize tqsizeHint() const;
- virtual void tqsetAlignment( int );
+ virtual TQSize minimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual void setAlignment( int );
public slots:
void setText( const TQString & );
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index e2373936..1950b5de 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -129,7 +129,7 @@ StatusBar::StatusBar( TQWidget *parent, const char *name )
m_popupProgress->setMargin( 1 );
m_popupProgress->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
m_popupProgress->setFrameShape( TQFrame::StyledPanel );
- m_popupProgress->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
+ m_popupProgress->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
(new TQGridLayout( m_popupProgress, 1 /*rows*/, 3 /*cols*/, 6, 3 ))->setAutoAdd( true );
}
@@ -151,7 +151,7 @@ StatusBar::polish()
TQObjectList *list = queryList( TQWIDGET_OBJECT_NAME_STRING, 0, false, false );
for( TQObject * o = list->first(); o; o = list->next() ) {
- int _h = TQT_TQWIDGET( o ) ->tqminimumSizeHint().height();
+ int _h = TQT_TQWIDGET( o ) ->minimumSizeHint().height();
if ( _h > h )
h = _h;
@@ -185,7 +185,7 @@ StatusBar::paintEvent( TQPaintEvent* )
TQStyle::PE_StatusBarSection,
&p,
TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ),
- tqcolorGroup(),
+ colorGroup(),
TQStyle::Style_Default,
TQStyleOption( w ) );
}
@@ -541,12 +541,12 @@ StatusBar::incrementProgressTotalSteps( const TQObject *owner, int inc )
}
void
-StatusBar::setProgresstqStatus( const TQObject *owner, const TQString &text )
+StatusBar::setProgressStatus( const TQObject *owner, const TQString &text )
{
if ( !m_progressMap.contains( owner ) )
return ;
- m_progressMap[owner]->settqStatus( text );
+ m_progressMap[owner]->setStatus( text );
}
void StatusBar::incrementProgress()
@@ -669,7 +669,7 @@ StatusBar::writeLogFile( const TQString &text )
TQTextStream stream( &file );
stream.setEncoding( TQTextStream::UnicodeUTF8 );
- stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) << "] " << text << endl;
+ stream << "[" << KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) << "] " << text << endl;
}
} //namespace KDE
diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h
index e71f5071..f9fd92c8 100644
--- a/amarok/src/statusbar/statusBarBase.h
+++ b/amarok/src/statusbar/statusBarBase.h
@@ -52,7 +52,7 @@ namespace KDE
*
* statusbar->newProgressOperation( myObject )
* .setDescription( i18n("MyProgressOperation") )
- * .settqStatus( i18n("Stage1") )
+ * .setStatus( i18n("Stage1") )
* .setAbortSlot( myObject, TQT_SLOT(abort()) )
* .setTotalSteps( 100 );
*
@@ -93,7 +93,7 @@ namespace KDE
* @return the progressBar so you can configure its parameters
* @see setProgress( TQObject*, int )
* @see incrementProgress( TQObject* )
- * @see setProgresstqStatus( const TQObject*, const TQString& )
+ * @see setProgressStatus( const TQObject*, const TQString& )
*/
ProgressBar &newProgressOperation( TQObject *owner );
@@ -104,7 +104,7 @@ namespace KDE
void incrementProgressTotalSteps( const TQObject *owner, int inc = 1 );
void incrementProgress( const TQObject *owner );
- void setProgresstqStatus( const TQObject *owner, const TQString &text );
+ void setProgressStatus( const TQObject *owner, const TQString &text );
public slots:
/**
diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp
index 6d2c1e37..b611c0f8 100644
--- a/amarok/src/statusbar/statusbar.cpp
+++ b/amarok/src/statusbar/statusbar.cpp
@@ -65,8 +65,8 @@ StatusBar::StatusBar( TQWidget *parent, const char *name )
// total songs count
m_itemCountLabel = new TQLabel( this );
- m_itemCountLabel->tqsetAlignment( TQt::AlignCenter );
- m_itemCountLabel->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
+ m_itemCountLabel->setAlignment( TQt::AlignCenter );
+ m_itemCountLabel->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
//positionBox
TQWidget *positionBox = new TQWidget( this, "positionBox" );
diff --git a/amarok/src/statusbar/timeLabel.h b/amarok/src/statusbar/timeLabel.h
index 1acd0d3b..ec703b93 100644
--- a/amarok/src/statusbar/timeLabel.h
+++ b/amarok/src/statusbar/timeLabel.h
@@ -28,7 +28,7 @@ public:
TimeLabel( TQWidget *parent ) : TQLabel( " 0:00:00 ", parent )
{
setFont( KGlobalSettings::fixedFont() );
- tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
+ setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
}
virtual void mousePressEvent( TQMouseEvent * )
diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp
index 0f66a715..19e5a7fe 100644
--- a/amarok/src/tagdialog.cpp
+++ b/amarok/src/tagdialog.cpp
@@ -418,7 +418,7 @@ void TagDialog::init()
//m_labelCloud = new KHTMLPart( labels_favouriteLabelsFrame );
m_labelCloud = new HTMLView( labels_favouriteLabelsFrame );
- m_labelCloud->view()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false );
+ m_labelCloud->view()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored, false );
m_labelCloud->view()->setVScrollBarMode( TQScrollView::AlwaysOff );
m_labelCloud->view()->setHScrollBarMode( TQScrollView::AlwaysOff );
@@ -550,7 +550,7 @@ void TagDialog::init()
// make it as small as possible
- resize( tqsizeHint().width(), tqminimumSize().height() );
+ resize( sizeHint().width(), minimumSize().height() );
}
diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui
index 8ce0a726..0e256497 100644
--- a/amarok/src/tagdialogbase.ui
+++ b/amarok/src/tagdialogbase.ui
@@ -61,7 +61,7 @@
MinimumExpanding
-
+
215
30
@@ -169,13 +169,13 @@
pixmap_cover
-
+
100
100
-
+
85
85
@@ -217,7 +217,7 @@
Expanding
-
+
21
20
@@ -521,13 +521,13 @@
0
-
+
50
0
-
+
100
32767
@@ -641,7 +641,7 @@
Expanding
-
+
20
200
@@ -669,7 +669,7 @@
Expanding
-
+
431
20
@@ -747,7 +747,7 @@
labels_favouriteLabelsFrame
-
+
0
120
diff --git a/amarok/src/tagguesserconfigdialog.ui b/amarok/src/tagguesserconfigdialog.ui
index d99d254c..abe81601 100644
--- a/amarok/src/tagguesserconfigdialog.ui
+++ b/amarok/src/tagguesserconfigdialog.ui
@@ -149,7 +149,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
Expanding
-
+
20
60
diff --git a/amarok/src/threadmanager.cpp b/amarok/src/threadmanager.cpp
index 96d01c6e..71b59f38 100644
--- a/amarok/src/threadmanager.cpp
+++ b/amarok/src/threadmanager.cpp
@@ -369,7 +369,7 @@ ThreadManager::Job::setProgress( uint steps )
}
void
-ThreadManager::Job::settqStatus( const TQString &status )
+ThreadManager::Job::setStatus( const TQString &status )
{
m_status = status;
@@ -390,7 +390,7 @@ ThreadManager::Job::customEvent( TQCustomEvent *e )
switch( progress )
{
case -2:
- StatusBar::instance()->setProgresstqStatus( this, m_status );
+ StatusBar::instance()->setProgressStatus( this, m_status );
break;
case -1:
diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h
index 63c3d72d..22e2b5b4 100644
--- a/amarok/src/threadmanager.h
+++ b/amarok/src/threadmanager.h
@@ -287,7 +287,7 @@ public:
/**
* If you set progress information, you should set this too, changing it when appropriate
*/
- void settqStatus( const TQString &status );
+ void setStatus( const TQString &status );
/**
* This shows the progressBar too, the user will be able to abort
diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp
index c9bb2283..5feb6136 100644
--- a/amarok/src/tooltip.cpp
+++ b/amarok/src/tooltip.cpp
@@ -151,9 +151,9 @@ void Amarok::ToolTip::maybeTip( const TQPoint &pos )
void Amarok::ToolTip::showTip()
{
m_timer.start( 15000, true );
- if( !isVisible() || tqsizeHint() != size() )
+ if( !isVisible() || sizeHint() != size() )
{
- resize( tqsizeHint() );
+ resize( sizeHint() );
position();
}
if( !isVisible() )
@@ -176,9 +176,9 @@ void Amarok::ToolTip::drawContents( TQPainter *painter )
{
TQPixmap buf( width(), height() );
TQPainter p( &buf );
- buf.fill( tqcolorGroup().background() );
+ buf.fill( colorGroup().background() );
- p.setPen( tqcolorGroup().foreground() );
+ p.setPen( colorGroup().foreground() );
p.drawRect( buf.rect() );
TQSimpleRichText text( s_text, TQToolTip::parentWidget()->font() );
@@ -188,12 +188,12 @@ void Amarok::ToolTip::drawContents( TQPainter *painter )
: s_hack == 1 ? TQPoint(4, -2)
: TQPoint(2, -2); //HACK positioning
p.setFont( TQToolTip::parentWidget()->font() );
- text.draw( &p, pos.x(), pos.y(), rect(), tqcolorGroup() );
+ text.draw( &p, pos.x(), pos.y(), rect(), colorGroup() );
painter->drawPixmap( 0, 0, buf );
}
-TQSize Amarok::ToolTip::tqsizeHint() const
+TQSize Amarok::ToolTip::sizeHint() const
{
if( !s_rect.isNull() )
return s_rect.size();
@@ -208,7 +208,7 @@ TQSize Amarok::ToolTip::tqsizeHint() const
void Amarok::ToolTip::position()
{
const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
- const TQSize size = tqsizeHint();
+ const TQSize size = sizeHint();
const int width = size.width(), height = size.height();
TQPoint pos;
if( !s_rect.isNull() )
diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h
index 0ca9b92d..268d8302 100644
--- a/amarok/src/tooltip.h
+++ b/amarok/src/tooltip.h
@@ -65,7 +65,7 @@ private:
static Manager* s_manager;
public:
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
protected:
virtual void maybeTip( const TQPoint &pos );