summaryrefslogtreecommitdiffstats
path: root/noatun
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:11 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:49:11 -0600
commit83fbc82a101309e171089f0d5ed080f82a367345 (patch)
treec7b61083b6e2d4bfceaace9a7f018181ea36afec /noatun
parentb248983f92b865ef74636ab5a673ae3a88f79c20 (diff)
downloadtdemultimedia-83fbc82a101309e171089f0d5ed080f82a367345.tar.gz
tdemultimedia-83fbc82a101309e171089f0d5ed080f82a367345.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'noatun')
-rw-r--r--noatun/library/app.cpp2
-rw-r--r--noatun/library/cmodule.cpp30
-rw-r--r--noatun/library/effects.cpp2
-rw-r--r--noatun/library/effectview.cpp4
-rw-r--r--noatun/library/engine.cpp6
-rw-r--r--noatun/library/equalizer.cpp2
-rw-r--r--noatun/library/equalizerview.cpp12
-rw-r--r--noatun/library/equalizerwidget.ui20
-rw-r--r--noatun/library/ksaver.cpp2
-rw-r--r--noatun/library/ksaver.h2
-rw-r--r--noatun/library/noatun/scrollinglabel.h4
-rw-r--r--noatun/library/noatuntags/tags.cpp2
-rw-r--r--noatun/library/playlistsaver.cpp12
-rw-r--r--noatun/library/plugin.cpp6
-rw-r--r--noatun/library/pluginmodule.cpp2
-rw-r--r--noatun/library/pref.cpp2
-rw-r--r--noatun/library/scrollinglabel.cpp10
-rw-r--r--noatun/library/titleproxy.cpp16
-rw-r--r--noatun/library/vequalizer.cpp2
-rw-r--r--noatun/library/video.cpp4
-rw-r--r--noatun/modules/artseffects/extrastereogui_impl.cc2
-rw-r--r--noatun/modules/excellent/userinterface.cpp12
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp10
-rw-r--r--noatun/modules/htmlexport/htmlexport.h4
-rw-r--r--noatun/modules/infrared/irprefs.cpp32
-rw-r--r--noatun/modules/kaiman/SKIN-SPECS10
-rw-r--r--noatun/modules/kaiman/pref.cpp2
-rw-r--r--noatun/modules/kaiman/skins/circle/README4
-rw-r--r--noatun/modules/kaiman/skins/circle/skindata6
-rw-r--r--noatun/modules/kaiman/skins/circle/skindata_alt6
-rw-r--r--noatun/modules/kaiman/style.cpp26
-rw-r--r--noatun/modules/kaiman/style.h2
-rw-r--r--noatun/modules/kaiman/userinterface.cpp18
-rw-r--r--noatun/modules/keyz/keyz.cpp8
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp8
-rw-r--r--noatun/modules/kjofol-skin/kjequalizer.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjequalizer.h2
-rw-r--r--noatun/modules/kjofol-skin/kjguisettingswidget.ui6
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp6
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp4
-rw-r--r--noatun/modules/kjofol-skin/kjseeker.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjskinselectorwidget.ui10
-rw-r--r--noatun/modules/kjofol-skin/kjsliders.cpp20
-rw-r--r--noatun/modules/kjofol-skin/kjtextdisplay.cpp20
-rw-r--r--noatun/modules/kjofol-skin/kjvis.cpp30
-rw-r--r--noatun/modules/kjofol-skin/kjwidget.cpp4
-rw-r--r--noatun/modules/kjofol-skin/kjwidget.h4
-rw-r--r--noatun/modules/kjofol-skin/parser.cpp2
-rw-r--r--noatun/modules/marquis/marquis.cpp6
-rw-r--r--noatun/modules/metatag/edit.cpp8
-rw-r--r--noatun/modules/metatag/metatag.cpp2
-rw-r--r--noatun/modules/monoscope/monoscope.cpp4
-rw-r--r--noatun/modules/noatunui/userinterface.cpp6
-rw-r--r--noatun/modules/simple/propertiesdialog.ui16
-rw-r--r--noatun/modules/simple/propertiesdialog.ui.h2
-rw-r--r--noatun/modules/simple/userinterface.cpp14
-rw-r--r--noatun/modules/splitplaylist/find.cpp12
-rw-r--r--noatun/modules/splitplaylist/playlist.cpp8
-rw-r--r--noatun/modules/splitplaylist/view.cpp6
-rw-r--r--noatun/modules/systray/cmodule.cpp2
-rw-r--r--noatun/modules/systray/kitsystemtray.cpp2
-rw-r--r--noatun/modules/systray/systray.cpp40
-rw-r--r--noatun/modules/systray/systray.h4
-rw-r--r--noatun/modules/systray/yhconfigwidget.ui6
-rw-r--r--noatun/modules/voiceprint/prefs.cpp2
-rw-r--r--noatun/modules/voiceprint/voiceprint.cpp6
-rw-r--r--noatun/modules/winskin/waInfo.cpp10
-rw-r--r--noatun/modules/winskin/waLabel.cpp2
-rw-r--r--noatun/modules/winskin/waSkin.cpp26
-rw-r--r--noatun/modules/winskin/waSkin.h6
-rw-r--r--noatun/modules/winskin/waSlider.cpp6
-rw-r--r--noatun/modules/winskin/waStatus.cpp6
-rw-r--r--noatun/modules/winskin/waStatus.h8
-rw-r--r--noatun/modules/winskin/waWidget.cpp2
-rw-r--r--noatun/modules/winskin/waWidget.h2
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp6
76 files changed, 312 insertions, 312 deletions
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 9f28ec0f..f3077e13 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -34,7 +34,7 @@
#include <tqimage.h>
#include <qiomanager.h>
#include <tqsessionmanager.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <signal.h>
#include <kmimetype.h>
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 2924e1bc..0301c7e8 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -7,7 +7,7 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kdebug.h>
#include <klistview.h>
@@ -19,7 +19,7 @@
#include <kdialog.h>
#include <klineedit.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqwhatsthis.h>
#include "mimetypetree.h"
@@ -88,24 +88,24 @@ General::General(TQObject *parent)
b->toggle();
}
- TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint());
- tqlayout->setSpacing(KDialog::spacingHint());
+ TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint());
+ layout->setSpacing(KDialog::spacingHint());
- tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
- tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
- tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
- tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
- tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
+ layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
+ layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
+ layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
+ layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
+ layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
- tqlayout->addWidget(titleLabel, 7, 0);
- tqlayout->addWidget(mTitleFormat, 7, 1);
+ layout->addWidget(titleLabel, 7, 0);
+ layout->addWidget(mTitleFormat, 7, 1);
- tqlayout->addWidget(dlsaver, 8, 0);
- tqlayout->addWidget(mDlSaver, 8, 1);
+ layout->addWidget(dlsaver, 8, 0);
+ layout->addWidget(mDlSaver, 8, 1);
- tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
+ layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
- tqlayout->setRowStretch(10, 1);
+ layout->setRowStretch(10, 1);
}
diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp
index 6815a90a..4e40fb56 100644
--- a/noatun/library/effects.cpp
+++ b/noatun/library/effects.cpp
@@ -7,7 +7,7 @@
#include <player.h>
#include <soundserver.h>
#include <noatunarts.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <config.h>
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index cd9e7d93..0a891ec6 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -34,9 +34,9 @@
#include <tqheader.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqtoolbutton.h>
#include <tqvgroupbox.h>
#include <tqwhatsthis.h>
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/equalizer.cpp b/noatun/library/equalizer.cpp
index ae86d00f..2bfcd239 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -11,7 +11,7 @@
#include <tqdom.h>
#include <kio/netaccess.h>
#include <kstandarddirs.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <math.h>
#include <kconfig.h>
#include <klocale.h>
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 7a55d6f7..02a14672 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -11,7 +11,7 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqslider.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
@@ -64,17 +64,17 @@ void PresetList::rename(TQListViewItem *item, int c)
EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
: TQWidget(parent), mBand(band)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this,
- 0, 0, "EqualizerLevel::tqlayout");
+ TQVBoxLayout *layout = new TQVBoxLayout(this,
+ 0, 0, "EqualizerLevel::layout");
mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider");
mSlider->setTickmarks(TQSlider::Left);
mSlider->setTickInterval(25);
- tqlayout->addWidget(mSlider);
+ layout->addWidget(mSlider);
connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
mLabel = new TQLabel("", this, "EqualizerLevel::mLabel");
- mLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
- tqlayout->addWidget(mLabel);
+ mLabel->setAlignment(AlignHCenter | AlignVCenter);
+ layout->addWidget(mLabel);
setMinimumHeight(200);
// setMinimumWidth(kapp->fontMetrics().width("158kHz"));
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui
index 8a4b52eb..7ec3329f 100644
--- a/noatun/library/equalizerwidget.ui
+++ b/noatun/library/equalizerwidget.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -37,7 +37,7 @@
<property name="text">
<string>Pre&amp;amp:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>1</width>
<height>8</height>
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>1</width>
<height>8</height>
@@ -80,7 +80,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -122,7 +122,7 @@
<property name="text">
<string>+/-</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>8</width>
<height>16</height>
@@ -238,7 +238,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>8</width>
<height>16</height>
@@ -301,7 +301,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>8</width>
<height>16</height>
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index fe2ed649..40b3606c 100644
--- a/noatun/library/ksaver.cpp
+++ b/noatun/library/ksaver.cpp
@@ -78,7 +78,7 @@ bool Noatun::KSaver::open(void)
}
else
{
- d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL());
+ d->error = i18n("Could not write to %1.").arg(d->url.prettyURL());
return false;
}
}
diff --git a/noatun/library/ksaver.h b/noatun/library/ksaver.h
index 91fc4af8..cf1e6a87 100644
--- a/noatun/library/ksaver.h
+++ b/noatun/library/ksaver.h
@@ -27,7 +27,7 @@
#include <kurl.h>
#include <tqfile.h>
#include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatastream.h>
namespace Noatun
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/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index b1ea94d5..4069b510 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -4,7 +4,7 @@
#include <tqslider.h>
#include <tqspinbox.h>
#include <kconfig.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqtimer.h>
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index f5bd09bd..6541a6b6 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -2,7 +2,7 @@
#include <tqdom.h>
#include <kio/netaccess.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <noatun/app.h>
#include "ksaver.h"
#include <ksimpleconfig.h>
@@ -107,7 +107,7 @@ bool PlaylistSaver::metalist(const KURL &url)
TQMap<TQString,TQString> map;
map["playObject"]="Arts::StreamPlayObject";
- map["title"] = i18n("Stream from %1").tqarg(url.host());
+ map["title"] = i18n("Stream from %1").arg(url.host());
KURL u(url);
if (!u.hasPath())
@@ -303,7 +303,7 @@ public:
else
{
propMap["playObject"]="SplayPlayObject";
- propMap["title"] = i18n("Stream from %1").tqarg(url.host());
+ propMap["title"] = i18n("Stream from %1").arg(url.host());
if (!url.hasPath())
url.setPath("/");
propMap["url"] = url.url();
@@ -556,7 +556,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
{
prop["playObject"]="SplayPlayObject";
// Default title, might be overwritten by #EXTINF later
- prop["title"] = i18n("Stream from %1").tqarg(protourl.host());
+ prop["title"] = i18n("Stream from %1").arg(protourl.host());
if (!protourl.hasPath())
protourl.setPath("/");
@@ -748,9 +748,9 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/)
map["playObject"]="SplayPlayObject";
if (title.isEmpty())
- map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() );
+ map["title"] = i18n("Stream from %1 (port: %2)").arg( url.host() ).arg( url.port() );
else
- map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() );
+ map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() );
map["url"] = map["stream_"]= url.url();
diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp
index 02c2f743..3c5b6f5d 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -88,13 +88,13 @@ 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();
TQCString appids[2];
- appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit();
+ appids[0]=TQString("noatun-%1").arg(parent).local8Bit();
appids[1]="noatun";
TQCString &appid=appids[0];
@@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
TQCString appids[2];
- appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit();
+ appids[0]=TQString("noatun-%1").arg(pid).local8Bit();
appids[1]="noatun";
appid=appids[0];
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index dd30111e..4a6193f5 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -28,7 +28,7 @@
#include <tqtabwidget.h>
#include <tqheader.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "noatunlistview.h"
#include "pluginmodule.h"
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 98c05453..4a304da8 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -4,7 +4,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
//#include <tqlabel.h>
#include "cmodule.h"
diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp
index 4484c872..c2c9dae8 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());
@@ -128,7 +128,7 @@ ScrollingLabel::_update()
if (d->scroll && (d->scrollSize > 0))
d->scrollTimer.start(100, true);
- tqrepaint(false);
+ repaint(false);
}
void
@@ -149,7 +149,7 @@ ScrollingLabel::scroll()
{
d->scrollTimer.stop();
- tqrepaint(false);
+ repaint(false);
int scrollTime = 100;
@@ -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..438504eb 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT
"%3"
"%4"
"\r\n" )
- .tqarg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) )
- .tqarg( m_url.host() )
- .tqarg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() )
- .tqarg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() )
- .tqarg( NOATUN_VERSION );
+ .arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) )
+ .arg( m_url.host() )
+ .arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() )
+ .arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() )
+ .arg( NOATUN_VERSION );
m_sockRemote.writeBlock( request.latin1(), request.length() );
@@ -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/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 71a40663..4c9eebe8 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -57,7 +57,7 @@
#include <klocale.h>
#include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <math.h>
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index f2428bc4..86645d42 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -110,7 +110,7 @@ void VideoFrame::stopped()
}
}
-#include <tqlayout.h>
+#include <layout.h>
GlobalVideo::GlobalVideo()
@@ -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/artseffects/extrastereogui_impl.cc b/noatun/modules/artseffects/extrastereogui_impl.cc
index 92148ba0..27e0a8f9 100644
--- a/noatun/modules/artseffects/extrastereogui_impl.cc
+++ b/noatun/modules/artseffects/extrastereogui_impl.cc
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
#include <tqslider.h>
#include "extrastereogui_impl.h"
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 5d18d488..95ad2bbb 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -54,7 +54,7 @@
#include <tqbitmap.h>
#include <tqdragobject.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqobjectlist.h>
#include <tqobjectdict.h>
#include <tqpushbutton.h>
@@ -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);
@@ -335,7 +335,7 @@ void Excellent::showMenubar(void)
}
else
{
- KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
+ KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
menuBar()->hide();
}
}
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 3a1e2b4e..b48f130f 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -1,6 +1,6 @@
#include <klocale.h>
#include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kaction.h>
#include <noatun/stdaction.h>
#include "htmlexport.h"
@@ -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/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 663eaae0..c67634e5 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -3,13 +3,13 @@
#define _HTMLEXPORT_H_
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqlabel.h>
#include <tqhgroupbox.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index c83326ad..fb81199d 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -1,5 +1,5 @@
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <noatun/app.h>
@@ -54,35 +54,35 @@ TQMap<TQString, IRPrefs::Command> IRPrefs::s_commands;
IRPrefs::IRPrefs(TQObject *parent)
: CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent)
{
- TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
- tqlayout->setColStretch(1, 1);
+ TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint());
+ layout->setColStretch(1, 1);
TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this);
- tqlayout->addMultiCellWidget(label, 0, 0, 0, 4);
+ layout->addMultiCellWidget(label, 0, 0, 0, 4);
label->setBuddy(m_commands = new KListView(this));
- tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
+ layout->addMultiCellWidget(m_commands, 1, 1, 0, 4);
label = new TQLabel(i18n("&Action:"), this);
- tqlayout->addWidget(label, 2, 0);
+ layout->addWidget(label, 2, 0);
label->setBuddy(m_action = new KComboBox(this));
m_action->setEnabled(false);
- tqlayout->addWidget(m_action, 2, 1);
+ layout->addWidget(m_action, 2, 1);
m_repeat = new TQCheckBox(i18n("&Repeat"), this);
m_repeat->setEnabled(false);
- tqlayout->addWidget(m_repeat, 2, 2);
+ layout->addWidget(m_repeat, 2, 2);
label = new TQLabel(i18n("&Interval:"), this);
- tqlayout->addWidget(label, 2, 3);
+ layout->addWidget(label, 2, 3);
label->setBuddy(m_interval = new KIntSpinBox(this));
m_interval->setMinValue(1);
m_interval->setMaxValue(0xff);
m_interval->setValue(10);
m_interval->setEnabled(false);
- tqlayout->addWidget(m_interval, 2, 4);
+ layout->addWidget(m_interval, 2, 4);
connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen()));
connect(m_commands,
@@ -109,9 +109,9 @@ void IRPrefs::save()
int i = 1;
for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it)
{
- c->writePathEntry(TQString("Command_%1").tqarg(i), it.key());
- c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action));
- c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval);
+ c->writePathEntry(TQString("Command_%1").arg(i), it.key());
+ c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action));
+ c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval);
++i;
}
}
@@ -288,9 +288,9 @@ void IRPrefs::readConfig()
for (int i = 1; i <= count; ++i)
{
Command cmd;
- cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i)));
- cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i));
- s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd);
+ cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i)));
+ cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i));
+ s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd);
}
s_configRead = true;
}
diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS
index 7cfc61e2..ae293014 100644
--- a/noatun/modules/kaiman/SKIN-SPECS
+++ b/noatun/modules/kaiman/SKIN-SPECS
@@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future.
PROPER TRANSPARENCY:
The main background image uses a threshold of 1 (out of 256 levels) for the
-window tqshape, the rest is used for partially overwiting the background when
+window shape, the rest is used for partially overwiting the background when
the Transparency option is true.
Portions of items, buttons, sliders, numbers, and text that never change and
@@ -80,7 +80,7 @@ Background: filename
filename
The background image file, the window will be the same size as this image.
- Add transparency to this image for tqshaped skins, the cutoff threshold for
+ Add transparency to this image for shaped skins, the cutoff threshold for
transparency is 1 on images with muli-level alpha (like in png).
Transparency: flag
@@ -95,7 +95,7 @@ Mask: filename
(this is DEPRECATED!, for transparent skins just add transparency to the
Background image, Mask remains merely for backwards compatibility)
filename
- The mask image file, only needed for skins which are tqshaped windows (not
+ The mask image file, only needed for skins which are shaped windows (not
rectangular). Contains a transparency mask for the main window.
==========================
@@ -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/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 1077613b..bc3222d5 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -17,7 +17,7 @@
*/
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <klistbox.h>
#include <tqdir.h>
diff --git a/noatun/modules/kaiman/skins/circle/README b/noatun/modules/kaiman/skins/circle/README
index a39fff38..d80082af 100644
--- a/noatun/modules/kaiman/skins/circle/README
+++ b/noatun/modules/kaiman/skins/circle/README
@@ -3,8 +3,8 @@ Author: Johne Ellis <gqview@geocities.ocm>
Released: November 25, 1998
Version: 1.0
URL: http://www.geocities.com/SiliconValley/Haven/5235
-Comments: Skin with a doughnut tqshape to test tqshaped windows.
- (skins with a tqshape mask)
+Comments: Skin with a doughnut shape to test shaped windows.
+ (skins with a shape mask)
Note: For transparency to work, GQmpeg 0.4.2 is required.
Previous versions will work, but will be _ugly_.
diff --git a/noatun/modules/kaiman/skins/circle/skindata b/noatun/modules/kaiman/skins/circle/skindata
index 8dba21db..25268d22 100644
--- a/noatun/modules/kaiman/skins/circle/skindata
+++ b/noatun/modules/kaiman/skins/circle/skindata
@@ -6,15 +6,15 @@
#Released: November 25, 1998
#Author: John Ellis <gqview@geocities.com>
#URL: http://www.geocities.com/SiliconValley/Haven/5235/
-#Comments: Skin with a doughnut tqshape to test tqshaped windows.
-# (skins with a tqshape mask)
+#Comments: Skin with a doughnut shape to test shaped windows.
+# (skins with a shape mask)
#run 'gqmpeg -skinhelp' for help with coordinates.
#simply comment out items you do not want to display
#only Background is required.
Background: back.png
-#Mask is an image with transparency used to define a tqshaped window
+#Mask is an image with transparency used to define a shaped window
Mask: back_mask.png
#Title: filename length x y
diff --git a/noatun/modules/kaiman/skins/circle/skindata_alt b/noatun/modules/kaiman/skins/circle/skindata_alt
index 42661e81..fb3e97f5 100644
--- a/noatun/modules/kaiman/skins/circle/skindata_alt
+++ b/noatun/modules/kaiman/skins/circle/skindata_alt
@@ -6,15 +6,15 @@
#Released: November 25, 1998
#Author: John Ellis <gqview@geocities.com>
#URL: http://www.geocities.com/SiliconValley/Haven/5235/
-#Comments: Skin with a doughnut tqshape to test tqshaped windows.
-# (skins with a tqshape mask)
+#Comments: Skin with a doughnut shape to test shaped windows.
+# (skins with a shape mask)
#run 'gqmpeg -skinhelp' for help with coordinates.
#simply comment out items you do not want to display
#only Background is required.
Background: back_sm.png
-#Mask is an image with transparency used to define a tqshaped window
+#Mask is an image with transparency used to define a shaped window
Mask: back_sm_mask.png
#Title: filename length x y
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index bbf55cb3..dbfcea6c 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -22,7 +22,7 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpainter.h>
#include <tqdropsite.h>
#include <kdebug.h>
@@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num )
if ( num<0 ) num = 0;
_currentPixmap = num;
- tqrepaint( FALSE );
+ repaint( FALSE );
}
}
@@ -321,7 +321,7 @@ void KaimanStyleButton::updateButtonState() {
}
setPixmap( *I_pmIndex[i_i_currentState] );
- tqrepaint();
+ repaint();
}
@@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value )
if (value>_max) value=_max;
if (value<_min) value=_min;
_value = value;
- tqrepaint();
+ repaint();
}
@@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max )
_min = min;
_max = max;
setValue( value );
- tqrepaint();
+ repaint();
}
}
@@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme)
{
_down = false;
releaseMouse();
- tqrepaint();
+ repaint();
setValue( pos2value(qme->x(), qme->y()) );
emit newValue( value() );
@@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e )
if ( !_lit && optionPrelight )
{
_lit = true;
- tqrepaint();
+ repaint();
}
KaimanStyleMasked::enterEvent( e );
@@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e )
if ( _lit )
{
_lit = false;
- tqrepaint();
+ repaint();
}
KaimanStyleMasked::leaveEvent( e );
@@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme)
void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme)
{
- // On the background we move the tqshaped toplevel around
+ // On the background we move the shaped toplevel around
if (!i_b_move) {
i_point_dragStart = qme->pos();
i_point_lastPos = qme->globalPos();
@@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value )
if ( _value!=value )
{
_value = value;
- tqrepaint();
+ repaint();
}
}
@@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value )
_pos = 0;
_direction = 1;
_value = value;
- tqrepaint();
+ repaint();
}
}
@@ -698,7 +698,7 @@ void KaimanStyleText::timeout()
// check new position
if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) {
_pos += _direction;
- tqrepaint();
+ repaint();
}
_timer->start( _delay, TRUE );
@@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps()
if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) {
- // OK, background and mask are defined. So now I can calculate the tqshape
+ // OK, background and mask are defined. So now I can calculate the shape
int l_i_width_Mask = l_pixmap_Mask->width();
int l_i_height_Mask = l_pixmap_Mask->height();
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 5d3bfcdb..19d44b98 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -346,7 +346,7 @@ private:
TQString i_s_styleBase;
- // The mask of the complete style. Used for doing tqshaped windows
+ // The mask of the complete style. Used for doing shaped windows
TQBitmap i_bitmap_Mask;
/// All style elements are stored here.
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index a8b241f7..3d1791ec 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -88,10 +88,10 @@ Kaiman::Kaiman()
if ( !changeStyle(skinName, "skindata") )
{
- KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) );
+ KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) );
if ( !changeStyle( DEFAULT_SKIN, "skindata" ) )
{
- KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) );
+ KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) );
TQTimer::singleShot( 0, this, TQT_SLOT(close()) );
return;
}
@@ -159,7 +159,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
if ( _style->Mask() != 0 )
{
- // Set the tqshaped window form
+ // Set the shaped window form
XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0,
_style->Mask()->handle(), ShapeSet );
}
@@ -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() );
}
@@ -520,7 +520,7 @@ void Kaiman::newSong()
if ( title.isEmpty() )
title = napp->player()->current().file();
- title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title,
+ title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title,
napp->player()->current().lengthString());
}
titleItem->setValue( title );
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index e1f2286a..60637d7a 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -3,12 +3,12 @@
#include <noatun/app.h>
#include <noatun/playlist.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kglobalaccel.h>
#include <kkeydialog.h>
#include <klocale.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include "keyz.h"
@@ -174,9 +174,9 @@ KeyzPrefs::KeyzPrefs( TQObject *parent ) :
CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings",
parent )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
m_chooser = new KKeyChooser( Keyz::accel(), this );
- tqlayout->addWidget( m_chooser );
+ layout->addWidget( m_chooser );
}
void KeyzPrefs::save()
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index edd53e2b..795dedfb 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -165,9 +165,9 @@ void KJButton::showPressed(bool b)
{
mShowPressed = b;
if ( mShowPressed )
- tqrepaint(true); // tqrepaint with selected image
+ repaint(true); // repaint with selected image
else
- tqrepaint(false); // tqrepaint with default image (player-background)
+ repaint(false); // repaint with default image (player-background)
}
void KJButton::slotPlaylistShown(void)
@@ -193,8 +193,8 @@ void KJButton::slotEqEnabled(bool on)
void KJButton::mouseRelease(const TQPoint &, bool in)
{
- // tqrepaint with default image (player-background)
- tqrepaint(false);
+ // repaint with default image (player-background)
+ repaint(false);
if (!in) // only do something if users is still inside the button
return;
diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp
index b84a0185..d7d2b9fa 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.cpp
+++ b/noatun/modules/kjofol-skin/kjequalizer.cpp
@@ -110,7 +110,7 @@ void KJEqualizer::slotUpdateBuffer()
} // for()
// whole thingy has been drawn, now set the mask
mView->setMask( regionMask );
- tqrepaint();
+ repaint();
}
void KJEqualizer::mouseMove(const TQPoint &p, bool in)
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index 42c64a45..18997c6f 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -32,7 +32,7 @@ private:
int mBandWidth;
int mBandHalfHeight;
TQPixmap mBars; // holds all slider images
- TQPixmap *mBack; // holds background of EQ for easy tqrepaint
+ TQPixmap *mBack; // holds background of EQ for easy repaint
TQPixmap *mView; // holds prepared img of all sliders
VInterpolation *mInterpEq;
};
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 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -320,7 +320,7 @@
<property name="name">
<cstring>titleScrollSpeed</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -428,7 +428,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>21</height>
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index a97acb98..ad843376 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -142,7 +142,7 @@ KJLoader::KJLoader()
else
{
KNotifyClient::event(winId(), "warning",
- i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin));
+ i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin));
napp->preferences();
}
@@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file)
show();
conserveMemory();
- tqrepaint();
+ repaint();
// update displays if we are already playing
// This happens while changing skins
@@ -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/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 4231d0ff..f3ec5f37 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -17,13 +17,13 @@
#include <tqcheckbox.h>
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqslider.h>
#include <tqpixmap.h>
#include <tqtabwidget.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
#include <tqregexp.h>
diff --git a/noatun/modules/kjofol-skin/kjseeker.cpp b/noatun/modules/kjofol-skin/kjseeker.cpp
index e82a1f8e..d368e95d 100644
--- a/noatun/modules/kjofol-skin/kjseeker.cpp
+++ b/noatun/modules/kjofol-skin/kjseeker.cpp
@@ -156,7 +156,7 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in)
return;
g = grayRgb(color);
- tqrepaint();
+ repaint();
// kdDebug(66666) << "length : " << napp->player()->getLength() << endl;
// kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl;
diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
index 229d307e..c393bc03 100644
--- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
+++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>21</height>
@@ -104,7 +104,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>21</height>
@@ -135,7 +135,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp
index 589f994f..eaba2e76 100644
--- a/noatun/modules/kjofol-skin/kjsliders.cpp
+++ b/noatun/modules/kjofol-skin/kjsliders.cpp
@@ -86,14 +86,14 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &)
TQt::CopyROP);
if (mText)
- mText->tqrepaint();
+ mText->repaint();
}
bool KJVolumeBar::mousePress(const TQPoint &pos)
{
mVolume = (pos.x()*100) / rect().width();
// kdDebug(66666) << "volume: " << mVolume << endl;
- tqrepaint();
+ repaint();
napp->player()->setVolume(mVolume);
return true;
}
@@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in)
void KJVolumeBar::timeUpdate(int)
{
mVolume = napp->player()->volume();
- tqrepaint();
+ repaint();
}
@@ -148,7 +148,7 @@ void KJVolumeBMP::paint(TQPainter *p, const TQRect &)
TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height());
bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
if (mText)
- mText->tqrepaint();
+ mText->repaint();
}
bool KJVolumeBMP::mousePress(const TQPoint &pos)
@@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos)
// kdDebug(66666) << "gray : " << grayRgb(color) << endl;
// kdDebug(66666) << "volume: " << mVolume << endl;
- tqrepaint();
+ repaint();
napp->player()->setVolume(mVolume);
@@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int)
mOldVolume = mVolume;
- tqrepaint();
+ repaint();
}
@@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
readConfig();
if (mText)
- mText->tqrepaint();
+ mText->repaint();
}
TQString KJPitchBMP::tip()
@@ -253,7 +253,7 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &)
bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
if (mText)
- mText->tqrepaint();
+ mText->repaint();
}
bool KJPitchBMP::mousePress(const TQPoint &pos)
@@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos)
mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 );
// kdDebug(66666) << "[KJPitchBMP] mousePress() mCurrentPitch: " << mCurrentPitch << endl;
- tqrepaint();
+ repaint();
newFile(); // wrong naming, in fact it just sets pitch
@@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int)
mOldPitch = mCurrentPitch;
- tqrepaint();
+ repaint();
}
void KJPitchBMP::newFile()
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
index e0d3028e..7bacbb13 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp
@@ -108,7 +108,7 @@ void KJFilename::timerEvent(TQTimerEvent *)
// apply the newly created mask
mView.setMask(newMask);
- tqrepaint();
+ repaint();
}
bool KJFilename::mousePress(const TQPoint &)
@@ -142,7 +142,7 @@ void KJFilename::readConfig()
mDistance = 1;
mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates();
textFont().recalcSysFont();
- mLastTitle=""; // tqinvalidate title so it gets repainted on next timeUpdate()
+ mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate()
}
void KJFilename::prepareString(const TQCString &str)
@@ -255,7 +255,7 @@ void KJTime::readConfig()
// kdDebug(66666) << "KJTime::readConfig()" << endl;
countDown = napp->displayRemaining();
timeFont().recalcSysFont();
- mLastTime=""; // tqinvalidate time so it gets repainted on next timeUpdate()
+ mLastTime=""; // invalidate time so it gets repainted on next timeUpdate()
}
TQString KJTime::lengthString ( void )
@@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str)
mLastTime = str;
mTime = timeFont().draw(str, rect().width());
- tqrepaint();
+ repaint();
// kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl;
}
@@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &)
void KJVolumeText::readConfig()
{
volumeFont().recalcSysFont();
- mLastVolume=""; // tqinvalidate value so it gets repainted on next timeUpdate()
+ mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate()
}
void KJVolumeText::timeUpdate(int)
@@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str)
mLastVolume = str;
mVolume = volumeFont().draw(str, rect().width());
- tqrepaint();
+ repaint();
}
TQString KJVolumeText::tip()
@@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in)
void KJPitchText::readConfig()
{
pitchFont().recalcSysFont();
- mLastPitch=""; // tqinvalidate value so it gets repainted on next timeUpdate()
+ mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate()
}
void KJPitchText::timeUpdate(int)
@@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str)
mLastPitch = str;
mSpeed = pitchFont().draw(str, rect().width());
- tqrepaint();
+ repaint();
}
TQString KJPitchText::tip()
@@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &)
void KJFileInfo::readConfig()
{
textFont().recalcSysFont();
- mLastTime=""; // tqinvalidate value so it gets repainted on next timeUpdate()
+ mLastTime=""; // invalidate value so it gets repainted on next timeUpdate()
}
void KJFileInfo::timeUpdate(int)
@@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str)
return;
mLastTime = str;
mTime = textFont().draw(str, rect().width());
- tqrepaint();
+ repaint();
}
TQString KJFileInfo::tip()
diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp
index a1a4c840..7ae04d44 100644
--- a/noatun/modules/kjofol-skin/kjvis.cpp
+++ b/noatun/modules/kjofol-skin/kjvis.cpp
@@ -79,7 +79,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
mBack = new KPixmap ( TQSize(xs,ys) );
bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
setRect ( x, y, xs, ys );
- tqrepaint();
+ repaint();
}
void KJNullScope::paint(TQPainter *p, const TQRect &)
@@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
if (!in) // only do something if users is still inside the button
return;
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope(FFT);
}
@@ -108,7 +108,7 @@ void KJNullScope::readConfig()
Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
if ( v != Null )
{
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope ( v );
}
}
@@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size)
if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
{
if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
return;
}
@@ -203,7 +203,7 @@ void KJFFT::scopeEvent(float *d, int size)
mGradient->setMask(mGradientMask);
bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
- tqrepaint();
+ repaint();
}
void KJFFT::paint(TQPainter *p, const TQRect &)
@@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
return;
stop();
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope(Mono);
}
@@ -236,7 +236,7 @@ void KJFFT::readConfig()
if ( v != FFT )
{
stop();
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope ( v );
return;
}
@@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
{
if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
return;
}
@@ -356,7 +356,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
mGradient->setMask(mGradientMask);
bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
- tqrepaint();
+ repaint();
}
void KJStereoFFT::paint(TQPainter *p, const TQRect &)
@@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in)
if (!in) // only do something if users is still inside the button
return;
stop();
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope(Null);
}
@@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
if ( v != StereoFFT )
{
stop();
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope ( v );
return;
}
@@ -448,7 +448,7 @@ void KJScope::scopeEvent(float *d, int size)
if ( napp->player()->isStopped() )
{
bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
- tqrepaint();
+ repaint();
}
return;
}
@@ -497,7 +497,7 @@ void KJScope::scopeEvent(float *d, int size)
x++;
}
- tqrepaint();
+ repaint();
}
void KJScope::paint(TQPainter *p, const TQRect &)
@@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
return;
stop();
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope(/*Null*/ StereoFFT);
}
@@ -528,7 +528,7 @@ void KJScope::readConfig()
if ( v != Mono )
{
stop();
- parent()->tqrepaint(rect(), false);
+ parent()->repaint(rect(), false);
swapScope ( v );
return;
}
diff --git a/noatun/modules/kjofol-skin/kjwidget.cpp b/noatun/modules/kjofol-skin/kjwidget.cpp
index f9cb345a..737032cf 100644
--- a/noatun/modules/kjofol-skin/kjwidget.cpp
+++ b/noatun/modules/kjofol-skin/kjwidget.cpp
@@ -34,13 +34,13 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
return bm;
}
-void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
+void KJWidget::repaint(bool me, const TQRect &r, bool clear)
{
TQPainter p(parent());
if (me)
paint(&p, r.isValid() ? r : rect());
else
- parent()->tqrepaint(r.isValid() ? r : rect(), clear);
+ parent()->repaint(r.isValid() ? r : rect(), clear);
}
const TQString &KJWidget::backgroundPressed(const TQString &bmp) const
diff --git a/noatun/modules/kjofol-skin/kjwidget.h b/noatun/modules/kjofol-skin/kjwidget.h
index a678e8a7..f64d2226 100644
--- a/noatun/modules/kjofol-skin/kjwidget.h
+++ b/noatun/modules/kjofol-skin/kjwidget.h
@@ -25,8 +25,8 @@ public:
virtual void readConfig() {}
// called when the mouse is moved while clicked in this widget
- // tqrepaint myself
- virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
+ // repaint myself
+ virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
virtual TQString tip() { return 0; }
diff --git a/noatun/modules/kjofol-skin/parser.cpp b/noatun/modules/kjofol-skin/parser.cpp
index b17e943a..91fe8013 100644
--- a/noatun/modules/kjofol-skin/parser.cpp
+++ b/noatun/modules/kjofol-skin/parser.cpp
@@ -10,7 +10,7 @@
#include "kjprefs.h"
// system includes
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqimage.h>
#include <tqfile.h>
#include <kdebug.h>
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 <noatun/engine.h>
#include <kaction.h>
-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..732f3c01 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -1,5 +1,5 @@
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klineedit.h>
#include <tqlabel.h>
#include <tqptrlist.h>
@@ -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/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index 1ec54cbf..8fde5123 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -9,7 +9,7 @@
#include <tqfile.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <klocale.h>
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index 1fa07fdd..dac87cf2 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -27,7 +27,7 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin()
setCaption(i18n("Monoscope"));
show();
resizeEvent(0);
- tqrepaint(0,0, TQWidget::width(), height(), false);
+ repaint(0,0, TQWidget::width(), height(), false);
resizeEvent(0);
setBackgroundColor(mLowColor);
}
@@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size)
buffer.fill(mLowColor);
TQPainter p(&buffer);
p.setPen(mHighColor);
- tqrepaint(rect());
+ repaint(rect());
if (line)
p.moveTo(0, y);
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 07ff7e15..c11083ca 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -14,7 +14,7 @@
#include <tqpushbutton.h>
#include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqobjectlist.h>
#include <tqobjectdict.h>
@@ -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()
@@ -199,7 +199,7 @@ void MilkChocolate::changeCaption(const TQString& text)
void MilkChocolate::popup()
{
NoatunStdAction::ContextMenu::showContextMenu(
- mapToGlobal(mPopup->tqgeometry().bottomLeft())
+ mapToGlobal(mPopup->geometry().bottomLeft())
);
}
diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui
index 8712ed1a..ca13195a 100644
--- a/noatun/modules/simple/propertiesdialog.ui
+++ b/noatun/modules/simple/propertiesdialog.ui
@@ -51,7 +51,7 @@
<property name="name">
<cstring>nameField</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
@@ -82,7 +82,7 @@
<property name="name">
<cstring>iconLabel</cstring>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -142,13 +142,13 @@
<property name="name">
<cstring>TextLabel2_2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>25</width>
<height>32767</height>
@@ -241,13 +241,13 @@
<property name="name">
<cstring>TextLabel2</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>80</width>
<height>32767</height>
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h
index 3b7f6834..ef6f14f9 100644
--- a/noatun/modules/simple/propertiesdialog.ui.h
+++ b/noatun/modules/simple/propertiesdialog.ui.h
@@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po )
// PlaylistItem properties (name and mimetype)
if (!pi.isNull())
{
- setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) );
+ setCaption( i18n("Properties for %1").arg(pi.url().fileName()) );
KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() );
iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) );
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/find.cpp b/noatun/modules/splitplaylist/find.cpp
index d167e02e..54b5c7ae 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -1,5 +1,5 @@
#include "find.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <kcombobox.h>
#include <tqpushbutton.h>
#include <tqcheckbox.h>
@@ -11,8 +11,8 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
mainWidget->setMinimumWidth(320);
setMainWidget(mainWidget);
- TQGridLayout *tqlayout=new TQGridLayout(mainWidget);
- tqlayout->setSpacing(KDialog::spacingHint());
+ TQGridLayout *layout=new TQGridLayout(mainWidget);
+ layout->setSpacing(KDialog::spacingHint());
mText=new KHistoryCombo(mainWidget);
mText->setMaxCount(10);
@@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget);
mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget);
- tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1);
- tqlayout->addWidget(mRegexp, 1, 0);
- tqlayout->addWidget(mBackwards, 1, 1);
+ layout->addMultiCellWidget(mText, 0, 0, 0, 1);
+ layout->addWidget(mRegexp, 1, 0);
+ layout->addWidget(mBackwards, 1, 1);
connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked()));
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index 787791ac..a08faa94 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -217,14 +217,14 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC)
if (now)
now->setPixmap(0, TQPixmap());
- TQRect rect(view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data())));
+ TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())));
rect.setWidth(view->listView()->viewport()->width());
currentItem=i;
- view->listView()->viewport()->tqrepaint(rect,true);
+ view->listView()->viewport()->repaint(rect,true);
view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data()));
- TQRect currentRect= view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data()));
- view->listView()->viewport()->tqrepaint(currentRect);
+ TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()));
+ view->listView()->viewport()->repaint(currentRect);
now=static_cast<SafeListViewItem*>(current().data());
if(now)
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 693b57ce..504344fe 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -12,10 +12,10 @@
#include <tqdragobject.h>
#include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmap.h>
#include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqpainter.h>
#include <kaction.h>
@@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url)
}
else
{
- KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) );
+ KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) );
return false;
}
}
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp
index c0e04fd3..58b83f3b 100644
--- a/noatun/modules/systray/cmodule.cpp
+++ b/noatun/modules/systray/cmodule.cpp
@@ -35,7 +35,7 @@
#include <tqcombobox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
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..4d008783 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();
}
@@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause()
if(!item.isProperty("title"))
{
// No metadata
- s = TQString("<nobr>%1</nobr>").tqarg(item.title());
+ s = TQString("<nobr>%1</nobr>").arg(item.title());
}
else
{
- s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title"));
+ s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title"));
if(item.isProperty("author"))
- s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author"));
+ s += TQString("<nobr>%1</nobr><br>").arg(item.property("author"));
if(item.isProperty("album"))
{
if(item.isProperty("date"))
- s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date"));
+ s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date"));
else
- s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album"));
+ s += TQString("<nobr>%1</nobr><br>").arg(item.property("album"));
}
}
@@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause()
setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \
"<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \
"<td valign=center><img src='%3'></td>" \
- "</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath));
+ "</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath));
}
else
{
- setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s));
+ setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s));
}
}
@@ -256,16 +256,16 @@ void NoatunSystray::slotStopped()
if(!napp->player()->current())
return;
changeTray("player_stop");
- setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped")));
+ setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped")));
}
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..02ea0a1c 100644
--- a/noatun/modules/systray/yhconfigwidget.ui
+++ b/noatun/modules/systray/yhconfigwidget.ui
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>81</height>
@@ -231,7 +231,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp
index b90d4b03..7d772c5b 100644
--- a/noatun/modules/voiceprint/prefs.cpp
+++ b/noatun/modules/voiceprint/prefs.cpp
@@ -4,7 +4,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kcolorbutton.h>
#include <kconfig.h>
diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp
index 234aafd0..0cfcb264 100644
--- a/noatun/modules/voiceprint/voiceprint.cpp
+++ b/noatun/modules/voiceprint/voiceprint.cpp
@@ -113,12 +113,12 @@ void VoicePrint::scopeEvent(float *data, int bands)
// redraw changes with the minimum amount of work
if(newOffset != 0)
{
- tqrepaint(mOffset,0,mSegmentWidth*2,height(),false);
+ repaint(mOffset,0,mSegmentWidth*2,height(),false);
}
else
{
- tqrepaint(mOffset,0,mSegmentWidth,height(),false);
- tqrepaint(newOffset,0,mSegmentWidth,height(),false);
+ repaint(mOffset,0,mSegmentWidth,height(),false);
+ repaint(newOffset,0,mSegmentWidth,height(),false);
}
mOffset = newOffset;
}
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index fb923994..5f670953 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;
@@ -55,7 +55,7 @@ void WaInfo::timeEvent()
}
if (isVisible())
- tqrepaint(false);
+ repaint(false);
}
}
@@ -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..fdf2e768 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;
@@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val)
waInfo->setText(i18n("Balance: Center"));
}
else if (val < 0) {
- waInfo->setText(i18n("Balance: %1% Left").tqarg(-val));
+ waInfo->setText(i18n("Balance: %1% Left").arg(-val));
} else {
- waInfo->setText(i18n("Balance: %1% Right").tqarg(val));
+ waInfo->setText(i18n("Balance: %1% Right").arg(val));
}
}
@@ -672,14 +672,14 @@ void WaSkin::volumeSliderReleased()
void WaSkin::volumeSetValue(int val)
{
if (mVolumePressed)
- waInfo->setText(i18n("Volume: %1%").tqarg(val));
+ waInfo->setText(i18n("Volume: %1%").arg(val));
napp->player()->setVolume(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);
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 0cfd7f90..0ed05dd4 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -2,7 +2,7 @@
#include <klocale.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqpixmap.h>
#include <kglobal.h>
@@ -29,7 +29,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
"style",
TQT_TQOBJECT(parent))
{
- // Make a token horizontal tqlayout box
+ // Make a token horizontal layout box
vbox = new TQVBoxLayout(this);
vbox->setSpacing( 6 );
vbox->setMargin( 0 );
@@ -163,7 +163,7 @@ void WinSkinConfig::remove()
// Ask the user first
if( KMessageBox::warningContinueCancel( this,
- i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
+ i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
== KMessageBox::Continue ) {
mWaSkinManager->removeSkin( skin_list->currentText() );