summaryrefslogtreecommitdiffstats
path: root/noatun/library
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/library')
-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
20 files changed, 71 insertions, 71 deletions
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index f3077e13..9f28ec0f 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 <textstream.h>
+#include <tqtextstream.h>
#include <signal.h>
#include <kmimetype.h>
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 0301c7e8..2924e1bc 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 <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kdebug.h>
#include <klistview.h>
@@ -19,7 +19,7 @@
#include <kdialog.h>
#include <klineedit.h>
-#include <textview.h>
+#include <tqtextview.h>
#include <tqwhatsthis.h>
#include "mimetypetree.h"
@@ -88,24 +88,24 @@ General::General(TQObject *parent)
b->toggle();
}
- TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint());
- layout->setSpacing(KDialog::spacingHint());
+ TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint());
+ tqlayout->setSpacing(KDialog::spacingHint());
- 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->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->addWidget(titleLabel, 7, 0);
- layout->addWidget(mTitleFormat, 7, 1);
+ tqlayout->addWidget(titleLabel, 7, 0);
+ tqlayout->addWidget(mTitleFormat, 7, 1);
- layout->addWidget(dlsaver, 8, 0);
- layout->addWidget(mDlSaver, 8, 1);
+ tqlayout->addWidget(dlsaver, 8, 0);
+ tqlayout->addWidget(mDlSaver, 8, 1);
- layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
+ tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
- layout->setRowStretch(10, 1);
+ tqlayout->setRowStretch(10, 1);
}
diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp
index 4e40fb56..6815a90a 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 <layout.h>
+#include <tqlayout.h>
#include <config.h>
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index 0a891ec6..cd9e7d93 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 <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqtoolbutton.h>
#include <tqvgroupbox.h>
#include <tqwhatsthis.h>
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 5cfd23ed..4aeb852f 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::fromLatin1("tdeinit_wrapper")));
+ cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper")));
cmdline += " ";
if (rt)
cmdline += TQFile::encodeName(KStandardDirs::findExe(
- TQString::fromLatin1("artswrapper")));
+ TQString::tqfromLatin1("artswrapper")));
else
cmdline += TQFile::encodeName(KStandardDirs::findExe(
- TQString::fromLatin1("artsd")));
+ TQString::tqfromLatin1("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 2bfcd239..ae86d00f 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 <textstream.h>
+#include <tqtextstream.h>
#include <math.h>
#include <kconfig.h>
#include <klocale.h>
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 02a14672..7a55d6f7 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -11,7 +11,7 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(this,
- 0, 0, "EqualizerLevel::layout");
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(this,
+ 0, 0, "EqualizerLevel::tqlayout");
mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider");
mSlider->setTickmarks(TQSlider::Left);
mSlider->setTickInterval(25);
- layout->addWidget(mSlider);
+ tqlayout->addWidget(mSlider);
connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
mLabel = new TQLabel("", this, "EqualizerLevel::mLabel");
- mLabel->setAlignment(AlignHCenter | AlignVCenter);
- layout->addWidget(mLabel);
+ mLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
+ tqlayout->addWidget(mLabel);
setMinimumHeight(200);
// setMinimumWidth(kapp->fontMetrics().width("158kHz"));
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui
index 7ec3329f..8a4b52eb 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>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<grid>
<property name="name">
@@ -37,7 +37,7 @@
<property name="text">
<string>Pre&amp;amp:</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>1</width>
<height>8</height>
@@ -71,7 +71,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>1</width>
<height>8</height>
@@ -80,7 +80,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
@@ -122,7 +122,7 @@
<property name="text">
<string>+/-</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<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>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>8</width>
<height>16</height>
@@ -301,7 +301,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>8</width>
<height>16</height>
diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp
index 40b3606c..fe2ed649 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.").arg(d->url.prettyURL());
+ d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL());
return false;
}
}
diff --git a/noatun/library/ksaver.h b/noatun/library/ksaver.h
index cf1e6a87..91fc4af8 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 <textstream.h>
+#include <tqtextstream.h>
#include <tqdatastream.h>
namespace Noatun
diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h
index de5bf276..c267aedd 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 sizeHint() const;
- virtual TQSize minimumSizeHint() const;
+ virtual TQSize tqsizeHint() const;
+ virtual TQSize tqminimumSizeHint() const;
/**
* @return the label's text.
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index 4069b510..b1ea94d5 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 <layout.h>
+#include <tqlayout.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <tqtimer.h>
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index 6541a6b6..f5bd09bd 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 <textstream.h>
+#include <tqtextstream.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").arg(url.host());
+ map["title"] = i18n("Stream from %1").tqarg(url.host());
KURL u(url);
if (!u.hasPath())
@@ -303,7 +303,7 @@ public:
else
{
propMap["playObject"]="SplayPlayObject";
- propMap["title"] = i18n("Stream from %1").arg(url.host());
+ propMap["title"] = i18n("Stream from %1").tqarg(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").arg(protourl.host());
+ prop["title"] = i18n("Stream from %1").tqarg(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)").arg( url.host() ).arg( url.port() );
+ map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() );
else
- map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() );
+ map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() );
map["url"] = map["stream_"]= url.url();
diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp
index 3c5b6f5d..02c2f743 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::fromLatin1(getenv("NOATUN_PID")).toInt();
+ parent = TQString::tqfromLatin1(getenv("NOATUN_PID")).toInt();
DCOPClient c;
c.attach();
TQCString appids[2];
- appids[0]=TQString("noatun-%1").arg(parent).local8Bit();
+ appids[0]=TQString("noatun-%1").tqarg(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").arg(pid).local8Bit();
+ appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit();
appids[1]="noatun";
appid=appids[0];
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index 4a6193f5..dd30111e 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 <layout.h>
+#include <tqlayout.h>
#include "noatunlistview.h"
#include "pluginmodule.h"
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 4a304da8..98c05453 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 <layout.h>
+#include <tqlayout.h>
//#include <tqlabel.h>
#include "cmodule.h"
diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp
index c2c9dae8..4484c872 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(colorGroup().background());
+ d->buf.fill(tqcolorGroup().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);
- repaint(false);
+ tqrepaint(false);
}
void
@@ -149,7 +149,7 @@ ScrollingLabel::scroll()
{
d->scrollTimer.stop();
- repaint(false);
+ tqrepaint(false);
int scrollTime = 100;
@@ -166,13 +166,13 @@ ScrollingLabel::scroll()
}
TQSize
-ScrollingLabel::sizeHint() const
+ScrollingLabel::tqsizeHint() const
{
return fontMetrics().boundingRect(d->text).size();
}
TQSize
-ScrollingLabel::minimumSizeHint() const
+ScrollingLabel::tqminimumSizeHint() const
{
return TQSize(0, fontMetrics().height());
}
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index 438504eb..c04fcbd4 100644
--- a/noatun/library/titleproxy.cpp
+++ b/noatun/library/titleproxy.cpp
@@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT
"%3"
"%4"
"\r\n" )
- .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 );
+ .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 );
m_sockRemote.writeBlock( request.latin1(), request.length() );
@@ -304,7 +304,7 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead )
}
}
- if ( m_streamUrl.startsWith( "www.", true ) )
+ if ( m_streamUrl.tqstartsWith( "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::fromLatin1("StreamTitle")),
- extractStr(data, TQString::fromLatin1("StreamUrl")));
+ extractStr(data, TQString::tqfromLatin1("StreamTitle")),
+ extractStr(data, TQString::tqfromLatin1("StreamUrl")));
}
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 4c9eebe8..71a40663 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -57,7 +57,7 @@
#include <klocale.h>
#include <tqdom.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <tqfile.h>
#include <math.h>
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 86645d42..f2428bc4 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -110,7 +110,7 @@ void VideoFrame::stopped()
}
}
-#include <layout.h>
+#include <tqlayout.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(minimumSizeHint());
+// video->setMinimumSize(tqminimumSizeHint());
// video->setMinimumSize(101,35);
video->setMinimumSize(128,96);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 02:46:17 +0000