From 3a4c7b39c5c4fc40d38b9ef2048ef18a2960b66f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:03:39 -0600 Subject: [PATCH] Rename obsolete tq methods to standard names (cherry picked from commit d150aff2e735190ac2926f7509b1c8d2240dccfd) --- amarok/src/Options1.ui | 12 +++--- amarok/src/Options2.ui | 8 ++-- amarok/src/Options4.ui | 14 +++---- amarok/src/Options5.ui | 6 +-- amarok/src/Options8.ui | 4 +- amarok/src/amarokcore/crashhandler.cpp | 16 ++++---- amarok/src/analyzers/blockanalyzer.cpp | 10 ++--- amarok/src/app.cpp | 4 +- amarok/src/atomicstring.cpp | 2 +- amarok/src/browserbar.cpp | 12 +++--- amarok/src/collectionbrowser.cpp | 4 +- amarok/src/covermanager.cpp | 4 +- amarok/src/covermanager.h | 2 +- amarok/src/dbsetup.ui | 4 +- amarok/src/deletedialogbase.ui | 4 +- amarok/src/directorylist.cpp | 2 +- .../src/engine/helix/helix-configdialog.cpp | 6 +-- .../helix-include/common/include/hxcore.h | 4 +- .../helix-include/common/include/hxwin.h | 10 ++--- amarok/src/engine/nmm/nmm_configdialogbase.ui | 6 +-- amarok/src/engine/xine/xineconfigbase.ui | 20 +++++----- amarok/src/htmlview.cpp | 4 +- .../magnatunepurchasedialogbase.ui | 2 +- amarok/src/mediadevice/daap/addhostbase.ui | 4 +- .../generic/genericmediadeviceconfigdialog.ui | 16 ++++---- amarok/src/metabundle.cpp | 6 +-- amarok/src/metadata/m4a/mp4mvhdbox.cpp | 2 +- amarok/src/metadata/m4a/mp4mvhdbox.h | 2 +- amarok/src/multitabbar.cpp | 4 +- amarok/src/organizecollectiondialog.ui | 6 +-- amarok/src/osd.cpp | 2 +- amarok/src/playerwindow.cpp | 2 +- amarok/src/playlist.cpp | 30 +++++++-------- amarok/src/playlistbrowseritem.cpp | 2 +- amarok/src/playlistitem.cpp | 4 +- amarok/src/playlistselection.cpp | 2 +- amarok/src/prettypopupmenu.cpp | 6 +-- amarok/src/qstringx.h | 2 +- .../databasescripts/databaseScripts.rb | 26 ++++++------- amarok/src/scripts/graphequalizer/eqdialog.ui | 6 +-- amarok/src/sqlite/sqlite3.c | 38 +++++++++---------- amarok/src/statistics.cpp | 2 +- amarok/src/statusbar/popupMessage.cpp | 8 ++-- amarok/src/statusbar/popupMessage.h | 2 +- amarok/src/statusbar/statusBarBase.cpp | 20 +++++----- amarok/src/statusbar/statusBarBase.h | 2 +- amarok/src/statusbar/statusbar.cpp | 12 +++--- amarok/src/tagdialog.cpp | 2 +- amarok/src/tagdialogbase.ui | 10 ++--- amarok/src/transferdialog.cpp | 12 +++--- 50 files changed, 195 insertions(+), 195 deletions(-) diff --git a/amarok/src/Options1.ui b/amarok/src/Options1.ui index db15d0d3..dbee4891 100644 --- a/amarok/src/Options1.ui +++ b/amarok/src/Options1.ui @@ -74,7 +74,7 @@ - tqlayout5 + layout5 @@ -132,7 +132,7 @@ - tqlayout4 + layout4 @@ -199,7 +199,7 @@ - tqlayout7 + layout7 @@ -265,7 +265,7 @@ - tqlayout8 + layout8 @@ -443,7 +443,7 @@ - tqlayout8_2_2 + layout8_2_2 @@ -527,7 +527,7 @@ - tqlayout7_2_2 + layout7_2_2 diff --git a/amarok/src/Options2.ui b/amarok/src/Options2.ui index c29a6cb6..bbca4945 100644 --- a/amarok/src/Options2.ui +++ b/amarok/src/Options2.ui @@ -282,7 +282,7 @@ - tqlayout2 + layout2 @@ -528,7 +528,7 @@ - tqlayout5 + layout5 @@ -576,7 +576,7 @@ - tqlayout6 + layout6 @@ -616,7 +616,7 @@ - tqlayout5 + layout5 diff --git a/amarok/src/Options4.ui b/amarok/src/Options4.ui index 23bd8271..fe777f1f 100644 --- a/amarok/src/Options4.ui +++ b/amarok/src/Options4.ui @@ -75,7 +75,7 @@ - tqlayout11 + layout11 @@ -158,7 +158,7 @@ - tqlayout9 + layout9 @@ -166,7 +166,7 @@ - tqlayout7 + layout7 @@ -232,7 +232,7 @@ - tqlayout8 + layout8 @@ -454,7 +454,7 @@ - tqlayout9_2 + layout9_2 @@ -462,7 +462,7 @@ - tqlayout7_2 + layout7_2 @@ -500,7 +500,7 @@ - tqlayout8_2 + layout8_2 diff --git a/amarok/src/Options5.ui b/amarok/src/Options5.ui index afea6452..9f3f556d 100644 --- a/amarok/src/Options5.ui +++ b/amarok/src/Options5.ui @@ -38,7 +38,7 @@ - tqlayout2 + layout2 @@ -142,7 +142,7 @@ - tqlayout3 + layout3 @@ -167,7 +167,7 @@ - tqlayout1 + layout1 diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui index b4d9c1dc..82e4fb70 100644 --- a/amarok/src/Options8.ui +++ b/amarok/src/Options8.ui @@ -30,7 +30,7 @@ - tqlayout2 + layout2 @@ -111,7 +111,7 @@ - tqlayout3 + layout3 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 @@ - tqlayout4 + layout4 @@ -343,7 +343,7 @@ - tqlayout4 + layout4 diff --git a/amarok/src/deletedialogbase.ui b/amarok/src/deletedialogbase.ui index 7d0c9590..bd4e2a5c 100644 --- a/amarok/src/deletedialogbase.ui +++ b/amarok/src/deletedialogbase.ui @@ -27,7 +27,7 @@ - tqlayout4 + layout4 @@ -51,7 +51,7 @@ - tqlayout3 + layout3 diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp index 4eaab516..78cf15d3 100644 --- a/amarok/src/directorylist.cpp +++ b/amarok/src/directorylist.cpp @@ -309,7 +309,7 @@ Item::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, p->setFont( font ); } - TQCheckListItem::paintCell( p, isDisabled() ? listView()->tqpalette().disabled() : _cg, column, width, align ); + TQCheckListItem::paintCell( p, isDisabled() ? listView()->palette().disabled() : _cg, column, width, align ); p->setFont( f ); } diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp index 3c8a1668..f8c1df7a 100644 --- a/amarok/src/engine/helix/helix-configdialog.cpp +++ b/amarok/src/engine/helix/helix-configdialog.cpp @@ -53,7 +53,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, , m_valueChanged( false ) , m_stringValue( defaultvalue ) { - TQGridLayout *grid = (TQGridLayout*)parent->tqlayout(); + TQGridLayout *grid = (TQGridLayout*)parent->layout(); m_w = new KLineEdit( m_stringValue, parent ); connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) ); @@ -79,7 +79,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent, , m_valueChanged( false ) , m_stringValue( defaultvalue ) { - TQGridLayout *grid = (TQGridLayout*)parent->tqlayout(); + TQGridLayout *grid = (TQGridLayout*)parent->layout(); m_key = str; @@ -110,7 +110,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent, HelixEngine *engine ) : deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine) { - TQGridLayout *grid = (TQGridLayout*)parent->tqlayout(); + TQGridLayout *grid = (TQGridLayout*)parent->layout(); deviceComboBox = new KComboBox( false, parent, "deviceComboBox" ); deviceComboBox->insertItem("oss"); // I believe these are not subject to translation (they don't seem to be in xine, 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 80cdc30b..4d6d7178 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h @@ -1129,7 +1129,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * Method: * IHXLayoutStream::GetProperty * Purpose: - * Get tqlayout stream property + * Get layout stream property * * */ @@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown) * Method: * IHXLayoutStream::SetProperty * Purpose: - * Set tqlayout stream property + * Set layout stream property * */ STDTQT_METHOD(SetProperties) (THIS_ diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h index c70a3cb1..1ccba13b 100644 --- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h +++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h @@ -614,9 +614,9 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * Method: * IHXSiteSupplier::BeginChangeLayout * Purpose: - * Called to inform the site supplier a tqlayout change has beginning + * Called to inform the site supplier a layout change has beginning * it can expect to receive SitesNeeded() and SitesNotNeeded() calls - * while a tqlayout change is in progress, + * while a layout change is in progress, */ STDTQT_METHOD(BeginChangeLayout) (THIS) PURE; @@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * Method: * IHXSiteSupplier::DoneChangeLayout * Purpose: - * Called to inform the site supplier the tqlayout change has been + * Called to inform the site supplier the layout change has been * completed. */ STDTQT_METHOD(DoneChangeLayout) (THIS) PURE; @@ -642,7 +642,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown) * * Interface implemented by the client core. This interface is called * by users of the client core to inform it of IHXSite's which are - * available for tqlayout of renderers + * available for layout of renderers * * IID_IHXSiteManager: * @@ -923,7 +923,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown) * * Purpose: * - * Allow tqlayout site groups to be added and removed + * Allow layout site groups to be added and removed * * IID_IHXLayoutSiteGroupManager: * diff --git a/amarok/src/engine/nmm/nmm_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui index ca8a7b92..c716be9c 100644 --- a/amarok/src/engine/nmm/nmm_configdialogbase.ui +++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui @@ -21,7 +21,7 @@ - tqlayout6 + layout6 @@ -130,7 +130,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a - tqlayout5 + layout5 @@ -159,7 +159,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a - tqlayout13 + layout13 diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui index 7e55162a..50e87bbf 100644 --- a/amarok/src/engine/xine/xineconfigbase.ui +++ b/amarok/src/engine/xine/xineconfigbase.ui @@ -32,7 +32,7 @@ - tqlayout11 + layout11 @@ -74,7 +74,7 @@ - tqlayout10 + layout10 @@ -82,7 +82,7 @@ - tqlayout10 + layout10 @@ -90,7 +90,7 @@ - tqlayout2 + layout2 @@ -241,7 +241,7 @@ - tqlayout5 + layout5 @@ -278,7 +278,7 @@ - tqlayout4 + layout4 @@ -318,7 +318,7 @@ - tqlayout2 + layout2 @@ -376,7 +376,7 @@ - tqlayout11 + layout11 @@ -419,7 +419,7 @@ - tqlayout12 + layout12 @@ -435,7 +435,7 @@ - tqlayout10 + layout10 diff --git a/amarok/src/htmlview.cpp b/amarok/src/htmlview.cpp index 4f63a5d6..382cafcc 100644 --- a/amarok/src/htmlview.cpp +++ b/amarok/src/htmlview.cpp @@ -83,8 +83,8 @@ HTMLView::copyText() TQString text = selectedText(); // Copy both to clipboard and X11-selection - TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); + TQApplication::clipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( text, TQClipboard::Selection ); } void HTMLView::paletteChange() { diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui index 1b8dba3b..801226f3 100644 --- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui +++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui @@ -158,7 +158,7 @@ - tqlayout2 + layout2 diff --git a/amarok/src/mediadevice/daap/addhostbase.ui b/amarok/src/mediadevice/daap/addhostbase.ui index 1f1566ca..3df6bb40 100644 --- a/amarok/src/mediadevice/daap/addhostbase.ui +++ b/amarok/src/mediadevice/daap/addhostbase.ui @@ -24,7 +24,7 @@ - tqlayout4 + layout4 @@ -95,7 +95,7 @@ - tqlayout5 + layout5 diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui index 38e52848..e3468e17 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui @@ -35,7 +35,7 @@ - tqlayout88 + layout88 @@ -88,7 +88,7 @@ - tqlayout24 + layout24 @@ -96,7 +96,7 @@ - tqlayout23 + layout23 @@ -133,7 +133,7 @@ - tqlayout19 + layout19 @@ -221,7 +221,7 @@ - tqlayout120 + layout120 @@ -229,7 +229,7 @@ - tqlayout119 + layout119 @@ -277,7 +277,7 @@ - tqlayout96 + layout96 @@ -293,7 +293,7 @@ - tqlayout86 + layout86 diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp index 1159fe20..8ac01799 100644 --- a/amarok/src/metabundle.cpp +++ b/amarok/src/metabundle.cpp @@ -1509,7 +1509,7 @@ MetaBundle::save( TagLib::FileRef* fileref ) // QT's version encodeAttr is 1) private to TQDom, and 2) a litte slow. This // one can be made public if needed. It happens to be on a critical path // (each char of playlist / undo save). TQStyleSheet::escape does not deal with -// tqunicode chars illegal for XML. There's a lot of junk in those tags +// unicode chars illegal for XML. There's a lot of junk in those tags static inline void xmlEncode(TQTextStream &stream, const TQString &str) { TQString tmp; @@ -1517,7 +1517,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) uint i = 0; while ( i < cur->length() ) { - uint uc = (*cur)[i].tqunicode(); + uint uc = (*cur)[i].unicode(); // we try to accumulate unescaped chars before writing to stream const char *escaped; // careful about the order of tests, common before less common @@ -1530,7 +1530,7 @@ static inline void xmlEncode(TQTextStream &stream, const TQString &str) else if ( uc == '"' ) escaped = """; else { - // see if it's a XML-valid tqunicode char at all + // see if it's a XML-valid unicode char at all if ( (0x20 <= uc && uc <= 0xD7FF || 0xE000 <= uc && uc <= 0xFFFD || uc == 0x9 || uc == 0xA || uc == 0xD) ) // fairly common, other ascii chars diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.cpp b/amarok/src/metadata/m4a/mp4mvhdbox.cpp index 894f7f89..36053e4b 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.cpp +++ b/amarok/src/metadata/m4a/mp4mvhdbox.cpp @@ -39,7 +39,7 @@ public: TagLib::uint timescale; //! duration of presentation TagLib::ulonglong duration; - //! ptqlayout speed + //! playout speed TagLib::uint rate; //! volume for entire presentation TagLib::uint volume; diff --git a/amarok/src/metadata/m4a/mp4mvhdbox.h b/amarok/src/metadata/m4a/mp4mvhdbox.h index 31e3d740..b133485e 100644 --- a/amarok/src/metadata/m4a/mp4mvhdbox.h +++ b/amarok/src/metadata/m4a/mp4mvhdbox.h @@ -44,7 +44,7 @@ namespace TagLib uint timescale() const; //! function to get the presentation duration in the mp4 file ulonglong duration() const; - //! function to get the rate (ptqlayout speed) - typically 1.0; + //! function to get the rate (playout speed) - typically 1.0; uint rate() const; //! function to get volume level for presentation - typically 1.0; uint volume() const; diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index 2f2082d0..19546a37 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -687,7 +687,7 @@ TQSize MultiTabBarButton::sizeHint() const } #endif if ( isMenuButton() ) - w += tqstyle().pixelMetric( TQStyle::PM_MenuButtonIndicator, this ); + w += style().pixelMetric( TQStyle::PM_MenuButtonIndicator, this ); if ( pixmap() ) { TQPixmap * pm = const_cast< TQPixmap * >( pixmap() ); @@ -714,7 +714,7 @@ TQSize MultiTabBarButton::sizeHint() const // h = ( parentWidget()->width() - 3 ) / NUM_TABS; // } - return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). + return ( style().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ). expandedTo( TQApplication::globalStrut() ) ); } diff --git a/amarok/src/organizecollectiondialog.ui b/amarok/src/organizecollectiondialog.ui index 96cc8f15..1f9548ef 100644 --- a/amarok/src/organizecollectiondialog.ui +++ b/amarok/src/organizecollectiondialog.ui @@ -81,7 +81,7 @@ - tqlayout5 + layout5 @@ -305,7 +305,7 @@ - tqlayout4 + layout4 @@ -404,7 +404,7 @@ - tqlayout7 + layout7 diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp index 0cab554f..68dc2d32 100644 --- a/amarok/src/osd.cpp +++ b/amarok/src/osd.cpp @@ -580,7 +580,7 @@ OSDWidget::mousePressEvent( TQMouseEvent* ) void OSDWidget::unsetColors() { - const TQColorGroup c = TQApplication::tqpalette().active(); + const TQColorGroup c = TQApplication::palette().active(); setPaletteForegroundColor( c.highlightedText() ); setPaletteBackgroundColor( c.highlight() ); diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp index af3ea5ad..250276fe 100644 --- a/amarok/src/playerwindow.cpp +++ b/amarok/src/playerwindow.cpp @@ -127,7 +127,7 @@ PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlayl setFont( font ); { // - //NOTE we use a tqlayout for the buttons so resizing will be possible + //NOTE we use a layout for the buttons so resizing will be possible m_pFrameButtons = createWidget( TQRect(0, 118, 311, 22), this ); KActionCollection *ac =Amarok::actionCollection(); diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index c63fb826..a1330744 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -3526,8 +3526,8 @@ Playlist::copyToClipboard( const TQListViewItem *item ) const //SLOT text.append( " :: " + playlistItem->url().url() ); // Copy both to clipboard and X11-selection - TQApplication::tqclipboard()->setText( text, TQClipboard::Clipboard ); - TQApplication::tqclipboard()->setText( text, TQClipboard::Selection ); + TQApplication::clipboard()->setText( text, TQClipboard::Clipboard ); + TQApplication::clipboard()->setText( text, TQClipboard::Selection ); Amarok::OSD::instance()->OSDWidget::show( i18n( "Copied: %1" ).arg( text ), TQImage(CollectionDB::instance()->albumImage(*playlistItem )) ); @@ -4579,7 +4579,7 @@ Playlist::slotMouseButtonPressed( int button, TQListViewItem *after, const TQPoi { case Qt::MidButton: { - const TQString path = TQApplication::tqclipboard()->text( TQClipboard::Selection ); + const TQString path = TQApplication::clipboard()->text( TQClipboard::Selection ); const KURL url = KURL::fromPathOrURL( path ); if( url.isValid() ) @@ -4790,7 +4790,7 @@ Playlist::showTagDialog( TQPtrList items ) lineEdit2 = new TQLineEdit( this, "Command" ); groupBox1 = new TQGroupBox( 1, Qt::Vertical, i18n( "Examples" ), this ); - groupBox1->tqlayout()->setMargin( 11 ); + groupBox1->layout()->setMargin( 11 ); new KActiveLabel( i18n( "file --brief %f\n" "ls -sh %f\n" "basename %f\n" "dirname %f" ), groupBox1 ); // buddies @@ -4798,22 +4798,22 @@ Playlist::showTagDialog( TQPtrList items ) textLabel3->setBuddy( lineEdit2 ); // layouts - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 ); - tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); - tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); - tqlayout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) ); + TQHBoxLayout *layout1 = new TQHBoxLayout( 0, 0, 6 ); + layout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); + layout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) ); + layout1->addWidget( new KPushButton( KStdGuiItem::cancel(), this, "CancelButton" ) ); - TQGridLayout *tqlayout2 = new TQGridLayout( 0, 2, 2, 0, 6 ); - tqlayout2->TQLayout::add( textLabel2 ); - tqlayout2->TQLayout::add( lineEdit1 ); - tqlayout2->TQLayout::add( textLabel3 ); - tqlayout2->TQLayout::add( lineEdit2 ); + TQGridLayout *layout2 = new TQGridLayout( 0, 2, 2, 0, 6 ); + layout2->TQLayout::add( textLabel2 ); + layout2->TQLayout::add( lineEdit1 ); + layout2->TQLayout::add( textLabel3 ); + layout2->TQLayout::add( lineEdit2 ); TQVBoxLayout *Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); Form1Layout->addWidget( textLabel1 ); Form1Layout->addWidget( groupBox1 ); - Form1Layout->addLayout( tqlayout2 ); - Form1Layout->addLayout( tqlayout1 ); + Form1Layout->addLayout( layout2 ); + Form1Layout->addLayout( layout1 ); Form1Layout->addItem( new TQSpacerItem( 20, 231, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); // properties diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 340b1883..3896843c 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -3147,7 +3147,7 @@ TQString SmartPlaylist::query() { if ( m_sqlForTags.isEmpty() ) m_sqlForTags = xmlToQuery( m_xml ); // duplicate string, thread-safely (TQDeepCopy is not thread-safe) - return TQString( m_sqlForTags.tqunicode(), m_sqlForTags.length() ) + return TQString( m_sqlForTags.unicode(), m_sqlForTags.length() ) .replace( "(*CurrentTimeT*)" , TQString::number(TQDateTime::currentDateTime().toTime_t()) ) .replace( "(*ListOfFields*)" , QueryBuilder::dragSQLFields() ) diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp index a8ee9e30..a4194502 100644 --- a/amarok/src/playlistitem.cpp +++ b/amarok/src/playlistitem.cpp @@ -690,8 +690,8 @@ void PlaylistItem::paintCell( TQPainter *painter, const TQColorGroup &cg, int co else { const TQColorGroup _cg = ( !exists() || !isEnabled() ) - ? listView()->tqpalette().disabled() - : listView()->tqpalette().active(); + ? listView()->palette().disabled() + : listView()->palette().active(); TQColor bg = isSelected() ? _cg.highlight() : isAlternate() ? listView()->alternateBackground() diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp index 76e10a8b..a78b1dbf 100644 --- a/amarok/src/playlistselection.cpp +++ b/amarok/src/playlistselection.cpp @@ -123,7 +123,7 @@ namespace ConfigDynamic else //if its a suggested song or a random mix... { nd->selectPlaylist->hide(); - nd->tqlayout()->remove( nd->selectPlaylist ); + nd->layout()->remove( nd->selectPlaylist ); // don't allow editing the name of the default random and suggested dynamics nd->m_name->hide(); nd->m_playlistName_label->hide(); diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp index eb4ee1ee..1e6f6926 100644 --- a/amarok/src/prettypopupmenu.cpp +++ b/amarok/src/prettypopupmenu.cpp @@ -75,8 +75,8 @@ PrettyPopupMenu::calcPixmapColor() KConfig *config = KGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::tqpalette().active().highlight(); -// TQColor activeTitle = TQApplication::tqpalette().active().background(); -// TQColor inactiveTitle = TQApplication::tqpalette().inactive().background(); +// TQColor activeTitle = TQApplication::palette().active().background(); +// TQColor inactiveTitle = TQApplication::palette().inactive().background(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); TQColor inactiveTitle = config->readColorEntry("inactiveBackground", &color); @@ -174,7 +174,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e ) drawContents( &p ); - tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, + style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); diff --git a/amarok/src/qstringx.h b/amarok/src/qstringx.h index ac5dca63..76c6389b 100644 --- a/amarok/src/qstringx.h +++ b/amarok/src/qstringx.h @@ -21,7 +21,7 @@ public: QStringx( TQChar ch ) : TQString( ch ) {}; QStringx( const TQString& s ) : TQString( s ) {}; QStringx( const TQByteArray& ba ) : TQString( ba ) {}; - QStringx( const TQChar* tqunicode, uint length ) : TQString( tqunicode, length ) {}; + QStringx( const TQChar* unicode, uint length ) : TQString( unicode, length ) {}; QStringx( const char* str ) : TQString( str ) {}; virtual ~QStringx() {}; diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb index 7a5a4c39..adef97b3 100644 --- a/amarok/src/scripts/databasescripts/databaseScripts.rb +++ b/amarok/src/scripts/databasescripts/databaseScripts.rb @@ -38,36 +38,36 @@ class DatabaseScriptChooser < Qt::Dialog @Form1Layout = Qt::GridLayout.new(self, 1, 1, 2, 2, 'Form1Layout') - @tqlayout3 = Qt::VBoxLayout.new(nil, 0, 2, 'tqlayout3') + @layout3 = Qt::VBoxLayout.new(nil, 0, 2, 'layout3') @m_optionCombo = Qt::ComboBox.new(false, self, "m_optionCombo") - @tqlayout3.addWidget(@m_optionCombo) + @layout3.addWidget(@m_optionCombo) - @tqlayout1 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout1') + @layout1 = Qt::HBoxLayout.new(nil, 0, 2, 'layout1') @m_saveText = Qt::Label.new(self, "m_saveText") - @tqlayout1.addWidget(@m_saveText) + @layout1.addWidget(@m_saveText) @m_saveDir = KDE::URLRequester.new(self, "m_saveDir") @m_saveDir.setMode( KDE::File::Directory | KDE::File::ExistingOnly ); @m_saveDir.setURL( ENV["HOME"] ) - @tqlayout1.addWidget(@m_saveDir) - @tqlayout3.addLayout(@tqlayout1) + @layout1.addWidget(@m_saveDir) + @layout3.addLayout(@layout1) @spacer1 = Qt::SpacerItem.new(20, 21, Qt::SizePolicy::Minimum, Qt::SizePolicy::Expanding) - @tqlayout3.addItem(@spacer1) + @layout3.addItem(@spacer1) - @tqlayout2 = Qt::HBoxLayout.new(nil, 0, 2, 'tqlayout2') + @layout2 = Qt::HBoxLayout.new(nil, 0, 2, 'layout2') @m_cancelButton = Qt::PushButton.new(self, "@m_cancelButton") - @tqlayout2.addWidget(@m_cancelButton) + @layout2.addWidget(@m_cancelButton) @spacer2 = Qt::SpacerItem.new(61, 20, Qt::SizePolicy::Expanding, Qt::SizePolicy::Minimum) - @tqlayout2.addItem(@spacer2) + @layout2.addItem(@spacer2) @m_okayButton = Qt::PushButton.new(self, "m_okayButton") - @tqlayout2.addWidget(@m_okayButton) - @tqlayout3.addLayout(@tqlayout2) + @layout2.addWidget(@m_okayButton) + @layout3.addLayout(@layout2) connect( @m_optionCombo, SIGNAL( "activated(int)" ), self, SLOT( "optionChanged(int)" ) ); connect( @m_okayButton, SIGNAL( "clicked()" ), self, SLOT( "accept()" ) ) @@ -76,7 +76,7 @@ class DatabaseScriptChooser < Qt::Dialog connect( @m_saveDir, SIGNAL( "textChanged(const QString &)" ), self, SLOT( "textChanged(const QString &)" ) ); - @Form1Layout.addLayout(@tqlayout3, 0, 0) + @Form1Layout.addLayout(@layout3, 0, 0) languageChange() resize( Qt::Size.new(356, 137).expandedTo(minimumSizeHint()) ) diff --git a/amarok/src/scripts/graphequalizer/eqdialog.ui b/amarok/src/scripts/graphequalizer/eqdialog.ui index 11ec9e57..ef2e1b16 100644 --- a/amarok/src/scripts/graphequalizer/eqdialog.ui +++ b/amarok/src/scripts/graphequalizer/eqdialog.ui @@ -54,7 +54,7 @@ - tqlayout7 + layout7 @@ -70,7 +70,7 @@ - tqlayout3 + layout3 @@ -78,7 +78,7 @@ - tqlayout2 + layout2 diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index be0650c1..1d55403b 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -5956,7 +5956,7 @@ extern const unsigned char sqlite3UtfTrans1[]; ** invalid characters. ** ** * These routines accept an infinite number of different UTF8 encodings -** for tqunicode values 0x80 and greater. They do not change over-length +** for unicode values 0x80 and greater. They do not change over-length ** encodings to 0xfffd as some systems recommend. ** */ @@ -9466,7 +9466,7 @@ typedef struct Mem Mem; ** No other flags may be set in this case. ** ** If the MEM_Str flag is set then Mem.z points at a string representation. -** Usually this is encoded in the same tqunicode encoding as the main +** Usually this is encoded in the same unicode encoding as the main ** database (see below for exceptions). If the MEM_Term flag is also ** set, then the string is nul terminated. The MEM_Int and MEM_Real ** flags may coexist with the MEM_Str flag. @@ -10100,10 +10100,10 @@ SQLITE_PRIVATE int sqlite3VdbeMemHandleBom(Mem *pMem){ #endif /* SQLITE_OMIT_UTF16 */ /* -** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero, -** return the number of tqunicode characters in pZ up to (but not including) +** pZ is a UTF-8 encoded unicode string. If nByte is less than zero, +** return the number of unicode characters in pZ up to (but not including) ** the first 0x00 byte. If nByte is not less than zero, return the -** number of tqunicode characters in the first nByte of pZ (or up to +** number of unicode characters in the first nByte of pZ (or up to ** the first 0x00, whichever comes first). */ SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *zIn, int nByte){ @@ -10142,10 +10142,10 @@ SQLITE_PRIVATE char *sqlite3Utf16to8(const void *z, int nByte){ } /* -** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero, +** pZ is a UTF-16 encoded unicode string. If nChar is less than zero, ** return the number of bytes up to (but not including), the first pair ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero, -** then return the number of bytes in the first nChar tqunicode characters +** then return the number of bytes in the first nChar unicode characters ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first). */ SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *zIn, int nChar){ @@ -16229,7 +16229,7 @@ int sqlite3_os_type = 0; #endif /* OS_WINCE */ /* -** Convert a UTF-8 string to microsoft tqunicode (UTF-16?). +** Convert a UTF-8 string to microsoft unicode (UTF-16?). ** ** Space to hold the returned string is obtained from sqliteMalloc. */ @@ -16251,10 +16251,10 @@ static WCHAR *utf8ToUnicode(const char *zFilename){ } /* -** Convert microsoft tqunicode to UTF-8. Space to hold the returned string is +** Convert microsoft unicode to UTF-8. Space to hold the returned string is ** obtained from sqliteMalloc(). */ -static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ +static char *unicodeToUtf8(const WCHAR *zWideFilename){ int nByte; char *zFilename; @@ -16273,7 +16273,7 @@ static char *tqunicodeToUtf8(const WCHAR *zWideFilename){ } /* -** Convert an ansi string to microsoft tqunicode, based on the +** Convert an ansi string to microsoft unicode, based on the ** current codepage settings for file apis. ** ** Space to hold the returned string is obtained @@ -16298,13 +16298,13 @@ static WCHAR *mbcsToUnicode(const char *zFilename){ } /* -** Convert microsoft tqunicode to multibyte character string, based on the +** Convert microsoft unicode to multibyte character string, based on the ** user's Ansi codepage. ** ** Space to hold the returned string is obtained from ** sqliteMalloc(). */ -static char *tqunicodeToMbcs(const WCHAR *zWideFilename){ +static char *unicodeToMbcs(const WCHAR *zWideFilename){ int nByte; char *zFilename; int codepage = AreFileApisANSI() ? CP_ACP : CP_OEMCP; @@ -16335,7 +16335,7 @@ static char *mbcsToUtf8(const char *zFilename){ if( zTmpWide==0 ){ return 0; } - zFilenameUtf8 = tqunicodeToUtf8(zTmpWide); + zFilenameUtf8 = unicodeToUtf8(zTmpWide); sqliteFree(zTmpWide); return zFilenameUtf8; } @@ -16352,7 +16352,7 @@ static char *utf8ToMbcs(const char *zFilename){ if( zTmpWide==0 ){ return 0; } - zFilenameMbcs = tqunicodeToMbcs(zTmpWide); + zFilenameMbcs = unicodeToMbcs(zTmpWide); sqliteFree(zTmpWide); return zFilenameMbcs; } @@ -17025,7 +17025,7 @@ SQLITE_PRIVATE int sqlite3WinTempFileName(char *zBuf){ char *zMulti; WCHAR zWidePath[SQLITE_TEMPNAME_SIZE]; GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath); - zMulti = tqunicodeToUtf8(zWidePath); + zMulti = unicodeToUtf8(zWidePath); if( zMulti ){ strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30); zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0; @@ -17513,7 +17513,7 @@ SQLITE_PRIVATE char *sqlite3WinFullPathname(const char *zRelative){ } GetFullPathNameW((WCHAR*)zConverted, nByte, zTemp, 0); sqliteFree(zConverted); - zFull = tqunicodeToUtf8(zTemp); + zFull = unicodeToUtf8(zTemp); sqliteFree(zTemp); }else{ char *zTemp; @@ -53685,7 +53685,7 @@ static int sqlite3Prepare16( if( zTail8 && pzTail ){ /* If sqlite3_prepare returns a tail pointer, we calculate the - ** equivalent pointer into the UTF-16 string by counting the tqunicode + ** equivalent pointer into the UTF-16 string by counting the unicode ** characters between zSql8 and zTail8, and then returning a pointer ** the same number of characters into the UTF-16 string. */ @@ -67205,7 +67205,7 @@ SQLITE_API const char *sqlite3_errmsg(sqlite3 *db){ ** error. */ SQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){ - /* Because all the characters in the string are in the tqunicode + /* Because all the characters in the string are in the unicode ** range 0x00-0xFF, if we pad the big-endian string with a ** zero byte, we can obtain the little-endian string with ** &big_endian[1]. diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index 6277d629..01cd0fd2 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -930,7 +930,7 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col if( showDetails ) { - const TQColorGroup _cg = listView()->tqpalette().disabled(); + const TQColorGroup _cg = listView()->palette().disabled(); text_x = lv->treeStepSize() + 3; font.setItalic( true ); pBuf.setPen( isSelected() ? _cg.highlightedText() : TQColor(_cg.text().dark()) ); diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp index 0450b86a..efd04b72 100644 --- a/amarok/src/statusbar/popupMessage.cpp +++ b/amarok/src/statusbar/popupMessage.cpp @@ -62,9 +62,9 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con TQLabel *label; KActiveLabel *alabel; - m_tqlayout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); + m_layout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); - hbox = new TQHBoxLayout( m_tqlayout, 12 ); + hbox = new TQHBoxLayout( m_layout, 12 ); hbox->addWidget( m_countdownFrame = new TQFrame( this, "counterVisual" ) ); m_countdownFrame->setFixedWidth( fontMetrics().width( "X" ) ); @@ -81,7 +81,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con hbox->add( alabel ); - hbox = new TQHBoxLayout( m_tqlayout ); + hbox = new TQHBoxLayout( m_layout ); hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); hbox->add( new KPushButton( KStdGuiItem::close(), this, "closeButton" ) ); @@ -91,7 +91,7 @@ PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, con void PopupMessage::addWidget( TQWidget *widget ) { - m_tqlayout->add( widget ); + m_layout->add( widget ); adjustSize(); } diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h index e23b7a39..3ce0627e 100644 --- a/amarok/src/statusbar/popupMessage.h +++ b/amarok/src/statusbar/popupMessage.h @@ -85,7 +85,7 @@ namespace KDE void slideMask(); private: - TQVBoxLayout *m_tqlayout; + TQVBoxLayout *m_layout; TQFrame *m_countdownFrame; TQWidget *m_anchor; TQWidget *m_parent; diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp index 1950b5de..957e7a77 100644 --- a/amarok/src/statusbar/statusBarBase.cpp +++ b/amarok/src/statusbar/statusBarBase.cpp @@ -86,10 +86,10 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) : TQWidget( parent, name ) , m_logCounter( -1 ) { - TQBoxLayout *maintqlayout = new TQHBoxLayout( this, 2, /*spacing*/5 ); + TQBoxLayout *mainlayout = new TQHBoxLayout( this, 2, /*spacing*/5 ); //we need extra spacing due to the way we paint the surrounding boxes - TQBoxLayout *tqlayout = new TQHBoxLayout( maintqlayout, /*spacing*/5 ); + TQBoxLayout *layout = new TQHBoxLayout( mainlayout, /*spacing*/5 ); TQHBox *statusBarTextBox = new TQHBox( this, "statusBarTextBox" ); m_mainTextLabel = new KDE::SqueezedTextLabel( statusBarTextBox, "mainTextLabel" ); @@ -103,15 +103,15 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) mainProgressBarBox->setSpacing( 2 ); mainProgressBarBox->hide(); - tqlayout->add( statusBarTextBox ); - tqlayout->add( mainProgressBarBox ); - tqlayout->setStretchFactor( statusBarTextBox, 3 ); - tqlayout->setStretchFactor( mainProgressBarBox, 1 ); + layout->add( statusBarTextBox ); + layout->add( mainProgressBarBox ); + layout->setStretchFactor( statusBarTextBox, 3 ); + layout->setStretchFactor( mainProgressBarBox, 1 ); - m_otherWidgetLayout = new TQHBoxLayout( maintqlayout, /*spacing*/5 ); + m_otherWidgetLayout = new TQHBoxLayout( mainlayout, /*spacing*/5 ); - maintqlayout->setStretchFactor( tqlayout, 6 ); - maintqlayout->setStretchFactor( m_otherWidgetLayout, 4 ); + mainlayout->setStretchFactor( layout, 6 ); + mainlayout->setStretchFactor( m_otherWidgetLayout, 4 ); shortLongButton->setIconSet( SmallIconSet( "edit_add" ) ); TQToolTip::add( shortLongButton, i18n( "Show details" ) ); @@ -181,7 +181,7 @@ StatusBar::paintEvent( TQPaintEvent* ) if ( !w->isVisible() ) continue; - tqstyle().tqdrawPrimitive( + style().tqdrawPrimitive( TQStyle::PE_StatusBarSection, &p, TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ), diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h index f9fd92c8..8bfe392d 100644 --- a/amarok/src/statusbar/statusBarBase.h +++ b/amarok/src/statusbar/statusBarBase.h @@ -187,7 +187,7 @@ namespace KDE /** * You must parent the widget to the statusbar, we won't do that - * for you! The widget will be added to the right of the tqlayout. + * for you! The widget will be added to the right of the layout. * Currently you must add widgets before the statusbar gets shown * for the first time, because we are not currently very flexible. */ diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp index 0430829e..b6dad191 100644 --- a/amarok/src/statusbar/statusbar.cpp +++ b/amarok/src/statusbar/statusbar.cpp @@ -85,12 +85,12 @@ StatusBar::StatusBar( TQWidget *parent, const char *name ) // TODO Both labels need tooltips (string freeze?) TQWidget *hbox = new TQWidget( this ); - TQBoxLayout *tqlayout = new TQHBoxLayout( hbox, 0, 2 ); - tqlayout->addSpacing( 3 ); - tqlayout->addWidget( m_queueLabel = new QueueLabel( hbox ) ); - tqlayout->addWidget( new SelectLabel( static_cast( Amarok::action( "repeat" ) ), hbox ) ); - tqlayout->addWidget( new SelectLabel( static_cast( Amarok::action( "random_mode" ) ), hbox ) ); - tqlayout->addSpacing( 3 ); + TQBoxLayout *layout = new TQHBoxLayout( hbox, 0, 2 ); + layout->addSpacing( 3 ); + layout->addWidget( m_queueLabel = new QueueLabel( hbox ) ); + layout->addWidget( new SelectLabel( static_cast( Amarok::action( "repeat" ) ), hbox ) ); + layout->addWidget( new SelectLabel( static_cast( Amarok::action( "random_mode" ) ), hbox ) ); + layout->addSpacing( 3 ); //TODO reimplement insertChild() instead addWidget( m_itemCountLabel ); diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp index f4e7bfb4..98b6ed88 100644 --- a/amarok/src/tagdialog.cpp +++ b/amarok/src/tagdialog.cpp @@ -423,7 +423,7 @@ void TagDialog::init() m_labelCloud->view()->setHScrollBarMode( TQScrollView::AlwaysOff ); new TQVBoxLayout( labels_favouriteLabelsFrame ); - labels_favouriteLabelsFrame->tqlayout()->add( m_labelCloud->view() ); + labels_favouriteLabelsFrame->layout()->add( m_labelCloud->view() ); const TQStringList favoriteLabels = CollectionDB::instance()->favoriteLabels(); TQString html = generateHTML( favoriteLabels ); m_labelCloud->set( html ); diff --git a/amarok/src/tagdialogbase.ui b/amarok/src/tagdialogbase.ui index 1e71f065..589f6fb1 100644 --- a/amarok/src/tagdialogbase.ui +++ b/amarok/src/tagdialogbase.ui @@ -21,7 +21,7 @@ - tqlayout5_3 + layout5_3 @@ -106,7 +106,7 @@ - tqlayout6 + layout6 @@ -286,7 +286,7 @@ - tqlayout14 + layout14 @@ -372,7 +372,7 @@ - tqlayout5_2 + layout5_2 @@ -473,7 +473,7 @@ - tqlayout11 + layout11 diff --git a/amarok/src/transferdialog.cpp b/amarok/src/transferdialog.cpp index e52b98e2..b5f258cf 100644 --- a/amarok/src/transferdialog.cpp +++ b/amarok/src/transferdialog.cpp @@ -49,9 +49,9 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQVBox *vbox2 = new TQVBox( vbox ); TQSpacerItem *spacer = new TQSpacerItem( 0, 25 ); - TQLayout *vtqlayout = vbox2->tqlayout(); - if( vtqlayout ) - vtqlayout->addItem( spacer ); + TQLayout *vlayout = vbox2->layout(); + if( vlayout ) + vlayout->addItem( spacer ); new TQLabel( i18n( "You can have your music automatically grouped in\n" "a variety of ways. Each grouping will create\n" @@ -94,9 +94,9 @@ TransferDialog::TransferDialog( MediaDevice *mdev ) TQVBox *vbox3 = new TQVBox( vbox ); TQSpacerItem *spacer2 = new TQSpacerItem( 0, 25 ); - TQLayout *vtqlayout2 = vbox3->tqlayout(); - if( vtqlayout2 ) - vtqlayout2->addItem( spacer2 ); + TQLayout *vlayout2 = vbox3->layout(); + if( vlayout2 ) + vlayout2->addItem( spacer2 ); TQGroupBox *options = new TQGroupBox( 6, Qt::Vertical, i18n( "Options" ), vbox );