summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-13 12:45:22 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-17 10:20:32 +0900
commit39a4235db1ca9b470a13686c534c2f10cf6be1b1 (patch)
treec57fbf371226a9b3e9748846b10a3455091dcc89
parent81c4cdd09da60e40f157a91bbe7828b82754e8e3 (diff)
downloadtdemultimedia-39a4235db1ca9b470a13686c534c2f10cf6be1b1.tar.gz
tdemultimedia-39a4235db1ca9b470a13686c534c2f10cf6be1b1.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 286a061a4cd8a904a0b16b5be4c274a20935d5df)
-rw-r--r--arts/builder/execdlg.cpp14
-rw-r--r--arts/builder/interfacedlg.cpp10
-rw-r--r--arts/builder/main.cpp98
-rw-r--r--arts/builder/menumaker.cpp4
-rw-r--r--arts/builder/mwidget.cpp4
-rw-r--r--arts/builder/portposdlg.cpp12
-rw-r--r--arts/builder/propertypanel.cpp28
-rw-r--r--arts/builder/qttableview.cpp24
-rw-r--r--arts/builder/retrievedlg.cpp6
-rw-r--r--arts/gui/kde/dbtest.cpp2
-rw-r--r--arts/gui/kde/kbutton_impl.cpp8
-rw-r--r--arts/gui/kde/kcombobox_impl.cpp2
-rw-r--r--arts/gui/kde/kfader_impl.cpp2
-rw-r--r--arts/gui/kde/klineedit_impl.cpp4
-rw-r--r--arts/gui/kde/kpoti.cpp8
-rw-r--r--arts/gui/kde/kpoti_impl.cpp2
-rw-r--r--arts/gui/kde/kspinbox_impl.cpp2
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp2
-rw-r--r--arts/gui/kde/kwidget_impl.cpp4
-rw-r--r--arts/gui/kde/tdepopupbox_impl.cpp6
-rw-r--r--arts/gui/kde/tdepopupbox_private.h4
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.h2
-rw-r--r--arts/tools/artsactions.cpp36
-rw-r--r--arts/tools/artscontrolapplet.cpp4
-rw-r--r--arts/tools/artscontrolapplet_private.h14
-rw-r--r--arts/tools/audiomanager.cpp6
-rw-r--r--arts/tools/choosebusdlg.cpp8
-rw-r--r--arts/tools/environmentview.cpp14
-rw-r--r--arts/tools/fftscopeview.cpp20
-rw-r--r--arts/tools/main.cpp12
-rw-r--r--arts/tools/midiinstdlg.cpp4
-rw-r--r--arts/tools/midimanagerview.cpp12
-rw-r--r--arts/tools/midiportdlg.cpp4
-rw-r--r--arts/tools/statusview.cpp4
-rw-r--r--juk/advancedsearchdialog.cpp6
-rw-r--r--juk/artsplayer.cpp4
-rw-r--r--juk/collectionlist.cpp10
-rw-r--r--juk/coverdialog.cpp4
-rw-r--r--juk/deletedialog.cpp2
-rw-r--r--juk/directorylist.cpp8
-rw-r--r--juk/dynamicplaylist.cpp4
-rw-r--r--juk/exampleoptions.cpp12
-rw-r--r--juk/filerenamer.cpp34
-rw-r--r--juk/folderplaylist.cpp4
-rw-r--r--juk/gstreamerplayer.cpp2
-rw-r--r--juk/historyplaylist.cpp4
-rw-r--r--juk/juk.cpp84
-rw-r--r--juk/k3bexporter.cpp10
-rw-r--r--juk/keydialog.cpp4
-rw-r--r--juk/nowplaying.cpp12
-rw-r--r--juk/playermanager.cpp16
-rw-r--r--juk/playlist.cpp44
-rw-r--r--juk/playlistbox.cpp48
-rw-r--r--juk/playlistcollection.cpp74
-rw-r--r--juk/playlistsplitter.cpp36
-rw-r--r--juk/searchwidget.cpp24
-rw-r--r--juk/slideraction.cpp24
-rw-r--r--juk/statuslabel.cpp2
-rw-r--r--juk/systemtray.cpp28
-rw-r--r--juk/tageditor.cpp52
-rw-r--r--juk/tagguesserconfigdlg.cpp18
-rw-r--r--juk/trackpickerdialog.cpp4
-rw-r--r--juk/tracksequencemanager.cpp8
-rw-r--r--juk/webimagefetcher.cpp6
-rw-r--r--juk/webimagefetcherdialog.cpp14
-rw-r--r--kaboodle/controls.cpp4
-rw-r--r--kaboodle/player.cpp16
-rw-r--r--kaboodle/userinterface.cpp16
-rw-r--r--kaboodle/view.cpp26
-rw-r--r--kaudiocreator/encodefileimp.cpp4
-rw-r--r--kaudiocreator/encoder.cpp10
-rw-r--r--kaudiocreator/encoderconfigimp.cpp16
-rw-r--r--kaudiocreator/jobqueimp.cpp6
-rw-r--r--kaudiocreator/kaudiocreator.cpp78
-rw-r--r--kaudiocreator/ripper.cpp10
-rw-r--r--kaudiocreator/tracksimp.cpp16
-rw-r--r--kmix/KMixApp.cpp2
-rw-r--r--kmix/dialogselectmaster.cpp6
-rw-r--r--kmix/dialogviewconfiguration.cpp2
-rw-r--r--kmix/kmix.cpp26
-rw-r--r--kmix/kmixapplet.cpp12
-rw-r--r--kmix/kmixdockwidget.cpp16
-rw-r--r--kmix/kmixerwidget.cpp4
-rw-r--r--kmix/mdwenum.cpp8
-rw-r--r--kmix/mdwslider.cpp22
-rw-r--r--kmix/mdwswitch.cpp8
-rw-r--r--kmix/mixer.cpp10
-rw-r--r--kmix/mixer_alsa9.cpp2
-rw-r--r--kmix/mixer_sun.cpp2
-rw-r--r--kmix/viewapplet.cpp4
-rw-r--r--kmix/viewbase.cpp8
-rw-r--r--kmix/viewdockareapopup.cpp2
-rw-r--r--kmix/viewinput.cpp2
-rw-r--r--krec/krecconfig_files.cpp8
-rw-r--r--krec/krecconfig_fileswidget.cpp10
-rw-r--r--krec/krecconfigure.cpp12
-rw-r--r--krec/krecexport_template.cpp2
-rw-r--r--krec/krecexport_wave.cpp2
-rw-r--r--krec/krecfile.cpp6
-rw-r--r--krec/krecfileview.cpp20
-rw-r--r--krec/krecfileviewhelpers.cpp4
-rw-r--r--krec/krecfilewidgets.cpp16
-rw-r--r--krec/krecnewproperties.cpp10
-rw-r--r--krec/krecord.cpp46
-rw-r--r--krec/mp3_export/krecexport_mp3.cpp2
-rw-r--r--krec/ogg_export/krecexport_ogg.cpp2
-rw-r--r--kscd/cddbdlg.cpp12
-rw-r--r--kscd/docking.cpp14
-rw-r--r--kscd/kcompactdisc.cpp2
-rw-r--r--kscd/kscd.cpp128
-rw-r--r--libkcddb/asynccddbplookup.cpp8
-rw-r--r--libkcddb/asynchttplookup.cpp12
-rw-r--r--libkcddb/asynchttpsubmit.cpp2
-rw-r--r--libkcddb/asyncsmtpsubmit.cpp4
-rw-r--r--libkcddb/cdinfoencodingwidget.cpp4
-rw-r--r--libkcddb/client.cpp16
-rw-r--r--libkcddb/test/asynccddblookuptest.cpp4
-rw-r--r--libkcddb/test/asynchttplookuptest.cpp4
-rw-r--r--libkcddb/test/asynchttpsubmittest.cpp4
-rw-r--r--libkcddb/test/asyncsmtpsubmittest.cpp4
-rw-r--r--mpeglib/lib/util/abstract/abs_thread.h2
-rw-r--r--noatun/library/app.cpp2
-rw-r--r--noatun/library/cmodule.cpp4
-rw-r--r--noatun/library/controls.cpp4
-rw-r--r--noatun/library/downloader.cpp12
-rw-r--r--noatun/library/effectview.cpp22
-rw-r--r--noatun/library/engine.cpp10
-rw-r--r--noatun/library/equalizer.cpp20
-rw-r--r--noatun/library/equalizerview.cpp56
-rw-r--r--noatun/library/noatunstdaction.cpp66
-rw-r--r--noatun/library/noatuntags/tags.cpp14
-rw-r--r--noatun/library/player.cpp10
-rw-r--r--noatun/library/playlist.cpp6
-rw-r--r--noatun/library/plugin.cpp2
-rw-r--r--noatun/library/pluginmodule.cpp8
-rw-r--r--noatun/library/pref.cpp2
-rw-r--r--noatun/library/scrollinglabel.cpp4
-rw-r--r--noatun/library/titleproxy.cpp14
-rw-r--r--noatun/library/video.cpp14
-rw-r--r--noatun/modules/dcopiface/dcopiface.cpp2
-rw-r--r--noatun/modules/excellent/userinterface.cpp34
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp2
-rw-r--r--noatun/modules/infrared/infrared.cpp6
-rw-r--r--noatun/modules/infrared/irprefs.cpp18
-rw-r--r--noatun/modules/infrared/lirc.cpp2
-rw-r--r--noatun/modules/kaiman/style.cpp4
-rw-r--r--noatun/modules/kaiman/userinterface.cpp58
-rw-r--r--noatun/modules/keyz/keyz.cpp34
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp8
-rw-r--r--noatun/modules/kjofol-skin/kjequalizer.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp30
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp10
-rw-r--r--noatun/modules/marquis/marquis.cpp6
-rw-r--r--noatun/modules/metatag/edit.cpp10
-rw-r--r--noatun/modules/metatag/metatag.cpp6
-rw-r--r--noatun/modules/monoscope/monoscope.cpp2
-rw-r--r--noatun/modules/net/net.cpp2
-rw-r--r--noatun/modules/noatunui/userinterface.cpp44
-rw-r--r--noatun/modules/simple/userinterface.cpp56
-rw-r--r--noatun/modules/splitplaylist/find.cpp6
-rw-r--r--noatun/modules/splitplaylist/playlist.cpp6
-rw-r--r--noatun/modules/splitplaylist/view.cpp52
-rw-r--r--noatun/modules/systray/cmodule.cpp6
-rw-r--r--noatun/modules/systray/systray.cpp26
-rw-r--r--noatun/modules/winskin/guiSpectrumAnalyser.cpp8
-rw-r--r--noatun/modules/winskin/waBalanceSlider.cpp8
-rw-r--r--noatun/modules/winskin/waInfo.cpp6
-rw-r--r--noatun/modules/winskin/waJumpSlider.cpp6
-rw-r--r--noatun/modules/winskin/waLabel.cpp4
-rw-r--r--noatun/modules/winskin/waSkin.cpp110
-rw-r--r--noatun/modules/winskin/waSkinManager.cpp6
-rw-r--r--noatun/modules/winskin/waVolumeSlider.cpp8
-rw-r--r--noatun/modules/winskin/waWidget.cpp2
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp8
-rw-r--r--tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp28
-rw-r--r--tdeioslave/audiocd/plugins/lame/collectingprocess.cpp16
-rw-r--r--tdeioslave/audiocd/plugins/lame/encoderlame.cpp18
-rw-r--r--tdemid/channel.cpp4
-rw-r--r--tdemid/channelcfgdlg.cpp2
-rw-r--r--tdemid/channelview.cpp6
-rw-r--r--tdemid/collectdlg.cpp20
-rw-r--r--tdemid/klcdnumber.cpp8
-rw-r--r--tdemid/main.cpp2
-rw-r--r--tdemid/midicfgdlg.cpp6
-rw-r--r--tdemid/tdemid_part.cpp10
-rw-r--r--tdemid/tdemidclient.cpp20
-rw-r--r--tdemid/tdemidframe.cpp82
187 files changed, 1388 insertions, 1388 deletions
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index 56207052..fec40c03 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -71,10 +71,10 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
cpuusagelabel->setText(i18n("CPU usage: unknown"));
cpuusagetimer = new TQTimer( this );
- connect( cpuusagetimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(updateCpuUsage()) );
- connect( cpuusagetimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(guiServerTick()) );
+ connect( cpuusagetimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(updateCpuUsage()) );
+ connect( cpuusagetimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(guiServerTick()) );
cpuusagetimer->start( 2000, false );
min_size(cpuusagelabel);
@@ -115,15 +115,15 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *savebutton = bbox->addButton(KStdGuiItem::saveAs());
- connect( savebutton, TQT_SIGNAL( clicked() ), TQT_SLOT(saveSession() ) );
+ connect( savebutton, TQ_SIGNAL( clicked() ), TQ_SLOT(saveSession() ) );
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
bbox->layout();
//min_size(bbox);
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 8cd65f90..936a0697 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -94,8 +94,8 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
listbox->setMinimumSize(340,400);
mainlayout->addWidget(listbox);
- connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
- TQT_SLOT(accept()));
+ connect( listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem *)), this,
+ TQ_SLOT(accept()));
// hruler
mainlayout->addSpacing(5);
@@ -112,14 +112,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
bbox->layout();
//min_size(bbox);
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 7f598816..bba94fca 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -146,7 +146,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
arts_debug("PORT: modulewidget");
modulewidget = new ModuleWidget(structure, mainDock, "mwidget");
mainDock->setWidget(modulewidget);
- connect(modulewidget, TQT_SIGNAL(modified(bool)), TQT_SLOT(setModified(bool)));
+ connect(modulewidget, TQ_SIGNAL(modified(bool)), TQ_SLOT(setModified(bool)));
arts_debug("PORT: modulewidget ok");
// allow others to dock to the 4 sides
@@ -167,20 +167,20 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
80); // relation target/this (in percent)
// selection
- connect(modulewidget, TQT_SIGNAL(portSelected(ModulePort *)),
- propertyPanel, TQT_SLOT (setSelectedPort(ModulePort *)));
- connect(propertyPanel, TQT_SIGNAL(portSelected(ModulePort *)),
- modulewidget, TQT_SLOT (selectPort(ModulePort *)));
- connect(modulewidget, TQT_SIGNAL(componentSelected(StructureComponent *)),
- propertyPanel, TQT_SLOT (setSelectedComponent(StructureComponent *)));
+ connect(modulewidget, TQ_SIGNAL(portSelected(ModulePort *)),
+ propertyPanel, TQ_SLOT (setSelectedPort(ModulePort *)));
+ connect(propertyPanel, TQ_SIGNAL(portSelected(ModulePort *)),
+ modulewidget, TQ_SLOT (selectPort(ModulePort *)));
+ connect(modulewidget, TQ_SIGNAL(componentSelected(StructureComponent *)),
+ propertyPanel, TQ_SLOT (setSelectedComponent(StructureComponent *)));
// connection
- connect(propertyPanel, TQT_SIGNAL(startConnection(ModulePort *)),
- modulewidget, TQT_SLOT (startConnection(ModulePort *)));
+ connect(propertyPanel, TQ_SIGNAL(startConnection(ModulePort *)),
+ modulewidget, TQ_SLOT (startConnection(ModulePort *)));
// port properties changed
- connect(propertyPanel, TQT_SIGNAL(portPropertiesChanged(ModulePort *)),
- modulewidget, TQT_SLOT (portPropertiesChanged(ModulePort *)));
+ connect(propertyPanel, TQ_SIGNAL(portPropertiesChanged(ModulePort *)),
+ modulewidget, TQ_SLOT (portPropertiesChanged(ModulePort *)));
arts_debug("PORT: setcanvas");
structure->setCanvas(modulewidget);
@@ -251,25 +251,25 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
*/
#if 000
- connect(menubar, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(activateMenu(int)));
- connect(m_view, TQT_SIGNAL(activated(int)), modulewidget, TQT_SLOT(setZoom(int)));
- connect(m_ports, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addPort(int)));
- connect(m_file_new, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fileNew(int)));
+ connect(menubar, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(activateMenu(int)));
+ connect(m_view, TQ_SIGNAL(activated(int)), modulewidget, TQ_SLOT(setZoom(int)));
+ connect(m_ports, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addPort(int)));
+ connect(m_file_new, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fileNew(int)));
- //connect(m_modules, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+ //connect(m_modules, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
/*
- connect(m_modules_synth, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
- connect(m_modules_gui, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
- connect(m_modules_instruments, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
- connect(m_modules_other, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
+ connect(m_modules_synth, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+ connect(m_modules_gui, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+ connect(m_modules_instruments, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
+ connect(m_modules_other, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addModule(int)));
*/
- connect(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit()));
+ connect(kapp, TQ_SIGNAL(lastWindowClosed()), this , TQ_SLOT(quit()));
// update the modules menu once for the start
#endif
arts_debug("PORT: activatemenu");
- connect(menumaker, TQT_SIGNAL(activated(const char *)), this, TQT_SLOT(addModule(const char *)));
+ connect(menumaker, TQ_SIGNAL(activated(const char *)), this, TQ_SLOT(addModule(const char *)));
fillModuleMenu();
arts_debug("PORT: activatemenu ok");
setupActions();
@@ -279,7 +279,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
// connect to aboutToShow to correctly show state of dockwidget there:
TQPopupMenu *viewmenu = (TQPopupMenu*)factory()->container("view", this);
if (viewmenu)
- connect(viewmenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(viewMenuAboutToShow()));
+ connect(viewmenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(viewMenuAboutToShow()));
else
arts_debug("view menu not found!");
@@ -292,55 +292,55 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
void ArtsBuilderWindow::setupActions()
{
// File menu
- KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
+ KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection());
- (void)new TDEAction(i18n("Open Session..."), 0, this, TQT_SLOT(openSession()),
+ (void)new TDEAction(i18n("Open Session..."), 0, this, TQ_SLOT(openSession()),
actionCollection(), "file_open_session");
- KStdAction::open(this, TQT_SLOT(open()), actionCollection());
- (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, this, TQT_SLOT(openExample()),
+ KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+ (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, this, TQ_SLOT(openExample()),
actionCollection(), "file_open_example");
- KStdAction::save(this, TQT_SLOT(save()), actionCollection());
- KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
- (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, this, TQT_SLOT(retrieve()),
+ KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+ (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(retrieve()),
actionCollection(), "file_retrieve_from_server");
- (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, this, TQT_SLOT(execute()),
+ (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, this, TQ_SLOT(execute()),
actionCollection(), "file_execute_structure");
- (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, this, TQT_SLOT(rename()),
+ (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, this, TQ_SLOT(rename()),
actionCollection(), "file_rename_structure");
- (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, this, TQT_SLOT(publish()),
+ (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, this, TQ_SLOT(publish()),
actionCollection(), "file_publish_structure");
- KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
// Edit menu
- (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQT_SLOT(delModule()),
+ (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQ_SLOT(delModule()),
actionCollection(), "edit_delete");
- KStdAction::selectAll(modulewidget, TQT_SLOT(selectAll()), actionCollection());
+ KStdAction::selectAll(modulewidget, TQ_SLOT(selectAll()), actionCollection());
// View menu
viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0,
- propertyDock, TQT_SLOT(changeHideShowState()),
+ propertyDock, TQ_SLOT(changeHideShowState()),
actionCollection(), "view_properties");
- (void)new TDEAction(i18n("200%"), 0, this, TQT_SLOT(viewAt200()),
+ (void)new TDEAction(i18n("200%"), 0, this, TQ_SLOT(viewAt200()),
actionCollection(), "view_200");
- (void)new TDEAction(i18n("150%"), 0, this, TQT_SLOT(viewAt150()),
+ (void)new TDEAction(i18n("150%"), 0, this, TQ_SLOT(viewAt150()),
actionCollection(), "view_150");
- (void)new TDEAction(i18n("100%"), 0, this, TQT_SLOT(viewAt100()),
+ (void)new TDEAction(i18n("100%"), 0, this, TQ_SLOT(viewAt100()),
actionCollection(), "view_100");
- (void)new TDEAction(i18n("50%"), 0, this, TQT_SLOT(viewAt50()),
+ (void)new TDEAction(i18n("50%"), 0, this, TQ_SLOT(viewAt50()),
actionCollection(), "view_50");
// Ports menu
- (void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQT_SLOT(createInAudioSignal()),
+ (void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQ_SLOT(createInAudioSignal()),
actionCollection(), "ports_create_in_audio_signal");
- (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQT_SLOT(createOutAudioSignal()),
+ (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQ_SLOT(createOutAudioSignal()),
actionCollection(), "ports_create_out_audio_signal");
- (void)new TDEAction(i18n("Create IN String Property"), 0, this, TQT_SLOT(createInStringProperty()),
+ (void)new TDEAction(i18n("Create IN String Property"), 0, this, TQ_SLOT(createInStringProperty()),
actionCollection(), "ports_create_in_string_property");
- (void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQT_SLOT(createInAudioProperty()),
+ (void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQ_SLOT(createInAudioProperty()),
actionCollection(), "ports_create_in_audio_property");
- (void)new TDEAction(i18n("Implement Interface..."), 0, this, TQT_SLOT(addInterface()),
+ (void)new TDEAction(i18n("Implement Interface..."), 0, this, TQ_SLOT(addInterface()),
actionCollection(), "ports_implement_interface");
- (void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQT_SLOT(changePortPositions()),
+ (void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQ_SLOT(changePortPositions()),
actionCollection(), "ports_change_positions");
}
@@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
+ connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute()));
hide();
// m_filename = filename; FIXME: DOESN'T THIS BELONG HERE?
@@ -674,7 +674,7 @@ void ArtsBuilderWindow::execute()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
+ connect(execDlg, TQ_SIGNAL(ready()), this, TQ_SLOT(endexecute()));
hide();
}
diff --git a/arts/builder/menumaker.cpp b/arts/builder/menumaker.cpp
index 8045091b..33784652 100644
--- a/arts/builder/menumaker.cpp
+++ b/arts/builder/menumaker.cpp
@@ -10,7 +10,7 @@ MenuEntry::MenuEntry(MenuMaker *menumaker, TDEActionMenu *parent, const char *te
{
action = new TDEAction(TQString::fromLocal8Bit(text));
parent->insert(action);
- connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(activated()));
+ connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(activated()));
}
void MenuEntry::activated()
@@ -93,7 +93,7 @@ void MenuMaker::addCategory(const TQString& name, const char *prefix)
TDEActionMenu *newMenu = new TDEActionMenu(catname(name));
pc->menu()->insert(newMenu);
/* 000 */
- /*connect(newMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuactivated(int)));
+ /*connect(newMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(menuactivated(int)));
pc->menu()->insertItem(catname(name).c_str(), newMenu, CAT_MAGIC_ID);*/
arts_debug("inserting a menu called '%s' in the parent menu '%s'",
catname(name).local8Bit().data(),pc->name().local8Bit().data());
diff --git a/arts/builder/mwidget.cpp b/arts/builder/mwidget.cpp
index 31b03b6f..e1b08ebf 100644
--- a/arts/builder/mwidget.cpp
+++ b/arts/builder/mwidget.cpp
@@ -637,8 +637,8 @@ ModuleWidget::ModuleWidget(Structure *structure, TQWidget *parent, const char *n
arts_debug("PORT: mw; new ar ok - qtimer");
TQTimer *timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(autoRedrawRouter()) );
+ connect( timer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(autoRedrawRouter()) );
arts_debug("PORT: mw; tstart");
timer->start( 100, FALSE ); // 100 ms reoccurring check
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 006b5c6d..246f972c 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -111,27 +111,27 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TDEIconLoader iconloader;
TQButton *raise = bbox->addButton(i18n("&Raise"));
raise->setPixmap(iconloader.loadIcon("go-up", TDEIcon::Small));
- connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() ));
+ connect( raise, TQ_SIGNAL( clicked() ), TQ_SLOT( raise() ));
TQButton *lower = bbox->addButton(i18n("&Lower"));
lower->setPixmap(iconloader.loadIcon("go-down", TDEIcon::Small));
- connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() ));
+ connect( lower, TQ_SIGNAL( clicked() ), TQ_SLOT( lower() ));
TQButton *rename = bbox->addButton(i18n("R&ename..."));
- connect( rename, TQT_SIGNAL( clicked() ), TQT_SLOT( rename() ));
+ connect( rename, TQ_SIGNAL( clicked() ), TQ_SLOT( rename() ));
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
/*
TQButton *cancelbutton = bbox->addButton(i18n("Cancel"));
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
*/
bbox->layout();
//min_size(bbox);
diff --git a/arts/builder/propertypanel.cpp b/arts/builder/propertypanel.cpp
index 9f306d15..209fe7e4 100644
--- a/arts/builder/propertypanel.cpp
+++ b/arts/builder/propertypanel.cpp
@@ -43,20 +43,20 @@ PropertyPanel::PropertyPanel( TQWidget* parent, const char* name, WFlags fl )
{
setTitleFont();
setTitleColors();
- connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ),
- this, TQT_SLOT( setTitleFont() ));
- connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ),
- this, TQT_SLOT( setTitleColors() ));
- connect( portValueGroup, TQT_SIGNAL( clicked(int) ),
- this, TQT_SLOT( pvModeChanged(int) ));
- connect( constantValueEdit, TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( writePortProperties() ));
- connect( constantValueComboBox, TQT_SIGNAL( activated(int) ),
- this, TQT_SLOT( writePortProperties() ));
- connect( portCombo, TQT_SIGNAL( activated(int) ),
- this, TQT_SLOT( comboPortSelected(int) ));
- connect( connectButton, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( connectButtonClicked() ));
+ connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ),
+ this, TQ_SLOT( setTitleFont() ));
+ connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ),
+ this, TQ_SLOT( setTitleColors() ));
+ connect( portValueGroup, TQ_SIGNAL( clicked(int) ),
+ this, TQ_SLOT( pvModeChanged(int) ));
+ connect( constantValueEdit, TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( writePortProperties() ));
+ connect( constantValueComboBox, TQ_SIGNAL( activated(int) ),
+ this, TQ_SLOT( writePortProperties() ));
+ connect( portCombo, TQ_SIGNAL( activated(int) ),
+ this, TQ_SLOT( comboPortSelected(int) ));
+ connect( connectButton, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( connectButtonClicked() ));
constantValueComboBox->hide();
setEnabled( false );
diff --git a/arts/builder/qttableview.cpp b/arts/builder/qttableview.cpp
index 3a2cac42..36236fe3 100644
--- a/arts/builder/qttableview.cpp
+++ b/arts/builder/qttableview.cpp
@@ -1447,12 +1447,12 @@ TQScrollBar *QtTableView::verticalScrollBar() const
TQ_CHECK_PTR(sb);
sb->setTracking( FALSE );
sb->setFocusPolicy( TQWidget::NoFocus );
- connect( sb, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(verSbValue(int)));
- connect( sb, TQT_SIGNAL(sliderMoved(int)),
- TQT_SLOT(verSbSliding(int)));
- connect( sb, TQT_SIGNAL(sliderReleased()),
- TQT_SLOT(verSbSlidingDone()));
+ connect( sb, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(verSbValue(int)));
+ connect( sb, TQ_SIGNAL(sliderMoved(int)),
+ TQ_SLOT(verSbSliding(int)));
+ connect( sb, TQ_SIGNAL(sliderReleased()),
+ TQ_SLOT(verSbSlidingDone()));
sb->hide();
that->vScrollBar = sb;
return sb;
@@ -1478,12 +1478,12 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
sb->setFocusPolicy( TQWidget::NoFocus );
TQ_CHECK_PTR(sb);
sb->setTracking( FALSE );
- connect( sb, TQT_SIGNAL(valueChanged(int)),
- TQT_SLOT(horSbValue(int)));
- connect( sb, TQT_SIGNAL(sliderMoved(int)),
- TQT_SLOT(horSbSliding(int)));
- connect( sb, TQT_SIGNAL(sliderReleased()),
- TQT_SLOT(horSbSlidingDone()));
+ connect( sb, TQ_SIGNAL(valueChanged(int)),
+ TQ_SLOT(horSbValue(int)));
+ connect( sb, TQ_SIGNAL(sliderMoved(int)),
+ TQ_SLOT(horSbSliding(int)));
+ connect( sb, TQ_SIGNAL(sliderReleased()),
+ TQ_SLOT(horSbSlidingDone()));
sb->hide();
that->hScrollBar = sb;
return sb;
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index 96c8dd18..9f6e4107 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -104,14 +104,14 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
bbox->layout();
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index e1933b17..57a03730 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -12,7 +12,7 @@
dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) {
kdDebug() << k_funcinfo << endl;
- ( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new TDEActionCollection( this ) );
+ ( void* ) KStdAction::quit( this, TQ_SLOT( close() ), new TDEActionCollection( this ) );
for ( float i=0; i<=1; i+=0.25 )
kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl;
diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp
index 752761b2..dfe4678f 100644
--- a/arts/gui/kde/kbutton_impl.cpp
+++ b/arts/gui/kde/kbutton_impl.cpp
@@ -33,10 +33,10 @@ KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but )
, impl( _impl )
, button( but )
{
- connect( but, TQT_SIGNAL( pressed() ), this, TQT_SLOT( pressed() ) );
- connect( but, TQT_SIGNAL( released() ), this, TQT_SLOT( released() ) );
- connect( but, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggled( bool ) ) );
- connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+ connect( but, TQ_SIGNAL( pressed() ), this, TQ_SLOT( pressed() ) );
+ connect( but, TQ_SIGNAL( released() ), this, TQ_SLOT( released() ) );
+ connect( but, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggled( bool ) ) );
+ connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
}
void KButtonMapper::pressed()
diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp
index 1bbc36c7..fced3445 100644
--- a/arts/gui/kde/kcombobox_impl.cpp
+++ b/arts/gui/kde/kcombobox_impl.cpp
@@ -34,7 +34,7 @@ ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co)
: TQObject( co, "map TQt signal to aRts" )
,impl(impl)
{
- connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &)));
+ connect(co, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(activated(const TQString &)));
}
void ComboBoxIntMapper::activated(const TQString & newValue)
diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp
index cda42179..b667056d 100644
--- a/arts/gui/kde/kfader_impl.cpp
+++ b/arts/gui/kde/kfader_impl.cpp
@@ -34,7 +34,7 @@ using namespace std;
FaderIntMapper::FaderIntMapper(KFader_impl *impl, KFader *kp) :impl(impl)
{
- connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+ connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
}
void FaderIntMapper::valueChanged(int pos)
diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp
index 6c3c907b..3054270e 100644
--- a/arts/gui/kde/klineedit_impl.cpp
+++ b/arts/gui/kde/klineedit_impl.cpp
@@ -29,8 +29,8 @@ using namespace std;
KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke)
:impl(impl)
{
- connect(ke, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(textChanged(const TQString&)));
+ connect(ke, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(textChanged(const TQString&)));
}
void KLineEditStringMapper::textChanged(const TQString& newText)
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 8fc412a2..03bd905d 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -495,14 +495,14 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
subtractPage();
if ( !timer )
timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) );
timer->start( thresholdTime, TRUE );
} else {
state = TimingUp;
addPage();
if ( !timer )
timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) );
timer->start( thresholdTime, TRUE );
}
}
@@ -695,9 +695,9 @@ void KPoti::repeatTimeout()
Q_ASSERT( timer );
timer->disconnect();
if ( state == TimingDown )
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) );
else if ( state == TimingUp )
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) );
timer->start( repeatTime, FALSE );
}
diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp
index b5d4f043..fbf442f0 100644
--- a/arts/gui/kde/kpoti_impl.cpp
+++ b/arts/gui/kde/kpoti_impl.cpp
@@ -35,7 +35,7 @@ PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp)
: TQObject( kp )
, impl( impl )
{
- connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+ connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
}
void PotiIntMapper::valueChanged(int pos)
diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp
index e352033c..877c080f 100644
--- a/arts/gui/kde/kspinbox_impl.cpp
+++ b/arts/gui/kde/kspinbox_impl.cpp
@@ -32,7 +32,7 @@ using namespace std;
SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp)
:impl(impl)
{
- connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+ connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
}
void SpinBoxIntMapper::valueChanged(int pos)
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index b32bff35..4236e0cd 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n )
, _value( -1 )
, _dir( Arts::BottomToTop )
, _menu( new TDEPopupMenu( this ) )
- , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQT_SLOT( exactValue() ), this ) )
+ , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQ_SLOT( exactValue() ), this ) )
{
//kdDebug() << k_funcinfo << endl;
setMinimumSize( 10,10 );
diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp
index 53ccb8ad..e44a818f 100644
--- a/arts/gui/kde/kwidget_impl.cpp
+++ b/arts/gui/kde/kwidget_impl.cpp
@@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( TQWidget * widget )
* the panel got deleted, our widget will be gone, too)
*/
_guard = new KWidgetGuard(this);
- TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()),
- _guard, TQT_SLOT(widgetDestroyed()));
+ TQObject::connect(_qwidget, TQ_SIGNAL(destroyed()),
+ _guard, TQ_SLOT(widgetDestroyed()));
}
KWidget_impl::~KWidget_impl()
diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp
index 9263fc0d..150cccb7 100644
--- a/arts/gui/kde/tdepopupbox_impl.cpp
+++ b/arts/gui/kde/tdepopupbox_impl.cpp
@@ -64,11 +64,11 @@ TDEPopupBox_widget::TDEPopupBox_widget( TQWidget *parent, const char* name ) : T
_titlebarlayout->setAutoAdd( true );
_showbutton = new ShowButton( _titlebar );
- connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) );
+ connect( _showbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( hide( bool ) ) );
_drag = new HandleDrag( _titlebar );
- connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) );
+ connect( _drag, TQ_SIGNAL( clicked() ), _showbutton, TQ_SLOT( toggle() ) );
_ownbutton = new OwnButton( _titlebar );
- connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) );
+ connect( _ownbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( own( bool ) ) );
_artswidget = new OwnWidget( _showbutton, this );
diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h
index 1df01f79..21fc3034 100644
--- a/arts/gui/kde/tdepopupbox_private.h
+++ b/arts/gui/kde/tdepopupbox_private.h
@@ -118,7 +118,7 @@ private:
public:
ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight )
{
- connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) );
+ connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( owntoggle( bool ) ) );
setToggleButton( true );
_pmleft = TQPixmap( const_cast<const char**>( left_xpm ) );
_pmright = TQPixmap( const_cast<const char**>( right_xpm ) );
@@ -174,7 +174,7 @@ private:
public:
OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name )
{
- connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) );
+ connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggle( bool ) ) );
setToggleButton( true );
_pmown = TQPixmap( const_cast<const char**>( own_xpm ) );
_pminside = TQPixmap( const_cast<const char**>( inside_xpm ) );
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index 5f6da3be..ff5d96dd 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -88,7 +88,7 @@ public:
public:
KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
_timer = new TQTimer( this );
- connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
+ connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimerSignal() ) );
}
public slots:
void slotTimerSignal() { _impl->updateValues(); }
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index d5c5f071..226c0bad 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -62,52 +62,52 @@ ArtsActions::~ArtsActions() {
}
TDEAction* ArtsActions::actionScopeView() {
- if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQT_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" );
+ if ( !_a_sv ) _a_sv = new TDEAction( i18n( "&FFT Scope" ), "artsfftscope", TDEShortcut(), this, TQ_SLOT( viewScopeView() ), _actioncollection, "artssupport_view_scopeview" );
return _a_sv;
}
TDEAction* ArtsActions::actionAudioManager() {
- if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQT_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" );
+ if ( !_a_am ) _a_am = new TDEAction( i18n( "&Audio Manager" ), "artsaudiomanager", TDEShortcut(), this, TQ_SLOT( viewAudioManager() ), _actioncollection, "artssupport_view_audiomanager" );
return _a_am;
}
TDEAction* ArtsActions::actionArtsStatusView() {
- if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
+ if ( !_a_asv ) _a_asv = new TDEAction( i18n( "aRts &Status" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
return _a_asv;
}
TDEAction* ArtsActions::actionMidiManagerView() {
- if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQT_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" );
+ if ( !_a_mmv ) _a_mmv = new TDEAction( i18n( "&MIDI Manager" ), "artsmidimanager", TDEShortcut(), this, TQ_SLOT( viewMidiManagerView() ), _actioncollection, "artssupport_view_midimanager" );
return _a_mmv;
}
TDEAction* ArtsActions::actionEnvironmentView() {
- if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQT_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" );
+ if ( !_a_ev ) _a_ev = new TDEAction( i18n( "&Environment" ), "artsenvironment", TDEShortcut(), this, TQ_SLOT( viewEnvironmentView() ), _actioncollection, "artssupport_view_environment" );
return _a_ev;
}
TDEAction* ArtsActions::actionMediaTypesView() {
- if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQT_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" );
+ if ( !_a_mtv ) _a_mtv = new TDEAction( i18n( "Available Media &Types" ), "artsmediatypes", TDEShortcut(), this, TQ_SLOT( viewMediaTypesView() ), _actioncollection, "artssupport_view_mediatypes" );
return _a_mtv;
}
TDEAction* ArtsActions::actionStyleNormal() {
- if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" );
+ if ( !_a_style_normal ) _a_style_normal = new TDEAction( i18n( "Style: NormalBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_normal() ), _actioncollection, "artssupport_style_normal" );
return _a_style_normal;
}
TDEAction* ArtsActions::actionStyleFire() {
- if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" );
+ if ( !_a_style_fire ) _a_style_fire = new TDEAction( i18n( "Style: FireBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_fire() ), _actioncollection, "artssupport_style_fire" );
return _a_style_fire;
}
TDEAction* ArtsActions::actionStyleLine() {
- if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" );
+ if ( !_a_style_line ) _a_style_line = new TDEAction( i18n( "Style: LineBars" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_line() ), _actioncollection, "artssupport_style_line" );
return _a_style_line;
}
TDEAction* ArtsActions::actionStyleLED() {
- if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" );
+ if ( !_a_style_led ) _a_style_led = new TDEAction( i18n( "Style: LEDs" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_led() ), _actioncollection, "artssupport_style_led" );
return _a_style_led;
}
TDEAction* ArtsActions::actionStyleAnalog() {
- if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" );
+ if ( !_a_style_analog ) _a_style_analog = new TDEAction( i18n( "Style: Analog" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_analog() ), _actioncollection, "artssupport_style_analog" );
return _a_style_analog;
}
TDEAction* ArtsActions::actionStyleSmall() {
- if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQT_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" );
+ if ( !_a_style_small ) _a_style_small = new TDEAction( i18n( "Style: Small" ), "", TDEShortcut(), this, TQ_SLOT( _p_style_small() ), _actioncollection, "artssupport_style_small" );
return _a_style_small;
}
TDEPopupMenu* ArtsActions::stylemenu() {
@@ -136,7 +136,7 @@ TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* sl
void ArtsActions::viewScopeView() {
if ( !_sv ) {
_sv = new FFTScopeView( _kartsserver->server() );
- connect( _sv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewScopeView() ) );
+ connect( _sv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewScopeView() ) );
} else {
delete _sv;
_sv = 0;
@@ -145,7 +145,7 @@ void ArtsActions::viewScopeView() {
void ArtsActions::viewAudioManager() {
if ( !_am ) {
_am = new Gui_AUDIO_MANAGER();
- connect( _am, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewAudioManager() ) );
+ connect( _am, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewAudioManager() ) );
} else {
delete _am;
_am = 0;
@@ -154,7 +154,7 @@ void ArtsActions::viewAudioManager() {
void ArtsActions::viewArtsStatusView() {
if ( !_asv ) {
_asv = new ArtsStatusView( _kartsserver->server() );
- connect( _asv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewArtsStatusView() ) );
+ connect( _asv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewArtsStatusView() ) );
} else {
delete _asv;
_asv = 0;
@@ -163,7 +163,7 @@ void ArtsActions::viewArtsStatusView() {
void ArtsActions::viewMidiManagerView() {
if ( !_mmv ) {
_mmv = new MidiManagerView();
- connect( _mmv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMidiManagerView() ) );
+ connect( _mmv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMidiManagerView() ) );
} else {
delete _mmv;
_mmv = 0;
@@ -172,7 +172,7 @@ void ArtsActions::viewMidiManagerView() {
void ArtsActions::viewEnvironmentView() {
if ( !_ev ) {
_ev = new EnvironmentView( defaultEnvironment() );
- connect( _ev, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewEnvironmentView() ) );
+ connect( _ev, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewEnvironmentView() ) );
} else {
delete _ev;
_ev = 0;
@@ -181,7 +181,7 @@ void ArtsActions::viewEnvironmentView() {
void ArtsActions::viewMediaTypesView() {
if ( !_mtv ) {
_mtv = new MediaTypesView();
- connect( _mtv, TQT_SIGNAL( closed() ), this, TQT_SLOT( viewMediaTypesView() ) );
+ connect( _mtv, TQ_SIGNAL( closed() ), this, TQ_SLOT( viewMediaTypesView() ) );
} else {
delete _mtv;
_mtv = 0;
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index a70b8683..bada9d2c 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -61,7 +61,7 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
p->layout->activate();
- TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+ TQTimer::singleShot( 100, this, TQ_SLOT( supdatelayout() ) );
kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
}
@@ -139,7 +139,7 @@ kdDebug() << k_funcinfo << endl;
if ( !svinline ) {
svinline = new FFTScopeView( arts->server(), _parent );
svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
- connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) );
+ connect( svinline, TQ_SIGNAL( closed() ), this, TQ_SLOT( SVinline() ) );
layout->addWidget( svinline );
} else {
delete svinline;
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 54928a84..7d14f458 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -83,7 +83,7 @@ public:
menu = new TDEPopupMenu( 0 );
_showSV = _artsactions->actionScopeView();
_showSV->plug( menu );
- _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQT_SLOT( SVinline() ), this );
+ _showSVinline = new TDEAction( i18n( "Toggle &Inline FFT Scope" ), "artscontrol", TDEShortcut(), this, TQ_SLOT( SVinline() ), this );
_showSVinline->plug( menu );
_showAM = _artsactions->actionAudioManager();
_showAM->plug( menu );
@@ -97,12 +97,12 @@ public:
_showMediaTypes->plug( menu );
menu->insertSeparator();
menu->insertItem( i18n( "VU-Style" ), _artsactions->stylemenu() );
- connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) );
- connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) );
- connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) );
- connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) );
- connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) );
- connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) );
+ connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) );
+ connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) );
+ connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) );
+ connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) );
+ connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) );
+ connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) );
}
~ArtsControlAppletPrivate() {
if ( svinline ) SVinline();
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index e8858954..10f901ee 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -55,7 +55,7 @@ Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Tem
TQTimer *updatetimer = new TQTimer(this);
updatetimer->start(500);
- TQObject::connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tick()));
+ TQObject::connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tick()));
}
Gui_AUDIO_MANAGER::~Gui_AUDIO_MANAGER()
@@ -103,8 +103,8 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
listview->setMinimumSize(300,100);
- TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
- TQT_SLOT(edit(TQListViewItem *)));
+ TQObject::connect(listview,TQ_SIGNAL(executed(TQListViewItem *)),proxy,
+ TQ_SLOT(edit(TQListViewItem *)));
mainlayout->addWidget(listview);
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 8a9a8031..e3a533a7 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -105,7 +105,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
layout2->addWidget( newbuslabel );
lineedit = new KLineEdit( this );
- connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
+ connect( lineedit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( textChanged( const TQString & ) ) );
layout2->addWidget( lineedit );
// hruler
@@ -126,15 +126,15 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
okbutton->setDefault( true );
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
- connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
+ connect( cancelbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(reject() ) );
bbox->layout();
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index aca373e9..1e223629 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -71,25 +71,25 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
defaultEnvFileName.replace('~', TQDir::homeDirPath());
listBox = new TDEListBox(this);
update();
- connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)),
- this,TQT_SLOT(view(TQListBoxItem*)));
+ connect(listBox,TQ_SIGNAL(executed(TQListBoxItem*)),
+ this,TQ_SLOT(view(TQListBoxItem*)));
TQPushButton *mixerButton = new TQPushButton(i18n("Add Mixer"), this);
- connect(mixerButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addMixer()));
+ connect(mixerButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addMixer()));
TQPushButton *effectRackButton = new TQPushButton(i18n("Add Effect Rack"), this);
- connect(effectRackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEffectRack()));
+ connect(effectRackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEffectRack()));
TQPushButton *delButton = new TQPushButton(i18n("Delete Item"), this);
- connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
+ connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delItem()));
TQPushButton *loadButton = new
TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
- connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
+ connect(loadButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(load()));
TQPushButton *saveButton = new
TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
- connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
+ connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(save()));
show();
}
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 6307fa71..975b2943 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -77,23 +77,23 @@ kdDebug()<<k_funcinfo<<endl;
updatetimer = new TQTimer( this );
updatetimer->start( 100 );
- connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
+ connect( updatetimer,TQ_SIGNAL( timeout() ),this,TQ_SLOT( updateScope() ) );
_artsactions = new ArtsActions( 0, 0, this );
- _moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 );
- _lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 );
+ _moreBars = ArtsActions::actionMoreBars( this, TQ_SLOT( moreBars() ), 0 );
+ _lessBars = ArtsActions::actionLessBars( this, TQ_SLOT( lessBars() ), 0 );
_menu = new TDEPopupMenu( 0 );
_moreBars->plug( _menu ); _lessBars->plug( _menu );
- _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQT_SLOT( substyle() ), this );
+ _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQ_SLOT( substyle() ), this );
_substyle->plug( _menu );
_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
- connect( _artsactions, TQT_SIGNAL( styleNormal() ), this, TQT_SLOT( styleNormalBars() ) );
- connect( _artsactions, TQT_SIGNAL( styleFire() ), this, TQT_SLOT( styleFireBars() ) );
- connect( _artsactions, TQT_SIGNAL( styleLine() ), this, TQT_SLOT( styleLineBars() ) );
- connect( _artsactions, TQT_SIGNAL( styleLED() ), this, TQT_SLOT( styleLEDs() ) );
- connect( _artsactions, TQT_SIGNAL( styleAnalog() ), this, TQT_SLOT( styleAnalog() ) );
- connect( _artsactions, TQT_SIGNAL( styleSmall() ), this, TQT_SLOT( styleSmall() ) );
+ connect( _artsactions, TQ_SIGNAL( styleNormal() ), this, TQ_SLOT( styleNormalBars() ) );
+ connect( _artsactions, TQ_SIGNAL( styleFire() ), this, TQ_SLOT( styleFireBars() ) );
+ connect( _artsactions, TQ_SIGNAL( styleLine() ), this, TQ_SLOT( styleLineBars() ) );
+ connect( _artsactions, TQ_SIGNAL( styleLED() ), this, TQ_SLOT( styleLEDs() ) );
+ connect( _artsactions, TQ_SIGNAL( styleAnalog() ), this, TQ_SLOT( styleAnalog() ) );
+ connect( _artsactions, TQ_SIGNAL( styleSmall() ), this, TQ_SLOT( styleSmall() ) );
}
FFTScopeView::~FFTScopeView() {
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 00450f51..74a9ed6f 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -87,7 +87,7 @@ VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
, server( artsserver )
{
- connect( server, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( initaRtsConnections() ) );
+ connect( server, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( initaRtsConnections() ) );
/* if(server.isNull())
{
KMessageBox::error( 0, i18n("Connection to the soundserver failed - make sure that artsd is really running and that your tdelibs version is not older than tdemultimedia."));
@@ -136,7 +136,7 @@ void VControl::useOldVolumeBar(int old) {
void VControl::showFreeVerbView() {
if(!freeVerbView) {
freeVerbView = new FreeVerbView(server->server());
- connect(freeVerbView,TQT_SIGNAL(closed()),this,TQT_SLOT(showFreeVerbView()));
+ connect(freeVerbView,TQ_SIGNAL(closed()),this,TQ_SLOT(showFreeVerbView()));
} else {
delete freeVerbView;
freeVerbView = 0;
@@ -160,7 +160,7 @@ void MainWindow::toggleVolumeBar() {
MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( this ) ) {
kdDebug() << k_funcinfo << endl;
- connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
+ connect( kartsserver, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( serverRestarted() ) );
vc = new VControl( kartsserver, this );
setCentralWidget( vc );
@@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl;
( void ) artsactions->actionMidiManagerView();
( void ) artsactions->actionEnvironmentView();
( void ) artsactions->actionMediaTypesView();
- ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+ ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQ_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
showOldVolumeDisplay=
new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this,
- TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
- ( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+ TQ_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
+ ( void ) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit_artscontrol" );
createGUI("artscontrol.rc");
resize(20,300);
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 5ef0b828..f07a7b8f 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -135,11 +135,11 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
bbox->layout();
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index c3f32e41..4e92c000 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -115,21 +115,21 @@ MidiManagerView::MidiManagerView()
{
TQTimer *updatetimer = new TQTimer(this);
updatetimer->start(5000);
- connect(updatetimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateLists()));
+ connect(updatetimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateLists()));
widget = new MidiManagerWidget(this);
setCentralWidget(widget);
setCaption(i18n("MIDI Manager"));
setIcon( MainBarIcon( "artsfftscope", 32 ) );
- (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()),
+ (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQ_SLOT(addOSSMidiPort()),
actionCollection(), "add_oss_midi_port");
(void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
- TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
+ TQ_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
- (void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection());
- connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect()));
- connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect()));
+ (void) KStdAction::quit( this, TQ_SLOT(close()), actionCollection());
+ connect(widget->connectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConnect()));
+ connect(widget->disconnectButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisconnect()));
connectionWidget = new ConnectionWidget(this, widget->connectionFrame);
connectionWidget->setMinimumSize(60,10);
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 56686be6..5c20e2bf 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -80,13 +80,13 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQ_SLOT( help() ));
bbox->addStretch(1);
helpbutton->setAutoDefault( true );
helpbutton->setDefault( true );
TQPushButton *okbutton = bbox->addButton(KStdGuiItem::ok());
- connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), TQ_SLOT(accept() ) );
okbutton->setAutoDefault( true );
okbutton->setDefault( true );
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index 197d620d..4f21657d 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -63,10 +63,10 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
suspendButton= new TQPushButton(this, "suspendButton");
suspendButton->setText(i18n("&Suspend Now"));
l->addWidget(suspendButton);
- connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked()));
+ connect(suspendButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(suspendButtonClicked()));
artsPollStatusTimer= new TQTimer(this);
- connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()));
+ connect(artsPollStatusTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateStatus()));
artsPollStatusTimer->start(1000);
//l->activate();
show();
diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp
index 8fc4c037..386e12e3 100644
--- a/juk/advancedsearchdialog.cpp
+++ b/juk/advancedsearchdialog.cpp
@@ -82,17 +82,17 @@ AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName,
TQBoxLayout *l = new TQHBoxLayout(buttons, 0, 5);
KPushButton *clearButton = new KPushButton(KStdGuiItem::clear(), buttons);
- connect(clearButton, TQT_SIGNAL(clicked()), TQT_SLOT(clear()));
+ connect(clearButton, TQ_SIGNAL(clicked()), TQ_SLOT(clear()));
l->addWidget(clearButton);
l->addStretch(1);
m_moreButton = new KPushButton(i18n("More"), buttons);
- connect(m_moreButton, TQT_SIGNAL(clicked()), TQT_SLOT(more()));
+ connect(m_moreButton, TQ_SIGNAL(clicked()), TQ_SLOT(more()));
l->addWidget(m_moreButton);
m_fewerButton = new KPushButton(i18n("Fewer"), buttons);
- connect(m_fewerButton, TQT_SIGNAL(clicked()), TQT_SLOT(fewer()));
+ connect(m_fewerButton, TQ_SIGNAL(clicked()), TQ_SLOT(fewer()));
l->addWidget(m_fewerButton);
m_playlistNameLineEdit->setFocus();
diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp
index 2bcf43ca..f3b27616 100644
--- a/juk/artsplayer.cpp
+++ b/juk/artsplayer.cpp
@@ -84,7 +84,7 @@ void ArtsPlayer::play(const FileHandle &file)
m_playobject = m_factory->createPlayObject(m_currentURL, false);
if(m_playobject->object().isNull())
- connect(m_playobject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(playObjectCreated()));
+ connect(m_playobject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(playObjectCreated()));
else
playObjectCreated();
}
@@ -251,7 +251,7 @@ void ArtsPlayer::setupPlayer()
m_dispatcher = new KArtsDispatcher;
m_server = new KArtsServer;
setupArtsObjects();
- connect(m_server, TQT_SIGNAL(restartedServer()), TQT_SLOT(setupArtsObjects()));
+ connect(m_server, TQ_SIGNAL(restartedServer()), TQ_SLOT(setupArtsObjects()));
}
void ArtsPlayer::setupVolumeControl()
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 770ed92f..3cc0eb6a 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -230,12 +230,12 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
{
new TDEAction(i18n("Show Playing"), TDEShortcut(), ActionCollection::actions(), "showPlaying");
- connect(action("showPlaying"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowPlaying()));
+ connect(action("showPlaying"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowPlaying()));
- connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(aboutToShow()),
- this, TQT_SLOT(slotPopulateBackMenu()));
- connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotPlayFromBackMenu(int)));
+ connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQ_SIGNAL(aboutToShow()),
+ this, TQ_SLOT(slotPopulateBackMenu()));
+ connect(action<TDEToolBarPopupAction>("back")->popupMenu(), TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotPlayFromBackMenu(int)));
setSorting(-1); // Temporarily disable sorting to add items faster.
m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict(5001, false);
diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp
index 9c81126b..fc4fa7ed 100644
--- a/juk/coverdialog.cpp
+++ b/juk/coverdialog.cpp
@@ -89,7 +89,7 @@ void CoverDialog::show()
m_artists->setSorting(0);
- TQTimer::singleShot(0, this, TQT_SLOT(loadCovers()));
+ TQTimer::singleShot(0, this, TQ_SLOT(loadCovers()));
CoverDialogBase::show();
}
@@ -142,7 +142,7 @@ void CoverDialog::slotContextRequested(TQIconViewItem *item, const TQPoint &pt)
if(!menu) {
menu = new TDEPopupMenu(this);
- menu->insertItem(i18n("Remove Cover"), this, TQT_SLOT(removeSelectedCover()));
+ menu->insertItem(i18n("Remove Cover"), this, TQ_SLOT(removeSelectedCover()));
}
menu->popup(pt);
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index f3d81680..daed8164 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -84,7 +84,7 @@ DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
slotShouldDelete(shouldDelete());
- connect(m_widget->ddShouldDelete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShouldDelete(bool)));
+ connect(m_widget->ddShouldDelete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShouldDelete(bool)));
}
bool DeleteDialog::confirmDeleteList(const TQStringList &condemnedFiles)
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index 8a9e2a56..f8af3b85 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -39,10 +39,10 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis
m_base->directoryListView->setFullWidth(true);
- connect(m_base->addDirectoryButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotAddDirectory()));
- connect(m_base->removeDirectoryButton, TQT_SIGNAL(clicked()),
- TQT_SLOT(slotRemoveDirectory()));
+ connect(m_base->addDirectoryButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotAddDirectory()));
+ connect(m_base->removeDirectoryButton, TQ_SIGNAL(clicked()),
+ TQ_SLOT(slotRemoveDirectory()));
TQStringList::ConstIterator it = directories.begin();
for(; it != directories.end(); ++it)
diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp
index 336d1e3e..c6f155da 100644
--- a/juk/dynamicplaylist.cpp
+++ b/juk/dynamicplaylist.cpp
@@ -60,7 +60,7 @@ DynamicPlaylist::DynamicPlaylist(const PlaylistList &playlists,
for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it)
m_observers.append(new PlaylistDirtyObserver(this, *it));
- connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()), this, TQT_SLOT(slotSetDirty()));
+ connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()), this, TQ_SLOT(slotSetDirty()));
}
DynamicPlaylist::~DynamicPlaylist()
@@ -153,7 +153,7 @@ void DynamicPlaylist::updateItems()
PlaylistItemList newSiblings = siblings;
if(m_siblings != newSiblings) {
m_siblings = newSiblings;
- TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateItems()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateItems()));
}
}
diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp
index dc95baa1..bc2b4f01 100644
--- a/juk/exampleoptions.cpp
+++ b/juk/exampleoptions.cpp
@@ -55,12 +55,12 @@ ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) :
// Forward signals
- connect(m_options, TQT_SIGNAL(fileChanged()), TQT_SLOT(fileModeSelected()));
- connect(m_options, TQT_SIGNAL(dataChanged()), TQT_SIGNAL(dataChanged()));
- connect(m_options->m_exampleFile, TQT_SIGNAL(urlSelected(const TQString &)),
- this, TQT_SIGNAL(fileChanged(const TQString &)));
- connect(m_options->m_exampleFile, TQT_SIGNAL(returnPressed(const TQString &)),
- this, TQT_SIGNAL(fileChanged(const TQString &)));
+ connect(m_options, TQ_SIGNAL(fileChanged()), TQ_SLOT(fileModeSelected()));
+ connect(m_options, TQ_SIGNAL(dataChanged()), TQ_SIGNAL(dataChanged()));
+ connect(m_options->m_exampleFile, TQ_SIGNAL(urlSelected(const TQString &)),
+ this, TQ_SIGNAL(fileChanged(const TQString &)));
+ connect(m_options->m_exampleFile, TQ_SIGNAL(returnPressed(const TQString &)),
+ this, TQ_SIGNAL(fileChanged(const TQString &)));
}
void ExampleOptionsDialog::hideEvent(TQHideEvent *)
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 9476ea29..e5398fdf 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -248,11 +248,11 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
m_category->insertItem(category);
}
- connect(m_exampleDialog, TQT_SIGNAL(signalShown()), TQT_SLOT(exampleDialogShown()));
- connect(m_exampleDialog, TQT_SIGNAL(signalHidden()), TQT_SLOT(exampleDialogHidden()));
- connect(m_exampleDialog, TQT_SIGNAL(dataChanged()), TQT_SLOT(dataSelected()));
- connect(m_exampleDialog, TQT_SIGNAL(fileChanged(const TQString &)),
- this, TQT_SLOT(fileSelected(const TQString &)));
+ connect(m_exampleDialog, TQ_SIGNAL(signalShown()), TQ_SLOT(exampleDialogShown()));
+ connect(m_exampleDialog, TQ_SIGNAL(signalHidden()), TQ_SLOT(exampleDialogHidden()));
+ connect(m_exampleDialog, TQ_SIGNAL(dataChanged()), TQ_SLOT(dataSelected()));
+ connect(m_exampleDialog, TQ_SIGNAL(fileChanged(const TQString &)),
+ this, TQ_SLOT(fileSelected(const TQString &)));
exampleTextChanged();
}
@@ -347,9 +347,9 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
row.upButton->setFlat(true);
row.downButton->setFlat(true);
- upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
+ upMapper->connect(row.upButton, TQ_SIGNAL(clicked()), TQ_SLOT(map()));
upMapper->setMapping(row.upButton, id);
- downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
+ downMapper->connect(row.downButton, TQ_SIGNAL(clicked()), TQ_SLOT(map()));
downMapper->setMapping(row.downButton, id);
TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
@@ -359,11 +359,11 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
TQVBox *options = new TQVBox(frame);
row.enableButton = new KPushButton(i18n("Remove"), options);
- toggleMapper->connect(row.enableButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
+ toggleMapper->connect(row.enableButton, TQ_SIGNAL(clicked()), TQ_SLOT(map()));
toggleMapper->setMapping(row.enableButton, id);
row.optionsButton = new KPushButton(i18n("Options"), options);
- mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
+ mapper->connect(row.optionsButton, TQ_SIGNAL(clicked()), TQ_SLOT(map()));
mapper->setMapping(row.optionsButton, id);
row.widget->show();
@@ -448,7 +448,7 @@ bool FileRenamerWidget::removeRow(unsigned id)
// We can insert another row now, make sure GUI is updated to match.
m_insertCategory->setEnabled(true);
- TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged()));
+ TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged()));
return true;
}
@@ -462,8 +462,8 @@ void FileRenamerWidget::addFolderSeparatorCheckbox()
l->addWidget(cb, 0, AlignCenter);
cb->setChecked(false);
- connect(cb, TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(exampleTextChanged()));
+ connect(cb, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(exampleTextChanged()));
temp->show();
}
@@ -485,10 +485,10 @@ void FileRenamerWidget::createTagRows()
upMapper = new TQSignalMapper(this, "up button mapper");
downMapper = new TQSignalMapper(this, "down button mapper");
- connect(mapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(showCategoryOption(int)));
- connect(toggleMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(slotRemoveRow(int)));
- connect(upMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemUp(int)));
- connect(downMapper, TQT_SIGNAL(mapped(int)), TQT_SLOT(moveItemDown(int)));
+ connect(mapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(showCategoryOption(int)));
+ connect(toggleMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(slotRemoveRow(int)));
+ connect(upMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemUp(int)));
+ connect(downMapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(moveItemDown(int)));
m_mainFrame = new TQVBox(m_mainView->viewport());
m_mainFrame->setMargin(10);
@@ -687,7 +687,7 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction)
layout->insertWidget(2 * pos, w);
layout->invalidate();
- TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged()));
+ TQTimer::singleShot(0, this, TQ_SLOT(exampleTextChanged()));
}
unsigned FileRenamerWidget::idOfPosition(unsigned position) const
diff --git a/juk/folderplaylist.cpp b/juk/folderplaylist.cpp
index 71934359..e12e0746 100644
--- a/juk/folderplaylist.cpp
+++ b/juk/folderplaylist.cpp
@@ -26,7 +26,7 @@ FolderPlaylist::FolderPlaylist(PlaylistCollection *collection, const TQString &f
Playlist(collection, name, "folder"),
m_folder(folder)
{
- TQTimer::singleShot(0, this, TQT_SLOT(slotReload()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotReload()));
}
FolderPlaylist::~FolderPlaylist()
@@ -42,7 +42,7 @@ TQString FolderPlaylist::folder() const
void FolderPlaylist::setFolder(const TQString &s)
{
m_folder = s;
- TQTimer::singleShot(0, this, TQT_SLOT(slotReload()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotReload()));
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp
index 26bd8aef..464e7486 100644
--- a/juk/gstreamerplayer.cpp
+++ b/juk/gstreamerplayer.cpp
@@ -193,7 +193,7 @@ static GstBusSyncReply messageHandler(GstBus *, GstMessage *message, gpointer da
{
if(GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) {
GStreamerPlayer *player = static_cast<GStreamerPlayer *>(data);
- TQTimer::singleShot(0, player, TQT_SLOT(stop()));
+ TQTimer::singleShot(0, player, TQ_SLOT(stop()));
}
gst_message_unref(message);
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index 47e6fddb..85d01c0c 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -31,8 +31,8 @@ HistoryPlaylist::HistoryPlaylist(PlaylistCollection *collection) :
setAllowDuplicates(true);
m_timer = new TQTimer(this);
- connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotAddPlaying()));
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateNewItem()));
+ connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotAddPlaying()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateNewItem()));
}
HistoryPlaylist::~HistoryPlaylist()
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 734d39b7..ad35266c 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -71,8 +71,8 @@ JuK::JuK(TQWidget *parent, const char *name) :
createDirs();
SplashScreen::finishedLoading();
- TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache()));
- TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs()));
+ TQTimer::singleShot(0, CollectionList::instance(), TQ_SLOT(slotCheckCache()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotProcessArgs()));
m_sliderAction->slotUpdateOrientation();
}
@@ -99,8 +99,8 @@ void JuK::setupLayout()
setCentralWidget(m_splitter);
m_statusLabel = new StatusLabel(m_splitter->playlist(), statusBar());
- connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()),
- m_statusLabel, TQT_SLOT(updateData()));
+ connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()),
+ m_statusLabel, TQ_SLOT(updateData()));
statusBar()->addWidget(m_statusLabel, 1);
PlayerManager::instance()->setStatusLabel(m_statusLabel);
@@ -112,15 +112,15 @@ void JuK::setupActions()
{
ActionCollection::actions()->setWidget(this);
- KStdAction::quit(this, TQT_SLOT(slotQuit()), ActionCollection::actions());
- KStdAction::undo(this, TQT_SLOT(slotUndo()), ActionCollection::actions());
- KStdAction::cut(kapp, TQT_SLOT(cut()), ActionCollection::actions());
- KStdAction::copy(kapp, TQT_SLOT(copy()), ActionCollection::actions());
- KStdAction::paste(kapp, TQT_SLOT(paste()), ActionCollection::actions());
- KStdAction::clear(kapp, TQT_SLOT(clear()), ActionCollection::actions());
- KStdAction::selectAll(kapp, TQT_SLOT(selectAll()), ActionCollection::actions());
+ KStdAction::quit(this, TQ_SLOT(slotQuit()), ActionCollection::actions());
+ KStdAction::undo(this, TQ_SLOT(slotUndo()), ActionCollection::actions());
+ KStdAction::cut(kapp, TQ_SLOT(cut()), ActionCollection::actions());
+ KStdAction::copy(kapp, TQ_SLOT(copy()), ActionCollection::actions());
+ KStdAction::paste(kapp, TQ_SLOT(paste()), ActionCollection::actions());
+ KStdAction::clear(kapp, TQ_SLOT(clear()), ActionCollection::actions());
+ KStdAction::selectAll(kapp, TQ_SLOT(selectAll()), ActionCollection::actions());
- new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
+ new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQ_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
actionMenu->setDelayed(false);
@@ -135,15 +135,15 @@ void JuK::setupActions()
ka = new TDERadioAction(i18n("Use &Album Random Play"), "roll", 0, ActionCollection::actions(), "albumRandomPlay");
ka->setExclusiveGroup("randomPlayGroup");
- connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
+ connect(ka, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckAlbumNextAction(bool)));
actionMenu->insert(ka);
- new TDEAction(i18n("&Play"), "media-playback-start", 0, m_player, TQT_SLOT(play()), ActionCollection::actions(), "play");
- new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQT_SLOT(pause()), ActionCollection::actions(), "pause");
- new TDEAction(i18n("&Stop"), "media-playback-stop", 0, m_player, TQT_SLOT(stop()), ActionCollection::actions(), "stop");
+ new TDEAction(i18n("&Play"), "media-playback-start", 0, m_player, TQ_SLOT(play()), ActionCollection::actions(), "play");
+ new TDEAction(i18n("P&ause"), "media-playback-pause", 0, m_player, TQ_SLOT(pause()), ActionCollection::actions(), "pause");
+ new TDEAction(i18n("&Stop"), "media-playback-stop", 0, m_player, TQ_SLOT(stop()), ActionCollection::actions(), "stop");
- new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQT_SLOT(back()), ActionCollection::actions(), "back");
- new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+ new TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), m_player, TQ_SLOT(back()), ActionCollection::actions(), "back");
+ new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), m_player, TQ_SLOT(forward()), ActionCollection::actions(), "forward");
new TDEToggleAction(i18n("&Loop Playlist"), 0, TDEShortcut(), ActionCollection::actions(), "loopPlaylist");
TDEToggleAction *resizeColumnAction =
new TDEToggleAction(i18n("&Resize Playlist Columns Manually"),
@@ -152,12 +152,12 @@ void JuK::setupActions()
// the following are not visible by default
- new TDEAction(i18n("Mute"), "mute", 0, m_player, TQT_SLOT(mute()), ActionCollection::actions(), "mute");
- new TDEAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
- new TDEAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
- new TDEAction(i18n("Play / Pause"), "playPause", 0, m_player, TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
- new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
- new TDEAction(i18n("Seek Back"), "seekBack", 0, m_player, TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
+ new TDEAction(i18n("Mute"), "mute", 0, m_player, TQ_SLOT(mute()), ActionCollection::actions(), "mute");
+ new TDEAction(i18n("Volume Up"), "volumeUp", 0, m_player, TQ_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
+ new TDEAction(i18n("Volume Down"), "volumeDown", 0, m_player, TQ_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
+ new TDEAction(i18n("Play / Pause"), "playPause", 0, m_player, TQ_SLOT(playPause()), ActionCollection::actions(), "playPause");
+ new TDEAction(i18n("Seek Forward"), "seekForward", 0, m_player, TQ_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
+ new TDEAction(i18n("Seek Back"), "seekBack", 0, m_player, TQ_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
//////////////////////////////////////////////////
// settings menu
@@ -179,8 +179,8 @@ void JuK::setupActions()
new TDEToggleAction(i18n("Save &Play Queue on Exit"),
TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks");
- connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotToggleSystemTray(bool)));
+ connect(m_toggleSystemTrayAction, TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotToggleSystemTray(bool)));
m_outputSelectAction = PlayerManager::playerSelectAction(ActionCollection::actions());
@@ -188,13 +188,13 @@ void JuK::setupActions()
if(m_outputSelectAction)
m_outputSelectAction->setCurrentItem(0);
- new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()),
+ new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQ_SLOT(slotConfigureTagGuesser()),
ActionCollection::actions(), "tagGuesserConfig");
- new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()),
+ new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQ_SLOT(slotConfigureFileRenamer()),
ActionCollection::actions(), "fileRenamerConfig");
- KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), ActionCollection::actions());
+ KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), ActionCollection::actions());
//////////////////////////////////////////////////
// just in the toolbar
@@ -213,7 +213,7 @@ void JuK::setupSystemTray()
m_toggleDockOnCloseAction->setEnabled(true);
m_togglePopupsAction->setEnabled(true);
- connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit()));
+ connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotAboutToQuit()));
}
else {
m_systemTray = 0;
@@ -226,18 +226,18 @@ void JuK::setupGlobalAccels()
{
m_accel = new TDEGlobalAccel(this);
- KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQT_SLOT(activate()));
- KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQT_SLOT(slotShowHide()));
- KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQT_SLOT(activate()));
+ KeyDialog::insert(m_accel, "Play", i18n("Play"), action("play"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "PlayPause", i18n("Play / Pause"), action("playPause"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "Stop", i18n("Stop Playing"), action("stop"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "Back", i18n("Back"), action("back"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "Forward", i18n("Forward"), action("forward"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "SeekBack", i18n("Seek Back"), action("seekBack"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "SeekForward", i18n("Seek Forward"), action("seekForward"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "VolumeUp", i18n("Volume Up"), action("volumeUp"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "VolumeDown", i18n("Volume Down"), action("volumeDown"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "Mute", i18n("Mute"), action("mute"), TQ_SLOT(activate()));
+ KeyDialog::insert(m_accel, "ShowHide", i18n("Show / Hide"), this, TQ_SLOT(slotShowHide()));
+ KeyDialog::insert(m_accel, "ForwardAlbum", i18n("Play Next Album"), action("forwardAlbum"), TQ_SLOT(activate()));
m_accel->setConfigGroup("Shortcuts");
m_accel->readSettings();
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index 91ad104a..36f7eadb 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -62,7 +62,7 @@ class PlaylistAction : public TDEAction
typedef TQMap<const Playlist *, TQObject *> PlaylistRecipientMap;
/**
- * Defines a TQObject to call (using the m_slot SLOT) when an action is
+ * Defines a TQObject to call (using the m_slot TQ_SLOT) when an action is
* emitted from a Playlist.
*/
void addCallMapping(const Playlist *p, TQObject *obj)
@@ -87,9 +87,9 @@ class PlaylistAction : public TDEAction
// Invoke the slot using some trickery.
// XXX: Use the TQMetaObject to do this in TQt 4.
- connect(this, TQT_SIGNAL(activated()), recipient, m_slot);
+ connect(this, TQ_SIGNAL(activated()), recipient, m_slot);
emit(activated());
- disconnect(this, TQT_SIGNAL(activated()), recipient, m_slot);
+ disconnect(this, TQ_SIGNAL(activated()), recipient, m_slot);
}
private:
@@ -108,7 +108,7 @@ TDEAction *K3bExporter::action()
"export_to_k3b",
i18n("Add Selected Items to Audio or Data CD"),
SmallIconSet("k3b"),
- TQT_SLOT(slotExport())
+ TQ_SLOT(slotExport())
);
m_action->setShortcutConfigurable(false);
@@ -276,7 +276,7 @@ TDEAction *K3bPlaylistExporter::action()
SmallIconSet("k3b"),
0,
this,
- TQT_SLOT(slotExport()),
+ TQ_SLOT(slotExport()),
actions(),
"export_playlist_to_k3b"
);
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index bc1d13a9..07584657 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -99,7 +99,7 @@ KeyDialog::KeyDialog(TDEGlobalAccel *keys, TDEActionCollection *actionCollection
new TQRadioButton(i18n("&No keys"), m_group);
new TQRadioButton(i18n("&Standard keys"), m_group);
new TQRadioButton(i18n("&Multimedia keys"), m_group);
- connect(m_group, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotKeys(int)));
+ connect(m_group, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotKeys(int)));
TQWhatsThis::add(m_group,
i18n("Here you can select the keys used as global shortcuts to control the player"));
@@ -127,7 +127,7 @@ void KeyDialog::newDialog(TDEGlobalAccel *keys, TDEActionCollection *actionColle
m_widgetStack->raiseWidget(m_pKeyChooser);
m_group->setButton(selectedButton);
- connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotDefault()));
+ connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotDefault()));
}
int KeyDialog::configure()
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 838aadd2..6c3110fa 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -67,8 +67,8 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c
setStretchFactor(new Line(this), 0);
setStretchFactor(new HistoryItem(this), 1);
- connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotUpdate()));
- connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotUpdate()));
+ connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotUpdate()));
+ connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotUpdate()));
hide();
}
@@ -230,14 +230,14 @@ TrackItem::TrackItem(NowPlaying *parent) :
layout->addWidget(m_label);
layout->addStretch();
- connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this,
- TQT_SLOT(slotOpenLink(const TQString &)));
+ connect(m_label, TQ_SIGNAL(linkClicked(const TQString &)), this,
+ TQ_SLOT(slotOpenLink(const TQString &)));
}
void TrackItem::update(const FileHandle &file)
{
m_file = file;
- TQTimer::singleShot(0, this, TQT_SLOT(slotUpdate()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotUpdate()));
}
void TrackItem::slotOpenLink(const TQString &link)
@@ -297,7 +297,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
setText(TQString("<b>%1</b>").arg(i18n("History")));
m_timer = new TQTimer(this);
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAddPlaying()));
}
void HistoryItem::update(const FileHandle &file)
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index 044198c3..8fe33f72 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -642,12 +642,12 @@ void PlayerManager::setup()
m_sliderAction = action<SliderAction>("trackPositionAction");
- connect(m_sliderAction, TQT_SIGNAL(signalPositionChanged(int)),
- this, TQT_SLOT(seekPosition(int)));
- connect(m_sliderAction->trackPositionSlider(), TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotUpdateTime(int)));
- connect(m_sliderAction, TQT_SIGNAL(signalVolumeChanged(int)),
- this, TQT_SLOT(slotSetVolume(int)));
+ connect(m_sliderAction, TQ_SIGNAL(signalPositionChanged(int)),
+ this, TQ_SLOT(seekPosition(int)));
+ connect(m_sliderAction->trackPositionSlider(), TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotUpdateTime(int)));
+ connect(m_sliderAction, TQ_SIGNAL(signalVolumeChanged(int)),
+ this, TQ_SLOT(slotSetVolume(int)));
// Call this method manually to avoid warnings.
@@ -655,7 +655,7 @@ void PlayerManager::setup()
if(outputAction) {
setOutput(static_cast<TDESelectAction *>(outputAction)->currentText());
- connect(outputAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSetOutput(const TQString &)));
+ connect(outputAction, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSetOutput(const TQString &)));
}
else
m_player = createPlayer();
@@ -673,7 +673,7 @@ void PlayerManager::setup()
m_player->setVolume(volume);
m_timer = new TQTimer(this, "play timer");
- connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollPlay()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollPlay()));
}
TQString PlayerManager::randomPlayMode() const
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index cf20a415..2895542d 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -1142,7 +1142,7 @@ bool Playlist::eventFilter(TQObject *watched, TQEvent *e)
}
if(!manualResize() && m_widthsDirty)
- TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateColumnWidths()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateColumnWidths()));
break;
}
default:
@@ -1561,25 +1561,25 @@ void Playlist::polish()
adjustColumn(i);
}
- connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumnVisible(int)));
+ connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumnVisible(int)));
- connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int)));
- connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)),
- this, TQT_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int)));
- connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- this, TQT_SLOT(slotPlayCurrent()));
- connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)),
- this, TQT_SLOT(slotPlayCurrent()));
+ connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(slotShowRMBMenu(TQListViewItem *, const TQPoint &, int)));
+ connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)),
+ this, TQ_SLOT(slotInlineEditDone(TQListViewItem *, const TQString &, int)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ this, TQ_SLOT(slotPlayCurrent()));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)),
+ this, TQ_SLOT(slotPlayCurrent()));
- connect(header(), TQT_SIGNAL(sizeChange(int, int, int)),
- this, TQT_SLOT(slotColumnSizeChanged(int, int, int)));
+ connect(header(), TQ_SIGNAL(sizeChange(int, int, int)),
+ this, TQ_SLOT(slotColumnSizeChanged(int, int, int)));
- connect(renameLineEdit(), TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
- this, TQT_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion)));
+ connect(renameLineEdit(), TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+ this, TQ_SLOT(slotInlineCompletionModeChanged(TDEGlobalSettings::Completion)));
- connect(action("resizeColumnsManually"), TQT_SIGNAL(activated()),
- this, TQT_SLOT(slotColumnResizeModeChanged()));
+ connect(action("resizeColumnsManually"), TQ_SIGNAL(activated()),
+ this, TQ_SLOT(slotColumnResizeModeChanged()));
if(action<TDEToggleAction>("resizeColumnsManually")->isChecked())
setHScrollBarMode(Auto);
@@ -1653,13 +1653,13 @@ void Playlist::setup()
{
setItemMargin(3);
- connect(header(), TQT_SIGNAL(indexChange(int, int, int)), this, TQT_SLOT(slotColumnOrderChanged(int, int, int)));
+ connect(header(), TQ_SIGNAL(indexChange(int, int, int)), this, TQ_SLOT(slotColumnOrderChanged(int, int, int)));
- connect(m_fetcher, TQT_SIGNAL(signalCoverChanged(int)), this, TQT_SLOT(slotCoverChanged(int)));
+ connect(m_fetcher, TQ_SIGNAL(signalCoverChanged(int)), this, TQ_SLOT(slotCoverChanged(int)));
// Prevent list of selected items from changing while internet search is in
// progress.
- connect(this, TQT_SIGNAL(selectionChanged()), m_fetcher, TQT_SLOT(abortSearch()));
+ connect(this, TQ_SIGNAL(selectionChanged()), m_fetcher, TQ_SLOT(abortSearch()));
setSorting(1);
}
@@ -2078,7 +2078,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
m_rmbMenu = new TDEPopupMenu(this);
m_rmbUpcomingID = m_rmbMenu->insertItem(SmallIcon("today"),
- i18n("Add to Play Queue"), this, TQT_SLOT(slotAddToUpcoming()));
+ i18n("Add to Play Queue"), this, TQ_SLOT(slotAddToUpcoming()));
m_rmbMenu->insertSeparator();
if(!readOnly()) {
@@ -2092,7 +2092,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
action("edit_copy")->plug(m_rmbMenu);
m_rmbEditID = m_rmbMenu->insertItem(
- i18n("Edit"), this, TQT_SLOT(slotRenameTag()));
+ i18n("Edit"), this, TQ_SLOT(slotRenameTag()));
action("refresh")->plug(m_rmbMenu);
action("removeItem")->plug(m_rmbMenu);
@@ -2107,7 +2107,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
m_rmbMenu->insertSeparator();
m_rmbMenu->insertItem(
- SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQT_SLOT(slotCreateGroup()));
+ SmallIcon("folder-new"), i18n("Create Playlist From Selected Items..."), this, TQ_SLOT(slotCreateGroup()));
K3bExporter *exporter = new K3bExporter(this);
TDEAction *k3bAction = exporter->action();
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index f0450166..a8a09018 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -120,36 +120,36 @@ PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
raise(CollectionList::instance());
viewModeAction->plug(m_contextMenu);
- connect(viewModeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetViewMode(int)));
+ connect(viewModeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetViewMode(int)));
- connect(this, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotPlaylistChanged()));
+ connect(this, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotPlaylistChanged()));
- connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
- this, TQT_SLOT(slotDoubleClicked()));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+ this, TQ_SLOT(slotDoubleClicked()));
- connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int)));
+ connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(slotShowContextMenu(TQListViewItem *, const TQPoint &, int)));
TagTransactionManager *tagManager = TagTransactionManager::instance();
- connect(tagManager, TQT_SIGNAL(signalAboutToModifyTags()), TQT_SLOT(slotFreezePlaylists()));
- connect(tagManager, TQT_SIGNAL(signalDoneModifyingTags()), TQT_SLOT(slotUnfreezePlaylists()));
+ connect(tagManager, TQ_SIGNAL(signalAboutToModifyTags()), TQ_SLOT(slotFreezePlaylists()));
+ connect(tagManager, TQ_SIGNAL(signalDoneModifyingTags()), TQ_SLOT(slotUnfreezePlaylists()));
setupUpcomingPlaylist();
- connect(CollectionList::instance(), TQT_SIGNAL(signalNewTag(const TQString &, unsigned)),
- this, TQT_SLOT(slotAddItem(const TQString &, unsigned)));
- connect(CollectionList::instance(), TQT_SIGNAL(signalRemovedTag(const TQString &, unsigned)),
- this, TQT_SLOT(slotRemoveItem(const TQString &, unsigned)));
+ connect(CollectionList::instance(), TQ_SIGNAL(signalNewTag(const TQString &, unsigned)),
+ this, TQ_SLOT(slotAddItem(const TQString &, unsigned)));
+ connect(CollectionList::instance(), TQ_SIGNAL(signalRemovedTag(const TQString &, unsigned)),
+ this, TQ_SLOT(slotRemoveItem(const TQString &, unsigned)));
- TQTimer::singleShot(0, object(), TQT_SLOT(slotScanFolders()));
+ TQTimer::singleShot(0, object(), TQ_SLOT(slotScanFolders()));
enableDirWatch(true);
// Auto-save playlists after 10 minutes
- TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists()));
+ TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists()));
m_showTimer = new TQTimer(this);
- connect(m_showTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotShowDropTarget()));
+ connect(m_showTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotShowDropTarget()));
}
PlaylistBox::~PlaylistBox()
@@ -232,8 +232,8 @@ void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName)
void PlaylistBox::setupPlaylist(Playlist *playlist, const TQString &iconName, Item *parentItem)
{
- connect(playlist, TQT_SIGNAL(signalPlaylistItemsDropped(Playlist *)),
- TQT_SLOT(slotPlaylistItemsDropped(Playlist *)));
+ connect(playlist, TQ_SIGNAL(signalPlaylistItemsDropped(Playlist *)),
+ TQ_SLOT(slotPlaylistItemsDropped(Playlist *)));
PlaylistCollection::setupPlaylist(playlist, iconName);
@@ -375,7 +375,7 @@ void PlaylistBox::slotSavePlaylists()
Cache::savePlaylists(l);
CoverManager::saveCovers();
- TQTimer::singleShot(600000, this, TQT_SLOT(slotSavePlaylists()));
+ TQTimer::singleShot(600000, this, TQ_SLOT(slotSavePlaylists()));
}
void PlaylistBox::slotShowDropTarget()
@@ -770,11 +770,11 @@ void PlaylistBox::Item::init()
list->addNameToDict(m_text);
if(m_playlist) {
- connect(m_playlist, TQT_SIGNAL(signalNameChanged(const TQString &)),
- this, TQT_SLOT(slotSetName(const TQString &)));
- connect(m_playlist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(deleteLater()));
- connect(m_playlist, TQT_SIGNAL(signalEnableDirWatch(bool)),
- list->object(), TQT_SLOT(slotEnableDirWatch(bool)));
+ connect(m_playlist, TQ_SIGNAL(signalNameChanged(const TQString &)),
+ this, TQ_SLOT(slotSetName(const TQString &)));
+ connect(m_playlist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(deleteLater()));
+ connect(m_playlist, TQ_SIGNAL(signalEnableDirWatch(bool)),
+ list->object(), TQ_SLOT(slotEnableDirWatch(bool)));
}
if(m_playlist == CollectionList::instance()) {
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index c1aca5aa..1d96e025 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -670,8 +670,8 @@ void PlaylistCollection::setupPlaylist(Playlist *playlist, const TQString &)
if(!playlist->name().isNull())
m_playlistNames.insert(playlist->name());
- TQObject::connect(playlist, TQT_SIGNAL(selectionChanged()),
- object(), TQT_SIGNAL(signalSelectedItemsChanged()));
+ TQObject::connect(playlist, TQ_SIGNAL(selectionChanged()),
+ object(), TQ_SIGNAL(signalSelectedItemsChanged()));
}
bool PlaylistCollection::importPlaylists() const
@@ -710,12 +710,12 @@ void PlaylistCollection::enableDirWatch(bool enable)
m_dirLister.disconnect(object());
if(enable) {
- TQObject::connect(&m_dirLister, TQT_SIGNAL(newItems(const KFileItemList &)),
- object(), TQT_SLOT(slotNewItems(const KFileItemList &)));
- TQObject::connect(&m_dirLister, TQT_SIGNAL(refreshItems(const KFileItemList &)),
- collection, TQT_SLOT(slotRefreshItems(const KFileItemList &)));
- TQObject::connect(&m_dirLister, TQT_SIGNAL(deleteItem(KFileItem *)),
- collection, TQT_SLOT(slotDeleteItem(KFileItem *)));
+ TQObject::connect(&m_dirLister, TQ_SIGNAL(newItems(const KFileItemList &)),
+ object(), TQ_SLOT(slotNewItems(const KFileItemList &)));
+ TQObject::connect(&m_dirLister, TQ_SIGNAL(refreshItems(const KFileItemList &)),
+ collection, TQ_SLOT(slotRefreshItems(const KFileItemList &)));
+ TQObject::connect(&m_dirLister, TQ_SIGNAL(deleteItem(KFileItem *)),
+ collection, TQ_SLOT(slotDeleteItem(KFileItem *)));
}
}
@@ -842,11 +842,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
menu = new TDEActionMenu(i18n("&New"), "document-new", actions(), "file_new");
- menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()),
+ menu->insert(createAction(i18n("&Empty Playlist..."), TQ_SLOT(slotCreatePlaylist()),
"newPlaylist", "window-new", "CTRL+n"));
- menu->insert(createAction(i18n("&Search Playlist..."), TQT_SLOT(slotCreateSearchPlaylist()),
+ menu->insert(createAction(i18n("&Search Playlist..."), TQ_SLOT(slotCreateSearchPlaylist()),
"newSearchPlaylist", "edit-find", "CTRL+f"));
- menu->insert(createAction(i18n("Playlist From &Folder..."), TQT_SLOT(slotCreateFolderPlaylist()),
+ menu->insert(createAction(i18n("Playlist From &Folder..."), TQ_SLOT(slotCreateFolderPlaylist()),
"newDirectoryPlaylist", "document-open", "CTRL+d"));
// Guess tag info menu
@@ -855,47 +855,47 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag");
menu->setIconSet(SmallIconSet("wizard"));
- menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()),
+ menu->insert(createAction(i18n("From &File Name"), TQ_SLOT(slotGuessTagFromFile()),
"guessTagFile", "fileimport", "CTRL+g"));
- menu->insert(createAction(i18n("From &Internet"), TQT_SLOT(slotGuessTagFromInternet()),
+ menu->insert(createAction(i18n("From &Internet"), TQ_SLOT(slotGuessTagFromInternet()),
"guessTagInternet", "connect_established", "CTRL+i"));
#else
- createAction(i18n("Guess Tag Information From &File Name"), TQT_SLOT(slotGuessTagFromFile()),
+ createAction(i18n("Guess Tag Information From &File Name"), TQ_SLOT(slotGuessTagFromFile()),
"guessTag", "fileimport", "CTRL+f");
#endif
- createAction(i18n("Play First Track"),TQT_SLOT(slotPlayFirst()), "playFirst");
- createAction(i18n("Play Next Album"), TQT_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next");
+ createAction(i18n("Play First Track"),TQ_SLOT(slotPlayFirst()), "playFirst");
+ createAction(i18n("Play Next Album"), TQ_SLOT(slotPlayNextAlbum()), "forwardAlbum", "next");
- createAction(i18n("Open..."), TQT_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o");
- createAction(i18n("Add &Folder..."), TQT_SLOT(slotAddFolder()), "openDirectory", "document-open");
- createAction(i18n("&Rename..."), TQT_SLOT(slotRename()), "renamePlaylist", "lineedit");
- createAction(i18n("D&uplicate..."), TQT_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy");
- createAction(i18n("Save"), TQT_SLOT(slotSave()), "file_save", "document-save", "CTRL+s");
- createAction(i18n("Save As..."), TQT_SLOT(slotSaveAs()), "file_save_as", "document-save-as");
- createAction(i18n("R&emove"), TQT_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash");
- createAction(i18n("Reload"), TQT_SLOT(slotReload()), "reloadPlaylist", "reload");
- createAction(i18n("Edit Search..."), TQT_SLOT(slotEditSearch()), "editSearch", "edit-clear");
+ createAction(i18n("Open..."), TQ_SLOT(slotOpen()), "file_open", "document-open", "CTRL+o");
+ createAction(i18n("Add &Folder..."), TQ_SLOT(slotAddFolder()), "openDirectory", "document-open");
+ createAction(i18n("&Rename..."), TQ_SLOT(slotRename()), "renamePlaylist", "lineedit");
+ createAction(i18n("D&uplicate..."), TQ_SLOT(slotDuplicate()), "duplicatePlaylist", "edit-copy");
+ createAction(i18n("Save"), TQ_SLOT(slotSave()), "file_save", "document-save", "CTRL+s");
+ createAction(i18n("Save As..."), TQ_SLOT(slotSaveAs()), "file_save_as", "document-save-as");
+ createAction(i18n("R&emove"), TQ_SLOT(slotRemove()), "deleteItemPlaylist", "edittrash");
+ createAction(i18n("Reload"), TQ_SLOT(slotReload()), "reloadPlaylist", "reload");
+ createAction(i18n("Edit Search..."), TQ_SLOT(slotEditSearch()), "editSearch", "edit-clear");
- createAction(i18n("&Delete"), TQT_SLOT(slotRemoveItems()), "removeItem", "edit-delete");
- createAction(i18n("Refresh"), TQT_SLOT(slotRefreshItems()), "refresh", "reload");
- createAction(i18n("&Rename File"), TQT_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r");
+ createAction(i18n("&Delete"), TQ_SLOT(slotRemoveItems()), "removeItem", "edit-delete");
+ createAction(i18n("Refresh"), TQ_SLOT(slotRefreshItems()), "refresh", "reload");
+ createAction(i18n("&Rename File"), TQ_SLOT(slotRenameItems()), "renameFile", "document-save-as", "CTRL+r");
menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
menu->setIconSet(SmallIconSet("image-x-generic"));
menu->insert(createAction(i18n("&View Cover"),
- TQT_SLOT(slotViewCovers()), "viewCover", "viewmag"));
+ TQ_SLOT(slotViewCovers()), "viewCover", "viewmag"));
menu->insert(createAction(i18n("Get Cover From &File..."),
- TQT_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f"));
+ TQ_SLOT(slotAddLocalCover()), "addCover", "fileimport", "CTRL+SHIFT+f"));
// Do not rename googleCover for backward compatibility
menu->insert(createAction(i18n("Get Cover From &Internet..."),
- TQT_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g"));
+ TQ_SLOT(slotAddInternetCover()), "googleCover", "connect_established", "CTRL+SHIFT+g"));
menu->insert(createAction(i18n("&Delete Cover"),
- TQT_SLOT(slotRemoveCovers()), "removeCover", "edit-delete"));
+ TQ_SLOT(slotRemoveCovers()), "removeCover", "edit-delete"));
menu->insert(createAction(i18n("Show Cover &Manager"),
- TQT_SLOT(slotShowCoverManager()), "showCoverManager"));
+ TQ_SLOT(slotShowCoverManager()), "showCoverManager"));
TDEToggleAction *historyAction =
new TDEToggleAction(i18n("Show &History"), "history", 0, actions(), "showHistory");
@@ -905,10 +905,10 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming");
upcomingAction->setCheckedState(i18n("Hide &Play Queue"));
- connect(action<TDEToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool)));
- connect(action<TDEToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool)));
+ connect(action<TDEToggleAction>("showHistory"), TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotSetHistoryPlaylistEnabled(bool)));
+ connect(action<TDEToggleAction>("showUpcoming"), TQ_SIGNAL(toggled(bool)),
+ this, TQ_SLOT(slotSetUpcomingPlaylistEnabled(bool)));
}
TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text,
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index a55e4747..d1eff928 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -121,7 +121,7 @@ void PlaylistSplitter::setupActions()
new TDEToggleAction(i18n("Show &Search Bar"), "filefind", 0, ActionCollection::actions(), "showSearch");
showSearch->setCheckedState(i18n("Hide &Search Bar"));
- new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
+ new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQ_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
}
void PlaylistSplitter::setupLayout()
@@ -140,7 +140,7 @@ void PlaylistSplitter::setupLayout()
m_playlistStack = new TQWidgetStack(top, "playlistStack");
m_playlistStack->installEventFilter(this);
- connect(m_playlistStack, TQT_SIGNAL(aboutToShow(TQWidget *)), this, TQT_SLOT(slotPlaylistChanged(TQWidget *)));
+ connect(m_playlistStack, TQ_SIGNAL(aboutToShow(TQWidget *)), this, TQ_SLOT(slotPlaylistChanged(TQWidget *)));
m_editor = new TagEditor(editorSplitter, "tagEditor");
@@ -152,31 +152,31 @@ void PlaylistSplitter::setupLayout()
m_playlistBox = new PlaylistBox(this, m_playlistStack, "playlistBox");
- connect(m_playlistBox->object(), TQT_SIGNAL(signalSelectedItemsChanged()),
- this, TQT_SLOT(slotPlaylistSelectionChanged()));
- connect(m_playlistBox, TQT_SIGNAL(signalPlaylistDestroyed(Playlist *)),
- m_editor, TQT_SLOT(slotPlaylistDestroyed(Playlist *)));
+ connect(m_playlistBox->object(), TQ_SIGNAL(signalSelectedItemsChanged()),
+ this, TQ_SLOT(slotPlaylistSelectionChanged()));
+ connect(m_playlistBox, TQ_SIGNAL(signalPlaylistDestroyed(Playlist *)),
+ m_editor, TQ_SLOT(slotPlaylistDestroyed(Playlist *)));
moveToFirst(m_playlistBox);
- connect(CollectionList::instance(), TQT_SIGNAL(signalCollectionChanged()),
- m_editor, TQT_SLOT(slotUpdateCollection()));
+ connect(CollectionList::instance(), TQ_SIGNAL(signalCollectionChanged()),
+ m_editor, TQ_SLOT(slotUpdateCollection()));
NowPlaying *nowPlaying = new NowPlaying(top, m_playlistBox);
// Create the search widget -- this must be done after the CollectionList is created.
m_searchWidget = new SearchWidget(top, "searchWidget");
- connect(m_searchWidget, TQT_SIGNAL(signalQueryChanged()),
- this, TQT_SLOT(slotShowSearchResults()));
- connect(m_searchWidget, TQT_SIGNAL(signalDownPressed()),
- this, TQT_SLOT(slotFocusCurrentPlaylist()));
- connect(m_searchWidget, TQT_SIGNAL(signalAdvancedSearchClicked()),
- m_playlistBox->object(), TQT_SLOT(slotCreateSearchPlaylist()));
- connect(m_searchWidget, TQT_SIGNAL(signalShown(bool)),
- m_playlistBox->object(), TQT_SLOT(slotSetSearchEnabled(bool)));
- connect(action<TDEToggleAction>("showSearch"), TQT_SIGNAL(toggled(bool)),
- m_searchWidget, TQT_SLOT(setEnabled(bool)));
+ connect(m_searchWidget, TQ_SIGNAL(signalQueryChanged()),
+ this, TQ_SLOT(slotShowSearchResults()));
+ connect(m_searchWidget, TQ_SIGNAL(signalDownPressed()),
+ this, TQ_SLOT(slotFocusCurrentPlaylist()));
+ connect(m_searchWidget, TQ_SIGNAL(signalAdvancedSearchClicked()),
+ m_playlistBox->object(), TQ_SLOT(slotCreateSearchPlaylist()));
+ connect(m_searchWidget, TQ_SIGNAL(signalShown(bool)),
+ m_playlistBox->object(), TQ_SLOT(slotSetSearchEnabled(bool)));
+ connect(action<TDEToggleAction>("showSearch"), TQ_SIGNAL(toggled(bool)),
+ m_searchWidget, TQ_SLOT(setEnabled(bool)));
topLayout->addWidget(nowPlaying);
topLayout->addWidget(m_searchWidget);
diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp
index 19e98c33..de6a1aa8 100644
--- a/juk/searchwidget.cpp
+++ b/juk/searchwidget.cpp
@@ -48,24 +48,24 @@ SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) :
if(!m_simple) {
m_searchFieldsBox = new KComboBox(this, "searchFields");
- connect(m_searchFieldsBox, TQT_SIGNAL(activated(int)),
- this, TQT_SIGNAL(signalQueryChanged()));
+ connect(m_searchFieldsBox, TQ_SIGNAL(activated(int)),
+ this, TQ_SIGNAL(signalQueryChanged()));
}
m_lineEdit = new KLineEdit(this, "searchLineEdit");
m_lineEdit->installEventFilter(this);
- connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString &)),
- this, TQT_SIGNAL(signalQueryChanged()));
- connect(m_lineEdit, TQT_SIGNAL(returnPressed()),
- this, TQT_SLOT(slotActivate()));
+ connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString &)),
+ this, TQ_SIGNAL(signalQueryChanged()));
+ connect(m_lineEdit, TQ_SIGNAL(returnPressed()),
+ this, TQ_SLOT(slotActivate()));
if(!m_simple) {
m_caseSensitive = new KComboBox(this);
m_caseSensitive->insertItem(i18n("Normal Matching"), 0);
m_caseSensitive->insertItem(i18n("Case Sensitive"), 1);
m_caseSensitive->insertItem(i18n("Pattern Matching"), 2);
- connect(m_caseSensitive, TQT_SIGNAL(activated(int)),
- this, TQT_SIGNAL(signalQueryChanged()));
+ connect(m_caseSensitive, TQ_SIGNAL(activated(int)),
+ this, TQ_SIGNAL(signalQueryChanged()));
}
else
m_caseSensitive = 0;
@@ -273,9 +273,9 @@ void SearchWidget::setupLayout()
label->setBuddy(m_searchLine);
- connect(m_searchLine, TQT_SIGNAL(signalQueryChanged()), this, TQT_SIGNAL(signalQueryChanged()));
- connect(m_searchLine, TQT_SIGNAL(signalDownPressed()), this, TQT_SIGNAL(signalDownPressed()));
- connect(clearSearchButton, TQT_SIGNAL(pressed()), m_searchLine, TQT_SLOT(clear()));
+ connect(m_searchLine, TQ_SIGNAL(signalQueryChanged()), this, TQ_SIGNAL(signalQueryChanged()));
+ connect(m_searchLine, TQ_SIGNAL(signalDownPressed()), this, TQ_SIGNAL(signalDownPressed()));
+ connect(clearSearchButton, TQ_SIGNAL(pressed()), m_searchLine, TQ_SLOT(clear()));
setStretchableWidget(m_searchLine);
// I've decided that I think this is ugly, for now.
@@ -285,7 +285,7 @@ void SearchWidget::setupLayout()
b->setTextLabel(i18n("Advanced Search"), true);
b->setIconSet(SmallIconSet("wizard"));
- connect(b, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalAdvancedSearchClicked()));
+ connect(b, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(signalAdvancedSearchClicked()));
*/
}
diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp
index b632282e..f16b21eb 100644
--- a/juk/slideraction.cpp
+++ b/juk/slideraction.cpp
@@ -66,7 +66,7 @@ protected:
VolumeSlider::VolumeSlider(TQt::Orientation o, TQWidget *parent, const char *name) :
TQSlider(o, parent, name)
{
- connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)));
+ connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)));
}
void VolumeSlider::wheelEvent(TQWheelEvent *e)
@@ -162,11 +162,11 @@ int SliderAction::plug(TQWidget *parent, int index)
addContainer(m_toolBar, id);
- connect(m_toolBar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotToolbarDestroyed()));
- connect(m_toolBar, TQT_SIGNAL(orientationChanged(TQt::Orientation)),
- this, TQT_SLOT(slotUpdateOrientation()));
- connect(m_toolBar, TQT_SIGNAL(placeChanged(TQDockWindow::Place)),
- this, TQT_SLOT(slotUpdateOrientation()));
+ connect(m_toolBar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotToolbarDestroyed()));
+ connect(m_toolBar, TQ_SIGNAL(orientationChanged(TQt::Orientation)),
+ this, TQ_SLOT(slotUpdateOrientation()));
+ connect(m_toolBar, TQ_SIGNAL(placeChanged(TQDockWindow::Place)),
+ this, TQ_SLOT(slotUpdateOrientation()));
slotUpdateOrientation();
return (containerCount() - 1);
@@ -254,8 +254,8 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas
m_trackPositionSlider->setMaxValue(maxPosition);
TQToolTip::add(m_trackPositionSlider, i18n("Track position"));
m_layout->addWidget(m_trackPositionSlider);
- connect(m_trackPositionSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotSliderPressed()));
- connect(m_trackPositionSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSliderReleased()));
+ connect(m_trackPositionSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotSliderPressed()));
+ connect(m_trackPositionSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotSliderReleased()));
m_layout->addItem(new TQSpacerItem(10, 1));
@@ -269,9 +269,9 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas
m_volumeSlider->setMaxValue(100);
TQToolTip::add(m_volumeSlider, i18n("Volume"));
m_layout->addWidget(m_volumeSlider);
- connect(m_volumeSlider, TQT_SIGNAL(signalVolumeChanged(int)), TQT_SIGNAL(signalVolumeChanged(int)));
- connect(m_volumeSlider, TQT_SIGNAL(sliderPressed()), this, TQT_SLOT(slotVolumeSliderPressed()));
- connect(m_volumeSlider, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotVolumeSliderReleased()));
+ connect(m_volumeSlider, TQ_SIGNAL(signalVolumeChanged(int)), TQ_SIGNAL(signalVolumeChanged(int)));
+ connect(m_volumeSlider, TQ_SIGNAL(sliderPressed()), this, TQ_SLOT(slotVolumeSliderPressed()));
+ connect(m_volumeSlider, TQ_SIGNAL(sliderReleased()), this, TQ_SLOT(slotVolumeSliderReleased()));
m_volumeSlider->setName("tde toolbar widget");
m_trackPositionSlider->setName("tde toolbar widget");
@@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by bas
m_layout->setStretchFactor(m_trackPositionSlider, 4);
m_layout->setStretchFactor(m_volumeSlider, 1);
- connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize()));
+ connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotUpdateSize()));
return base;
}
diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index a590362c..1aea48b5 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -85,7 +85,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
jumpButton->setFlat(true);
TQToolTip::add(jumpButton, i18n("Jump to the currently playing item"));
- connect(jumpButton, TQT_SIGNAL(clicked()), action("showPlaying"), TQT_SLOT(activate()));
+ connect(jumpButton, TQ_SIGNAL(clicked()), action("showPlaying"), TQ_SLOT(activate()));
installEventFilter(this);
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 29c5c436..2e46272e 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -97,7 +97,7 @@ PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) :
// that I'll just handle the timeout myself, thank you very much.
KPassivePopup::setTimeout(0);
- connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired()));
+ connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired()));
}
void PassiveInfo::setTimeout(int delay)
@@ -163,13 +163,13 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
// bindings dialog.
new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), this,
- TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup");
+ TQ_SLOT(slotPlay()), ActionCollection::actions(), "showPopup");
TDEPopupMenu *cm = contextMenu();
- connect(PlayerManager::instance(), TQT_SIGNAL(signalPlay()), this, TQT_SLOT(slotPlay()));
- connect(PlayerManager::instance(), TQT_SIGNAL(signalPause()), this, TQT_SLOT(slotPause()));
- connect(PlayerManager::instance(), TQT_SIGNAL(signalStop()), this, TQT_SLOT(slotStop()));
+ connect(PlayerManager::instance(), TQ_SIGNAL(signalPlay()), this, TQ_SLOT(slotPlay()));
+ connect(PlayerManager::instance(), TQ_SIGNAL(signalPause()), this, TQ_SLOT(slotPause()));
+ connect(PlayerManager::instance(), TQ_SIGNAL(signalStop()), this, TQ_SLOT(slotStop()));
action("play")->plug(cm);
action("pause")->plug(cm);
@@ -190,7 +190,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
action("togglePopups")->plug(cm);
m_fadeTimer = new TQTimer(this, "systrayFadeTimer");
- connect(m_fadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNextStep()));
+ connect(m_fadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNextStep()));
if(PlayerManager::instance()->playing())
slotPlay();
@@ -278,8 +278,8 @@ void SystemTray::slotFadeOut()
m_startColor = m_labels[0]->textColor();
m_endColor = m_labels[0]->backgroundColor();
- connect(this, TQT_SIGNAL(fadeDone()), m_popup, TQT_SLOT(hide()));
- connect(m_popup, TQT_SIGNAL(mouseEntered()), this, TQT_SLOT(slotMouseInPopup()));
+ connect(this, TQ_SIGNAL(fadeDone()), m_popup, TQ_SLOT(hide()));
+ connect(m_popup, TQ_SIGNAL(mouseEntered()), this, TQ_SLOT(slotMouseInPopup()));
m_fadeTimer->start(1500 / STEPS);
}
@@ -289,7 +289,7 @@ void SystemTray::slotFadeOut()
void SystemTray::slotMouseInPopup()
{
m_endColor = m_labels[0]->textColor();
- disconnect(TQT_SIGNAL(fadeDone()));
+ disconnect(TQ_SIGNAL(fadeDone()));
m_step = STEPS - 1; // Simulate end of fade to solid text
slotNextStep();
@@ -360,8 +360,8 @@ void SystemTray::createPopup()
m_step = 0;
m_popup = new PassiveInfo(this);
- connect(m_popup, TQT_SIGNAL(destroyed()), TQT_SLOT(slotPopupDestroyed()));
- connect(m_popup, TQT_SIGNAL(timeExpired()), TQT_SLOT(slotFadeOut()));
+ connect(m_popup, TQ_SIGNAL(destroyed()), TQ_SLOT(slotPopupDestroyed()));
+ connect(m_popup, TQ_SIGNAL(timeExpired()), TQ_SLOT(slotFadeOut()));
TQHBox *box = new TQHBox(m_popup, "popupMainLayout");
box->setSpacing(15); // Add space between text and buttons
@@ -448,11 +448,11 @@ void SystemTray::createButtonBox(TQWidget *parent)
TQPushButton *forwardButton = new TQPushButton(m_forwardPix, 0, buttonBox, "popup_forward");
forwardButton->setFlat(true);
- connect(forwardButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotForward()));
+ connect(forwardButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotForward()));
TQPushButton *backButton = new TQPushButton(m_backPix, 0, buttonBox, "popup_back");
backButton->setFlat(true);
- connect(backButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotBack()));
+ connect(backButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotBack()));
}
/**
@@ -491,7 +491,7 @@ void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover)
coverButton->setFixedSize(cover.size());
coverButton->setFlat(true);
- connect(coverButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPopupLargeCover()));
+ connect(coverButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPopupLargeCover()));
}
TQColor SystemTray::interpolateColor(int step, int steps)
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 0129680f..ed1cdca8 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -174,8 +174,8 @@ void TagEditor::slotSetItems(const PlaylistItemList &list)
saveChangesPrompt();
if(m_currentPlaylist) {
- disconnect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)),
- this, TQT_SLOT(slotItemRemoved(PlaylistItem *)));
+ disconnect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)),
+ this, TQ_SLOT(slotItemRemoved(PlaylistItem *)));
}
if(hadPlaylist && !m_currentPlaylist || !itemPlaylist) {
@@ -191,9 +191,9 @@ void TagEditor::slotSetItems(const PlaylistItemList &list)
}
if(m_currentPlaylist) {
- connect(m_currentPlaylist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)),
- this, TQT_SLOT(slotItemRemoved(PlaylistItem *)));
- connect(m_currentPlaylist, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotPlaylistRemoved()));
+ connect(m_currentPlaylist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)),
+ this, TQ_SLOT(slotItemRemoved(PlaylistItem *)));
+ connect(m_currentPlaylist, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotPlaylistRemoved()));
}
if(isVisible())
@@ -473,9 +473,9 @@ void TagEditor::setupActions()
{
TDEToggleAction *show = new TDEToggleAction(i18n("Show &Tag Editor"), "edit", 0, ActionCollection::actions(), "showEditor");
show->setCheckedState(i18n("Hide &Tag Editor"));
- connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool)));
+ connect(show, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShown(bool)));
- new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
+ new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQ_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
}
void TagEditor::setupLayout()
@@ -588,32 +588,32 @@ void TagEditor::setupLayout()
}
- connect(m_artistNameBox, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_artistNameBox, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_trackNameBox, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_trackNameBox, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_albumNameBox, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_albumNameBox, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_genreBox, TQT_SIGNAL(activated(int)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_genreBox, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_genreBox, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_genreBox, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_fileNameBox, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_fileNameBox, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_yearSpin, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_yearSpin, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_trackSpin, TQT_SIGNAL(valueChanged(int)),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_trackSpin, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(slotDataChanged()));
- connect(m_commentBox, TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(slotDataChanged()));
+ connect(m_commentBox, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(slotDataChanged()));
}
void TagEditor::save(const PlaylistItemList &list)
@@ -752,7 +752,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layou
enableBox->hide();
- connect(enableBox, TQT_SIGNAL(toggled(bool)), item, TQT_SLOT(setEnabled(bool)));
+ connect(enableBox, TQ_SIGNAL(toggled(bool)), item, TQ_SLOT(setEnabled(bool)));
m_enableBoxes.insert(item, enableBox);
}
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index b5ceaac9..201e2215 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -41,15 +41,15 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name)
item->moveItem(m_child->lvSchemes->lastItem());
}
- connect(m_child->lvSchemes, TQT_SIGNAL(currentChanged(TQListViewItem *)),
- this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)));
- connect(m_child->lvSchemes, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int)));
- connect(m_child->bMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUpClicked()));
- connect(m_child->bMoveDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDownClicked()));
- connect(m_child->bAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddClicked()));
- connect(m_child->bModify, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModifyClicked()));
- connect(m_child->bRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveClicked()));
+ connect(m_child->lvSchemes, TQ_SIGNAL(currentChanged(TQListViewItem *)),
+ this, TQ_SLOT(slotCurrentChanged(TQListViewItem *)));
+ connect(m_child->lvSchemes, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(slotRenameItem(TQListViewItem *, const TQPoint &, int)));
+ connect(m_child->bMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUpClicked()));
+ connect(m_child->bMoveDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDownClicked()));
+ connect(m_child->bAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddClicked()));
+ connect(m_child->bModify, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModifyClicked()));
+ connect(m_child->bRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveClicked()));
m_child->lvSchemes->setSelected(m_child->lvSchemes->firstChild(), true);
slotCurrentChanged(m_child->lvSchemes->currentItem());
diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp
index 892b2156..f02d43fd 100644
--- a/juk/trackpickerdialog.cpp
+++ b/juk/trackpickerdialog.cpp
@@ -61,8 +61,8 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name,
m_base->trackList->setSelected(m_base->trackList->firstChild(), true);
- connect(m_base->trackList, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
- this, TQT_SLOT(accept()));
+ connect(m_base->trackList, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+ this, TQ_SLOT(accept()));
setMinimumWidth(kMax(400, width()));
}
diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp
index 86f88f96..34076bf7 100644
--- a/juk/tracksequencemanager.cpp
+++ b/juk/tracksequencemanager.cpp
@@ -121,8 +121,8 @@ void TrackSequenceManager::setCurrentPlaylist(Playlist *list)
m_playlist->disconnect(this);
m_playlist = list;
- connect(m_playlist, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)),
- this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *)));
+ connect(m_playlist, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)),
+ this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *)));
}
void TrackSequenceManager::setCurrent(PlaylistItem *item)
@@ -148,8 +148,8 @@ void TrackSequenceManager::initialize()
return;
// Make sure we don't use m_playNextItem if it's invalid.
- connect(collection, TQT_SIGNAL(signalAboutToRemove(PlaylistItem *)),
- this, TQT_SLOT(slotItemAboutToDie(PlaylistItem *)));
+ connect(collection, TQ_SIGNAL(signalAboutToRemove(PlaylistItem *)),
+ this, TQ_SLOT(slotItemAboutToDie(PlaylistItem *)));
m_initialized = true;
}
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index 142b1eb9..368832d1 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -48,7 +48,7 @@ WebImageFetcher::WebImageFetcher(TQObject *parent)
m_connectionId(-1),
m_dialog(0)
{
- connect(m_connection, TQT_SIGNAL(requestFinished(int,bool)), TQT_SLOT(slotWebRequestFinished(int,bool)));
+ connect(m_connection, TQ_SIGNAL(requestFinished(int,bool)), TQ_SLOT(slotWebRequestFinished(int,bool)));
}
WebImageFetcher::~WebImageFetcher()
@@ -173,8 +173,8 @@ void WebImageFetcher::slotWebRequestFinished(int id, bool error)
m_dialog = new WebImageFetcherDialog(m_imageList, m_file, 0);
m_dialog->setModal(true);
- connect(m_dialog, TQT_SIGNAL(coverSelected()), TQT_SLOT(slotCoverChosen()));
- connect(m_dialog, TQT_SIGNAL(newSearchRequested()), TQT_SLOT(slotNewSearch()));
+ connect(m_dialog, TQ_SIGNAL(coverSelected()), TQ_SLOT(slotCoverChosen()));
+ connect(m_dialog, TQ_SIGNAL(newSearchRequested()), TQ_SLOT(slotNewSearch()));
}
m_dialog->refreshScreen(m_imageList);
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 9f6c9744..c7abdf1a 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -55,8 +55,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList,
m_iconWidget->arrangeItemsInGrid();
m_iconWidget->setItemsMovable(false);
mainLayout->addWidget(m_iconWidget);
- connect(m_iconWidget, TQT_SIGNAL(executed(TQIconViewItem *)),
- this, TQT_SLOT(slotOk()));
+ connect(m_iconWidget, TQ_SIGNAL(executed(TQIconViewItem *)),
+ this, TQ_SLOT(slotOk()));
// Before changing the code below be sure to check the attribution terms
// of the Yahoo Image Search API.
@@ -66,8 +66,8 @@ WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList,
logoLabel->setPixmap(UserIcon("yahoo_credit"));
logoLabel->setMargin(15); // Allow large margin per attribution terms.
logoLabel->setUseTips(true); // Show URL in tooltip.
- connect(logoLabel, TQT_SIGNAL(leftClickedURL(const TQString &)),
- TQT_SLOT(showCreditURL(const TQString &)));
+ connect(logoLabel, TQ_SIGNAL(leftClickedURL(const TQString &)),
+ TQ_SLOT(showCreditURL(const TQString &)));
TQBoxLayout *creditLayout = new TQHBoxLayout(mainLayout);
creditLayout->addStretch(); // Left spacer
@@ -197,9 +197,9 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image)
// Start downloading the image.
m_job = TDEIO::get(image.thumbURL(), false, false);
- connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *)));
- connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
- this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &)));
+ connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(imageResult(TDEIO::Job *)));
+ connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+ this, TQ_SLOT(imageData(TDEIO::Job *, const TQByteArray &)));
}
CoverIconViewItem::~CoverIconViewItem()
diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp
index 5ac7d3b0..74517bd4 100644
--- a/kaboodle/controls.cpp
+++ b/kaboodle/controls.cpp
@@ -97,11 +97,11 @@ int Kaboodle::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/kaboodle/player.cpp b/kaboodle/player.cpp
index 4ec345c7..776ff320 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -41,7 +41,7 @@ Kaboodle::Player::Player(TQObject *parent, const char *name)
{
setInstance(KaboodleFactory::instance());
- connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout()));
+ connect(&ticker, TQ_SIGNAL(timeout()), TQ_SLOT(tickerTimeout()));
ticker.start(500);
setState(Empty);
}
@@ -56,18 +56,18 @@ Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName,
{
setInstance(KaboodleFactory::instance());
- connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout()));
+ connect(&ticker, TQ_SIGNAL(timeout()), TQ_SLOT(tickerTimeout()));
ticker.start(500);
setState(Empty);
- playAction = new TDEAction(i18n("&Play"), 0, this, TQT_SLOT(play()), actionCollection(), "play");
- pauseAction = new TDEAction(i18n("&Pause"), 0, this, TQT_SLOT(pause()), actionCollection(), "pause");
- stopAction = new TDEAction(i18n("&Stop"), 0, this, TQT_SLOT(stop()), actionCollection(), "stop");
- loopAction = new TDEToggleAction(i18n("&Looping"), 0, this, TQT_SLOT(loop()), actionCollection(), "loop");
+ playAction = new TDEAction(i18n("&Play"), 0, this, TQ_SLOT(play()), actionCollection(), "play");
+ pauseAction = new TDEAction(i18n("&Pause"), 0, this, TQ_SLOT(pause()), actionCollection(), "pause");
+ stopAction = new TDEAction(i18n("&Stop"), 0, this, TQ_SLOT(stop()), actionCollection(), "stop");
+ loopAction = new TDEToggleAction(i18n("&Looping"), 0, this, TQ_SLOT(loop()), actionCollection(), "loop");
stopAction->setEnabled(false);
playAction->setEnabled(false);
pauseAction->setEnabled(false);
- connect(this, TQT_SIGNAL(loopingChanged(bool)), loopAction, TQT_SLOT(setChecked(bool)));
+ connect(this, TQ_SIGNAL(loopingChanged(bool)), loopAction, TQ_SLOT(setChecked(bool)));
KParts::Part::setWidget(widget);
setXMLFile("kaboodlepartui.rc");
@@ -108,7 +108,7 @@ bool Kaboodle::Player::openURL(const KURL &f)
if (previousLoad)
{
- TQTimer::singleShot( 0, this, SLOT(play()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(play()) );
return true;
}
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 0a334d08..45edc4a4 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -54,13 +54,13 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
setAcceptDrops(true);
setStandardToolBarMenuEnabled(true);
- KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
- KStdAction::preferences(this, TQT_SLOT(playerPreferences()), actionCollection());
- KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(playerPreferences()), actionCollection());
+ KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() );
- menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
- propertiesAction = new TDEAction(i18n("Properties"), 0, this, TQT_SLOT(properties()), actionCollection(), "properties");
+ menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection());
+ propertiesAction = new TDEAction(i18n("Properties"), 0, this, TQ_SLOT(properties()), actionCollection(), "properties");
propertiesAction->setEnabled(false);
part = new Player(this, "KaboodlePlayer", this, "KaboodleView");
@@ -72,8 +72,8 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
statusBar()->show();
- connect(part, TQT_SIGNAL(setWindowCaption(const TQString &)), this, TQT_SLOT(updateTitle(const TQString &)));
- connect(part->view(), TQT_SIGNAL(adaptSize(int, int)), this, TQT_SLOT(adaptSize(int, int)));
+ connect(part, TQ_SIGNAL(setWindowCaption(const TQString &)), this, TQ_SLOT(updateTitle(const TQString &)));
+ connect(part->view(), TQ_SIGNAL(adaptSize(int, int)), this, TQ_SLOT(adaptSize(int, int)));
setIcon(SmallIcon("kaboodle"));
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index ef9e1fcb..3a16135c 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -49,7 +49,7 @@ TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject
button->setMaximumSize(50, 50);
button->setIconSet(_iconset);
TQToolTip::add(button, _tip);
- TQObject::connect(button, TQT_SIGNAL(clicked()), _receiver, _slot);
+ TQObject::connect(button, TQ_SIGNAL(clicked()), _receiver, _slot);
button->show();
return button;
}
@@ -72,9 +72,9 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
video = new KVideoWidget(player, box);
video->actionCollection()->readShortcutSettings();
setVideoWidget(video);
- connect(video, TQT_SIGNAL(adaptSize(int, int)), this, TQT_SLOT(calculateSize(int, int)));
- connect(video, TQT_SIGNAL(mouseButtonPressed(int, const TQPoint&, int)), this, TQT_SLOT(slotButtonPressed(int, const TQPoint &, int) ) ) ;
- connect(video, TQT_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQT_SLOT(slotDblClick(const TQPoint &, int) ) ) ;
+ connect(video, TQ_SIGNAL(adaptSize(int, int)), this, TQ_SLOT(calculateSize(int, int)));
+ connect(video, TQ_SIGNAL(mouseButtonPressed(int, const TQPoint&, int)), this, TQ_SLOT(slotButtonPressed(int, const TQPoint &, int) ) ) ;
+ connect(video, TQ_SIGNAL(mouseButtonDoubleClick(const TQPoint&, int)), this, TQ_SLOT(slotDblClick(const TQPoint &, int) ) ) ;
TQWidget *sliderBox = new TQWidget(box);
sliderBox->setFocusPolicy(TQWidget::ClickFocus);
@@ -85,9 +85,9 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
layout->setMargin(0);
layout->setAutoAdd(true);
- playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox);
- pauseButton = createButton(BarIconSet("media-playback-pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox);
- stopButton = createButton(BarIconSet("media-playback-stop"), i18n("Stop"), player, TQT_SLOT(stop()), sliderBox);
+ playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQ_SLOT(play()), sliderBox);
+ pauseButton = createButton(BarIconSet("media-playback-pause"), i18n("Pause"), player, TQ_SLOT(pause()), sliderBox);
+ stopButton = createButton(BarIconSet("media-playback-stop"), i18n("Stop"), player, TQ_SLOT(stop()), sliderBox);
slider = new L33tSlider(0, 1000, 10, 0, TQt::Horizontal, sliderBox);
slider->setTickmarks(TQSlider::NoMarks);
@@ -103,15 +103,15 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
elapsedLabel->setFixedHeight(labelFontMetrics.height());
elapsedLabel->setMinimumWidth(labelFontMetrics.width("00:00"));
- connect(player, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(stateChanged(int)));
- connect(player, TQT_SIGNAL(completed()), this, TQT_SLOT(playerFinished()));
- connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout()));
+ connect(player, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(stateChanged(int)));
+ connect(player, TQ_SIGNAL(completed()), this, TQ_SLOT(playerFinished()));
+ connect(player, TQ_SIGNAL(timeout()), this, TQ_SLOT(playerTimeout()));
- connect(slider, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int)));
- connect(slider, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderMoved(int)));
+ connect(slider, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int)));
+ connect(slider, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(sliderMoved(int)));
slider->setEnabled(false);
- connect(this, TQT_SIGNAL(buttonsChanged(int)), this, TQT_SLOT(updateButtons(int)));
+ connect(this, TQ_SIGNAL(buttonsChanged(int)), this, TQ_SLOT(updateButtons(int)));
updateButtons(buttons());
updateLabel("--:--/--:--");
diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp
index 75f79736..28bc688a 100644
--- a/kaudiocreator/encodefileimp.cpp
+++ b/kaudiocreator/encodefileimp.cpp
@@ -33,8 +33,8 @@ EncodeFileImp::EncodeFileImp(TQWidget* parent,
// Specify to only accept wav files
file->setFilter("*.wav|Wav Files");
- connect(file,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(enableEncodeButton(const TQString &)));
- connect(encodeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(encode()));
+ connect(file,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(enableEncodeButton(const TQString &)));
+ connect(encodeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(encode()));
}
/**
diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index 9cc729a6..23137f3d 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -212,11 +212,11 @@ void Encoder::tendToNewJobs() {
proc->setPriority(Prefs::niceLevel());
*proc << TQFile::encodeName(command).data();
- connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
- this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
- connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int )),
- this, TQT_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
- connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(jobDone(TDEProcess *)));
+ connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+ this, TQ_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
+ connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int )),
+ this, TQ_SLOT(receivedThreadOutput(TDEProcess *, char *, int )));
+ connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(jobDone(TDEProcess *)));
jobs.insert(proc, job);
threads.append(proc);
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index 2865dce3..e2ca1188 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -34,10 +34,10 @@
*/
EncoderConfigImp::EncoderConfigImp( TQWidget* parent, const char* name) :
EncoderConfig (parent, name) {
- connect(addEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(addEncoderSlot()));
- connect(removeEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeEncoderSlot()));
- connect(configureEncoder, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureEncoderSlot()));
- connect(kcfg_currentEncoder, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQT_SLOT(configureEncoderSlot()));
+ connect(addEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(addEncoderSlot()));
+ connect(removeEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeEncoderSlot()));
+ connect(configureEncoder, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureEncoderSlot()));
+ connect(kcfg_currentEncoder, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),this, TQ_SLOT(configureEncoderSlot()));
// If there are no encoders then store the three default ones.
if( Prefs::lastKnownEncoder() == 0){
@@ -138,7 +138,7 @@ void EncoderConfigImp::addEncoderSlot(){
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help);
dialog->setCaption(i18n("Configure Encoder"));
dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings");
- connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadEncoderList()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadEncoderList()));
dialog->show();
}
@@ -198,9 +198,9 @@ void EncoderConfigImp::configureEncoderSlot() {
KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help);
dialog->setCaption(i18n("Configure Encoder"));
dialog->addPage(new EncoderEdit(0, groupName.latin1()), i18n("Encoder Configuration"), "package_settings");
- connect(dialog, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(updateEncoder(TQObject *)));
- connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SIGNAL(encoderUpdated()));
- connect(dialog, TQT_SIGNAL(settingsChanged(const char *)), this, TQT_SLOT(updateEncoder(const char *)));
+ connect(dialog, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(updateEncoder(TQObject *)));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SIGNAL(encoderUpdated()));
+ connect(dialog, TQ_SIGNAL(settingsChanged(const char *)), this, TQ_SLOT(updateEncoder(const char *)));
dialog->show();
}
diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp
index a800aea3..760f8e4a 100644
--- a/kaudiocreator/jobqueimp.cpp
+++ b/kaudiocreator/jobqueimp.cpp
@@ -51,9 +51,9 @@
*/
JobQueImp::JobQueImp( TQWidget* parent, const char* name) :
JobQue(parent,name),highestNumber(DEFAULT_HIGHEST_NUMBER), currentId(0){
- connect(removeSelected,TQT_SIGNAL(clicked()), this, TQT_SLOT( removeSelectedJob()));
- connect(removeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllJobs()));
- connect(removeDoneJobs, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDoneJobs()));
+ connect(removeSelected,TQ_SIGNAL(clicked()), this, TQ_SLOT( removeSelectedJob()));
+ connect(removeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllJobs()));
+ connect(removeDoneJobs, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDoneJobs()));
}
/**
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index 5465d808..115de82f 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -67,71 +67,71 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
resize(500, 440);
/*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, tracks,
- TQT_SLOT( eject() ), actionCollection(), "eject" );
+ TQ_SLOT( eject() ), actionCollection(), "eject" );
(void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, this,
- TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" );
+ TQ_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" );
TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, tracks,
- TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ;
+ TQ_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ;
TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, tracks,
- TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" );
+ TQ_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" );
selectAll->setEnabled( false );
deselectAll->setEnabled( false );
TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Rip &Selection"), "rip", actionCollection(), "rip" );
actActionMenu->setDelayed(true); //needed for checking "all accounts"
actActionMenu->setEnabled( false );
- connect( actActionMenu, TQT_SIGNAL( activated() ), tracks, TQT_SLOT( startSession() ) );
+ connect( actActionMenu, TQ_SIGNAL( activated() ), tracks, TQ_SLOT( startSession() ) );
ripMenu = actActionMenu->popupMenu();
- connect( ripMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRipSelection(int)) );
- connect( ripMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( getRipMenu()) );
+ connect( ripMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRipSelection(int)) );
+ connect( ripMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( getRipMenu()) );
TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, tracks,
- TQT_SLOT( startSession() ), actionCollection(), "rip_selected" );
+ TQ_SLOT( startSession() ), actionCollection(), "rip_selected" );
rip->setEnabled( false );
- connect( jobQue, TQT_SIGNAL( removeJob(int) ), this, TQT_SLOT( updateStatus() ) );
- connect( jobQue, TQT_SIGNAL( removeJob(int) ), ripper, TQT_SLOT( removeJob(int) ) );
- connect( jobQue, TQT_SIGNAL( removeJob(int) ), encoder, TQT_SLOT( removeJob(int)) );
+ connect( jobQue, TQ_SIGNAL( removeJob(int) ), this, TQ_SLOT( updateStatus() ) );
+ connect( jobQue, TQ_SIGNAL( removeJob(int) ), ripper, TQ_SLOT( removeJob(int) ) );
+ connect( jobQue, TQ_SIGNAL( removeJob(int) ), encoder, TQ_SLOT( removeJob(int)) );
- connect( ripper, TQT_SIGNAL( updateProgress(int, int) ), jobQue, TQT_SLOT( updateProgress(int,int) ) );
- connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), jobQue, TQT_SLOT( addJob(Job*, const TQString &)) );
- connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , tracks, TQT_SLOT( ejectDevice(const TQString &)) );
- connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , encoder, TQT_SLOT( encodeWav(Job *)) );
- connect( ripper, TQT_SIGNAL( jobsChanged() ) , this, TQT_SLOT( updateStatus() ) );
+ connect( ripper, TQ_SIGNAL( updateProgress(int, int) ), jobQue, TQ_SLOT( updateProgress(int,int) ) );
+ connect( ripper, TQ_SIGNAL( addJob(Job*, const TQString &) ), jobQue, TQ_SLOT( addJob(Job*, const TQString &)) );
+ connect( ripper, TQ_SIGNAL( eject(const TQString &) ) , tracks, TQ_SLOT( ejectDevice(const TQString &)) );
+ connect( ripper, TQ_SIGNAL( encodeWav(Job *) ) , encoder, TQ_SLOT( encodeWav(Job *)) );
+ connect( ripper, TQ_SIGNAL( jobsChanged() ) , this, TQ_SLOT( updateStatus() ) );
- connect( encoder, TQT_SIGNAL( updateProgress(int, int) ) , jobQue, TQT_SLOT( updateProgress(int,int)) );
- connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), jobQue, TQT_SLOT( addJob(Job*, const TQString &)) );
- connect( encoder, TQT_SIGNAL( jobsChanged() ) , this, TQT_SLOT( updateStatus() ) );
+ connect( encoder, TQ_SIGNAL( updateProgress(int, int) ) , jobQue, TQ_SLOT( updateProgress(int,int)) );
+ connect( encoder, TQ_SIGNAL( addJob(Job*, const TQString&)), jobQue, TQ_SLOT( addJob(Job*, const TQString &)) );
+ connect( encoder, TQ_SIGNAL( jobsChanged() ) , this, TQ_SLOT( updateStatus() ) );
- connect( tracks, TQT_SIGNAL( hasCD(bool) ) , this, TQT_SLOT( hasCD(bool) ) );
- connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), ripper, TQT_SLOT( ripTrack(Job *)) );
- connect( tracks, TQT_SIGNAL( hasTracks(bool) ), rip, TQT_SLOT( setEnabled(bool)) );
- connect( tracks, TQT_SIGNAL( hasTracks(bool) ), actActionMenu, TQT_SLOT( setEnabled(bool)) );
- connect( tracks, TQT_SIGNAL( hasTracks(bool) ), deselectAll, TQT_SLOT( setEnabled(bool)) );
- connect( tracks, TQT_SIGNAL( hasTracks(bool) ), selectAll, TQT_SLOT( setEnabled(bool)) );
+ connect( tracks, TQ_SIGNAL( hasCD(bool) ) , this, TQ_SLOT( hasCD(bool) ) );
+ connect( tracks, TQ_SIGNAL( ripTrack(Job *) ), ripper, TQ_SLOT( ripTrack(Job *)) );
+ connect( tracks, TQ_SIGNAL( hasTracks(bool) ), rip, TQ_SLOT( setEnabled(bool)) );
+ connect( tracks, TQ_SIGNAL( hasTracks(bool) ), actActionMenu, TQ_SLOT( setEnabled(bool)) );
+ connect( tracks, TQ_SIGNAL( hasTracks(bool) ), deselectAll, TQ_SLOT( setEnabled(bool)) );
+ connect( tracks, TQ_SIGNAL( hasTracks(bool) ), selectAll, TQ_SLOT( setEnabled(bool)) );
(void)new TDEAction(i18n("Remove &Completed Jobs"), 0, jobQue,
- TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" );
+ TQ_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" );
TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, tracks,
- TQT_SLOT(editInformation()), actionCollection(), "edit_cd");
- connect(tracks, TQT_SIGNAL(hasCD(bool)), edit, TQT_SLOT(setEnabled(bool)));
+ TQ_SLOT(editInformation()), actionCollection(), "edit_cd");
+ connect(tracks, TQ_SIGNAL(hasCD(bool)), edit, TQ_SLOT(setEnabled(bool)));
edit->setEnabled( false );
(void)new TDEAction(i18n("Encode &File..."), 0, this,
- TQT_SLOT(encodeFile()), actionCollection(), "encode_file");
+ TQ_SLOT(encodeFile()), actionCollection(), "encode_file");
TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, tracks,
- TQT_SLOT(performCDDB()), actionCollection(), "cddb_now");
- connect(tracks, TQT_SIGNAL(hasCD(bool)), cddb, TQT_SLOT(setEnabled(bool)));
+ TQ_SLOT(performCDDB()), actionCollection(), "cddb_now");
+ connect(tracks, TQ_SIGNAL(hasCD(bool)), cddb, TQ_SLOT(setEnabled(bool)));
cddb->setEnabled( false );
- KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()),
+ KStdAction::configureNotifications(this, TQ_SLOT(configureNotifications()),
actionCollection());
- KStdAction::quit( this, TQT_SLOT(close()), actionCollection(), "quit" );
+ KStdAction::quit( this, TQ_SLOT(close()), actionCollection(), "quit" );
// Init statusbar
statusBar()->insertItem(i18n("No Audio CD detected"), 0 );
@@ -216,7 +216,7 @@ void KAudioCreator::configureNotifications() {
void KAudioCreator::encodeFile(){
EncodeFileImp *file = new EncodeFileImp(this, "EncodeFile");
- connect(file, TQT_SIGNAL(startJob(Job*)),encoder, TQT_SLOT(encodeWav(Job*)));
+ connect(file, TQ_SIGNAL(startJob(Job*)),encoder, TQ_SLOT(encodeWav(Job*)));
file->show();
}
@@ -228,10 +228,10 @@ void KAudioCreator::showSettings(){
return;
SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self());
- connect(dialog, TQT_SIGNAL(settingsChanged()), ripper, TQT_SLOT(loadSettings()));
- connect(dialog, TQT_SIGNAL(settingsChanged()), encoder, TQT_SLOT(loadSettings()));
- connect(dialog, TQT_SIGNAL(settingsChanged()), tracks, TQT_SLOT(loadSettings()));
- connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), encoder, TQT_SLOT(loadSettings()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), ripper, TQ_SLOT(loadSettings()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), encoder, TQ_SLOT(loadSettings()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), tracks, TQ_SLOT(loadSettings()));
+ connect(dialog->encoderConfigImp, TQ_SIGNAL(encoderUpdated()), encoder, TQ_SLOT(loadSettings()));
dialog->show();
}
@@ -253,7 +253,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele
{
cddb->load();
addPage(cddb, i18n("CDDB"), "media-optical-cdaudio-mounted", i18n("CDDB Configuration"), false);
- connect(cddb, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(slotCddbChanged(bool)));
+ connect(cddb, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(slotCddbChanged(bool)));
}
}
RipConfig *rip = new RipConfig(0, "Ripper");
diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp
index 657d21b2..9dab32eb 100644
--- a/kaudiocreator/ripper.cpp
+++ b/kaudiocreator/ripper.cpp
@@ -57,8 +57,8 @@ Ripper::~Ripper(){
if(ioJob){
TDEIO::FileCopyJob *copyJob = static_cast<TDEIO::FileCopyJob*> (ioJob);
- disconnect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*)));
- disconnect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long)));
+ disconnect(copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(copyJobResult(TDEIO::Job*)));
+ disconnect(copyJob, TQ_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQ_SLOT(updateProgress ( TDEIO::Job *, unsigned long)));
TQString fileDestination = (copyJob->destURL()).path();
copyJob->kill();
TQFile file( fileDestination );
@@ -184,8 +184,8 @@ void Ripper::tendToNewJobs(){
TDEIO::FileCopyJob *copyJob = new TDEIO::FileCopyJob(source, dest, 0644, false, true, false, false);
jobs.insert(copyJob, job);
- connect(copyJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(copyJobResult(TDEIO::Job*)));
- connect(copyJob, TQT_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQT_SLOT(updateProgress ( TDEIO::Job *, unsigned long)));
+ connect(copyJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(copyJobResult(TDEIO::Job*)));
+ connect(copyJob, TQ_SIGNAL(percent ( TDEIO::Job *, unsigned long)), this, TQ_SLOT(updateProgress ( TDEIO::Job *, unsigned long)));
emit jobsChanged();
}
@@ -234,7 +234,7 @@ void Ripper::copyJobResult(TDEIO::Job *copyjob){
}
if( !job ){
deviceToEject = newJob->device;
- TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQT_SLOT(ejectNow()));
+ TQTimer::singleShot( Prefs::autoEjectDelay()*1000 + 500, this, TQ_SLOT(ejectNow()));
}
}
KNotifyClient::event("cd ripped");
diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp
index 0d7ab5cd..42c43599 100644
--- a/kaudiocreator/tracksimp.cpp
+++ b/kaudiocreator/tracksimp.cpp
@@ -55,22 +55,22 @@ TracksImp::TracksImp( TQWidget* parent, const char* name) :
{
cd = new TDECompactDisc;
- connect(cd,TQT_SIGNAL(discChanged(unsigned)),this,TQT_SLOT(newDisc(unsigned)));
+ connect(cd,TQ_SIGNAL(discChanged(unsigned)),this,TQ_SLOT(newDisc(unsigned)));
- connect(trackListing, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(selectTrack(TQListViewItem*)));
- connect(trackListing, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(editInformation()));
- connect(trackListing, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(editInformation()));
- connect(selectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllTracks()));
- connect(deselectAllTracksButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllTracks()));
+ connect(trackListing, TQ_SIGNAL(clicked( TQListViewItem * )), this, TQ_SLOT(selectTrack(TQListViewItem*)));
+ connect(trackListing, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(editInformation()));
+ connect(trackListing, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(editInformation()));
+ connect(selectAllTracksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAllTracks()));
+ connect(deselectAllTracksButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deselectAllTracks()));
- connect(deviceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changeDevice(const TQString &)));
+ connect(deviceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changeDevice(const TQString &)));
selectAllTracksButton->setEnabled( false );
deselectAllTracksButton->setEnabled( false );
cddb = new KCDDB::Client();
cddb->setBlockingMode(false);
- connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result)));
+ connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result)));
trackListing->setSorting(-1, false);
loadSettings();
}
diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index 40bf6cfb..980ce18d 100644
--- a/kmix/KMixApp.cpp
+++ b/kmix/KMixApp.cpp
@@ -49,7 +49,7 @@ KMixApp::newInstance()
else
{
m_kmix = new KMixWindow;
- connect(this, TQT_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQT_SLOT(stopVisibilityUpdates()));
+ connect(this, TQ_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQ_SLOT(stopVisibilityUpdates()));
if ( isRestored() && TDEMainWindow::canBeRestored(0) )
{
m_kmix->restore(0, FALSE);
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index b2020397..abeca6e4 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -62,7 +62,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
// Default or user selected
TQButtonGroup *bgMasterSelection = new TQButtonGroup(1, TQt::Vertical, i18n("KMix master channel selection"), m_mainFrame);
- connect(bgMasterSelection, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(masterSelectionChanged(int)));
+ connect(bgMasterSelection, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(masterSelectionChanged(int)));
_layout->add(bgMasterSelection);
m_defaultMaster = new TQRadioButton(i18n("Default"), bgMasterSelection);
m_userMaster = new TQRadioButton(i18n("Custom"), bgMasterSelection);
@@ -82,7 +82,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
m_cMixer = new KComboBox( FALSE, hboxMixerName, "mixerCombo" );
m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
TQToolTip::add(m_cMixer, i18n("Current mixer"));
- connect(m_cMixer, TQT_SIGNAL(activated(int)), this, TQT_SLOT(createPageByID(int)));
+ connect(m_cMixer, TQ_SIGNAL(activated(int)), this, TQ_SLOT(createPageByID(int)));
for ( Mixer *mixer = Mixer::mixers().first(); mixer !=0; mixer = Mixer::mixers().next() ) {
m_cMixer->insertItem(mixer->mixerName());
@@ -97,7 +97,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible TQButtonGroup
m_buttonGroupForScrollView->hide();
- connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) );
+ connect( this, TQ_SIGNAL(okClicked()) , this, TQ_SLOT(apply()) );
}
void DialogSelectMaster::show(Mixer *curr_mixer)
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index d6deb523..81a411fe 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -59,7 +59,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
}
_layout->activate();
resize(_layout->sizeHint() );
- connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) );
+ connect( this, TQ_SIGNAL(okClicked()) , this, TQ_SLOT(apply()) );
}
DialogViewConfiguration::~DialogViewConfiguration()
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index c4c7a9e6..8db11212 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -97,7 +97,7 @@ KMixWindow::KMixWindow()
{
hide();
}
- connect( kapp, TQT_SIGNAL( aboutToQuit()), TQT_SLOT( saveSettings()) );
+ connect( kapp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) );
}
@@ -111,25 +111,25 @@ void
KMixWindow::initActions()
{
// file menu
- KStdAction::quit( this, TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit( this, TQ_SLOT(quit()), actionCollection());
// settings menu
- KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection());
- KStdAction::preferences( this, TQT_SLOT(showSettings()), actionCollection());
+ KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBar()), actionCollection());
+ KStdAction::preferences( this, TQ_SLOT(showSettings()), actionCollection());
new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this,
- TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
- KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+ TQ_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
+ KStdAction::keyBindings( guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
- (void) new TDEAction( i18n( "Hardware &Information" ), 0, this, TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
- (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
+ (void) new TDEAction( i18n( "Hardware &Information" ), 0, this, TQ_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
+ (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQ_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
m_globalAccel = new TDEGlobalAccel(this, "KMix");
m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotIncreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotIncreaseVolume() ) );
m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotDecreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotDecreaseVolume() ) );
m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotToggleMuted() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotToggleMuted() ) );
m_globalAccel->readSettings();
m_globalAccel->updateConnections();
@@ -157,7 +157,7 @@ KMixWindow::initWidgets()
qlbl->setFixedHeight(qlbl->sizeHint().height());
m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" );
m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
- connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) );
+ connect( m_cMixer, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( showSelectedMixer( int ) ) );
TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
// Add first layout to widgets
@@ -370,7 +370,7 @@ KMixWindow::showSettings()
cfg->addPage(cfgx, i18n("Experimental"), "bug");
#endif
- connect(cfg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPrefs()));
+ connect(cfg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPrefs()));
cfg->show();
}
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index a4770993..19bfcbdb 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -208,7 +208,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(), m_errorLabel->sizeHint().height() );
TQToolTip::add(m_errorLabel, "Select one of the available mixers");
resize( m_errorLabel->sizeHint() );
- connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
+ connect( m_errorLabel, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectMixer()) );
}
else {
// We know which mixer to use: Call positionChange(), which does all the creating
@@ -288,7 +288,7 @@ void KMixApplet::loadConfig( TDEConfig *config, const TQString &grp )
if ( m_mixerWidget ) {
//config->setGroup( grp );
KMixToolBox::loadConfig(m_mixerWidget->_mdws, config, grp, "PanelApplet" );
- connect(m_mixerWidget, TQT_SIGNAL(selectMixer()), this, TQT_SLOT(selectMixer()));
+ connect(m_mixerWidget, TQ_SIGNAL(selectMixer()), this, TQ_SLOT(selectMixer()));
}
}
@@ -369,7 +369,7 @@ void KMixApplet::positionChange(Position pos) {
delete m_mixerWidget;
}
m_mixerWidget = new ViewApplet( this, _mixer->name(), _mixer, 0, pos );
- connect ( m_mixerWidget, TQT_SIGNAL(appletContentChanged()), this, TQT_SLOT(updateGeometrySlot()) );
+ connect ( m_mixerWidget, TQ_SIGNAL(appletContentChanged()), this, TQ_SLOT(updateGeometrySlot()) );
m_mixerWidget->createDeviceWidgets();
_layout->add(m_mixerWidget);
_layout->activate();
@@ -383,7 +383,7 @@ void KMixApplet::positionChange(Position pos) {
//setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
//kdDebug(67100) << "KMixApplet::positionChange(). New MDW is at " << panelAppletConstrainedSize << endl;
m_mixerWidget->show();
- //connect( _mixer, TQT_SIGNAL(newVolumeLevels()), m_mixerWidget, TQT_SLOT(refreshVolumeLevels()) );
+ //connect( _mixer, TQ_SIGNAL(newVolumeLevels()), m_mixerWidget, TQ_SLOT(refreshVolumeLevels()) );
}
}
@@ -479,8 +479,8 @@ void KMixApplet::preferences()
if ( !m_pref )
{
m_pref = new AppletConfigDialog( this );
- connect(m_pref, TQT_SIGNAL(finished()), TQT_SLOT(preferencesDone()));
- connect( m_pref, TQT_SIGNAL(applied()), TQT_SLOT(applyPreferences()) );
+ connect(m_pref, TQ_SIGNAL(finished()), TQ_SLOT(preferencesDone()));
+ connect( m_pref, TQ_SIGNAL(applied()), TQ_SLOT(applyPreferences()) );
m_pref->setActiveColors(_colors.high , _colors.low , _colors.back);
m_pref->setMutedColors (_colors.mutedHigh, _colors.mutedLow, _colors.mutedBack);
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 5876956b..574a996c 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -71,7 +71,7 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name
}
createActions();
createMasterVolWidget();
- connect(this, TQT_SIGNAL(quitSelected()), kapp, TQT_SLOT(quitExtended()));
+ connect(this, TQ_SIGNAL(quitSelected()), kapp, TQ_SLOT(quitExtended()));
}
KMixDockWidget::~KMixDockWidget()
@@ -89,7 +89,7 @@ void KMixDockWidget::createActions()
TDEPopupMenu *popupMenu = contextMenu();
// Put "Mute" selector in context menu
- (void)new TDEToggleAction(i18n("M&ute"), 0, this, TQT_SLOT(dockMute()),
+ (void)new TDEToggleAction(i18n("M&ute"), 0, this, TQ_SLOT(dockMute()),
actionCollection(), "dock_mute");
TDEAction *a = actionCollection()->action("dock_mute");
if (a)
@@ -100,7 +100,7 @@ void KMixDockWidget::createActions()
// Put "Select Master Channel" dialog in context menu
if (m_mixer)
{
- (void)new TDEAction(i18n("Select Master Channel..."), 0, this, TQT_SLOT(selectMaster()),
+ (void)new TDEAction(i18n("Select Master Channel..."), 0, this, TQ_SLOT(selectMaster()),
actionCollection(), "select_master");
a = actionCollection()->action("select_master");
if (a)
@@ -178,8 +178,8 @@ void KMixDockWidget::createMasterVolWidget()
* Refreshing the Icon
*
*/
- connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip()));
- connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap()));
+ connect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(setVolumeTip()));
+ connect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(slotUpdatePixmap()));
}
void KMixDockWidget::deleteMasterVolWidget()
@@ -191,8 +191,8 @@ void KMixDockWidget::deleteMasterVolWidget()
}
if (m_mixer)
{
- disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip()));
- disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap()));
+ disconnect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(setVolumeTip()));
+ disconnect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(slotUpdatePixmap()));
}
}
@@ -206,7 +206,7 @@ void KMixDockWidget::selectMaster()
if (!_dsm)
{
_dsm = new DialogSelectMaster(m_mixer);
- connect(_dsm, TQT_SIGNAL(newMasterSelected(bool, int, const TQString&)), TQT_SLOT( handleNewMaster(bool, int, const TQString&)));
+ connect(_dsm, TQ_SIGNAL(newMasterSelected(bool, int, const TQString&)), TQ_SLOT( handleNewMaster(bool, int, const TQString&)));
}
_dsm->show(m_mixer);
}
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index e1d6a307..cc12c7dd 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -151,7 +151,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
balanceAndDetail->addWidget( mixerName );
balanceAndDetail->addSpacing( 10 );
- connect( m_balanceSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(balanceChanged(int)) );
+ connect( m_balanceSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(balanceChanged(int)) );
TQToolTip::add( m_balanceSlider, i18n("Left/Right balancing") );
// --- "MenuBar" toggling from the various View's ---
@@ -170,7 +170,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase)
_views.push_back(vbase);
vbase ->createDeviceWidgets();
m_ioTab->addTab( vbase , vbase->caption() );
- connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) );
+ connect( vbase, TQ_SIGNAL(toggleMenuBar()), parentWidget(), TQ_SLOT(toggleMenuBar()) );
}
}
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 9e8006a9..5a685772 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -53,15 +53,15 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
/* !!! remove this for production version */
m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( nextEnumId() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( nextEnumId() ) );
installEventFilter( this ); // filter for popup
}
@@ -99,7 +99,7 @@ void MDWEnum::createWidgets()
// ------------ fill ComboBox end --------------
_layout->addWidget(_enumCombo);
_enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
- connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) );
+ connect( _enumCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setEnumId( int ) ) );
TQToolTip::add( _enumCombo, m_mixdevice->name() );
//_layout->addSpacing( 4 );
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 169c2810..c8302c54 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -64,29 +64,29 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
{
// create actions (on _mdwActions, see MixDeviceWidget)
- new TDEToggleAction( i18n("&Split Channels"), 0, this, TQT_SLOT(toggleStereoLinked()),
+ new TDEToggleAction( i18n("&Split Channels"), 0, this, TQ_SLOT(toggleStereoLinked()),
_mdwActions, "stereo" );
- new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" );
TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
- connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) );
+ connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleMuted()) );
if( m_mixdevice->isRecordable() ) {
a = new TDEToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" );
- connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) );
+ connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT( toggleRecsrc()) );
}
- new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets( showMuteLED, showRecordLED );
m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( increaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( increaseVolume() ) );
m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( decreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( decreaseVolume() ) );
m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( toggleMuted() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( toggleMuted() ) );
installEventFilter( this ); // filter for popup
@@ -232,7 +232,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
m_muteLED->resize( TQSize(16, 16) );
ledlayout->addWidget( m_muteLED );
TQToolTip::add( m_muteLED, i18n( "Mute" ) );
- connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) );
+ connect( m_muteLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(toggleMuted()) );
m_muteLED->installEventFilter( this );
ledlayout->addStretch();
} // has Mute LED
@@ -316,7 +316,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
slinumLayout->addWidget( slider ); // add to layout
m_sliders.append ( slider ); // add to list
_slidersChids.append(chid); // Remember slider-chid association
- connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) );
+ connect( slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volumeChange(int)) );
} // for all channels of this device
@@ -343,7 +343,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
KLed::Sunken, KLed::Circular, this, "RecordLED" );
m_recordLED->setFixedSize( TQSize(16, 16) );
reclayout->addWidget( m_recordLED );
- connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool)));
+ connect(m_recordLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(setRecsrc(bool)));
m_recordLED->installEventFilter( this );
TQToolTip::add( m_recordLED, i18n( "Record" ) );
reclayout->addStretch();
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 93ebaad2..2fcd228c 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -54,14 +54,14 @@ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md,
// create actions (on _mdwActions, see MixDeviceWidget)
// KStdAction::showMenubar() is in MixDeviceWidget now
- new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(),
- TDEShortcut(), TDEShortcut(), this, TQT_SLOT( toggleSwitch() ) );
+ TDEShortcut(), TDEShortcut(), this, TQ_SLOT( toggleSwitch() ) );
// The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp)
//m_keys->readSettings();
@@ -124,7 +124,7 @@ void MDWSwitch::createWidgets()
_switchLED->installEventFilter( this );
_label->installEventFilter( this );
}
- connect( _switchLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleSwitch()) );
+ connect( _switchLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(toggleSwitch()) );
_layout->addSpacing( 4 );
}
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 150b196d..953afce9 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -89,7 +89,7 @@ Mixer::Mixer( int driver, int device ) : DCOPObject( "Mixer" )
m_profiles.setAutoDelete( true );
_pollingTimer = new TQTimer(); // will be started on open() and stopped on close()
- connect( _pollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(readSetFromHW()));
+ connect( _pollingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(readSetFromHW()));
TQCString objid;
#ifndef KMIX_DCOP_OBJID_TEST
@@ -207,7 +207,7 @@ int Mixer::open()
else {
_mixerBackend->prepareSignalling(this);
// poll once to give the GUI a chance to rebuild it's info
- TQTimer::singleShot( 50, this, TQT_SLOT( readSetFromHW() ) );
+ TQTimer::singleShot( 50, this, TQ_SLOT( readSetFromHW() ) );
}
return err;
}
@@ -516,7 +516,7 @@ void Mixer::setVolume( int deviceidx, int percentage )
_mixerBackend->writeVolumeToHW(deviceidx, vol);
// Make sure volume reading is synced
readSetFromHWforceUpdate();
- TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
+ TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW()));
}
/**
@@ -534,7 +534,7 @@ void Mixer::commitVolumeChange( MixDevice* md ) {
// Muting/unmuting PulseAudio directly does not send back any notification to the mixer
// so we make sure we always update the tray icon after each operation.
readSetFromHWforceUpdate();
- TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
+ TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW()));
}
// @dcop only
@@ -586,7 +586,7 @@ void Mixer::setAbsoluteVolume( int deviceidx, long absoluteVolume ) {
_mixerBackend->writeVolumeToHW(deviceidx, vol);
// Make sure volume reading is synced
readSetFromHWforceUpdate();
- TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
+ TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW()));
}
// @dcop , especially for use in KMilo
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index 22303b43..aaf6a109 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -418,7 +418,7 @@ void Mixer_ALSA::prepareSignalling( Mixer *mixer )
{
kdDebug() << "socket " << i << endl;
m_sns[i] = new TQSocketNotifier(m_fds[i].fd, TQSocketNotifier::Read);
- mixer->connect(m_sns[i], TQT_SIGNAL(activated(int)), mixer, TQT_SLOT(readSetFromHW()));
+ mixer->connect(m_sns[i], TQ_SIGNAL(activated(int)), mixer, TQ_SLOT(readSetFromHW()));
}
}
diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp
index 12806bda..ac5fe03f 100644
--- a/kmix/mixer_sun.cpp
+++ b/kmix/mixer_sun.cpp
@@ -105,7 +105,7 @@ const uint_t MixerSunPortMasks[] =
//======================================================================
-// FUNCTION/TQT_METHOD DEFINITIONS
+// FUNCTION/METHOD DEFINITIONS
//======================================================================
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 125479ba..ccd6080e 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -41,8 +41,8 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
{
setBackgroundOrigin(AncestorOrigin);
// remove the menu bar action, that is put by the "ViewBase" constructor in _actions.
- //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
- _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) );
+ //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBarSlot()), _actions ));
+ _actions->remove( KStdAction::showMenubar(this, TQ_SLOT(toggleMenuBarSlot()), _actions) );
if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) {
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index ddacd4d8..41d26f6a 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -51,7 +51,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
// Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window.
if ( vflags & ViewBase::HasMenuBar ) {
- TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBarSlot()), _actions ));
if ( vflags & ViewBase::MenuBarVisible ) {
m->setChecked(true);
}
@@ -59,9 +59,9 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
m->setChecked(false);
}
}
- new TDEAction(i18n("&Channels"), 0, this, TQT_SLOT(configureView()), _actions, "toggle_channels");
- new TDEAction(i18n("&Select Mixer"), 0, this, TQT_SLOT(selectMixerSlot()), _actions, "select_mixer");
- connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) );
+ new TDEAction(i18n("&Channels"), 0, this, TQ_SLOT(configureView()), _actions, "toggle_channels");
+ new TDEAction(i18n("&Select Mixer"), 0, this, TQ_SLOT(selectMixerSlot()), _actions, "select_mixer");
+ connect ( _mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(refreshVolumeLevels()) );
}
ViewBase::~ViewBase() {
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 21b5d8d9..79d8cfc4 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -137,7 +137,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md)
// Add button to show main panel
_showPanelBox = new TQPushButton( i18n("Mixer"), _frame, "MixerPanel" );
- connect ( _showPanelBox, TQT_SIGNAL( clicked() ), TQT_SLOT( showPanelSlot() ) );
+ connect ( _showPanelBox, TQ_SIGNAL( clicked() ), TQ_SLOT( showPanelSlot() ) );
_layoutMDW->addMultiCellWidget( _showPanelBox, 1, 1, 0, 2 );
return _mdw;
diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp
index eeadc61b..412b773b 100644
--- a/kmix/viewinput.cpp
+++ b/kmix/viewinput.cpp
@@ -29,7 +29,7 @@ ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & captio
: ViewSliders(parent, name, caption, mixer, vflags)
{
init();
- connect ( _mixer, TQT_SIGNAL(newRecsrc()) , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources
+ connect ( _mixer, TQ_SIGNAL(newRecsrc()) , this, TQ_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources
}
ViewInput::~ViewInput() {
diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp
index 31df79aa..6d4d58a1 100644
--- a/krec/krecconfig_files.cpp
+++ b/krec/krecconfig_files.cpp
@@ -41,10 +41,10 @@ KRecConfigFiles::KRecConfigFiles( TQWidget* p, const char*, const TQStringList&
_layout->addSpacing( 10 );
_filewidget = new KRecConfigFilesWidget( this );
- connect( _filewidget, TQT_SIGNAL( sRateChanged( int ) ), this, TQT_SLOT( ratechanged( int ) ) );
- connect( _filewidget, TQT_SIGNAL( sChannelsChanged( int ) ), this, TQT_SLOT( channelschanged( int ) ) );
- connect( _filewidget, TQT_SIGNAL( sBitsChanged( int ) ), this, TQT_SLOT( bitschanged( int ) ) );
- connect( _filewidget, TQT_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) );
+ connect( _filewidget, TQ_SIGNAL( sRateChanged( int ) ), this, TQ_SLOT( ratechanged( int ) ) );
+ connect( _filewidget, TQ_SIGNAL( sChannelsChanged( int ) ), this, TQ_SLOT( channelschanged( int ) ) );
+ connect( _filewidget, TQ_SIGNAL( sBitsChanged( int ) ), this, TQ_SLOT( bitschanged( int ) ) );
+ connect( _filewidget, TQ_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) );
_layout->addWidget( _filewidget );
_layout->addStretch( 100 );
diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp
index d396d41f..eae7157a 100644
--- a/krec/krecconfig_fileswidget.cpp
+++ b/krec/krecconfig_fileswidget.cpp
@@ -37,7 +37,7 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n )
, _samplingRate( 44100 ), _channels( 2 ), _bits( 16 )
{
_ratebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sampling Rate" ), _hbox );
- connect( _ratebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( ratechanged( int ) ) );
+ connect( _ratebox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( ratechanged( int ) ) );
_rate48 = new TQRadioButton( i18n( "48000 Hz" ), _ratebox );
_rate44 = new TQRadioButton( i18n( "44100 Hz" ), _ratebox );
_rate22 = new TQRadioButton( i18n( "22050 Hz" ), _ratebox );
@@ -50,18 +50,18 @@ KRecConfigFilesWidget::KRecConfigFilesWidget( TQWidget* p, const char* n )
_rateotherline->setMaxLength( 10 );
_rateotherline->setFrame( true );
_rateotherbox->setEnabled( false );
- connect( _rateotherline, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( rateotherchanged( const TQString& ) ) );
+ connect( _rateotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( rateotherchanged( const TQString& ) ) );
_channelsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Channels" ), _hbox );
- connect( _channelsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( channelschanged( int ) ) );
+ connect( _channelsbox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( channelschanged( int ) ) );
_channels2 = new TQRadioButton( i18n( "Stereo (2 channels)" ), _channelsbox );
_channels1 = new TQRadioButton( i18n( "Mono (1 channel)" ), _channelsbox );
_bitsbox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Bits" ), _hbox );
- connect( _bitsbox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( bitschanged( int ) ) );
+ connect( _bitsbox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( bitschanged( int ) ) );
_bits16 = new TQRadioButton( i18n( "16 bit" ), _bitsbox );
_bits8 = new TQRadioButton( i18n( "8 bit" ), _bitsbox );
_usedefaults = new TQCheckBox( i18n( "Use defaults for creating new files" ), this );
- connect( _usedefaults, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) );
+ connect( _usedefaults, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) );
setSpacing( 5 );
diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp
index 32e0dafa..34c8d0cf 100644
--- a/krec/krecconfigure.cpp
+++ b/krec/krecconfigure.cpp
@@ -55,14 +55,14 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
_displaybox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Timedisplay Style" ), this );
_layout_display->addWidget( _displaybox, 100 );
- connect( _displaybox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( displaychanged( int ) ) );
+ connect( _displaybox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( displaychanged( int ) ) );
_display0 = new TQRadioButton( i18n( "Plain samples" ), _displaybox );
_display1 = new TQRadioButton( i18n( "[hours:]mins:secs:samples" ), _displaybox );
_display2 = new TQRadioButton( i18n( "[hours:]mins:secs:frames" ), _displaybox );
_display3 = new TQRadioButton( i18n( "MByte.KByte" ), _displaybox );
_framebasebox = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Framebase" ), this );
_layout_display->addWidget( _framebasebox, 100 );
- connect( _framebasebox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( framebasechanged( int ) ) );
+ connect( _framebasebox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( framebasechanged( int ) ) );
_framebase30 = new TQRadioButton( i18n( "30 frames per second (American TV)" ), _framebasebox );
_framebase25 = new TQRadioButton( i18n( "25 frames per second (European TV)" ), _framebasebox );
_framebase75 = new TQRadioButton( i18n( "75 frames per second (CD)" ), _framebasebox );
@@ -73,11 +73,11 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
_framebaseotherline = new TQLineEdit( _framebaseotherbox );
_framebaseotherline->setMaxLength( 10 );
_framebaseotherbox->setEnabled( false );
- connect( _framebaseotherline, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( framebaseotherchanged( const TQString& ) ) );
+ connect( _framebaseotherline, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( framebaseotherchanged( const TQString& ) ) );
_layout->addSpacing( 5 );
_verboseDisplayMode = new TQCheckBox( i18n( "Show verbose times ( XXmins:XXsecs:XXframes instead of XX:XX::XX )" ), this );
- connect( _verboseDisplayMode, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( verboseDisplayChanged( bool ) ) );
+ connect( _verboseDisplayMode, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( verboseDisplayChanged( bool ) ) );
_layout->addWidget( _verboseDisplayMode );
_layout->addSpacing( 10 );
@@ -85,11 +85,11 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi
_layout->addWidget( _other_title );
_tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this );
- connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) );
+ connect( _tipofday, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( tipofdaychanged( bool ) ) );
_layout->addWidget( _tipofday );
TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
_enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this );
- connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) );
+ connect( _enableAllMessages, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableallmessagesclicked() ) );
_tmplayout->addWidget( _enableAllMessages );
TQLabel* _tmplbl = new TQLabel( i18n( "<qt><i>All messages with the \"Don't show this message again\" option are shown again after selecting this button.</i></qt>" ), this );
_tmplayout->addWidget( _tmplbl );
diff --git a/krec/krecexport_template.cpp b/krec/krecexport_template.cpp
index 05a19d2b..2a76cf2a 100644
--- a/krec/krecexport_template.cpp
+++ b/krec/krecexport_template.cpp
@@ -57,7 +57,7 @@ kdDebug( 60005 ) << k_funcinfo << endl;
if ( !running() ) {
if ( process() ) {
_running = true;
- TQTimer::singleShot( 0, this, TQT_SLOT( process() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( process() ) );
emit running( running() );
}
return true;
diff --git a/krec/krecexport_wave.cpp b/krec/krecexport_wave.cpp
index 6de79d3d..c7f3e18a 100644
--- a/krec/krecexport_wave.cpp
+++ b/krec/krecexport_wave.cpp
@@ -69,7 +69,7 @@ bool KRecExport_Wave::process() {
TQByteArray bytearray( 4096 );
emit getData( bytearray );
_file->writeBlock( bytearray );
- TQTimer::singleShot( 10, this, TQT_SLOT( process() ) );
+ TQTimer::singleShot( 10, this, TQ_SLOT( process() ) );
}
return true;
} else return false;
diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp
index 864b4c43..24053d45 100644
--- a/krec/krecfile.cpp
+++ b/krec/krecfile.cpp
@@ -258,9 +258,9 @@ void KRecFile::newBuffer( const TQString &filename ) {
}
void KRecFile::newBuffer( KRecBuffer* buffer ) {
kdDebug( 60005 ) << k_funcinfo << endl;
- connect( buffer, TQT_SIGNAL( posChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQT_SLOT( newPos( KRecBuffer*, TQIODevice::Offset ) ) );
- connect( buffer, TQT_SIGNAL( sizeChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQT_SLOT( newSize( KRecBuffer*, TQIODevice::Offset ) ) );
- connect( buffer, TQT_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+ connect( buffer, TQ_SIGNAL( posChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQ_SLOT( newPos( KRecBuffer*, TQIODevice::Offset ) ) );
+ connect( buffer, TQ_SIGNAL( sizeChanged( KRecBuffer*, TQIODevice::Offset ) ), this, TQ_SLOT( newSize( KRecBuffer*, TQIODevice::Offset ) ) );
+ connect( buffer, TQ_SIGNAL( deleteSelf( KRecBuffer* ) ), this, TQ_SLOT( deleteBuffer( KRecBuffer* ) ) );
_buffers.append( buffer );
newSize( buffer, buffer->size() );
_currentBuffer = _buffers.findIndex( buffer );
diff --git a/krec/krecfileview.cpp b/krec/krecfileview.cpp
index bdf62adb..5c9f4c06 100644
--- a/krec/krecfileview.cpp
+++ b/krec/krecfileview.cpp
@@ -57,15 +57,15 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
if ( _file ) {
if ( !_file->filename().isNull() ) setFilename( _file->filename() );
else _filename->setText( i18n( "file with no name" ) );
- connect( _file, TQT_SIGNAL( posChanged( int ) ), this, TQT_SLOT( setPos( int ) ) );
- connect( _file, TQT_SIGNAL( posChanged( int ) ), _timebar, TQT_SLOT( newPos( int ) ) );
- connect( _file, TQT_SIGNAL( posChanged( int ) ), _timedisplay, TQT_SLOT( newPos( int ) ) );
- connect( _file, TQT_SIGNAL( sizeChanged( int ) ), this, TQT_SLOT( setSize( int ) ) );
- connect( _file, TQT_SIGNAL( sizeChanged( int ) ), _timebar, TQT_SLOT( newSize( int ) ) );
- connect( _file, TQT_SIGNAL( sizeChanged( int ) ), _timedisplay, TQT_SLOT( newSize( int ) ) );
- connect( _file, TQT_SIGNAL( filenameChanged( const TQString &) ), this, TQT_SLOT( setFilename( const TQString &) ) );
- connect( _file, TQT_SIGNAL( filenameChanged( const TQString &) ), _timedisplay, TQT_SLOT( newFilename( const TQString &) ) );
- connect( _timebar, TQT_SIGNAL( sNewPos( int ) ), _file, TQT_SLOT( newPos( int ) ) );
+ connect( _file, TQ_SIGNAL( posChanged( int ) ), this, TQ_SLOT( setPos( int ) ) );
+ connect( _file, TQ_SIGNAL( posChanged( int ) ), _timebar, TQ_SLOT( newPos( int ) ) );
+ connect( _file, TQ_SIGNAL( posChanged( int ) ), _timedisplay, TQ_SLOT( newPos( int ) ) );
+ connect( _file, TQ_SIGNAL( sizeChanged( int ) ), this, TQ_SLOT( setSize( int ) ) );
+ connect( _file, TQ_SIGNAL( sizeChanged( int ) ), _timebar, TQ_SLOT( newSize( int ) ) );
+ connect( _file, TQ_SIGNAL( sizeChanged( int ) ), _timedisplay, TQ_SLOT( newSize( int ) ) );
+ connect( _file, TQ_SIGNAL( filenameChanged( const TQString &) ), this, TQ_SLOT( setFilename( const TQString &) ) );
+ connect( _file, TQ_SIGNAL( filenameChanged( const TQString &) ), _timedisplay, TQ_SLOT( newFilename( const TQString &) ) );
+ connect( _timebar, TQ_SIGNAL( sNewPos( int ) ), _file, TQ_SLOT( newPos( int ) ) );
_timebar->newPos( _file->position() );
_timebar->newSize( _file->size() );
_timedisplay->newSamplingRate( _file->samplerate() );
@@ -75,7 +75,7 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
_timedisplay->newPos( _file->position() );
_timedisplay->newSize( _file->size() );
} else {
- disconnect( this, TQT_SLOT( setPos( TQIODevice::Offset ) ) );
+ disconnect( this, TQ_SLOT( setPos( TQIODevice::Offset ) ) );
_filename->setText( i18n( "<no file>" ) );
_timedisplay->newFilename( TQString() );
}
diff --git a/krec/krecfileviewhelpers.cpp b/krec/krecfileviewhelpers.cpp
index 8a177e20..4757078f 100644
--- a/krec/krecfileviewhelpers.cpp
+++ b/krec/krecfileviewhelpers.cpp
@@ -80,9 +80,9 @@ KRecTimeDisplay::KRecTimeDisplay( TQWidget* p, const char* n )
, _samplingRate( 44100 ), _bits( 16 ), _channels( 2 )
{
_position = new AKLabel( this );
- connect( _position, TQT_SIGNAL( showContextMenu( const TQPoint & ) ), this, TQT_SLOT( timeContextMenu( const TQPoint &) ) );
+ connect( _position, TQ_SIGNAL( showContextMenu( const TQPoint & ) ), this, TQ_SLOT( timeContextMenu( const TQPoint &) ) );
_size = new AKLabel( this );
- connect( _size, TQT_SIGNAL( showContextMenu( const TQPoint &) ), this, TQT_SLOT( sizeContextMenu( const TQPoint &) ) );
+ connect( _size, TQ_SIGNAL( showContextMenu( const TQPoint &) ), this, TQ_SLOT( sizeContextMenu( const TQPoint &) ) );
_layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight, 0, 2 );
_layout->addStretch( 100 );
diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index 4f5b0537..c626a961 100644
--- a/krec/krecfilewidgets.cpp
+++ b/krec/krecfilewidgets.cpp
@@ -64,8 +64,8 @@ kdDebug( 60005 ) << k_funcinfo << file << endl;
for ( TQValueList<KRecBuffer*>::iterator it = _file->_buffers.begin(); it != _file->_buffers.end(); ++it ) {
newBuffer( ( *it ) );
}
- connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQT_SLOT( newBuffer( KRecBuffer* ) ) );
- connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+ connect( _file, TQ_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQ_SLOT( newBuffer( KRecBuffer* ) ) );
+ connect( _file, TQ_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQ_SLOT( deleteBuffer( KRecBuffer* ) ) );
//kdDebug( 60005 ) << _file->_currentBuffer << endl;
}
}
@@ -98,7 +98,7 @@ void KRecFileWidget::mouseReleaseEvent( TQMouseEvent* qme ) {
void KRecFileWidget::newBuffer( KRecBuffer* buffer ) {
//kdDebug( 60005 ) << k_funcinfo << buffer << endl;
KRecBufferWidget *tmp = new KRecBufferWidget( buffer, this );
- connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
+ connect( tmp, TQ_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQ_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
bufferwidgets.append( tmp );
tmp->show();
resizeEvent();
@@ -121,10 +121,10 @@ void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) {
TDEPopupMenu tmp( this );
TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), this );
_activeaction->setChecked( bw->buffer()->active() );
- connect( _activeaction, TQT_SIGNAL( toggled( bool ) ), bw->buffer(), TQT_SLOT( setActive( bool ) ) );
- TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQT_SLOT( deleteBuffer() ), this );
- TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), bw, TQT_SLOT( changeTitle() ), this );
- TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), bw, TQT_SLOT( changeComment() ), this );
+ connect( _activeaction, TQ_SIGNAL( toggled( bool ) ), bw->buffer(), TQ_SLOT( setActive( bool ) ) );
+ TDEAction* _removeaction = new TDEAction( i18n( "Remove This Part" ), "fileremove", TDEShortcut(), bw->buffer(), TQ_SLOT( deleteBuffer() ), this );
+ TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), bw, TQ_SLOT( changeTitle() ), this );
+ TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), bw, TQ_SLOT( changeComment() ), this );
_activeaction->plug( &tmp );
_changetitle->plug( &tmp );
_changecomment->plug( &tmp );
@@ -147,7 +147,7 @@ KRecBufferWidget::KRecBufferWidget( KRecBuffer* buffer, TQWidget* p, const char*
, _main_region( 0 ), _title_region( 0 ), _fileend_region( 0 )
, alreadyreadsize( 0 )
{
- connect( _buffer, TQT_SIGNAL( somethingChanged() ), this, TQT_SLOT( update() ) );
+ connect( _buffer, TQ_SIGNAL( somethingChanged() ), this, TQ_SLOT( update() ) );
kdDebug( 60005 ) << k_funcinfo << endl;
}
KRecBufferWidget::~KRecBufferWidget() {
diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp
index 8f5f7385..ecc9bf4c 100644
--- a/krec/krecnewproperties.cpp
+++ b/krec/krecnewproperties.cpp
@@ -57,16 +57,16 @@ kdDebug( 60005 ) << k_funcinfo << endl;
_layout->addWidget( captionlabel );
_filewidget = new KRecConfigFilesWidget( this );
- connect( _filewidget, TQT_SIGNAL( sRateChanged( int ) ), this, TQT_SLOT( ratechanged( int ) ) );
- connect( _filewidget, TQT_SIGNAL( sChannelsChanged( int ) ), this, TQT_SLOT( channelschanged( int ) ) );
- connect( _filewidget, TQT_SIGNAL( sBitsChanged( int ) ), this, TQT_SLOT( bitschanged( int ) ) );
- connect( _filewidget, TQT_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQT_SLOT( usedefaultschanged( bool ) ) );
+ connect( _filewidget, TQ_SIGNAL( sRateChanged( int ) ), this, TQ_SLOT( ratechanged( int ) ) );
+ connect( _filewidget, TQ_SIGNAL( sChannelsChanged( int ) ), this, TQ_SLOT( channelschanged( int ) ) );
+ connect( _filewidget, TQ_SIGNAL( sBitsChanged( int ) ), this, TQ_SLOT( bitschanged( int ) ) );
+ connect( _filewidget, TQ_SIGNAL( sUseDefaultsChanged( bool ) ), this, TQ_SLOT( usedefaultschanged( bool ) ) );
TQWidget *_btnWidget = new TQWidget( this );
_layoutbuttons = new TQHBoxLayout( _btnWidget );
_layoutbuttons->addStretch( 100 );
_btnok = new KPushButton( KStdGuiItem::ok(), _btnWidget );
- connect( _btnok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
+ connect( _btnok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) );
_layoutbuttons->addWidget( _btnok, 0 );
_layout->addWidget( new KSeparator( KSeparator::HLine, this ) );
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index f9a79891..d1f74f54 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -107,8 +107,8 @@ void KRecPrivate::openFile() {
}
void KRecPrivate::pNewFile( KRecFile* file ) {
_currentFile = file;
- connect( m_recStream, TQT_SIGNAL( data( TQByteArray& ) ), _currentFile, TQT_SLOT( writeData( TQByteArray& ) ) );
- connect( m_playStream, TQT_SIGNAL( requestData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) );
+ connect( m_recStream, TQ_SIGNAL( data( TQByteArray& ) ), _currentFile, TQ_SLOT( writeData( TQByteArray& ) ) );
+ connect( m_playStream, TQ_SIGNAL( requestData( TQByteArray& ) ), _currentFile, TQ_SLOT( getData( TQByteArray& ) ) );
mainwidget->_fileview->setFile( _currentFile );
checkActions();
}
@@ -162,9 +162,9 @@ void KRecPrivate::exportFile() {
if ( _exportitem ) {
_exportitem->initialize( _currentFile->samplerate(), _currentFile->bits(), _currentFile->channels() );
if ( _exportitem->initialize( filename ) ) {
- connect( _exportitem, TQT_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQT_SLOT( getData( TQByteArray& ) ) );
- connect( _currentFile, TQT_SIGNAL( endReached() ), _exportitem, TQT_SLOT( stop() ) );
- connect( _currentFile, TQT_SIGNAL( endReached() ), this, TQT_SLOT( endExportFile() ) );
+ connect( _exportitem, TQ_SIGNAL( getData( TQByteArray& ) ), _currentFile, TQ_SLOT( getData( TQByteArray& ) ) );
+ connect( _currentFile, TQ_SIGNAL( endReached() ), _exportitem, TQ_SLOT( stop() ) );
+ connect( _currentFile, TQ_SIGNAL( endReached() ), this, TQ_SLOT( endExportFile() ) );
_exportitem->start();
}
} else
@@ -185,7 +185,7 @@ void KRecPrivate::exportFile() {
} else KRecGlobal::the()->message( i18n( "There is nothing to export." ) );
checkActions();
}
-void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQT_SLOT( endExportFile2() ) ); }
+void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQ_SLOT( endExportFile2() ) ); }
void KRecPrivate::endExportFile2() {
_exportitem->finalize();
disconnect( _currentFile, 0, _exportitem, 0 );
@@ -283,40 +283,40 @@ KRecord::KRecord(TQWidget *parent, const char *name )
// * * * Actions * * *
d->artsactions = new ArtsActions( d->server, actionCollection(), this );
- KStdAction::preferences( d, TQT_SLOT( showConfDialog() ), actionCollection() );
+ KStdAction::preferences( d, TQ_SLOT( showConfDialog() ), actionCollection() );
- KStdAction::openNew( d, TQT_SLOT( newFile() ), actionCollection() );
- KStdAction::open( d, TQT_SLOT( openFile() ), actionCollection() );
- KStdAction::save( d, TQT_SLOT( saveFile() ), actionCollection() );
- KStdAction::saveAs( d, TQT_SLOT( saveAsFile() ), actionCollection() );
- KStdAction::close( d, TQT_SLOT( closeFile() ), actionCollection() );
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::openNew( d, TQ_SLOT( newFile() ), actionCollection() );
+ KStdAction::open( d, TQ_SLOT( openFile() ), actionCollection() );
+ KStdAction::save( d, TQ_SLOT( saveFile() ), actionCollection() );
+ KStdAction::saveAs( d, TQ_SLOT( saveAsFile() ), actionCollection() );
+ KStdAction::close( d, TQ_SLOT( closeFile() ), actionCollection() );
+ KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
- KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() );
+ KStdAction::tipOfDay( d, TQ_SLOT( forceTipOfDay() ), actionCollection() );
d->aExportFile = new TDEAction( i18n( "Export..." ), TDEShortcut(),
- d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" );
+ d, TQ_SLOT( exportFile() ), actionCollection(), "export_file" );
d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ),
- this, TQT_SLOT( startRec() ), actionCollection(), "player_record" );
+ this, TQ_SLOT( startRec() ), actionCollection(), "player_record" );
d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ),
- this, TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
+ this, TQ_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ),
- this, TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
+ this, TQ_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
d->aThru = new TDEToggleAction( i18n( "Play Through" ), TDEShortcut( CTRL + Key_P), actionCollection(), "play_thru" );
- connect( d->aThru, TQT_SIGNAL( toggled( bool ) ), d, TQT_SLOT( playthru( bool ) ) );
+ connect( d->aThru, TQ_SIGNAL( toggled( bool ) ), d, TQ_SLOT( playthru( bool ) ) );
d->aBegin = new TDEAction( i18n( "Go to &Beginning" ), TDEShortcut( SHIFT + Key_Left ),
- d, TQT_SLOT( toBegin() ), actionCollection(), "player_gobegin" );
+ d, TQ_SLOT( toBegin() ), actionCollection(), "player_gobegin" );
d->aEnd = new TDEAction( i18n( "Go to &End" ), TDEShortcut( SHIFT + Key_Right ),
- d, TQT_SLOT( toEnd() ), actionCollection(), "player_goend" );
+ d, TQ_SLOT( toEnd() ), actionCollection(), "player_goend" );
( void* ) d->artsactions->actionAudioManager();
d->aExecaRtsControl = new TDEAction( i18n( "Start aRts Control Tool" ), TDEShortcut(),
- d, TQT_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" );
+ d, TQ_SLOT( execaRtsControl() ), actionCollection(), "exec_artscontrol" );
d->aExecKMix = new TDEAction( i18n( "Start KMix" ), TDEShortcut(),
- d, TQT_SLOT( execKMix() ), actionCollection(), "exec_kmix" );
+ d, TQ_SLOT( execKMix() ), actionCollection(), "exec_kmix" );
// * * * GUI * * *
// TODO Fix toolbar config so this line can just be setupGUI()
diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp
index d337dafc..a40c5b1f 100644
--- a/krec/mp3_export/krecexport_mp3.cpp
+++ b/krec/mp3_export/krecexport_mp3.cpp
@@ -128,7 +128,7 @@ bool KRecExport_MP3::process() {
i18n( lame_error[ code ] ) );
error_occurred = true;
}
- TQTimer::singleShot( 10, this, TQT_SLOT( process() ) );
+ TQTimer::singleShot( 10, this, TQ_SLOT( process() ) );
}
return true;
} else return false;
diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp
index 2841c64b..5c957577 100644
--- a/krec/ogg_export/krecexport_ogg.cpp
+++ b/krec/ogg_export/krecexport_ogg.cpp
@@ -169,7 +169,7 @@ bool KRecExport_OGG::process() {
}
}
}
- TQTimer::singleShot( 10, this, TQT_SLOT( process() ) );
+ TQTimer::singleShot( 10, this, TQ_SLOT( process() ) );
}
return true;
} else return false;
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp
index 40a17cbf..9fc6cbac 100644
--- a/kscd/cddbdlg.cpp
+++ b/kscd/cddbdlg.cpp
@@ -46,15 +46,15 @@ CDDBDlg::CDDBDlg( TQWidget* parent, const char* name )
setButtonText( User1, i18n( "Upload" ) );
setButtonText( User2, i18n( "Fetch Info" ) );
- connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( save() ) );
- connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( upload() ) );
- connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SIGNAL( cddbQuery() ) );
- connect( m_dlgBase, TQT_SIGNAL( play( int ) ), TQT_SIGNAL( play( int ) ) );
+ connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( save() ) );
+ connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( upload() ) );
+ connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SIGNAL( cddbQuery() ) );
+ connect( m_dlgBase, TQ_SIGNAL( play( int ) ), TQ_SIGNAL( play( int ) ) );
cddbClient = new KCDDB::Client();
cddbClient->setBlockingMode(false);
- connect (cddbClient, TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(submitFinished(CDDB::Result)));
+ connect (cddbClient, TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(submitFinished(CDDB::Result)));
}
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 0241b803..3a45e71a 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
// popup menu for right mouse button
TQPopupMenu* popup = contextMenu();
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked()));
- popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-start", TDEIcon::Small), i18n("Play/Pause"), parent, TQ_SLOT(playClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-playback-stop", TDEIcon::Small), i18n("Stop"), parent, TQ_SLOT(stopClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-forward", TDEIcon::Small), i18n("Next"), parent, TQ_SLOT(nextClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("media-skip-backward", TDEIcon::Small), i18n("Previous"), parent, TQ_SLOT(prevClicked()));
+ popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("player_eject", TDEIcon::Small), i18n("Eject"), parent, TQ_SLOT(ejectClicked()));
TQToolTip::add(this, kapp->aboutData()->programName());
}
@@ -80,7 +80,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons)
{
TQPushButton* backButton = new TQPushButton(m_backPix, 0, box, "popup_back");
backButton->setFlat(true);
- connect(backButton, TQT_SIGNAL(clicked()), m_backAction, TQT_SLOT(activate()));
+ connect(backButton, TQ_SIGNAL(clicked()), m_backAction, TQ_SLOT(activate()));
}
TQLabel* l = new TQLabel(songName, box);
@@ -90,7 +90,7 @@ void DockWidget::createPopup(const TQString &songName, bool addButtons)
{
TQPushButton* forwardButton = new TQPushButton(m_forwardPix, 0, box, "popup_forward");
forwardButton->setFlat(true);
- connect(forwardButton, TQT_SIGNAL(clicked()), m_forwardAction, TQT_SLOT(activate()));
+ connect(forwardButton, TQ_SIGNAL(clicked()), m_forwardAction, TQ_SLOT(activate()));
}
m_popup->setView(box);
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index e17fdaa7..5ae482d2 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -109,7 +109,7 @@ TDECompactDisc::TDECompactDisc(InformationMode infoMode) :
m_trackArtists.clear();
m_trackTitles.clear();
m_trackStartFrames.clear();
- connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired()));
+ connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerExpired()));
}
TDECompactDisc::~TDECompactDisc()
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 34e7c360..3a8599c4 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
random_current = random_list.begin();
cddb = new KCDDB::Client();
- connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result)));
+ connect(cddb, TQ_SIGNAL(finished(CDDB::Result)), this, TQ_SLOT(lookupCDDBDone(CDDB::Result)));
#if defined(BUILD_CDDA)
audio_systems_list
@@ -124,10 +124,10 @@ KSCD::KSCD( TQWidget *parent, const char *name )
// the time slider
timeIcon->setPixmap(SmallIcon("player_time"));
- connect(timeSlider, TQT_SIGNAL(sliderPressed()), TQT_SLOT(timeSliderPressed()));
- connect(timeSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(timeSliderReleased()));
- connect(timeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(timeSliderMoved(int)));
- connect(timeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(jumpToTime(int)));
+ connect(timeSlider, TQ_SIGNAL(sliderPressed()), TQ_SLOT(timeSliderPressed()));
+ connect(timeSlider, TQ_SIGNAL(sliderReleased()), TQ_SLOT(timeSliderReleased()));
+ connect(timeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(timeSliderMoved(int)));
+ connect(timeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(jumpToTime(int)));
// the volume slider
volumeIcon->setPixmap(SmallIcon("player_volume"));
@@ -135,33 +135,33 @@ KSCD::KSCD( TQWidget *parent, const char *name )
TQString str;
str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) );
volumelabel->setText(str);
- connect(volumeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volChanged(int)));
+ connect(volumeSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volChanged(int)));
/* FIXME check for return value */
setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/);
- connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), this, TQT_SLOT(trackChanged(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(discStopped()), this, TQT_SLOT(discStopped()));
- connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), this, TQT_SLOT(discChanged(unsigned)));
- connect( &queryledtimer, TQT_SIGNAL(timeout()), TQT_SLOT(togglequeryled()) );
- connect( &titlelabeltimer, TQT_SIGNAL(timeout()), TQT_SLOT(titlelabeltimeout()) );
- connect( &cycletimer, TQT_SIGNAL(timeout()), TQT_SLOT(cycletimeout()) );
- connect( &jumpTrackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(jumpTracks()) );
+ connect(m_cd, TQ_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned)));
+ connect(m_cd, TQ_SIGNAL(trackPaused(unsigned, unsigned)), this, TQ_SLOT(trackUpdate(unsigned, unsigned)));
+ connect(m_cd, TQ_SIGNAL(trackChanged(unsigned, unsigned)), this, TQ_SLOT(trackChanged(unsigned, unsigned)));
+ connect(m_cd, TQ_SIGNAL(discStopped()), this, TQ_SLOT(discStopped()));
+ connect(m_cd, TQ_SIGNAL(discChanged(unsigned)), this, TQ_SLOT(discChanged(unsigned)));
+ connect( &queryledtimer, TQ_SIGNAL(timeout()), TQ_SLOT(togglequeryled()) );
+ connect( &titlelabeltimer, TQ_SIGNAL(timeout()), TQ_SLOT(titlelabeltimeout()) );
+ connect( &cycletimer, TQ_SIGNAL(timeout()), TQ_SLOT(cycletimeout()) );
+ connect( &jumpTrackTimer, TQ_SIGNAL(timeout()), TQ_SLOT(jumpTracks()) );
/*
these are always connected in base class
- connect( playPB, TQT_SIGNAL(clicked()), TQT_SLOT(playClicked()) );
- connect( nextPB, TQT_SIGNAL(clicked()), TQT_SLOT(nextClicked()) );
- connect( prevPB, TQT_SIGNAL(clicked()), TQT_SLOT(prevClicked()) );
- connect( stopPB, TQT_SIGNAL(clicked()), TQT_SLOT(stopClicked()) );
- connect( ejectPB, TQT_SIGNAL(clicked()), TQT_SLOT(ejectClicked()) );
+ connect( playPB, TQ_SIGNAL(clicked()), TQ_SLOT(playClicked()) );
+ connect( nextPB, TQ_SIGNAL(clicked()), TQ_SLOT(nextClicked()) );
+ connect( prevPB, TQ_SIGNAL(clicked()), TQ_SLOT(prevClicked()) );
+ connect( stopPB, TQ_SIGNAL(clicked()), TQ_SLOT(stopClicked()) );
+ connect( ejectPB, TQ_SIGNAL(clicked()), TQ_SLOT(ejectClicked()) );
*/
- connect( repeatPB, TQT_SIGNAL(clicked()), TQT_SLOT(loopClicked()) );
- connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int)));
- connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected()));
- connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected()));
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(setColors()));
- connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(setIcons()));
+ connect( repeatPB, TQ_SIGNAL(clicked()), TQ_SLOT(loopClicked()) );
+ connect( songListCB, TQ_SIGNAL(activated(int)), TQ_SLOT(trackSelected(int)));
+ connect( shufflePB, TQ_SIGNAL(clicked()), TQ_SLOT(randomSelected()));
+ connect( cddbPB, TQ_SIGNAL(clicked()), TQ_SLOT(CDDialogSelected()));
+ connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(setColors()));
+ connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(setIcons()));
TQToolTip::remove(songListCB);
TQToolTip::add(songListCB, i18n("Track list"));
@@ -170,24 +170,24 @@ KSCD::KSCD( TQWidget *parent, const char *name )
m_actions = new TDEActionCollection(this);
TDEAction* action;
- action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQT_SLOT(playClicked()), m_actions, "Play/Pause");
- action = new TDEAction(i18n("Stop"), Key_S, this, TQT_SLOT(stopClicked()), m_actions, "Stop");
- action = new TDEAction(i18n("Previous"), Key_B, this, TQT_SLOT(prevClicked()), m_actions, "Previous");
- action = new TDEAction(i18n("Next"), Key_N, this, TQT_SLOT(nextClicked()), m_actions, "Next");
- action = KStdAction::quit(this, TQT_SLOT(quitClicked()), m_actions);
- action = KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
- action = KStdAction::keyBindings(this, TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
- action = KStdAction::preferences(this, TQT_SLOT(showConfig()), m_actions);
- action = new TDEAction(i18n("Loop"), Key_L, this, TQT_SLOT(loopClicked()), m_actions, "Loop");
- action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQT_SLOT(ejectClicked()), m_actions, "Eject");
- action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQT_SLOT(incVolume()), m_actions, "IncVolume");
+ action = new TDEAction(i18n("Play/Pause"), Key_P, this, TQ_SLOT(playClicked()), m_actions, "Play/Pause");
+ action = new TDEAction(i18n("Stop"), Key_S, this, TQ_SLOT(stopClicked()), m_actions, "Stop");
+ action = new TDEAction(i18n("Previous"), Key_B, this, TQ_SLOT(prevClicked()), m_actions, "Previous");
+ action = new TDEAction(i18n("Next"), Key_N, this, TQ_SLOT(nextClicked()), m_actions, "Next");
+ action = KStdAction::quit(this, TQ_SLOT(quitClicked()), m_actions);
+ action = KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
+ action = KStdAction::keyBindings(this, TQ_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
+ action = KStdAction::preferences(this, TQ_SLOT(showConfig()), m_actions);
+ action = new TDEAction(i18n("Loop"), Key_L, this, TQ_SLOT(loopClicked()), m_actions, "Loop");
+ action = new TDEAction(i18n("Eject"), CTRL + Key_E, this, TQ_SLOT(ejectClicked()), m_actions, "Eject");
+ action = new TDEAction(i18n("Increase Volume"), Key_Plus, this, TQ_SLOT(incVolume()), m_actions, "IncVolume");
TDEShortcut increaseVolume = action->shortcut();
increaseVolume.append( KKey( Key_Equal ) );
action->setShortcut( increaseVolume );
- action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQT_SLOT(decVolume()), m_actions, "DecVolume");
- action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQT_SLOT(showConfig()), m_actions, "Options");
- action = new TDEAction(i18n("Shuffle"), Key_R, this, TQT_SLOT(randomSelected()), m_actions, "Shuffle");
- action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+ action = new TDEAction(i18n("Decrease Volume"), Key_Minus, this, TQ_SLOT(decVolume()), m_actions, "DecVolume");
+ action = new TDEAction(i18n("Options"), CTRL + Key_T, this, TQ_SLOT(showConfig()), m_actions, "Options");
+ action = new TDEAction(i18n("Shuffle"), Key_R, this, TQ_SLOT(randomSelected()), m_actions, "Shuffle");
+ action = new TDEAction(i18n("CDDB"), CTRL + Key_D, this, TQ_SLOT(CDDialogSelected()), m_actions, "CDDB");
m_actions->readShortcutSettings("Shortcuts");
@@ -232,20 +232,20 @@ void KSCD::initGlobalShortcuts() {
//Definition of global shortcuts is based on 'local' shortcuts which follow
//the WIN key.
m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"),
- this, TQT_SLOT(nextClicked()));
+ this, TQ_SLOT(nextClicked()));
//NOTE: WIN+B collidates with amarok's default global shortcut.
m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"),
- this, TQT_SLOT(prevClicked()));
+ this, TQ_SLOT(prevClicked()));
m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0,
- this, TQT_SLOT(playClicked()));
+ this, TQ_SLOT(playClicked()));
m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0,
- this, TQT_SLOT(stopClicked()));
+ this, TQ_SLOT(stopClicked()));
m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"),
- this, TQT_SLOT(incVolume()));
+ this, TQ_SLOT(incVolume()));
m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"),
- this, TQT_SLOT(decVolume()));
+ this, TQ_SLOT(decVolume()));
m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0,
- this, TQT_SLOT(incVolume()));
+ this, TQ_SLOT(incVolume()));
m_globalAccel->setConfigGroup( "GlobalShortcuts" );
m_globalAccel->readSettings( kapp->config() );
@@ -312,7 +312,7 @@ void KSCD::drawPanel()
trackTimeLED[u]->setLEDoffColor(Prefs::backColor());
trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor());
trackTimeLED[u]->setGeometry(2 + u * 18, D, 23, 30);
- connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode()));
+ connect(trackTimeLED[u], TQ_SIGNAL(clicked()), this, TQ_SLOT(cycleplaytimemode()));
}
setLEDs(-1);
@@ -369,7 +369,7 @@ void KSCD::setupPopups()
mainPopup->insertItem(i18n("Artist Information"), infoPopup);
- connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) );
+ connect( infoPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(information(int)) );
KHelpMenu* helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu());
@@ -756,16 +756,16 @@ void KSCD::showConfig()
cfg->readConfig();
configDialog -> addPage(m, cfg, TQString("CDDB"), "application-x-cda", i18n("Configure Fetching Items"));
- connect(configDialog, TQT_SIGNAL(okClicked()), m, TQT_SLOT(save()));
- connect(configDialog, TQT_SIGNAL(applyClicked()), m, TQT_SLOT(save()));
- connect(configDialog, TQT_SIGNAL(defaultClicked()), m, TQT_SLOT(defaults()));
+ connect(configDialog, TQ_SIGNAL(okClicked()), m, TQ_SLOT(save()));
+ connect(configDialog, TQ_SIGNAL(applyClicked()), m, TQ_SLOT(save()));
+ connect(configDialog, TQ_SIGNAL(defaultClicked()), m, TQ_SLOT(defaults()));
}
}
}
updateConfigDialog(confWidget);
- connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone()));
+ connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(configDone()));
configDialog -> show();
} // showConfig()
@@ -814,14 +814,14 @@ void KSCD::setDocking(bool dock)
if (!m_dockWidget)
{
m_dockWidget = new DockWidget(this, "dockw");
- connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked()));
+ connect(m_dockWidget, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitClicked()));
}
m_dockWidget->show();
- connect(this, TQT_SIGNAL(trackChanged(const TQString&)),
- m_dockWidget, TQT_SLOT(setToolTip(const TQString&)));
- connect(this, TQT_SIGNAL(trackChanged(const TQString&)),
- m_dockWidget, TQT_SLOT(createPopup(const TQString&)));
+ connect(this, TQ_SIGNAL(trackChanged(const TQString&)),
+ m_dockWidget, TQ_SLOT(setToolTip(const TQString&)));
+ connect(this, TQ_SIGNAL(trackChanged(const TQString&)),
+ m_dockWidget, TQ_SLOT(createPopup(const TQString&)));
}
else
{
@@ -1155,11 +1155,11 @@ void KSCD::CDDialogSelected()
cddialog = new CDDBDlg(this);
cddialog->setData(cddbInfo, m_cd->discSignature(), playlist);
- connect(cddialog,TQT_SIGNAL(cddbQuery()),TQT_SLOT(lookupCDDB()));
- connect(cddialog,TQT_SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
- TQT_SLOT(setCDInfo(KCDDB::CDInfo)));
- connect(cddialog,TQT_SIGNAL(finished()),TQT_SLOT(CDDialogDone()));
- connect(cddialog,TQT_SIGNAL(play(int)),TQT_SLOT(trackSelected(int)));
+ connect(cddialog,TQ_SIGNAL(cddbQuery()),TQ_SLOT(lookupCDDB()));
+ connect(cddialog,TQ_SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
+ TQ_SLOT(setCDInfo(KCDDB::CDInfo)));
+ connect(cddialog,TQ_SIGNAL(finished()),TQ_SLOT(CDDialogDone()));
+ connect(cddialog,TQ_SIGNAL(play(int)),TQ_SLOT(trackSelected(int)));
}
cddialog->show();
diff --git a/libkcddb/asynccddbplookup.cpp b/libkcddb/asynccddbplookup.cpp
index e4642dbe..f5dcf64d 100644
--- a/libkcddb/asynccddbplookup.cpp
+++ b/libkcddb/asynccddbplookup.cpp
@@ -48,12 +48,12 @@ namespace KCDDB
socket_->setBlocking( false );
- connect (socket_, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotGotError(int)));
+ connect (socket_, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotGotError(int)));
- connect (socket_, TQT_SIGNAL( connected(const KResolverEntry &) ),
- TQT_SLOT( slotConnectionSuccess() ) );
+ connect (socket_, TQ_SIGNAL( connected(const KResolverEntry &) ),
+ TQ_SLOT( slotConnectionSuccess() ) );
- connect (socket_, TQT_SIGNAL( readyRead() ), TQT_SLOT( slotReadyRead() ) );
+ connect (socket_, TQ_SIGNAL( readyRead() ), TQ_SLOT( slotReadyRead() ) );
if ( trackOffsetList.count() < 3 )
return UnknownError;
diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index b6f26051..3e988f2b 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -52,8 +52,8 @@ namespace KCDDB
trackOffsetList_ = trackOffsetList;
- connect( this, TQT_SIGNAL( queryReady() ), TQT_SLOT( slotQueryReady() ) );
- connect( this, TQT_SIGNAL( readReady() ), TQT_SLOT( requestCDInfoForMatch() ) );
+ connect( this, TQ_SIGNAL( queryReady() ), TQ_SLOT( slotQueryReady() ) );
+ connect( this, TQ_SIGNAL( readReady() ), TQ_SLOT( requestCDInfoForMatch() ) );
initURL( hostName, port );
@@ -144,10 +144,10 @@ namespace KCDDB
if ( 0 == job )
return ServerError;
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
return Success;
}
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 246e5804..6201e886 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -36,7 +36,7 @@ namespace KCDDB
CDDB::Result AsyncHTTPSubmit::runJob(TDEIO::Job* job)
{
- connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotFinished(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotFinished(TDEIO::Job *)));
return CDDB::Success;
}
diff --git a/libkcddb/asyncsmtpsubmit.cpp b/libkcddb/asyncsmtpsubmit.cpp
index 1214e951..305f9ce9 100644
--- a/libkcddb/asyncsmtpsubmit.cpp
+++ b/libkcddb/asyncsmtpsubmit.cpp
@@ -38,8 +38,8 @@ namespace KCDDB
CDDB::Result AsyncSMTPSubmit::runJob(TDEIO::Job* job)
{
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT(slotDone( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT(slotDone( TDEIO::Job* ) ) );
return Success;
}
diff --git a/libkcddb/cdinfoencodingwidget.cpp b/libkcddb/cdinfoencodingwidget.cpp
index f2a7e578..6714c56b 100644
--- a/libkcddb/cdinfoencodingwidget.cpp
+++ b/libkcddb/cdinfoencodingwidget.cpp
@@ -37,8 +37,8 @@ namespace KCDDB
slotEncodingChanged(encodingCombo->currentText());
- connect(encodingCombo,TQT_SIGNAL(activated(const TQString&)),
- this,TQT_SLOT(slotEncodingChanged(const TQString&)));
+ connect(encodingCombo,TQ_SIGNAL(activated(const TQString&)),
+ this,TQ_SLOT(slotEncodingChanged(const TQString&)));
}
TQString CDInfoEncodingWidget::selectedEncoding()
diff --git a/libkcddb/client.cpp b/libkcddb/client.cpp
index c1a0102a..38ba5aea 100644
--- a/libkcddb/client.cpp
+++ b/libkcddb/client.cpp
@@ -177,16 +177,16 @@ namespace KCDDB
cdInfoLookup = new AsyncCDDBPLookup();
connect( static_cast<AsyncCDDBPLookup *>( cdInfoLookup ),
- TQT_SIGNAL( finished( CDDB::Result ) ),
- TQT_SLOT( slotFinished( CDDB::Result ) ) );
+ TQ_SIGNAL( finished( CDDB::Result ) ),
+ TQ_SLOT( slotFinished( CDDB::Result ) ) );
}
else
{
cdInfoLookup = new AsyncHTTPLookup();
connect( static_cast<AsyncHTTPLookup *>( cdInfoLookup ),
- TQT_SIGNAL( finished( CDDB::Result ) ),
- TQT_SLOT( slotFinished( CDDB::Result ) ) );
+ TQ_SIGNAL( finished( CDDB::Result ) ),
+ TQ_SLOT( slotFinished( CDDB::Result ) ) );
}
r = cdInfoLookup->lookup( d->config.hostname(),
@@ -267,8 +267,8 @@ namespace KCDDB
{
cdInfoSubmit = new AsyncHTTPSubmit(from, hostname, port);
connect( static_cast<AsyncHTTPSubmit *>( cdInfoSubmit ),
- TQT_SIGNAL(finished( CDDB::Result ) ),
- TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) );
+ TQ_SIGNAL(finished( CDDB::Result ) ),
+ TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) );
}
break;
@@ -285,8 +285,8 @@ namespace KCDDB
{
cdInfoSubmit = new AsyncSMTPSubmit( hostname, port, username, from, d->config.submitAddress() );
connect( static_cast<AsyncSMTPSubmit *>( cdInfoSubmit ),
- TQT_SIGNAL( finished( CDDB::Result ) ),
- TQT_SLOT( slotSubmitFinished( CDDB::Result ) ) );
+ TQ_SIGNAL( finished( CDDB::Result ) ),
+ TQ_SLOT( slotSubmitFinished( CDDB::Result ) ) );
}
break;
}
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index e9100c40..1910527b 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -22,8 +22,8 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
TrackOffsetList list;
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 045e6b15..a86d4a66 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -21,8 +21,8 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
TrackOffsetList list;
diff --git a/libkcddb/test/asynchttpsubmittest.cpp b/libkcddb/test/asynchttpsubmittest.cpp
index 0dd0766e..ace90808 100644
--- a/libkcddb/test/asynchttpsubmittest.cpp
+++ b/libkcddb/test/asynchttpsubmittest.cpp
@@ -51,8 +51,8 @@ AsyncHTTPSubmitTest::AsyncHTTPSubmitTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
client_->submit(cdInfo, list);
diff --git a/libkcddb/test/asyncsmtpsubmittest.cpp b/libkcddb/test/asyncsmtpsubmittest.cpp
index 72ee0adc..90f6fddd 100644
--- a/libkcddb/test/asyncsmtpsubmittest.cpp
+++ b/libkcddb/test/asyncsmtpsubmittest.cpp
@@ -52,8 +52,8 @@ AsyncSMTPSubmitTest::AsyncSMTPSubmitTest()
connect
(
client_,
- TQT_SIGNAL(finished(CDDB::Result)),
- TQT_SLOT(slotFinished(CDDB::Result))
+ TQ_SIGNAL(finished(CDDB::Result)),
+ TQ_SLOT(slotFinished(CDDB::Result))
);
client_->submit(cdInfo, list);
diff --git a/mpeglib/lib/util/abstract/abs_thread.h b/mpeglib/lib/util/abstract/abs_thread.h
index 0da7e2a0..f65445d8 100644
--- a/mpeglib/lib/util/abstract/abs_thread.h
+++ b/mpeglib/lib/util/abstract/abs_thread.h
@@ -83,7 +83,7 @@ typedef SDL_mutex* abs_thread_mutex_t;
typedef SDL_cond* abs_thread_cond_t;
typedef SDL_Thread* abs_thread_t;
-// TQT_SIGNAL FUNCTIONS
+// SIGNAL FUNCTIONS
// note we have _no_ cond attribut (not needed)
int abs_thread_cond_init(abs_thread_cond_t* cond);
int abs_thread_cond_destroy(abs_thread_cond_t *cond);
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index d135658e..e93509d9 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -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;
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 3fc17983..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"), 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"), this, TQT_SLOT(moveUp()), bottomLeftFrame);
- down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), this, TQT_SLOT(moveDown()), bottomLeftFrame);
- configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), this, TQT_SLOT(configureEffect()), bottomLeftFrame);
- remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), 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..8e0000fa 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -293,19 +293,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 +328,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..aad2de65 100644
--- a/noatun/library/equalizer.cpp
+++ b/noatun/library/equalizer.cpp
@@ -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..89ec960b 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -71,7 +71,7 @@ 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);
@@ -82,8 +82,8 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
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/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index 745886da..5fa6b0fc 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()), this, TQT_SLOT(fillPopup()));
- connect(popupMenu(), TQT_SIGNAL(activated(int)), 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, this, TQT_SLOT(loopNoneSelected()), 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, this, TQT_SLOT(loopSongSelected()), 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, this, TQT_SLOT(loopPlaylistSelected()), 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, this, TQT_SLOT(loopRandomSelected()), this, "loop_random");
+ 0, this, TQ_SLOT(loopRandomSelected()), this, "loop_random");
mLoopRandom->setExclusiveGroup("loopType");
insert(mLoopRandom);
- connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), 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, 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, 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, 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
@@ -333,11 +333,11 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
TDEActionCollection* actions = new TDEActionCollection(helpmenu);
- KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
- KStdAction::quit(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(napp, TQT_SLOT(preferences()), actions)->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);
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/plugin.cpp b/noatun/library/plugin.cpp
index 3c5b6f5d..ac0f0329 100644
--- a/noatun/library/plugin.cpp
+++ b/noatun/library/plugin.cpp
@@ -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/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 a0d1bbcc..55926830 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -59,7 +59,7 @@ 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;
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/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..731d3cf7 100644
--- a/noatun/modules/dcopiface/dcopiface.cpp
+++ b/noatun/modules/dcopiface/dcopiface.cpp
@@ -19,7 +19,7 @@ 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()
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 0d844671..b03a2dbc 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -67,12 +67,12 @@ Excellent::Excellent()
{
setAcceptDrops(true);
- KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
- KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(napp, TQ_SLOT(quit()), actionCollection());
+ KStdAction::open(napp, TQ_SLOT(fileOpen()), actionCollection());
setStandardToolBarMenuEnabled(true);
- menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
- KStdAction::preferences(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, 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..b256b421 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -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..92ae3c4f 100644
--- a/noatun/modules/infrared/infrared.cpp
+++ b/noatun/modules/infrared/infrared.cpp
@@ -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..50df64cd 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -84,19 +84,19 @@ 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();
}
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/style.cpp b/noatun/modules/kaiman/style.cpp
index b380e438..87fc3f56 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -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()
@@ -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()
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index c63c5d0f..bed68ec6 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -92,22 +92,22 @@ 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();
@@ -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 );
}
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 9ee32b90..613274e5 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -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,
- 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,
- napp, TQT_SLOT( effectView() ));
+ napp, TQ_SLOT( effectView() ));
s_accel->insert( "Preferences", i18n("Preferences"), TQString(),
CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F,
- 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,
- napp, TQT_SLOT( toggleInterfaces() ));
+ napp, TQ_SLOT( toggleInterfaces() ));
s_accel->readSettings();
s_accel->updateConnections();
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 e23c47a7..293dca96 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -132,7 +132,7 @@ KJLoader::KJLoader()
subwidgets.setAutoDelete(true);
mPrefs = new KJPrefs(this);
- connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) );
+ connect ( mPrefs, TQ_SIGNAL(configChanged()), this, TQ_SLOT(readConfig()) );
TQString skin = mPrefs->skin();
if ( TQFile(skin).exists() )
@@ -147,13 +147,13 @@ KJLoader::KJLoader()
}
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()));
+ 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..04670fe0 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -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/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/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 4ff6a9e0..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());
@@ -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..afb55d2e 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -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 702424af..ded4a42d 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -41,7 +41,7 @@ Monoscope::~Monoscope()
void Monoscope::init()
{
mAction = new TDEToggleAction(i18n("Toggle Monoscope"), 0, 0,
- this, TQT_SLOT(toggle()), 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..8d67580e 100644
--- a/noatun/modules/net/net.cpp
+++ b/noatun/modules/net/net.cpp
@@ -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/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/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index e06feca5..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( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
- new TDEAction( i18n("&Properties"), 0, 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( 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(this, TQT_SLOT(showMenubar()),
+ menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()),
actionCollection());
- statusbarAction = KStdAction::showStatusbar(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( 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/view.cpp b/noatun/modules/splitplaylist/view.cpp
index b0179b88..1b2679d5 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -355,10 +355,10 @@ List::List(View *parent)
setDragEnabled(true);
setItemsMovable(true);
setSelectionMode(TQListView::Extended);
- connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
- connect(this, TQT_SIGNAL(moved()), TQT_SLOT(move()));
- connect(this, TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
- connect(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()
@@ -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)), 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, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
- (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
- mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, 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(this, TQT_SLOT(close()), actionCollection());
- mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection());
+ mClose=KStdAction::close(this, TQ_SLOT(close()), actionCollection());
+ mFind=KStdAction::find(this, TQ_SLOT(find()), actionCollection());
- (void) KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
- mOpenNew=KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
- mOpenpl=KStdAction::open(this, TQT_SLOT(open()), actionCollection());
- mSave=KStdAction::save(this, TQT_SLOT(save()), actionCollection());
- mSaveAs=KStdAction::saveAs(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, SPL, TQT_SLOT( randomize() ), actionCollection(), "shuffle");
- (void) new TDEAction(i18n("Clear"), "edit-clear", 0, 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/systray.cpp b/noatun/modules/systray/systray.cpp
index a1270076..ab70c8dd 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -100,9 +100,9 @@ NoatunSystray::NoatunSystray() : TDEMainWindow(0, "NoatunSystray"), Plugin(),
removeCover(); // make sure any old temp cover is gone
- KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
- KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::preferences(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();
}
@@ -146,7 +146,7 @@ NoatunSystray::~NoatunSystray()
void NoatunSystray::init()
{
YHModule *cmod = new YHModule(this);
- connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings()));
+ 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/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index d5413414..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;
@@ -139,7 +139,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode)
if (!winSkinVis)
{
winSkinVis=new WinSkinVis(this,"WinSkinVis");
- connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks()));
+ connect(winSkinVis,TQ_SIGNAL(doRepaint()),this,TQ_SLOT(updatePeaks()));
}
}
else
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/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index 97f21606..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()
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 54b7513b..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();
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index a9e68a2a..91e6a45e 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -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..f2e63469 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -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/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 48e6eb24..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() {
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 7e49da08..4591b4d7 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -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;
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
index 1954422c..a0dcf468 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp
@@ -62,25 +62,25 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
TDEConfigDialogManager *widget;
for ( widget = encoderSettings.first(); widget; widget = encoderSettings.next() ){
- connect(widget, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(slotModuleChanged()));
+ connect(widget, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(slotModuleChanged()));
}
//CDDA Options
- connect(cd_specify_device,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotConfigChanged()));
- connect(ec_enable_check,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEcEnable()));
- connect(ec_skip_check,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigChanged()));
- connect(cd_device_string,TQT_SIGNAL(textChanged(const TQString &)),TQT_SLOT(slotConfigChanged()));
- connect(niceLevel,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotConfigChanged()));
+ connect(cd_specify_device,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotConfigChanged()));
+ connect(ec_enable_check,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEcEnable()));
+ connect(ec_skip_check,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigChanged()));
+ connect(cd_device_string,TQ_SIGNAL(textChanged(const TQString &)),TQ_SLOT(slotConfigChanged()));
+ connect(niceLevel,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotConfigChanged()));
// File Name
- connect(fileNameLineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotConfigChanged()));
- connect(albumNameLineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotConfigChanged()));
- connect( kcfg_replaceInput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) );
- connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) );
- connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( updateExample() ) );
- connect( kcfg_replaceInput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
- connect( kcfg_replaceOutput, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
- connect( example, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( slotConfigChanged() ) );
+ connect(fileNameLineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotConfigChanged()));
+ connect(albumNameLineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotConfigChanged()));
+ connect( kcfg_replaceInput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) );
+ connect( kcfg_replaceOutput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) );
+ connect( example, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( updateExample() ) );
+ connect( kcfg_replaceInput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) );
+ connect( kcfg_replaceOutput, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) );
+ connect( example, TQ_SIGNAL( textChanged(const TQString&) ), this, TQ_SLOT( slotConfigChanged() ) );
TDEAboutData *about =
new TDEAboutData(I18N_NOOP("kcmaudiocd"), I18N_NOOP("TDE Audio CD IO Slave"),
diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp
index 4eaf5304..50bf5d42 100644
--- a/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp
+++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp
@@ -59,18 +59,18 @@ CollectingProcess::~CollectingProcess() {
bool CollectingProcess::start( RunMode runmode, Communication comm ) {
// prevent duplicate connection
- disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+ disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
if ( comm & Stdout ) {
- connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
+ connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
}
// prevent duplicate connection
- disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+ disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
if ( comm & Stderr ) {
- connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
- this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
+ connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
+ this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
}
return TDEProcess::start( runmode, comm );
}
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index f7535f5f..6b375385 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -233,15 +233,15 @@ long EncoderLame::readInit(long /*size*/){
//kdDebug(7117) << d->currentEncodeProcess->args() << endl;
- connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
- this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
- connect(d->currentEncodeProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
- this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
- connect(d->currentEncodeProcess, TQT_SIGNAL(wroteStdin(TDEProcess *)),
- this, TQT_SLOT(wroteStdin(TDEProcess *)));
-
- connect(d->currentEncodeProcess, TQT_SIGNAL(processExited(TDEProcess *)),
- this, TQT_SLOT(processExited(TDEProcess *)));
+ connect(d->currentEncodeProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+ this, TQ_SLOT(receivedStdout(TDEProcess *, char *, int)));
+ connect(d->currentEncodeProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+ this, TQ_SLOT(receivedStderr(TDEProcess *, char *, int)));
+ connect(d->currentEncodeProcess, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+ this, TQ_SLOT(wroteStdin(TDEProcess *)));
+
+ connect(d->currentEncodeProcess, TQ_SIGNAL(processExited(TDEProcess *)),
+ this, TQ_SLOT(processExited(TDEProcess *)));
// Launch!
d->currentEncodeProcess->start(TDEProcess::NotifyOnExit, KShellProcess::All);
diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp
index 6b8e23cf..0b03ddc0 100644
--- a/tdemid/channel.cpp
+++ b/tdemid/channel.cpp
@@ -62,7 +62,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
for (i=0;i<128;i++)
instrumentCombo->insertItem(i18n(instrumentName[i]),i);
- connect(instrumentCombo,TQT_SIGNAL(activated(int)),this,TQT_SLOT(pgmChanged(int)));
+ connect(instrumentCombo,TQ_SIGNAL(activated(int)),this,TQ_SLOT(pgmChanged(int)));
forcepgm=new KMidButton(this,"forcepgm");
forcepgm->setGeometry(135,4,16,16);
@@ -71,7 +71,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
button2 = TQPixmap(locate("appdata","icons/button2.xpm"));
forcepgm->setPixmaps(button1,button2);
forcepgm->show();
- connect(forcepgm,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(changeForcedState(bool)));
+ connect(forcepgm,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(changeForcedState(bool)));
}
diff --git a/tdemid/channelcfgdlg.cpp b/tdemid/channelcfgdlg.cpp
index e55aaa58..76f6b87a 100644
--- a/tdemid/channelcfgdlg.cpp
+++ b/tdemid/channelcfgdlg.cpp
@@ -27,7 +27,7 @@ ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *na
topLayout->addWidget( qbg );
((ChannelView::lookMode()==0)?rb0:rb1)->setChecked(TRUE);
- connect (qbg, TQT_SIGNAL(pressed(int)),this,TQT_SLOT(modeselected(int)));
+ connect (qbg, TQ_SIGNAL(pressed(int)),this,TQ_SLOT(modeselected(int)));
}
void ChannelViewConfigDialog::modeselected(int idx)
diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp
index 27410baa..32f6472a 100644
--- a/tdemid/channelview.cpp
+++ b/tdemid/channelview.cpp
@@ -40,12 +40,12 @@ ChannelView::ChannelView(void) : TDEMainWindow(0, "ChannelView")
Channel[i]=new KMidChannel3D(i+1,this);
else
Channel[i]=new KMidChannel4D(i+1,this);
- connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *)));
+ connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *)));
Channel[i]->setGeometry(5,5+i*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
Channel[i]->show();
}
scrollbar=new TQScrollBar(1,16,1,1,1,TQt::Vertical,this,"Channelscrollbar");
- connect(scrollbar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(ScrollChn(int)));
+ connect(scrollbar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(ScrollChn(int)));
setScrollBarRange();
}
@@ -150,7 +150,7 @@ void ChannelView::lookMode(int i)
else
Channel[i]=new KMidChannel4D(i+1,this);
- connect(Channel[i],TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(slottotdemidclient(int *)));
+ connect(Channel[i],TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(slottotdemidclient(int *)));
Channel[i]->setGeometry(5,5+(i-(scrollbar->value()-1))*CHANNELHEIGHT,width()-20,CHANNELHEIGHT);
Channel[i]->loadState(tmp,&pgm);
Channel[i]->show();
diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp
index 4df74df7..226d86d1 100644
--- a/tdemid/collectdlg.cpp
+++ b/tdemid/collectdlg.cpp
@@ -43,18 +43,18 @@ CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,cons
setCaption(i18n("Collections Manager"));
ok=new KPushButton(KStdGuiItem::ok(),this);
ok->setGeometry(140,200,100,30);
-connect(ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept()) );
+connect(ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept()) );
cancel=new KPushButton(KStdGuiItem::cancel(),this);
cancel->setGeometry(250,200,100,30);
-connect(cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()) );
+connect(cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()) );
label=new TQLabel(i18n("Available collections:"),this);
label->adjustSize();
label->move(10,10);
collections=new TQListBox(this,"collectionlist");
collections->setGeometry(10,20+label->height(),340,90);
-connect(collections,TQT_SIGNAL(highlighted(int)),TQT_SLOT(collectionselected(int)));
-connect(collections,TQT_SIGNAL(selected(int)),TQT_SLOT(changeCollectionName(int)));
+connect(collections,TQ_SIGNAL(highlighted(int)),TQ_SLOT(collectionselected(int)));
+connect(collections,TQ_SIGNAL(selected(int)),TQ_SLOT(changeCollectionName(int)));
slman=slm;
for (int i=0;i<=slman->numberOfCollections();i++)
{
@@ -74,7 +74,7 @@ label2->move(10,collections->y()+collections->height()+10);
songs=new TQListBox(this,"songlist");
songs->setGeometry(10,label2->y()+label2->height()+10,340,120);
-connect(songs,TQT_SIGNAL(highlighted(int)),TQT_SLOT(songselected(int)));
+connect(songs,TQ_SIGNAL(highlighted(int)),TQ_SLOT(songselected(int)));
currentsl=slman->getCollection(selectedC);
if (slman->numberOfCollections()>0)
{
@@ -85,24 +85,24 @@ if (slman->numberOfCollections()>0)
newC=new TQPushButton(i18n("&New..."),this);
newC->adjustSize();
newC->move(360,collections->y()+5);
-connect(newC,TQT_SIGNAL(clicked()),TQT_SLOT(newCollection()) );
+connect(newC,TQ_SIGNAL(clicked()),TQ_SLOT(newCollection()) );
copyC=new TQPushButton(i18n("&Copy..."),this);
copyC->adjustSize();
copyC->move(360,newC->y()+newC->height()+5);
-connect(copyC,TQT_SIGNAL(clicked()),TQT_SLOT(copyCollection()) );
+connect(copyC,TQ_SIGNAL(clicked()),TQ_SLOT(copyCollection()) );
deleteC=new TQPushButton(i18n("Delete"),this);
deleteC->adjustSize();
deleteC->move(360,copyC->y()+copyC->height()+5);
-connect(deleteC,TQT_SIGNAL(clicked()),TQT_SLOT(deleteCollection()) );
+connect(deleteC,TQ_SIGNAL(clicked()),TQ_SLOT(deleteCollection()) );
addS=new TQPushButton(i18n("&Add..."),this);
addS->adjustSize();
addS->move(360,songs->y()+5);
-connect(addS,TQT_SIGNAL(clicked()),TQT_SLOT(addSong()) );
+connect(addS,TQ_SIGNAL(clicked()),TQ_SLOT(addSong()) );
delS=new TQPushButton(i18n("&Remove"),this);
delS->adjustSize();
delS->move(360,addS->y()+addS->height()+5);
-connect(delS,TQT_SIGNAL(clicked()),TQT_SLOT(removeSong()) );
+connect(delS,TQ_SIGNAL(clicked()),TQ_SLOT(removeSong()) );
ok->move(ok->x(),songs->y()+songs->height()+10);
cancel->move(ok->x()+ok->width()+5,ok->y());
diff --git a/tdemid/klcdnumber.cpp b/tdemid/klcdnumber.cpp
index 1d4bab00..57385a39 100644
--- a/tdemid/klcdnumber.cpp
+++ b/tdemid/klcdnumber.cpp
@@ -71,10 +71,10 @@ KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,
downBtn=new KTriangleButton(KTriangleButton::Left,this,"Down");
upBtn->setGeometry(width()-BUTTONWIDTH,0,BUTTONWIDTH,height());
downBtn->setGeometry(0,0,BUTTONWIDTH,height());
- connect(upBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(increaseValue()));
- connect(downBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(decreaseValue()));
- connect(upBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(increaseValueFast()));
- connect(downBtn,TQT_SIGNAL(clickedQuickly()),this,TQT_SLOT(decreaseValueFast()));
+ connect(upBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(increaseValue()));
+ connect(downBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(decreaseValue()));
+ connect(upBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(increaseValueFast()));
+ connect(downBtn,TQ_SIGNAL(clickedQuickly()),this,TQ_SLOT(decreaseValueFast()));
};
}
diff --git a/tdemid/main.cpp b/tdemid/main.cpp
index 40902097..3f12b7c9 100644
--- a/tdemid/main.cpp
+++ b/tdemid/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
app.setMainWidget ( tdemidframe );
- TQObject::connect(&app,TQT_SIGNAL(shutDown()),tdemidframe,TQT_SLOT(shuttingDown()));
+ TQObject::connect(&app,TQ_SIGNAL(shutDown()),tdemidframe,TQ_SLOT(shuttingDown()));
if (app.isRestored())
{
diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp
index 446f7e03..010e8f42 100644
--- a/tdemid/midicfgdlg.cpp
+++ b/tdemid/midicfgdlg.cpp
@@ -50,7 +50,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
topLayout->addWidget(label);
mididevices=new TQListBox(page,"midideviceslist");
topLayout->addWidget(mididevices,3);
- connect(mididevices,TQT_SIGNAL(highlighted(int)),TQT_SLOT(deviceselected(int)));
+ connect(mididevices,TQ_SIGNAL(highlighted(int)),TQ_SLOT(deviceselected(int)));
devman=dm;
TQString temp;
for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
@@ -87,11 +87,11 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
hbox->addStretch(1);
mapbrowse=new TQPushButton(i18n("Browse..."),page);
hbox->addWidget(mapbrowse);
- connect(mapbrowse,TQT_SIGNAL(clicked()),TQT_SLOT(browseMap()) );
+ connect(mapbrowse,TQ_SIGNAL(clicked()),TQ_SLOT(browseMap()) );
mapnone=new TQPushButton(i18n("None"),page);
hbox->addWidget(mapnone);
- connect(mapnone,TQT_SIGNAL(clicked()),TQT_SLOT(noMap()) );
+ connect(mapnone,TQ_SIGNAL(clicked()),TQ_SLOT(noMap()) );
topLayout->addStretch(1);
diff --git a/tdemid/tdemid_part.cpp b/tdemid/tdemid_part.cpp
index 17ce3c1b..ed6e062b 100644
--- a/tdemid/tdemid_part.cpp
+++ b/tdemid/tdemid_part.cpp
@@ -78,21 +78,21 @@ TDEInstance *KMidFactory::instance()
// create and connect our actions
(void)new TDEAction(i18n("Play"), "media-playback-start", 0, this,
- TQT_SLOT(slotPlay()), actionCollection(),
+ TQ_SLOT(slotPlay()), actionCollection(),
"play");
(void)new TDEAction(i18n("Stop"), "media-playback-stop", 0, this,
- TQT_SLOT(slotStop()), actionCollection(),
+ TQ_SLOT(slotStop()), actionCollection(),
"stop");
(void)new TDEAction(i18n("Backward"),
"2leftarrow", 0, this,
- TQT_SLOT(slotBackward()), actionCollection(),
+ TQ_SLOT(slotBackward()), actionCollection(),
"backward");
(void)new TDEAction(i18n("Forward"),
"2rightarrow", 0, this,
- TQT_SLOT(slotForward()), actionCollection(),
+ TQ_SLOT(slotForward()), actionCollection(),
"forward");
m_extension = new KMidBrowserExtension(this);
@@ -111,7 +111,7 @@ bool KMidPart::openFile()
widget->openURL(m_file);
widget->stop();
widget->show();
- TQTimer::singleShot(2000, this, TQT_SLOT(slotPlay()));
+ TQTimer::singleShot(2000, this, TQ_SLOT(slotPlay()));
return true;
}
diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp
index cc6cce2d..dc6f09ae 100644
--- a/tdemid/tdemidclient.cpp
+++ b/tdemid/tdemidclient.cpp
@@ -93,7 +93,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
timebar = new TQSlider(0,240000,30000,60000,TQt::Horizontal, this);
timebar->setSteps(30000,60000);
timebar->setValue(0);
- connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int)));
+ connect (timebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSeek(int)));
timetags = new QSliderTime(timebar,this);
timetags->setMinimumSize(timetags->sizeHint());
@@ -109,14 +109,14 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
tempoLCD->setDefaultValue(120);
tempoLCD->setUserSetDefaultValue(true);
tempoLCD->setMinimumSize(tempoLCD->sizeHint());
- connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double)));
+ connect(tempoLCD,TQ_SIGNAL(valueChanged(double)),this,TQ_SLOT(slotSetTempo(double)));
comboSongs = new TQComboBox(FALSE, this,"Songs");
- connect (comboSongs,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectSong(int)));
+ connect (comboSongs,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectSong(int)));
comboSongs->setMinimumWidth(200);
comboEncodings = new TQComboBox(FALSE, this, "Encodings");
- connect (comboEncodings,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSelectEncoding(int)));
+ connect (comboEncodings,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSelectEncoding(int)));
comboEncodings->insertItem(i18n("Default"));
comboEncodings->insertStringList( TDEGlobal::charsets()->descriptiveEncodingNames() );
comboEncodings->setCurrentItem(0);
@@ -130,7 +130,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
volumebar->setValue(100);
volumebar->setTickmarks(TQSlider::NoMarks);
volumebar->setTickInterval(50);
- connect (volumebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSetVolume(int)));
+ connect (volumebar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotSetVolume(int)));
visiblevolumebar=cfg->readNumEntry("ShowVolumeBar",0);
if (visiblevolumebar) volumebar->show();
@@ -141,9 +141,9 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
kdispt->show();
timer4timebar=new TQTimer(this);
- connect (timer4timebar,TQT_SIGNAL(timeout()),this,TQT_SLOT(timebarUpdate()));
+ connect (timer4timebar,TQ_SIGNAL(timeout()),this,TQ_SLOT(timebarUpdate()));
timer4events=new TQTimer(this);
- connect (timer4events,TQT_SIGNAL(timeout()),this,TQT_SLOT(processSpecialEvent()));
+ connect (timer4events,TQ_SIGNAL(timeout()),this,TQ_SLOT(processSpecialEvent()));
TQString samplefile =
TDEGlobal::dirs()->findAllResources("appdata", "fm/*.o3").last();
@@ -372,7 +372,7 @@ int tdemidClient::openURL(const TQString _url)
filename = TQString("/tmp/") + u.filename();
TDEIO::Job *iojob = TDEIO::copy( u, KURL::fromPathOrURL( filename ) );
downloaded=false;
- connect( iojob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT(downloadFinished( TDEIO::Job * ) ) );
+ connect( iojob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT(downloadFinished( TDEIO::Job * ) ) );
if (!downloaded)
kapp->enter_loop();
@@ -1373,8 +1373,8 @@ void tdemidClient::visibleChannelView(int i)
}
}
channelView->show();
- connect(channelView,TQT_SIGNAL(signalToKMidClient(int *)),this,TQT_SLOT(communicationFromChannelView(int *)));
- connect(kapp,TQT_SIGNAL(shutDown()),parentWidget(),TQT_SLOT(shuttingDown()));
+ connect(channelView,TQ_SIGNAL(signalToKMidClient(int *)),this,TQ_SLOT(communicationFromChannelView(int *)));
+ connect(kapp,TQ_SIGNAL(shutDown()),parentWidget(),TQ_SLOT(shuttingDown()));
}
else if ((channelView!=NULL)&&(i==0))
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index 609be7dd..88069499 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -68,73 +68,73 @@ tdemidFrame::tdemidFrame(const char *name)
/*
kKeysAccel=new TDEAccel(this);
kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
- kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed()));
+ kKeysAccel->connectItem("Play/Pause", this, TQ_SLOT(spacePressed()));
kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
- kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop()));
+ kKeysAccel->connectItem("Stop",tdemidclient,TQ_SLOT(song_Stop()));
kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
- kKeysAccel->connectItem("Previous Song",tdemidclient,TQT_SLOT(song_PlayPrevSong()));
+ kKeysAccel->connectItem("Previous Song",tdemidclient,TQ_SLOT(song_PlayPrevSong()));
kKeysAccel->insertItem(i18n("Next Song"),"Next Song", Key_Right);
- kKeysAccel->connectItem("Next Song",tdemidclient,TQT_SLOT(song_PlayNextSong()));
+ kKeysAccel->connectItem("Next Song",tdemidclient,TQ_SLOT(song_PlayNextSong()));
kKeysAccel->insertItem(i18n("Scroll Down Karaoke"),"Scroll down karaoke",Key_Down);
- kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollDown()));
+ kKeysAccel->connectItem("Scroll Down karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollDown()));
kKeysAccel->insertItem(i18n("Scroll Up Karaoke"),"Scroll up karaoke",Key_Up);
- kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollUp()));
+ kKeysAccel->connectItem("Scroll Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollUp()));
kKeysAccel->insertItem(i18n("Scroll Page Down Karaoke"),"Scroll page down karaoke",Key_PageDown);
- kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageDown()));
+ kKeysAccel->connectItem("Scroll Page Down Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageDown()));
kKeysAccel->insertItem(i18n("Scroll Page Up Karaoke"),"Scroll page up karaoke",Key_PageUp);
- kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQT_SLOT(ScrollPageUp()));
+ kKeysAccel->connectItem("Scroll Page Up Karaoke",tdemidclient->getKDisplayText(),TQ_SLOT(ScrollPageUp()));
kKeysAccel->readSettings();
*/
- KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(file_Open()), actionCollection());
(void)new TDEAction(i18n("&Save Lyrics..."), 0, this,
- TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
- KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+ TQ_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
+ KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
(void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
- tdemidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play");
+ tdemidclient, TQ_SLOT(slotPlay()), actionCollection(), "song_play");
(void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, tdemidclient,
- TQT_SLOT(slotPause()), actionCollection(), "song_pause");
+ TQ_SLOT(slotPause()), actionCollection(), "song_pause");
(void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace,
- tdemidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+ tdemidclient, TQ_SLOT(slotStop()), actionCollection(), "song_stop");
(void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left,
- tdemidclient, TQT_SLOT(slotPrevSong()), actionCollection(),
+ tdemidclient, TQ_SLOT(slotPrevSong()), actionCollection(),
"song_previous");
(void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right,
- tdemidclient, TQT_SLOT(slotNextSong()), actionCollection(),
+ tdemidclient, TQ_SLOT(slotNextSong()), actionCollection(),
"song_next");
- (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()),
+ (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQ_SLOT(song_Loop()),
actionCollection(), "song_loop");
(void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, tdemidclient,
- TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
+ TQ_SLOT(slotRewind()), actionCollection(), "song_rewind");
(void)new TDEAction(i18n("Forward"), "2rightarrow", 0, tdemidclient,
- TQT_SLOT(slotForward()), actionCollection(), "song_forward");
+ TQ_SLOT(slotForward()), actionCollection(), "song_forward");
- (void)new TDEAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()),
+ (void)new TDEAction(i18n("&Organize..."), 0, this, TQ_SLOT(collect_organize()),
actionCollection(), "collect_organize");
TQStringList playmodes;
playmodes.append(i18n("In Order"));
playmodes.append(i18n("Shuffle"));
- TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQT_SLOT(collect_PlayOrder(int)),*/
+ TDESelectAction *act=new TDESelectAction(i18n("Play Order"), 0, /*this, TQ_SLOT(collect_PlayOrder(int)),*/
actionCollection(), "play_order");
- connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
+ connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(collect_PlayOrder(int)));
act->setItems(playmodes);
(void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, this,
- TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
+ TQ_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
playmodes.clear();
playmodes.append(i18n("&General MIDI"));
playmodes.append(i18n("&MT-32"));
- act=new TDESelectAction(i18n("File Type"), 0,/* this, TQT_SLOT(options_FileType(int)),*/
+ act=new TDESelectAction(i18n("File Type"), 0,/* this, TQ_SLOT(options_FileType(int)),*/
actionCollection(), "file_type");
- connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_FileType(int)));
+ connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_FileType(int)));
act->setItems(playmodes);
playmodes.clear();
@@ -142,35 +142,35 @@ tdemidFrame::tdemidFrame(const char *name)
playmodes.append(i18n("&Lyric Events"));
act=new TDESelectAction(i18n("Display Events"), Key_T, /*this,
- TQT_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
+ TQ_SLOT(options_DisplayEvents(int)),*/ actionCollection(),
"display_events");
- connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
+ connect(act,TQ_SIGNAL(activated(int)),this, TQ_SLOT(options_DisplayEvents(int)));
act->setItems(playmodes);
(void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, this,
- TQT_SLOT(options_AutomaticText()), actionCollection(),
+ TQ_SLOT(options_AutomaticText()), actionCollection(),
"option_automatictext");
TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
- 0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+ 0, this, TQ_SLOT(options_ShowVolumeBar()), actionCollection(),
"toggle_volumebar");
togact->setCheckedState(i18n("Hide &Volume Bar"));
togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
- 0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(),
+ 0, this, TQ_SLOT(options_ShowChannelView()), actionCollection(),
"toggle_channelview");
togact->setCheckedState(i18n("Hide &Channel View"));
(void)new TDEAction(i18n("Channel View &Options..."), 0, this,
- TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
+ TQ_SLOT(options_ChannelViewOptions()), actionCollection(),
"channelview_options");
(void)new TDEAction(i18n("&Font Change..."), 0, this,
- TQT_SLOT(options_FontChange()), actionCollection(),
+ TQ_SLOT(options_FontChange()), actionCollection(),
"change_font");
(void)new TDEAction(i18n("MIDI &Setup..."), 0, this,
- TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
+ TQ_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");
setupGUI((ToolBar | Keys | StatusBar | Save | Create ), "tdemidui.rc" );
@@ -212,14 +212,14 @@ tdemidFrame::tdemidFrame(const char *name)
setAcceptDrops(true);
- connect( tdemidclient, TQT_SIGNAL( mustRechooseTextEvent() ),
- this, TQT_SLOT( rechooseTextEvent() ) );
+ connect( tdemidclient, TQ_SIGNAL( mustRechooseTextEvent() ),
+ this, TQ_SLOT( rechooseTextEvent() ) );
- connect( tdemidclient, TQT_SIGNAL( stopPause() ),
- this, TQT_SLOT( song_stopPause() ) );
+ connect( tdemidclient, TQ_SIGNAL( stopPause() ),
+ this, TQ_SLOT( song_stopPause() ) );
-// connect( tdemidclient, TQT_SIGNAL( channelView_Destroyed() ),
-// this, TQT_SLOT( channelViewDestroyed() ) );
+// connect( tdemidclient, TQ_SIGNAL( channelView_Destroyed() ),
+// this, TQ_SLOT( channelViewDestroyed() ) );
TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs();
@@ -258,7 +258,7 @@ tdemidFrame::tdemidFrame(const char *name)
/*
kKeys->addKey("Play/Pause",Key_Space);
kKeys->registerWidget("KMidFrame",this);
- kKeys->connectFunction("KMidFrame","Play/Pause",this,TQT_SLOT(spacePressed()));
+ kKeys->connectFunction("KMidFrame","Play/Pause",this,TQ_SLOT(spacePressed()));
*/
// kKeysAccel->writeSettings(cfg);
@@ -599,7 +599,7 @@ void tdemidFrame::options_ShowChannelView()
} else
{
tdemidclient->visibleChannelView(1);
- connect (tdemidclient->getChannelView(),TQT_SIGNAL(destroyMe()),this,TQT_SLOT(channelViewDestroyed()));
+ connect (tdemidclient->getChannelView(),TQ_SIGNAL(destroyMe()),this,TQ_SLOT(channelViewDestroyed()));
}
}