summaryrefslogtreecommitdiffstats
path: root/noatun/library
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/library')
-rw-r--r--noatun/library/Makefile.am2
-rw-r--r--noatun/library/app.cpp50
-rw-r--r--noatun/library/cmodule.cpp36
-rw-r--r--noatun/library/cmodule.h3
-rw-r--r--noatun/library/controls.cpp24
-rw-r--r--noatun/library/downloader.cpp8
-rw-r--r--noatun/library/effects.cpp8
-rw-r--r--noatun/library/effectview.cpp26
-rw-r--r--noatun/library/effectview.h4
-rw-r--r--noatun/library/engine.cpp16
-rw-r--r--noatun/library/equalizer.cpp2
-rw-r--r--noatun/library/equalizerview.cpp22
-rw-r--r--noatun/library/equalizerview.h13
-rw-r--r--noatun/library/equalizerwidget.ui56
-rw-r--r--noatun/library/globalvideo.h3
-rw-r--r--noatun/library/ksaver.cpp2
-rw-r--r--noatun/library/mimetypetree.cpp8
-rw-r--r--noatun/library/mimetypetree.h5
-rw-r--r--noatun/library/noatun/app.h5
-rw-r--r--noatun/library/noatun/controls.h12
-rw-r--r--noatun/library/noatun/downloader.h5
-rw-r--r--noatun/library/noatun/effects.h3
-rw-r--r--noatun/library/noatun/engine.h5
-rw-r--r--noatun/library/noatun/equalizer.h3
-rw-r--r--noatun/library/noatun/player.h5
-rw-r--r--noatun/library/noatun/playlist.h5
-rw-r--r--noatun/library/noatun/plugin.h12
-rw-r--r--noatun/library/noatun/pref.h8
-rw-r--r--noatun/library/noatun/scrollinglabel.h9
-rw-r--r--noatun/library/noatun/stdaction.h37
-rw-r--r--noatun/library/noatun/stereobuttonaction.h13
-rw-r--r--noatun/library/noatun/vequalizer.h8
-rw-r--r--noatun/library/noatun/video.h7
-rw-r--r--noatun/library/noatunarts/Session_impl.cpp4
-rw-r--r--noatun/library/noatunarts/StereoEffectStack_impl.cpp2
-rw-r--r--noatun/library/noatunstdaction.cpp96
-rw-r--r--noatun/library/noatuntags/tags.cpp14
-rw-r--r--noatun/library/noatuntags/tagsgetter.h4
-rw-r--r--noatun/library/player.cpp2
-rw-r--r--noatun/library/playlist.cpp22
-rw-r--r--noatun/library/playlistsaver.cpp34
-rw-r--r--noatun/library/plugin.cpp22
-rw-r--r--noatun/library/plugin_deps.h3
-rw-r--r--noatun/library/pluginloader.cpp18
-rw-r--r--noatun/library/pluginmodule.cpp28
-rw-r--r--noatun/library/pluginmodule.h4
-rw-r--r--noatun/library/pref.cpp19
-rw-r--r--noatun/library/scrollinglabel.cpp36
-rw-r--r--noatun/library/stereobuttonaction.cpp24
-rw-r--r--noatun/library/titleproxy.cpp36
-rw-r--r--noatun/library/titleproxy.h12
-rw-r--r--noatun/library/vequalizer.cpp22
-rw-r--r--noatun/library/video.cpp16
53 files changed, 436 insertions, 407 deletions
diff --git a/noatun/library/Makefile.am b/noatun/library/Makefile.am
index f3e1dfd9..951ba5a4 100644
--- a/noatun/library/Makefile.am
+++ b/noatun/library/Makefile.am
@@ -41,7 +41,7 @@ META_INCLUDES = $(srcdir)/noatun
noinst_PROGRAMS = gentable
gentable_SOURCES = gentable.cpp
-gentable_LDFLAGS = $(KDE_EXTRA_RPATH)
+gentable_LDFLAGS = $(KDE_EXTRA_RPATH) $(LIB_QT)
magictable: gentable
$(top_builddir)/noatun/library/gentable > magictable
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index cf340f68..aaa4b9e6 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -69,7 +69,7 @@ NoatunApp::NoatunApp()
// set the default config data
// TODO: Maybe a first time wizard instead?
KConfig *config=KGlobal::config(); // +
- config->setGroup(TQString::null); // 1
+ config->setGroup(TQString()); // 1
if (!config->readEntry("Modules").length())
{
TQStringList modules;
@@ -88,9 +88,9 @@ NoatunApp::NoatunApp()
mLibraryLoader->add("dcopiface.plugin");
- new General(this); // 25
- new Plugins(this); // 149
-// new Types(this);
+ new General(TQT_TQOBJECT(this)); // 25
+ new Plugins(TQT_TQOBJECT(this)); // 149
+// new Types(TQT_TQOBJECT(this));
mPlayer=new Player; // 139
d->effects=new Effects; // 1
@@ -122,7 +122,7 @@ NoatunApp::NoatunApp()
}
else
{
- config->setGroup(TQString::null); // 0
+ config->setGroup(TQString()); // 0
player()->setVolume(config->readNumEntry("Volume", 100)); // 10
player()->loop(config->readNumEntry("LoopStyle", (int)Player::None));
mPlayer->engine()->setInitialized(); // 0
@@ -147,7 +147,7 @@ NoatunApp::~NoatunApp()
{
saveEngineState();
KConfig *config = KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("Volume", player()->volume());
config->writeEntry("LoopStyle", player()->loopStyle());
// for version continuity in the future
@@ -212,14 +212,14 @@ bool NoatunApp::clearOnStart() const
int NoatunApp::startupPlayMode() const
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
return config->readNumEntry("StartupPlayMode", autoPlay() ? Play : Restore);
}
void NoatunApp::setStartupPlayMode(int mode)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("StartupPlayMode", mode);
config->sync();
}
@@ -227,7 +227,7 @@ void NoatunApp::setStartupPlayMode(int mode)
void NoatunApp::setHackUpPlaylist(bool b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("HackUpPlaylist", b);
config->sync();
}
@@ -238,7 +238,7 @@ void NoatunApp::setFastMixer(bool b)
if (whatBefore!=b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("FastMixer", b);
config->sync();
player()->engine()->useHardwareMixer(b);
@@ -256,7 +256,7 @@ void NoatunApp::setOneInstance(bool b)
void NoatunApp::setLoopList(bool b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("LoopList", b);
KGlobal::config()->sync();
}
@@ -264,7 +264,7 @@ void NoatunApp::setLoopList(bool b)
void NoatunApp::setAutoPlay(bool b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("AutoPlay", b);
KGlobal::config()->sync();
}
@@ -272,7 +272,7 @@ void NoatunApp::setAutoPlay(bool b)
void NoatunApp::setRememberPositions(bool b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("RememberPositions", b);
KGlobal::config()->sync();
}
@@ -280,7 +280,7 @@ void NoatunApp::setRememberPositions(bool b)
void NoatunApp::setSaveDirectory(const TQString &s)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writePathEntry("SaveDirectory", s);
config->sync();
}
@@ -288,21 +288,21 @@ void NoatunApp::setSaveDirectory(const TQString &s)
TQString NoatunApp::saveDirectory() const
{
KConfig *c=KGlobal::config();
- c->setGroup(TQString::null);
+ c->setGroup(TQString());
return c->readPathEntry("SaveDirectory", TQString(getenv("HOME")));
}
TQString NoatunApp::titleFormat() const
{
KConfig *c=KGlobal::config();
- c->setGroup(TQString::null);
+ c->setGroup(TQString());
return c->readEntry("TitleFormat", "$(\"[\"author\"] - \")$(title)$(\" (\"bitrate\"kbps)\")");
}
void NoatunApp::setTitleFormat(const TQString &format)
{
KConfig *c=KGlobal::config();
- c->setGroup(TQString::null);
+ c->setGroup(TQString());
return c->writeEntry("TitleFormat", format);
}
@@ -314,7 +314,7 @@ void NoatunApp::setClearOnStart(bool b)
void NoatunApp::setClearOnOpen(bool b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("ClearOnOpen", b);
config->sync();
}
@@ -322,7 +322,7 @@ void NoatunApp::setClearOnOpen(bool b)
void NoatunApp::setDisplayRemaining(bool b)
{
KConfig *config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("DisplayRemaining", b);
config->sync();
}
@@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id)
NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu()
{
if (!mPluginActionMenu)
- mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions");
+ mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions");
return mPluginActionMenu;
}
@@ -450,7 +450,7 @@ TQString NoatunApp::mimeTypes()
continue;
const char *m = (*istr).c_str();
- if ((KServiceType::serviceType(m)) && !mimeTypes.contains(m))
+ if ((KServiceType::serviceType(m)) && !mimeTypes.tqcontains(m))
{
mimeTypes += m;
mimeTypes += ' ';
@@ -478,11 +478,11 @@ Playlist *NoatunApp::playlist() const
return mLibraryLoader->playlist();
}
-void NoatunApp::commitData(QSessionManager &)
+void NoatunApp::commitData(TQSessionManager &)
{
}
-void NoatunApp::saveState(QSessionManager &sm)
+void NoatunApp::saveState(TQSessionManager &sm)
{
TQStringList restartCommand = sm.restartCommand();
sm.setRestartCommand( restartCommand );
@@ -502,7 +502,7 @@ TQImage NoatunApp::readPNG(const TQString &filename)
void NoatunApp::restoreEngineState()
{
KConfig* config = KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
int state = config->readNumEntry("EngineState", Arts::posPlaying);
switch (state)
{
@@ -522,7 +522,7 @@ void NoatunApp::restoreEngineState()
void NoatunApp::saveEngineState()
{
KConfig* config=KGlobal::config();
- config->setGroup(TQString::null);
+ config->setGroup(TQString());
config->writeEntry("EngineState", player()->engine()->state());
// we don't sync here since it's done in the destructor afterwards anyway
}
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 27dbc686..226cc2d6 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -28,8 +28,8 @@
* General options
*****************************************************************/
-General::General(TQObject *parent)
- : CModule(i18n("General"), i18n("General Options"), "configure", parent)
+General::General(TQObject *tqparent)
+ : CModule(i18n("General"), i18n("General Options"), "configure", tqparent)
{
mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this);
mLoopList->setChecked(napp->loopList());
@@ -58,7 +58,7 @@ General::General(TQObject *parent)
TQWhatsThis::add(mTitleFormat, i18n(
"Select a title to use for each file (in the playlist and user interface). "
"Each element such as $(title) is replaced with the property with the name "
- "as given in the parentheses. The properties include, but are not limited to: "
+ "as given in the tqparentheses. The properties include, but are not limited to: "
"title, author, date, comments and album."));
TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this);
@@ -68,7 +68,7 @@ General::General(TQObject *parent)
this, TQT_SLOT( slotRequesterClicked( KURLRequester * )));
TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder."));
- mPlayOnStartup = new TQButtonGroup(1, Horizontal, i18n("Play Behavior on Startup"), this);
+ mPlayOnStartup = new TQButtonGroup(1,Qt::Horizontal, i18n("Play Behavior on Startup"), this);
mPlayOnStartup->setExclusive(true);
mPlayOnStartup->insert(
new TQRadioButton(i18n("Restore &play state"), mPlayOnStartup),
@@ -83,29 +83,29 @@ General::General(TQObject *parent)
NoatunApp::DontPlay
);
- if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode()))
+ if (TQButton* b = mPlayOnStartup->tqfind(napp->startupPlayMode()))
{
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/cmodule.h b/noatun/library/cmodule.h
index 89aa37f0..9a592075 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -22,8 +22,9 @@ class KURLRequester;
class General : public CModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- General(TQObject *parent=0);
+ General(TQObject *tqparent=0);
virtual void save();
private slots:
diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp
index dc67ffaa..1644f724 100644
--- a/noatun/library/controls.cpp
+++ b/noatun/library/controls.cpp
@@ -1,14 +1,14 @@
#include <noatun/controls.h>
-L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
- TQSlider(parent,name), pressed(false)
+L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) :
+ TQSlider(tqparent,name), pressed(false)
{}
-L33tSlider::L33tSlider(Orientation o, TQWidget * parent, const char * name) :
- TQSlider(o,parent,name), pressed(false)
+L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) :
+ TQSlider(o,tqparent,name), pressed(false)
{}
L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
- Orientation o, TQWidget * parent, const char * name) :
- TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
+ Qt::Orientation o, TQWidget * tqparent, const char * name) :
+ TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false)
{}
bool L33tSlider::currentlyPressed() const
@@ -24,7 +24,7 @@ void L33tSlider::setValue(int i)
void L33tSlider::mousePressEvent(TQMouseEvent*e)
{
- if (e->button()!=RightButton)
+ if (e->button()!=Qt::RightButton)
{
pressed=true;
TQSlider::mousePressEvent(e);
@@ -52,8 +52,8 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
- const char *member, TQObject* parent, const char* name )
- : KAction( text, accel, parent, name )
+ const char *member, TQObject* tqparent, const char* name )
+ : KAction( text, accel, tqparent, name )
{
m_receiver = receiver;
m_member = member;
@@ -67,7 +67,7 @@ int SliderAction::plug( TQWidget *w, int index )
int id = KAction::getToolButtonID();
//Create it.
- m_slider=new L33tSlider(0, 1000, 100, 0, Horizontal, toolBar);
+ m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
m_slider->setMinimumWidth(10);
toolBar->insertWidget(id, 10, m_slider, index );
@@ -91,12 +91,12 @@ return;
/*
if (pos == KToolBar::Left || pos == KToolBar::Right)
{
- m_slider->setOrientation(Vertical);
+ m_slider->setOrientationVertical);
m_slider->setFixedWidth(m_slider->height());
}
else
{
- m_slider->setOrientation(Horizontal);
+ m_slider->setOrientationHorizontal);
m_slider->resize(m_slider->height(), m_slider->height());
}
*/
diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index cce6e4d9..d607ca6d 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -65,8 +65,8 @@ void DownloadItem::dequeue()
-Downloader::Downloader(TQObject *parent)
- : TQObject(parent), localfile(0), current(0), mJob(0), mTimeout(0)
+Downloader::Downloader(TQObject *tqparent)
+ : TQObject(tqparent), localfile(0), current(0), mJob(0), mTimeout(0)
{
mStarted=false;
mUnstartedQueue=new TQPtrList<Downloader::QueueItem>;
@@ -105,7 +105,7 @@ static TQString nonExistantFile(const TQString &file)
{
i++;
f=file;
- f.insert(f.findRev('.'), '_'+TQString::number(i));
+ f.insert(f.tqfindRev('.'), '_'+TQString::number(i));
}
return f;
}
@@ -175,7 +175,7 @@ void Downloader::getNext()
if (mQueue.isEmpty()) return;
current=mQueue.take(0);
- // open the QFile
+ // open the TQFile
localfile=new TQFile(current->local);
localfile->open(IO_ReadWrite | IO_Append);
diff --git a/noatun/library/effects.cpp b/noatun/library/effects.cpp
index a71e0b43..33a3b8ad 100644
--- a/noatun/library/effects.cpp
+++ b/noatun/library/effects.cpp
@@ -25,11 +25,11 @@
using namespace std;
using namespace Arts;
-class EffectConfigWidget : public QWidget
+class EffectConfigWidget : public TQWidget
{
public:
- EffectConfigWidget(Effect *e, TQWidget *parent=0)
- : TQWidget(parent), mEf(e)
+ EffectConfigWidget(Effect *e, TQWidget *tqparent=0)
+ : TQWidget(tqparent), mEf(e)
{}
virtual ~EffectConfigWidget()
@@ -102,7 +102,7 @@ TQString Effect::title() const
TQString Effect::clean(const TQCString &name)
{
- int pos=name.findRev("::");
+ int pos=name.tqfindRev("::");
if (pos>0)
return name.right(name.length()-pos-2);
return name;
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index 334781a1..807f0e71 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -41,11 +41,11 @@
#include <tqvgroupbox.h>
#include <tqwhatsthis.h>
-class EffectListItem : public QListViewItem
+class EffectListItem : public TQListViewItem
{
public:
- EffectListItem(TQListView *parent, TQListViewItem *after, Effect *e)
- : TQListViewItem(parent, after, e->title()), mEffect(e)
+ EffectListItem(TQListView *tqparent, TQListViewItem *after, Effect *e)
+ : TQListViewItem(tqparent, after, e->title()), mEffect(e)
{
}
@@ -55,8 +55,8 @@ private:
Effect *mEffect;
};
-EffectList::EffectList(TQWidget *parent)
- : KListView(parent)
+EffectList::EffectList(TQWidget *tqparent)
+ : KListView(tqparent)
{
}
@@ -85,9 +85,9 @@ void EffectView::show()
namespace
{
-TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *parent, const char *name = 0)
+TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, const char * slot, TQWidget *tqparent, const char *name = 0)
{
- TQToolButton *button = new TQToolButton(parent, name);
+ TQToolButton *button = new TQToolButton(tqparent, name);
button->setIconSet(iconSet);
button->setTextLabel(textLabel, true);
TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot);
@@ -104,7 +104,7 @@ void EffectView::init(void)
setCaption(i18n("Effects - Noatun"));
setIcon(SmallIcon("effect"));
- // Create widgets and layouts
+ // Create widgets and tqlayouts
TQFrame *box = makeMainWidget();
TQVBoxLayout *boxLayout = new TQVBoxLayout(box, 0, KDialog::spacingHint());
@@ -116,7 +116,7 @@ void EffectView::init(void)
TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint());
topTopLayout->setAutoAdd(true);
available = new KComboBox(false, topTopFrame);
- TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame);
+ TQToolButton *add = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame);
// Active
TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box);
@@ -153,10 +153,10 @@ void EffectView::init(void)
// the buttons
TQFrame *bottomLeftFrame = new TQFrame(bottomBox);
TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint());
- up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), this, TQT_SLOT(moveUp()), bottomLeftFrame);
- down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame);
- configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame);
- remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), this, TQT_SLOT(removeEffect()), bottomLeftFrame);
+ up = newButton(BarIconSet("up", KIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame);
+ down = newButton(BarIconSet("down", KIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame);
+ configure = newButton(BarIconSet("configure", KIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame);
+ remove = newButton(BarIconSet("remove", KIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame);
bottomLeftLayout->addWidget(up);
bottomLeftLayout->addWidget(down);
bottomLeftLayout->addWidget(configure);
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 28b26c9f..c0946d89 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -36,6 +36,7 @@ class TQToolButton;
class EffectView : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
EffectView();
@@ -74,8 +75,9 @@ private:
class EffectList : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- EffectList(TQWidget *parent);
+ EffectList(TQWidget *tqparent);
virtual bool acceptDrag(TQDropEvent *) const;
virtual TQDragObject *dragObject() const;
};
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index 00f26022..06693797 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -79,13 +79,13 @@ namespace VolumeControls
else
{
#define ERROR { fd=-1; return; }
- int devmask, recmask, i_recsrc, stereodevs;
+ int devtqmask, rectqmask, i_recsrc, stereodevs;
// Mixer is open. Now define properties
- if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) ERROR
- if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &recmask) == -1) ERROR
+ if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devtqmask) == -1) ERROR
+ if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &rectqmask) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1) ERROR
if (ioctl(fd, SOUND_MIXER_READ_STEREODEVS, &stereodevs) == -1) ERROR
- if (!devmask) ERROR
+ if (!devtqmask) ERROR
#undef ERROR
}
@@ -248,7 +248,7 @@ Noatun::StereoEffectStack *Engine::globalEffectStack() const { return &d->globa
Noatun::Equalizer *Engine::equalizer() const { return &d->equalizer; }
Noatun::Session *Engine::session() const { return &d->session; }
-Engine::Engine(TQObject *parent) : TQObject(parent, "Engine"), mPlay(false)
+Engine::Engine(TQObject *tqparent) : TQObject(tqparent, "Engine"), mPlay(false)
{
d=new EnginePrivate;
// Connect to aRts
@@ -482,15 +482,15 @@ bool Engine::initArts()
X11CommConfig.sync();
}
- cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
+ cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_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 61b10d01..ae86d00f 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -333,7 +333,7 @@ void Equalizer::enableUpdates(bool)
}
#undef EQ
-#undef EQBACK
+#undef ETQBACK
#include "equalizer.moc"
diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index 098226a7..7758f35c 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -1,7 +1,7 @@
#include "vequalizer.h"
-#define EQVIEW_CPP
+#define ETQVIEW_CPP
#include "equalizerview.h"
-#undef EQVIEW_CPP
+#undef ETQVIEW_CPP
#include "equalizerwidget.h"
#include "app.h"
@@ -30,8 +30,8 @@
////////////////////////////////////////////////
// PresetList
-PresetList::PresetList(TQWidget *parent, const char *name)
- : KListView(parent, name)
+PresetList::PresetList(TQWidget *tqparent, const char *name)
+ : KListView(tqparent, name)
{
setItemsRenameable(true);
setRenameable(0, true);
@@ -61,20 +61,20 @@ void PresetList::rename(TQListViewItem *item, int c)
////////////////////////////////////////////////
// EqualizerLevel
-EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
- : TQWidget(parent), mBand(band)
+EqualizerLevel::EqualizerLevel(TQWidget *tqparent, VBand band)
+ : TQWidget(tqparent), 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/equalizerview.h b/noatun/library/equalizerview.h
index 8c29aadb..d902f49b 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -1,5 +1,5 @@
-#ifndef EQUALIZERVIEW_H
-#define EQUALIZERVIEW_H
+#ifndef ETQUALIZERVIEW_H
+#define ETQUALIZERVIEW_H
#include <tqwidget.h>
#include <kdialogbase.h>
@@ -14,11 +14,12 @@ class TQHBoxLayout;
class EqualizerWidget;
-class EqualizerLevel : public QWidget
+class EqualizerLevel : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- EqualizerLevel(TQWidget *parent, VBand band);
+ EqualizerLevel(TQWidget *tqparent, VBand band);
public slots:
void changed();
@@ -36,8 +37,9 @@ private:
class PresetList : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- PresetList(TQWidget *parent, const char *name=0);
+ PresetList(TQWidget *tqparent, const char *name=0);
public:
void rename(TQListViewItem *item, int c);
@@ -47,6 +49,7 @@ public:
class EqualizerView : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
TQPtrList<EqualizerLevel> mBands;
public:
diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui
index 1432f59a..b68b2ff6 100644
--- a/noatun/library/equalizerwidget.ui
+++ b/noatun/library/equalizerwidget.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EqualizerWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>EqualizerWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -22,22 +22,22 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QLayoutWidget" row="1" column="0">
+ <widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<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,22 +71,22 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>1</width>
<height>8</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QSlider">
+ <widget class="TQSlider">
<property name="name">
<cstring>preampSlider</cstring>
</property>
@@ -115,14 +115,14 @@
<number>25</number>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
<property name="text">
<string>+/-</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -130,7 +130,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox" row="1" column="1">
+ <widget class="TQGroupBox" row="1" column="1">
<property name="name">
<cstring>bandsGroupBox</cstring>
</property>
@@ -141,7 +141,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>bandsFrame</cstring>
</property>
@@ -165,7 +165,7 @@
</widget>
</vbox>
</widget>
- <widget class="QGroupBox" row="1" column="2">
+ <widget class="TQGroupBox" row="1" column="2">
<property name="name">
<cstring>presetsGroupBox</cstring>
</property>
@@ -176,7 +176,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQFrame" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>presetFrame</cstring>
</property>
@@ -201,7 +201,7 @@
<number>0</number>
</property>
</widget>
- <widget class="QPushButton" row="1" column="0">
+ <widget class="TQPushButton" row="1" column="0">
<property name="name">
<cstring>removePresetButton</cstring>
</property>
@@ -209,7 +209,7 @@
<string>&amp;Remove</string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="0">
+ <widget class="TQPushButton" row="2" column="0">
<property name="name">
<cstring>addPresetButton</cstring>
</property>
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>8</width>
<height>16</height>
@@ -236,15 +236,15 @@
</spacer>
</grid>
</widget>
- <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
+ <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">
<cstring>unnamed</cstring>
</property>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>enabledCheckBox</cstring>
</property>
@@ -262,14 +262,14 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>8</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>textLabel1_3</cstring>
</property>
@@ -301,14 +301,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>8</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>resetEqButton</cstring>
</property>
@@ -330,7 +330,7 @@
<tabstop>removePresetButton</tabstop>
<tabstop>addPresetButton</tabstop>
</tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/noatun/library/globalvideo.h b/noatun/library/globalvideo.h
index c070ab30..8203282d 100644
--- a/noatun/library/globalvideo.h
+++ b/noatun/library/globalvideo.h
@@ -4,9 +4,10 @@
#include "noatun/video.h"
-class GlobalVideo : public QWidget
+class GlobalVideo : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
TQPopupMenu *menu;
VideoFrame *video;
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/mimetypetree.cpp b/noatun/library/mimetypetree.cpp
index 0370b048..a63b49f6 100644
--- a/noatun/library/mimetypetree.cpp
+++ b/noatun/library/mimetypetree.cpp
@@ -4,8 +4,8 @@
#include <tqheader.h>
-MimeTypeTree::MimeTypeTree(TQWidget *parent)
- : KListView(parent)
+MimeTypeTree::MimeTypeTree(TQWidget *tqparent)
+ : KListView(tqparent)
{
KMimeType::List list=KMimeType::allMimeTypes();
TQDict<TQListViewItem> map;
@@ -17,7 +17,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *parent)
for (; i != list.end(); ++i)
{
TQString mimetype = (*i)->name();
- int slash = mimetype.find("/");
+ int slash = mimetype.tqfind("/");
TQString major = mimetype.left(slash);
// hide all and inode majors
@@ -38,7 +38,7 @@ MimeTypeTree::MimeTypeTree(TQWidget *parent)
void MimeTypeTree::sel(TQListViewItem *item)
{
- TQListViewItem *p=item->parent();
+ TQListViewItem *p=item->tqparent();
if (!p) return;
TQString major=p->text(0);
TQString minor=item->text(0);
diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h
index 92af43ec..b3f7ccb7 100644
--- a/noatun/library/mimetypetree.h
+++ b/noatun/library/mimetypetree.h
@@ -6,7 +6,7 @@
* of Noatun linking to this, and to a GPL plugin,
* where the GPL plugin does not use any code
* in this class. However, it may link directly
- * to the Qt Library, where Qt may be under any license.
+ * to the TQt Library, where TQt may be under any license.
*
* Debian, Gnome, and GNU must ALL DIE.
* Especially GNU's stupid info pages.
@@ -19,8 +19,9 @@
class MimeTypeTree : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- MimeTypeTree(TQWidget *parent);
+ MimeTypeTree(TQWidget *tqparent);
private:
TQListViewItem *addMajor(const TQString &name);
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index 0b8af3ee..8e8b0e1b 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -31,6 +31,7 @@ namespace NoatunStdAction
class KDE_EXPORT NoatunApp : public KUniqueApplication
{
Q_OBJECT
+ TQ_OBJECT
friend class Playlist;
public:
@@ -71,8 +72,8 @@ public:
TQCString version() const;
- virtual void commitData(QSessionManager &);
- virtual void saveState(QSessionManager &);
+ virtual void commitData(TQSessionManager &);
+ virtual void saveState(TQSessionManager &);
/**
* The three startup modes how noatun should behave when it is
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index 4c11aac7..02564048 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -20,14 +20,15 @@ class TQLabel;
* @author Charles Samuels
* @version 2.3
**/
-class KDE_EXPORT L33tSlider : public QSlider
+class KDE_EXPORT L33tSlider : public TQSlider
{
Q_OBJECT
+ TQ_OBJECT
public:
- L33tSlider(TQWidget * parent, const char * name=0);
- L33tSlider(Orientation, TQWidget * parent, const char * name=0);
+ L33tSlider(TQWidget * tqparent, const char * name=0);
+ L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0);
L33tSlider(int minValue, int maxValue, int pageStep, int value,
- Orientation, TQWidget * parent, const char * name=0);
+ Qt::Orientation, TQWidget * tqparent, const char * name=0);
bool currentlyPressed() const;
signals:
@@ -56,9 +57,10 @@ private:
class SliderAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
SliderAction(const TQString& text, int accel, const TQObject *receiver,
- const char *member, TQObject* parent, const char* name );
+ const char *member, TQObject* tqparent, const char* name );
virtual int plug( TQWidget *w, int index = -1 );
virtual void unplug( TQWidget *w );
TQSlider* slider() const { return m_slider; }
diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h
index a4c08ad7..7d711c26 100644
--- a/noatun/library/noatun/downloader.h
+++ b/noatun/library/noatun/downloader.h
@@ -63,9 +63,10 @@ private:
/**
* download playlistitems, in a queue based fasion
**/
-class Downloader : public QObject
+class Downloader : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
struct QueueItem
{
DownloadItem *notifier;
@@ -74,7 +75,7 @@ Q_OBJECT
};
public:
- Downloader(TQObject *parent=0);
+ Downloader(TQObject *tqparent=0);
virtual ~Downloader();
public slots:
diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h
index 4c014a93..0480729d 100644
--- a/noatun/library/noatun/effects.h
+++ b/noatun/library/noatun/effects.h
@@ -94,9 +94,10 @@ private:
* Noatuns effect stack
* @author Charles Samuels
**/
-class Effects : public QObject
+class Effects : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class Effect;
public:
Effects();
diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h
index b47eb087..3108ae84 100644
--- a/noatun/library/noatun/engine.h
+++ b/noatun/library/noatun/engine.h
@@ -30,12 +30,13 @@ class NoatunApp;
* Does almost everything related to multimedia.
* Most interfacing should be done with Player
**/
-class KDE_EXPORT Engine : public QObject
+class KDE_EXPORT Engine : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class NoatunApp;
public:
- Engine(TQObject *parent=0);
+ Engine(TQObject *tqparent=0);
~Engine();
void setInitialized();
bool initialized() const;
diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h
index d048d21d..744958b3 100644
--- a/noatun/library/noatun/equalizer.h
+++ b/noatun/library/noatun/equalizer.h
@@ -99,13 +99,14 @@ private:
* @author Charles Samuels
* @version 2.3
**/
-class Equalizer : public QObject
+class Equalizer : public TQObject
{
friend class Band;
friend class Preset;
friend class Engine;
Q_OBJECT
+ TQ_OBJECT
public:
Equalizer();
~Equalizer();
diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h
index a61c2335..406f4f1b 100644
--- a/noatun/library/noatun/player.h
+++ b/noatun/library/noatun/player.h
@@ -19,9 +19,10 @@ class KLibrary;
* @author Charles Samuels
* @version 2.4
**/
-class KDE_EXPORT Player : public QObject
+class KDE_EXPORT Player : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class Effects;
friend class PlaylistItemData;
friend class PlaylistNotifier;
@@ -41,7 +42,7 @@ public:
enum LoopType { None=0, Song, Playlist, Random };
public:
- Player(TQObject *parent=0);
+ Player(TQObject *tqparent=0);
~Player();
/**
diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h
index 013d63a4..d1baa25d 100644
--- a/noatun/library/noatun/playlist.h
+++ b/noatun/library/noatun/playlist.h
@@ -326,12 +326,13 @@ private:
* when you can call a Player method, unless, of course, you
* ARE the playlist.
**/
-class Playlist : public QObject
+class Playlist : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class PlaylistItemData;
public:
- Playlist(TQObject *parent, const char *name);
+ Playlist(TQObject *tqparent, const char *name);
/**
* on playlist unload, your playlist must
* have current()==0 and emit playCurrent
diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h
index 2bd8c994..d127ab9f 100644
--- a/noatun/library/noatun/plugin.h
+++ b/noatun/library/noatun/plugin.h
@@ -402,13 +402,14 @@ class NoatunListenerNotif;
*
* So far only used for ExitNotifier.
**/
-class NoatunListener : public QObject
+class NoatunListener : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
friend class NoatunListenerNotif;
public:
- NoatunListener(TQObject *parent=0);
+ NoatunListener(TQObject *tqparent=0);
virtual ~NoatunListener();
signals:
@@ -432,7 +433,7 @@ protected:
class ExitNotifier : public NoatunListener
{
public:
- ExitNotifier(int pid, TQObject *parent=0);
+ ExitNotifier(int pid, TQObject *tqparent=0);
virtual ~ExitNotifier();
private:
@@ -450,11 +451,12 @@ private:
*
* When noatunOk is false, then noatun has exited somehow.
**/
-class BoolNotifier : public QObject
+class BoolNotifier : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0);
+ BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent=0);
private slots:
void event() {*mValue=false;}
diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h
index 5a7d056e..a290e51c 100644
--- a/noatun/library/noatun/pref.h
+++ b/noatun/library/noatun/pref.h
@@ -13,6 +13,7 @@ class CModule;
class NoatunPreferences : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
friend class CModule;
public:
@@ -53,19 +54,20 @@ private:
* Create your GUI in constructor, reimplement reopen() and save() and
* you're all set.
**/
-class KDE_EXPORT CModule : public QWidget
+class KDE_EXPORT CModule : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* arguments are short and long descriptions
* for this module, respectively
*
- * parent is the object that is this modules virtual-parent.
+ * tqparent is the object that is this modules virtual-tqparent.
* When that is deleted, this also will go away, automagically.
**/
- CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *parent=0);
+ CModule(const TQString &name, const TQString &description, const TQString &icon, TQObject *tqparent=0);
virtual ~CModule();
diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h
index 231d3158..94253d4a 100644
--- a/noatun/library/noatun/scrollinglabel.h
+++ b/noatun/library/noatun/scrollinglabel.h
@@ -28,12 +28,13 @@
* A clever label that scrolls its contents as soon as there is not enough
* space to show everything at once.
**/
-class ScrollingLabel : public QWidget
+class ScrollingLabel : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- ScrollingLabel(const TQString &initialText,TQWidget *parent,
+ ScrollingLabel(const TQString &initialText,TQWidget *tqparent,
const char * name = 0);
virtual ~ScrollingLabel();
@@ -43,8 +44,8 @@ class ScrollingLabel : public QWidget
**/
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/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index bfa34164..f7413e70 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -20,8 +20,9 @@ namespace NoatunStdAction
class PlayAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- PlayAction(TQObject *parent, const char *name);
+ PlayAction(TQObject *tqparent, const char *name);
private slots:
void playing();
void notplaying();
@@ -33,8 +34,9 @@ private slots:
class PlaylistAction : public KToggleAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- PlaylistAction(TQObject *parent, const char *name);
+ PlaylistAction(TQObject *tqparent, const char *name);
private slots:
void shown();
void hidden();
@@ -47,8 +49,9 @@ private slots:
class PluginActionMenu : public KActionMenu
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginActionMenu(TQObject *parent, const char *name);
+ PluginActionMenu(TQObject *tqparent, const char *name);
/**
* inserts the given @p action into the action-menu
* @param action the action to insert
@@ -80,8 +83,9 @@ private:
class VisActionMenu : public KActionMenu
{
Q_OBJECT
+ TQ_OBJECT
public:
- VisActionMenu(TQObject *parent, const char *name);
+ VisActionMenu(TQObject *tqparent, const char *name);
private slots:
void fillPopup();
void toggleVisPlugin(int);
@@ -97,8 +101,9 @@ private:
class LoopActionMenu : public KActionMenu
{
Q_OBJECT
+ TQ_OBJECT
public:
- LoopActionMenu(TQObject *parent, const char *name);
+ LoopActionMenu(TQObject *tqparent, const char *name);
private slots:
void updateLooping(int);
void loopNoneSelected();
@@ -116,48 +121,48 @@ private:
/**
* @return pointer to a KAction which opens the effects dialog on activation
*/
-KDE_EXPORT KAction *effects(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *effects(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to a KAction which opens the equalizer dialog on activation
*/
-KDE_EXPORT KAction *equalizer(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *equalizer(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to a KAction which goes back one track on activation
*/
-KDE_EXPORT KAction *back(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *back(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to a KAction which stops playback on activation
*/
-KDE_EXPORT KAction *stop(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *stop(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to a KAction which starts/pauses playback on activation
*/
-KDE_EXPORT KAction *playpause(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *playpause(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to a KAction which advances one track on activation
*/
-KDE_EXPORT KAction *forward(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *forward(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to a KToggleAction which shows/hides the playlist
*/
-KDE_EXPORT KToggleAction *playlist(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KToggleAction *playlist(TQObject *tqparent = 0, const char *name = 0);
/**
* loop action
**/
-KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name);
+KDE_EXPORT LoopActionMenu *loop(TQObject *tqparent, const char *name);
/**
* play action
*/
-KDE_EXPORT KAction *play(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *play(TQObject *tqparent = 0, const char *name = 0);
/**
* pause action
*/
-KDE_EXPORT KAction *pause(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT KAction *pause(TQObject *tqparent = 0, const char *name = 0);
/**
* @return pointer to the global PluginActionMenu object (there is only one instance)
@@ -167,7 +172,7 @@ KDE_EXPORT PluginActionMenu *actions();
/**
* @return pointer to a VisActionMenu object
*/
-KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0);
+KDE_EXPORT VisActionMenu *visualizations(TQObject *tqparent = 0, const char *name = 0);
/**
* The global popupmenu of noatun, there's not two or three but only one of these :)
diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h
index d6d6edb9..a364dba0 100644
--- a/noatun/library/noatun/stereobuttonaction.h
+++ b/noatun/library/noatun/stereobuttonaction.h
@@ -13,13 +13,14 @@ namespace NoatunStdAction
class StereoButtonAction : public KAction
{
Q_OBJECT
+ TQ_OBJECT
public:
- StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
- StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
- StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 );
- StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* parent = 0, const char* name = 0 );
- StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
- StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
+ StereoButtonAction(const TQString& text, int accel = 0, TQObject* tqparent = 0, const char* name = 0 );
+ StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
+ StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 );
+ StereoButtonAction(const TQString& text, const TQString& pix, int accel = 0, TQObject* tqparent = 0, const char* name = 0 );
+ StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
+ StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name = 0 );
public slots:
void disable(void);
void enable(void);
diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h
index d5ee7ecf..5e494472 100644
--- a/noatun/library/noatun/vequalizer.h
+++ b/noatun/library/noatun/vequalizer.h
@@ -4,7 +4,7 @@
* This file is hereby licensed under the GNU General Public License version
* 2 or later at your option.
*
- * This file is licensed under the Qt Public License version 1 with the
+ * This file is licensed under the TQt Public License version 1 with the
* condition that the licensed will be governed under the Laws of California
* (USA) instead of Norway. Disputes will be settled in Santa Clara county
* courts.
@@ -36,8 +36,8 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NOATUN_VEQUALIZER_H
-#define NOATUN_VEQUALIZER_H
+#ifndef NOATUN_VETQUALIZER_H
+#define NOATUN_VETQUALIZER_H
#include <tqptrlist.h>
#include <tqobject.h>
@@ -137,6 +137,7 @@ public:
class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface
{
Q_OBJECT
+ TQ_OBJECT
struct Private;
Private *d;
friend class VBand;
@@ -176,6 +177,7 @@ class VPreset;
class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface
{
Q_OBJECT
+ TQ_OBJECT
friend class VBand;
friend class VPreset;
friend class Engine;
diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h
index a659401e..217a8640 100644
--- a/noatun/library/noatun/video.h
+++ b/noatun/library/noatun/video.h
@@ -12,6 +12,7 @@ class TQPopupMenu;
class VideoFrame : public KVideoWidget
{
Q_OBJECT
+ TQ_OBJECT
struct Private;
VideoFrame::Private *d;
@@ -19,8 +20,8 @@ Q_OBJECT
static VideoFrame *whose;
public:
- VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent=0, const char *name=0, WFlags f=0);
- VideoFrame(TQWidget *parent = 0, const char *name=0, WFlags f=0);
+ VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+ VideoFrame(TQWidget *tqparent = 0, const char *name=0, WFlags f=0);
~VideoFrame();
/**
@@ -28,7 +29,7 @@ public:
**/
static VideoFrame *playing();
- TQPopupMenu *popupMenu(TQWidget *parent);
+ TQPopupMenu *popupMenu(TQWidget *tqparent);
TQPopupMenu *popupMenu() { return popupMenu(this); }
public slots:
diff --git a/noatun/library/noatunarts/Session_impl.cpp b/noatun/library/noatunarts/Session_impl.cpp
index 63912801..edec216a 100644
--- a/noatun/library/noatunarts/Session_impl.cpp
+++ b/noatun/library/noatunarts/Session_impl.cpp
@@ -10,7 +10,7 @@ static bool compareArtsObjects(const Noatun::Listener &left, const Noatun::Liste
return left._isEqual(right);
}
-list<Noatun::Listener>::iterator find(list<Noatun::Listener> &v, const Noatun::Listener &is,
+list<Noatun::Listener>::iterator tqfind(list<Noatun::Listener> &v, const Noatun::Listener &is,
bool (*compare)(const Noatun::Listener& left, const Noatun::Listener& right))
{
for (list<Noatun::Listener>::iterator i=v.begin(); i!=v.end(); ++i)
@@ -55,7 +55,7 @@ public:
void removeListener(Noatun::Listener listener)
{
list<Listener>::iterator i=
- find(listeners, listener, &compareArtsObjects);
+ tqfind(listeners, listener, &compareArtsObjects);
if (i!=listeners.end())
listeners.erase(i);
}
diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp
index 684d9694..107f06e9 100644
--- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp
+++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp
@@ -85,7 +85,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod
list<EffectEntry*>::iterator i = fx.begin();
bool found=false;
- // seek through until we find 'after'
+ // seek through until we tqfind 'after'
while(i != fx.end())
if((*i)->id == after)
{
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 99b69cb3..72c67d1c 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -21,8 +21,8 @@
namespace NoatunStdAction
{
/////////////////////////////////////////////////////
-PlayAction::PlayAction(TQObject *parent, const char *name)
- : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name)
+PlayAction::PlayAction(TQObject *tqparent, const char *name)
+ : KAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), tqparent, name)
{
connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing()));
connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying()));
@@ -46,8 +46,8 @@ void PlayAction::notplaying()
}
/////////////////////////////////////////////////////
-PlaylistAction::PlaylistAction(TQObject *parent, const char *name)
- : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name)
+PlaylistAction::PlaylistAction(TQObject *tqparent, const char *name)
+ : KToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), tqparent, name)
{
setCheckedState(i18n("Hide Playlist"));
connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown()));
@@ -67,8 +67,8 @@ void PlaylistAction::hidden()
////////////////////////////////////////////////////
-PluginActionMenu::PluginActionMenu(TQObject *parent, const char *name)
- : KActionMenu(i18n("&Actions"), parent, name)
+PluginActionMenu::PluginActionMenu(TQObject *tqparent, const char *name)
+ : KActionMenu(i18n("&Actions"), tqparent, name)
{
// kdDebug(66666) << k_funcinfo << "called" << endl;
setEnabled(false);
@@ -111,11 +111,11 @@ void PluginActionMenu::menuRemove(int id)
////////////////////////////////////////////////////
-VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
- : KActionMenu(i18n("&Visualizations"), parent, name)
+VisActionMenu::VisActionMenu(TQObject *tqparent, const char *name)
+ : KActionMenu(i18n("&Visualizations"), tqparent, name)
{
- connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup()));
- connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int)));
+ connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup()));
+ connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int)));
}
void VisActionMenu::fillPopup()
@@ -133,14 +133,14 @@ void VisActionMenu::fillPopup()
{
id = popupMenu()->insertItem((*i).name);
mSpecMap[id] = (*i).specfile;
- popupMenu()->setItemChecked(id, loaded.contains(*i));
+ popupMenu()->setItemChecked(id, loaded.tqcontains(*i));
}
}
}
void VisActionMenu::toggleVisPlugin(int id)
{
- if(!mSpecMap.contains(id))
+ if(!mSpecMap.tqcontains(id))
return;
TQString specfile = mSpecMap[id];
@@ -159,30 +159,30 @@ void VisActionMenu::toggleVisPlugin(int id)
////////////////////////////////////////////////////
-LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
- : KActionMenu(i18n("&Loop"), parent, name)
+LoopActionMenu::LoopActionMenu(TQObject *tqparent, const char *name)
+ : KActionMenu(i18n("&Loop"), tqparent, name)
{
mLoopNone = new KRadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
- 0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none");
+ 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none");
mLoopNone->setExclusiveGroup("loopType");
insert(mLoopNone);
mLoopSong = new KRadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
- 0, this, TQT_SLOT(loopSongSelected()), this, "loop_song");
+ 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song");
mLoopSong->setExclusiveGroup("loopType");
insert(mLoopSong);
mLoopPlaylist = new KRadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
- 0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist");
+ 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist");
mLoopPlaylist->setExclusiveGroup("loopType");
insert(mLoopPlaylist);
mLoopRandom = new KRadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
- 0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random");
+ 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random");
mLoopRandom->setExclusiveGroup("loopType");
insert(mLoopRandom);
- connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int)));
+ connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int)));
updateLooping(static_cast<int>(napp->player()->loopStyle()));
}
@@ -232,29 +232,29 @@ void LoopActionMenu::loopRandomSelected()
////////////////////////////////////////////////////
-KAction *playpause(TQObject *parent, const char *name)
+KAction *playpause(TQObject *tqparent, const char *name)
{
- return new PlayAction(parent, name);
+ return new PlayAction(tqparent, name);
}
-KAction *effects(TQObject *parent, const char *name)
+KAction *effects(TQObject *tqparent, const char *name)
{
- return new KAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name);
+ return new KAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), tqparent, name);
}
-KAction *equalizer(TQObject *parent, const char *name)
+KAction *equalizer(TQObject *tqparent, const char *name)
{
- return new KAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name);
+ return new KAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), tqparent, name);
}
-KAction *back(TQObject *parent, const char *name)
+KAction *back(TQObject *tqparent, const char *name)
{
- return new KAction(i18n("&Back"), "player_start", 0, napp->player(), TQT_SLOT(back()), parent, name);
+ return new KAction(i18n("&Back"), "player_start", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), tqparent, name);
}
-KAction *stop(TQObject *parent, const char *name)
+KAction *stop(TQObject *tqparent, const char *name)
{
- StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), parent, name);
+ StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "player_stop", 0, napp->player(), TQT_SLOT(stop()), tqparent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@@ -265,14 +265,14 @@ KAction *stop(TQObject *parent, const char *name)
return action;
}
-KAction *forward(TQObject *parent, const char *name)
+KAction *forward(TQObject *tqparent, const char *name)
{
- return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), parent, name);
+ return new KAction(i18n("&Forward"), "player_end", 0, napp->player(), TQT_SLOT(forward()), tqparent, name);
}
-KAction *play(TQObject *parent, const char *name)
+KAction *play(TQObject *tqparent, const char *name)
{
- StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
+ StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "player_play", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(disable()));
TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(enable()));
@@ -283,9 +283,9 @@ KAction *play(TQObject *parent, const char *name)
return action;
}
-KAction *pause(TQObject *parent, const char *name)
+KAction *pause(TQObject *tqparent, const char *name)
{
- StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), parent, name);
+ StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "player_pause", 0, napp->player(), TQT_SLOT(playpause()), tqparent, name);
TQObject::connect(napp->player(), TQT_SIGNAL(playing()), action, TQT_SLOT(enable()));
TQObject::connect(napp->player(), TQT_SIGNAL(paused()), action, TQT_SLOT(disable()));
TQObject::connect(napp->player(), TQT_SIGNAL(stopped()), action, TQT_SLOT(disable()));
@@ -296,9 +296,9 @@ KAction *pause(TQObject *parent, const char *name)
return action;
}
-LoopActionMenu *loop(TQObject *parent, const char *name)
+LoopActionMenu *loop(TQObject *tqparent, const char *name)
{
- return new LoopActionMenu(parent, name);
+ return new LoopActionMenu(tqparent, name);
}
PluginActionMenu *actions()
@@ -307,14 +307,14 @@ PluginActionMenu *actions()
return napp->pluginActionMenu();
}
-VisActionMenu *visualizations(TQObject *parent, const char *name)
+VisActionMenu *visualizations(TQObject *tqparent, const char *name)
{
- return new VisActionMenu(parent, name);
+ return new VisActionMenu(tqparent, name);
}
-KToggleAction *playlist(TQObject *parent, const char *name)
+KToggleAction *playlist(TQObject *tqparent, const char *name)
{
- return new PlaylistAction(parent, name);
+ return new PlaylistAction(tqparent, name);
}
KPopupMenu *ContextMenu::mContextMenu = 0;
@@ -333,15 +333,15 @@ KPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
KActionCollection* actions = new KActionCollection(helpmenu);
- KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
- KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu);
+ KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
+ KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu);
contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu());
contextMenu->insertSeparator();
- KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu);
- NoatunStdAction::playlist(contextMenu)->plug(contextMenu);
- NoatunStdAction::effects(contextMenu)->plug(contextMenu);
- NoatunStdAction::equalizer(napp)->plug(contextMenu);
- NoatunStdAction::visualizations(napp)->plug(contextMenu);
+ KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu);
+ NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu);
+ NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu);
+ NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu);
+ NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu);
napp->pluginActionMenu()->plug(contextMenu);
return contextMenu;
diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp
index 268f7bd9..47e2d92a 100644
--- a/noatun/library/noatuntags/tags.cpp
+++ b/noatun/library/noatuntags/tags.cpp
@@ -177,8 +177,8 @@ Tags::~Tags()
}
-Control::Control(TagsGetter *parent)
- : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", parent)
+Control::Control(TagsGetter *tqparent)
+ : CModule(i18n("Tagging"), i18n("Settings for Tag Loaders"), "edit", tqparent)
{
// todo
(void)I18N_NOOP("Rescan All Tags");
@@ -201,7 +201,7 @@ Control::Control(TagsGetter *parent)
", and updates tags (e.g., ID3)",
"Interval:"), intervalLine);
TQSlider *slider=new TQSlider(
- 0, 2000, 100, 0, Horizontal, intervalLine
+ 0, 2000, 100, 0,Qt::Horizontal, intervalLine
);
TQSpinBox *spin=new TQSpinBox(
0, 2000, 10, intervalLine
@@ -212,14 +212,14 @@ Control::Control(TagsGetter *parent)
connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int)));
connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int)));
- slider->setValue(parent->interval());
- connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int)));
+ slider->setValue(tqparent->interval());
+ connect(slider, TQT_SIGNAL(valueChanged(int)), tqparent, TQT_SLOT(setInterval(int)));
connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool)));
}
- connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool)));
+ connect(onPlay, TQT_SIGNAL(toggled(bool)), tqparent, TQT_SLOT(setLoadAuto(bool)));
- onPlay->setChecked(parent->loadAuto());
+ onPlay->setChecked(tqparent->loadAuto());
}
diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h
index 8b6eddb9..bd66ab3f 100644
--- a/noatun/library/noatuntags/tagsgetter.h
+++ b/noatun/library/noatuntags/tagsgetter.h
@@ -10,6 +10,7 @@
class TagsGetter : public TQObject, public PlaylistNotifier
{
Q_OBJECT
+ TQ_OBJECT
public:
TagsGetter();
void associate(Tags *t);
@@ -47,8 +48,9 @@ private:
class Control : public CModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- Control(TagsGetter* parent);
+ Control(TagsGetter* tqparent);
};
diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp
index 0b90952c..accdfd47 100644
--- a/noatun/library/player.cpp
+++ b/noatun/library/player.cpp
@@ -14,7 +14,7 @@ enum ArtsPOS { posIdle=0, posPlaying, posPaused };
-Player::Player(TQObject *parent) : TQObject(parent, "Player"),
+Player::Player(TQObject *tqparent) : TQObject(tqparent, "Player"),
position(-1), mLoopStyle(None), firstTimeout(true)
{
mEngine=new Engine;
diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp
index 7cc28337..a86be118 100644
--- a/noatun/library/playlist.cpp
+++ b/noatun/library/playlist.cpp
@@ -62,12 +62,12 @@ TQString PlaylistItemData::title() const
// "$(property)"
TQString format=napp->titleFormat();
- TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)");
+ TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)");
int start=0;
while (start != -1)
{
- start = find.search(format, start);
+ start = tqfind.search(format, start);
if (start == -1) break;
// test if there's an odd amount of backslashes
@@ -81,8 +81,8 @@ TQString PlaylistItemData::title() const
uint len=counter.cap(1).length()-1;
// and half them, and remove one more
- format.replace(start-1, len/2+1, "");
- start=start-1+len/2+find.cap(1).length()+3;
+ format.tqreplace(start-1, len/2+1, "");
+ start=start-1+len/2+tqfind.cap(1).length()+3;
continue;
}
@@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const
uint len=counter.cap(1).length();
// and half them
- format.replace(start, len/2, "");
+ format.tqreplace(start, len/2, "");
start=start+len/2;
}
// "sth"foo"sth"
- TQString cont(find.cap(1));
+ TQString cont(tqfind.cap(1));
TQString prefix,suffix,propname;
unsigned int i=0;
if (cont[i] == '"')
@@ -150,18 +150,18 @@ TQString PlaylistItemData::title() const
{
// comments can contain newlines
// these are not wanted in a formatted title
- propval.replace('\n', ' ');
+ propval.tqreplace('\n', ' ');
}
if (propval.length())
{
propval = prefix+propval+suffix;
- format.replace(start, i+2, propval);
+ format.tqreplace(start, i+2, propval);
start += propval.length();
}
else
{
- format.replace(start, i+2, "");
+ format.tqreplace(start, i+2, "");
}
}
return format;
@@ -278,7 +278,7 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const
-Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name)
+Playlist::Playlist(TQObject *tqparent, const char *name) : TQObject(tqparent, name)
{
napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent()));
napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden()));
@@ -356,7 +356,7 @@ TQValueList<PlaylistItem> Playlist::select(
}
else
{
- if ((*val).find(v, 0, caseSensitive)!=-1)
+ if ((*val).tqfind(v, 0, caseSensitive)!=-1)
{
list.append(i);
limit--;
diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp
index 8b34deca..15fcad58 100644
--- a/noatun/library/playlistsaver.cpp
+++ b/noatun/library/playlistsaver.cpp
@@ -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())
@@ -144,7 +144,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int )
else
localFile = napp->tempSaveName(file.path());
- // QDom is a pain :)
+ // TQDom is a pain :)
TQDomDocument doc("playlist");
doc.setContent(TQString("<!DOCTYPE XMLPlaylist><playlist version=\"1.0\" client=\"noatun\"/>"));
@@ -186,7 +186,7 @@ bool PlaylistSaver::saveXML(const KURL &file, int )
return true;
}
-class NoatunXMLStructure : public QXmlDefaultHandler
+class NoatunXMLStructure : public TQXmlDefaultHandler
{
public:
PlaylistSaver *saver;
@@ -231,7 +231,7 @@ public:
};
-class MSASXStructure : public QXmlDefaultHandler
+class MSASXStructure : public TQXmlDefaultHandler
{
public:
PlaylistSaver *saver;
@@ -291,7 +291,7 @@ public:
if(a.qName(i).lower()=="href")
{
TQString filename=a.value(i);
- if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
+ if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
{
KURL url(filename);
KMimeType::Ptr mimetype = KMimeType::findByURL(url);
@@ -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();
@@ -316,7 +316,7 @@ public:
{
KURL u1;
// we have to deal with a relative path
- if (filename.find('/'))
+ if (filename.tqfind('/'))
{
u1.setPath(mAbsPath); //FIXME: how to get the path in this place?
u1.setFileName(filename);
@@ -448,8 +448,8 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt)
reset();
- // QXml is horribly documented
- TQXmlInputSource source(&file);
+ // TQXml is horribly documented
+ TQXmlInputSource source(TQT_TQIODEVICE(&file));
TQXmlSimpleReader reader;
if (opt == ASX ||
@@ -541,7 +541,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
if (filename.isEmpty())
continue;
- if (filename.find(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
+ if (filename.tqfind(TQRegExp("^[a-zA-Z0-9]+:/"))==0)
{
//kdDebug(66666) << k_funcinfo << "url filename = " << filename << endl;
@@ -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("/");
@@ -569,7 +569,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
{
KURL u1;
// we have to deal with a relative path
- if (filename.find('/'))
+ if (filename.tqfind('/'))
{
u1.setPath(file.path(0));
u1.setFileName(filename);
@@ -587,7 +587,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
{
extinf.remove(0,8); // remove "#EXTINF:"
//kdDebug(66666) << "EXTM3U extinf = '" << extinf << "'" << endl;
- int timeTitleSep = extinf.find(',', 0);
+ int timeTitleSep = extinf.tqfind(',', 0);
int length = (extinf.left(timeTitleSep)).toInt();
if (length>0)
@@ -596,7 +596,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
TQString displayTitle=extinf.mid(timeTitleSep+1);
if (!displayTitle.isEmpty())
{
- int artistTitleSep = displayTitle.find(" - ",0);
+ int artistTitleSep = displayTitle.tqfind(" - ",0);
if (artistTitleSep == -1) // no "artist - title" like format, just set it as title
{
prop["title"] = displayTitle;
@@ -718,7 +718,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/)
// some stupid Windows lusers like to be case insensitive
TQStringList groups = list.groupList().grep(TQRegExp("^playlist$", false));
/*
- if (!groups.count()) // didn't find "[playlist]", it's not a .pls file
+ if (!groups.count()) // didn't tqfind "[playlist]", it's not a .pls file
return false;
*/
@@ -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..36c1a2cf 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -85,16 +85,16 @@ Visualization::Visualization(int timeout, int pid)
// if this is a fork, do a cutesy arts thingy to get a remote
// stack, otherwise, get it from localhost :)
{
- int parent=pid ? pid : getppid();
+ int tqparent=pid ? pid : getppid();
if (getenv("NOATUN_PID"))
- parent = TQString::fromLatin1(getenv("NOATUN_PID")).toInt();
+ tqparent = 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(tqparent).local8Bit();
appids[1]="noatun";
TQCString &appid=appids[0];
@@ -120,7 +120,7 @@ Visualization::Visualization(int timeout, int pid)
if (!c.call(appid, "Noatun", "visStack()", TQByteArray(), replyType, replyData))
{
- kdDebug(66666) << "Error communicating to parent noatun" << endl;
+ kdDebug(66666) << "Error communicating to tqparent noatun" << endl;
}
else
{
@@ -187,7 +187,7 @@ int Visualization::noatunPid()
{
if ((*i).left(6) != "noatun")
continue;
- int pid=(*i).mid((*i).find('-')+1).toInt();
+ int pid=(*i).mid((*i).tqfind('-')+1).toInt();
return pid;
}
return -1;
@@ -473,7 +473,7 @@ void StereoScope::setSamples(int len)
-NoatunListener::NoatunListener(TQObject *parent) : TQObject(parent)
+NoatunListener::NoatunListener(TQObject *tqparent) : TQObject(tqparent)
{ }
NoatunListener::~NoatunListener()
@@ -495,7 +495,7 @@ void NoatunListenerNotif::message()
}
-ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
+ExitNotifier::ExitNotifier(int pid, TQObject *tqparent) : NoatunListener(tqparent)
{
mNotif=new NoatunListenerNotif(this);
@@ -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];
@@ -528,7 +528,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
if (!c.call(appid, "Noatun", "session()", TQByteArray(), replyType, replyData))
{
- kdDebug(66666) << "Error communicating to parent noatun" << endl;
+ kdDebug(66666) << "Error communicating to tqparent noatun" << endl;
}
else
{
@@ -563,8 +563,8 @@ ExitNotifier::~ExitNotifier()
delete mNotif;
}
-BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent)
- : TQObject(parent)
+BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *tqparent)
+ : TQObject(tqparent)
{
connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event()));
mValue=value;
diff --git a/noatun/library/plugin_deps.h b/noatun/library/plugin_deps.h
index 330636e3..e52e73c1 100644
--- a/noatun/library/plugin_deps.h
+++ b/noatun/library/plugin_deps.h
@@ -9,9 +9,10 @@ class Visualization;
class NoatunListener;
-class TimerThingy : public QObject
+class TimerThingy : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
TimerThingy(Visualization*);
diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp
index 0897e76d..032761a0 100644
--- a/noatun/library/pluginloader.cpp
+++ b/noatun/library/pluginloader.cpp
@@ -81,7 +81,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
{
NoatunLibraryInfo info=getInfo(*i);
- if (!info.type.contains("sm"))
+ if (!info.type.tqcontains("sm"))
continue;
loadSO(*i);
}
@@ -90,7 +90,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
{
NoatunLibraryInfo info=getInfo(*i);
- if (!info.type.contains("playlist"))
+ if (!info.type.tqcontains("playlist"))
continue;
loadSO(*i);
}
@@ -106,7 +106,7 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
{
NoatunLibraryInfo info=getInfo(*i);
- if (!info.type.contains("userinterface"))
+ if (!info.type.tqcontains("userinterface"))
continue;
loadSO(*i);
}
@@ -121,9 +121,9 @@ bool LibraryLoader::loadAll(const TQStringList &modules)
for(TQStringList::ConstIterator i=modules.begin(); i!=modules.end(); ++i)
{
NoatunLibraryInfo info=getInfo(*i);
- if((!info.type.contains("playlist"))
- && (!info.type.contains("userinterface"))
- && (!info.type.contains("sm")))
+ if((!info.type.tqcontains("playlist"))
+ && (!info.type.tqcontains("userinterface"))
+ && (!info.type.tqcontains("sm")))
{
loadSO(*i);
}
@@ -139,7 +139,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const
if (!TQFile::exists(specPath))
return info;
KSimpleConfig file(specPath);
- if (spec.find('/')>=0)
+ if (spec.tqfind('/')>=0)
info.specfile=KURL(spec).fileName();
else
info.specfile=spec;
@@ -197,7 +197,7 @@ bool LibraryLoader::loadSO(const TQString &spec)
plugInStart=(Plugin* (*)()) create;
listitem->plugin=plugInStart();
- if (info.type.contains("playlist"))
+ if (info.type.tqcontains("playlist"))
{
//kdDebug(66666) << k_funcinfo << "Assigning mPlaylist to " << info.name << endl;
mPlaylist=listitem->plugin->playlist();
@@ -329,7 +329,7 @@ TQValueList<NoatunLibraryInfo> LibraryLoader::loadedByType(const TQString &type)
if (isLoaded(i.currentKey()))
{
NoatunLibraryInfo info = getInfo(i.currentKey());
- if (info.type.contains(type))
+ if (info.type.tqcontains(type))
items.append(info);
}
}
diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp
index 77047471..0cd47d6d 100644
--- a/noatun/library/pluginmodule.cpp
+++ b/noatun/library/pluginmodule.cpp
@@ -203,34 +203,34 @@ void Plugins::reopen()
for(TQValueList<NoatunLibraryInfo>::Iterator i = available.begin(); i != available.end(); ++i)
{
- PluginListView *parent;
+ PluginListView *tqparent;
bool exclusive = false;
if((*i).type == "userinterface")
{
- parent = interfaceList;
+ tqparent = interfaceList;
}
else if((*i).type == "playlist")
{
- parent = playlistList;
+ tqparent = playlistList;
exclusive = true;
}
else if((*i).type == "sm" || (*i).type=="hidden")
{
- parent = 0;
+ tqparent = 0;
}
else if ((*i).type == "visualization")
{
- parent = visList;
+ tqparent = visList;
}
else
{
- parent = otherList;
+ tqparent = otherList;
}
- if(parent)
+ if(tqparent)
{
- PluginListItem *item = new PluginListItem(exclusive, loaded.contains(*i), *i, parent);
+ PluginListItem *item = new PluginListItem(exclusive, loaded.tqcontains(*i), *i, tqparent);
item->setText(0, (*i).name);
item->setText(1, (*i).comment);
item->setText(2, (*i).author);
@@ -257,9 +257,9 @@ void Plugins::addPlugin(const NoatunLibraryInfo &info)
if(item) item->setOn(true);
}
- if(mDeleted.contains(info.specfile))
+ if(mDeleted.tqcontains(info.specfile))
mDeleted.remove(info.specfile);
- else if(!mAdded.contains(info.specfile))
+ else if(!mAdded.tqcontains(info.specfile))
mAdded.append(info.specfile);
}
@@ -291,9 +291,9 @@ void Plugins::removePlugin(const NoatunLibraryInfo &info)
}
}
- if (mAdded.contains(info.specfile))
+ if (mAdded.tqcontains(info.specfile))
mAdded.remove(info.specfile);
- else if(!mDeleted.contains(info.specfile))
+ else if(!mDeleted.tqcontains(info.specfile))
mDeleted.append(info.specfile);
}
@@ -382,7 +382,7 @@ void Plugins::save()
TQValueList<NoatunLibraryInfo> loaded = loader.loaded();
for(TQValueList<NoatunLibraryInfo>::Iterator i = loaded.begin(); i != loaded.end(); ++i)
{
- if(!specList.contains((*i).specfile) && loader.isLoaded((*i).specfile))
+ if(!specList.tqcontains((*i).specfile) && loader.isLoaded((*i).specfile))
specList += (*i).specfile;
}
@@ -398,7 +398,7 @@ void Plugins::showEvent(TQShowEvent *e)
if(!shown)
{
shown = true;
- KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString::null, "Plugin warning");
+ KMessageBox::information(this, i18n("<qt>Changing your playlist plugin will stop playback. Different playlists may use different methods of storing information, so after changing playlists you may have to recreate your playlist.</qt>"), TQString(), "Plugin warning");
}
CModule::showEvent(e);
}
diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h
index 59ece235..c3818040 100644
--- a/noatun/library/pluginmodule.h
+++ b/noatun/library/pluginmodule.h
@@ -30,7 +30,7 @@
class KTabCtl;
-class PluginListItem : public QCheckListItem
+class PluginListItem : public TQCheckListItem
{
public:
PluginListItem(const bool _exclusive, bool _checked, const NoatunLibraryInfo &_info, TQListView *_parent);
@@ -51,6 +51,7 @@ private:
class PluginListView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
friend class PluginListItem;
@@ -75,6 +76,7 @@ private:
class Plugins : public CModule
{
Q_OBJECT
+ TQ_OBJECT
public:
Plugins(TQObject *_parent = 0);
virtual void save();
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 658e7951..04e301ff 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -8,9 +8,9 @@
//#include <tqlabel.h>
#include "cmodule.h"
-NoatunPreferences::NoatunPreferences(TQWidget *parent)
+NoatunPreferences::NoatunPreferences(TQWidget *tqparent)
: KDialogBase(TreeList, i18n("Preferences - Noatun"),
- Ok|Apply|Cancel|Help, Ok, parent, "NoatunPreferences", false, true)
+ Ok|Apply|Cancel|Help, Ok, tqparent, "NoatunPreferences", false, true)
{
resize(640, 480); // KDE is required to support 800x600 min.
setShowIconsInTreeList(true);
@@ -32,7 +32,7 @@ void NoatunPreferences::show()
void NoatunPreferences::show(CModule *page)
{
- int index = pageIndex( static_cast<TQWidget *>(page->parent()) );
+ int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->tqparent())) );
if (index != -1)
showPage(index);
show();
@@ -65,29 +65,20 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri
napp->preferencesBox()->add(this);
- TQFrame *page=static_cast<TQFrame*>(parent());
+ TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(tqparent()));
(new TQHBoxLayout(page))->addWidget(this);
}
CModule::~CModule()
{
//kdDebug(66666) << k_funcinfo << endl;
-#if QT_VERSION < 0x030102 && KDE_VERSION < KDE_MAKE_VERSION( 3, 1, 90 )
- // Due to a bug in Qt 3.1 and 3.1.1 no close events are sent to hidden
- // widgets, causing the KJanusWidget to crash. This workaround is
- // rather intrusive and should be used only in the affected versions
- // to avoid hard to track bugs in the future. KDE HEAD (to become 3.2)
- // has a workaround for this problem, and additionally it's fixed in
- // Qt 3.1.2.
- napp->sendPostedEvents();
-#endif
napp->preferencesBox()->remove(this);
}
void CModule::ownerDeleted()
{
- TQObject *p=parent();
+ TQObject *p=tqparent();
delete this;
p->deleteLater();
}
diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp
index 09d64678..682c4f6a 100644
--- a/noatun/library/scrollinglabel.cpp
+++ b/noatun/library/scrollinglabel.cpp
@@ -40,11 +40,11 @@ class ScrollingLabel::Private
}
// Order dependency.
- QString text;
- QString originalText;
- QPixmap buf;
- QTimer scrollTimer;
- QTimer resetTimer;
+ TQString text;
+ TQString originalText;
+ TQPixmap buf;
+ TQTimer scrollTimer;
+ TQTimer resetTimer;
int scrollSize;
int pos;
bool add;
@@ -54,11 +54,11 @@ class ScrollingLabel::Private
ScrollingLabel::ScrollingLabel
(
- const QString & initialText,
- QWidget * parent,
+ const TQString & initialText,
+ TQWidget * tqparent,
const char * name
)
- : TQWidget(parent, name)
+ : TQWidget(tqparent, name)
{
d = new Private;
@@ -116,10 +116,10 @@ ScrollingLabel::_update()
setFixedHeight(h);
- d->scrollSize = QMAX(0, w - width());
+ 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,14 +128,14 @@ ScrollingLabel::_update()
if (d->scroll && (d->scrollSize > 0))
d->scrollTimer.start(100, true);
- repaint(false);
+ tqrepaint(false);
}
void
ScrollingLabel::paintEvent(TQPaintEvent *)
{
bitBlt
- (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), Qt::CopyROP);
+ (this, 0, 0, &d->buf, d->pos, 0, d->pos + width(), height(), TQt::CopyROP);
}
void
@@ -149,7 +149,7 @@ ScrollingLabel::scroll()
{
d->scrollTimer.stop();
- repaint(false);
+ tqrepaint(false);
int scrollTime = 100;
@@ -165,19 +165,19 @@ ScrollingLabel::scroll()
d->scrollTimer.start(scrollTime, true);
}
- QSize
-ScrollingLabel::sizeHint() const
+ TQSize
+ScrollingLabel::tqsizeHint() const
{
return fontMetrics().boundingRect(d->text).size();
}
- QSize
-ScrollingLabel::minimumSizeHint() const
+ TQSize
+ScrollingLabel::tqminimumSizeHint() const
{
return TQSize(0, fontMetrics().height());
}
- QString
+ TQString
ScrollingLabel::text() const
{
return d->text;
diff --git a/noatun/library/stereobuttonaction.cpp b/noatun/library/stereobuttonaction.cpp
index e8df0046..7d5d3936 100644
--- a/noatun/library/stereobuttonaction.cpp
+++ b/noatun/library/stereobuttonaction.cpp
@@ -3,28 +3,28 @@
namespace NoatunStdAction
{
-StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* parent, const char* name )
- : KAction(text, accel, parent, name)
+StereoButtonAction::StereoButtonAction(const TQString& text, int accel, TQObject* tqparent, const char* name )
+ : KAction(text, accel, tqparent, name)
{}
-StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
- : KAction(text, accel, receiver, slot, parent, name)
+StereoButtonAction::StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name )
+ : KAction(text, accel, receiver, slot, tqparent, name)
{}
-StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* parent, const char* name )
- : KAction(text, pix, accel, parent, name)
+StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, TQObject* tqparent, const char* name )
+ : KAction(text, pix, accel, tqparent, name)
{}
-StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* parent, const char* name )
- : KAction(text, pix, accel, parent, name)
+StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, TQObject* tqparent, const char* name )
+ : KAction(text, pix, accel, tqparent, name)
{}
-StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
- : KAction(text, pix, accel, receiver, slot, parent, name)
+StereoButtonAction::StereoButtonAction(const TQString& text, const TQIconSet& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name )
+ : KAction(text, pix, accel, receiver, slot, tqparent, name)
{}
-StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
- : KAction(text, pix, accel, receiver, slot, parent, name)
+StereoButtonAction::StereoButtonAction(const TQString& text, const TQString& pix, int accel, const TQObject* receiver, const char* slot, TQObject* tqparent, const char* name )
+ : KAction(text, pix, accel, receiver, slot, tqparent, name)
{}
void StereoButtonAction::disable(void)
diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp
index ee62863c..bda84b18 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::null )
- .arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString::null )
- .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() );
@@ -172,9 +172,9 @@ void Proxy::sendRequest() //SLOT
void Proxy::readRemote() //SLOT
{
m_connectSuccess = true;
- Q_LONG index = 0;
- Q_LONG bytesWrite = 0;
- Q_LONG bytesRead = m_sockRemote.readBlock( m_pBuf, BUFSIZE );
+ TQ_LONG index = 0;
+ TQ_LONG bytesWrite = 0;
+ TQ_LONG bytesRead = m_sockRemote.readBlock( m_pBuf, BUFSIZE );
if ( bytesRead == -1 )
{
kdDebug(66666) << k_funcinfo << "Could not read remote data from socket, aborting" << endl;
@@ -246,7 +246,7 @@ void Proxy::connectError() //SLOT
// PRIVATE
//////////////////////////////////////////////////////////////////////////////////////////
-bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead )
+bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead )
{
while ( index < bytesRead )
{
@@ -258,11 +258,11 @@ bool Proxy::processHeader( Q_LONG &index, Q_LONG bytesRead )
// Handle redirection
TQString loc( "Location: " );
- int index = m_headerStr.find( loc );
+ int index = m_headerStr.tqfind( loc );
if ( index >= 0 )
{
int start = index + loc.length();
- int end = m_headerStr.find( "\n", index );
+ int end = m_headerStr.tqfind( "\n", index );
m_url = m_headerStr.mid( start, end - start - 1 );
kdDebug(66666) << k_funcinfo <<
@@ -304,7 +304,7 @@ bool Proxy::processHeader( Q_LONG &index, Q_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")));
}
@@ -360,15 +360,15 @@ void Proxy::error()
TQString Proxy::extractStr( const TQString &str, const TQString &key )
{
- int index = str.find( key, 0, true );
+ int index = str.tqfind( key, 0, true );
if ( index == -1 )
{
- return TQString::null;
+ return TQString();
}
else
{
- index = str.find( "'", index ) + 1;
- int indexEnd = str.find( "'", index );
+ index = str.tqfind( "'", index ) + 1;
+ int indexEnd = str.tqfind( "'", index );
return str.mid( index, indexEnd - index );
}
}
diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h
index 7bbb3143..947ccff5 100644
--- a/noatun/library/titleproxy.h
+++ b/noatun/library/titleproxy.h
@@ -46,9 +46,10 @@ namespace TitleProxy
* @short A proxy server for extracting metadata from Shoutcast streams.
*/
- class Proxy : public QObject
+ class Proxy : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Proxy( KURL url );
~Proxy();
@@ -74,7 +75,7 @@ namespace TitleProxy
void connectError();
private:
- bool processHeader( Q_LONG &index, Q_LONG bytesRead );
+ bool processHeader( TQ_LONG &index, TQ_LONG bytesRead );
void transmitData( const TQString &data );
void error();
TQString extractStr( const TQString &str, const TQString &key );
@@ -108,13 +109,14 @@ namespace TitleProxy
};
- class Server : public QServerSocket
+ class Server : public TQServerSocket
{
Q_OBJECT
+ TQ_OBJECT
public:
- Server( Q_UINT16 port, TQObject* parent )
- : TQServerSocket( port, 1, parent, "TitleProxyServer" ) {};
+ Server( TQ_UINT16 port, TQObject* tqparent )
+ : TQServerSocket( port, 1, tqparent, "TitleProxyServer" ) {};
signals:
void connected( int socket );
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index c081d84b..a61e3eec 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -4,7 +4,7 @@
* This file is hereby licensed under the GNU General Public License version
* 2 or later at your option.
*
- * This file is licensed under the Qt Public License version 1 with the
+ * This file is licensed under the TQt Public License version 1 with the
* condition that the licensed will be governed under the Laws of California
* (USA) instead of Norway. Disputes will be settled in Santa Clara county
* courts.
@@ -63,7 +63,7 @@
#include <math.h>
#define EQ (napp->vequalizer())
-#define EQBACK (napp->player()->engine()->equalizer())
+#define ETQBACK (napp->player()->engine()->equalizer())
using std::vector;
@@ -440,7 +440,7 @@ void VEqualizer::setBands(int num, bool interpolate)
void VEqualizer::setPreamp(int preamp)
{
d->preamp = preamp;
- EQBACK->preamp(pow(2,float(preamp)/100.0));
+ ETQBACK->preamp(pow(2,float(preamp)/100.0));
emit changed();
emit preampChanged();
emit preampChanged(preamp);
@@ -483,7 +483,7 @@ int VEqualizer::bands() const
bool VEqualizer::isEnabled() const
{
- return bool(EQBACK->enabled());
+ return bool(ETQBACK->enabled());
}
int VEqualizer::preamp() const
@@ -534,7 +534,7 @@ void VEqualizer::setLevels(const TQValueList<int> &levels)
void VEqualizer::setEnabled(bool e)
{
update(true); // just in case
- EQBACK->enabled((long)e);
+ ETQBACK->enabled((long)e);
KConfig *config=kapp->config();
config->setGroup("Equalizer");
config->writeEntry("enabled", e);
@@ -565,9 +565,9 @@ void VEqualizer::update(bool full)
}
}
if (full)
- EQBACK->set(levels, mids, widths);
+ ETQBACK->set(levels, mids, widths);
else
- EQBACK->levels(levels);
+ ETQBACK->levels(levels);
}
@@ -609,7 +609,7 @@ TQString VEqualizer::toString(const TQString &name) const
{
docElem.setAttribute("level", preamp());
docElem.setAttribute("name", name);
- docElem.setAttribute("version", napp->version());
+ docElem.setAttribute("version", TQString(napp->version()));
}
int bandc = bands();
@@ -764,7 +764,7 @@ VPreset VEqualizer::presetByFile(const TQString &file)
KConfig *conf=KGlobal::config();
conf->setGroup("Equalizer");
TQStringList list=kapp->config()->readListEntry("presets");
- if (list.contains(file))
+ if (list.tqcontains(file))
return VPreset(file);
return VPreset();
}
@@ -920,7 +920,7 @@ void VPreset::remove()
emit EQ->removed(*this);
- if (file().find(kapp->dirs()->localkdedir())==0)
+ if (file().tqfind(kapp->dirs()->localkdedir())==0)
{
TQFile f(file());
f.remove();
@@ -930,7 +930,7 @@ void VPreset::remove()
#undef EQ
-#undef EQBACK
+#undef ETQBACK
#include "vequalizer.moc"
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index 94646315..e009b044 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -24,8 +24,8 @@ struct VideoFrame::Private
};
-VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char*name, WFlags f)
- : KVideoWidget(clientParent, parent, name, f)
+VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *tqparent, const char*name, WFlags f)
+ : KVideoWidget(clientParent, tqparent, name, f)
{
d = new Private;
connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
@@ -33,8 +33,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char
frames.append(this);
}
-VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f)
- : KVideoWidget(parent, name, f)
+VideoFrame::VideoFrame(TQWidget *tqparent, const char *name, WFlags f)
+ : KVideoWidget(tqparent, name, f)
{
d = new Private;
connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed()));
@@ -62,9 +62,9 @@ VideoFrame *VideoFrame::playing()
return whose;
}
-TQPopupMenu *VideoFrame::popupMenu(TQWidget *parent)
+TQPopupMenu *VideoFrame::popupMenu(TQWidget *tqparent)
{
- TQPopupMenu *view = new TQPopupMenu(parent);
+ TQPopupMenu *view = new TQPopupMenu(tqparent);
action( "half_size" )->plug( view );
action( "normal_size" )->plug( view );
action( "double_size" )->plug( view );
@@ -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);
@@ -151,7 +151,7 @@ void GlobalVideo::hide()
void GlobalVideo::mouseReleaseEvent(TQMouseEvent *e)
{
- if (e->button() == RightButton)
+ if (e->button() == Qt::RightButton)
{
menu->exec(mapToGlobal(e->pos()));
}