diff options
Diffstat (limited to 'noatun')
86 files changed, 598 insertions, 600 deletions
diff --git a/noatun/app/main.cpp b/noatun/app/main.cpp index d39b2735..85f6571c 100644 --- a/noatun/app/main.cpp +++ b/noatun/app/main.cpp @@ -14,7 +14,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +extern "C" TDE_EXPORT int kdemain(int argc, char **argv) { TDEAboutData aboutData("noatun", I18N_NOOP("Noatun"), version, description, TDEAboutData::License_BSD, diff --git a/noatun/library/CMakeLists.txt b/noatun/library/CMakeLists.txt index 69b9cdd0..0be30314 100644 --- a/noatun/library/CMakeLists.txt +++ b/noatun/library/CMakeLists.txt @@ -58,7 +58,7 @@ tde_add_library( noatun SHARED AUTOMOC ${CMAKE_CURRENT_SOURCE_DIR}/noatun VERSION 1.2.0 LINK - DCOP-shared tdeio-shared artskde-shared ${DL_LIBRARIES} + DCOP-shared tdeio-shared artskde-shared ${CMAKE_DL_LIBS} ${NOATUN_ARTS_LIBRARIES} mcop qtmcop kmedia2_idl soundserver_idl artsflow noatunarts-shared @@ -75,7 +75,7 @@ tde_add_library( noatuncontrols SHARED AUTOMOC ${CMAKE_CURRENT_SOURCE_DIR}/noatun VERSION 1.2.0 LINK - tdecore-shared tdeui-shared ${DL_LIBRARIES} + tdecore-shared tdeui-shared ${CMAKE_DL_LIBS} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 1bd1fb6b..66b0907b 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -52,7 +52,7 @@ struct NoatunApp::Private NoatunApp::NoatunApp() - : KUniqueApplication(true, true, true), mPluginMenu(0), mPluginActionMenu(0), mEqualizer(0) + : TDEUniqueApplication(true, true, true), mPluginMenu(0), mPluginActionMenu(0), mEqualizer(0) { d = new Private; d->vequalizer=0; @@ -88,9 +88,9 @@ NoatunApp::NoatunApp() mLibraryLoader->add("dcopiface.plugin"); - new General(TQT_TQOBJECT(this)); // 25 - new Plugins(TQT_TQOBJECT(this)); // 149 -// new Types(TQT_TQOBJECT(this)); + new General(this); // 25 + new Plugins(this); // 149 +// new Types(this); mPlayer=new Player; // 139 d->effects=new Effects; // 1 @@ -101,7 +101,7 @@ NoatunApp::NoatunApp() mEffectView=new EffectView; // 859 mEqualizerView=new EqualizerView; // 24 - TQTimer::singleShot(0, mDownloader, TQT_SLOT(start())); + TQTimer::singleShot(0, mDownloader, TQ_SLOT(start())); ::globalVideo = new GlobalVideo; @@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id) NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu() { if (!mPluginActionMenu) - mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions"); + mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions"); return mPluginActionMenu; } diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 92058c85..7c5e1a99 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -64,8 +64,8 @@ General::General(TQObject *parent) TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this); mDlSaver=new KURLRequester(napp->saveDirectory(), this); dlsaver->setBuddy(mDlSaver); - connect( mDlSaver, TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( slotRequesterClicked( KURLRequester * ))); + connect( mDlSaver, TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( slotRequesterClicked( KURLRequester * ))); TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder.")); mPlayOnStartup = new TQButtonGroup(1,TQt::Horizontal, i18n("Play Behavior on Startup"), this); diff --git a/noatun/library/controls.cpp b/noatun/library/controls.cpp index fef7768f..7042cfbd 100644 --- a/noatun/library/controls.cpp +++ b/noatun/library/controls.cpp @@ -73,11 +73,11 @@ int SliderAction::plug( TQWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "TDEToolBar" )) - connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition))); + connect(toolBar, TQ_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQ_SLOT(toolbarMoved(TDEToolBar::BarPosition))); emit plugged(); diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index b8081626..2c65f536 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -94,7 +94,7 @@ void Downloader::start() delete mUnstartedQueue; mUnstartedQueue=0; - TQTimer::singleShot(0, this, TQT_SLOT(getNext())); + TQTimer::singleShot(0, this, TQ_SLOT(getNext())); } static TQString nonExistantFile(const TQString &file) @@ -143,7 +143,7 @@ TQString Downloader::enqueue(DownloadItem *notifier, const KURL &file) } mQueue.append(i); - TQTimer::singleShot(0, this, TQT_SLOT(getNext())); + TQTimer::singleShot(0, this, TQ_SLOT(getNext())); emit enqueued(notifier, file); return i->local; } @@ -181,15 +181,15 @@ void Downloader::getNext() localfile->open(IO_ReadWrite | IO_Append); mJob= TDEIO::get(current->file, true, false); - connect(mJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQT_SLOT(data(TDEIO::Job*, const TQByteArray&))); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(jobDone(TDEIO::Job*))); - connect(mJob, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(percent(TDEIO::Job*, unsigned long))); + connect(mJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), TQ_SLOT(data(TDEIO::Job*, const TQByteArray&))); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(jobDone(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQ_SLOT(percent(TDEIO::Job*, unsigned long))); if (mTimeout) delete mTimeout; mTimeout=new TQTimer(this); mTimeout->start(30000, true); - connect(mTimeout, TQT_SIGNAL(timeout()), TQT_SLOT(giveUpWithThisDownloadServerIsRunningNT())); + connect(mTimeout, TQ_SIGNAL(timeout()), TQ_SLOT(giveUpWithThisDownloadServerIsRunningNT())); } void Downloader::data(TDEIO::Job *, const TQByteArray &data) diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp index 72391b8d..193d8adb 100644 --- a/noatun/library/effectview.cpp +++ b/noatun/library/effectview.cpp @@ -90,7 +90,7 @@ TQToolButton *newButton(const TQIconSet &iconSet, const TQString &textLabel, TQO TQToolButton *button = new TQToolButton(parent, name); button->setIconSet(iconSet); button->setTextLabel(textLabel, true); - TQObject::connect(button, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(button, TQ_SIGNAL(clicked()), receiver, slot); button->setFixedSize(TQSize(22, 22)); return button; } @@ -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("go-down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame); + TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), this, TQ_SLOT(addEffect()), topTopFrame); // Active TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box); @@ -138,25 +138,25 @@ void EffectView::init(void) active->setItemsMovable(true); active->setSelectionMode(TQListView::Single); active->setDragEnabled(true); - connect(active, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQT_SLOT(activeDrop(TQDropEvent *, TQListViewItem *))); + connect(active, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), TQ_SLOT(activeDrop(TQDropEvent *, TQListViewItem *))); // when a new effect is added - connect(napp->effects(), TQT_SIGNAL(added(Effect *)), TQT_SLOT(added(Effect *))); - connect(napp->effects(), TQT_SIGNAL(removed(Effect *)), TQT_SLOT(removed(Effect *))); - connect(napp->effects(), TQT_SIGNAL(moved(Effect *)), TQT_SLOT(moved(Effect *))); + connect(napp->effects(), TQ_SIGNAL(added(Effect *)), TQ_SLOT(added(Effect *))); + connect(napp->effects(), TQ_SIGNAL(removed(Effect *)), TQ_SLOT(removed(Effect *))); + connect(napp->effects(), TQ_SIGNAL(moved(Effect *)), TQ_SLOT(moved(Effect *))); available->setCurrentItem(0); - connect(active, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(activeChanged(TQListViewItem *))); + connect(active, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(activeChanged(TQListViewItem *))); active->setCurrentItem(0); // the buttons TQFrame *bottomLeftFrame = new TQFrame(bottomBox); TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint()); - up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame); - down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame); - configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame); - remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame); + up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), this, TQ_SLOT(moveUp()), bottomLeftFrame); + down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), this, TQ_SLOT(moveDown()), bottomLeftFrame); + configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), this, TQ_SLOT(configureEffect()), bottomLeftFrame); + remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), this, TQ_SLOT(removeEffect()), bottomLeftFrame); bottomLeftLayout->addWidget(up); bottomLeftLayout->addWidget(down); bottomLeftLayout->addWidget(configure); diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index dbb4d978..fcf5d160 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -11,7 +11,7 @@ #include <tdemessagebox.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> #include <tqfile.h> @@ -39,9 +39,7 @@ static Arts::PlayObject nullPO() { return Arts::PlayObject::null(); } #define HARDWARE_VOLUME -#if defined(__osf__) -#undef HARDWARE_VOLUME -#elif defined(__linux__) +#if defined(__linux__) #include <sys/soundcard.h> #elif defined(__FreeBSD__) #include <sys/soundcard.h> @@ -293,19 +291,19 @@ bool Engine::open(const PlaylistItem &file) d->pProxy = new TitleProxy::Proxy(KURL(file.property("stream_"))); d->playobj = factory.createPlayObject(d->pProxy->proxyUrl(), false); - connect(d->playobj, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteProxy())); + connect(d->playobj, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteProxy())); connect( - d->pProxy, TQT_SIGNAL( + d->pProxy, TQ_SIGNAL( metaData( const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), - this, TQT_SIGNAL( + this, TQ_SIGNAL( receivedStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)) ); - connect(d->pProxy, TQT_SIGNAL(proxyError()), this, TQT_SLOT(slotProxyError())); + connect(d->pProxy, TQ_SIGNAL(proxyError()), this, TQ_SLOT(slotProxyError())); } else { @@ -328,7 +326,7 @@ bool Engine::open(const PlaylistItem &file) } else { - connect( d->playobj, TQT_SIGNAL( playObjectCreated() ), this, TQT_SLOT( connectPlayObject() ) ); + connect( d->playobj, TQ_SIGNAL( playObjectCreated() ), this, TQ_SLOT( connectPlayObject() ) ); } if (mPlay) diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index 87255cb7..da85115d 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -10,7 +10,7 @@ #include <tdetempfile.h> #include <tqdom.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextstream.h> #include <math.h> #include <tdeconfig.h> @@ -164,19 +164,19 @@ void Equalizer::init() mBands.append(new Band(4)); mBands.append(new Band(5)); - connect(VEQ, TQT_SIGNAL(changed()), TQT_SIGNAL(changed())); + connect(VEQ, TQ_SIGNAL(changed()), TQ_SIGNAL(changed())); - connect(VEQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset))); - connect(VEQ, TQT_SIGNAL(selected(VPreset)), TQT_SLOT(selected(VPreset))); - connect(VEQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset))); - connect(VEQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset))); + connect(VEQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset))); + connect(VEQ, TQ_SIGNAL(selected(VPreset)), TQ_SLOT(selected(VPreset))); + connect(VEQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset))); + connect(VEQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset))); - connect(VEQ, TQT_SIGNAL(enabled()), TQT_SIGNAL(enabled())); - connect(VEQ, TQT_SIGNAL(disabled()), TQT_SIGNAL(disabled())); - connect(VEQ, TQT_SIGNAL(enabled(bool)), TQT_SIGNAL(enabled(bool))); + connect(VEQ, TQ_SIGNAL(enabled()), TQ_SIGNAL(enabled())); + connect(VEQ, TQ_SIGNAL(disabled()), TQ_SIGNAL(disabled())); + connect(VEQ, TQ_SIGNAL(enabled(bool)), TQ_SIGNAL(enabled(bool))); - connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int))); - connect(VEQ, TQT_SIGNAL(preampChanged(int)), TQT_SIGNAL(preampChanged(int))); + connect(VEQ, TQ_SIGNAL(preampChanged(int)), TQ_SIGNAL(preampChanged(int))); + connect(VEQ, TQ_SIGNAL(preampChanged(int)), TQ_SIGNAL(preampChanged(int))); } void Equalizer::created(VPreset preset) diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index dd809257..e2e2f0c1 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -42,7 +42,7 @@ PresetList::PresetList(TQWidget *parent, const char *name) header()->hide(); // a try to set a sne minimum width. unfortuately the custom item // still doesn't draw all text with that minimum width - setMinimumWidth(kapp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); + setMinimumWidth(tdeApp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin()); } void PresetList::rename(TQListViewItem *item, int c) @@ -71,19 +71,19 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); layout->addWidget(mSlider); - connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int))); mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); mLabel->setAlignment(AlignHCenter | AlignVCenter); layout->addWidget(mLabel); setMinimumHeight(200); -// setMinimumWidth(kapp->fontMetrics().width("158kHz")); -// setMinimumWidth(kapp->fontMetrics().width("549kHz")); +// setMinimumWidth(tdeApp->fontMetrics().width("158kHz")); +// setMinimumWidth(tdeApp->fontMetrics().width("549kHz")); setBand(band); - connect(EQ, TQT_SIGNAL(modified()), TQT_SLOT(changed())); - connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); + connect(EQ, TQ_SIGNAL(modified()), TQ_SLOT(changed())); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int))); } void EqualizerLevel::setBand(VBand band) @@ -126,30 +126,30 @@ void EqualizerView::show() bandsLayout = new TQHBoxLayout(mWidget->bandsFrame, 0, KDialog::spacingHint(), "bandsLayout"); - connect(mWidget->preampSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(setPreamp(int))); - connect(EQ, TQT_SIGNAL(preampChanged(int)), - this, TQT_SLOT(changedPreamp(int))); + connect(mWidget->preampSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(setPreamp(int))); + connect(EQ, TQ_SIGNAL(preampChanged(int)), + this, TQ_SLOT(changedPreamp(int))); mWidget->bandCount->setRange(EQ->minBands(), EQ->maxBands()); - connect(mWidget->bandCount, TQT_SIGNAL(valueChanged(int)), - EQ, TQT_SLOT(setBands(int))); + connect(mWidget->bandCount, TQ_SIGNAL(valueChanged(int)), + EQ, TQ_SLOT(setBands(int))); TQVBoxLayout *l = new TQVBoxLayout(mWidget->presetFrame); mPresets = new PresetList(mWidget->presetFrame, "mPresets"); l->addWidget(mPresets); - connect(mWidget->removePresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(remove())); - connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create())); - connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset())); + connect(mWidget->removePresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(remove())); + connect(mWidget->addPresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(create())); + connect(mWidget->resetEqButton, TQ_SIGNAL(clicked()), TQ_SLOT(reset())); new TDEListViewItem(mPresets, i18n("Custom")); - connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(select(TQListViewItem*))); + connect(mPresets, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(select(TQListViewItem*))); - connect(mPresets, TQT_SIGNAL(itemRenamed(TQListViewItem*)), - this, TQT_SLOT(rename(TQListViewItem*))); + connect(mPresets, TQ_SIGNAL(itemRenamed(TQListViewItem*)), + this, TQ_SLOT(rename(TQListViewItem*))); // populate the preset list TQValueList<VPreset> presets = EQ->presets(); @@ -159,20 +159,20 @@ void EqualizerView::show() created(*it); } - connect(EQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset))); - connect(EQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset))); - connect(EQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset))); + connect(EQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset))); + connect(EQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset))); + connect(EQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset))); mWidget->enabledCheckBox->setChecked(EQ->isEnabled()); - connect(mWidget->enabledCheckBox, TQT_SIGNAL(toggled(bool)), - EQ, TQT_SLOT(setEnabled(bool))); - connect(EQ, TQT_SIGNAL(enabled(bool)), - mWidget->enabledCheckBox, TQT_SLOT(setChecked(bool))); - - connect(EQ, TQT_SIGNAL(changed()), - this, TQT_SLOT(changedEq())); - connect(EQ, TQT_SIGNAL(changedBands()), - this, TQT_SLOT(changedBands())); + connect(mWidget->enabledCheckBox, TQ_SIGNAL(toggled(bool)), + EQ, TQ_SLOT(setEnabled(bool))); + connect(EQ, TQ_SIGNAL(enabled(bool)), + mWidget->enabledCheckBox, TQ_SLOT(setChecked(bool))); + + connect(EQ, TQ_SIGNAL(changed()), + this, TQ_SLOT(changedEq())); + connect(EQ, TQ_SIGNAL(changedBands()), + this, TQ_SLOT(changedBands())); changedBands(); changedEq(); diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h index f8927376..ba6108fb 100644 --- a/noatun/library/noatun/app.h +++ b/noatun/library/noatun/app.h @@ -1,8 +1,8 @@ #ifndef NOATUN_H #define NOATUN_H -#include <kuniqueapplication.h> -#include <kdemacros.h> +#include <tdeuniqueapplication.h> +#include <tdemacros.h> class Playlist; class Player; class LibraryLoader; @@ -28,7 +28,7 @@ namespace NoatunStdAction * @author Charles Samuels * @version 2.3 */ -class KDE_EXPORT NoatunApp : public KUniqueApplication +class TDE_EXPORT NoatunApp : public TDEUniqueApplication { TQ_OBJECT @@ -258,7 +258,7 @@ private: bool showingInterfaces; }; -#define napp (static_cast<NoatunApp*>(kapp)) +#define napp (static_cast<NoatunApp*>(tdeApp)) // version info for the plugins // this is MAJOR.MINOR.PATCHLEVEL diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h index 813be2ee..8648a514 100644 --- a/noatun/library/noatun/controls.h +++ b/noatun/library/noatun/controls.h @@ -7,7 +7,7 @@ #include <tdetoolbar.h> #include <tqslider.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQComboBox; class TQLabel; @@ -20,7 +20,7 @@ class TQLabel; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT L33tSlider : public TQSlider +class TDE_EXPORT L33tSlider : public TQSlider { TQ_OBJECT diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h index e4dc1403..10b73293 100644 --- a/noatun/library/noatun/engine.h +++ b/noatun/library/noatun/engine.h @@ -5,7 +5,7 @@ #include <kurl.h> #include <arts/kmedia2.h> #include <noatun/playlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class Visualization; namespace Arts @@ -30,7 +30,7 @@ class NoatunApp; * Does almost everything related to multimedia. * Most interfacing should be done with Player **/ -class KDE_EXPORT Engine : public TQObject +class TDE_EXPORT Engine : public TQObject { TQ_OBJECT diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h index 3f3b3ae8..a5022269 100644 --- a/noatun/library/noatun/player.h +++ b/noatun/library/noatun/player.h @@ -5,7 +5,7 @@ #include <tqtimer.h> #include <kurl.h> #include <noatun/playlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class Engine; class Playlist; class KLibrary; @@ -19,7 +19,7 @@ class KLibrary; * @author Charles Samuels * @version 2.4 **/ -class KDE_EXPORT Player : public TQObject +class TDE_EXPORT Player : public TQObject { TQ_OBJECT diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h index a8188e3b..4a8ebeb4 100644 --- a/noatun/library/noatun/playlist.h +++ b/noatun/library/noatun/playlist.h @@ -6,7 +6,7 @@ #include <tqdict.h> #include <tqstringlist.h> #include <cassert> -#include <kdemacros.h> +#include <tdemacros.h> class PlaylistItem; @@ -27,7 +27,7 @@ class PlaylistItem; * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT PlaylistItemData +class TDE_EXPORT PlaylistItemData { public: PlaylistItemData(); @@ -205,7 +205,7 @@ private: * @author Charles Samuels * @version 2.3 **/ -class KDE_EXPORT PlaylistItem +class TDE_EXPORT PlaylistItem { public: PlaylistItem(const PlaylistItem &source); diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h index f01b0f27..e42ec136 100644 --- a/noatun/library/noatun/plugin.h +++ b/noatun/library/noatun/plugin.h @@ -4,7 +4,7 @@ #include <noatun/pluginloader.h> #include <tqmemarray.h> #include <vector> -#include <kdemacros.h> +#include <tdemacros.h> namespace Noatun { class FFTScopeStereo; class FFTScope; class RawScope; class RawScopeStereo; class StereoEffectStack; @@ -24,7 +24,7 @@ class NoatunApp; /** * @short Base class for all plugins **/ -class KDE_EXPORT Plugin +class TDE_EXPORT Plugin { public: Plugin(); @@ -58,7 +58,7 @@ public: * Inherit from this one instead of Plugin if you are * a user-interface **/ -class KDE_EXPORT UserInterface : public Plugin +class TDE_EXPORT UserInterface : public Plugin { public: UserInterface(); @@ -162,7 +162,7 @@ private: /** * Base class for all kinds of FFT scopes **/ -class KDE_EXPORT FFTScope : public Visualization +class TDE_EXPORT FFTScope : public Visualization { public: FFTScope(int interval, int pid=0); @@ -205,7 +205,7 @@ public: * An easy to use FFT scope, stereo version. * You certainly want to reimplement scopeEvent() **/ -class KDE_EXPORT StereoFFTScope : public FFTScope +class TDE_EXPORT StereoFFTScope : public FFTScope { public: StereoFFTScope(int timeout=250, int pid=0); @@ -242,7 +242,7 @@ private: * An easy to use FFT scope, mono version. * You certainly want to reimplement scopeEvent() **/ -class KDE_EXPORT MonoFFTScope : public FFTScope +class TDE_EXPORT MonoFFTScope : public FFTScope { public: MonoFFTScope(int timeout=250, int pid=0); @@ -302,7 +302,7 @@ public: * Note: Of course this one also works for audio with more than one channel * You certainly want to reimplement scopeEvent() */ -class KDE_EXPORT MonoScope : public Scope +class TDE_EXPORT MonoScope : public Scope { public: MonoScope(int timeout=250, int pid=0); diff --git a/noatun/library/noatun/pluginloader.h b/noatun/library/noatun/pluginloader.h index 04c1b750..d6059021 100644 --- a/noatun/library/noatun/pluginloader.h +++ b/noatun/library/noatun/pluginloader.h @@ -8,7 +8,7 @@ #include <klibloader.h> #include <tqdict.h> -#include <kdemacros.h> +#include <tdemacros.h> struct NoatunLibraryInfo { @@ -33,7 +33,7 @@ class Plugin; /** * Used for loading plugins at runtime **/ -class KDE_EXPORT LibraryLoader +class TDE_EXPORT LibraryLoader { friend class Plugin; struct PluginLibrary @@ -64,7 +64,7 @@ public: **/ bool remove(const TQString &spec); /** - * Same as the above, but does not call kapp->exit() even + * Same as the above, but does not call tdeApp->exit() even * when the last userinterface plugin is removed. Necessary * during session management (see marquis plugin). * ### BIC: merge with above with terminateOnLastUI = true diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h index 4745a010..58780594 100644 --- a/noatun/library/noatun/pref.h +++ b/noatun/library/noatun/pref.h @@ -3,7 +3,7 @@ #include <kdialogbase.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class CModule; @@ -54,7 +54,7 @@ private: * Create your GUI in constructor, reimplement reopen() and save() and * you're all set. **/ -class KDE_EXPORT CModule : public TQWidget +class TDE_EXPORT CModule : public TQWidget { TQ_OBJECT diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h index 0ddf7f20..af3cec69 100644 --- a/noatun/library/noatun/stdaction.h +++ b/noatun/library/noatun/stdaction.h @@ -3,7 +3,7 @@ #include <tdeaction.h> #include <tdeactionclasses.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEPopupMenu; /** @@ -121,64 +121,64 @@ private: /** * @return pointer to a TDEAction which opens the effects dialog on activation */ -KDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *effects(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which opens the equalizer dialog on activation */ -KDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *equalizer(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which goes back one track on activation */ -KDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *back(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which stops playback on activation */ -KDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *stop(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which starts/pauses playback on activation */ -KDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *playpause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEAction which advances one track on activation */ -KDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *forward(TQObject *parent = 0, const char *name = 0); /** * @return pointer to a TDEToggleAction which shows/hides the playlist */ -KDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEToggleAction *playlist(TQObject *parent = 0, const char *name = 0); /** * loop action **/ -KDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); +TDE_EXPORT LoopActionMenu *loop(TQObject *parent, const char *name); /** * play action */ -KDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *play(TQObject *parent = 0, const char *name = 0); /** * pause action */ -KDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT TDEAction *pause(TQObject *parent = 0, const char *name = 0); /** * @return pointer to the global PluginActionMenu object (there is only one instance) */ -KDE_EXPORT PluginActionMenu *actions(); +TDE_EXPORT PluginActionMenu *actions(); /** * @return pointer to a VisActionMenu object */ -KDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); +TDE_EXPORT VisActionMenu *visualizations(TQObject *parent = 0, const char *name = 0); /** * The global popupmenu of noatun, there's not two or three but only one of these :) * @author Charles Samuels **/ -class KDE_EXPORT ContextMenu +class TDE_EXPORT ContextMenu { public: static TDEPopupMenu *createContextMenu(TQWidget *p); diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h index 244fcd11..54599973 100644 --- a/noatun/library/noatun/vequalizer.h +++ b/noatun/library/noatun/vequalizer.h @@ -42,7 +42,7 @@ #include <tqptrlist.h> #include <tqobject.h> #include <kurl.h> -#include <kdemacros.h> +#include <tdemacros.h> class VBand; /** @@ -76,7 +76,7 @@ class VEqualizer; * Represents a single band in a vequalizer * @author Charles Samuels **/ -class KDE_EXPORT VBand +class TDE_EXPORT VBand { friend class VInterpolation; friend class VEqualizer; @@ -134,7 +134,7 @@ public: * @short interpolated representation of Eq data * @author Charles Samuels **/ -class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface +class TDE_EXPORT VInterpolation : public TQObject, public VBandsInterface { TQ_OBJECT @@ -174,7 +174,7 @@ class VPreset; * @short Noatun EQ * @author Charles Samuels **/ -class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface +class TDE_EXPORT VEqualizer : public TQObject, public VBandsInterface { TQ_OBJECT diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp index de05590c..f9e6f49f 100644 --- a/noatun/library/noatunstdaction.cpp +++ b/noatun/library/noatunstdaction.cpp @@ -22,11 +22,11 @@ namespace NoatunStdAction { ///////////////////////////////////////////////////// PlayAction::PlayAction(TQObject *parent, const char *name) - : TDEAction(i18n("Play"), 0, napp->player(), TQT_SLOT(playpause()), parent, name) + : TDEAction(i18n("Play"), 0, napp->player(), TQ_SLOT(playpause()), parent, name) { - connect(napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(playing())); - connect(napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(notplaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(notplaying())); + connect(napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(playing())); + connect(napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(notplaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(notplaying())); if (napp->player()->isPlaying()) playing(); else if (napp->player()->isPaused() || napp->player()->isStopped()) @@ -47,11 +47,11 @@ void PlayAction::notplaying() ///////////////////////////////////////////////////// PlaylistAction::PlaylistAction(TQObject *parent, const char *name) - : TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQT_SLOT(toggleListView()), parent, name) + : TDEToggleAction(i18n("Show Playlist"), "playlist", 0, napp->player(), TQ_SLOT(toggleListView()), parent, name) { setCheckedState(i18n("Hide Playlist")); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(shown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(hidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(shown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(hidden())); setChecked(napp->playlist()->listVisible()); } @@ -114,8 +114,8 @@ void PluginActionMenu::menuRemove(int id) VisActionMenu::VisActionMenu(TQObject *parent, const char *name) : TDEActionMenu(i18n("&Visualizations"), parent, name) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int))); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(fillPopup())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleVisPlugin(int))); } void VisActionMenu::fillPopup() @@ -163,26 +163,26 @@ LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name) : TDEActionMenu(i18n("&Loop"), parent, name) { mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none"); + 0, this, TQ_SLOT(loopNoneSelected()), this, "loop_none"); mLoopNone->setExclusiveGroup("loopType"); insert(mLoopNone); mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song"); + 0, this, TQ_SLOT(loopSongSelected()), this, "loop_song"); mLoopSong->setExclusiveGroup("loopType"); insert(mLoopSong); mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist"); + 0, this, TQ_SLOT(loopPlaylistSelected()), this, "loop_playlist"); mLoopPlaylist->setExclusiveGroup("loopType"); insert(mLoopPlaylist); mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"), - 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random"); + 0, this, TQ_SLOT(loopRandomSelected()), this, "loop_random"); mLoopRandom->setExclusiveGroup("loopType"); insert(mLoopRandom); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int))); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(updateLooping(int))); updateLooping(static_cast<int>(napp->player()->loopStyle())); } @@ -239,25 +239,25 @@ TDEAction *playpause(TQObject *parent, const char *name) TDEAction *effects(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name); + return new TDEAction(i18n("&Effects..."), "effect", 0, napp, TQ_SLOT(effectView()), parent, name); } TDEAction *equalizer(TQObject *parent, const char *name) { - return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name); + return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQ_SLOT(equalizerView()), parent, name); } TDEAction *back(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Back"), "media-skip-backward", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name); + return new TDEAction(i18n("&Back"), "media-skip-backward", 0, napp->player(), TQ_SLOT(back()), parent, name); } TDEAction *stop(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQT_SLOT(stop()), parent, 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())); + StereoButtonAction *action = new StereoButtonAction(i18n("Stop"), "media-playback-stop", 0, napp->player(), TQ_SLOT(stop()), parent, name); + TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(disable())); if(napp->player()->isStopped()) action->disable(); else @@ -267,15 +267,15 @@ TDEAction *stop(TQObject *parent, const char *name) TDEAction *forward(TQObject *parent, const char *name) { - return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQT_SLOT(forward()), parent, name); + return new TDEAction(i18n("&Forward"), "media-skip-forward", 0, napp->player(), TQ_SLOT(forward()), parent, name); } TDEAction *play(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQT_SLOT(playpause()), parent, 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())); + StereoButtonAction *action = new StereoButtonAction(i18n("&Play"), "media-playback-start", 0, napp->player(), TQ_SLOT(playpause()), parent, name); + TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(disable())); + TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(enable())); if(napp->player()->isPlaying()) action->disable(); else @@ -285,10 +285,10 @@ TDEAction *play(TQObject *parent, const char *name) TDEAction *pause(TQObject *parent, const char *name) { - StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQT_SLOT(playpause()), parent, 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())); + StereoButtonAction *action = new StereoButtonAction(i18n("&Pause"), "media-playback-pause", 0, napp->player(), TQ_SLOT(playpause()), parent, name); + TQObject::connect(napp->player(), TQ_SIGNAL(playing()), action, TQ_SLOT(enable())); + TQObject::connect(napp->player(), TQ_SIGNAL(paused()), action, TQ_SLOT(disable())); + TQObject::connect(napp->player(), TQ_SIGNAL(stopped()), action, TQ_SLOT(disable())); if(napp->player()->isPlaying()) action->enable(); else @@ -330,18 +330,18 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p) { TDEPopupMenu *contextMenu = new TDEPopupMenu(p, "NoatunContextMenu"); - KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false); + KHelpMenu *helpmenu = new KHelpMenu(contextMenu, tdeApp->aboutData(), false); TDEActionCollection* actions = new TDEActionCollection(helpmenu); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu); - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actions)->plug(contextMenu); + KStdAction::quit(napp, TQ_SLOT(quit()), actions)->plug(contextMenu); contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu()); contextMenu->insertSeparator(); - 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); + KStdAction::preferences(napp, TQ_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); napp->pluginActionMenu()->plug(contextMenu); return contextMenu; diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index 7ac9e07f..62cd97bb 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -16,7 +16,7 @@ TagsGetter *Tags::getter=0; TagsGetter::TagsGetter() { new Control(this); - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); } int TagsGetter::interval() const @@ -115,7 +115,7 @@ void TagsGetter::associate(Tags *t) tags.append(t); sortPriority(); // getSongs(); - TQTimer::singleShot(interval(), this, TQT_SLOT(getSongs())); + TQTimer::singleShot(interval(), this, TQ_SLOT(getSongs())); } void TagsGetter::sortPriority() @@ -210,14 +210,14 @@ Control::Control(TagsGetter *parent) spin->setSuffix(i18n("Milliseconds", " ms")); - connect(slider, TQT_SIGNAL(valueChanged(int)), spin, TQT_SLOT(setValue(int))); - connect(spin, TQT_SIGNAL(valueChanged(int)), slider, TQT_SLOT(setValue(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), spin, TQ_SLOT(setValue(int))); + connect(spin, TQ_SIGNAL(valueChanged(int)), slider, TQ_SLOT(setValue(int))); slider->setValue(parent->interval()); - connect(slider, TQT_SIGNAL(valueChanged(int)), parent, TQT_SLOT(setInterval(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), parent, TQ_SLOT(setInterval(int))); - connect(onPlay, TQT_SIGNAL(toggled(bool)), intervalLine, TQT_SLOT(setEnabled(bool))); + connect(onPlay, TQ_SIGNAL(toggled(bool)), intervalLine, TQ_SLOT(setEnabled(bool))); } - connect(onPlay, TQT_SIGNAL(toggled(bool)), parent, TQT_SLOT(setLoadAuto(bool))); + connect(onPlay, TQ_SIGNAL(toggled(bool)), parent, TQ_SLOT(setLoadAuto(bool))); onPlay->setChecked(parent->loadAuto()); } diff --git a/noatun/library/player.cpp b/noatun/library/player.cpp index 5ab2aeba..bf1ecaed 100644 --- a/noatun/library/player.cpp +++ b/noatun/library/player.cpp @@ -18,18 +18,18 @@ Player::Player(TQObject *parent) : TQObject(parent, "Player"), position(-1), mLoopStyle(None), firstTimeout(true) { mEngine=new Engine; - connect(&filePos, TQT_SIGNAL(timeout()), TQT_SLOT(posTimeout())); - connect(mEngine, TQT_SIGNAL(aboutToPlay()), this, TQT_SLOT(aboutToPlay())); + connect(&filePos, TQ_SIGNAL(timeout()), TQ_SLOT(posTimeout())); + connect(mEngine, TQ_SIGNAL(aboutToPlay()), this, TQ_SLOT(aboutToPlay())); connect(mEngine, - TQT_SIGNAL(receivedStreamMeta(const TQString &, const TQString &, + TQ_SIGNAL(receivedStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT( + this, TQ_SLOT( slotUpdateStreamMeta(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)) ); - connect(mEngine, TQT_SIGNAL(playingFailed()), this, TQT_SLOT(forward())); + connect(mEngine, TQ_SIGNAL(playingFailed()), this, TQ_SLOT(forward())); handleButtons(); } diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 7e59885f..380934bd 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -280,9 +280,9 @@ bool PlaylistItemData::operator != (const PlaylistItemData &d) const Playlist::Playlist(TQObject *parent, const char *name) : TQObject(parent, name) { - napp->player()->connect(this, TQT_SIGNAL(playCurrent()), TQT_SLOT(playCurrent())); - napp->player()->connect(this, TQT_SIGNAL(listHidden()), TQT_SIGNAL(playlistHidden())); - napp->player()->connect(this, TQT_SIGNAL(listShown()), TQT_SIGNAL(playlistShown())); + napp->player()->connect(this, TQ_SIGNAL(playCurrent()), TQ_SLOT(playCurrent())); + napp->player()->connect(this, TQ_SIGNAL(listHidden()), TQ_SIGNAL(playlistHidden())); + napp->player()->connect(this, TQ_SIGNAL(listShown()), TQ_SIGNAL(playlistShown())); } diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 13b7ecfe..418c2a42 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -5,7 +5,7 @@ #include <tqtextstream.h> #include <noatun/app.h> #include "ksaver.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kmimetype.h> #include <tdelocale.h> #include <tqregexp.h> @@ -449,7 +449,7 @@ bool PlaylistSaver::loadXML(const KURL &url, int opt) reset(); // TQXml is horribly documented - TQXmlInputSource source(TQT_TQIODEVICE(&file)); + TQXmlInputSource source(&file); TQXmlSimpleReader reader; if (opt == ASX || @@ -485,7 +485,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) // if it's a PLS, transfer control, again (TDEIO bug?) #if 0 { - KSimpleConfig list(local, true); + TDESimpleConfig list(local, true); list.setGroup("playlist"); // some stupid Windows lusers like to be case insensitive @@ -712,7 +712,7 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/) } - KSimpleConfig list(localFile, true); + TDESimpleConfig list(localFile, true); //list.setGroup("playlist"); // some stupid Windows lusers like to be case insensitive diff --git a/noatun/library/plugin.cpp b/noatun/library/plugin.cpp index 3c5b6f5d..63eb6464 100644 --- a/noatun/library/plugin.cpp +++ b/noatun/library/plugin.cpp @@ -8,7 +8,7 @@ #include <dcopclient.h> #include <dispatcher.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <cmath> @@ -566,7 +566,7 @@ ExitNotifier::~ExitNotifier() BoolNotifier::BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent) : TQObject(parent) { - connect(listener, TQT_SIGNAL(event()), TQT_SLOT(event())); + connect(listener, TQ_SIGNAL(event()), TQ_SLOT(event())); mValue=value; } diff --git a/noatun/library/pluginloader.cpp b/noatun/library/pluginloader.cpp index 2fecb898..bc1cc2ff 100644 --- a/noatun/library/pluginloader.cpp +++ b/noatun/library/pluginloader.cpp @@ -1,8 +1,8 @@ #include <tqfile.h> #include <tdeglobal.h> #include <tqdir.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <knotifyclient.h> #include <tdelocale.h> #include <kurl.h> @@ -138,7 +138,7 @@ NoatunLibraryInfo LibraryLoader::getInfo(const TQString &spec) const TQString specPath = (spec[0]=='/') ? spec : TDEGlobal::dirs()->findResource("appdata", spec); if (!TQFile::exists(specPath)) return info; - KSimpleConfig file(specPath); + TDESimpleConfig file(specPath); if (spec.find('/')>=0) info.specfile=KURL(spec).fileName(); else @@ -262,7 +262,7 @@ bool LibraryLoader::remove(const TQString& spec, bool terminateOnLastUI) else { // No other UIs, terminate - kapp->exit(); + tdeApp->exit(); } } else if (info.type=="playlist") diff --git a/noatun/library/pluginmodule.cpp b/noatun/library/pluginmodule.cpp index d6b86e86..a7a59b48 100644 --- a/noatun/library/pluginmodule.cpp +++ b/noatun/library/pluginmodule.cpp @@ -152,7 +152,7 @@ Plugins::Plugins(TQObject *_parent) interfaceList->addColumn(i18n("Description")); interfaceList->addColumn(i18n("Author")); interfaceList->addColumn(i18n("License")); - connect(interfaceList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(interfaceList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(interfaceTab, i18n("&Interfaces")); TQFrame *playlistTab = new TQFrame(tabControl); @@ -164,7 +164,7 @@ Plugins::Plugins(TQObject *_parent) playlistList->addColumn(i18n("Description")); playlistList->addColumn(i18n("Author")); playlistList->addColumn(i18n("License")); - connect(playlistList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(playlistList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(playlistTab, i18n("&Playlist")); TQFrame *visTab = new TQFrame(tabControl); @@ -175,7 +175,7 @@ Plugins::Plugins(TQObject *_parent) visList->addColumn(i18n("Description")); visList->addColumn(i18n("Author")); visList->addColumn(i18n("License")); - connect(visList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(visList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(visTab, i18n("&Visualizations")); // Other plugins are not restricted @@ -187,7 +187,7 @@ Plugins::Plugins(TQObject *_parent) otherList->addColumn(i18n("Description")); otherList->addColumn(i18n("Author")); otherList->addColumn(i18n("License")); - connect(otherList, TQT_SIGNAL(stateChange(PluginListItem *, bool)), this, TQT_SLOT(stateChange(PluginListItem *, bool))); + connect(otherList, TQ_SIGNAL(stateChange(PluginListItem *, bool)), this, TQ_SLOT(stateChange(PluginListItem *, bool))); tabControl->addTab(otherTab, i18n("O&ther Plugins")); } diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp index 9ed882c5..55926830 100644 --- a/noatun/library/pref.cpp +++ b/noatun/library/pref.cpp @@ -32,7 +32,7 @@ void NoatunPreferences::show() void NoatunPreferences::show(CModule *page) { - int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->parent())) ); + int index = pageIndex( static_cast<TQWidget *>(page->parent()) ); if (index != -1) showPage(index); show(); @@ -59,13 +59,13 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri icon, TDEIcon::Small,0, TDEIcon::DefaultState,0, true))) { if (owner) - connect(owner, TQT_SIGNAL(destroyed()), TQT_SLOT(ownerDeleted())); + connect(owner, TQ_SIGNAL(destroyed()), TQ_SLOT(ownerDeleted())); //kdDebug(66666) << k_funcinfo << "name = " << name << endl; napp->preferencesBox()->add(this); - TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(parent())); + TQFrame *page=static_cast<TQFrame*>(parent()); (new TQHBoxLayout(page))->addWidget(this); } diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index d21a2aad..235d10b3 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -62,8 +62,8 @@ ScrollingLabel::ScrollingLabel { d = new Private; - connect(&d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scroll())); - connect(&d->resetTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(restoreText())); + connect(&d->scrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll())); + connect(&d->resetTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(restoreText())); setText(initialText); } diff --git a/noatun/library/titleproxy.cpp b/noatun/library/titleproxy.cpp index 65006135..a4439207 100644 --- a/noatun/library/titleproxy.cpp +++ b/noatun/library/titleproxy.cpp @@ -50,9 +50,9 @@ Proxy::Proxy( KURL url ) if ( m_url.port() < 1 ) m_url.setPort( 80 ); - connect( &m_sockRemote, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( connectError() ) ); - connect( &m_sockRemote, TQT_SIGNAL( connected() ), this, TQT_SLOT( sendRequest() ) ); - connect( &m_sockRemote, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readRemote() ) ); + connect( &m_sockRemote, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( connectError() ) ); + connect( &m_sockRemote, TQ_SIGNAL( connected() ), this, TQ_SLOT( sendRequest() ) ); + connect( &m_sockRemote, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( readRemote() ) ); uint i = 0; Server* server = 0; @@ -74,7 +74,7 @@ Proxy::Proxy( KURL url ) return; } m_usedPort = i; - connect( server, TQT_SIGNAL( connected( int ) ), this, TQT_SLOT( accept( int ) ) ); + connect( server, TQ_SIGNAL( connected( int ) ), this, TQ_SLOT( accept( int ) ) ); } @@ -130,7 +130,7 @@ void Proxy::connectToHost() //SLOT { //connect to server TQTimer::singleShot( KProtocolManager::connectTimeout() * 1000, - this, TQT_SLOT( connectError() ) ); + this, TQ_SLOT( connectError() ) ); kdDebug(66666) << k_funcinfo << "Connecting to " << m_url.host() << ":" << m_url.port() << endl; @@ -316,8 +316,8 @@ bool Proxy::processHeader( TQ_LONG &index, TQ_LONG bytesRead ) return false; } - connect( &m_sockRemote, TQT_SIGNAL( connectionClosed() ), - this, TQT_SLOT( connectError() ) ); + connect( &m_sockRemote, TQ_SIGNAL( connectionClosed() ), + this, TQ_SLOT( connectError() ) ); return true; } } diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index b8f46fa5..8b23322b 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -52,7 +52,7 @@ #include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> @@ -315,7 +315,7 @@ VEqualizer::VEqualizer() void VEqualizer::init() { KURL url; - url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); + url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); if(!load(url)) { setPreamp(0); @@ -323,7 +323,7 @@ void VEqualizer::init() } else { - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); setEnabled(config->readBoolEntry("enabled", false)); } @@ -333,7 +333,7 @@ void VEqualizer::init() VEqualizer::~VEqualizer() { KURL url; - url.setPath(kapp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); + url.setPath(tdeApp->dirs()->localtdedir()+"/share/apps/noatun/equalizer"); save(url, "auto"); delete d; @@ -535,7 +535,7 @@ void VEqualizer::setEnabled(bool e) { update(true); // just in case EQBACK->enabled((long)e); - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); config->writeEntry("enabled", e); config->sync(); @@ -664,7 +664,7 @@ bool VEqualizer::fromString(const TQString &str) static TQString makePresetFile() { - TQString basedir=kapp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/"; + TQString basedir=tdeApp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/"; // now append a filename that doesn't exist TDEStandardDirs::makeDir(basedir); TQString fullpath; @@ -698,7 +698,7 @@ VPreset VEqualizer::createPreset(const TQString &name, bool smart) preset.setName(nameReal); save(preset.file(), nameReal); - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); TQStringList list = config->readListEntry("presets"); list += preset.file(); @@ -722,7 +722,7 @@ TQValueList<VPreset> VEqualizer::presets() const } else { - list=kapp->dirs()->findAllResources("data", "noatun/eq.preset/*"); + list=tdeApp->dirs()->findAllResources("data", "noatun/eq.preset/*"); conf->writeEntry("presets", list); conf->sync(); } @@ -763,7 +763,7 @@ VPreset VEqualizer::presetByFile(const TQString &file) { TDEConfig *conf=TDEGlobal::config(); conf->setGroup("Equalizer"); - TQStringList list=kapp->config()->readListEntry("presets"); + TQStringList list=tdeApp->config()->readListEntry("presets"); if (list.contains(file)) return VPreset(file); return VPreset(); @@ -911,7 +911,7 @@ TQString VPreset::file() const void VPreset::remove() { - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("Equalizer"); TQStringList items=config->readListEntry("presets"); items.remove(file()); @@ -920,7 +920,7 @@ void VPreset::remove() emit EQ->removed(*this); - if (file().find(kapp->dirs()->localtdedir())==0) + if (file().find(tdeApp->dirs()->localtdedir())==0) { TQFile f(file()); f.remove(); diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp index 0fceeb2d..8105127d 100644 --- a/noatun/library/video.cpp +++ b/noatun/library/video.cpp @@ -28,8 +28,8 @@ VideoFrame::VideoFrame(KXMLGUIClient *clientParent, TQWidget *parent, const char : KVideoWidget(clientParent, parent, name, f) { d = new Private; - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(changed())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped())); frames.append(this); } @@ -37,8 +37,8 @@ VideoFrame::VideoFrame(TQWidget *parent, const char *name, WFlags f) : KVideoWidget(parent, name, f) { d = new Private; - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(changed())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(stopped())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(changed())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(stopped())); frames.append(this); } @@ -126,9 +126,9 @@ GlobalVideo::GlobalVideo() // video->setMinimumSize(101,35); video->setMinimumSize(128,96); - connect(video, TQT_SIGNAL(acquired()), TQT_SLOT(appear())); - connect(video, TQT_SIGNAL(lost()), TQT_SLOT(hide())); - connect(video, TQT_SIGNAL(adaptSize(int,int)), this, TQT_SLOT(slotAdaptSize(int,int))); + connect(video, TQ_SIGNAL(acquired()), TQ_SLOT(appear())); + connect(video, TQ_SIGNAL(lost()), TQ_SLOT(hide())); + connect(video, TQ_SIGNAL(adaptSize(int,int)), this, TQ_SLOT(slotAdaptSize(int,int))); video->setNormalSize(); video->give(); diff --git a/noatun/modules/dcopiface/dcopiface.cpp b/noatun/modules/dcopiface/dcopiface.cpp index aef6c58f..0a146f94 100644 --- a/noatun/modules/dcopiface/dcopiface.cpp +++ b/noatun/modules/dcopiface/dcopiface.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT NIF *create_plugin() + TDE_EXPORT NIF *create_plugin() { return new NIF(); } @@ -19,12 +19,12 @@ extern "C" NIF::NIF() : Plugin(), DCOPObject("Noatun") { mLastVolume = 0; -// connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSongPlaying())); +// connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSongPlaying())); } NIF::~NIF() { - kapp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("exiting()", TQByteArray()); } void NIF::toggleListView() @@ -241,7 +241,7 @@ TQCString NIF::version() void NIF::newSongPlaying() { - kapp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); + tdeApp->dcopClient()->emitDCOPSignal("newFile()", TQByteArray()); } void NIF::clear() diff --git a/noatun/modules/dcopiface/dcopiface.h b/noatun/modules/dcopiface/dcopiface.h index cd58a228..05afd019 100644 --- a/noatun/modules/dcopiface/dcopiface.h +++ b/noatun/modules/dcopiface/dcopiface.h @@ -5,9 +5,9 @@ #include <noatun/plugin.h> #include <dcopobject.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT NIF : public Plugin, public DCOPObject +class TDE_EXPORT NIF : public Plugin, public DCOPObject { K_DCOP diff --git a/noatun/modules/excellent/noatunui.cpp b/noatun/modules/excellent/noatunui.cpp index a103268d..575dc32a 100644 --- a/noatun/modules/excellent/noatunui.cpp +++ b/noatun/modules/excellent/noatunui.cpp @@ -26,7 +26,7 @@ #include "userinterface.h" -extern "C" KDE_EXPORT Plugin *create_plugin() +extern "C" TDE_EXPORT Plugin *create_plugin() { return new Excellent(); } diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 540a3abc..b03a2dbc 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -67,12 +67,12 @@ Excellent::Excellent() { setAcceptDrops(true); - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); + menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection()); + KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection()); // buttons NoatunStdAction::back(actionCollection(), "back"); @@ -82,7 +82,7 @@ Excellent::Excellent() NoatunStdAction::forward(actionCollection(), "forward"); NoatunStdAction::playlist(actionCollection(), "show_playlist"); - volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); + volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, this, TQ_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol"); volumeAction->setCheckedState(i18n("Hide &Volume Control")); NoatunStdAction::effects(actionCollection(), "effects"); NoatunStdAction::equalizer(actionCollection(), "equalizer"); @@ -129,24 +129,24 @@ Excellent::Excellent() statusBar()->addWidget(total, 0, true); statusBar()->show(); - connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(slotLoopTypeChanged(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(slotLoopTypeChanged(int))); /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); + connect(slider, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); - connect(slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); setCaption("Noatun"); setIcon(SmallIcon("noatun")); @@ -376,8 +376,8 @@ void Excellent::growVolumeControl(void) volumeSlider = new L33tSlider(0, 100, 10, 0,TQt::Vertical, mainFrame); volumeSlider->setValue(100 - napp->player()->volume()); volumeSlider->show(); - connect(volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(changeVolume(int))); - connect(volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(changeVolume(int))); + connect(volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(changeVolume(int))); + connect(volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(changeVolume(int))); } void Excellent::shrinkVolumeControl(void) diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp index bc2399cc..3facc98c 100644 --- a/noatun/modules/htmlexport/htmlexport.cpp +++ b/noatun/modules/htmlexport/htmlexport.cpp @@ -7,7 +7,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new HTMLExport(); } @@ -18,7 +18,7 @@ HTMLExport::HTMLExport(): TQObject(0, "HTMLExport"), Plugin() NOATUNPLUGINC(HTMLExport); mAction = new TDEAction(i18n("&Export Playlist..."), "document-save-as", 0, - this, TQT_SLOT(slotExport()), this, "exportlist"); + this, TQ_SLOT(slotExport()), this, "exportlist"); napp->pluginActionMenu()->insert(mAction); new Prefs(this); diff --git a/noatun/modules/infrared/infrared.cpp b/noatun/modules/infrared/infrared.cpp index bd8a65bd..76b6dc73 100644 --- a/noatun/modules/infrared/infrared.cpp +++ b/noatun/modules/infrared/infrared.cpp @@ -14,7 +14,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new InfraRed(); } @@ -28,12 +28,12 @@ InfraRed::InfraRed() NOATUNPLUGINC(InfraRed); m_lirc = new Lirc(this); connect(m_lirc, - TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), - TQT_SLOT(slotCommand(const TQString &, const TQString &, int))); + TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), + TQ_SLOT(slotCommand(const TQString &, const TQString &, int))); IRPrefs::s_lirc = m_lirc; volume=0; - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } InfraRed::~InfraRed() diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 06a1ade4..829f51aa 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -84,26 +84,26 @@ IRPrefs::IRPrefs(TQObject *parent) m_interval->setEnabled(false); layout->addWidget(m_interval, 2, 4); - connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); + connect(s_lirc, TQ_SIGNAL(remotesRead()), TQ_SLOT(reopen())); connect(m_commands, - TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotCommandSelected(TQListViewItem *))); + TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotCommandSelected(TQListViewItem *))); connect(m_action, - TQT_SIGNAL(activated(int)), - TQT_SLOT(slotActionActivated(int))); + TQ_SIGNAL(activated(int)), + TQ_SLOT(slotActionActivated(int))); connect(m_repeat, - TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotRepeatToggled(bool))); + TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotRepeatToggled(bool))); connect(m_interval, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotIntervalChanged(int))); + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotIntervalChanged(int))); reopen(); } void IRPrefs::save() { - TDEConfig *c = kapp->config(); + TDEConfig *c = tdeApp->config(); TDEConfigGroupSaver groupSaver(c, "Infrared"); c->writeEntry("CommandCount", s_commands.count()); int i = 1; @@ -282,7 +282,7 @@ void IRPrefs::readConfig() { if (s_configRead) return; - TDEConfig *c = kapp->config(); + TDEConfig *c = tdeApp->config(); TDEConfigGroupSaver groupSaver(c, "Infrared"); int count = c->readNumEntry("CommandCount"); for (int i = 1; i <= count; ++i) diff --git a/noatun/modules/infrared/lirc.cpp b/noatun/modules/infrared/lirc.cpp index 2487278b..2a6e2ec5 100644 --- a/noatun/modules/infrared/lirc.cpp +++ b/noatun/modules/infrared/lirc.cpp @@ -34,7 +34,7 @@ Lirc::Lirc(TQObject *parent) m_socket = new TQSocket; m_socket->setSocket(sock); - connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); + connect(m_socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); update(); } diff --git a/noatun/modules/kaiman/SKIN-SPECS b/noatun/modules/kaiman/SKIN-SPECS index ae293014..bc3533ad 100644 --- a/noatun/modules/kaiman/SKIN-SPECS +++ b/noatun/modules/kaiman/SKIN-SPECS @@ -247,7 +247,7 @@ Digit_Large/Digit_Small_Default: filename Image file. Contains digits horizontally from 0 to 9, and a blank space. These two digits are a convenience function, if you want to use a digit more than - once it is quicker to load it into on of these two Q_SLOTS. Then when using the digit + once it is quicker to load it into on of these two slots. Then when using the digit in the number item type below, use the words 'Large' or 'Small' in place of the filename. diff --git a/noatun/modules/kaiman/noatunui.cpp b/noatun/modules/kaiman/noatunui.cpp index bc1bceb0..6dc2538e 100644 --- a/noatun/modules/kaiman/noatunui.cpp +++ b/noatun/modules/kaiman/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Kaiman(); } diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index 5e2193c7..3464e66f 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include "pref.h" diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp index 1e4da725..ca96c933 100644 --- a/noatun/modules/kaiman/style.cpp +++ b/noatun/modules/kaiman/style.cpp @@ -19,7 +19,7 @@ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> @@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num ) if ( num<0 ) num = 0; _currentPixmap = num; - repaint( FALSE ); + repaint( false ); } } @@ -646,7 +646,7 @@ KaimanStyleText::KaimanStyleText(TQWidget *parent, const char *name) _pos = 0; _timer = new TQTimer( this ); _delay = 500; - connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); + connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); } KaimanStyleText::~KaimanStyleText() @@ -677,7 +677,7 @@ void KaimanStyleText::startAnimation( int delay ) _pos = 0; _direction = 1; _delay = delay; - _timer->start( _delay, TRUE ); + _timer->start( _delay, true ); } @@ -693,7 +693,7 @@ void KaimanStyleText::timeout() // reflect if ( _pos+_direction<0 || (int)_value.length()-(_pos+_direction)<digits ) { _direction = -_direction; - _timer->start( _delay*5, TRUE ); + _timer->start( _delay*5, true ); } else { // check new position if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) { @@ -701,7 +701,7 @@ void KaimanStyleText::timeout() repaint(); } - _timer->start( _delay, TRUE ); + _timer->start( _delay, true ); } @@ -741,7 +741,7 @@ KaimanStyleAnimation::KaimanStyleAnimation(int delay, TQWidget *parent, const ch _delay = delay; _frame = 0; _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); + connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); } KaimanStyleAnimation::~KaimanStyleAnimation() @@ -750,7 +750,7 @@ KaimanStyleAnimation::~KaimanStyleAnimation() void KaimanStyleAnimation::start() { - _timer->start( _delay, FALSE ); + _timer->start( _delay, false ); } void KaimanStyleAnimation::pause() @@ -1405,8 +1405,8 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e ) return true; } - TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(), - m->y()+TQT_TQWIDGET(o)->y() ); + TQPoint mousePos( m->x()+static_cast<TQWidget*>(o)->x(), + m->y()+static_cast<TQWidget*>(o)->y() ); TQWidget *slider = 0; /* find slider that is under the mouse position */ diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 9f502178..dfcc15ab 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -46,7 +46,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> #include <kurldrag.h> @@ -92,27 +92,27 @@ Kaiman::Kaiman() if ( !changeStyle( DEFAULT_SKIN, "skindata" ) ) { KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) ); - TQTimer::singleShot( 0, this, TQT_SLOT(close()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(close()) ); return; } } // global connects - connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect( napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(updateMode())); - connect( napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(updateMode())); - connect( napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(updateMode())); - connect( napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); - connect( napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(loopTypeChange(int))); - connect( napp->player(), TQT_SIGNAL(newSongLen(int,int)), this, TQT_SLOT(newSongLen(int,int))); - connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); + connect( napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(updateMode())); + connect( napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(updateMode())); + connect( napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(updateMode())); + connect( napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); + connect( napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(loopTypeChange(int))); + connect( napp->player(), TQ_SIGNAL(newSongLen(int,int)), this, TQ_SLOT(newSongLen(int,int))); + connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong())); if( napp->player()->isPlaying() ) newSong(); - new KaimanPrefDlg(TQT_TQOBJECT(this)); + new KaimanPrefDlg(this); show(); } @@ -174,64 +174,64 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc ) } item = _style->find("Playlist_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) ); item = _style->find("Play_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); item = _style->find("Pause_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); item = _style->find("Stop_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) ); item = _style->find("Next_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) ); item = _style->find("Prev_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) ); item = _style->find("Exit_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()) ); item = _style->find("Mixer_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(execMixer()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(execMixer()) ); item = _style->find("Iconify_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMinimized()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMinimized()) ); item = _style->find("Alt_Skin_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleSkin()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleSkin()) ); item = _style->find("Repeat_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleLoop()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleLoop()) ); item = _style->find("Shuffle_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShuffle()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShuffle()) ); item = _style->find("Config_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), napp, TQT_SLOT(preferences()) ); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), napp, TQ_SLOT(preferences()) ); item = _style->find("Volume_Up_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeUp())); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeUp())); item = _style->find("Volume_Down_Button"); - if( item!=0 ) connect( item, TQT_SIGNAL(clicked()), this,TQT_SLOT(volumeDown())); + if( item!=0 ) connect( item, TQ_SIGNAL(clicked()), this,TQ_SLOT(volumeDown())); KaimanStyleSlider* slider = static_cast<KaimanStyleSlider*>(_style->find("Position_Slider")); if( slider!=0 ) { - connect( slider, TQT_SIGNAL(newValueDrag(int)), this, TQT_SLOT(seekStart(int)) ); - connect( slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(seekDrag(int)) ); - connect( slider, TQT_SIGNAL(newValueDrop(int)), this, TQT_SLOT(seekStop(int)) ); + connect( slider, TQ_SIGNAL(newValueDrag(int)), this, TQ_SLOT(seekStart(int)) ); + connect( slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(seekDrag(int)) ); + connect( slider, TQ_SIGNAL(newValueDrop(int)), this, TQ_SLOT(seekStop(int)) ); slider->setValue( 0, 0, 1000 ); } slider = static_cast<KaimanStyleSlider*>(_style->find("Volume_Slider")); if ( slider!=0 ) { - connect(slider, TQT_SIGNAL(newValue(int)), this, TQT_SLOT(setVolume(int))); + connect(slider, TQ_SIGNAL(newValue(int)), this, TQ_SLOT(setVolume(int))); slider->setValue( napp->player()->volume(), 0, 100 ); } @@ -372,7 +372,7 @@ void Kaiman::volumeDown() void Kaiman::execMixer() { - kapp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); + tdeApp->startServiceByDesktopName ( TQString::fromLatin1("kmix"), TQString() ); } diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index 420ccd01..19e29288 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -5,7 +5,7 @@ #include <tqlayout.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include <tdelocale.h> #include <tqclipboard.h> @@ -14,7 +14,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Keyz(); } @@ -32,56 +32,56 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0) s_accel = new TDEGlobalAccel( this, "noatunglobalaccel" ); s_accel->insert( "PlayPause", i18n("Play/Pause"), TQString(), CTRL+ALT+Key_P, KKey::QtWIN+CTRL+Key_P, - player, TQT_SLOT( playpause() )); + player, TQ_SLOT( playpause() )); s_accel->insert( "Stop", i18n("Stop Playing"), TQString(), CTRL+ALT+Key_S, KKey::QtWIN+CTRL+Key_S, - player, TQT_SLOT( stop() )); + player, TQ_SLOT( stop() )); s_accel->insert( "Back", i18n("Back"), TQString(), CTRL+ALT+Key_Left, KKey::QtWIN+CTRL+Key_Left, - player, TQT_SLOT( back() )); + player, TQ_SLOT( back() )); s_accel->insert( "Forward", i18n("Forward"), TQString(), CTRL+ALT+Key_Right, KKey::QtWIN+CTRL+Key_Right, - player, TQT_SLOT( forward() )); + player, TQ_SLOT( forward() )); s_accel->insert( "Playlist", i18n("Show/Hide Playlist"), TQString(), CTRL+ALT+Key_L, KKey::QtWIN+CTRL+Key_L, - player, TQT_SLOT( toggleListView() )); + player, TQ_SLOT( toggleListView() )); s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(), CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O, - TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() )); + napp, TQ_SLOT( fileOpen() )); s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(), CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E, - TQT_TQOBJECT(napp), TQT_SLOT( effectView() )); + napp, TQ_SLOT( effectView() )); s_accel->insert( "Preferences", i18n("Preferences"), TQString(), CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F, - TQT_TQOBJECT(napp), TQT_SLOT( preferences() )); + napp, TQ_SLOT( preferences() )); s_accel->insert( "VolumeUp", i18n("Volume Up"), TQString(), CTRL+ALT+SHIFT+Key_Up, KKey::QtWIN+CTRL+SHIFT+Key_Up, - this, TQT_SLOT( slotVolumeUp() )); + this, TQ_SLOT( slotVolumeUp() )); s_accel->insert( "VolumeDown", i18n("Volume Down"), TQString(), CTRL+ALT+SHIFT+Key_Down, KKey::QtWIN+CTRL+SHIFT+Key_Down, - this, TQT_SLOT( slotVolumeDown() )); + this, TQ_SLOT( slotVolumeDown() )); s_accel->insert( "Mute", i18n("Mute"), TQString(), CTRL+ALT+Key_M, KKey::QtWIN+CTRL+Key_M, - this, TQT_SLOT( slotMute() )); + this, TQ_SLOT( slotMute() )); s_accel->insert( "SeekForward", i18n("Seek Forward"), TQString(), CTRL+ALT+SHIFT+Key_Right, KKey::QtWIN+CTRL+SHIFT+Key_Right, - this, TQT_SLOT( slotForward() )); + this, TQ_SLOT( slotForward() )); s_accel->insert( "SeekBackward", i18n("Seek Backward"), TQString(), CTRL+ALT+SHIFT+Key_Left, KKey::QtWIN+CTRL+SHIFT+Key_Left, - this, TQT_SLOT( slotBackward() )); + this, TQ_SLOT( slotBackward() )); s_accel->insert( "NextSection", i18n("Next Section"), TQString(), 0, 0, - this, TQT_SLOT( slotNextSection() )); + this, TQ_SLOT( slotNextSection() )); s_accel->insert( "PrevSection", i18n("Previous Section"), TQString(), 0, 0, - this, TQT_SLOT( slotPrevSection() )); + this, TQ_SLOT( slotPrevSection() )); s_accel->insert( "CopyTitle", i18n("Copy Song Title to Clipboard"), TQString(), CTRL+ALT+Key_C, KKey::QtWIN+CTRL+Key_C, - this, TQT_SLOT( slotCopyTitle() )); + this, TQ_SLOT( slotCopyTitle() )); s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(), CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W, - TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() )); + napp, TQ_SLOT( toggleInterfaces() )); s_accel->readSettings(); s_accel->updateConnections(); @@ -147,7 +147,7 @@ void Keyz::slotPrevSection() void Keyz::slotCopyTitle() { if (napp->player()->current()) - TDEApplication::kApplication()->clipboard()->setText(napp->player()->current().title()); + tdeApp->clipboard()->setText(napp->player()->current().title()); } diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 306a82fc..31e1ad96 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -87,18 +87,18 @@ KJButton::KJButton(const TQStringList &i, KJLoader *parent) if (mTitle=="playlistbutton") { mShowPressed = napp->playlist()->listVisible(); - connect( napp->player(), TQT_SIGNAL(playlistShown()), this, TQT_SLOT(slotPlaylistShown()) ); - connect( napp->player(), TQT_SIGNAL(playlistHidden()), this, TQT_SLOT(slotPlaylistHidden()) ); + connect( napp->player(), TQ_SIGNAL(playlistShown()), this, TQ_SLOT(slotPlaylistShown()) ); + connect( napp->player(), TQ_SIGNAL(playlistHidden()), this, TQ_SLOT(slotPlaylistHidden()) ); } else if ( mTitle=="equalizeroffbutton") // same goes for EQ buttons { mShowPressed = (!napp->vequalizer()->isEnabled()); - connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool))); + connect( napp->vequalizer(), TQ_SIGNAL(enabled(bool)), TQ_SLOT(slotEqEnabled(bool))); } else if (mTitle=="equalizeronbutton") { mShowPressed = napp->vequalizer()->isEnabled(); - connect( napp->vequalizer(), TQT_SIGNAL(enabled(bool)), TQT_SLOT(slotEqEnabled(bool))); + connect( napp->vequalizer(), TQ_SIGNAL(enabled(bool)), TQ_SLOT(slotEqEnabled(bool))); } } diff --git a/noatun/modules/kjofol-skin/kjequalizer.cpp b/noatun/modules/kjofol-skin/kjequalizer.cpp index d7d2b9fa..c82d1a93 100644 --- a/noatun/modules/kjofol-skin/kjequalizer.cpp +++ b/noatun/modules/kjofol-skin/kjequalizer.cpp @@ -47,7 +47,7 @@ KJEqualizer::KJEqualizer(const TQStringList &l, KJLoader *p) kdDebug(66666) << "[KJEqualizer] creating VInterpolation for " << mBands << " bands..." << endl; mInterpEq = new VInterpolation(mBands); // napp->vequalizer()->setBands(mBands); // FIXME: hack because spline sucks :P - connect(napp->vequalizer(), TQT_SIGNAL(changed()), this, TQT_SLOT(slotUpdateBuffer())); + connect(napp->vequalizer(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotUpdateBuffer())); slotUpdateBuffer(); // fill mView pixmap with valid data } diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index ce9c88c8..2763d733 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -61,7 +61,7 @@ #include <tdelocale.h> #include <tdeglobalsettings.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knotifyclient.h> #include <kpixmapeffect.h> #include <kurldrag.h> @@ -131,8 +131,8 @@ KJLoader::KJLoader() subwidgets.setAutoDelete(true); - mPrefs = new KJPrefs(TQT_TQOBJECT(this)); - connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) ); + mPrefs = new KJPrefs(this); + connect ( mPrefs, TQ_SIGNAL(configChanged()), this, TQ_SLOT(readConfig()) ); TQString skin = mPrefs->skin(); if ( TQFile(skin).exists() ) @@ -146,14 +146,14 @@ KJLoader::KJLoader() napp->preferences(); } - mHelpMenu = new KHelpMenu(this, kapp->aboutData()); - connect(napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(timeUpdate())); - connect(napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(timeUpdate())); - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); + mHelpMenu = new KHelpMenu(this, tdeApp->aboutData()); + connect(napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(timeUpdate())); + connect(napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(timeUpdate())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); - connect(napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide())); - connect(napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show())); -// KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection()); + connect(napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide())); + connect(napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show())); +// KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); TQApplication::restoreOverrideCursor(); // newSong(); @@ -371,7 +371,7 @@ void KJLoader::loadSkin(const TQString &file) // I cant believe it, there are skins without a seeker, now THATS stupid :) if (exist("seekregion")) - TQTimer::singleShot(0, this, TQT_SLOT(loadSeeker())); + TQTimer::singleShot(0, this, TQ_SLOT(loadSeeker())); // all the regular buttons for (TQDictIterator<TQStringList> i(*this); i.current(); ++i) @@ -487,11 +487,11 @@ void KJLoader::switchToDockmode() // kdDebug(66666) << "KJLoader::switchToDockmode()" << endl; loadSkin( mCurrentDockModeSkin ); - connect(mWin, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(slotWindowActivate(WId))); - connect(mWin, TQT_SIGNAL(windowRemoved(WId)), this, TQT_SLOT(slotWindowRemove(WId))); - connect(mWin, TQT_SIGNAL(stackingOrderChanged()), this, TQT_SLOT(slotStackingChanged())); - connect(mWin, TQT_SIGNAL(windowChanged(WId)), this, TQT_SLOT(slotWindowChange(WId))); - connect(mWin, TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT(slotDesktopChange(int))); + connect(mWin, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(slotWindowActivate(WId))); + connect(mWin, TQ_SIGNAL(windowRemoved(WId)), this, TQ_SLOT(slotWindowRemove(WId))); + connect(mWin, TQ_SIGNAL(stackingOrderChanged()), this, TQ_SLOT(slotStackingChanged())); + connect(mWin, TQ_SIGNAL(windowChanged(WId)), this, TQ_SLOT(slotWindowChange(WId))); + connect(mWin, TQ_SIGNAL(currentDesktopChanged(int)), this, TQ_SLOT(slotDesktopChange(int))); WId activeWin = mWin->activeWindow(); if (activeWin && (activeWin != winId())) @@ -676,7 +676,7 @@ void KJLoader::slotStackingChanged() // We seem to get this signal before the window has been restacked, // so we just schedule a restack. - TQTimer::singleShot ( 10, this, TQT_SLOT(restack()) ); + TQTimer::singleShot ( 10, this, TQ_SLOT(restack()) ); // kdDebug(66666) << "END slotStackingChanged()" << endl; } @@ -822,7 +822,7 @@ void KJLoader::showSplash() splashScreen->show(); napp->processEvents(); // we want this one time to get the splash actually displayed ASAP - TQTimer::singleShot(3000, this, TQT_SLOT(hideSplash()) ); + TQTimer::singleShot(3000, this, TQ_SLOT(hideSplash()) ); } void KJLoader::hideSplash() diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index cb341ea3..91838f5c 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -37,8 +37,8 @@ #include <tdemessagebox.h> #include <kmimemagic.h> #include <knotifyclient.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdefontcombo.h> #include <kcolorcombo.h> @@ -63,9 +63,9 @@ KJPrefs::KJPrefs(TQObject* parent) mTabWidget->insertTab( mSkinselectorWidget, i18n("&Skin Selector") ); mTabWidget->insertTab( mGuiSettingsWidget, i18n("O&ther Settings") ); - connect ( mSkinselectorWidget->mSkins, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(showPreview(const TQString&)) ); - connect ( mSkinselectorWidget->installButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(installNewSkin()) ); - connect ( mSkinselectorWidget->mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelectedSkin()) ); + connect ( mSkinselectorWidget->mSkins, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(showPreview(const TQString&)) ); + connect ( mSkinselectorWidget->installButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(installNewSkin()) ); + connect ( mSkinselectorWidget->mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelectedSkin()) ); reopen(); // fill the skinlist and draw a preview } @@ -488,7 +488,7 @@ void KJPrefs::installNewSkin( void ) kdDebug(66666) << "src: " << src.path().latin1() << endl; kdDebug(66666) << "dst: " << dst.path().latin1() << endl; TDEIO::Job *job = TDEIO::copy(src,dst); - connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect ( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotResult(TDEIO::Job*)) ); skinInstalled = true; } } // END iterate trough dirList @@ -555,7 +555,7 @@ void KJPrefs::removeSelectedSkin( void ) { kdDebug(66666) << "Deleting Skindir: " << dirToDelete.latin1() << endl; TDEIO::Job *job = TDEIO::del( dirToDelete, false, true ); - connect ( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect ( job, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotResult(TDEIO::Job*)) ); } int item = -1; diff --git a/noatun/modules/kjofol-skin/noatunui.cpp b/noatun/modules/kjofol-skin/noatunui.cpp index b5be87fd..4541e45b 100644 --- a/noatun/modules/kjofol-skin/noatunui.cpp +++ b/noatun/modules/kjofol-skin/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new KJLoader(); } diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index f7a6e5ff..ba3c258b 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -78,9 +78,9 @@ Marquis::Marquis() // for testing: uncomment this and use // dcop `dcop | grep noatun` Marquis activateAction dynamicRestore // and dynamicSave accordingly. -// (void) new TDEAction("Restore", 0, this, TQT_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" ); -// (void) new TDEAction("Save", 0, this, TQT_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" ); - connect( napp, TQT_SIGNAL( saveYourself() ), TQT_SLOT( dynamicSave() )); +// (void) new TDEAction("Restore", 0, this, TQ_SLOT( dynamicRestore() ), actionCollection(), "dynamicRestore" ); +// (void) new TDEAction("Save", 0, this, TQ_SLOT( dynamicSave() ), actionCollection(), "dynamicSave" ); + connect( napp, TQ_SIGNAL( saveYourself() ), TQ_SLOT( dynamicSave() )); } Marquis::~Marquis() diff --git a/noatun/modules/marquis/plugin.cpp b/noatun/modules/marquis/plugin.cpp index 146b0979..e9ccc0e2 100644 --- a/noatun/modules/marquis/plugin.cpp +++ b/noatun/modules/marquis/plugin.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Marquis(); } diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 72064a4a..16d09ece 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -49,8 +49,8 @@ Editor::Editor() mControls.setAutoDelete(true); mNextRow = 2; - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(delayedDestruct())); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(save())); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(delayedDestruct())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(save())); enableButtonSeparator(true); setFixedHeight(sizeHint().height()); @@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe // Get the correct validator if ( info && !groupName.isNull() ) - validator = info->createValidator( groupName, key, TQT_TQOBJECT(parent) ); + validator = info->createValidator( groupName, key, parent ); // meta_widget is used for book-keeping internally meta_widget = new MetaWidget; @@ -215,7 +215,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe box->setValue(info_item.value().toInt()); - connect(box, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(modified())); + connect(box, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(modified())); meta_widget->widget = box; } else { @@ -234,7 +234,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe >(validator)->stringList()); combo->setCurrentText(info_item.value().toString()); - connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(modified())); + connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(modified())); meta_widget->widget = combo; } @@ -244,7 +244,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe edit = new KLineEdit(parent); edit->setText(info_item.value().toString()); edit->setValidator(validator); - connect(edit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(modified())); + connect(edit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(modified())); meta_widget->widget = edit; } diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp index 801ddf0f..1df53d35 100644 --- a/noatun/modules/metatag/metatag.cpp +++ b/noatun/modules/metatag/metatag.cpp @@ -24,7 +24,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new MetaTagLoader; } @@ -32,7 +32,7 @@ extern "C" MetaTagLoader::MetaTagLoader():Plugin() { - mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQT_SLOT(editTag()), this, "edittag"); + mAction = new TDEAction(i18n("&Tag Editor..."), "edit", 0, this, TQ_SLOT(editTag()), this, "edittag"); napp->pluginActionMenu()->insert(mAction); } @@ -52,8 +52,8 @@ void MetaTagLoader::editTag() e->open(i); e->show(); - connect(e, TQT_SIGNAL(saved(PlaylistItem &)), - TQT_SLOT(update(PlaylistItem &))); + connect(e, TQ_SIGNAL(saved(PlaylistItem &)), + TQ_SLOT(update(PlaylistItem &))); } bool MetaTagLoader::update(PlaylistItem & item) diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp index 7ab51333..4c717c42 100644 --- a/noatun/modules/monoscope/monoscope.cpp +++ b/noatun/modules/monoscope/monoscope.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Monoscope(); } @@ -41,7 +41,7 @@ Monoscope::~Monoscope() void Monoscope::init() { mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0, - TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope"); + this, TQ_SLOT(toggle()), this, "togglemonoscope"); mAction->setChecked(!isHidden()); napp->pluginActionMenu()->insert(mAction); } diff --git a/noatun/modules/net/net.cpp b/noatun/modules/net/net.cpp index dbdd7e2f..752b2005 100644 --- a/noatun/modules/net/net.cpp +++ b/noatun/modules/net/net.cpp @@ -4,7 +4,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new Net(); } @@ -14,7 +14,7 @@ extern "C" Net::Net() : TQServerSocket(7539, 10), Plugin() { mFDs.setAutoDelete(true); - connect(napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(newSong())); + connect(napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(newSong())); } Net::~Net() diff --git a/noatun/modules/noatunui/noatunui.cpp b/noatun/modules/noatunui/noatunui.cpp index adb9534b..081b9158 100644 --- a/noatun/modules/noatunui/noatunui.cpp +++ b/noatun/modules/noatunui/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new MilkChocolate; } diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index 250d79a9..7fbc497b 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -37,45 +37,45 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() mBack=new TQPushButton(this); mBack->setFixedSize(buttonSize,buttonSize); mBack->setPixmap(BarIcon("noatunback")); - connect(mBack, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(mBack, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); TQToolTip::add(mBack,i18n("Back")); mStop=new TQPushButton(this); mStop->setFixedSize(buttonSize,buttonSize); mStop->setPixmap(BarIcon("noatunstop")); - connect(mStop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(mStop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); TQToolTip::add(mStop, i18n("Stop")); mPlay=new TQPushButton(this); mPlay->setToggleButton(true); mPlay->setFixedSize(buttonSize,buttonSize); mPlay->setPixmap(BarIcon("noatunplay")); - connect(mPlay, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause())); + connect(mPlay, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause())); TQToolTip::add(mPlay, i18n("Play")); mForward=new TQPushButton(this); mForward->setFixedSize(buttonSize,buttonSize); mForward->setPixmap(BarIcon("noatunforward")); - connect(mForward, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(mForward, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); TQToolTip::add(mForward, i18n("Forward")); mPlaylist=new TQPushButton(this); mPlaylist->setToggleButton(true); mPlaylist->setFixedSize(buttonSize,buttonSize); mPlaylist->setPixmap(BarIcon("noatunplaylist")); - connect(mPlaylist, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView())); + connect(mPlaylist, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView())); TQToolTip::add(mPlaylist, i18n("Playlist")); mLoop=new TQPushButton(this); mLoop->setFixedSize(buttonSize,buttonSize); mLoop->setPixmap(BarIcon("noatunloopnone")); - connect(mLoop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(loop())); + connect(mLoop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(loop())); TQToolTip::add(mLoop, i18n("Change loop style")); mPopup=new TQPushButton(this); mPopup->setFixedSize(buttonSize,buttonSize); mPopup->setPixmap(BarIcon("noatun")); - connect(mPopup, TQT_SIGNAL(clicked()), TQT_SLOT(popup())); + connect(mPopup, TQ_SIGNAL(clicked()), TQ_SLOT(popup())); // TQToolTip::add(mRemoveCurrent, i18n("Remove current file from playlist")); } @@ -104,32 +104,32 @@ MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() statusBar()->message(i18n("No File Loaded")); statusBar()->insertItem("--:--/--:--", 1, 0, true); - connect(napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect(napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); + connect(napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect(napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(changeLoopType(int))); + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, TQ_SLOT(changeLoopType(int))); // if(seeker()) { /* This skipToWrapper is needed to pass milliseconds to Player() as everybody * below the GUI is based on milliseconds instead of some unprecise thingy * like seconds or mille */ - connect(seeker(), TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(int)), napp->player(), TQT_SLOT(skipTo(int))); - connect(seeker(), TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(sliderMoved(int))); + connect(seeker(), TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(int)), napp->player(), TQ_SLOT(skipTo(int))); + connect(seeker(), TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(sliderMoved(int))); } - connect(mVolume, TQT_SIGNAL(sliderMoved(int)), napp->player(), TQT_SLOT(setVolume(int))); - connect(mVolume, TQT_SIGNAL(userChanged(int)), napp->player(), TQT_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(sliderMoved(int)), napp->player(), TQ_SLOT(setVolume(int))); + connect(mVolume, TQ_SIGNAL(userChanged(int)), napp->player(), TQ_SLOT(setVolume(int))); - connect(napp->player(), TQT_SIGNAL(playlistShown()), TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), TQT_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(playlistShown()), TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), TQ_SLOT(playlistHidden())); // Event Filter for the RMB for (TQPtrListIterator<TQObject> i(childrenListObject()); i.current(); ++i) @@ -205,7 +205,7 @@ void MilkChocolate::popup() void MilkChocolate::slotPlaying() { -// connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), view, TQT_SLOT(attemptReparent(WId))); +// connect(twinmodule, TQ_SIGNAL(windowAdded(WId)), view, TQ_SLOT(attemptReparent(WId))); changeStatusbar(napp->player()->current().title(), napp->player()->lengthString()); mPlay->setOn(true); mStop->setEnabled(true); diff --git a/noatun/modules/simple/noatunui.cpp b/noatun/modules/simple/noatunui.cpp index 3b647e42..ba2ca067 100644 --- a/noatun/modules/simple/noatunui.cpp +++ b/noatun/modules/simple/noatunui.cpp @@ -13,5 +13,5 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() { return new SimpleUI(); } + TDE_EXPORT Plugin *create_plugin() { return new SimpleUI(); } } diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index ca13195a..9ac59ed1 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -341,8 +341,8 @@ <include location="global" impldecl="in declaration">kmimetype.h</include> <include location="local" impldecl="in implementation">propertiesdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="non virtual">setPlayObject( PlaylistItem pi, Arts::PlayObject po )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 929ada84..72edda51 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -63,14 +63,14 @@ SimpleUI::SimpleUI() setupGUI( StatusBar|Create, "simpleui.rc" ); - connect( napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying()) ); - connect( napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped()) ); - connect( napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused()) ); - connect( napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(slotChanged()) ); - connect( napp->player(), TQT_SIGNAL(volumeChanged(int)), TQT_SLOT(slotVolumeChanged(int)) ); - connect( napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show()) ); + connect( napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying()) ); + connect( napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped()) ); + connect( napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused()) ); + connect( napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(slotChanged()) ); + connect( napp->player(), TQ_SIGNAL(volumeChanged(int)), TQ_SLOT(slotVolumeChanged(int)) ); + connect( napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show()) ); napp->player()->handleButtons(); @@ -126,10 +126,10 @@ SimpleUI::~SimpleUI() void SimpleUI::setupActions() { - KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); - new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()), + KStdAction::open( napp, TQ_SLOT(fileOpen()), actionCollection(), "_file_open" ); + new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQ_SLOT(show()), actionCollection(), "_file_properties" ); - KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit"); + KStdAction::quit( napp, TQ_SLOT(quit()), actionCollection(), "_file_quit"); NoatunStdAction::playlist( actionCollection(), "view_playlist" ); actionCollection()->insert(video->action( "half_size" )); @@ -139,14 +139,14 @@ void SimpleUI::setupActions() actionCollection()->insert(napp->pluginActionMenu()); - menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), + menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection()); - statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), + statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(showStatusbar()), actionCollection()); NoatunStdAction::effects( actionCollection(), "effects" ); NoatunStdAction::equalizer( actionCollection(), "equalizer" ); NoatunStdAction::loop( actionCollection(), "loop_style" ); - KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( napp, TQ_SLOT(preferences()), actionCollection() ); } void SimpleUI::showMenubar() @@ -178,10 +178,10 @@ void SimpleUI::setupCentralWidget() statusBar()->addWidget( positionLabel, 0, true ); video = new VideoFrame( npWidget ); - connect( video, TQT_SIGNAL(adaptSize(int,int)), - TQT_SLOT(slotAdaptSize(int,int)) ); - connect( video, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), - TQT_SLOT(slotContextMenu(const TQPoint &)) ); + connect( video, TQ_SIGNAL(adaptSize(int,int)), + TQ_SLOT(slotAdaptSize(int,int)) ); + connect( video, TQ_SIGNAL(rightButtonPressed(const TQPoint &)), + TQ_SLOT(slotContextMenu(const TQPoint &)) ); TQHBox *ctlFrame = new TQHBox( npWidget ); ctlFrame->setFixedHeight( 38 ); @@ -194,38 +194,38 @@ void SimpleUI::setupCentralWidget() backButton->setFixedSize( 24, 24 ); backButton->setPixmap( TQPixmap( back_xpm ) ); TQToolTip::add( backButton, i18n("Back") ); - connect( backButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) ); + connect( backButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) ); stopButton = new TQPushButton( ctlFrame ); stopButton->setFixedSize( 24, 24 ); stopButton->setPixmap( TQPixmap( stop_xpm ) ); TQToolTip::add( stopButton, i18n("Stop") ); - connect( stopButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) ); + connect( stopButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) ); playButton = new TQPushButton( ctlFrame ); playButton->setFixedSize( 24, 24 ); playButton->setPixmap( TQPixmap( play_xpm ) ); TQToolTip::add( playButton, i18n("Play / Pause") ); - connect( playButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) ); + connect( playButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) ); TQPushButton *forwButton = new TQPushButton( ctlFrame ); forwButton->setFixedSize( 24, 24 ); forwButton->setPixmap( TQPixmap( forward_xpm ) ); TQToolTip::add( forwButton, i18n("Forward") ); - connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); + connect( forwButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) ); slider = new L33tSlider( 0, 1000, 10, 0, TQt::Horizontal, ctlFrame ); slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( TQSlider::NoMarks ); - connect( slider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotSkipTo(int)) ); - connect( slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotSliderMoved(int)) ); + connect( slider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotSkipTo(int)) ); + connect( slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotSliderMoved(int)) ); TQPushButton *playlistButton = new TQPushButton( ctlFrame ); playlistButton->setFixedSize( 24, 24 ); playlistButton->setPixmap( TQPixmap( playlist_xpm ) ); TQToolTip::add( playlistButton, i18n("Playlist") ); - connect( playlistButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) ); + connect( playlistButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) ); volumeButton = new TQPushButton( ctlFrame ); volumeButton->setFixedSize( 24, 24 ); @@ -248,9 +248,9 @@ void SimpleUI::setupCentralWidget() volumeFrame->resize( volumeFrame->sizeHint() ); - connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotVolumeFrame()) ); + connect( volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotVolumeSliderMoved(int)) ); + connect( volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotVolumeSliderMoved(int)) ); + connect( volumeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotVolumeFrame()) ); setCentralWidget( npWidget ); diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index 67b7f332..7c504383 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -26,10 +26,10 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C layout->addWidget(mRegexp, 1, 0); layout->addWidget(mBackwards, 1, 1); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(clicked())); - connect(mText, TQT_SIGNAL(activated(int)), TQT_SLOT(clicked())); - connect(mText, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &))); + connect(mText, TQ_SIGNAL(activated(int)), TQ_SLOT(clicked())); + connect(mText, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &))); enableButton(User1, false); } diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp index 34690f91..d940c8ca 100644 --- a/noatun/modules/splitplaylist/playlist.cpp +++ b/noatun/modules/splitplaylist/playlist.cpp @@ -20,9 +20,9 @@ SplitPlaylist::SplitPlaylist() void SplitPlaylist::init() { view=new View(this); // 195 - connect(view->listView(), TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(listItemSelected(TQListViewItem*))); - connect(view, TQT_SIGNAL(shown()), TQT_SIGNAL(listShown())); - connect(view, TQT_SIGNAL(hidden()), TQT_SIGNAL(listHidden())); + connect(view->listView(), TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(listItemSelected(TQListViewItem*))); + connect(view, TQ_SIGNAL(shown()), TQ_SIGNAL(listShown())); + connect(view, TQ_SIGNAL(hidden()), TQ_SIGNAL(listHidden())); view->init(); // 1000 } diff --git a/noatun/modules/splitplaylist/splitplaylist.cpp b/noatun/modules/splitplaylist/splitplaylist.cpp index fd854311..92e075a5 100644 --- a/noatun/modules/splitplaylist/splitplaylist.cpp +++ b/noatun/modules/splitplaylist/splitplaylist.cpp @@ -5,7 +5,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new SplitPlaylist(); } diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index b7481125..f724d490 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -26,8 +26,8 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemenubar.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <kedittoolbar.h> #include <kurldrag.h> @@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co addRef(); setUrl(text); - static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after); + static_cast<TDEListView*>(parent)->moveItem(this, 0, after); setOn(true); // is this really needed, it makes the listview too wide for me :( @@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co } } - static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after); + static_cast<TDEListView*>(parent)->moveItem(this, 0, after); modified(); if (!streamable() && enqueue(url())) @@ -355,10 +355,10 @@ List::List(View *parent) setDragEnabled(true); setItemsMovable(true); setSelectionMode(TQListView::Extended); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting())); - connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected())); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQ_SLOT(dropEvent(TQDropEvent*, TQListViewItem*))); + connect(this, TQ_SIGNAL(moved()), TQ_SLOT(move())); + connect(this, TQ_SIGNAL(aboutToMove()), parent, TQ_SLOT(setNoSorting())); + connect(this, TQ_SIGNAL(deleteCurrentItem()), parent, TQ_SLOT(deleteSelected())); } List::~List() @@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const void List::dropEvent(TQDropEvent *event, TQListViewItem *after) { - static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting(); + static_cast<View*>(parent())->setNoSorting(); KURL::List textlist; if (!KURLDrag::decode(event, textlist)) return; event->acceptAction(); @@ -569,16 +569,16 @@ void List::addNextPendingDirectory() currentJobURL= *pendingIt; listJob= TDEIO::listRecursive(currentJobURL, false,false); connect( - listJob, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) + listJob, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)) ); connect( - listJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotResult(TDEIO::Job *)) + listJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotResult(TDEIO::Job *)) ); connect( - listJob, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) + listJob, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &)) ); pendingAddDirectories.remove(pendingIt); } @@ -638,25 +638,25 @@ View::View(SplitPlaylist *) { list=new List(this); setCentralWidget(list); - connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) ); + connect(list, TQ_SIGNAL(modified(void)), this, TQ_SLOT(setModified(void)) ); // connect the click on the header with sorting - connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) ); + connect(list->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(headerClicked(int)) ); - mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); - (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); - mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete"); + mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, TQ_SLOT(addFiles()), actionCollection(), "add_files"); + (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQ_SLOT(addDirectory()), actionCollection(), "add_dir"); + mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, this, TQ_SLOT(deleteSelected()), actionCollection(), "delete"); - mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); + mClose=KStdAction::close(this, TQ_SLOT(close()), actionCollection()); + mFind=KStdAction::find(this, TQ_SLOT(find()), actionCollection()); - (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); - mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); - mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); - mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); + (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection()); + mOpenNew=KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection()); + mOpenpl=KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + mSave=KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + mSaveAs=KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); - (void) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle"); - (void) new TDEAction(i18n("Clear"), "edit-clear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear"); + (void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQ_SLOT( randomize() ), actionCollection(), "shuffle"); + (void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQ_SLOT( clear() ), actionCollection(), "clear"); createGUI("splui.rc"); @@ -669,7 +669,7 @@ View::View(SplitPlaylist *) void View::find() { mFinder->show(); - connect(mFinder, TQT_SIGNAL(search(Finder*)), TQT_SLOT(findIt(Finder*))); + connect(mFinder, TQ_SIGNAL(search(Finder*)), TQ_SLOT(findIt(Finder*))); } static bool testWord(TQListViewItem *i, const TQString &finder) @@ -967,7 +967,7 @@ void View::configureToolBars() { saveMainWindowSettings(TDEGlobal::config(), "SPL Window"); KEditToolbar dlg(actionCollection(), "splui.rc"); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig())); dlg.exec(); } diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp index 189d1539..e9e33d16 100644 --- a/noatun/modules/systray/cmodule.cpp +++ b/noatun/modules/systray/cmodule.cpp @@ -58,9 +58,9 @@ YHModule::YHModule(TQObject *_parent) mWidget->cmbModifier->insertItem(i18n("Ctrl"), YHConfig::Ctrl); mWidget->cmbModifier->setCurrentItem(YHConfig::None); - connect(mWidget->chkUsePopup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUsePopupToggled(bool))); - connect(mWidget->cmbModifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotModifierActivated(int))); - connect(mWidget->grpMwheel, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotMwheelClicked(int))); + connect(mWidget->chkUsePopup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUsePopupToggled(bool))); + connect(mWidget->cmbModifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotModifierActivated(int))); + connect(mWidget->grpMwheel, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotMwheelClicked(int))); reopen(); } diff --git a/noatun/modules/systray/noatunui.cpp b/noatun/modules/systray/noatunui.cpp index 76f9af25..3beac24e 100644 --- a/noatun/modules/systray/noatunui.cpp +++ b/noatun/modules/systray/noatunui.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new NoatunSystray(); } diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 2a7953d3..ee3024ec 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -58,7 +58,7 @@ #include <kurl.h> #include <tdeio/netaccess.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <netwm.h> #include <tdeglobalsettings.h> @@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), removeCover(); // make sure any old temp cover is gone - KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection()); + KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection()); + KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::preferences(napp, TQ_SLOT(preferences()), actionCollection()); NoatunStdAction::back(actionCollection(), "back"); NoatunStdAction::stop(actionCollection(), "stop"); NoatunStdAction::playpause(actionCollection(), "play"); @@ -124,11 +124,11 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(), showingTrayStatus = false; mBlinkTimer = new TQTimer(this); - connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlinkTimer())); + connect(mBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBlinkTimer())); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlayPause())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPlayPause())); - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlayPause())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPlayPause())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); //napp->player()->handleButtons(); } @@ -145,8 +145,8 @@ NoatunSystray::~NoatunSystray() void NoatunSystray::init() { - YHModule *cmod = new YHModule(TQT_TQOBJECT(this)); - connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings())); + YHModule *cmod = new YHModule(this); + connect(cmod, TQ_SIGNAL(saved()), this, TQ_SLOT(slotLoadSettings())); slotLoadSettings(); } @@ -364,7 +364,7 @@ void NoatunSystray::setTipText(const TQString& text) YHConfig *c = YHConfig::self(); if(c->passivePopup()) - TQTimer::singleShot(0, this, TQT_SLOT(showPassivePopup())); + TQTimer::singleShot(0, this, TQ_SLOT(showPassivePopup())); if(c->tip()) TQToolTip::add(mTray, tipText); @@ -405,11 +405,11 @@ void NoatunSystray::showPassivePopup() TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); TQFrame *line = new TQFrame(box); line->setFrameShape(TQFrame::VLine); @@ -429,11 +429,11 @@ void NoatunSystray::showPassivePopup() TQPushButton *forwardButton = new TQPushButton(action("forward")->iconSet(), 0, buttonBox, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, TQT_SIGNAL(clicked()), action("forward"), TQT_SLOT(activate())); + connect(forwardButton, TQ_SIGNAL(clicked()), action("forward"), TQ_SLOT(activate())); TQPushButton *backButton = new TQPushButton(action("back")->iconSet(), 0, buttonBox, "popup_back"); backButton->setFlat(true); - connect(backButton, TQT_SIGNAL(clicked()), action("back"), TQT_SLOT(activate())); + connect(backButton, TQ_SIGNAL(clicked()), action("back"), TQ_SLOT(activate())); } mPassivePopup->setView(box); } diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp index c0b1c859..f9f65105 100644 --- a/noatun/modules/voiceprint/voiceprint.cpp +++ b/noatun/modules/voiceprint/voiceprint.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT Plugin *create_plugin() + TDE_EXPORT Plugin *create_plugin() { return new VoicePrint(); } @@ -35,7 +35,7 @@ VoicePrint::~VoicePrint() void VoicePrint::init() { - Prefs *p=new Prefs(TQT_TQOBJECT(this)); + Prefs *p=new Prefs(this); p->reopen(); p->save(); resizeEvent(0); diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index a1ff8cdc..46be1e2f 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -28,7 +28,7 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() : WaWidget(_WA_MAPPING_ANALYSER) { - connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), this, TQ_SLOT(pixmapChange())); contextMenu = new TQPopupMenu(this); visualizationMenu = new TQPopupMenu(); @@ -40,13 +40,13 @@ GuiSpectrumAnalyser::GuiSpectrumAnalyser() visualizationMenu->insertItem(i18n("Analyzer"), (int)MODE_ANALYSER); visualizationMenu->insertItem(i18n("Disabled"), (int)MODE_DISABLED); visualizationMenu->setCheckable(true); - connect(visualizationMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setVisualizationMode(int))); + connect(visualizationMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setVisualizationMode(int))); analyserMenu->insertItem(i18n("Normal"), (int)MODE_NORMAL); analyserMenu->insertItem(i18n("Fire"), (int)MODE_FIRE); analyserMenu->insertItem(i18n("Vertical Lines"), (int)MODE_VERTICAL_LINES); analyserMenu->setCheckable(true); - connect(analyserMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAnalyserMode(int))); + connect(analyserMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAnalyserMode(int))); analyserCache = NULL; winSkinVis = NULL; @@ -138,8 +138,8 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode) { if (!winSkinVis) { - winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis"); - connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks())); + winSkinVis=new WinSkinVis(this,"WinSkinVis"); + connect(winSkinVis,TQ_SIGNAL(doRepaint()),this,TQ_SLOT(updatePeaks())); } } else diff --git a/noatun/modules/winskin/plugin.cpp b/noatun/modules/winskin/plugin.cpp index 8be9cc77..ff38a4ab 100644 --- a/noatun/modules/winskin/plugin.cpp +++ b/noatun/modules/winskin/plugin.cpp @@ -5,7 +5,7 @@ #include "waSkin.h" extern "C" { - KDE_EXPORT Plugin *create_plugin() { + TDE_EXPORT Plugin *create_plugin() { WaSkin *new_skin = new WaSkin(); new WinSkinConfig(new_skin, new_skin->skinManager()); return new_skin; diff --git a/noatun/modules/winskin/waBalanceSlider.cpp b/noatun/modules/winskin/waBalanceSlider.cpp index cb6b0f19..1503632b 100644 --- a/noatun/modules/winskin/waBalanceSlider.cpp +++ b/noatun/modules/winskin/waBalanceSlider.cpp @@ -38,10 +38,10 @@ void WaBalanceSlider::buildGui() ws->setValue(0); - connect(ws, TQT_SIGNAL(valueChanged(int)), this, - TQT_SIGNAL(balanceSetValue(int))); - connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); - connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); + connect(ws, TQ_SIGNAL(valueChanged(int)), this, + TQ_SIGNAL(balanceSetValue(int))); + connect(ws, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed())); + connect(ws, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased())); } diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index 3e953e6b..1feb3851 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -57,24 +57,24 @@ void WaDigit::paintEvent(TQPaintEvent *) // continue parsing mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS); if (len == 6) { - waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y); time++; } else { - waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y); } mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1); - waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2); - waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3); - waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y); mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4); - waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y); + waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y); } void WaDigit::mousePressEvent(TQMouseEvent* e) { diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index af64ecc2..1e55af78 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -25,8 +25,8 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) { - connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), - this, TQT_SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), + this, TQ_SLOT(pixmapChange())); completePixmap = new TQPixmap(); @@ -36,7 +36,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO) xGrabbedPos = -1; timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeEvent())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeEvent())); } WaInfo::~WaInfo() @@ -132,7 +132,7 @@ void WaInfo::pixmapChange() completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT); for (i = 0; i < n; i++) { - WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0); + WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0); x += _WA_TEXT_WIDTH; } @@ -140,7 +140,7 @@ void WaInfo::pixmapChange() // fill the pixmap with spaces if (x < size.width()) { while (x < size.width()) { - WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0); + WaSkinModel::instance()->getText(' ', completePixmap, x, 0); x += _WA_TEXT_WIDTH; } } diff --git a/noatun/modules/winskin/waJumpSlider.cpp b/noatun/modules/winskin/waJumpSlider.cpp index b8750dc1..f38fc3c3 100644 --- a/noatun/modules/winskin/waJumpSlider.cpp +++ b/noatun/modules/winskin/waJumpSlider.cpp @@ -30,9 +30,9 @@ void WaJumpSlider::buildGui() ws->setRange(0, 100); ws->setValue(0); - connect(ws, TQT_SIGNAL(sliderPressed()), this, TQT_SIGNAL(sliderPressed())); - connect(ws, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(releasedSlider())); - connect(ws, TQT_SIGNAL(valueChanged(int)), this, TQT_SIGNAL(valueChanged(int))); + connect(ws, TQ_SIGNAL(sliderPressed()), this, TQ_SIGNAL(sliderPressed())); + connect(ws, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(releasedSlider())); + connect(ws, TQ_SIGNAL(valueChanged(int)), this, TQ_SIGNAL(valueChanged(int))); } void WaJumpSlider::setJumpRange(int val) diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp index 71f2baa2..7b452dac 100644 --- a/noatun/modules/winskin/waLabel.cpp +++ b/noatun/modules/winskin/waLabel.cpp @@ -19,8 +19,8 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping) { - connect(WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), - this, TQT_SLOT(pixmapChange())); + connect(WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), + this, TQ_SLOT(pixmapChange())); completePixmap = new TQPixmap(); @@ -58,7 +58,7 @@ void WaLabel::pixmapChange() int n = label_text ? strlen(label_text) : 0; for (int i = 0; i < n; i++) - WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap), + WaSkinModel::instance()->getText(label_text[i], completePixmap, i * _WA_TEXT_WIDTH, 0); } diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp index fdbad9af..d4285022 100644 --- a/noatun/modules/winskin/waRegion.cpp +++ b/noatun/modules/winskin/waRegion.cpp @@ -10,7 +10,7 @@ */ -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqbitmap.h> #include <tqpainter.h> #include <tqregexp.h> @@ -28,7 +28,7 @@ const char *numPointsNames[] = {"NumPoints", "numpoints", "Numpoints", "numPoint WaRegion::WaRegion(TQString filename) { // Load the region file, which happens to be in TDEConfig format - KSimpleConfig regionFile(filename, true); + TDESimpleConfig regionFile(filename, true); // Clear our variables by default window_mask = 0; diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index a9e68a2a..2127fda2 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -22,7 +22,7 @@ #include <kstdaction.h> #include <tdeaction.h> #include <tqdragobject.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <time.h> @@ -83,18 +83,18 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() title_shaded = false; // These slots make Young Hickory love us - connect( napp, TQT_SIGNAL(hideYourself()), this, TQT_SLOT(hide()) ); - connect( napp, TQT_SIGNAL(showYourself()), this, TQT_SLOT(show()) ); - - connect(napp->player(), TQT_SIGNAL(playlistShown()), this, - TQT_SLOT(playlistShown())); - connect(napp->player(), TQT_SIGNAL(playlistHidden()), this, - TQT_SLOT(playlistHidden())); - connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, - TQT_SLOT(loopChange(int))); - connect(napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong())); - - connect(napp->player(), TQT_SIGNAL(timeout()), this, TQT_SLOT(timetick())); + connect( napp, TQ_SIGNAL(hideYourself()), this, TQ_SLOT(hide()) ); + connect( napp, TQ_SIGNAL(showYourself()), this, TQ_SLOT(show()) ); + + connect(napp->player(), TQ_SIGNAL(playlistShown()), this, + TQ_SLOT(playlistShown())); + connect(napp->player(), TQ_SIGNAL(playlistHidden()), this, + TQ_SLOT(playlistHidden())); + connect(napp->player(), TQ_SIGNAL(loopTypeChange(int)), this, + TQ_SLOT(loopChange(int))); + connect(napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong())); + + connect(napp->player(), TQ_SIGNAL(timeout()), this, TQ_SLOT(timetick())); TDEConfig *config=TDEGlobal::config(); config->setGroup("Winskin"); @@ -106,13 +106,13 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface() setIcon(SmallIcon("noatun")); - TQObject::connect(waTitleBar, TQT_SIGNAL(shaded()), this, TQT_SLOT(shadeEvent())); + TQObject::connect(waTitleBar, TQ_SIGNAL(shaded()), this, TQ_SLOT(shadeEvent())); // connect to players signals - so we can update our display if someone else // changes settings... - connect(napp->player(), TQT_SIGNAL(stopped()), this, TQT_SLOT(slotStopped())); - connect(napp->player(), TQT_SIGNAL(playing()), this, TQT_SLOT(slotPlaying())); - connect(napp->player(), TQT_SIGNAL(paused()), this, TQT_SLOT(slotPaused())); + connect(napp->player(), TQ_SIGNAL(stopped()), this, TQ_SLOT(slotStopped())); + connect(napp->player(), TQ_SIGNAL(playing()), this, TQ_SLOT(slotPlaying())); + connect(napp->player(), TQ_SIGNAL(paused()), this, TQ_SLOT(slotPaused())); napp->player()->handleButtons(); @@ -180,22 +180,22 @@ void WaSkin::createButtons() menu = new WaButton(_WA_MAPPING_TITLE_MENU); menu->setPixmapUp(_WA_SKIN_TITLE_MENU_NORM); menu->setPixmapDown(_WA_SKIN_TITLE_MENU_PRES); - connect(menu, TQT_SIGNAL(clicked()), this, TQT_SLOT(menuEvent())); + connect(menu, TQ_SIGNAL(clicked()), this, TQ_SLOT(menuEvent())); minimize = new WaButton(_WA_MAPPING_TITLE_MIN); minimize->setPixmapUp(_WA_SKIN_TITLE_MIN_NORM); minimize->setPixmapDown(_WA_SKIN_TITLE_MIN_PRES); - connect(minimize, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimizeEvent())); + connect(minimize, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimizeEvent())); titleshade = new WaButton(_WA_MAPPING_TITLE_SHADE); titleshade->setPixmapUp(_WA_SKIN_TITLE_SHADE_NORM); titleshade->setPixmapDown(_WA_SKIN_TITLE_SHADE_PRES); - connect(titleshade, TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeEvent())); + connect(titleshade, TQ_SIGNAL(clicked()), this, TQ_SLOT(shadeEvent())); close = new WaButton(_WA_MAPPING_TITLE_CLOSE); close->setPixmapUp(_WA_SKIN_TITLE_CLOSE_NORM); close->setPixmapDown(_WA_SKIN_TITLE_CLOSE_PRES); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(doClose())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(doClose())); shuffle->setTogglable(true); shuffle->show(); @@ -203,44 +203,44 @@ void WaSkin::createButtons() repeat->setTogglable(true); playlist->setTogglable(true); - connect(shuffle, TQT_SIGNAL(toggleEvent(bool)), - this, TQT_SLOT(shuffleClickedEvent(bool))); + connect(shuffle, TQ_SIGNAL(toggleEvent(bool)), + this, TQ_SLOT(shuffleClickedEvent(bool))); - connect(repeat, TQT_SIGNAL(toggleEvent(bool)), - this, TQT_SLOT(repeatClickedEvent(bool))); + connect(repeat, TQ_SIGNAL(toggleEvent(bool)), + this, TQ_SLOT(repeatClickedEvent(bool))); - connect(playlist, TQT_SIGNAL(toggleEvent(bool)), - this, TQT_SLOT(playlistClickedEvent(bool))); + connect(playlist, TQ_SIGNAL(toggleEvent(bool)), + this, TQ_SLOT(playlistClickedEvent(bool))); - connect(eq, TQT_SIGNAL(clicked()), - this, TQT_SLOT(eqClickedEvent())); + connect(eq, TQ_SIGNAL(clicked()), + this, TQ_SLOT(eqClickedEvent())); prev->setPixmapUp(_WA_SKIN_CBUTTONS_PREV_NORM); prev->setPixmapDown(_WA_SKIN_CBUTTONS_PREV_PRES); - connect(prev, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back())); + connect(prev, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back())); play->setPixmapUp(_WA_SKIN_CBUTTONS_PLAY_NORM); play->setPixmapDown(_WA_SKIN_CBUTTONS_PLAY_PRES); - connect(play, TQT_SIGNAL(clicked()), this, TQT_SLOT(playCurrentEvent())); + connect(play, TQ_SIGNAL(clicked()), this, TQ_SLOT(playCurrentEvent())); pause->setPixmapUp(_WA_SKIN_CBUTTONS_PAUSE_NORM); pause->setPixmapDown(_WA_SKIN_CBUTTONS_PAUSE_PRES); - connect(pause, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPauseEvent())); + connect(pause, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPauseEvent())); stop->setPixmapUp(_WA_SKIN_CBUTTONS_STOP_NORM); stop->setPixmapDown(_WA_SKIN_CBUTTONS_STOP_PRES); - connect(stop, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop())); + connect(stop, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop())); next->setPixmapUp(_WA_SKIN_CBUTTONS_NEXT_NORM); next->setPixmapDown(_WA_SKIN_CBUTTONS_NEXT_PRES); - connect(next, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward())); + connect(next, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward())); eject->setPixmapUp(_WA_SKIN_CBUTTONS_EJECT_NORM); eject->setPixmapDown(_WA_SKIN_CBUTTONS_EJECT_PRESS); - connect(eject, TQT_SIGNAL(clicked()), napp, TQT_SLOT(fileOpen())); + connect(eject, TQ_SIGNAL(clicked()), napp, TQ_SLOT(fileOpen())); shuffle->setPixmapUp(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_NORM); shuffle->setPixmapDown(_WA_SKIN_SHUFREP_SHUFFLE_NOT_SET_PRES); @@ -280,25 +280,25 @@ void WaSkin::createHighLevelElements() waVolumeSlider = new WaVolumeSlider(); waVolumeSlider->buildGui(); - connect(waVolumeSlider, TQT_SIGNAL(volumeSetValue(int)), - this, TQT_SLOT(volumeSetValue(int))); - connect(waVolumeSlider, TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(volumeSliderPressed())); - connect(waVolumeSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(volumeSliderReleased())); + connect(waVolumeSlider, TQ_SIGNAL(volumeSetValue(int)), + this, TQ_SLOT(volumeSetValue(int))); + connect(waVolumeSlider, TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(volumeSliderPressed())); + connect(waVolumeSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(volumeSliderReleased())); waBalanceSlider = new WaBalanceSlider(); waBalanceSlider->buildGui(); - connect(waBalanceSlider, TQT_SIGNAL(balanceSetValue(int)), - this, TQT_SLOT(balanceSetValue(int))); - connect(waBalanceSlider, TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(balanceSliderPressed())); - connect(waBalanceSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(balanceSliderReleased())); + connect(waBalanceSlider, TQ_SIGNAL(balanceSetValue(int)), + this, TQ_SLOT(balanceSetValue(int))); + connect(waBalanceSlider, TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(balanceSliderPressed())); + connect(waBalanceSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(balanceSliderReleased())); waDigit = new WaDigit(); - connect(waDigit, TQT_SIGNAL(digitsClicked()), this, TQT_SLOT(digitsClicked())); + connect(waDigit, TQ_SIGNAL(digitsClicked()), this, TQ_SLOT(digitsClicked())); waBPS = new WaLabel(_WA_MAPPING_BPS); waFreq = new WaLabel(_WA_MAPPING_FREQ); @@ -310,13 +310,13 @@ void WaSkin::createHighLevelElements() waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE); waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE); - connect(waJumpSlider, TQT_SIGNAL(jump(int)), this, TQT_SLOT(jump(int))); - connect(waJumpSlider, TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(jumpSliderPressed())); - connect(waJumpSlider, TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(jumpSliderReleased())); - connect(waJumpSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(jumpValueChanged(int))); + connect(waJumpSlider, TQ_SIGNAL(jump(int)), this, TQ_SLOT(jump(int))); + connect(waJumpSlider, TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(jumpSliderPressed())); + connect(waJumpSlider, TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(jumpSliderReleased())); + connect(waJumpSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(jumpValueChanged(int))); } @@ -518,7 +518,7 @@ void WaSkin::doUnload() { } void WaSkin::doClose() { - TQTimer::singleShot(0, this, TQT_SLOT(doUnload())); + TQTimer::singleShot(0, this, TQ_SLOT(doUnload())); } void WaSkin::dragEnterEvent(TQDragEnterEvent * event) diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index 3363292c..99c2df99 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -1,7 +1,7 @@ #include <tdeglobal.h> #include <tqfileinfo.h> #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <kdebug.h> #include <kmimetype.h> @@ -73,7 +73,7 @@ bool WaSkinManager::installSkin(TQString _url) { if (mimetype == "inode/directory") { TDEIO::Job *job = TDEIO::copy(url, location, !url.isLocalFile()); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList())); return true; } else if ((mimetype == "interface/x-winamp-skin") || (mimetype == "application/x-zip")) @@ -84,7 +84,7 @@ bool WaSkinManager::installSkin(TQString _url) { TQString base_path; base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " "); TDEIO::Job *job = TDEIO::copy("zip:" + url.path(), base_path); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList())); return true; } @@ -99,7 +99,7 @@ bool WaSkinManager::removeSkin(TQString skinName) { TQStringList skins = TDEGlobal::dirs()->findDirs("data", "noatun/skins/winamp/" + skinName); TDEIO::Job *job = TDEIO::del(KURL(skins[0]), false, false); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SIGNAL(updateSkinList())); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SIGNAL(updateSkinList())); return true; } diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp index 88c1f460..188c16be 100644 --- a/noatun/modules/winskin/waSkinModel.cpp +++ b/noatun/modules/winskin/waSkinModel.cpp @@ -17,7 +17,7 @@ #include <tqstringlist.h> #include <tqbitmap.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "waSkinMapping.h" #include "waShadeMapping.h" diff --git a/noatun/modules/winskin/waVolumeSlider.cpp b/noatun/modules/winskin/waVolumeSlider.cpp index f61e22f1..712e974d 100644 --- a/noatun/modules/winskin/waVolumeSlider.cpp +++ b/noatun/modules/winskin/waVolumeSlider.cpp @@ -33,10 +33,10 @@ void WaVolumeSlider::buildGui() ws->setPixmapSliderButtonDown(_WA_SKIN_VOLUME_SLIDER_PRES); ws->setPixmapSliderBar(_WA_SKIN_VOLUME_BAR); - connect(ws, TQT_SIGNAL(valueChanged(int)), this, - TQT_SIGNAL(volumeSetValue(int))); - connect(ws, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed())); - connect(ws, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased())); + connect(ws, TQ_SIGNAL(valueChanged(int)), this, + TQ_SIGNAL(volumeSetValue(int))); + connect(ws, TQ_SIGNAL(sliderPressed()), TQ_SIGNAL(sliderPressed())); + connect(ws, TQ_SIGNAL(sliderReleased()), TQ_SIGNAL(sliderReleased())); } void WaVolumeSlider::setVolumeValue(int val) diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp index 69f797f5..b8c4b1ac 100644 --- a/noatun/modules/winskin/waWidget.cpp +++ b/noatun/modules/winskin/waWidget.cpp @@ -6,7 +6,7 @@ WaWidget::WaWidget(int _mapping) : TQWidget(WaSkin::instance()) { mapping = _mapping; setBackgroundMode(NoBackground); - connect (WaSkinModel::instance(), TQT_SIGNAL(skinChanged()), this, TQT_SLOT(skinChanged())); + connect (WaSkinModel::instance(), TQ_SIGNAL(skinChanged()), this, TQ_SLOT(skinChanged())); } WaWidget::~WaWidget() { @@ -14,31 +14,31 @@ WaWidget::~WaWidget() { void WaWidget::paintPixmap(int pixmap_mapping) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); } void WaWidget::paintPixmap(int pixmap_mapping, int argument) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) { if (pixmap_mapping != -1) - WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument); + WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument); else - WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y); + WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y); } TQSize WaWidget::sizeHint() { diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h index 81f12f14..3f2f018a 100644 --- a/noatun/modules/winskin/waWidget.h +++ b/noatun/modules/winskin/waWidget.h @@ -19,7 +19,7 @@ public: void paintPixmap(int wa_mapping, int x, int y); void paintPixmap(int wa_mapping, int number, int x, int y); - void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); } + void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); } protected: void mousePressEvent(TQMouseEvent *); diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 961ed457..03e469f1 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -13,7 +13,7 @@ #include <tdefile.h> #include <tdefiledialog.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> #include <tqdir.h> @@ -27,7 +27,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : CModule(i18n("Winskin"), i18n("Skin Selection for the Winskin Plugin"), "style", - TQT_TQOBJECT(parent)) + parent) { // Make a token horizontal layout box vbox = new TQVBoxLayout(this); @@ -48,10 +48,10 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : hbox->addWidget(buttonRemove); vbox->addLayout(hbox); - connect( skin_list, TQT_SIGNAL(highlighted(const TQString &)), this, TQT_SLOT(selected())); - connect( buttonInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(install())); - connect( buttonRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); - connect(waSkinManager, TQT_SIGNAL(updateSkinList()), this, TQT_SLOT(reopen())); + connect( skin_list, TQ_SIGNAL(highlighted(const TQString &)), this, TQ_SLOT(selected())); + connect( buttonInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(install())); + connect( buttonRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); + connect(waSkinManager, TQ_SIGNAL(updateSkinList()), this, TQ_SLOT(reopen())); mWaSkinManager = waSkinManager; |