From 3c299dfe48c0060272c2966fff599b3b417e2ee4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:07 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- arts/builder/execdlg.cpp | 6 +-- arts/builder/interfacedlg.cpp | 6 +-- arts/builder/portposdlg.cpp | 6 +-- arts/builder/propertypanel.cpp | 4 +- arts/builder/qttableview.cpp | 10 ++-- arts/builder/retrievedlg.cpp | 4 +- arts/gui/kde/klayoutbox_impl.cpp | 10 ++-- arts/gui/kde/klayoutbox_impl.h | 4 +- arts/gui/kde/klevelmeter_linebars.cpp | 2 +- arts/gui/kde/kpopupbox_private.h | 22 ++++----- arts/gui/kde/kpoti.cpp | 26 +++++----- arts/gui/kde/kpoti.h | 4 +- arts/gui/kde/ktickmarks_impl.cpp | 4 +- arts/gui/kde/kvolumefader_impl.cpp | 8 ++-- arts/gui/kde/kwidget_impl.cpp | 12 ++--- arts/midi/artsmidi.idl | 2 +- arts/tools/artscontrolapplet.cpp | 4 +- arts/tools/artscontrolapplet_private.h | 6 +-- arts/tools/choosebusdlg.cpp | 4 +- arts/tools/environmentview.cpp | 2 +- arts/tools/levelmeters.cpp | 10 ++-- arts/tools/levelmeters.h | 4 +- arts/tools/midiinstdlg.cpp | 10 ++-- arts/tools/midimanagerview.cpp | 4 +- arts/tools/midiportdlg.cpp | 2 +- arts/tools/statusview.cpp | 6 +-- arts/tools/statusview.h | 2 +- juk/coverdialogbase.ui | 2 +- juk/covermanager.cpp | 4 +- juk/covermanager.h | 2 +- juk/deletedialogbase.ui | 2 +- juk/directorylist.cpp | 4 +- juk/directorylistbase.ui | 2 +- juk/filerenamer.cpp | 2 +- juk/filerenamerbase.ui | 6 +-- juk/filerenameroptionsbase.ui | 6 +-- juk/historyplaylist.cpp | 4 +- juk/ktrm.cpp | 18 +++---- juk/nowplaying.cpp | 4 +- juk/playermanager.cpp | 2 +- juk/playlist.cpp | 2 +- juk/playlistbox.cpp | 4 +- juk/playlistbox.h | 2 +- juk/playlistitem.cpp | 10 ++-- juk/splashscreen.cpp | 2 +- juk/statuslabel.cpp | 16 +++---- juk/systemtray.cpp | 2 +- juk/tageditor.cpp | 10 ++-- juk/tagguesserconfigdlgwidget.ui | 2 +- juk/viewmode.cpp | 10 ++-- juk/viewmode.h | 4 +- juk/webimagefetcherdialog.cpp | 2 +- kaboodle/view.cpp | 2 +- kaudiocreator/cdconfig.ui | 2 +- kaudiocreator/encodefile.ui | 4 +- kaudiocreator/encoderconfig.ui | 4 +- kaudiocreator/encoderedit.ui | 4 +- kaudiocreator/encoderoutput.ui | 2 +- kaudiocreator/general.ui | 2 +- kaudiocreator/infodialog.ui | 2 +- kaudiocreator/jobque.ui | 2 +- kaudiocreator/kaudiocreator.cpp | 22 ++++----- kaudiocreator/kaudiocreator.h | 2 +- kaudiocreator/ripconfig.ui | 2 +- kaudiocreator/tracks.ui | 4 +- kaudiocreator/wizard.ui | 4 +- kioslave/audiocd/audiocd.cpp | 4 +- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui | 8 ++-- kioslave/audiocd/plugins/flac/encoderflac.cpp | 2 +- .../audiocd/plugins/lame/encoderlameconfig.ui | 2 +- .../plugins/vorbis/encodervorbisconfig.ui | 2 +- kmid/channel.cpp | 2 +- kmid/kdisptext.h | 2 +- kmid/klcdnumber.cpp | 2 +- kmid/klcdnumber.h | 2 +- kmid/kmidclient.cpp | 14 +++--- kmid/kmidclient.h | 2 +- kmid/ktrianglebutton.cpp | 12 ++--- kmid/qslidertime.cpp | 2 +- kmid/qslidertime.h | 2 +- kmid/rhythmview.cpp | 2 +- kmid/rhythmview.h | 2 +- kmix/colorwidget.ui | 2 +- kmix/dialogselectmaster.cpp | 6 +-- kmix/dialogviewconfiguration.cpp | 8 ++-- kmix/dialogviewconfiguration.h | 2 +- kmix/kledbutton.cpp | 2 +- kmix/kledbutton.h | 2 +- kmix/kmix.cpp | 6 +-- kmix/kmixapplet.cpp | 28 +++++------ kmix/kmixapplet.h | 2 +- kmix/kmixerwidget.cpp | 6 +-- kmix/ksmallslider.cpp | 6 +-- kmix/ksmallslider.h | 4 +- kmix/mdwenum.cpp | 16 +++---- kmix/mdwenum.h | 2 +- kmix/mdwslider.cpp | 48 +++++++++---------- kmix/mdwslider.h | 2 +- kmix/mdwswitch.cpp | 10 ++-- kmix/mdwswitch.h | 2 +- kmix/verticaltext.cpp | 2 +- kmix/verticaltext.h | 2 +- kmix/viewapplet.cpp | 12 ++--- kmix/viewapplet.h | 2 +- kmix/viewdockareapopup.cpp | 10 ++-- kmix/viewdockareapopup.h | 2 +- kmix/viewgrid.cpp | 20 ++++---- kmix/viewgrid.h | 4 +- kmix/viewsliders.cpp | 6 +-- kmix/viewsliders.h | 2 +- kmix/viewsurround.cpp | 6 +-- kmix/viewsurround.h | 2 +- kmix/viewswitches.cpp | 8 ++-- kmix/viewswitches.h | 2 +- krec/krecfilewidgets.cpp | 10 ++-- krec/krecnewproperties.cpp | 4 +- krec/ogg_export/krecexport_ogg.cpp | 2 +- kscd/bwlednum.cpp | 4 +- kscd/configWidgetUI.ui | 6 +-- kscd/kcompactdisc.cpp | 22 ++++----- kscd/kcompactdisc.h | 6 +-- kscd/kscd.cpp | 12 ++--- kscd/kscd.h | 4 +- kscd/kscdmagic/syna.h | 2 +- kscd/libwm/plat_news.c | 4 +- kscd/panel.ui | 10 ++-- libkcddb/cddb.cpp | 14 +++--- libkcddb/cddb.h | 4 +- libkcddb/cdinfodialogbase.ui | 2 +- libkcddb/cdinfoencodingwidgetbase.ui | 2 +- libkcddb/kcmcddb/cddbconfigwidgetbase.ui | 12 ++--- libkcddb/lookup.cpp | 12 ++--- libkcddb/submit.cpp | 4 +- mpeglib/example/yaf/yafcore/inputDecoder.cpp | 4 +- mpeglib/example/yaf/yafcore/inputDecoder.h | 4 +- mpeglib/example/yaf/yafcore/yaf_control.cpp | 2 +- .../yaf/yafxplayer/inputDecoderXPlayer.cpp | 4 +- noatun/library/engine.cpp | 6 +-- noatun/library/equalizerview.cpp | 2 +- noatun/library/equalizerwidget.ui | 10 ++-- noatun/library/noatun/scrollinglabel.h | 4 +- noatun/library/plugin.cpp | 2 +- noatun/library/scrollinglabel.cpp | 6 +-- noatun/library/titleproxy.cpp | 6 +-- noatun/library/video.cpp | 2 +- noatun/modules/excellent/userinterface.cpp | 8 ++-- noatun/modules/htmlexport/htmlexport.cpp | 8 ++-- noatun/modules/kaiman/SKIN-SPECS | 4 +- noatun/modules/kaiman/userinterface.cpp | 10 ++-- .../kjofol-skin/kjguisettingswidget.ui | 6 +-- noatun/modules/kjofol-skin/kjloader.cpp | 2 +- .../kjofol-skin/kjskinselectorwidget.ui | 8 ++-- noatun/modules/marquis/marquis.cpp | 6 +-- noatun/modules/metatag/edit.cpp | 6 +-- noatun/modules/noatunui/userinterface.cpp | 2 +- noatun/modules/simple/propertiesdialog.ui | 14 +++--- noatun/modules/simple/userinterface.cpp | 14 +++--- noatun/modules/splitplaylist/playlist.cpp | 4 +- noatun/modules/systray/kitsystemtray.cpp | 2 +- noatun/modules/systray/systray.cpp | 24 +++++----- noatun/modules/systray/systray.h | 4 +- noatun/modules/systray/yhconfigwidget.ui | 4 +- noatun/modules/winskin/waInfo.cpp | 8 ++-- noatun/modules/winskin/waLabel.cpp | 2 +- noatun/modules/winskin/waSkin.cpp | 20 ++++---- noatun/modules/winskin/waSkin.h | 6 +-- noatun/modules/winskin/waSlider.cpp | 6 +-- noatun/modules/winskin/waStatus.cpp | 6 +-- noatun/modules/winskin/waStatus.h | 8 ++-- noatun/modules/winskin/waWidget.cpp | 2 +- noatun/modules/winskin/waWidget.h | 2 +- 171 files changed, 518 insertions(+), 518 deletions(-) diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index 790691e8..e5b6cd89 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -41,7 +41,7 @@ #ifndef KDE_USE_FINAL static void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } #endif @@ -63,7 +63,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" ")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); min_size(captionlabel); maintqlayout->addWidget(captionlabel); @@ -151,7 +151,7 @@ void ExecDlg::updateCpuUsage() #if 0 /* TODO:PORT */ char cpuusage[100]; - ArtsCorba::tqStatus s = Synthesizer->gettqStatus(); + ArtsCorba::Status s = Synthesizer->getStatus(); if(s.halted) { cpuusagetimer->stop(); diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index 3b4d455a..dd85fc80 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -56,7 +56,7 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) labelfont.setPointSize(labelfont.pointSize()*3/2); objectlabel->setFont(labelfont); objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); - objectlabel->tqsetAlignment(AlignCenter); + objectlabel->setAlignment(AlignCenter); min_size(objectlabel); maintqlayout->addWidget(objectlabel); */ @@ -70,10 +70,10 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); min_size(portlabel); - portlabel->tqsetAlignment(AlignCenter); + portlabel->setAlignment(AlignCenter); maintqlayout->addWidget(portlabel); - int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width()); + int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width()); portlabel->setMinimumWidth(labelwidth); objectlabel->setMinimumWidth(labelwidth); diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 63f2546c..69e8ac86 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -57,7 +57,7 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, labelfont.setPointSize(labelfont.pointSize()*3/2); objectlabel->setFont(labelfont); objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); - objectlabel->tqsetAlignment(AlignCenter); + objectlabel->setAlignment(AlignCenter); min_size(objectlabel); maintqlayout->addWidget(objectlabel); */ @@ -71,10 +71,10 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); min_size(portlabel); - portlabel->tqsetAlignment(AlignCenter); + portlabel->setAlignment(AlignCenter); maintqlayout->addWidget(portlabel); - int labelwidth = imax(portlabel->tqsizeHint().width(),objectlabel->tqsizeHint().width()); + int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width()); portlabel->setMinimumWidth(labelwidth); objectlabel->setMinimumWidth(labelwidth); diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp index df76588a..98e40de1 100644 --- a/arts/builder/propertypanel.cpp +++ b/arts/builder/propertypanel.cpp @@ -115,7 +115,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component ) if(component->pixmap()) { moduleIconLabel->setPixmap( *component->pixmap() ); - moduleIconLabel->setMinimumSize( moduleIconLabel->tqsizeHint() ); + moduleIconLabel->setMinimumSize( moduleIconLabel->sizeHint() ); moduleIconLabel->show(); } else @@ -132,7 +132,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component ) i18n("OUTPUT") : i18n("INPUT") ); portCombo->insertItem( portTitle ); } - //portCombo->setMinimumSize( portCombo->tqsizeHint() ); + //portCombo->setMinimumSize( portCombo->sizeHint() ); setEnabled(true); } } diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp index f8716b44..d08deab2 100644 --- a/arts/builder/qttableview.cpp +++ b/arts/builder/qttableview.cpp @@ -34,8 +34,8 @@ enum ScrollBarDirtyFlags { }; -#define HSBEXT horizontalScrollBar()->tqsizeHint().height() -#define VSBEXT verticalScrollBar()->tqsizeHint().width() +#define HSBEXT horizontalScrollBar()->sizeHint().height() +#define VSBEXT verticalScrollBar()->sizeHint().width() class TQCornerSquare : public TQWidget // internal class @@ -1385,7 +1385,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // outside the cells. TQRect viewR = viewRect(); - const TQColorGroup g = tqcolorGroup(); + const TQColorGroup g = colorGroup(); if ( xPos <= maxX ) { TQRect r = viewR; @@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->tqsizeHint() ); // height is irrelevant + sb->resize( sb->sizeHint() ); // height is irrelevant Q_CHECK_PTR(sb); sb->setTracking( FALSE ); sb->setFocusPolicy( TQ_NoFocus ); @@ -1474,7 +1474,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->tqsizeHint() ); // width is irrelevant + sb->resize( sb->sizeHint() ); // width is irrelevant sb->setFocusPolicy( TQ_NoFocus ); Q_CHECK_PTR(sb); sb->setTracking( FALSE ); diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index 5b738471..cedd5940 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -37,7 +37,7 @@ #include static void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) @@ -54,7 +54,7 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" ")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); min_size(captionlabel); maintqlayout->addWidget(captionlabel); diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 9aeee822..5ee56635 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); } -TQSize KLayoutBox_Separator::tqminimumSizeHint() const { - int wh = tqstyle().tqpixelMetric( TQStyle::PM_SplitterWidth, this ); +TQSize KLayoutBox_Separator::minimumSizeHint() const { + int wh = tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ); return TQSize( wh, wh ); } @@ -105,12 +105,12 @@ KLayoutBox_Line::KLayoutBox_Line( int width, int space, TQWidget* p, const char* void KLayoutBox_Line::paintEvent( TQPaintEvent* ) { //kdDebug() << k_funcinfo << size() << endl; TQPainter p( this ); - p.setPen( TQPen( tqcolorGroup().foreground(), _width ) ); + p.setPen( TQPen( colorGroup().foreground(), _width ) ); if ( width() > height() ) p.drawLine( 0, height()/2, width(), height()/2 ); else p.drawLine( width()/2, 0, width()/2, height() ); } -TQSize KLayoutBox_Line::tqminimumSizeHint() const { +TQSize KLayoutBox_Line::minimumSizeHint() const { //kdDebug() << k_funcinfo << size() << endl; int wh = _width + 2* _space; return TQSize( wh, wh ); diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h index 38cca947..eee3b781 100644 --- a/arts/gui/kde/klayoutbox_impl.h +++ b/arts/gui/kde/klayoutbox_impl.h @@ -85,7 +85,7 @@ public: KLayoutBox_Separator( TQWidget*, const char* =0 ); void resizeEvent( TQResizeEvent* ); void paintEvent( TQPaintEvent* ); - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; }; class KLayoutBox_Line : public TQWidget { @@ -96,7 +96,7 @@ private: public: KLayoutBox_Line( int, int, TQWidget*, const char* =0 ); void paintEvent( TQPaintEvent* ); - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; }; #endif diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp index 37dfe4d3..cdbb819d 100644 --- a/arts/gui/kde/klevelmeter_linebars.cpp +++ b/arts/gui/kde/klevelmeter_linebars.cpp @@ -31,7 +31,7 @@ KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidg //kdDebug()<<"KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* "<setMinimumSize( 5, 5 ); this->substyle( substyle ); - _stdcolors = tqcolorGroup(); + _stdcolors = colorGroup(); setBackgroundMode( TQt::NoBackground ); } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index b9b38e7f..07fb221c 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -88,7 +88,7 @@ public: TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), tqcolorGroup(), flags ); + tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); } signals: void clicked(); @@ -151,17 +151,17 @@ public slots: } } public: - TQSize tqminimumSizeHint() const { - int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize minimumSizeHint() const { + int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; @@ -187,17 +187,17 @@ public slots: else setPixmap( _pmown ); } public: - TQSize tqminimumSizeHint() const { - int wh = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + TQSize minimumSizeHint() const { + int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } void drawButton( TQPainter * p ) { - p->fillRect( 0,0, width(), height(), TQBrush( tqcolorGroup().brush( TQColorGroup::Background ) ) ); + p->fillRect( 0,0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) ); p->drawPixmap( ( width() - pixmap()->width() ) / 2, ( height() - pixmap()->height() ) / 2, *pixmap() ); } }; diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index dca86721..b38902d8 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -53,7 +53,7 @@ struct KPoti::KPotiPrivate bool bgDirty; KPixmap bgdb; - KPixmap bgPixmap( const TQColorGroup & tqcolorGroup ) + KPixmap bgPixmap( const TQColorGroup & colorGroup ) { if( bgDirty || bgdb.isNull() ) { @@ -73,8 +73,8 @@ struct KPoti::KPotiPrivate // inset shadow KPixmap gradient( bgdb.size() ); - KPixmapEffect::gradient( gradient, tqcolorGroup.light(), tqcolorGroup.dark(), KPixmapEffect::DiagonalGradient ); - dbp.setBrush( TQBrush( tqcolorGroup.button(), gradient ) ); + KPixmapEffect::gradient( gradient, colorGroup.light(), colorGroup.dark(), KPixmapEffect::DiagonalGradient ); + dbp.setBrush( TQBrush( colorGroup.button(), gradient ) ); dbp.drawEllipse( drawRect ); potiRect.setSize( drawRect.size() * 0.9 ); @@ -133,12 +133,12 @@ TQSizePolicy KPoti::sizePolicy() const return TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); } -TQSize KPoti::tqsizeHint() const +TQSize KPoti::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } -TQSize KPoti::tqminimumSizeHint() const +TQSize KPoti::minimumSizeHint() const { int width = 40; int height = 40; @@ -162,7 +162,7 @@ TQString KPoti::text() const void KPoti::setText( const TQString & text ) { d->label = text; - setMinimumSize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); updateGeometry(); } @@ -408,8 +408,8 @@ void KPoti::paintPoti( TQPainter * p ) p2.translate( db.rect().center().x(), db.rect().center().y() ); p2.rotate( potiPos * 180.0 / PI ); TQRect pointer( db.width() / -20, db.width() / -2, db.width() / 10, db.width() / 2 ); - TQBrush buttonbrush( tqcolorGroup().button() ); - qDrawShadePanel( &p2, pointer, tqcolorGroup(), true, 1, &buttonbrush ); + TQBrush buttonbrush( colorGroup().button() ); + qDrawShadePanel( &p2, pointer, colorGroup(), true, 1, &buttonbrush ); p2.end(); p->drawPixmap( d->potiRect, db ); @@ -440,7 +440,7 @@ void KPoti::reallyMovePoti( float newPos ) void KPoti::drawContents( TQPainter * p ) { TQPixmap doublebuffer( contentsRect().size() ); - doublebuffer.fill( tqcolorGroup().background() ); + doublebuffer.fill( colorGroup().background() ); TQPainter dbp( &doublebuffer ); if( m_bLabel ) { @@ -455,10 +455,10 @@ void KPoti::drawContents( TQPainter * p ) if( ticks ) drawTicks( &dbp, buttonRadius, tickLength, interval ); - dbp.drawPixmap( d->buttonRect, d->bgPixmap( tqcolorGroup() ) ); + dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, tqcolorGroup() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); @@ -711,7 +711,7 @@ void KPoti::repeatTimeout() void KPoti::drawTicks( TQPainter *p, double dist, double w, int i ) const { - p->setPen( tqcolorGroup().foreground() ); + p->setPen( colorGroup().foreground() ); double angle,s,c; double x, y; for (int v=0; v<=i; v++) diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h index d9013c8a..52705f8f 100644 --- a/arts/gui/kde/kpoti.h +++ b/arts/gui/kde/kpoti.h @@ -53,8 +53,8 @@ public: int tickInterval() const { return tickInt; } virtual TQSizePolicy sizePolicy() const; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; TQString text() const; public slots: diff --git a/arts/gui/kde/ktickmarks_impl.cpp b/arts/gui/kde/ktickmarks_impl.cpp index 4988ad7b..5df8dd00 100644 --- a/arts/gui/kde/ktickmarks_impl.cpp +++ b/arts/gui/kde/ktickmarks_impl.cpp @@ -75,8 +75,8 @@ void KTickmarks_Widget::drawContents( TQPainter* p ) { int _minsize; // Shorcuts int w,h; - TQColor colornormal = tqcolorGroup().foreground(); - TQColor colordiff = tqcolorGroup().buttonText(); + TQColor colornormal = colorGroup().foreground(); + TQColor colordiff = colorGroup().buttonText(); if ( _dir == Arts::BottomToTop || _dir == Arts::TopToBottom ) { p->translate( contentsRect().left(), contentsRect().bottom() ); diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp index fca3466e..97ea35a6 100644 --- a/arts/gui/kde/kvolumefader_impl.cpp +++ b/arts/gui/kde/kvolumefader_impl.cpp @@ -159,10 +159,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::BottomToTop ) h = contentsRect().height() * ( 1 - _value ); else h = contentsRect().height() * _value; for ( int i=int( h ); isetPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( i )/contentsRect().height() ) ); + p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( i )/contentsRect().height() ) ); p->drawLine( contentsRect().left(), this->frameWidth() + i, contentsRect().right(), this->frameWidth() + i ); } - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->drawLine( contentsRect().left(), this->frameWidth() + int( h ), contentsRect().right(), this->frameWidth() + int( h ) ); } else { float w; @@ -170,10 +170,10 @@ void KVolumeFader_Widget::drawContents( TQPainter* p ){ if ( _dir==Arts::LeftToRight ) w = - contentsRect().width() * ( 1 - _value ); else w = - contentsRect().width() * _value; for ( int i=int( w ); i>=-contentsRect().width(); i-- ) { - p->setPen( interpolate( tqcolorGroup().light(), tqcolorGroup().highlight(), float( -i )/contentsRect().width() ) ); + p->setPen( interpolate( colorGroup().light(), colorGroup().highlight(), float( -i )/contentsRect().width() ) ); p->drawLine( this->frameWidth() + i, contentsRect().top(), this->frameWidth() + i, contentsRect().bottom() ); } - p->setPen( tqcolorGroup().dark() ); + p->setPen( colorGroup().dark() ); p->drawLine( this->frameWidth() + int( w ), contentsRect().top(), this->frameWidth() + int( w ), contentsRect().bottom() ); } } diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp index b716f4c3..2a1399f1 100644 --- a/arts/gui/kde/kwidget_impl.cpp +++ b/arts/gui/kde/kwidget_impl.cpp @@ -143,26 +143,26 @@ void KWidget_impl::visible(bool newVisible) SizePolicy KWidget_impl::hSizePolicy() { - return ( SizePolicy )_qwidget->tqsizePolicy().horData(); + return ( SizePolicy )_qwidget->sizePolicy().horData(); } void KWidget_impl::hSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->tqsizePolicy(); + TQSizePolicy sp = _qwidget->sizePolicy(); sp.setHorData( ( TQSizePolicy::SizeType )p ); - _qwidget->tqsetSizePolicy( sp ); + _qwidget->setSizePolicy( sp ); } SizePolicy KWidget_impl::vSizePolicy() { - return ( SizePolicy )_qwidget->tqsizePolicy().verData(); + return ( SizePolicy )_qwidget->sizePolicy().verData(); } void KWidget_impl::vSizePolicy( SizePolicy p ) { - TQSizePolicy sp = _qwidget->tqsizePolicy(); + TQSizePolicy sp = _qwidget->sizePolicy(); sp.setVerData( ( TQSizePolicy::SizeType )p ); - _qwidget->tqsetSizePolicy( sp ); + _qwidget->setSizePolicy( sp ); } void KWidget_impl::show() diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl index 82e6e9e4..70157d95 100644 --- a/arts/midi/artsmidi.idl +++ b/arts/midi/artsmidi.idl @@ -54,7 +54,7 @@ struct TimeStamp { /** * different status of a midi command */ -enum MidiCommandtqStatus { +enum MidiCommandStatus { // Masks: mcsCommandMask = 0xf0, mcsChannelMask = 0x0f, diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index f59bc9ff..8ffe493f 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -93,12 +93,12 @@ kdDebug()<tqlayout->tqsizeHint().width(); + return p->tqlayout->sizeHint().width(); } int ArtsControlApplet::heightForWidth( int w ) const { kdDebug()<<"ArtsControlApplet::heightForWidth( int "<tqlayout->tqsizeHint().height(); + return p->tqlayout->sizeHint().height(); } void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) { diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 3f6417b1..da6c1824 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -63,7 +63,7 @@ public: Arts::StereoVolumeControlGui vu; KPopupMenu *menu; - KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; + KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall; ArtsControlAppletPrivate( ArtsControlApplet *parent ) @@ -87,8 +87,8 @@ public: _showSVinline->plug( menu ); _showAM = _artsactions->actionAudioManager(); _showAM->plug( menu ); - _showArtstqStatus = _artsactions->actionArtsStatusView(); - _showArtstqStatus->plug( menu ); + _showArtsStatus = _artsactions->actionArtsStatusView(); + _showArtsStatus->plug( menu ); _showMidiManager = _artsactions->actionMidiManagerView(); _showMidiManager->plug( menu ); _showEnvironment = _artsactions->actionEnvironmentView(); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index 29a1bb69..b23c1f8c 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -39,7 +39,7 @@ using namespace std; static void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } ChooseBusDlg::ChooseBusDlg(TQWidget *parent) @@ -58,7 +58,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" ")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); min_size(captionlabel); maintqlayout->addWidget(captionlabel); diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index f62a5c06..b6b03a39 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -57,7 +57,7 @@ public: printf("~ItemView()\n"); } TQString text() const { - return TQString::tqfromLatin1(item._interfaceName().c_str()); + return TQString::fromLatin1(item._interfaceName().c_str()); } }; diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index 08d9099b..93bb0c2a 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent) lastValues.setAutoDelete( TRUE ); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setBackgroundMode(NoBackground); setMinimumSize(frameWidth()+7, 70); } @@ -30,7 +30,7 @@ void PeakBar::frameChanged() { TQFrame::frameChanged(); } -TQSize PeakBar::tqsizeHint() const { +TQSize PeakBar::sizeHint() const { return TQSize(13, 250); } @@ -122,7 +122,7 @@ PeakLevelMeters::PeakLevelMeters(TQWidget *parent): left.setLineWidth(2); right.setLineWidth(2); scaleView.setScaleMargins(right.frameWidth()); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setDbRange(36); } @@ -144,7 +144,7 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) { ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) { font.setPixelSize(10); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); } void ScaleView::setDbRange(int db) { @@ -152,7 +152,7 @@ void ScaleView::setDbRange(int db) { tqrepaint(); } -TQSize ScaleView::tqsizeHint() const { +TQSize ScaleView::sizeHint() const { return TQSize(TQFontMetrics(font).width("-88")+8, 250); } diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h index 8046d745..5bb867ab 100644 --- a/arts/tools/levelmeters.h +++ b/arts/tools/levelmeters.h @@ -94,7 +94,7 @@ protected: public: PeakBar(TQWidget *parent); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void drawContents(TQPainter *p); virtual void setValue(float f); @@ -114,7 +114,7 @@ public: ScaleView(TQWidget *parent); void setDbRange(int db); void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; void drawContents(TQPainter *p); }; diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 8fe922b7..d2f108ba 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -76,7 +76,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" ")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); maintqlayout->addWidget(captionlabel); @@ -95,7 +95,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) TQStringList::Iterator it; for ( it = instruments.begin(); it != instruments.end(); it++ ) { TQString modname = *it; - TQString prefix = TQString::tqfromLatin1("instrument_"); + TQString prefix = TQString::fromLatin1("instrument_"); if (modname.length() > 5) modname.truncate(modname.length()-5); // kill .arts extension if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) ) @@ -108,7 +108,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) for ( it = maps.begin(); it != maps.end(); it++ ) { TQString modname = *it; - TQString prefix = TQString::tqfromLatin1("instrument_"); + TQString prefix = TQString::fromLatin1("instrument_"); if (modname.length() > 9) modname.truncate(modname.length()-9); // kill .arts-map extension if (modname.startsWith(prefix)) @@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename() TQStringList::Iterator it; for ( it = artsPath.begin(); it != artsPath.end(); it++ ) { - TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts"); + TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts"); TQFileInfo fi(pathname); if (fi.exists() && fi.isReadable()) return TQFile::encodeName(pathname); - pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts-map"); + pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map"); fi.setFile(pathname); if (fi.exists() && fi.isReadable()) return TQFile::encodeName(pathname); diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp index 3f137dea..2a598bbd 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -96,8 +96,8 @@ public: conn != item->info.connections.end(); conn++) { MidiManagerItem *outitem = v->itemMap[*conn]; - TQRect r1 = v->widget->inputsListBox->tqitemRect(item); - TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem); + TQRect r1 = v->widget->inputsListBox->itemRect(item); + TQRect r2 = v->widget->outputsListBox->itemRect(outitem); if(r1.height() > 0 && r2.height() > 0) { diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 1c46d9e5..411df674 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -44,7 +44,7 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(i18n("OSS MIDI Port")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); maintqlayout->addWidget(captionlabel); diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index 37d8cbe2..c29cf4ed 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -41,7 +41,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con TQBoxLayout *l= new TQVBoxLayout(this); //l->setAutoAdd(TRUE); - RealtimetqStatus rs= server.realtimetqStatus(); + RealtimeStatus rs= server.realtimeStatus(); l->addWidget(new TQLabel(rs==rtRealtime? i18n("Artsd is running with realtime scheduling."): rs==rtNoSupport? @@ -66,7 +66,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked())); artsPollStatusTimer= new TQTimer(this); - connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus())); + connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus())); artsPollStatusTimer->start(1000); //l->activate(); show(); @@ -77,7 +77,7 @@ void ArtsStatusView::suspendButtonClicked() (void)server.suspend(); // TODO: error msg if suspend not possible? } -void ArtsStatusView::updatetqStatus() +void ArtsStatusView::updateStatus() { long seconds= server.secondsUntilSuspend(); if (seconds<0) diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h index 59f757c2..37487588 100644 --- a/arts/tools/statusview.h +++ b/arts/tools/statusview.h @@ -40,7 +40,7 @@ public: ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 ); public slots: - void updatetqStatus(); + void updateStatus(); void suspendButtonClicked(); protected: diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index a94fac63..080f108c 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -50,7 +50,7 @@ 0 - + 164 0 diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp index 7cd3d014..5ee5bbf0 100644 --- a/juk/covermanager.cpp +++ b/juk/covermanager.cpp @@ -269,7 +269,7 @@ const char *CoverDrag::format(int i) const return 0; } -TQByteArray CoverDrag::tqencodedData(const char *mimetype) const +TQByteArray CoverDrag::encodedData(const char *mimetype) const { if(qstrcmp(CoverDrag::mimetype, mimetype) == 0) { TQByteArray data; @@ -303,7 +303,7 @@ bool CoverDrag::decode(const TQMimeSource *e, coverKey &id) if(!canDecode(e)) return false; - TQByteArray data = e->tqencodedData(mimetype); + TQByteArray data = e->encodedData(mimetype); TQDataStream ds(data, IO_ReadOnly); TQ_UINT32 i; diff --git a/juk/covermanager.h b/juk/covermanager.h index b5c5d6e7..61ecc567 100644 --- a/juk/covermanager.h +++ b/juk/covermanager.h @@ -68,7 +68,7 @@ public: CoverDrag(coverKey id, TQWidget *src); virtual const char *format(int i) const; - virtual TQByteArray tqencodedData(const char *mimetype) const; + virtual TQByteArray encodedData(const char *mimetype) const; void setId(coverKey id) { m_id = id; } diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index 50e13fe7..7aebdf5c 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -12,7 +12,7 @@ 374 - + 420 320 diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index ceb0d71d..43df3dda 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -50,9 +50,9 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis m_base->importPlaylistsCheckBox->setChecked(importPlaylists); - TQSize sz = tqsizeHint(); + TQSize sz = sizeHint(); setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height())); - resize(tqsizeHint()); + resize(sizeHint()); } DirectoryList::~DirectoryList() diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui index 64a23800..65d334e8 100644 --- a/juk/directorylistbase.ui +++ b/juk/directorylistbase.ui @@ -77,7 +77,7 @@ Expanding - + 20 40 diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index 6f479313..b0dc50f6 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -355,7 +355,7 @@ unsigned FileRenamerWidget::addRowCategory(TagType category) TQString labelText = TQString("%1").tqarg(TagRenamerOptions::tagTypeText(category)); TQLabel *label = new TQLabel(labelText, frame); frame->setStretchFactor(label, 1); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQVBox *options = new TQVBox(frame); row.enableButton = new KPushButton(i18n("Remove"), options); diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui index dfd5d0fd..541e928d 100644 --- a/juk/filerenamerbase.ui +++ b/juk/filerenamerbase.ui @@ -232,7 +232,7 @@ Expanding - + 40 20 @@ -257,7 +257,7 @@ Expanding - + 40 20 @@ -295,7 +295,7 @@ Expanding - + 20 0 diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui index 265685dc..07788856 100644 --- a/juk/filerenameroptionsbase.ui +++ b/juk/filerenameroptionsbase.ui @@ -65,7 +65,7 @@ Expanding - + 40 20 @@ -106,7 +106,7 @@ Expanding - + 40 20 @@ -346,7 +346,7 @@ Expanding - + 20 0 diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp index a9bded13..204197c0 100644 --- a/juk/historyplaylist.cpp +++ b/juk/historyplaylist.cpp @@ -92,14 +92,14 @@ void HistoryPlaylist::slotCreateNewItem() HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) : PlaylistItem(item, parent, after), - m_dateTime(TQDateTime::tqcurrentDateTime()) + m_dateTime(TQDateTime::currentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) : PlaylistItem(item, parent), - m_dateTime(TQDateTime::tqcurrentDateTime()) + m_dateTime(TQDateTime::currentDateTime()) { setText(0, KGlobal::locale()->formatDateTime(m_dateTime)); } diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp index 3838d8bc..09a77546 100644 --- a/juk/ktrm.cpp +++ b/juk/ktrm.cpp @@ -43,7 +43,7 @@ class KTRMLookup; extern "C" { #if HAVE_MUSICBRAINZ >= 4 - static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status); + static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status); #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId); #endif @@ -205,14 +205,14 @@ private: class KTRMEvent : public TQCustomEvent { public: - enum tqStatus { + enum Status { Recognized, Unrecognized, Collision, Error }; - KTRMEvent(int fileId, tqStatus status) : + KTRMEvent(int fileId, Status status) : TQCustomEvent(id), m_fileId(fileId), m_status(status) {} @@ -222,7 +222,7 @@ public: return m_fileId; } - tqStatus status() const + Status status() const { return m_status; } @@ -231,7 +231,7 @@ public: private: int m_fileId; - tqStatus m_status; + Status m_status; }; /** @@ -242,7 +242,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)); } @@ -303,7 +303,7 @@ protected: * Callback fuction for TunePimp lookup events. */ #if HAVE_MUSICBRAINZ >= 4 -static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status) +static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status) #else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId) #endif @@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, #if HAVE_MUSICBRAINZ < 4 track_t track = tp_GetTrack(pimp, fileId); - TPFiletqStatus status = tr_GettqStatus(track); + TPFileStatus status = tr_GetStatus(track); #endif switch(status) { @@ -496,7 +496,7 @@ void KTRMLookup::unrecognized() tr_Lock(track); tr_GetTRM(track, trm, 255); if ( !trm[0] ) { - tr_SettqStatus(track, ePending); + tr_SetStatus(track, ePending); tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track); } else diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index 8e14f1e9..0aac58d3 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -219,7 +219,7 @@ TrackItem::TrackItem(NowPlaying *parent) : NowPlayingItem(parent) { setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); - tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); TQVBoxLayout *tqlayout = new TQVBoxLayout(this); @@ -292,7 +292,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) : NowPlayingItem(parent) { setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); - tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); setLinkUnderline(false); setText(TQString("%1").tqarg(i18n("History"))); diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp index db01392c..0ecc9e84 100644 --- a/juk/playermanager.cpp +++ b/juk/playermanager.cpp @@ -46,7 +46,7 @@ using namespace ActionCollection; -enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; +enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 }; //////////////////////////////////////////////////////////////////////////////// // helper functions diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 41f18228..51228642 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -102,7 +102,7 @@ public: (column == m_playlist->columnOffset() + PlaylistItem::CoverColumn && item->file().coverInfo()->hasCover())) { - TQRect r = m_playlist->tqitemRect(item); + TQRect r = m_playlist->itemRect(item); int headerPosition = m_playlist->header()->sectionPos(column); r.setLeft(headerPosition); r.setRight(headerPosition + m_playlist->header()->sectionSize(column)); diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index d0e82d27..f708242b 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -722,10 +722,10 @@ int PlaylistBox::Item::compare(TQListViewItem *i, int col, bool) const return text(col).lower().localeAwareCompare(i->text(col).lower()); } -void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align) +void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align) { PlaylistBox *playlistBox = static_cast(listView()); - playlistBox->viewMode()->paintCell(this, painter, tqcolorGroup, column, width, align); + playlistBox->viewMode()->paintCell(this, painter, colorGroup, column, width, align); } void PlaylistBox::Item::setText(int column, const TQString &text) diff --git a/juk/playlistbox.h b/juk/playlistbox.h index 793ae654..42003634 100644 --- a/juk/playlistbox.h +++ b/juk/playlistbox.h @@ -162,7 +162,7 @@ protected: void setSortedFirst(bool first = true) { m_sortedFirst = first; } virtual int compare(TQListViewItem *i, int col, bool) const; - virtual void paintCell(TQPainter *p, const TQColorGroup &tqcolorGroup, int column, int width, int align); + virtual void paintCell(TQPainter *p, const TQColorGroup &colorGroup, int column, int width, int align); virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {} virtual void setText(int column, const TQString &text); diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp index 81aad977..2a9a2412 100644 --- a/juk/playlistitem.cpp +++ b/juk/playlistitem.cpp @@ -272,10 +272,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i if(!m_playingItems.contains(this)) return KListViewItem::paintCell(p, cg, column, width, align); - TQColorGroup tqcolorGroup = cg; + TQColorGroup colorGroup = cg; - TQColor base = tqcolorGroup.base(); - TQColor selection = tqcolorGroup.highlight(); + TQColor base = colorGroup.base(); + TQColor selection = colorGroup.highlight(); int r = (base.red() + selection.red()) / 2; int b = (base.blue() + selection.blue()) / 2; @@ -283,8 +283,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i TQColor c(r, g, b); - tqcolorGroup.setColor(TQColorGroup::Base, c); - TQListViewItem::paintCell(p, tqcolorGroup, column, width, align); + colorGroup.setColor(TQColorGroup::Base, c); + TQListViewItem::paintCell(p, colorGroup, column, width, align); } int PlaylistItem::compare(TQListViewItem *item, int column, bool ascending) const diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp index 21f037b0..d20e5896 100644 --- a/juk/splashscreen.cpp +++ b/juk/splashscreen.cpp @@ -77,7 +77,7 @@ SplashScreen::SplashScreen() : TQLabel(0 , "splashScreen", TQt::WStyle_Splash) setPaletteBackgroundPixmap(background); setMargin(7); - tqsetAlignment(AlignLeft | AlignBottom); + setAlignment(AlignLeft | AlignBottom); setPaletteForegroundColor(TQColor(107, 158, 194)); diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp index 951604cd..d94a3247 100644 --- a/juk/statuslabel.cpp +++ b/juk/statuslabel.cpp @@ -42,7 +42,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch { TQFrame *trackAndPlaylist = new TQFrame(this); trackAndPlaylist->setFrameStyle(Box | Sunken); - trackAndPlaylist->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + trackAndPlaylist->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); // Make sure that we have enough of a margin to suffice for the borders, // hence the "lineWidth() * 2" @@ -53,23 +53,23 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch m_playlistLabel = new KSqueezedTextLabel(trackAndPlaylist, "playlistLabel"); trackAndPlaylistLayout->addWidget(m_playlistLabel); - m_playlistLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_playlistLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_playlistLabel->setTextFormat(PlainText); - m_playlistLabel->tqsetAlignment(AlignLeft | AlignVCenter); + m_playlistLabel->setAlignment(AlignLeft | AlignVCenter); m_trackLabel = new KSqueezedTextLabel(trackAndPlaylist, "trackLabel"); trackAndPlaylistLayout->addWidget(m_trackLabel); - m_trackLabel->tqsetAlignment(AlignRight | AlignVCenter); - m_trackLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + m_trackLabel->setAlignment(AlignRight | AlignVCenter); + m_trackLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_trackLabel->setTextFormat(PlainText); trackAndPlaylistLayout->addSpacing(5); m_itemTimeLabel = new TQLabel(this); TQFontMetrics fontMetrics(font()); - m_itemTimeLabel->tqsetAlignment(AlignCenter); + m_itemTimeLabel->setAlignment(AlignCenter); m_itemTimeLabel->setMinimumWidth(fontMetrics.boundingRect("000:00 / 000:00").width()); - m_itemTimeLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_itemTimeLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); m_itemTimeLabel->setFrameStyle(Box | Sunken); m_itemTimeLabel->installEventFilter(this); @@ -78,7 +78,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch TQHBox *jumpBox = new TQHBox(this); jumpBox->setFrameStyle(Box | Sunken); - jumpBox->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); + jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum); TQPushButton *jumpButton = new TQPushButton(jumpBox); jumpButton->setPixmap(SmallIcon("up")); diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp index ad1eb7c8..1c0abaec 100644 --- a/juk/systemtray.cpp +++ b/juk/systemtray.cpp @@ -370,7 +370,7 @@ void SystemTray::createPopup() for(unsigned i = 0; i < m_labels.capacity(); ++i) { m_labels[i] = new FlickerFreeLabel(" ", infoBox); - m_labels[i]->tqsetAlignment(AlignRight | AlignVCenter); + m_labels[i]->setAlignment(AlignRight | AlignVCenter); } // We don't want an autodelete popup. There are times when it will need diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index c9f866c4..d13f09f0 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -90,11 +90,11 @@ public: m_width(-1) {} void setWidth(int w = -1) { - m_width = w == -1 ? TQHBoxLayout::tqminimumSize().width() : w; + m_width = w == -1 ? TQHBoxLayout::minimumSize().width() : w; } - virtual TQSize tqminimumSize() const + virtual TQSize minimumSize() const { - TQSize s = TQHBoxLayout::tqminimumSize(); + TQSize s = TQHBoxLayout::minimumSize(); s.setWidth(m_width); return s; } @@ -560,7 +560,7 @@ void TagEditor::setupLayout() // addItem(i18n("Length:"), m_lengthBox, trackRowLayout); m_lengthBox->setMinimumWidth(fontMetrics().width("00:00") + trackRowLayout->spacing()); m_lengthBox->setMaximumWidth(50); - m_lengthBox->tqsetAlignment(TQt::AlignRight); + m_lengthBox->setAlignment(TQt::AlignRight); m_lengthBox->setReadOnly(true); trackRowLayout->addWidget(addHidden(m_lengthBox)); @@ -572,7 +572,7 @@ void TagEditor::setupLayout() // addItem(i18n("Bitrate:"), m_bitrateBox, trackRowLayout); m_bitrateBox->setMinimumWidth(fontMetrics().width("000") + trackRowLayout->spacing()); m_bitrateBox->setMaximumWidth(50); - m_bitrateBox->tqsetAlignment(TQt::AlignRight); + m_bitrateBox->setAlignment(TQt::AlignRight); m_bitrateBox->setReadOnly(true); trackRowLayout->addWidget(addHidden(m_bitrateBox)); diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui index 08a03ed6..f3b3b2e5 100644 --- a/juk/tagguesserconfigdlgwidget.ui +++ b/juk/tagguesserconfigdlgwidget.ui @@ -136,7 +136,7 @@ Note that the order in which the schemes appear in the list is relevant, since t Expanding - + 20 130 diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index b95d8cbc..d1877730 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -49,7 +49,7 @@ ViewMode::~ViewMode() void ViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &tqcolorGroup, + const TQColorGroup &colorGroup, int column, int width, int) { if(width < item->pixmap(column)->width()) @@ -79,8 +79,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item, painter->setPen(oldPen); painter->fillRect(border, border, width - border * 2, item->height() - border * 2 + 1, - tqcolorGroup.brush(TQColorGroup::Highlight)); - painter->setPen(tqcolorGroup.highlightedText()); + colorGroup.brush(TQColorGroup::Highlight)); + painter->setPen(colorGroup.highlightedText()); } else painter->eraseRect(0, 0, width, item->height()); @@ -224,10 +224,10 @@ CompactViewMode::~CompactViewMode() void CompactViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &tqcolorGroup, + const TQColorGroup &colorGroup, int column, int width, int align) { - item->KListViewItem::paintCell(painter, tqcolorGroup, column, width, align); + item->KListViewItem::paintCell(painter, colorGroup, column, width, align); if(item == item->listView()->dropItem()) paintDropIndicator(painter, width, item->height()); } diff --git a/juk/viewmode.h b/juk/viewmode.h index 2ef4f007..a2d30a9a 100644 --- a/juk/viewmode.h +++ b/juk/viewmode.h @@ -40,7 +40,7 @@ public: virtual void paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &tqcolorGroup, + const TQColorGroup &colorGroup, int column, int width, int align); virtual bool eventFilter(TQObject *watched, TQEvent *e); @@ -106,7 +106,7 @@ public: virtual void paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &tqcolorGroup, + const TQColorGroup &colorGroup, int column, int width, int align); virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); } diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index eb2b1c2a..7eb08c0f 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -86,7 +86,7 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url) { // Don't use static member since I'm sure that someday knowing my luck // Yahoo will change their mimetype they serve. - (void) new KRun(KURL(url), tqtopLevelWidget()); + (void) new KRun(KURL(url), topLevelWidget()); } void WebImageFetcherDialog::setLayout() diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 437af5b0..06eb4aaa 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -99,7 +99,7 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) labelFont.setBold(true); TQFontMetrics labelFontMetrics(labelFont); elapsedLabel->setFont(labelFont); - elapsedLabel->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); + elapsedLabel->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsedLabel->setFixedHeight(labelFontMetrics.height()); elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00")); diff --git a/kaudiocreator/cdconfig.ui b/kaudiocreator/cdconfig.ui index cc317a9e..c0756c83 100644 --- a/kaudiocreator/cdconfig.ui +++ b/kaudiocreator/cdconfig.ui @@ -45,7 +45,7 @@ Expanding - + 20 20 diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui index ccbb6313..14836475 100644 --- a/kaudiocreator/encodefile.ui +++ b/kaudiocreator/encodefile.ui @@ -244,7 +244,7 @@ Expanding - + 20 16 @@ -283,7 +283,7 @@ Expanding - + 121 20 diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui index 67f256c0..6700df46 100644 --- a/kaudiocreator/encoderconfig.ui +++ b/kaudiocreator/encoderconfig.ui @@ -131,7 +131,7 @@ Expanding - + 20 20 @@ -188,7 +188,7 @@ Expanding - + 20 30 diff --git a/kaudiocreator/encoderedit.ui b/kaudiocreator/encoderedit.ui index f5c3c072..1023611b 100644 --- a/kaudiocreator/encoderedit.ui +++ b/kaudiocreator/encoderedit.ui @@ -28,7 +28,7 @@ kcfg_encoderName - + 320 0 @@ -80,7 +80,7 @@ Expanding - + 20 16 diff --git a/kaudiocreator/encoderoutput.ui b/kaudiocreator/encoderoutput.ui index 94779b68..8851d0f4 100644 --- a/kaudiocreator/encoderoutput.ui +++ b/kaudiocreator/encoderoutput.ui @@ -63,7 +63,7 @@ Expanding - + 20 20 diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui index 765cbb1c..609d81bb 100644 --- a/kaudiocreator/general.ui +++ b/kaudiocreator/general.ui @@ -240,7 +240,7 @@ Expanding - + 20 16 diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui index 1add6372..e68e3ffe 100644 --- a/kaudiocreator/infodialog.ui +++ b/kaudiocreator/infodialog.ui @@ -205,7 +205,7 @@ Expanding - + 20 100 diff --git a/kaudiocreator/jobque.ui b/kaudiocreator/jobque.ui index 3c76a257..b2014c29 100644 --- a/kaudiocreator/jobque.ui +++ b/kaudiocreator/jobque.ui @@ -45,7 +45,7 @@ Expanding - + 16 20 diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp index 91c0de17..b0a6d87f 100644 --- a/kaudiocreator/kaudiocreator.cpp +++ b/kaudiocreator/kaudiocreator.cpp @@ -92,7 +92,7 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : TQT_SLOT( startSession() ), actionCollection(), "rip_selected" ); rip->setEnabled( false ); - connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); + connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) ); connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) ); @@ -100,11 +100,11 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) : connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , TQT_TQOBJECT(tracks), TQT_SLOT( ejectDevice(const TQString &)) ); connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) ); - connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); + connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int)) ); connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) ); - connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updatetqStatus() ) ); + connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) ); connect( tracks, TQT_SIGNAL( hasCD(bool) ) , TQT_TQOBJECT(this), TQT_SLOT( hasCD(bool) ) ); connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper), TQT_SLOT( ripTrack(Job *)) ); @@ -170,28 +170,28 @@ void KAudioCreator::hasCD(bool cd){ statusBar()->changeItem(i18n("No Audio CD detected"), 0 ); } -void KAudioCreator::updatetqStatus() { +void KAudioCreator::updateStatus() { TQString status = i18n("Idle."); - TQString rippingtqStatus; - TQString encodingtqStatus; + TQString rippingStatus; + TQString encodingStatus; int activeRippingJobs = ripper->activeJobCount(); int pendingRippingJobs = ripper->pendingJobCount(); int activeEncodingJobs = encoder->activeJobCount(); int pendingEncodingJobs = encoder->pendingJobCount(); if ( activeRippingJobs ) { - rippingtqStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs ); - status = rippingtqStatus; + rippingStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs ); + status = rippingStatus; } if ( activeEncodingJobs ) { - encodingtqStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs ); + encodingStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs ); if ( activeRippingJobs ) { status.append(" : "); - status.append( encodingtqStatus ); + status.append( encodingStatus ); } else { - status = encodingtqStatus; + status = encodingStatus; } } diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 5e901d77..64bca008 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -47,7 +47,7 @@ protected: private slots: void showSettings(); - void updatetqStatus(); + void updateStatus(); void hasCD(bool); void configureNotifications(); diff --git a/kaudiocreator/ripconfig.ui b/kaudiocreator/ripconfig.ui index 8c47615b..7d655de1 100644 --- a/kaudiocreator/ripconfig.ui +++ b/kaudiocreator/ripconfig.ui @@ -151,7 +151,7 @@ Expanding - + 20 280 diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui index 8b7e5a5e..fc15059e 100644 --- a/kaudiocreator/tracks.ui +++ b/kaudiocreator/tracks.ui @@ -120,7 +120,7 @@ Expanding - + 20 20 @@ -200,7 +200,7 @@ Expanding - + 246 20 diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui index f289cb2d..0f6c65be 100644 --- a/kaudiocreator/wizard.ui +++ b/kaudiocreator/wizard.ui @@ -65,7 +65,7 @@ Expanding - + 20 16 @@ -251,7 +251,7 @@ Expanding - + 20 20 diff --git a/kioslave/audiocd/audiocd.cpp b/kioslave/audiocd/audiocd.cpp index 5c2068b5..0e182aeb 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/kioslave/audiocd/audiocd.cpp @@ -59,7 +59,7 @@ extern "C" using namespace KIO; using namespace KCDDB; -#define TQFL1(x) TQString::tqfromLatin1(x) +#define TQFL1(x) TQString::fromLatin1(x) #define DEFAULT_CD_DEVICE "/dev/cdrom" #define CDDB_INFORMATION "CDDB Information" @@ -251,7 +251,7 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url) // circumstances, so build a representation from // the unit number and SCSI device name. // - TQString devname = TQString::tqfromLatin1( "/dev/%1%2" ) + TQString devname = TQString::fromLatin1( "/dev/%1%2" ) .tqarg( drive->dev->given_dev_name ) .tqarg( drive->dev->given_unit_number ) ; kdDebug(7117) << " Using derived name " << devname << endl; diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index 448749a9..505f6616 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -63,7 +63,7 @@ Expanding - + 20 210 @@ -193,7 +193,7 @@ Fixed - + 20 20 @@ -460,7 +460,7 @@ Expanding - + 21 16 @@ -570,7 +570,7 @@ Expanding - + 20 31 diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp index 6b71d515..dfb4f7ba 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp @@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St } /* -static FLAC__SeekableStreamEncoderSeektqStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) +static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) {} ; */ diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui index 3951bb00..d2883737 100644 --- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui +++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui @@ -244,7 +244,7 @@ Expanding - + 20 16 diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index 2d5fd2dc..e442ade2 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui @@ -383,7 +383,7 @@ Expanding - + 20 51 diff --git a/kmid/channel.cpp b/kmid/channel.cpp index 2fe22de6..419a375c 100644 --- a/kmid/channel.cpp +++ b/kmid/channel.cpp @@ -48,7 +48,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent) keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm")); penB = new TQPen (black); penW = new TQPen (white); - penT = new TQPen (tqcolorGroup().background()); + penT = new TQPen (colorGroup().background()); KConfig *kcfg=KGlobal::instance()->config(); kcfg->setGroup("KMid"); diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h index 8cd9939f..2c331425 100644 --- a/kmid/kdisptext.h +++ b/kmid/kdisptext.h @@ -113,7 +113,7 @@ public: void setLyricsEncoding(const TQString &enc); -// TQSize tqsizeHint(); +// TQSize sizeHint(); public slots: void ScrollDown(); diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp index 355f9578..f97e2775 100644 --- a/kmid/klcdnumber.cpp +++ b/kmid/klcdnumber.cpp @@ -332,7 +332,7 @@ void KLCDNumber::setRange(double min, double max) maxValue=max; } -TQSize KLCDNumber::tqsizeHint() +TQSize KLCDNumber::sizeHint() { return TQSize(83,28); } diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h index cf1fca4e..6f9096c4 100644 --- a/kmid/klcdnumber.h +++ b/kmid/klcdnumber.h @@ -121,7 +121,7 @@ public: void display (int v); void display (double v); - TQSize tqsizeHint (); + TQSize sizeHint (); // TQSizePolicy sizePolicy(); protected: diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp index 706e7cbf..40565172 100644 --- a/kmid/kmidclient.cpp +++ b/kmid/kmidclient.cpp @@ -96,7 +96,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int))); timetags = new QSliderTime(timebar,this); - timetags->setMinimumSize(timetags->tqsizeHint()); + timetags->setMinimumSize(timetags->sizeHint()); qlabelTempo= new TQLabel(i18n("Tempo:"), this,"tempolabel", TQLabel::NoFrame); @@ -108,7 +108,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name tempoLCD->setRange(3,999); tempoLCD->setDefaultValue(120); tempoLCD->setUserSetDefaultValue(true); - tempoLCD->setMinimumSize(tempoLCD->tqsizeHint()); + tempoLCD->setMinimumSize(tempoLCD->sizeHint()); connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double))); comboSongs = new TQComboBox(FALSE, this,"Songs"); @@ -313,7 +313,7 @@ int kmidClient::openFile(const char *filename) timetags->tqrepaint(TRUE); kdispt->ClearEv(); kdispt->tqrepaint(TRUE); - tqtopLevelWidget()->setCaption("KMid"); + topLevelWidget()->setCaption("KMid"); return -1; } @@ -353,7 +353,7 @@ int kmidClient::openFile(const char *filename) char *capt=new char[strlen(fn)+20]; sprintf(capt,"KMid - %s",fn); delete fn; - tqtopLevelWidget()->setCaption(capt); + topLevelWidget()->setCaption(capt); delete capt; timebar->setValue(0); @@ -1270,7 +1270,7 @@ void kmidClient::slotSelectSong(int i) kdispt->tqrepaint(TRUE); comboSongs->clear(); comboSongs->tqrepaint(TRUE); - tqtopLevelWidget()->setCaption("KMid"); + topLevelWidget()->setCaption("KMid"); return; } @@ -1522,9 +1522,9 @@ void kmidClient::downloadFinished(KIO::Job *) kapp->exit_loop(); } -TQSize kmidClient::tqsizeHint() const +TQSize kmidClient::sizeHint() const { - TQSize sh = TQWidget::tqsizeHint(); + TQSize sh = TQWidget::sizeHint(); return sh.expandedTo(TQSize(560,420)); } diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h index dbfa7518..3b6fbad8 100644 --- a/kmid/kmidclient.h +++ b/kmid/kmidclient.h @@ -217,7 +217,7 @@ public: void setCurrentSong(int i); void setPlayListMode(int i); - TQSize tqsizeHint() const; + TQSize sizeHint() const; private: TQSlider *timebar; QSliderTime *timetags; diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp index 155daf31..bf7137bf 100644 --- a/kmid/ktrianglebutton.cpp +++ b/kmid/ktrianglebutton.cpp @@ -75,21 +75,21 @@ void KTriangleButton::paint( TQPainter *painter ) { if ( isDown() || isOn() ) { - if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), - height(), tqcolorGroup(), TRUE ); + height(), colorGroup(), TRUE ); else qDrawShadePanel( painter, 0, 0, width(), - height(), tqcolorGroup(), TRUE, 2, 0L ); + height(), colorGroup(), TRUE, 2, 0L ); } else if ( raised ) { - if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), height(), - tqcolorGroup(), FALSE ); + colorGroup(), FALSE ); else qDrawShadePanel( painter, 0, 0, width(), height(), - tqcolorGroup(), FALSE, 2, 0L ); + colorGroup(), FALSE, 2, 0L ); } if (dir==Right) diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp index ba1b62f8..aa879da5 100644 --- a/kmid/qslidertime.cpp +++ b/kmid/qslidertime.cpp @@ -108,7 +108,7 @@ if (kslider==NULL) return; } -TQSize QSliderTime::tqsizeHint() +TQSize QSliderTime::sizeHint() { return TQSize(10,fontheight+2); } diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h index a409332b..3dda085d 100644 --- a/kmid/qslidertime.h +++ b/kmid/qslidertime.h @@ -43,7 +43,7 @@ public: int getFontHeight(void) {return fontheight;}; - TQSize tqsizeHint(); + TQSize sizeHint(); TQSizePolicy sizePolicy(); private: diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp index 49499d46..240ee242 100644 --- a/kmid/rhythmview.cpp +++ b/kmid/rhythmview.cpp @@ -95,7 +95,7 @@ void RhythmView::resizeEvent(TQResizeEvent *) } } -TQSize RhythmView::tqsizeHint() +TQSize RhythmView::sizeHint() { return TQSize(10,10); } diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h index 97a7ae1a..8af09613 100644 --- a/kmid/rhythmview.h +++ b/kmid/rhythmview.h @@ -43,7 +43,7 @@ public: void Beat(void); // Just increase the beat - TQSize tqsizeHint(); + TQSize sizeHint(); TQSizePolicy sizePolicy(); private: diff --git a/kmix/colorwidget.ui b/kmix/colorwidget.ui index d91d9ea9..27739653 100644 --- a/kmix/colorwidget.ui +++ b/kmix/colorwidget.ui @@ -236,7 +236,7 @@ Expanding - + 20 20 diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp index b70c2b6c..08c8f760 100644 --- a/kmix/dialogselectmaster.cpp +++ b/kmix/dialogselectmaster.cpp @@ -67,15 +67,15 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer) TQHBoxLayout* mixerNameLayout = new TQHBoxLayout( _layout ); //widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - //mixerNameLayout->tqsetSizePolicy(qsp); + //mixerNameLayout->setSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); TQLabel *qlbl = new TQLabel( i18n("Current Mixer"), m_mainFrame ); mixerNameLayout->addWidget(qlbl); - qlbl->setFixedHeight(qlbl->tqsizeHint().height()); + qlbl->setFixedHeight(qlbl->sizeHint().height()); m_cMixer = new KComboBox( FALSE, m_mainFrame, "mixerCombo" ); - m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height()); + m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( createPageByID( int ) ) ); //int id=1; diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp index 28cf3c3f..09e88d23 100644 --- a/kmix/dialogviewconfiguration.cpp +++ b/kmix/dialogviewconfiguration.cpp @@ -58,7 +58,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view) } } _layout->activate(); - resize(_layout->tqsizeHint() ); + resize(_layout->sizeHint() ); connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) ); } @@ -93,9 +93,9 @@ void DialogViewConfiguration::apply() _view.configurationUpdate(); } -TQSize DialogViewConfiguration::tqsizeHint() const { - // kdDebug(67100) << "DialogViewConfiguration::tqsizeHint() is (100,500)\n"; - return _layout->tqsizeHint(); +TQSize DialogViewConfiguration::sizeHint() const { + // kdDebug(67100) << "DialogViewConfiguration::sizeHint() is (100,500)\n"; + return _layout->sizeHint(); } #include "dialogviewconfiguration.moc" diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h index c0a80bae..8d64bd27 100644 --- a/kmix/dialogviewconfiguration.h +++ b/kmix/dialogviewconfiguration.h @@ -18,7 +18,7 @@ class DialogViewConfiguration : public KDialogBase DialogViewConfiguration(TQWidget* parent, ViewBase& view); ~DialogViewConfiguration(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: void apply(); diff --git a/kmix/kledbutton.cpp b/kmix/kledbutton.cpp index 7e9fbe02..6c134d2b 100644 --- a/kmix/kledbutton.cpp +++ b/kmix/kledbutton.cpp @@ -66,7 +66,7 @@ bool KLedButton::eventFilter( TQObject* /*obj*/ , TQEvent* /*ev*/ ) { } -TQSize KLedButton::tqsizeHint() const +TQSize KLedButton::sizeHint() const { return size(); } diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h index da07d492..8e22cb9b 100644 --- a/kmix/kledbutton.h +++ b/kmix/kledbutton.h @@ -39,7 +39,7 @@ class KLedButton : public KLed { TQWidget *parent=0, const char *name=0); ~KLedButton(); - TQSize tqsizeHint () const; + TQSize sizeHint () const; TQSizePolicy sizePolicy () const; signals: void stateChanged( bool newState ); diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index 3db2ec09..bc9a7124 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -157,12 +157,12 @@ KMixWindow::initWidgets() mixerNameLayout = new TQHBox( centralWidget(), "mixerNameLayout" ); widgetsLayout->setStretchFactor( mixerNameLayout, 0 ); TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - mixerNameLayout->tqsetSizePolicy(qsp); + mixerNameLayout->setSizePolicy(qsp); mixerNameLayout->setSpacing(KDialog::spacingHint()); TQLabel *qlbl = new TQLabel( i18n("Current mixer:"), mixerNameLayout ); - qlbl->setFixedHeight(qlbl->tqsizeHint().height()); + qlbl->setFixedHeight(qlbl->sizeHint().height()); m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" ); - m_cMixer->setFixedHeight(m_cMixer->tqsizeHint().height()); + m_cMixer->setFixedHeight(m_cMixer->sizeHint().height()); connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) ); TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 741cbd0e..3d5fec6d 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -205,8 +205,8 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t, // No mixer set by user (kmixappletrc_*) and more than one to choose // We do NOT know which mixer to use => ask the User m_errorLabel = new TQPushButton( i18n("Select Mixer"), this ); - m_errorLabel->setGeometry(0, 0, m_errorLabel->tqsizeHint().width(), m_errorLabel->tqsizeHint().height() ); - resize( m_errorLabel->tqsizeHint() ); + m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(), m_errorLabel->sizeHint().height() ); + resize( m_errorLabel->sizeHint() ); connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) ); } else { @@ -375,7 +375,7 @@ void KMixApplet::positionChange(Position pos) { loadConfig(); setColors(); - const TQSize panelAppletConstrainedSize = tqsizeHint(); + const TQSize panelAppletConstrainedSize = sizeHint(); m_mixerWidget->setGeometry( 0, 0, panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); resize( panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); //setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() ); @@ -401,7 +401,7 @@ void KMixApplet::resizeEvent(TQResizeEvent *e) } - // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account. + // resizing changes our own sizeHint(), because we must take the new PanelSize in account. // So updateGeometry() is amust for us. //kdDebug(67100) << "KMixApplet::resizeEvent(). UPDATE GEOMETRY" << endl; updateGeometry(); @@ -414,21 +414,21 @@ void KMixApplet::updateGeometrySlot() { } -TQSize KMixApplet::tqsizeHint() const { - //kdDebug(67100) << "KMixApplet::tqsizeHint()\n"; +TQSize KMixApplet::sizeHint() const { + //kdDebug(67100) << "KMixApplet::sizeHint()\n"; TQSize qsz; if ( m_errorLabel !=0 ) { - qsz = m_errorLabel->tqsizeHint(); + qsz = m_errorLabel->sizeHint(); } else if ( m_mixerWidget != 0) { - qsz = m_mixerWidget->tqsizeHint(); + qsz = m_mixerWidget->sizeHint(); } else { // During construction of m_mixerWidget or if something goes wrong: - // Return something that should resemble our former tqsizeHint(). + // Return something that should resemble our former sizeHint(). qsz = size(); } - //kdDebug(67100) << "KMixApplet::tqsizeHint() leftright =" << qsz << "\n"; + //kdDebug(67100) << "KMixApplet::sizeHint() leftright =" << qsz << "\n"; return qsz; } @@ -437,12 +437,12 @@ TQSize KMixApplet::tqsizeHint() const { using this method. Actually we ignore the passed paramater and just return our preferred size. */ int KMixApplet::widthForHeight(int) const { - //kdDebug(67100) << "KMixApplet::widthForHeight() = " << tqsizeHint().width() << endl; - return tqsizeHint().width(); + //kdDebug(67100) << "KMixApplet::widthForHeight() = " << sizeHint().width() << endl; + return sizeHint().width(); } int KMixApplet::heightForWidth(int) const { - //kdDebug(67100) << "KMixApplet::heightForWidth() = " << tqsizeHint().height() << endl; - return tqsizeHint().height(); + //kdDebug(67100) << "KMixApplet::heightForWidth() = " << sizeHint().height() << endl; + return sizeHint().height(); } diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h index 5f7136ad..2147b421 100644 --- a/kmix/kmixapplet.h +++ b/kmix/kmixapplet.h @@ -88,7 +88,7 @@ public: void reportBug(); void paletteChange ( const TQPalette & oldPalette ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; int widthForHeight(int) const; int heightForWidth(int) const; diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index 56c90d03..20153449 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -81,7 +81,7 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, if ( !mixerName.isEmpty() ) s.append(" \"").append(mixerName).append("\""); TQLabel *errorLabel = new TQLabel( s, this ); - errorLabel->tqsetAlignment( TQLabel::AlignCenter | TQLabel::WordBreak ); + errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak ); tqlayout->addWidget( errorLabel ); } } @@ -136,8 +136,8 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) m_balanceSlider = new TQSlider( -100, 100, 25, 0, Qt::Horizontal, this, "RightLeft" ); m_balanceSlider->setTickmarks( TQSlider::Below ); m_balanceSlider->setTickInterval( 25 ); - m_balanceSlider->setMinimumSize( m_balanceSlider->tqsizeHint() ); - m_balanceSlider->setFixedHeight( m_balanceSlider->tqsizeHint().height() ); + m_balanceSlider->setMinimumSize( m_balanceSlider->sizeHint() ); + m_balanceSlider->setFixedHeight( m_balanceSlider->sizeHint().height() ); TQLabel *mixerName = new TQLabel(this, "mixerName"); mixerName->setText( _mixer->mixerName() ); diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index fea113b5..ef3382c5 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * ) int sliderPos = positionFromValue( TQRangeControl::value() ); // ------------------------ draw 3d border --------------------------------------------- - tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), tqcolorGroup(), TRUE ); + tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); // ------------------------ draw lower/left part ---------------------------------------- @@ -396,7 +396,7 @@ int KSmallSlider::goodPart( const TQPoint &p ) const } /***************** SIZE STUFF START ***************/ -TQSize KSmallSlider::tqsizeHint() const +TQSize KSmallSlider::sizeHint() const { //constPolish(); const int length = 25; @@ -409,7 +409,7 @@ TQSize KSmallSlider::tqsizeHint() const } -TQSize KSmallSlider::tqminimumSizeHint() const +TQSize KSmallSlider::minimumSizeHint() const { TQSize s(10,10); return s; diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h index 7b672720..2ed0f6e6 100644 --- a/kmix/ksmallslider.h +++ b/kmix/ksmallslider.h @@ -42,9 +42,9 @@ class KSmallSlider : public TQWidget, public TQRangeControl //virtual void setTracking( bool enable ); //bool tracking() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; - TQSize tqminimumSizeHint() const; + TQSize minimumSizeHint() const; int minValue() const; int maxValue() const; diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 90ac1350..8ec363ba 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -75,21 +75,21 @@ void MDWEnum::createWidgets() { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->tqsetAlignment(TQt::AlignHCenter); + _layout->setAlignment(TQt::AlignHCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->tqsetAlignment(TQt::AlignVCenter); + _layout->setAlignment(TQt::AlignVCenter); } TQToolTip::add( this, m_mixdevice->name() ); //this->setStretchFactor( _layout, 0 ); //TQSizePolicy qsp( TQSizePolicy::Ignored, TQSizePolicy::Maximum); - //_layout->tqsetSizePolicy(qsp); + //_layout->setSizePolicy(qsp); //_layout->setSpacing(KDialog::spacingHint()); _label = new TQLabel( m_mixdevice->name(), this); _layout->addWidget(_label); - _label->setFixedHeight(_label->tqsizeHint().height()); + _label->setFixedHeight(_label->sizeHint().height()); _enumCombo = new KComboBox( FALSE, this, "mixerCombo" ); // ------------ fill ComboBox start ------------ int maxEnumId= m_mixdevice->enumValues().count(); @@ -98,7 +98,7 @@ void MDWEnum::createWidgets() } // ------------ fill ComboBox end -------------- _layout->addWidget(_enumCombo); - _enumCombo->setFixedHeight(_enumCombo->tqsizeHint().height()); + _enumCombo->setFixedHeight(_enumCombo->sizeHint().height()); connect( _enumCombo, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) ); TQToolTip::add( _enumCombo, m_mixdevice->name() ); @@ -127,13 +127,13 @@ void MDWEnum::showContextMenu() menu->popup( pos ); } -TQSize MDWEnum::tqsizeHint() const { +TQSize MDWEnum::sizeHint() const { if ( _layout != 0 ) { - return _layout->tqsizeHint(); + return _layout->sizeHint(); } else { // tqlayout not (yet) created - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } } diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h index 0a77506f..398afa93 100644 --- a/kmix/mdwenum.h +++ b/kmix/mdwenum.h @@ -51,7 +51,7 @@ public: ~MDWEnum(); void addActionToPopup( KAction *action ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool eventFilter( TQObject* obj, TQEvent* e ); public slots: diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index 8d363c5e..18037f69 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -115,22 +115,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->tqsetAlignment(TQt::AlignCenter); + _layout->setAlignment(TQt::AlignCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->tqsetAlignment(TQt::AlignCenter); + _layout->setAlignment(TQt::AlignCenter); } // -- MAIN SLIDERS LAYOUT --- TQBoxLayout *slidersLayout; if ( _orientation == Qt::Vertical ) { slidersLayout = new TQHBoxLayout( _layout ); - slidersLayout->tqsetAlignment(TQt::AlignVCenter); + slidersLayout->setAlignment(TQt::AlignVCenter); } else { slidersLayout = new TQVBoxLayout( _layout ); - slidersLayout->tqsetAlignment(TQt::AlignHCenter); + slidersLayout->setAlignment(TQt::AlignHCenter); } /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ? @@ -145,11 +145,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *labelLayout; if ( _orientation == Qt::Vertical ) { labelLayout = new TQVBoxLayout( slidersLayout ); - labelLayout->tqsetAlignment(TQt::AlignHCenter); + labelLayout->setAlignment(TQt::AlignHCenter); } else { labelLayout = new TQHBoxLayout( slidersLayout ); - labelLayout->tqsetAlignment(TQt::AlignVCenter); + labelLayout->setAlignment(TQt::AlignVCenter); } if ( _orientation == Qt::Vertical ) { m_label = new VerticalText( this, m_mixdevice->name().utf8().data() ); @@ -183,22 +183,22 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *sliLayout; if ( _orientation == Qt::Vertical ) { sliLayout = new TQVBoxLayout( slidersLayout ); - sliLayout->tqsetAlignment(TQt::AlignHCenter); + sliLayout->setAlignment(TQt::AlignHCenter); } else { sliLayout = new TQHBoxLayout( slidersLayout ); - sliLayout->tqsetAlignment(TQt::AlignVCenter); + sliLayout->setAlignment(TQt::AlignVCenter); } // --- ICON ---------------------------- TQBoxLayout *iconLayout; if ( _orientation == Qt::Vertical ) { iconLayout = new TQHBoxLayout( sliLayout ); - iconLayout->tqsetAlignment(TQt::AlignVCenter); + iconLayout->setAlignment(TQt::AlignVCenter); } else { iconLayout = new TQVBoxLayout( sliLayout ); - iconLayout->tqsetAlignment(TQt::AlignHCenter); + iconLayout->setAlignment(TQt::AlignHCenter); } m_iconLabel = 0L; @@ -216,11 +216,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *ledtqlayout; if ( _orientation == Qt::Vertical ) { ledtqlayout = new TQHBoxLayout( sliLayout ); - ledtqlayout->tqsetAlignment(TQt::AlignVCenter); + ledtqlayout->setAlignment(TQt::AlignVCenter); } else { ledtqlayout = new TQVBoxLayout( sliLayout ); - ledtqlayout->tqsetAlignment(TQt::AlignHCenter); + ledtqlayout->setAlignment(TQt::AlignHCenter); } if( m_mixdevice->hasMute() ) @@ -253,11 +253,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *volLayout; if ( _orientation == Qt::Vertical ) { volLayout = new TQHBoxLayout( sliLayout ); - volLayout->tqsetAlignment(TQt::AlignVCenter); + volLayout->setAlignment(TQt::AlignVCenter); } else { volLayout = new TQVBoxLayout( sliLayout ); - volLayout->tqsetAlignment(TQt::AlignHCenter); + volLayout->setAlignment(TQt::AlignHCenter); } // Sliders and volume number indication @@ -273,11 +273,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) if ( _orientation == Qt::Vertical ) { slinumLayout = new TQVBoxLayout( volLayout ); - slinumLayout->tqsetAlignment(TQt::AlignHCenter); + slinumLayout->setAlignment(TQt::AlignHCenter); } else { slinumLayout = new TQHBoxLayout( volLayout ); - slinumLayout->tqsetAlignment(TQt::AlignVCenter); + slinumLayout->setAlignment(TQt::AlignVCenter); } // create labels to hold volume values (taken from qamix/kamix) @@ -285,7 +285,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slinumLayout->addWidget( number ); number->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); number->setLineWidth( 2 ); - number->setMinimumWidth( number->tqsizeHint().width() ); + number->setMinimumWidth( number->sizeHint().width() ); number->setPaletteBackgroundColor( TQColor(190, 250, 190) ); // don't show the value by default number->hide(); @@ -302,7 +302,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider = new TQSlider( 0, maxvol, maxvol/10, maxvol - m_mixdevice->getVolume( chid ), _orientation, this, m_mixdevice->name().ascii() ); - slider->setMinimumSize( slider->tqsizeHint() ); + slider->setMinimumSize( slider->sizeHint() ); } slider->setBackgroundOrigin(AncestorOrigin); @@ -330,11 +330,11 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) TQBoxLayout *rectqlayout; if ( _orientation == Qt::Vertical ) { rectqlayout = new TQHBoxLayout( sliLayout ); - rectqlayout->tqsetAlignment(TQt::AlignVCenter); + rectqlayout->setAlignment(TQt::AlignVCenter); } else { rectqlayout = new TQVBoxLayout( sliLayout ); - rectqlayout->tqsetAlignment(TQt::AlignHCenter); + rectqlayout->setAlignment(TQt::AlignHCenter); } if( m_mixdevice->isRecordable() ) { @@ -432,7 +432,7 @@ MDWSlider::setIcon( int icontype ) m_iconLabel->resize( 10, 10 ); } else m_iconLabel->setPixmap( miniDevPM ); - m_iconLabel->tqsetAlignment( TQt::AlignCenter ); + m_iconLabel->setAlignment( TQt::AlignCenter ); } else { kdError(67100) << "Pixmap missing." << endl; @@ -934,13 +934,13 @@ void MDWSlider::showContextMenu() menu->popup( pos ); } -TQSize MDWSlider::tqsizeHint() const { +TQSize MDWSlider::sizeHint() const { if ( _layout != 0 ) { - return _layout->tqsizeHint(); + return _layout->sizeHint(); } else { // tqlayout not (yet) created - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } } diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h index 61a95c96..49b3d700 100644 --- a/kmix/mdwslider.h +++ b/kmix/mdwslider.h @@ -77,7 +77,7 @@ public: void setValueStyle( ValueStyle valueStyle ); void setColors( TQColor high, TQColor low, TQColor back ); void setMutedColors( TQColor high, TQColor low, TQColor back ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool eventFilter( TQObject* obj, TQEvent* e ); TQSizePolicy sizePolicy() const; diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 056bca57..d16be452 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -79,11 +79,11 @@ void MDWSwitch::createWidgets() { if ( _orientation == Qt::Vertical ) { _layout = new TQVBoxLayout( this ); - _layout->tqsetAlignment(TQt::AlignHCenter); + _layout->setAlignment(TQt::AlignHCenter); } else { _layout = new TQHBoxLayout( this ); - _layout->tqsetAlignment(TQt::AlignVCenter); + _layout->setAlignment(TQt::AlignVCenter); } TQToolTip::add( this, m_mixdevice->name() ); @@ -164,13 +164,13 @@ void MDWSwitch::showContextMenu() menu->popup( pos ); } -TQSize MDWSwitch::tqsizeHint() const { +TQSize MDWSwitch::sizeHint() const { if ( _layout != 0 ) { - return _layout->tqsizeHint(); + return _layout->sizeHint(); } else { // tqlayout not (yet) created - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } } diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h index 6c6f3bbf..5b4b15e0 100644 --- a/kmix/mdwswitch.h +++ b/kmix/mdwswitch.h @@ -61,7 +61,7 @@ public: ~MDWSwitch(); void addActionToPopup( KAction *action ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setBackgroundMode(BackgroundMode m); bool eventFilter( TQObject* obj, TQEvent* e ); diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp index aabe8a23..77bda1af 100644 --- a/kmix/verticaltext.cpp +++ b/kmix/verticaltext.cpp @@ -46,7 +46,7 @@ void VerticalText::paintEvent ( TQPaintEvent * /*event*/ ) { paint.drawText( -height()+2, width(), TQString::fromUtf8(name()) ); } -TQSize VerticalText::tqsizeHint() const { +TQSize VerticalText::sizeHint() const { return TQSize(20,100); // !! UGLY. Should be reworked } diff --git a/kmix/verticaltext.h b/kmix/verticaltext.h index 1e621e83..c378bafc 100644 --- a/kmix/verticaltext.h +++ b/kmix/verticaltext.h @@ -9,7 +9,7 @@ public: VerticalText(TQWidget * parent, const char * name, WFlags f = 0); ~VerticalText(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy () const; protected: diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index 6b25dde0..cf2b15b6 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -56,11 +56,11 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas if ( _viewOrientation == Qt::Horizontal ) { _layoutMDW = new TQHBoxLayout( this ); - tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); + setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred); } else { _layoutMDW = new TQVBoxLayout( this ); - tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); } @@ -139,10 +139,10 @@ void ViewApplet::constructionFinished() { } -TQSize ViewApplet::tqsizeHint() const { +TQSize ViewApplet::sizeHint() const { // Basically out main tqlayout knows very good what the sizes should be - TQSize qsz = _layoutMDW->tqsizeHint(); - //kdDebug(67100) << "ViewApplet::tqsizeHint(): NewSize is " << qsz << "\n"; + TQSize qsz = _layoutMDW->sizeHint(); + //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n"; return qsz; } @@ -196,7 +196,7 @@ void ViewApplet::resizeEvent(TQResizeEvent *qre) // kdDebug(67100) << "ViewApplet::resizeEvent(). SHOULD resize _layoutMDW to " << qre->size() << endl; //TQWidget::resizeEvent(qre); - // resizing changes our own tqsizeHint(), because we must take the new PanelSize in account. + // resizing changes our own sizeHint(), because we must take the new PanelSize in account. // So updateGeometry() is amust for us. updateGeometry(); } diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h index 38d21465..400e45f5 100644 --- a/kmix/viewapplet.h +++ b/kmix/viewapplet.h @@ -25,7 +25,7 @@ public: virtual void constructionFinished(); virtual void configurationUpdate(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; virtual void resizeEvent(TQResizeEvent*); diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index 859993bb..ec9a3cd6 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -163,9 +163,9 @@ int ViewDockAreaPopup::advice() { } } -TQSize ViewDockAreaPopup::tqsizeHint() const { - // kdDebug(67100) << "ViewDockAreaPopup::tqsizeHint(): NewSize is " << _mdw->tqsizeHint() << "\n"; - return( _mdw->tqsizeHint() ); +TQSize ViewDockAreaPopup::sizeHint() const { + // kdDebug(67100) << "ViewDockAreaPopup::sizeHint(): NewSize is " << _mdw->sizeHint() << "\n"; + return( _mdw->sizeHint() ); } void ViewDockAreaPopup::constructionFinished() { @@ -173,8 +173,8 @@ void ViewDockAreaPopup::constructionFinished() { _mdw->move(0,0); _mdw->show(); - _mdw->resize(_mdw->tqsizeHint() ); - resize(tqsizeHint()); + _mdw->resize(_mdw->sizeHint() ); + resize(sizeHint()); } diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h index a31afa4b..7a30a1a0 100644 --- a/kmix/viewdockareapopup.h +++ b/kmix/viewdockareapopup.h @@ -32,7 +32,7 @@ public: virtual void refreshVolumeLevels(); virtual void showContextMenu(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool justHidden(); protected: diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp index 1aba7fcf..588f9c5e 100644 --- a/kmix/viewgrid.cpp +++ b/kmix/viewgrid.cpp @@ -126,9 +126,9 @@ TQWidget* ViewGrid::add(MixDevice *md) return mdw; } -TQSize ViewGrid::tqsizeHint() const { - // kdDebug(67100) << "ViewGrid::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; - return( m_tqsizeHint); +TQSize ViewGrid::sizeHint() const { + // kdDebug(67100) << "ViewGrid::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; + return( m_sizeHint); } void ViewGrid::constructionFinished() { @@ -141,8 +141,8 @@ void ViewGrid::constructionFinished() { void ViewGrid::refreshVolumeLevels() { // kdDebug(67100) << "ViewGrid::refreshVolumeLevels()\n"; - m_tqsizeHint.setWidth (0); - m_tqsizeHint.setHeight(0); + m_sizeHint.setWidth (0); + m_sizeHint.setHeight(0); m_testingX = 0; m_testingY = 0; @@ -182,8 +182,8 @@ void ViewGrid::refreshVolumeLevels() { after hiding/showing channels. */ void ViewGrid::configurationUpdate() { - m_tqsizeHint.setWidth (0); - m_tqsizeHint.setHeight(0); + m_sizeHint.setWidth (0); + m_sizeHint.setHeight(0); m_testingX = 0; m_testingY = 0; @@ -195,9 +195,9 @@ void ViewGrid::configurationUpdate() { int xPos = m_testingX * m_spacingHorizontal; int yPos = m_testingY * m_spacingVertical ; mdw->move( xPos, yPos ); - mdw->resize( mdw->tqsizeHint() ); - int xMax = xPos + mdw->width() ; if ( xMax > m_tqsizeHint.width() ) m_tqsizeHint.setWidth(xMax); - int yMax = yPos + mdw->height(); if ( yMax > m_tqsizeHint.height() ) m_tqsizeHint.setHeight(yMax); + mdw->resize( mdw->sizeHint() ); + int xMax = xPos + mdw->width() ; if ( xMax > m_sizeHint.width() ) m_sizeHint.setWidth(xMax); + int yMax = yPos + mdw->height(); if ( yMax > m_sizeHint.height() ) m_sizeHint.setHeight(yMax); m_testingX += 5; if ( m_testingX > 50 ) { diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h index 5fd1a183..48592a55 100644 --- a/kmix/viewgrid.h +++ b/kmix/viewgrid.h @@ -23,7 +23,7 @@ public: virtual void configurationUpdate(); virtual void constructionFinished(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); @@ -33,7 +33,7 @@ private: unsigned int m_spacingVertical; // m_maxX and m_maxY are the highest coordiantes encountered - TQSize m_tqsizeHint; + TQSize m_sizeHint; unsigned int m_testingX; unsigned int m_testingY; diff --git a/kmix/viewsliders.cpp b/kmix/viewsliders.cpp index 3cab3c6d..ea97e2aa 100644 --- a/kmix/viewsliders.cpp +++ b/kmix/viewsliders.cpp @@ -102,9 +102,9 @@ TQWidget* ViewSliders::add(MixDevice *md) return mdw; } -TQSize ViewSliders::tqsizeHint() const { - // kdDebug(67100) << "ViewSliders::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; - return( _layoutMDW->tqsizeHint() ); +TQSize ViewSliders::sizeHint() const { + // kdDebug(67100) << "ViewSliders::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; + return( _layoutMDW->sizeHint() ); } void ViewSliders::constructionFinished() { diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h index 168a425c..31e3fda9 100644 --- a/kmix/viewsliders.h +++ b/kmix/viewsliders.h @@ -21,7 +21,7 @@ public: virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index 5b2ac99f..81f84f64 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -162,9 +162,9 @@ TQWidget* ViewSurround::add(MixDevice *md) return mdw; } -TQSize ViewSurround::tqsizeHint() const { - // kdDebug(67100) << "ViewSurround::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; - return( _layoutMDW->tqsizeHint() ); +TQSize ViewSurround::sizeHint() const { + // kdDebug(67100) << "ViewSurround::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; + return( _layoutMDW->sizeHint() ); } void ViewSurround::constructionFinished() { diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h index de469292..4ba3c5cc 100644 --- a/kmix/viewsurround.h +++ b/kmix/viewsurround.h @@ -24,7 +24,7 @@ public: virtual TQWidget* add(MixDevice *mdw); virtual void constructionFinished(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index 3d3166bb..3c414815 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -46,7 +46,7 @@ ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & // Place enums right from the switches: This is done, so that there will be no // ugly space on the left side, when no Switch is shown. // Actually it is not really clear yet, why there is empty space at all: There are 0 items in - // the _layoutEnum, so it might be a tqsizeHint() or some other subtle tqlayout issue. + // the _layoutEnum, so it might be a sizeHint() or some other subtle tqlayout issue. _layoutEnum = new TQVBoxLayout(_layoutMDW); } init(); @@ -118,9 +118,9 @@ TQWidget* ViewSwitches::add(MixDevice *md) return mdw; } -TQSize ViewSwitches::tqsizeHint() const { - //kdDebug(67100) << "ViewSwitches::tqsizeHint(): NewSize is " << _layoutMDW->tqsizeHint() << "\n"; - return( _layoutMDW->tqsizeHint() ); +TQSize ViewSwitches::sizeHint() const { + //kdDebug(67100) << "ViewSwitches::sizeHint(): NewSize is " << _layoutMDW->sizeHint() << "\n"; + return( _layoutMDW->sizeHint() ); } void ViewSwitches::constructionFinished() { diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h index 9e591514..3ddb288f 100644 --- a/kmix/viewswitches.h +++ b/kmix/viewswitches.h @@ -22,7 +22,7 @@ public: virtual void constructionFinished(); virtual void configurationUpdate(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; public slots: virtual void refreshVolumeLevels(); diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp index cbcaba81..82eac246 100644 --- a/krec/krecfilewidgets.cpp +++ b/krec/krecfilewidgets.cpp @@ -189,18 +189,18 @@ void KRecBufferWidget::initLayout() { void KRecBufferWidget::drawFrame( TQPainter* p ) { //kdDebug( 60005 ) << k_funcinfo << endl; if ( _buffer->active() ) - p->setBrush( tqcolorGroup().highlight() ); + p->setBrush( colorGroup().highlight() ); else - p->setBrush( tqcolorGroup().highlight().dark() ); - p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); + p->setBrush( colorGroup().highlight().dark() ); + p->setPen( TQPen( colorGroup().dark(), 1 ) ); p->drawRect( _title_region->boundingRect() ); p->drawRect( _fileend_region->boundingRect() ); p->setBrush( TQBrush() ); - p->setPen( TQPen( tqcolorGroup().dark(), 1 ) ); + p->setPen( TQPen( colorGroup().dark(), 1 ) ); p->drawRect( _main_region->boundingRect() ); - p->setPen( TQPen( tqcolorGroup().highlightedText() ) ); + p->setPen( TQPen( colorGroup().highlightedText() ) ); p->drawText( _title_region->boundingRect(), TQt::AlignCenter, _buffer->title() ); } diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index 56ec7228..c8c1398f 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -53,7 +53,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; labelfont.setPointSize( labelfont.pointSize()*3/2 ); captionlabel->setFont( labelfont ); captionlabel->setText( i18n( "Properties for the new File" ) ); - captionlabel->tqsetAlignment( AlignCenter ); + captionlabel->setAlignment( AlignCenter ); _layout->addWidget( captionlabel ); _filewidget = new KRecConfigFilesWidget( this ); @@ -74,7 +74,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; _layout->addWidget( new KSeparator( KSeparator::HLine, this ) ); _layout->addWidget( _btnWidget ); - tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); + setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum ); } KRecNewProperties::~KRecNewProperties() { kdDebug( 60005 ) << k_funcinfo << endl; diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index 32223cb8..32f274df 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -95,7 +95,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; vorbis_comment_add_tag ( &vc, const_cast( "kde-encoder" ), const_cast( "KRec" ) ); if ( write_vorbis_comments ) { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); vorbis_comment_add_tag ( &vc, const_cast( "title" ), const_cast( "" ) ); vorbis_comment_add_tag ( &vc, const_cast( "artist" ), diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp index 385c0c74..bb9ca8c1 100644 --- a/kscd/bwlednum.cpp +++ b/kscd/bwlednum.cpp @@ -84,7 +84,7 @@ void BW_LED_Number::setLEDColor( const TQColor& fgColor, const TQColor& bgColor fgcolor = fgColor; bgcolor = bgColor; - TQColorGroup old_cg = this->tqcolorGroup(); + TQColorGroup old_cg = this->colorGroup(); TQColorGroup new_cg( fgColor, bgColor, @@ -277,7 +277,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter TQPoint pt = pos; - TQColorGroup g = tqcolorGroup(); + TQColorGroup g = colorGroup(); TQColor lightColor,darkColor; if ( erase ){ diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui index 1477a193..de755edf 100644 --- a/kscd/configWidgetUI.ui +++ b/kscd/configWidgetUI.ui @@ -84,7 +84,7 @@ Expanding - + 292 20 @@ -221,7 +221,7 @@ Expanding - + 171 81 @@ -401,7 +401,7 @@ Expanding - + 20 45 diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp index 83a9c532..ce2559ac 100644 --- a/kscd/kcompactdisc.cpp +++ b/kscd/kcompactdisc.cpp @@ -100,7 +100,7 @@ const unsigned KCompactDisc::missingDisc = (unsigned)-1; KCompactDisc::KCompactDisc(InformationMode infoMode) : m_device(TQString()), m_status(0), - m_previoustqStatus(123456), + m_previousStatus(123456), m_discId(missingDisc), m_previousDiscId(0), m_artist(TQString()), @@ -143,7 +143,7 @@ unsigned KCompactDisc::discPosition() const return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]); } -TQString KCompactDisc::disctqStatus(int status) +TQString KCompactDisc::discStatus(int status) { TQString message; @@ -282,7 +282,7 @@ bool KCompactDisc::setDevice( << m_device << ", " << (digitalPlayback ? audioSystem : TQString()) << ", " << (digitalPlayback ? audioDevice : TQString()) << ", status: " - << disctqStatus(status) << endl; + << discStatus(status) << endl; if (status < 0) { @@ -295,7 +295,7 @@ bool KCompactDisc::setDevice( setVolume(volume); } - m_previoustqStatus = m_status = wm_cd_status(); + m_previousStatus = m_status = wm_cd_status(); if (m_infoMode == Asynchronous) timerExpired(); @@ -307,7 +307,7 @@ bool KCompactDisc::setDevice( void KCompactDisc::setVolume(unsigned volume) { int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED); - kdDebug() << "Volume change: " << volume << ", status: " << disctqStatus(status) << endl; + kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl; } void KCompactDisc::stop() @@ -380,9 +380,9 @@ void KCompactDisc::timerExpired() if (WM_CDS_NO_DISC(m_status) || (m_device == TQString())) { - if (m_previoustqStatus != m_status) + if (m_previousStatus != m_status) { - m_previoustqStatus = m_status; + m_previousStatus = m_status; m_discId = missingDisc; m_previousDiscId = 0; m_trackArtists.clear(); @@ -450,12 +450,12 @@ void KCompactDisc::timerExpired() } if (isPlaying()) { - m_previoustqStatus = m_status; + m_previousStatus = m_status; // Update the current playing position. emit trackPlaying(m_track, trackPosition()); } else - if (m_previoustqStatus != m_status) + if (m_previousStatus != m_status) { // If we are not playing, then we are either paused, or stopped. switch (m_status) @@ -467,7 +467,7 @@ void KCompactDisc::timerExpired() emit trayOpening(); break; default: - if (m_previoustqStatus == WM_CDM_PLAYING || m_previoustqStatus == WM_CDM_PAUSED + if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED && m_status == WM_CDM_STOPPED) { emit discStopped(); @@ -475,7 +475,7 @@ void KCompactDisc::timerExpired() break; } - m_previoustqStatus = m_status; + m_previousStatus = m_status; } } diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h index 10d5eabb..eeb17989 100644 --- a/kscd/kcompactdisc.h +++ b/kscd/kcompactdisc.h @@ -281,7 +281,7 @@ private: TQTimer timer; TQString m_device; int m_status; - int m_previoustqStatus; + int m_previousStatus; unsigned m_discId; unsigned m_previousDiscId; TQString m_artist; @@ -292,8 +292,8 @@ private: TQStringList m_trackTitles; unsigned m_track; unsigned m_previousTrack; - void checkDevicetqStatus(); - TQString disctqStatus(int status); + void checkDeviceStatus(); + TQString discStatus(int status); class KCompactDiscPrivate *d; InformationMode m_infoMode; diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 74842d50..8c025ab2 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -212,7 +212,7 @@ KSCD::KSCD( TQWidget *parent, const char *name ) setFocusPolicy(TQ_NoFocus); - songListCB->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); + songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); adjustSize(); setFixedHeight(this->height()); } // KSCD @@ -688,7 +688,7 @@ void KSCD::randomSelected() { setShuffle(Prefs::randomPlay()?0:1); - /* FIXME this helps us to display "Random" in tqStatus line + /* FIXME this helps us to display "Random" in Status line should it maybe to be replaced with symbol "RAND" or something others */ statuslabel->setText(Prefs::randomPlay()?i18n("Random"):i18n("Play")); } // randomSelected @@ -1313,7 +1313,7 @@ int KSCD::currentPosition() return m_cd->trackPosition(); } -int KSCD::gettqStatus() +int KSCD::getStatus() { if (m_cd->isPlaying()) return 2; @@ -1563,11 +1563,11 @@ TQStringList KSCD::trackList() return tracks; } -void KSCD::populateSongList(TQString infotqStatus) +void KSCD::populateSongList(TQString infoStatus) { // set the artist and title labels as well as the dock tooltip. - if (!infotqStatus.isEmpty()) - artistlabel->setText(infotqStatus); + if (!infoStatus.isEmpty()) + artistlabel->setText(infoStatus); else artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title)); diff --git a/kscd/kscd.h b/kscd/kscd.h index a6c192bd..9a4e1044 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -102,7 +102,7 @@ k_dcop: int currentTrack(); int currentTrackLength(); int currentPosition(); - int gettqStatus(); + int getStatus(); TQString currentTrackTitle(); TQString currentAlbum(); TQString currentArtist(); @@ -175,7 +175,7 @@ protected: void calculateDisplayedTime(); void calculateDisplayedTime(int sec); void setSongListTo(int whichTrack); - void populateSongList(TQString infotqStatus); + void populateSongList(TQString infoStatus); void updatePlayPB(bool playing); void updateConfigDialog(configWidget* widget); diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h index 4d35e3e0..d359a8c2 100644 --- a/kscd/kscdmagic/syna.h +++ b/kscd/kscdmagic/syna.h @@ -160,7 +160,7 @@ enum SoundSource { SourceLine, SourceCD, SourcePipe }; void cdOpen(char *cdromName); void cdClose(void); -void cdGettqStatus(int &track, int &frames, SymbolID &state); +void cdGetStatus(int &track, int &frames, SymbolID &state); void cdPlay(int trackFrame, int endFrame=-1); void cdStop(void); void cdPause(void); diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c index 304ebfda..4b9f2ef7 100644 --- a/kscd/libwm/plat_news.c +++ b/kscd/libwm/plat_news.c @@ -181,7 +181,7 @@ int gen_get_drive_status( struct wm_drive *d, int oldmode, int *mode, int *pos, int *track, int *index) { - struct CD_tqStatus sc; + struct CD_Status sc; /* If we can't get status, the CD is ejected, so default to that. */ *mode = WM_CDM_EJECTED; @@ -199,7 +199,7 @@ gen_get_drive_status( struct wm_drive *d, int oldmode, } /* Disc is ejected. Close the device. */ - if (CD_GettqStatus(d->fd, &sc)) + if (CD_GetStatus(d->fd, &sc)) { gen_close(d); return (0); diff --git a/kscd/panel.ui b/kscd/panel.ui index 43fd739a..ab9203ec 100644 --- a/kscd/panel.ui +++ b/kscd/panel.ui @@ -92,7 +92,7 @@ Fixed - + 16 20 @@ -160,7 +160,7 @@ 0 - + 270 80 @@ -221,7 +221,7 @@ 0 - + 100 35 @@ -239,7 +239,7 @@ statuslabel - tqStatus + Status @@ -275,7 +275,7 @@ 0 - + 30 0 diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp index c11e086c..7cdfee6e 100644 --- a/libkcddb/cddb.cpp +++ b/libkcddb/cddb.cpp @@ -100,14 +100,14 @@ namespace KCDDB bool CDDB::parseGreeting( const TQString & line ) { - uint servertqStatus = statusCode( line ); + uint serverStatus = statusCode( line ); - if ( 200 == servertqStatus ) + if ( 200 == serverStatus ) { kdDebug(60010) << "Server response: read-only" << endl; readOnly_ = true; } - else if ( 201 == servertqStatus ) + else if ( 201 == serverStatus ) { kdDebug(60010) << "Server response: read-write" << endl; } @@ -123,9 +123,9 @@ namespace KCDDB bool CDDB::parseHandshake( const TQString & line ) { - uint servertqStatus = statusCode( line ); + uint serverStatus = statusCode( line ); - if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) ) + if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) ) { kdDebug(60010) << "Handshake was too tight. Letting go." << endl; return false; @@ -141,9 +141,9 @@ namespace KCDDB { TQStringList tokenList = TQStringList::split( ' ', line ); - uint servertqStatus = tokenList[ 0 ].toUInt(); + uint serverStatus = tokenList[ 0 ].toUInt(); - return servertqStatus; + return serverStatus; } /* CDDB::Transport diff --git a/libkcddb/cddb.h b/libkcddb/cddb.h index a848ffb8..38daf164 100644 --- a/libkcddb/cddb.h +++ b/libkcddb/cddb.h @@ -66,8 +66,8 @@ namespace KCDDB static TQString resultToString(Result); static TQString trackOffsetListToId( const TrackOffsetList & ); - static TQString clientName() { return TQString::tqfromLatin1("libkcddb"); } - static TQString clientVersion() { return TQString::tqfromLatin1("0.31"); } + static TQString clientName() { return TQString::fromLatin1("libkcddb"); } + static TQString clientVersion() { return TQString::fromLatin1("0.31"); } protected: bool parseGreeting( const TQString & ); diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui index 17a97eb0..0e2e2f35 100644 --- a/libkcddb/cdinfodialogbase.ui +++ b/libkcddb/cdinfodialogbase.ui @@ -292,7 +292,7 @@ Expanding - + 231 41 diff --git a/libkcddb/cdinfoencodingwidgetbase.ui b/libkcddb/cdinfoencodingwidgetbase.ui index e60d91b3..5605785c 100644 --- a/libkcddb/cdinfoencodingwidgetbase.ui +++ b/libkcddb/cdinfoencodingwidgetbase.ui @@ -55,7 +55,7 @@ songsBox - + 300 250 diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui index ecd8a587..d70a63db 100644 --- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui +++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui @@ -243,7 +243,7 @@ Expanding - + 41 260 @@ -286,7 +286,7 @@ Expanding - + 21 240 @@ -314,7 +314,7 @@ Fixed - + 21 21 @@ -331,7 +331,7 @@ Fixed - + 21 21 @@ -367,7 +367,7 @@ Fixed - + 20 140 @@ -517,7 +517,7 @@ Expanding - + 260 20 diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp index 25c7599e..e353ece9 100644 --- a/libkcddb/lookup.cpp +++ b/libkcddb/lookup.cpp @@ -38,19 +38,19 @@ namespace KCDDB CDDB::Result Lookup::parseQuery( const TQString & line ) { - uint servertqStatus = statusCode( line ); + uint serverStatus = statusCode( line ); - if ( 200 == servertqStatus ) + if ( 200 == serverStatus ) { TQStringList tokenList = TQStringList::split( ' ', line ); matchList_.append( tqMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); return Success; } - else if ( ( 211 == servertqStatus ) || ( 210 == servertqStatus ) ) + else if ( ( 211 == serverStatus ) || ( 210 == serverStatus ) ) { return MultipleRecordFound; } - else if ( 202 == servertqStatus ) + else if ( 202 == serverStatus ) { return NoRecordFound; } @@ -68,9 +68,9 @@ namespace KCDDB CDDB::Result Lookup::parseRead( const TQString & line ) { - uint servertqStatus = statusCode( line ); + uint serverStatus = statusCode( line ); - if ( 210 != servertqStatus ) + if ( 210 != serverStatus ) return ServerError; return Success; diff --git a/libkcddb/submit.cpp b/libkcddb/submit.cpp index 3f099c23..23f24f49 100644 --- a/libkcddb/submit.cpp +++ b/libkcddb/submit.cpp @@ -57,9 +57,9 @@ namespace KCDDB CDDB::Result Submit::parseWrite( const TQString & line ) { - uint servertqStatus = statusCode( line ); + uint serverStatus = statusCode( line ); - if ( 320 != servertqStatus ) + if ( 320 != serverStatus ) return ServerError; return Success; diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.cpp b/mpeglib/example/yaf/yafcore/inputDecoder.cpp index cc8aa0a5..e24b7758 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.cpp +++ b/mpeglib/example/yaf/yafcore/inputDecoder.cpp @@ -173,13 +173,13 @@ void InputDecoder::doSomething(){ -int InputDecoder::getDecodertqStatus() { +int InputDecoder::getDecoderStatus() { return status; } -void InputDecoder::setDecodertqStatus(int newState) { +void InputDecoder::setDecoderStatus(int newState) { // First start a new thread with start()! // Their is no recovery if the thread status is set to exit! diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h index 6382228d..0a5623a0 100644 --- a/mpeglib/example/yaf/yafcore/inputDecoder.h +++ b/mpeglib/example/yaf/yafcore/inputDecoder.h @@ -49,8 +49,8 @@ class KDE_EXPORT InputDecoder { virtual const char* processCommand(int command,const char* args); virtual void doSomething(); - virtual void setDecodertqStatus(int status); - int getDecodertqStatus(); + virtual void setDecoderStatus(int status); + int getDecoderStatus(); const char* getReturnCode(); diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp index 6192f36b..6e789588 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.cpp +++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp @@ -37,7 +37,7 @@ void yaf_control(InputInterface* input, while(1) { - status=decoder->getDecodertqStatus(); + status=decoder->getDecoderStatus(); if (status == _DECODER_STATUS_EXIT) { break; diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp index 0d1bd034..4b3bf3b3 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp @@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) : this->yafOutput=yafOutput; ct=new CommandTableXPlayer(); - setDecodertqStatus(_DECODER_STATUS_IDLE); + setDecoderStatus(_DECODER_STATUS_IDLE); appendCommandTable(ct); majorMode=_PLAYER_MAJOR_MODE_OFF; setRuntimeInfo(false); @@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ } if (command == _PLAYER_PLAY) { - setDecodertqStatus(_DECODER_STATUS_WORKING); + setDecoderStatus(_DECODER_STATUS_WORKING); setMajorMode(_PLAYER_MAJOR_MODE_PLAYING); return""; } diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 4aeb852f..5cfd23ed 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -482,15 +482,15 @@ bool Engine::initArts() X11CommConfig.sync(); } - cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))); + cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))); cmdline += " "; if (rt) cmdline += TQFile::encodeName(KStandardDirs::findExe( - TQString::tqfromLatin1("artswrapper"))); + TQString::fromLatin1("artswrapper"))); else cmdline += TQFile::encodeName(KStandardDirs::findExe( - TQString::tqfromLatin1("artsd"))); + TQString::fromLatin1("artsd"))); cmdline += " "; cmdline += config.readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f").utf8(); diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 7a55d6f7..2a476861 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -73,7 +73,7 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) tqlayout->addWidget(mSlider); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); - mLabel->tqsetAlignment(AlignHCenter | AlignVCenter); + mLabel->setAlignment(AlignHCenter | AlignVCenter); tqlayout->addWidget(mLabel); setMinimumHeight(200); diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui index 8a4b52eb..97f30430 100644 --- a/noatun/library/equalizerwidget.ui +++ b/noatun/library/equalizerwidget.ui @@ -54,7 +54,7 @@ Minimum - + 1 8 @@ -71,7 +71,7 @@ Minimum - + 1 8 @@ -227,7 +227,7 @@ Expanding - + 8 16 @@ -262,7 +262,7 @@ Minimum - + 8 16 @@ -301,7 +301,7 @@ Expanding - + 8 16 diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index c267aedd..de5bf276 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -44,8 +44,8 @@ class ScrollingLabel : public TQWidget **/ virtual void setText(const TQString &text, int time = -1); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /** * @return the label's text. diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 02c2f743..697b27b8 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -88,7 +88,7 @@ Visualization::Visualization(int timeout, int pid) int parent=pid ? pid : getppid(); if (getenv("NOATUN_PID")) - parent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt(); + parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt(); DCOPClient c; c.attach(); diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index 4484c872..678a7098 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -119,7 +119,7 @@ ScrollingLabel::_update() d->scrollSize = TQMAX(0, w - width()); d->buf.resize(w, h); - d->buf.fill(tqcolorGroup().background()); + d->buf.fill(colorGroup().background()); TQPainter p(&d->buf); p.setFont(font()); @@ -166,13 +166,13 @@ ScrollingLabel::scroll() } TQSize -ScrollingLabel::tqsizeHint() const +ScrollingLabel::sizeHint() const { return fontMetrics().boundingRect(d->text).size(); } TQSize -ScrollingLabel::tqminimumSizeHint() const +ScrollingLabel::minimumSizeHint() const { return TQSize(0, fontMetrics().height()); } diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index c04fcbd4..5c705d3c 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -304,7 +304,7 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead ) } } - if ( m_streamUrl.tqstartsWith( "www.", true ) ) + if ( m_streamUrl.startsWith( "www.", true ) ) m_streamUrl.prepend( "http://" ); m_sockProxy.writeBlock( m_headerStr.latin1(), m_headerStr.length() ); @@ -339,8 +339,8 @@ void Proxy::transmitData( const TQString &data ) emit metaData( m_streamName, m_streamGenre, m_streamUrl, m_bitRate, - extractStr(data, TQString::tqfromLatin1("StreamTitle")), - extractStr(data, TQString::tqfromLatin1("StreamUrl"))); + extractStr(data, TQString::fromLatin1("StreamTitle")), + extractStr(data, TQString::fromLatin1("StreamUrl"))); } diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index f2428bc4..d227c949 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -122,7 +122,7 @@ GlobalVideo::GlobalVideo() menu = video->popupMenu(this); // FIXME: How to obtain minimum size for top-level widgets? -// video->setMinimumSize(tqminimumSizeHint()); +// video->setMinimumSize(minimumSizeHint()); // video->setMinimumSize(101,35); video->setMinimumSize(128,96); diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 5d18d488..3b084d4e 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -107,10 +107,10 @@ Excellent::Excellent() labelFont.setBold(true); TQFontMetrics labelFontMetrics = labelFont; elapsed->setFont(labelFont); - elapsed->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); + elapsed->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); elapsed->setText("--:--"); elapsed->setFixedHeight(labelFontMetrics.height()); - elapsed->setMinimumWidth(elapsed->tqsizeHint().width()); + elapsed->setMinimumWidth(elapsed->sizeHint().width()); // Doing this makes the slider the same heigh as the font. This is just plain wrong... //slider->setFixedHeight(labelFontMetrics.height()); @@ -121,9 +121,9 @@ Excellent::Excellent() labelFont = total->font(); labelFont.setBold(true); total->setFont(labelFont); - total->tqsetAlignment(AlignCenter | AlignVCenter | ExpandTabs); + total->setAlignment(AlignCenter | AlignVCenter | ExpandTabs); total->setText("--:--"); - total->setMinimumWidth(total->tqsizeHint().width()); + total->setMinimumWidth(total->sizeHint().width()); total->setText(""); statusBar()->addWidget(total, 0, true); diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index 3a1e2b4e..2a4c53eb 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -213,19 +213,19 @@ Prefs::Prefs(TQObject *parent) txtColorLabel = new TQLabel( colorBox, "txtColorLabel" ); txtColorLabel->setText( i18n( "Text:" ) ); - txtColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgColorLabel = new TQLabel( colorBox, "bgColorLabel" ); bgColorLabel->setText( i18n( "Background:" ) ); - bgColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); headColorLabel = new TQLabel( colorBox, "headColorLabel" ); headColorLabel->setText( i18n( "Heading:" ) ); - headColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" ); hoverColorLabel->setText( i18n( "Link hover:" ) ); - hoverColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); + hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); bgcolorLabel->setRowStretch(0, 1); diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index 7cfc61e2..ef603f30 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -185,7 +185,7 @@ Preset_1_/.../Preset_10_Button: filename prelight x y [clip_filename] Items (with fixed number sections) ========================== -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/ +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/ Minus/Total_Item: filename x y filename @@ -401,7 +401,7 @@ Option line: | # images | Normal | Pressed | Prelit | Items (all item images contained vertically) -------------------------- -Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/tqStatus/Minus/Total_Item: filename x y +Stereo/Shuffle/Repeat/Mpegversion/Mpeglayer/Mpegmode/Status/Minus/Total_Item: filename x y Item: | # images | Image 1 | Image 2 | Image 3 | Image 4 | Image 5 | | total | | | | | | diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index a8b241f7..2a992040 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -335,13 +335,13 @@ void Kaiman::toggleSkin() TQString oldDesc, newDesc; if ( _altSkin ) { - oldDesc = TQString::tqfromLatin1("skindata"); - newDesc = TQString::tqfromLatin1("alt_skindata"); + oldDesc = TQString::fromLatin1("skindata"); + newDesc = TQString::fromLatin1("alt_skindata"); } else { - newDesc = TQString::tqfromLatin1("skindata"); - oldDesc = TQString::tqfromLatin1("alt_skindata"); + newDesc = TQString::fromLatin1("skindata"); + oldDesc = TQString::fromLatin1("alt_skindata"); } if ( !changeStyle(skinName, newDesc) ) @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::tqfromLatin1("kmix"), TQString() ); + kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); } diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui index 762d86b9..934285fa 100644 --- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui +++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui @@ -276,7 +276,7 @@ Expanding - + 20 60 @@ -320,7 +320,7 @@ titleScrollSpeed - + 80 0 @@ -428,7 +428,7 @@ Expanding - + 140 21 diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index a97acb98..c4339229 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -812,7 +812,7 @@ void KJLoader::showSplash() splashScreen->setBackgroundMode ( NoBackground ); splashScreen->setMask( KJWidget::getMask(image(item("splashscreen")[1])) ); - TQSize sh = splashScreen->tqsizeHint(); + TQSize sh = splashScreen->sizeHint(); TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); splashScreen->move (desk.x() + (desk.width() - sh.width())/2, diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui index 229d307e..17bce84d 100644 --- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui +++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui @@ -70,7 +70,7 @@ Expanding - + 20 31 @@ -87,7 +87,7 @@ Expanding - + 51 21 @@ -104,7 +104,7 @@ Expanding - + 20 41 @@ -121,7 +121,7 @@ Expanding - + 31 21 diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index b51841a4..566e291d 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -37,7 +37,7 @@ #include #include -static int getPlaytqStatus( Player *player ) +static int getPlayStatus( Player *player ) { if ( player->isPlaying() ) return 1; @@ -46,7 +46,7 @@ static int getPlaytqStatus( Player *player ) return 0; } -static void setPlaytqStatus( Player *player, int status ) +static void setPlayStatus( Player *player, int status ) { switch( status ) { @@ -114,7 +114,7 @@ void Marquis::saveSessionConfig(KConfig *c) c->writePathEntry("Current Song", TQString()); c->writeEntry("Current Position", player->getTime()); - c->writeEntry("PlayStatus", getPlaytqStatus( player )); + c->writeEntry("PlayStatus", getPlayStatus( player )); // borrowed from Plugin config dialog TQStringList specList; diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 89c123a4..6e37347c 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -37,9 +37,9 @@ Editor::Editor() TQHBox *heading = new TQHBox(mMainWidget, "Editor::heading"); heading->setSpacing(4); mFileIcon = new TQLabel(heading); - mFileIcon->tqsetAlignment(AlignVCenter | AlignLeft); + mFileIcon->setAlignment(AlignVCenter | AlignLeft); mFile = new TQLabel(heading); - mFile->tqsetAlignment(AlignVCenter | AlignLeft); + mFile->setAlignment(AlignVCenter | AlignLeft); heading->setStretchFactor(mFile, 2); mGrid->addMultiCellWidget(heading, 0, 0, 0, 2); @@ -53,7 +53,7 @@ Editor::Editor() connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save())); enableButtonSeparator(true); - setFixedHeight(tqsizeHint().height()); + setFixedHeight(sizeHint().height()); } void Editor::open(const PlaylistItem & file) diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 07ff7e15..9d19b166 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -140,7 +140,7 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() show(); // What it is now, stay, stay.. roll over, good boy! - setFixedSize(tqminimumSize()); + setFixedSize(minimumSize()); } MilkChocolate::~MilkChocolate() diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index 8712ed1a..21fd0686 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -51,7 +51,7 @@ nameField - + 180 0 @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -142,13 +142,13 @@ TextLabel2_2 - + 25 0 - + 25 32767 @@ -241,13 +241,13 @@ TextLabel2 - + 80 0 - + 80 32767 @@ -305,7 +305,7 @@ Expanding - + 20 20 diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 591335f9..2661f27c 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -74,7 +74,7 @@ SimpleUI::SimpleUI() napp->player()->handleButtons(); - resize( tqminimumSize() ); + resize( minimumSize() ); // Show UI and calculate video widget frame show(); @@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget() npWidget->setSpacing( 0 ); positionLabel = new TQLabel( statusBar() ); - positionLabel->tqsetAlignment( AlignVCenter | AlignCenter ); + positionLabel->setAlignment( AlignVCenter | AlignCenter ); positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) ); statusBar()->addWidget( positionLabel, 0, true ); @@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget() volumeLabel = new TQLabel( volumeFrame ); volumeLabel->setText( "100%" ); - volumeLabel->tqsetAlignment( AlignCenter ); - volumeLabel->setFixedSize( volumeLabel->tqsizeHint() ); + volumeLabel->setAlignment( AlignCenter ); + volumeLabel->setFixedSize( volumeLabel->sizeHint() ); TQHBox *volumeSubFrame = new TQHBox( volumeFrame ); volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame ); volumeSlider->setValue( 100 - napp->player()->volume() ); - volumeSlider->setFixedSize( volumeSlider->tqsizeHint() ); + volumeSlider->setFixedSize( volumeSlider->sizeHint() ); - volumeFrame->resize( volumeFrame->tqsizeHint() ); + volumeFrame->resize( volumeFrame->sizeHint() ); connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); @@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget() setCentralWidget( npWidget ); - video->setMinimumSize( tqminimumSizeHint().width(), 1 ); + video->setMinimumSize( minimumSizeHint().width(), 1 ); // Create properties dialog propertiesDialog = new PropertiesDialog( this ); diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index 787791ac..3d42d566 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -217,13 +217,13 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC) if (now) now->setPixmap(0, TQPixmap()); - TQRect rect(view->listView()->tqitemRect(static_cast(current().data()))); + TQRect rect(view->listView()->itemRect(static_cast(current().data()))); rect.setWidth(view->listView()->viewport()->width()); currentItem=i; view->listView()->viewport()->tqrepaint(rect,true); view->listView()->ensureItemVisible(static_cast(current().data())); - TQRect currentRect= view->listView()->tqitemRect(static_cast(current().data())); + TQRect currentRect= view->listView()->itemRect(static_cast(current().data())); view->listView()->viewport()->tqrepaint(currentRect); now=static_cast(current().data()); diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp index 95bbb698..a0b545ab 100644 --- a/noatun/modules/systray/kitsystemtray.cpp +++ b/noatun/modules/systray/kitsystemtray.cpp @@ -47,7 +47,7 @@ KitSystemTray::KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name) : KSystemTray(parent, name) { - tqsetAlignment(AlignHCenter | AlignVCenter); + setAlignment(AlignHCenter | AlignVCenter); menu = (KPopupMenu *)parent->guiFactory()->container(contextMenu, parent); menu->insertTitle(SmallIcon("noatun"), TQString(), 0, 0); setAcceptDrops(true); diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index c298df37..3303ad6a 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -91,7 +91,7 @@ protected: NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), - mTray(0), traytqStatus(0), trayBase(0), mPassivePopup(0L) + mTray(0), trayStatus(0), trayBase(0), mPassivePopup(0L) { //self = this; hide(); @@ -118,10 +118,10 @@ NoatunSystray::NoatunSystray() : KMainWindow(0, "NoatunSystray"), Plugin(), mTray->show(); trayBase = renderIcon(BASEICON, TQString()); - traytqStatus = renderIcon(BASEICON, "player_stop"); + trayStatus = renderIcon(BASEICON, "player_stop"); mTray->changeTitle(*trayBase, i18n("Noatun")); - showingTraytqStatus = false; + showingTrayStatus = false; mBlinkTimer = new TQTimer(this); connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); @@ -138,7 +138,7 @@ NoatunSystray::~NoatunSystray() //kdDebug(66666) << k_funcinfo << "Called." << endl; removeCover(); delete trayBase; - delete traytqStatus; + delete trayStatus; napp->showInterfaces(); } @@ -263,9 +263,9 @@ void NoatunSystray::slotStopped() void NoatunSystray::changeTray(const TQString &pm) { - delete traytqStatus; - traytqStatus = renderIcon(BASEICON, pm); - if(showingTraytqStatus) + delete trayStatus; + trayStatus = renderIcon(BASEICON, pm); + if(showingTrayStatus) slotBlinkTimer(); } @@ -275,18 +275,18 @@ void NoatunSystray::slotBlinkTimer() switch(YHConfig::self()->stateIconDisplay()) { case (YHConfig::FlashingIcon): - showingTraytqStatus ^= true; + showingTrayStatus ^= true; break; case (YHConfig::StaticIcon): - showingTraytqStatus = true; + showingTrayStatus = true; break; case (YHConfig::NoIcon): - showingTraytqStatus = false; + showingTrayStatus = false; break; } - if(showingTraytqStatus) - mTray->setPixmap(*traytqStatus); + if(showingTrayStatus) + mTray->setPixmap(*trayStatus); else mTray->setPixmap(*trayBase); } diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h index 11743a22..efab29be 100644 --- a/noatun/modules/systray/systray.h +++ b/noatun/modules/systray/systray.h @@ -69,11 +69,11 @@ private: private: KitSystemTray *mTray; TQTimer *mBlinkTimer; - TQPixmap *traytqStatus; + TQPixmap *trayStatus; TQPixmap *trayBase; PassivePopup *mPassivePopup; - bool showingTraytqStatus; + bool showingTrayStatus; TQString tipText; TQString tmpCoverPath; }; diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui index f63d7319..3c14d3df 100644 --- a/noatun/modules/systray/yhconfigwidget.ui +++ b/noatun/modules/systray/yhconfigwidget.ui @@ -169,7 +169,7 @@ Expanding - + 20 81 @@ -299,7 +299,7 @@ Expanding - + 20 21 diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index fb923994..05aa6381 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) completePixmap = new TQPixmap(); - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); completePixmap->resize(size.width(), size.height()); xGrabbedPos = -1; @@ -65,7 +65,7 @@ void WaInfo::scrollerSetup() xScrollPos = 0; xScrollDirection = 0; timer->stop(); - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); if (completePixmap->width() > size.width()) { xScrollDirection = 1; @@ -79,7 +79,7 @@ void WaInfo::scrollerSetup() void WaInfo::paintEvent(TQPaintEvent *) { - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); if (completePixmap->width() <= size.width()) { bitBlt(this, 0, 0, completePixmap); @@ -127,7 +127,7 @@ void WaInfo::pixmapChange() int x = 0; int n=infoString ? strlen(infoString) : 0; - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index bb16d118..71f2baa2 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping) completePixmap = new TQPixmap(); - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); completePixmap->resize(size.width(), size.height()); } diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index e4770b7f..c2da5eb8 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() createHighLevelElements(); createButtons(); - setMinimumSize(tqsizeHint()); - setMaximumSize(tqsizeHint()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); KWin::setType(this->winId(), NET::Override); setBackgroundMode(NoBackground); @@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir) { waSkinManager->loadSkin(newSkinDir); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); if (title_shaded) { // waSkinModel::load() resets our skin model :( @@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir) } } -TQSize WaSkin::tqsizeHint() const +TQSize WaSkin::sizeHint() const { TQRect temp_rect; @@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements() waInfo = new WaInfo(); - watqStatus = new WatqStatus(); + waStatus = new WaStatus(); waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE); waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE); @@ -337,7 +337,7 @@ void WaSkin::setChannels(int val) void WaSkin::shade() { waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); setMask(*windowRegion->mainWindowShadeMask()); title_shaded = true; @@ -346,7 +346,7 @@ void WaSkin::shade() { void WaSkin::unshade() { waSkinModel->setSkinModel(WA_MODEL_NORMAL); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); setMask(*windowRegion->mainWindowMask()); title_shaded = false; @@ -679,7 +679,7 @@ void WaSkin::volumeSetValue(int val) void WaSkin::slotPlaying() { - watqStatus->settqStatus(STATUS_PLAYING); + waStatus->setStatus(STATUS_PLAYING); if (!napp->playlist()->current()) { return; @@ -710,7 +710,7 @@ void WaSkin::slotPlaying() void WaSkin::slotStopped() { - watqStatus->settqStatus(STATUS_STOPPED); + waStatus->setStatus(STATUS_STOPPED); waDigit->setTime(""); @@ -733,7 +733,7 @@ void WaSkin::slotStopped() void WaSkin::slotPaused() { - watqStatus->settqStatus(STATUS_PAUSED); + waStatus->setStatus(STATUS_PAUSED); } void WaSkin::keyPressEvent(TQKeyEvent *e) { diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h index 5c363428..842a17d7 100644 --- a/noatun/modules/winskin/waSkin.h +++ b/noatun/modules/winskin/waSkin.h @@ -33,7 +33,7 @@ class WaMain; class WaIndicator; class WaTitleBar; class WaClutterbar; -class WatqStatus; +class WaStatus; class WaJumpSlider; class WaVolumeSlider; @@ -60,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface { void loadSkin(TQString skinDir); void setChannels(int val); - TQSize tqsizeHint() const; + TQSize sizeHint() const; static TQString defaultSkin(); static WaSkin *instance() { return _waskin_instance; } @@ -159,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface { WaLabel *waFreq; WaInfo *waInfo; - WatqStatus *watqStatus; + WaStatus *waStatus; WaIndicator *waStereo; WaIndicator *waMono; diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp index 3323e7ee..8c97c272 100644 --- a/noatun/modules/winskin/waSlider.cpp +++ b/noatun/modules/winskin/waSlider.cpp @@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e) if (newX < 0) newX = 0; - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); int maxX = size.width() - slider_width; @@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e) int WaSlider::pixel2Value(int xpos) { - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); int min = abs(minValue); int max = abs(maxValue); @@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos) int WaSlider::value2Pixel(int value) { - TQSize size = tqsizeHint(); + TQSize size = sizeHint(); float min = (float) minValue; float max = (float) maxValue; float fmin = min; diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp index 20f95d92..861e8677 100644 --- a/noatun/modules/winskin/waStatus.cpp +++ b/noatun/modules/winskin/waStatus.cpp @@ -14,16 +14,16 @@ #include "waStatus.h" #include "waSkinModel.h" -WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS) +WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS) { _status = STATUS_STOPPED; } -WatqStatus::~WatqStatus() +WaStatus::~WaStatus() { } -void WatqStatus::paintEvent(TQPaintEvent *) +void WaStatus::paintEvent(TQPaintEvent *) { if (_status == STATUS_PLAYING) { paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR); diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h index e028f318..3508ddca 100644 --- a/noatun/modules/winskin/waStatus.h +++ b/noatun/modules/winskin/waStatus.h @@ -22,15 +22,15 @@ enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED}; -class WatqStatus : public WaWidget { +class WaStatus : public WaWidget { Q_OBJECT TQ_OBJECT public: - WatqStatus(); - ~WatqStatus(); + WaStatus(); + ~WaStatus(); - void settqStatus(status_enum status) { _status = status; update(); } + void setStatus(status_enum status) { _status = status; update(); } status_enum status() const { return _status; } private: diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index 0b792c7c..4a44f252 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -41,7 +41,7 @@ void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); } -TQSize WaWidget::tqsizeHint() { +TQSize WaWidget::sizeHint() { return WaSkinModel::instance()->getMapGeometry(mapping).size(); } diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index d1fb1d9c..b8b5cb3f 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -11,7 +11,7 @@ public: WaWidget(int mapping); virtual ~WaWidget(); - TQSize tqsizeHint(); + TQSize sizeHint(); void paintPixmap(int wa_mapping); void paintPixmap(int wa_mapping, int number);