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 +- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'noatun/library') 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); -- cgit v1.2.1