diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp
index fa48d44c..a07904f3 100644
--- a/amarok/src/amarokcore/crashhandler.cpp
+++ b/amarok/src/amarokcore/crashhandler.cpp
@@ -265,10 +265,10 @@ namespace Amarok
Amarok::CrashHandlerWidget::CrashHandlerWidget()
{
- TQBoxLayout *tqlayout = new TQHBoxLayout( this, 18, 12 );
+ TQBoxLayout *layout = new TQHBoxLayout( this, 18, 12 );
{
- TQBoxLayout *lay = new TQVBoxLayout( tqlayout );
+ TQBoxLayout *lay = new TQVBoxLayout( layout );
TQLabel *label = new TQLabel( this );
label->setPixmap( locate( "data", "drkonqi/pics/konqi.png" ) );
label->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@@ -276,9 +276,9 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
lay->addItem( new TQSpacerItem( 3, 3, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
}
- tqlayout = new TQVBoxLayout( tqlayout, 6 );
+ layout = new TQVBoxLayout( layout, 6 );
- tqlayout->add( new TQLabel( /*i18n*/(
+ layout->add( new TQLabel( /*i18n*/(
"" "Amarok has crashed! We are terribly sorry about this :("
"
" "However you now have an opportunity to help us fix this crash so that it doesn't "
"happen again! Click Send Email and Amarok will prepare an email that you "
@@ -286,11 +286,11 @@ Amarok::CrashHandlerWidget::CrashHandlerWidget()
"as soon as possible."
"
" "Thanks for choosing Amarok.
" ), this ) );
- tqlayout = new TQHBoxLayout( tqlayout, 6 );
+ layout = new TQHBoxLayout( layout, 6 );
- tqlayout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
- tqlayout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
- tqlayout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
+ layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) );
+ layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) );
+ layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) );
static_cast(child("email"))->setDefault( true );
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 953a1d15..e6d75dea 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/amarok/src/analyzers/blockanalyzer.cpp
@@ -354,7 +354,7 @@ ensureContrast( const TQColor &bg, const TQColor &fg, uint _amount = 150 )
void
BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
{
- const TQColor bg = tqpalette().active().background();
+ const TQColor bg = palette().active().background();
const TQColor fg = ensureContrast( bg, KGlobalSettings::activeTitleColor() );
m_topBarPixmap.fill( fg );
@@ -372,11 +372,11 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
p.fillRect( 0, y*(HEIGHT+1), WIDTH, HEIGHT, TQColor( r+int(dr*y), g+int(dg*y), b+int(db*y) ) );
{
- const TQColor bg = tqpalette().active().background().dark( 112 );
+ const TQColor bg = palette().active().background().dark( 112 );
//make a complimentary fadebar colour
//TODO dark is not always correct, dumbo!
- int h,s,v; tqpalette().active().background().dark( 150 ).getHsv( &h, &s, &v );
+ int h,s,v; palette().active().background().dark( 150 ).getHsv( &h, &s, &v );
const TQColor fg( h + 120, s, v, TQColor::Hsv );
const double dr = fg.red() - bg.red();
@@ -386,7 +386,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
// Precalculate all fade-bar pixmaps
for( uint y = 0; y < FADE_SIZE; ++y ) {
- m_fade_bars[y].fill( tqpalette().active().background() );
+ m_fade_bars[y].fill( palette().active().background() );
TQPainter f( &m_fade_bars[y] );
for( int z = 0; (uint)z < m_rows; ++z ) {
const double Y = 1.0 - (log10( FADE_SIZE - y ) / log10( FADE_SIZE ));
@@ -401,7 +401,7 @@ BlockAnalyzer::paletteChange( const TQPalette& ) //virtual
void
BlockAnalyzer::drawBackground()
{
- const TQColor bg = tqpalette().active().background();
+ const TQColor bg = palette().active().background();
const TQColor bgdark = bg.dark( 112 );
background()->fill( bg );
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index e4e6d873..021bf50f 100644
--- a/amarok/src/app.cpp
+++ b/amarok/src/app.cpp
@@ -871,7 +871,7 @@ App::applyColorScheme()
else if( AmarokConfig::schemeAmarok() )
{
- group = TQApplication::tqpalette().active();
+ group = TQApplication::palette().active();
const TQColor bg( Amarok::blue );
AltBase.setRgb( 57, 64, 98 );
@@ -916,7 +916,7 @@ App::applyColorScheme()
{
// we try to be smart: this code figures out contrasting colors for
// selection and alternate background rows
- group = TQApplication::tqpalette().active();
+ group = TQApplication::palette().active();
const TQColor fg( AmarokConfig::playlistWindowFgColor() );
const TQColor bg( AmarokConfig::playlistWindowBgColor() );
diff --git a/amarok/src/atomicstring.cpp b/amarok/src/atomicstring.cpp
index ced1b89a..297f5b3c 100644
--- a/amarok/src/atomicstring.cpp
+++ b/amarok/src/atomicstring.cpp
@@ -82,7 +82,7 @@ TQString AtomicString::string() const
TQString AtomicString::deepCopy() const
{
if (m_string)
- return TQString( m_string->tqunicode(), m_string->length() );
+ return TQString( m_string->unicode(), m_string->length() );
return TQString();
}
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index 6018d087..1406a756 100644
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@@ -38,18 +38,18 @@ namespace Amarok
Splitter( BrowserBar *w ) : TQWidget( w, "divider" )
{
setCursor( TQCursor(SplitHCursor) );
- styleChange( tqstyle() );
+ styleChange( style() );
}
virtual void paintEvent( TQPaintEvent* )
{
TQPainter p( this );
- parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
+ parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
}
virtual void styleChange( TQStyle& )
{
- setFixedWidth( tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ) );
+ setFixedWidth( style().pixelMetric( TQStyle::PM_SplitterWidth, this ) );
}
virtual void mouseMoveEvent( TQMouseEvent *e )
@@ -94,9 +94,9 @@ BrowserBar::BrowserBar( TQWidget *parent )
m_tabBar->setFixedWidth( m_pos );
m_tabBar->move( 0, 25 );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( m_browserBox );
- tqlayout->addSpacing( 3 ); // aesthetics
- tqlayout->setAutoAdd( true );
+ TQVBoxLayout *layout = new TQVBoxLayout( m_browserBox );
+ layout->addSpacing( 3 ); // aesthetics
+ layout->setAutoAdd( true );
m_browserBox->move( m_pos, 0 );
m_browserBox->hide();
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index ecd219ef..25c4c494 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -4133,7 +4133,7 @@ CollectionView::removeDuplicatedHeaders()
{
if ( !current->text(0).at(0).isLetterOrNumber()
|| ( last->text(0).at(0).isLetterOrNumber()
- && current->text(0).at(0).tqunicode() > last->text(0).at(0).tqunicode() ) )
+ && current->text(0).at(0).unicode() > last->text(0).at(0).unicode() ) )
toDelete += current;
else
{
@@ -4366,7 +4366,7 @@ CollectionItem::paintCell ( TQPainter * painter, const TQColorGroup & cg,
TQPixmap buf( width, height() );
TQPainter p( &buf, true );
- const TQColorGroup _cg = listView()->tqpalette().active();
+ const TQColorGroup _cg = listView()->palette().active();
TQColor bg = isSelected() ? _cg.highlight()
: isAlternate() ? listView()->alternateBackground()
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 6ccc0d3a..1d35d9bd 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -278,8 +278,8 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album,
kapp->setTopWidget( this );
setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) );
- m_tqlayout = new TQHBoxLayout( this );
- m_tqlayout->setAutoAdd( true );
+ m_layout = new TQHBoxLayout( this );
+ m_layout->setAutoAdd( true );
m_pixmapViewer = new PixmapViewer( this, m_pixmap );
setFixedSize( m_pixmapViewer->maximalSize() );
diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h
index 704bb342..1c7680eb 100644
--- a/amarok/src/covermanager.h
+++ b/amarok/src/covermanager.h
@@ -160,7 +160,7 @@ class CoverViewDialog : public TQDialog {
CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent);
private:
- TQHBoxLayout *m_tqlayout;
+ TQHBoxLayout *m_layout;
TQPixmap m_pixmap;
PixmapViewer *m_pixmapViewer;
TQLabel *m_label;
diff --git a/amarok/src/dbsetup.ui b/amarok/src/dbsetup.ui
index 586dc4ad..f8186c08 100644
--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@@ -164,7 +164,7 @@