From cc17a105bc9cf5683ff3f208214068c571fcde59 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:07 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit 3c299dfe48c0060272c2966fff599b3b417e2ee4) --- 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 ++++----- noatun/modules/kjofol-skin/kjguisettingswidget.ui | 6 +++--- noatun/modules/kjofol-skin/kjloader.cpp | 2 +- noatun/modules/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 +- 34 files changed, 112 insertions(+), 112 deletions(-) (limited to 'noatun') diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 36863a0c..00f26022 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("kdeinit_wrapper"))); + cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_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 86c4f500..f5e5b00e 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 47e8a8b7..83e33921 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 ae25f152..cc6007c0 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 0aeb2fc8..012d3b67 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 d7ddd1bf..a84e66f2 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 aae49bf9..4168642e 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); -- cgit v1.2.1