summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-21 11:50:24 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-24 18:25:52 +0900
commitf353dc99d02df0ebd3d23ee05cfdb98b64e64ae4 (patch)
tree991cd3edc99b0a2e08f6226443833cdb8b69bca8
parentda49daf5e172336e697c47c702521231d5001001 (diff)
downloadtdemultimedia-f353dc99d02df0ebd3d23ee05cfdb98b64e64ae4.tar.gz
tdemultimedia-f353dc99d02df0ebd3d23ee05cfdb98b64e64ae4.zip
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit dd6db75d8ab2821740e4ce6c66c9de91252138ea)
-rw-r--r--arts/builder/execdlg.cpp2
-rw-r--r--arts/builder/interfacedlg.cpp2
-rw-r--r--arts/builder/main.cpp72
-rw-r--r--arts/builder/portposdlg.cpp2
-rw-r--r--arts/builder/retrievedlg.cpp2
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp2
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.cpp2
-rw-r--r--arts/tools/choosebusdlg.cpp2
-rw-r--r--arts/tools/fftscopeview.cpp6
-rw-r--r--arts/tools/main.cpp8
-rw-r--r--arts/tools/midiinstdlg.cpp2
-rw-r--r--arts/tools/midimanagerview.cpp10
-rw-r--r--arts/tools/midiportdlg.cpp2
-rw-r--r--juk/filerenamer.cpp24
-rw-r--r--juk/juk.cpp56
-rw-r--r--juk/playlist.cpp10
-rw-r--r--juk/playlistcollection.cpp6
-rw-r--r--juk/playlistsplitter.cpp2
-rw-r--r--juk/systemtray.cpp4
-rw-r--r--juk/tageditor.cpp4
-rw-r--r--juk/tagtransactionmanager.cpp4
-rw-r--r--kaboodle/userinterface.cpp14
-rw-r--r--kaudiocreator/kaudiocreator.cpp66
-rw-r--r--kmix/kmix.cpp20
-rw-r--r--kmix/kmixdockwidget.cpp12
-rw-r--r--kmix/mdwenum.cpp8
-rw-r--r--kmix/mdwslider.cpp14
-rw-r--r--kmix/mdwswitch.cpp6
-rw-r--r--kmix/mixdevicewidget.cpp2
-rw-r--r--kmix/viewapplet.cpp2
-rw-r--r--kmix/viewbase.cpp6
-rw-r--r--krec/krecfilewidgets.cpp16
-rw-r--r--krec/krecord.cpp12
-rw-r--r--kscd/kscd.cpp68
-rw-r--r--noatun/library/app.cpp8
-rw-r--r--noatun/library/effectview.cpp10
-rw-r--r--noatun/library/noatunstdaction.cpp34
-rw-r--r--noatun/library/pref.cpp4
-rw-r--r--noatun/modules/excellent/userinterface.cpp10
-rw-r--r--noatun/modules/kaiman/style.cpp4
-rw-r--r--noatun/modules/kaiman/userinterface.cpp2
-rw-r--r--noatun/modules/keyz/keyz.cpp8
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp2
-rw-r--r--noatun/modules/metatag/edit.cpp2
-rw-r--r--noatun/modules/monoscope/monoscope.cpp2
-rw-r--r--noatun/modules/simple/userinterface.cpp12
-rw-r--r--noatun/modules/splitplaylist/view.cpp40
-rw-r--r--noatun/modules/systray/systray.cpp8
-rw-r--r--noatun/modules/voiceprint/voiceprint.cpp2
-rw-r--r--noatun/modules/winskin/guiSpectrumAnalyser.cpp2
-rw-r--r--noatun/modules/winskin/winSkinConfig.cpp2
-rw-r--r--tdemid/kdisptext.cpp6
-rw-r--r--tdemid/klcdnumber.cpp2
-rw-r--r--tdemid/ktrianglebutton.cpp6
-rw-r--r--tdemid/tdemidframe.cpp40
55 files changed, 338 insertions, 338 deletions
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp
index fcdce6b8..56207052 100644
--- a/arts/builder/execdlg.cpp
+++ b/arts/builder/execdlg.cpp
@@ -115,7 +115,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp
index 99b8072e..8cd65f90 100644
--- a/arts/builder/interfacedlg.cpp
+++ b/arts/builder/interfacedlg.cpp
@@ -112,7 +112,7 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp
index 1d7bbce9..7f598816 100644
--- a/arts/builder/main.cpp
+++ b/arts/builder/main.cpp
@@ -251,17 +251,17 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
*/
#if 000
- connect(menubar, TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(activateMenu(int)));
+ 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)), TQT_TQOBJECT(this), TQT_SLOT(addPort(int)));
- connect(m_file_new, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(fileNew(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(m_modules, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
+ //connect(m_modules, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addModule(int)));
/*
- connect(m_modules_synth, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
- connect(m_modules_gui, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
- connect(m_modules_instruments, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(addModule(int)));
- connect(m_modules_other, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_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(kapp, TQT_SIGNAL(lastWindowClosed()), this , TQT_SLOT(quit()));
@@ -269,7 +269,7 @@ ArtsBuilderWindow::ArtsBuilderWindow(const char *name)
#endif
arts_debug("PORT: activatemenu");
- connect(menumaker, TQT_SIGNAL(activated(const char *)), TQT_TQOBJECT(this), TQT_SLOT(addModule(const char *)));
+ connect(menumaker, TQT_SIGNAL(activated(const char *)), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(viewMenuAboutToShow()));
+ connect(viewmenu, TQT_SIGNAL(aboutToShow()), this, TQT_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(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+ KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
- (void)new TDEAction(i18n("Open Session..."), 0, TQT_TQOBJECT(this), TQT_SLOT(openSession()),
+ (void)new TDEAction(i18n("Open Session..."), 0, this, TQT_SLOT(openSession()),
actionCollection(), "file_open_session");
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
- (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, TQT_TQOBJECT(this), TQT_SLOT(openExample()),
+ KStdAction::open(this, TQT_SLOT(open()), actionCollection());
+ (void)new TDEAction(i18n("Open E&xample..."), TQt::CTRL + TQt::Key_X, this, TQT_SLOT(openExample()),
actionCollection(), "file_open_example");
- KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
- KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
- (void)new TDEAction(i18n("&Retrieve From Server..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(retrieve()),
+ 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()),
actionCollection(), "file_retrieve_from_server");
- (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(execute()),
+ (void)new TDEAction(i18n("&Execute Structure"), "artsbuilderexecute", TQt::CTRL + TQt::Key_E, this, TQT_SLOT(execute()),
actionCollection(), "file_execute_structure");
- (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(rename()),
+ (void)new TDEAction(i18n("&Rename Structure..."), TQt::CTRL + TQt::Key_R, this, TQT_SLOT(rename()),
actionCollection(), "file_rename_structure");
- (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(publish()),
+ (void)new TDEAction(i18n("&Publish Structure"), TQt::CTRL + TQt::Key_P, this, TQT_SLOT(publish()),
actionCollection(), "file_publish_structure");
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
// Edit menu
- (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, TQT_TQOBJECT(modulewidget), TQT_SLOT(delModule()),
+ (void)new TDEAction(i18n("&Delete"), TQt::Key_Delete, modulewidget, TQT_SLOT(delModule()),
actionCollection(), "edit_delete");
- KStdAction::selectAll(TQT_TQOBJECT(modulewidget), TQT_SLOT(selectAll()), actionCollection());
+ KStdAction::selectAll(modulewidget, TQT_SLOT(selectAll()), actionCollection());
// View menu
viewPropertiesAction= new TDEToggleAction(i18n("&Property Panel"), 0,
- TQT_TQOBJECT(propertyDock), TQT_SLOT(changeHideShowState()),
+ propertyDock, TQT_SLOT(changeHideShowState()),
actionCollection(), "view_properties");
- (void)new TDEAction(i18n("200%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt200()),
+ (void)new TDEAction(i18n("200%"), 0, this, TQT_SLOT(viewAt200()),
actionCollection(), "view_200");
- (void)new TDEAction(i18n("150%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt150()),
+ (void)new TDEAction(i18n("150%"), 0, this, TQT_SLOT(viewAt150()),
actionCollection(), "view_150");
- (void)new TDEAction(i18n("100%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt100()),
+ (void)new TDEAction(i18n("100%"), 0, this, TQT_SLOT(viewAt100()),
actionCollection(), "view_100");
- (void)new TDEAction(i18n("50%"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewAt50()),
+ (void)new TDEAction(i18n("50%"), 0, this, TQT_SLOT(viewAt50()),
actionCollection(), "view_50");
// Ports menu
- (void)new TDEAction(i18n("Create IN Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioSignal()),
+ (void)new TDEAction(i18n("Create IN Audio Signal"), 0, this, TQT_SLOT(createInAudioSignal()),
actionCollection(), "ports_create_in_audio_signal");
- (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, TQT_TQOBJECT(this), TQT_SLOT(createOutAudioSignal()),
+ (void)new TDEAction(i18n("Create OUT Audio Signal"), 0, this, TQT_SLOT(createOutAudioSignal()),
actionCollection(), "ports_create_out_audio_signal");
- (void)new TDEAction(i18n("Create IN String Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInStringProperty()),
+ (void)new TDEAction(i18n("Create IN String Property"), 0, this, TQT_SLOT(createInStringProperty()),
actionCollection(), "ports_create_in_string_property");
- (void)new TDEAction(i18n("Create IN Audio Property"), 0, TQT_TQOBJECT(this), TQT_SLOT(createInAudioProperty()),
+ (void)new TDEAction(i18n("Create IN Audio Property"), 0, this, TQT_SLOT(createInAudioProperty()),
actionCollection(), "ports_create_in_audio_property");
- (void)new TDEAction(i18n("Implement Interface..."), 0, TQT_TQOBJECT(this), TQT_SLOT(addInterface()),
+ (void)new TDEAction(i18n("Implement Interface..."), 0, this, TQT_SLOT(addInterface()),
actionCollection(), "ports_implement_interface");
- (void)new TDEAction(i18n("Change Positions/Names..."), 0, TQT_TQOBJECT(this), TQT_SLOT(changePortPositions()),
+ (void)new TDEAction(i18n("Change Positions/Names..."), 0, this, TQT_SLOT(changePortPositions()),
actionCollection(), "ports_change_positions");
}
@@ -532,7 +532,7 @@ void ArtsBuilderWindow::openSession()
execDlg->start();
execDlg->show();
- connect(execDlg, TQT_SIGNAL(ready()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+ connect(execDlg, TQT_SIGNAL(ready()), this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(endexecute()));
+ connect(execDlg, TQT_SIGNAL(ready()), this, TQT_SLOT(endexecute()));
hide();
}
diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 2bf9dbe4..006b5c6d 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -111,7 +111,7 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
TDEIconLoader iconloader;
diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp
index c95d40ad..96c8dd18 100644
--- a/arts/builder/retrievedlg.cpp
+++ b/arts/builder/retrievedlg.cpp
@@ -104,7 +104,7 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index a45f91aa..b32bff35 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(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) )
+ , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQT_SLOT( exactValue() ), this ) )
{
//kdDebug() << k_funcinfo << endl;
setMinimumSize( 10,10 );
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index cc5b42de..d7f8d30b 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -30,7 +30,7 @@ using namespace Arts;
KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
{
//kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
- _mapper = new KStereoVolumeControlGui_EventMapper( this, TQT_TQOBJECT(_qframe) );
+ _mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
this->addWidget( _label, -100 );
_label.bottom( Arts::East );
_label.text( "Volume" );
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index 62ba74be..8a9a8031 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -126,7 +126,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 35805877..6307fa71 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -80,11 +80,11 @@ kdDebug()<<k_funcinfo<<endl;
connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
_artsactions = new ArtsActions( 0, 0, this );
- _moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 );
- _lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 );
+ _moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 );
+ _lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 );
_menu = new TDEPopupMenu( 0 );
_moreBars->plug( _menu ); _lessBars->plug( _menu );
- _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) );
+ _substyle = new TDEAction( i18n( "Substyle" ), "", TDEShortcut(), this, TQT_SLOT( substyle() ), this );
_substyle->plug( _menu );
_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index b651c625..00450f51 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() {
vc->useOldVolumeBar(showOldVolumeDisplay->isChecked());
}
-MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) {
+MainWindow::MainWindow() : TDEMainWindow(0), kartsserver( new KArtsServer( this ) ) {
kdDebug() << k_funcinfo << endl;
connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
@@ -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, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+ ( void ) new TDEAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
showOldVolumeDisplay=
- new TDEToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this),
+ 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( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+ ( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
createGUI("artscontrol.rc");
resize(20,300);
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 6d155b06..5ef0b828 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -135,7 +135,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index b32c09f2..c3f32e41 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -122,14 +122,14 @@ MidiManagerView::MidiManagerView()
setCaption(i18n("MIDI Manager"));
setIcon( MainBarIcon( "artsfftscope", 32 ) );
- (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()),
+ (void)new TDEAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()),
actionCollection(), "add_oss_midi_port");
- (void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
- (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect()));
- connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect()));
+ (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()));
connectionWidget = new ConnectionWidget(this, widget->connectionFrame);
connectionWidget->setMinimumSize(60,10);
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 1273bf58..56686be6 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -80,7 +80,7 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
buttonlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
+ TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
bbox->addStretch(1);
helpbutton->setAutoDefault( true );
helpbutton->setDefault( true );
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 88681efe..9476ea29 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -348,9 +348,9 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
row.downButton->setFlat(true);
upMapper->connect(row.upButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- upMapper->setMapping(TQT_TQOBJECT(row.upButton), id);
+ upMapper->setMapping(row.upButton, id);
downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- downMapper->setMapping(TQT_TQOBJECT(row.downButton), id);
+ downMapper->setMapping(row.downButton, id);
TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
TQLabel *label = new TQLabel(labelText, frame);
@@ -360,11 +360,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->setMapping(TQT_TQOBJECT(row.enableButton), id);
+ toggleMapper->setMapping(row.enableButton, id);
row.optionsButton = new KPushButton(i18n("Options"), options);
mapper->connect(row.optionsButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
- mapper->setMapping(TQT_TQOBJECT(row.optionsButton), id);
+ mapper->setMapping(row.optionsButton, id);
row.widget->show();
m_rows.append(row);
@@ -378,10 +378,10 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
void FileRenamerWidget::moveSignalMappings(unsigned oldId, unsigned newId)
{
- mapper->setMapping(TQT_TQOBJECT(m_rows[oldId].optionsButton), newId);
- downMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].downButton), newId);
- upMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].upButton), newId);
- toggleMapper->setMapping(TQT_TQOBJECT(m_rows[oldId].enableButton), newId);
+ mapper->setMapping(m_rows[oldId].optionsButton, newId);
+ downMapper->setMapping(m_rows[oldId].downButton, newId);
+ upMapper->setMapping(m_rows[oldId].upButton, newId);
+ toggleMapper->setMapping(m_rows[oldId].enableButton, newId);
}
bool FileRenamerWidget::removeRow(unsigned id)
@@ -480,10 +480,10 @@ void FileRenamerWidget::createTagRows()
m_rows.reserve(categoryOrder.count());
m_folderSwitches.reserve(categoryOrder.count() - 1);
- mapper = new TQSignalMapper(TQT_TQOBJECT(this), "signal mapper");
- toggleMapper = new TQSignalMapper(TQT_TQOBJECT(this), "toggle mapper");
- upMapper = new TQSignalMapper(TQT_TQOBJECT(this), "up button mapper");
- downMapper = new TQSignalMapper(TQT_TQOBJECT(this), "down button mapper");
+ mapper = new TQSignalMapper(this, "signal mapper");
+ toggleMapper = new TQSignalMapper(this, "toggle mapper");
+ 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)));
diff --git a/juk/juk.cpp b/juk/juk.cpp
index c66c19fc..734d39b7 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -72,7 +72,7 @@ JuK::JuK(TQWidget *parent, const char *name) :
SplashScreen::finishedLoading();
TQTimer::singleShot(0, CollectionList::instance(), TQT_SLOT(slotCheckCache()));
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotProcessArgs()));
+ TQTimer::singleShot(0, this, TQT_SLOT(slotProcessArgs()));
m_sliderAction->slotUpdateOrientation();
}
@@ -112,15 +112,15 @@ void JuK::setupActions()
{
ActionCollection::actions()->setWidget(this);
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), ActionCollection::actions());
- KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ActionCollection::actions());
- KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), ActionCollection::actions());
- KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), ActionCollection::actions());
- KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), ActionCollection::actions());
- KStdAction::clear(TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions());
- KStdAction::selectAll(TQT_TQOBJECT(kapp), TQT_SLOT(selectAll()), ActionCollection::actions());
+ 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());
- new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
+ new TDEAction(i18n("Remove From Playlist"), "edit_remove", 0, kapp, TQT_SLOT(clear()), ActionCollection::actions(), "removeFromPlaylist");
TDEActionMenu *actionMenu = new TDEActionMenu(i18n("&Random Play"), "roll", ActionCollection::actions(), "actionMenu");
actionMenu->setDelayed(false);
@@ -138,12 +138,12 @@ void JuK::setupActions()
connect(ka, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckAlbumNextAction(bool)));
actionMenu->insert(ka);
- new TDEAction(i18n("&Play"), "media-playback-start", 0, TQT_TQOBJECT(m_player), TQT_SLOT(play()), ActionCollection::actions(), "play");
- new TDEAction(i18n("P&ause"), "media-playback-pause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(pause()), ActionCollection::actions(), "pause");
- new TDEAction(i18n("&Stop"), "media-playback-stop", 0, TQT_TQOBJECT(m_player), TQT_SLOT(stop()), ActionCollection::actions(), "stop");
+ 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 TDEToolBarPopupAction(i18n("previous track", "Previous"), "media-skip-backward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(back()), ActionCollection::actions(), "back");
- new TDEAction(i18n("next track", "&Next"), "media-skip-forward", TDEShortcut(), TQT_TQOBJECT(m_player), TQT_SLOT(forward()), ActionCollection::actions(), "forward");
+ 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 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, TQT_TQOBJECT(m_player), TQT_SLOT(mute()), ActionCollection::actions(), "mute");
- new TDEAction(i18n("Volume Up"), "volumeUp", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeUp()), ActionCollection::actions(), "volumeUp");
- new TDEAction(i18n("Volume Down"), "volumeDown", 0, TQT_TQOBJECT(m_player), TQT_SLOT(volumeDown()), ActionCollection::actions(), "volumeDown");
- new TDEAction(i18n("Play / Pause"), "playPause", 0, TQT_TQOBJECT(m_player), TQT_SLOT(playPause()), ActionCollection::actions(), "playPause");
- new TDEAction(i18n("Seek Forward"), "seekForward", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekForward()), ActionCollection::actions(), "seekForward");
- new TDEAction(i18n("Seek Back"), "seekBack", 0, TQT_TQOBJECT(m_player), TQT_SLOT(seekBack()), ActionCollection::actions(), "seekBack");
+ 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");
//////////////////////////////////////////////////
// settings menu
@@ -175,9 +175,9 @@ void JuK::setupActions()
TDEShortcut(), ActionCollection::actions(), "dockOnClose");
m_togglePopupsAction =
new TDEToggleAction(i18n("Popup &Track Announcement"),
- TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "togglePopups");
+ TDEShortcut(), this, 0, ActionCollection::actions(), "togglePopups");
new TDEToggleAction(i18n("Save &Play Queue on Exit"),
- TDEShortcut(), TQT_TQOBJECT(this), 0, ActionCollection::actions(), "saveUpcomingTracks");
+ TDEShortcut(), this, 0, ActionCollection::actions(), "saveUpcomingTracks");
connect(m_toggleSystemTrayAction, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(slotToggleSystemTray(bool)));
@@ -188,13 +188,13 @@ void JuK::setupActions()
if(m_outputSelectAction)
m_outputSelectAction->setCurrentItem(0);
- new TDEAction(i18n("&Tag Guesser..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTagGuesser()),
+ new TDEAction(i18n("&Tag Guesser..."), 0, 0, this, TQT_SLOT(slotConfigureTagGuesser()),
ActionCollection::actions(), "tagGuesserConfig");
- new TDEAction(i18n("&File Renamer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureFileRenamer()),
+ new TDEAction(i18n("&File Renamer..."), 0, 0, this, TQT_SLOT(slotConfigureFileRenamer()),
ActionCollection::actions(), "fileRenamerConfig");
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), ActionCollection::actions());
+ KStdAction::keyBindings(this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToQuit()));
+ connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotAboutToQuit()));
}
else {
m_systemTray = 0;
@@ -224,7 +224,7 @@ void JuK::setupSystemTray()
void JuK::setupGlobalAccels()
{
- m_accel = new TDEGlobalAccel(TQT_TQOBJECT(this));
+ 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()));
@@ -236,7 +236,7 @@ void JuK::setupGlobalAccels()
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"), TQT_TQOBJECT(this), TQT_SLOT(slotShowHide()));
+ 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()));
m_accel->setConfigGroup("Shortcuts");
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 21df8553..cf20a415 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -314,7 +314,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQString &name,
const TQString &iconName) :
TDEListView(collection->playlistStack(), name.latin1()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+ m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -338,7 +338,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items
const TQString &name, const TQString &iconName) :
TDEListView(collection->playlistStack(), name.latin1()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+ m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -363,7 +363,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
const TQString &iconName) :
TDEListView(collection->playlistStack()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+ m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -387,7 +387,7 @@ Playlist::Playlist(PlaylistCollection *collection, const TQFileInfo &playlistFil
Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) :
TDEListView(collection->playlistStack()),
m_collection(collection),
- m_fetcher(new WebImageFetcher(TQT_TQOBJECT(this))),
+ m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_polished(false),
@@ -1547,7 +1547,7 @@ void Playlist::polish()
// setup header RMB menu
//////////////////////////////////////////////////
- m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), TQT_TQOBJECT(this), "showColumns");
+ m_columnVisibleAction = new TDEActionMenu(i18n("&Show Columns"), this, "showColumns");
m_headerMenu = m_columnVisibleAction->popupMenu();
m_headerMenu->insertTitle(i18n("Show"));
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 7d4e7f7d..c1aca5aa 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -158,7 +158,7 @@ TQStringList PlaylistCollection::playlists() const
TQObjectList *childList = m_playlistStack->queryList("Playlist");
TQObject *obj;
for(obj = childList->first(); obj; obj = childList->next()) {
- Playlist *p = static_cast<Playlist *>(TQT_TQWIDGET(obj));
+ Playlist *p = static_cast<Playlist *>(obj);
l.append(p->name());
}
@@ -706,7 +706,7 @@ void PlaylistCollection::clearShowMore(bool raisePlaylist)
void PlaylistCollection::enableDirWatch(bool enable)
{
- TQObject *collection = TQT_TQOBJECT(CollectionList::instance());
+ TQObject *collection = CollectionList::instance();
m_dirLister.disconnect(object());
if(enable) {
@@ -789,7 +789,7 @@ Playlist *PlaylistCollection::playlistByName(const TQString &name) const
TQObject *obj;
for(obj = l->first(); obj; obj = l->next()) {
- Playlist *p = static_cast<Playlist*>(TQT_TQWIDGET(obj));
+ Playlist *p = static_cast<Playlist*>(obj);
if(p->name() == name) {
list = p;
break;
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index 17da7a07..a55e4747 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", TQT_TQOBJECT(this), TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
+ new TDEAction(i18n("Edit Track Search"), "edit_clear", "F6", this, TQT_SLOT(setFocus()), ActionCollection::actions(), "editTrackSearch");
}
void PlaylistSplitter::setupLayout()
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index ae3aee32..29c5c436 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -162,7 +162,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
// Just create this here so that it show up in the DCOP interface and the key
// bindings dialog.
- new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), TQT_TQOBJECT(this),
+ new TDEAction(i18n("Redisplay Popup"), TDEShortcut(), this,
TQT_SLOT(slotPlay()), ActionCollection::actions(), "showPopup");
TDEPopupMenu *cm = contextMenu();
@@ -181,7 +181,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent,
// Pity the actionCollection doesn't keep track of what sub-menus it has.
- TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), TQT_TQOBJECT(this));
+ TDEActionMenu *menu = new TDEActionMenu(i18n("&Random Play"), this);
menu->insert(action("disableRandomPlay"));
menu->insert(action("randomPlay"));
menu->insert(action("albumRandomPlay"));
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index c1200e3d..0129680f 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -475,7 +475,7 @@ void TagEditor::setupActions()
show->setCheckedState(i18n("Hide &Tag Editor"));
connect(show, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShown(bool)));
- new TDEAction(i18n("&Save"), "document-save", "CTRL+t", TQT_TQOBJECT(this), TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
+ new TDEAction(i18n("&Save"), "document-save", "CTRL+t", this, TQT_SLOT(slotSave()), ActionCollection::actions(), "saveItem");
}
void TagEditor::setupLayout()
@@ -526,7 +526,7 @@ void TagEditor::setupLayout()
horizontalSpacing);
m_fileNameBox = new KLineEdit(this, "fileNameBox");
- m_fileNameBox->setValidator(new FileNameValidator(TQT_TQOBJECT(m_fileNameBox)));
+ m_fileNameBox->setValidator(new FileNameValidator(m_fileNameBox));
TQLabel *fileNameIcon = new TQLabel(this);
fileNameIcon->setPixmap(SmallIcon("audio-x-generic"));
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index c816f2f4..2c66f120 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo
if(!to.exists() ||
KMessageBox::warningContinueCancel(
- TQT_TQWIDGET(parent()),
+ static_cast<TQWidget*>(parent()),
i18n("This file already exists.\nDo you want to replace it?"),
i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue)
{
@@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo)
action("edit_undo")->setEnabled(false);
if(!errorItems.isEmpty())
- KMessageBox::errorList(TQT_TQWIDGET(parent()),
+ KMessageBox::errorList(static_cast<TQWidget*>(parent()),
i18n("The following files were unable to be changed."),
errorItems,
i18n("Error"));
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 08531166..0a334d08 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -54,16 +54,16 @@ Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile
setAcceptDrops(true);
setStandardToolBarMenuEnabled(true);
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(playerPreferences()), actionCollection());
- KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+ 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() );
- menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection());
- propertiesAction = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection(), "properties");
+ menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
+ propertiesAction = new TDEAction(i18n("Properties"), 0, this, TQT_SLOT(properties()), actionCollection(), "properties");
propertiesAction->setEnabled(false);
- part = new Player(this, "KaboodlePlayer", TQT_TQOBJECT(this), "KaboodleView");
+ part = new Player(this, "KaboodlePlayer", this, "KaboodleView");
part->view()->setButtons(KMediaPlayer::View::Seeker);
setCentralWidget(part->view());
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index 8c752338..5465d808 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -58,23 +58,23 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio-unmounted", 32));
tracks = new TracksImp(frame, "Tracks");
- ripper = new Ripper ( TQT_TQOBJECT(frame), "Rip" );
- encoder = new Encoder( TQT_TQOBJECT(frame), "Encoder" );
+ ripper = new Ripper ( frame, "Rip" );
+ encoder = new Encoder( frame, "Encoder" );
frame = janusWidget->addVBoxPage( i18n("&Jobs"), TQString(), SmallIcon( "system-run", 32 ) );
jobQue = new JobQueImp( frame, "Que" );
resize(500, 440);
- /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, TQT_TQOBJECT(tracks),
+ /*TDEAction *eject = */new TDEAction( i18n("&Eject CD"), 0, tracks,
TQT_SLOT( eject() ), actionCollection(), "eject" );
- (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction( i18n("&Configure KAudioCreator..."), 0, this,
TQT_SLOT( showSettings() ), actionCollection(), "configure_kaudiocreator" );
- TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, TQT_TQOBJECT(tracks),
+ TDEAction *selectAll = new TDEAction( i18n( "Select &All Tracks"), 0, tracks,
TQT_SLOT( selectAllTracks() ), actionCollection(), "select_all" ) ;
- TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, TQT_TQOBJECT(tracks),
+ TDEAction *deselectAll = new TDEAction( i18n( "Deselect &All Tracks"), 0, tracks,
TQT_SLOT( deselectAllTracks() ), actionCollection(), "deselect_all" );
selectAll->setEnabled( false );
deselectAll->setEnabled( false );
@@ -82,56 +82,56 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
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() ), TQT_TQOBJECT(tracks), TQT_SLOT( startSession() ) );
+ connect( actActionMenu, TQT_SIGNAL( activated() ), tracks, TQT_SLOT( startSession() ) );
ripMenu = actActionMenu->popupMenu();
- connect( ripMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotRipSelection(int)) );
- connect( ripMenu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( getRipMenu()) );
+ connect( ripMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRipSelection(int)) );
+ connect( ripMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( getRipMenu()) );
- TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, TQT_TQOBJECT(tracks),
+ TDEAction *rip = new TDEAction( i18n( "Rip &Selection" ), 0, tracks,
TQT_SLOT( startSession() ), actionCollection(), "rip_selected" );
rip->setEnabled( false );
- connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) );
- connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(ripper), TQT_SLOT( removeJob(int) ) );
- connect( jobQue, TQT_SIGNAL( removeJob(int) ), TQT_TQOBJECT(encoder), TQT_SLOT( removeJob(int)) );
+ 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( ripper, TQT_SIGNAL( updateProgress(int, int) ), TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int) ) );
- connect( ripper, TQT_SIGNAL( addJob(Job*, const TQString &) ), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) );
- connect( ripper, TQT_SIGNAL( eject(const TQString &) ) , TQT_TQOBJECT(tracks), TQT_SLOT( ejectDevice(const TQString &)) );
- connect( ripper, TQT_SIGNAL( encodeWav(Job *) ) , TQT_TQOBJECT(encoder), TQT_SLOT( encodeWav(Job *)) );
- connect( ripper, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_SLOT( updateStatus() ) );
+ 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( encoder, TQT_SIGNAL( updateProgress(int, int) ) , TQT_TQOBJECT(jobQue), TQT_SLOT( updateProgress(int,int)) );
- connect( encoder, TQT_SIGNAL( addJob(Job*, const TQString&)), TQT_TQOBJECT(jobQue), TQT_SLOT( addJob(Job*, const TQString &)) );
- connect( encoder, TQT_SIGNAL( jobsChanged() ) , TQT_TQOBJECT(this), TQT_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( tracks, TQT_SIGNAL( hasCD(bool) ) , TQT_TQOBJECT(this), TQT_SLOT( hasCD(bool) ) );
- connect( tracks, TQT_SIGNAL( ripTrack(Job *) ), TQT_TQOBJECT(ripper), TQT_SLOT( ripTrack(Job *)) );
+ 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)) );
- (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, TQT_TQOBJECT(jobQue),
+ (void)new TDEAction(i18n("Remove &Completed Jobs"), 0, jobQue,
TQT_SLOT(clearDoneJobs()), actionCollection(), "clear_done_jobs" );
- TDEAction *edit = new TDEAction(i18n("&Edit Album..."), 0, TQT_TQOBJECT(tracks),
+ 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)));
edit->setEnabled( false );
- (void)new TDEAction(i18n("Encode &File..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("Encode &File..."), 0, this,
TQT_SLOT(encodeFile()), actionCollection(), "encode_file");
- TDEAction *cddb = new TDEAction(i18n("&CDDB Lookup"), 0, TQT_TQOBJECT(tracks),
+ 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)));
cddb->setEnabled( false );
- KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()),
+ KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()),
actionCollection());
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit" );
+ KStdAction::quit( this, TQT_SLOT(close()), actionCollection(), "quit" );
// Init statusbar
statusBar()->insertItem(i18n("No Audio CD detected"), 0 );
@@ -229,9 +229,9 @@ void KAudioCreator::showSettings(){
SettingsDialog *dialog = new SettingsDialog(this, "settings", Prefs::self());
connect(dialog, TQT_SIGNAL(settingsChanged()), ripper, TQT_SLOT(loadSettings()));
- connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(encoder), TQT_SLOT(loadSettings()));
- connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(tracks), TQT_SLOT(loadSettings()));
- connect(dialog->encoderConfigImp, TQT_SIGNAL(encoderUpdated()), TQT_TQOBJECT(encoder), 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()));
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)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool)));
+ connect(cddb, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(slotCddbChanged(bool)));
}
}
RipConfig *rip = new RipConfig(0, "Ripper");
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 20e9c58f..c4c7a9e6 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -111,25 +111,25 @@ void
KMixWindow::initActions()
{
// file menu
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit( this, TQT_SLOT(quit()), actionCollection());
// settings menu
- KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBar()), actionCollection());
- KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
- new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
+ KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection());
+ KStdAction::preferences( this, TQT_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());
- (void) new TDEAction( i18n( "Hardware &Information" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
- (void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
+ (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" );
m_globalAccel = new TDEGlobalAccel(this, "KMix");
m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotIncreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotIncreaseVolume() ) );
m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDecreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotDecreaseVolume() ) );
m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleMuted() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_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 ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) );
+ connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) );
TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
// Add first layout to widgets
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 8867b40b..5876956b 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -89,7 +89,7 @@ void KMixDockWidget::createActions()
TDEPopupMenu *popupMenu = contextMenu();
// Put "Mute" selector in context menu
- (void)new TDEToggleAction(i18n("M&ute"), 0, TQT_TQOBJECT(this), TQT_SLOT(dockMute()),
+ (void)new TDEToggleAction(i18n("M&ute"), 0, this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(selectMaster()),
+ (void)new TDEAction(i18n("Select Master Channel..."), 0, this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip()));
- connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap()));
+ connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip()));
+ connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap()));
}
void KMixDockWidget::deleteMasterVolWidget()
@@ -191,8 +191,8 @@ void KMixDockWidget::deleteMasterVolWidget()
}
if (m_mixer)
{
- disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(setVolumeTip()));
- disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdatePixmap()));
+ disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip()));
+ disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap()));
}
}
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index ceeac1f3..9e8006a9 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, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
/* !!! remove this for production version */
m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( nextEnumId() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_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 ) ), TQT_TQOBJECT(this), TQT_SLOT( setEnumId( int ) ) );
+ connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) );
TQToolTip::add( _enumCombo, m_mixdevice->name() );
//_layout->addSpacing( 4 );
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 6b493e48..169c2810 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -64,9 +64,9 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
{
// create actions (on _mdwActions, see MixDeviceWidget)
- new TDEToggleAction( i18n("&Split Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(toggleStereoLinked()),
+ new TDEToggleAction( i18n("&Split Channels"), 0, this, TQT_SLOT(toggleStereoLinked()),
_mdwActions, "stereo" );
- new TDEToggleAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) );
@@ -76,17 +76,17 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) );
}
- new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQT_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(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_SLOT( increaseVolume() ) );
m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_SLOT( decreaseVolume() ) );
m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_SLOT( toggleMuted() ) );
installEventFilter( this ); // filter for popup
@@ -908,7 +908,7 @@ void MDWSlider::showContextMenu()
a = _mdwActions->action( "keys" );
if ( a && m_keys ) {
- TDEActionSeparator sep( TQT_TQOBJECT(this) );
+ TDEActionSeparator sep( this );
sep.plug( menu );
a->plug( menu );
}
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 48b918a3..93ebaad2 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, TQT_TQOBJECT(this), TQT_SLOT(setDisabled()), _mdwActions, "hide" );
- new TDEAction( i18n("C&onfigure Shortcuts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+ new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+ new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
// create widgets
createWidgets();
m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(),
- TDEShortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleSwitch() ) );
+ TDEShortcut(), TDEShortcut(), this, TQT_SLOT( toggleSwitch() ) );
// The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp)
//m_keys->readSettings();
diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp
index 889b19ac..5fbfac2a 100644
--- a/kmix/mixdevicewidget.cpp
+++ b/kmix/mixdevicewidget.cpp
@@ -59,7 +59,7 @@ MixDeviceWidget::MixDeviceWidget(Mixer *mixer, MixDevice* md,
m_disabled( false ), _orientation( orientation ), m_small( small )
{
_mdwActions = new TDEActionCollection( this );
- m_keys = new TDEGlobalAccel( TQT_TQOBJECT(this), "Keys" );
+ m_keys = new TDEGlobalAccel( this, "Keys" );
}
MixDeviceWidget::~MixDeviceWidget()
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 4bebfdbc..125479ba 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -42,7 +42,7 @@ 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(TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions) );
+ _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) );
if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) {
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index 48a7ccb0..ddacd4d8 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( TQT_TQOBJECT(this), TQT_SLOT(toggleMenuBarSlot()), _actions ));
+ TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
if ( vflags & ViewBase::MenuBarVisible ) {
m->setChecked(true);
}
@@ -59,8 +59,8 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
m->setChecked(false);
}
}
- new TDEAction(i18n("&Channels"), 0, TQT_TQOBJECT(this), TQT_SLOT(configureView()), _actions, "toggle_channels");
- new TDEAction(i18n("&Select Mixer"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectMixerSlot()), _actions, "select_mixer");
+ 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()) );
}
diff --git a/krec/krecfilewidgets.cpp b/krec/krecfilewidgets.cpp
index a0c2180d..4f5b0537 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* ) ), TQT_TQOBJECT(this), TQT_SLOT( newBuffer( KRecBuffer* ) ) );
- connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), TQT_TQOBJECT(this), TQT_SLOT( deleteBuffer( KRecBuffer* ) ) );
+ connect( _file, TQT_SIGNAL( sNewBuffer( KRecBuffer* ) ), this, TQT_SLOT( newBuffer( KRecBuffer* ) ) );
+ connect( _file, TQT_SIGNAL( sDeleteBuffer( KRecBuffer* ) ), this, TQT_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 ) ), TQT_TQOBJECT(this), TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
+ connect( tmp, TQT_SIGNAL( popupMenu( KRecBufferWidget*, TQPoint ) ), this, TQT_SLOT( popupMenu( KRecBufferWidget*, TQPoint ) ) );
bufferwidgets.append( tmp );
tmp->show();
resizeEvent();
@@ -119,12 +119,12 @@ void KRecFileWidget::deleteBuffer( KRecBuffer* buffer ) {
void KRecFileWidget::popupMenu( KRecBufferWidget* bw, TQPoint pos ) {
TDEPopupMenu tmp( this );
- TDEToggleAction* _activeaction = new TDEToggleAction( i18n( "Toggle Active/Disabled State" ), TDEShortcut(), TQT_TQOBJECT(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() ), TQT_TQOBJECT(this) );
- TDEAction* _changetitle = new TDEAction( i18n( "Change Title of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeTitle() ), TQT_TQOBJECT(this) );
- TDEAction* _changecomment = new TDEAction( i18n( "Change Comment of This Part" ), TDEShortcut(), TQT_TQOBJECT(bw), TQT_SLOT( changeComment() ), TQT_TQOBJECT(this) );
+ 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 );
_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() ), TQT_TQOBJECT(this), TQT_SLOT( update() ) );
+ connect( _buffer, TQT_SIGNAL( somethingChanged() ), this, TQT_SLOT( update() ) );
kdDebug( 60005 ) << k_funcinfo << endl;
}
KRecBufferWidget::~KRecBufferWidget() {
diff --git a/krec/krecord.cpp b/krec/krecord.cpp
index 324d1d01..f9a79891 100644
--- a/krec/krecord.cpp
+++ b/krec/krecord.cpp
@@ -164,7 +164,7 @@ void KRecPrivate::exportFile() {
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() ), TQT_TQOBJECT(this), TQT_SLOT( endExportFile() ) );
+ connect( _currentFile, TQT_SIGNAL( endReached() ), this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT( endExportFile2() ) ); }
+void KRecPrivate::endExportFile() { TQTimer::singleShot( 20, this, TQT_SLOT( endExportFile2() ) ); }
void KRecPrivate::endExportFile2() {
_exportitem->finalize();
disconnect( _currentFile, 0, _exportitem, 0 );
@@ -290,7 +290,7 @@ KRecord::KRecord(TQWidget *parent, const char *name )
KStdAction::save( d, TQT_SLOT( saveFile() ), actionCollection() );
KStdAction::saveAs( d, TQT_SLOT( saveAsFile() ), actionCollection() );
KStdAction::close( d, TQT_SLOT( closeFile() ), actionCollection() );
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
KStdAction::tipOfDay( d, TQT_SLOT( forceTipOfDay() ), actionCollection() );
@@ -298,11 +298,11 @@ KRecord::KRecord(TQWidget *parent, const char *name )
d, TQT_SLOT( exportFile() ), actionCollection(), "export_file" );
d->aRecord = new TDEAction( i18n( "&Record" ), TDEShortcut( Key_R ),
- TQT_TQOBJECT(this), TQT_SLOT( startRec() ), actionCollection(), "player_record" );
+ this, TQT_SLOT( startRec() ), actionCollection(), "player_record" );
d->aPlay = new TDEAction( i18n( "&Play" ), TDEShortcut( Key_P ),
- TQT_TQOBJECT(this), TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
+ this, TQT_SLOT( startPlay() ), actionCollection(), "media-playback-start" );
d->aStop = new TDEAction( i18n( "&Stop" ), TDEShortcut( Key_S ),
- TQT_TQOBJECT(this), TQT_SLOT( stopRec() ), actionCollection(), "media-playback-stop" );
+ this, TQT_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 ) ) );
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index df4eeabf..34e7c360 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)), TQT_TQOBJECT(this), TQT_SLOT(lookupCDDBDone(CDDB::Result)));
+ connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result)));
#if defined(BUILD_CDDA)
audio_systems_list
@@ -139,11 +139,11 @@ KSCD::KSCD( TQWidget *parent, const char *name )
/* FIXME check for return value */
setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/);
- connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackChanged(unsigned, unsigned)));
- connect(m_cd, TQT_SIGNAL(discStopped()), TQT_TQOBJECT(this), TQT_SLOT(discStopped()));
- connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), TQT_TQOBJECT(this), TQT_SLOT(discChanged(unsigned)));
+ 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()) );
@@ -160,8 +160,8 @@ KSCD::KSCD( TQWidget *parent, const char *name )
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()), TQT_TQOBJECT(this), TQT_SLOT(setColors()));
- connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setIcons()));
+ connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(setColors()));
+ connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
- action = new TDEAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
- action = new TDEAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
- action = new TDEAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
- action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions);
- action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
- action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
- action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions);
- action = new TDEAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
- action = new TDEAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
- action = new TDEAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
+ 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");
TDEShortcut increaseVolume = action->shortcut();
increaseVolume.append( KKey( Key_Equal ) );
action->setShortcut( increaseVolume );
- action = new TDEAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
- action = new TDEAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
- action = new TDEAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
- action = new TDEAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+ 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");
m_actions->readShortcutSettings("Shortcuts");
@@ -227,25 +227,25 @@ KSCD::~KSCD()
void KSCD::initGlobalShortcuts() {
- m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ m_globalAccel = new TDEGlobalAccel( this );
//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"),
- TQT_TQOBJECT(this), TQT_SLOT(nextClicked()));
+ this, TQT_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"),
- TQT_TQOBJECT(this), TQT_SLOT(prevClicked()));
+ this, TQT_SLOT(prevClicked()));
m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(playClicked()));
+ this, TQT_SLOT(playClicked()));
m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(stopClicked()));
+ this, TQT_SLOT(stopClicked()));
m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"),
- TQT_TQOBJECT(this), TQT_SLOT(incVolume()));
+ this, TQT_SLOT(incVolume()));
m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"),
- TQT_TQOBJECT(this), TQT_SLOT(decVolume()));
+ this, TQT_SLOT(decVolume()));
m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(incVolume()));
+ this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(cycleplaytimemode()));
+ connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode()));
}
setLEDs(-1);
@@ -765,7 +765,7 @@ void KSCD::showConfig()
updateConfigDialog(confWidget);
- connect(configDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(configDone()));
+ connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone()));
configDialog -> show();
} // showConfig()
@@ -814,7 +814,7 @@ void KSCD::setDocking(bool dock)
if (!m_dockWidget)
{
m_dockWidget = new DockWidget(this, "dockw");
- connect(m_dockWidget, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitClicked()));
+ connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked()));
}
m_dockWidget->show();
diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 1bd1fb6b..d135658e 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -88,9 +88,9 @@ NoatunApp::NoatunApp()
mLibraryLoader->add("dcopiface.plugin");
- new General(TQT_TQOBJECT(this)); // 25
- new Plugins(TQT_TQOBJECT(this)); // 149
-// new Types(TQT_TQOBJECT(this));
+ new General(this); // 25
+ new Plugins(this); // 149
+// new Types(this);
mPlayer=new Player; // 139
d->effects=new Effects; // 1
@@ -363,7 +363,7 @@ void NoatunApp::pluginMenuRemove(int id)
NoatunStdAction::PluginActionMenu *NoatunApp::pluginActionMenu()
{
if (!mPluginActionMenu)
- mPluginActionMenu = new NoatunStdAction::PluginActionMenu(TQT_TQOBJECT(this), "menu_actions");
+ mPluginActionMenu = new NoatunStdAction::PluginActionMenu(this, "menu_actions");
return mPluginActionMenu;
}
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index 72391b8d..3fc17983 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -116,7 +116,7 @@ void EffectView::init(void)
TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint());
topTopLayout->setAutoAdd(true);
available = new KComboBox(false, topTopFrame);
- TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame);
+ TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), this, TQT_SLOT(addEffect()), topTopFrame);
// Active
TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box);
@@ -153,10 +153,10 @@ void EffectView::init(void)
// the buttons
TQFrame *bottomLeftFrame = new TQFrame(bottomBox);
TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint());
- up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame);
- down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame);
- configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame);
- remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame);
+ up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), this, 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);
bottomLeftLayout->addWidget(up);
bottomLeftLayout->addWidget(down);
bottomLeftLayout->addWidget(configure);
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index de05590c..745886da 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -114,8 +114,8 @@ void PluginActionMenu::menuRemove(int id)
VisActionMenu::VisActionMenu(TQObject *parent, const char *name)
: TDEActionMenu(i18n("&Visualizations"), parent, name)
{
- connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillPopup()));
- connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(toggleVisPlugin(int)));
+ connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillPopup()));
+ connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleVisPlugin(int)));
}
void VisActionMenu::fillPopup()
@@ -163,26 +163,26 @@ LoopActionMenu::LoopActionMenu(TQObject *parent, const char *name)
: TDEActionMenu(i18n("&Loop"), parent, name)
{
mLoopNone = new TDERadioAction(i18n("&None"), TQString::fromLocal8Bit("noatunloopnone"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(loopNoneSelected()), TQT_TQOBJECT(this), "loop_none");
+ 0, this, TQT_SLOT(loopNoneSelected()), this, "loop_none");
mLoopNone->setExclusiveGroup("loopType");
insert(mLoopNone);
mLoopSong = new TDERadioAction(i18n("&Song"), TQString::fromLocal8Bit("noatunloopsong"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(loopSongSelected()), TQT_TQOBJECT(this), "loop_song");
+ 0, this, TQT_SLOT(loopSongSelected()), this, "loop_song");
mLoopSong->setExclusiveGroup("loopType");
insert(mLoopSong);
mLoopPlaylist = new TDERadioAction(i18n("&Playlist"), TQString::fromLocal8Bit("noatunloopplaylist"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(loopPlaylistSelected()), TQT_TQOBJECT(this), "loop_playlist");
+ 0, this, TQT_SLOT(loopPlaylistSelected()), this, "loop_playlist");
mLoopPlaylist->setExclusiveGroup("loopType");
insert(mLoopPlaylist);
mLoopRandom = new TDERadioAction(i18n("&Random"), TQString::fromLocal8Bit("noatunlooprandom"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(loopRandomSelected()), TQT_TQOBJECT(this), "loop_random");
+ 0, this, TQT_SLOT(loopRandomSelected()), this, "loop_random");
mLoopRandom->setExclusiveGroup("loopType");
insert(mLoopRandom);
- connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), TQT_TQOBJECT(this), TQT_SLOT(updateLooping(int)));
+ connect(napp->player(), TQT_SIGNAL(loopTypeChange(int)), this, TQT_SLOT(updateLooping(int)));
updateLooping(static_cast<int>(napp->player()->loopStyle()));
}
@@ -239,17 +239,17 @@ TDEAction *playpause(TQObject *parent, const char *name)
TDEAction *effects(TQObject *parent, const char *name)
{
- return new TDEAction(i18n("&Effects..."), "effect", 0, TQT_TQOBJECT(napp), TQT_SLOT(effectView()), parent, name);
+ return new TDEAction(i18n("&Effects..."), "effect", 0, napp, TQT_SLOT(effectView()), parent, name);
}
TDEAction *equalizer(TQObject *parent, const char *name)
{
- return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, TQT_TQOBJECT(napp), TQT_SLOT(equalizerView()), parent, name);
+ return new TDEAction(i18n("E&qualizer..."), "equalizer", 0, napp, TQT_SLOT(equalizerView()), parent, name);
}
TDEAction *back(TQObject *parent, const char *name)
{
- return new TDEAction(i18n("&Back"), "media-skip-backward", 0, TQT_TQOBJECT(napp->player()), TQT_SLOT(back()), parent, name);
+ return new TDEAction(i18n("&Back"), "media-skip-backward", 0, napp->player(), TQT_SLOT(back()), parent, name);
}
TDEAction *stop(TQObject *parent, const char *name)
@@ -333,15 +333,15 @@ TDEPopupMenu *ContextMenu::createContextMenu(TQWidget *p)
KHelpMenu *helpmenu = new KHelpMenu(contextMenu, kapp->aboutData(), false);
TDEActionCollection* actions = new TDEActionCollection(helpmenu);
- KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
- KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actions)->plug(contextMenu);
+ KStdAction::open(napp, TQT_SLOT(fileOpen()), actions)->plug(contextMenu);
+ KStdAction::quit(napp, TQT_SLOT(quit()), actions)->plug(contextMenu);
contextMenu->insertItem(SmallIcon("help"), KStdGuiItem::help().text(), helpmenu->menu());
contextMenu->insertSeparator();
- KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actions)->plug(contextMenu);
- NoatunStdAction::playlist(TQT_TQOBJECT(contextMenu))->plug(contextMenu);
- NoatunStdAction::effects(TQT_TQOBJECT(contextMenu))->plug(contextMenu);
- NoatunStdAction::equalizer(TQT_TQOBJECT(napp))->plug(contextMenu);
- NoatunStdAction::visualizations(TQT_TQOBJECT(napp))->plug(contextMenu);
+ KStdAction::preferences(napp, TQT_SLOT(preferences()), actions)->plug(contextMenu);
+ NoatunStdAction::playlist(contextMenu)->plug(contextMenu);
+ NoatunStdAction::effects(contextMenu)->plug(contextMenu);
+ NoatunStdAction::equalizer(napp)->plug(contextMenu);
+ NoatunStdAction::visualizations(napp)->plug(contextMenu);
napp->pluginActionMenu()->plug(contextMenu);
return contextMenu;
diff --git a/noatun/library/pref.cpp b/noatun/library/pref.cpp
index 9ed882c5..a0d1bbcc 100644
--- a/noatun/library/pref.cpp
+++ b/noatun/library/pref.cpp
@@ -32,7 +32,7 @@ void NoatunPreferences::show()
void NoatunPreferences::show(CModule *page)
{
- int index = pageIndex( static_cast<TQWidget *>(TQT_TQWIDGET(page->parent())) );
+ int index = pageIndex( static_cast<TQWidget *>(page->parent()) );
if (index != -1)
showPage(index);
show();
@@ -65,7 +65,7 @@ CModule::CModule(const TQString &name, const TQString &description, const TQStri
napp->preferencesBox()->add(this);
- TQFrame *page=static_cast<TQFrame*>(TQT_TQWIDGET(parent()));
+ TQFrame *page=static_cast<TQFrame*>(parent());
(new TQHBoxLayout(page))->addWidget(this);
}
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 540a3abc..0d844671 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -67,12 +67,12 @@ Excellent::Excellent()
{
setAcceptDrops(true);
- KStdAction::quit(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection());
- KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
setStandardToolBarMenuEnabled(true);
- menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection());
+ menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection());
+ KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
// buttons
NoatunStdAction::back(actionCollection(), "back");
@@ -82,7 +82,7 @@ Excellent::Excellent()
NoatunStdAction::forward(actionCollection(), "forward");
NoatunStdAction::playlist(actionCollection(), "show_playlist");
- volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, TQT_TQOBJECT(this), TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
+ volumeAction = new TDEToggleAction(i18n("Show &Volume Control"), 0, this, TQT_SLOT(showVolumeControl()), actionCollection(), "show_volumecontrol");
volumeAction->setCheckedState(i18n("Hide &Volume Control"));
NoatunStdAction::effects(actionCollection(), "effects");
NoatunStdAction::equalizer(actionCollection(), "equalizer");
diff --git a/noatun/modules/kaiman/style.cpp b/noatun/modules/kaiman/style.cpp
index 1e4da725..b380e438 100644
--- a/noatun/modules/kaiman/style.cpp
+++ b/noatun/modules/kaiman/style.cpp
@@ -1405,8 +1405,8 @@ bool KaimanStyle::eventFilter( TQObject *o, TQEvent *e )
return true;
}
- TQPoint mousePos( m->x()+TQT_TQWIDGET(o)->x(),
- m->y()+TQT_TQWIDGET(o)->y() );
+ TQPoint mousePos( m->x()+static_cast<TQWidget*>(o)->x(),
+ m->y()+static_cast<TQWidget*>(o)->y() );
TQWidget *slider = 0;
/* find slider that is under the mouse position */
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index 9f502178..c63c5d0f 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -112,7 +112,7 @@ Kaiman::Kaiman()
if( napp->player()->isPlaying() )
newSong();
- new KaimanPrefDlg(TQT_TQOBJECT(this));
+ new KaimanPrefDlg(this);
show();
}
diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp
index 420ccd01..9ee32b90 100644
--- a/noatun/modules/keyz/keyz.cpp
+++ b/noatun/modules/keyz/keyz.cpp
@@ -47,13 +47,13 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
player, TQT_SLOT( toggleListView() ));
s_accel->insert( "OpenFile", i18n("Open File to Play"), TQString(),
CTRL+ALT+Key_O, KKey::QtWIN+CTRL+Key_O,
- TQT_TQOBJECT(napp), TQT_SLOT( fileOpen() ));
+ napp, TQT_SLOT( fileOpen() ));
s_accel->insert( "Effects", i18n("Effects Configuration"), TQString(),
CTRL+ALT+Key_E, KKey::QtWIN+CTRL+Key_E,
- TQT_TQOBJECT(napp), TQT_SLOT( effectView() ));
+ napp, TQT_SLOT( effectView() ));
s_accel->insert( "Preferences", i18n("Preferences"), TQString(),
CTRL+ALT+Key_F, KKey::QtWIN+CTRL+Key_F,
- TQT_TQOBJECT(napp), TQT_SLOT( preferences() ));
+ napp, TQT_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() ));
@@ -81,7 +81,7 @@ Keyz::Keyz() : TQObject( 0L, "Keyz" ), Plugin(), preMuteVol(0)
s_accel->insert( "ToggleGUI", i18n("Show/Hide Main Window"), TQString(),
CTRL+ALT+Key_W, KKey::QtWIN+CTRL+Key_W,
- TQT_TQOBJECT(napp), TQT_SLOT( toggleInterfaces() ));
+ napp, TQT_SLOT( toggleInterfaces() ));
s_accel->readSettings();
s_accel->updateConnections();
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index ce9c88c8..e23c47a7 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -131,7 +131,7 @@ KJLoader::KJLoader()
subwidgets.setAutoDelete(true);
- mPrefs = new KJPrefs(TQT_TQOBJECT(this));
+ mPrefs = new KJPrefs(this);
connect ( mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()) );
TQString skin = mPrefs->skin();
diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp
index 72064a4a..4ff6a9e0 100644
--- a/noatun/modules/metatag/edit.cpp
+++ b/noatun/modules/metatag/edit.cpp
@@ -182,7 +182,7 @@ MetaWidget* Editor::createControl(KFileMetaInfo& meta_info, const TQString &labe
// Get the correct validator
if ( info && !groupName.isNull() )
- validator = info->createValidator( groupName, key, TQT_TQOBJECT(parent) );
+ validator = info->createValidator( groupName, key, parent );
// meta_widget is used for book-keeping internally
meta_widget = new MetaWidget;
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index 7ab51333..702424af 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,
- TQT_TQOBJECT(this), TQT_SLOT(toggle()), TQT_TQOBJECT(this), "togglemonoscope");
+ this, TQT_SLOT(toggle()), this, "togglemonoscope");
mAction->setChecked(!isHidden());
napp->pluginActionMenu()->insert(mAction);
}
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 929ada84..e06feca5 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -126,10 +126,10 @@ SimpleUI::~SimpleUI()
void SimpleUI::setupActions()
{
- KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
- new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
+ KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
+ new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()),
actionCollection(), "_file_properties" );
- KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
+ KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit");
NoatunStdAction::playlist( actionCollection(), "view_playlist" );
actionCollection()->insert(video->action( "half_size" ));
@@ -139,14 +139,14 @@ void SimpleUI::setupActions()
actionCollection()->insert(napp->pluginActionMenu());
- menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()),
+ menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()),
actionCollection());
- statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()),
+ statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()),
actionCollection());
NoatunStdAction::effects( actionCollection(), "effects" );
NoatunStdAction::equalizer( actionCollection(), "equalizer" );
NoatunStdAction::loop( actionCollection(), "loop_style" );
- KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() );
+ KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() );
}
void SimpleUI::showMenubar()
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index b7481125..b0179b88 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -49,7 +49,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
addRef();
setUrl(text);
- static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(parent)->moveItem(this, 0, after);
setOn(true);
// is this really needed, it makes the listview too wide for me :(
@@ -91,7 +91,7 @@ SafeListViewItem::SafeListViewItem(TQListView *parent, TQListViewItem *after, co
}
}
- static_cast<TDEListView*>(TQT_TQWIDGET(parent))->moveItem(this, 0, after);
+ static_cast<TDEListView*>(parent)->moveItem(this, 0, after);
modified();
if (!streamable() && enqueue(url()))
@@ -355,10 +355,10 @@ List::List(View *parent)
setDragEnabled(true);
setItemsMovable(true);
setSelectionMode(TQListView::Extended);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), TQT_SLOT(dropEvent(TQDropEvent*, TQListViewItem*)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(moved()), TQT_SLOT(move()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(aboutToMove()), parent, TQT_SLOT(setNoSorting()));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(deleteCurrentItem()), parent, TQT_SLOT(deleteSelected()));
+ connect(this, 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()));
}
List::~List()
@@ -377,7 +377,7 @@ bool List::acceptDrag(TQDropEvent *event) const
void List::dropEvent(TQDropEvent *event, TQListViewItem *after)
{
- static_cast<View*>(TQT_TQWIDGET(parent()))->setNoSorting();
+ static_cast<View*>(parent())->setNoSorting();
KURL::List textlist;
if (!KURLDrag::decode(event, textlist)) return;
event->acceptAction();
@@ -638,25 +638,25 @@ View::View(SplitPlaylist *)
{
list=new List(this);
setCentralWidget(list);
- connect(list, TQT_SIGNAL(modified(void)), TQT_TQOBJECT(this), TQT_SLOT(setModified(void)) );
+ connect(list, TQT_SIGNAL(modified(void)), this, TQT_SLOT(setModified(void)) );
// connect the click on the header with sorting
connect(list->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(headerClicked(int)) );
- mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
- (void) new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
- mDelete=new TDEAction(i18n("Delete"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(deleteSelected()), actionCollection(), "delete");
+ mOpen=new TDEAction(i18n("Add &Files..."), "queue", 0, this, 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");
- mClose=KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- mFind=KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
+ mClose=KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+ mFind=KStdAction::find(this, TQT_SLOT(find()), actionCollection());
- (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
- mOpenNew=KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
- mOpenpl=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
- mSave=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
- mSaveAs=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
+ (void) KStdAction::configureToolbars(this, 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) new TDEAction(i18n("Shuffle"), "misc", 0, TQT_TQOBJECT(SPL), TQT_SLOT( randomize() ), actionCollection(), "shuffle");
- (void) new TDEAction(i18n("Clear"), "edit-clear", 0, TQT_TQOBJECT(list), TQT_SLOT( clear() ), actionCollection(), "clear");
+ (void) new TDEAction(i18n("Shuffle"), "misc", 0, SPL, TQT_SLOT( randomize() ), actionCollection(), "shuffle");
+ (void) new TDEAction(i18n("Clear"), "edit-clear", 0, list, TQT_SLOT( clear() ), actionCollection(), "clear");
createGUI("splui.rc");
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 2a7953d3..a1270076 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(TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection());
- KStdAction::open(TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection());
+ KStdAction::quit(napp, TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(napp, TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::preferences(napp, TQT_SLOT(preferences()), actionCollection());
NoatunStdAction::back(actionCollection(), "back");
NoatunStdAction::stop(actionCollection(), "stop");
NoatunStdAction::playpause(actionCollection(), "play");
@@ -145,7 +145,7 @@ NoatunSystray::~NoatunSystray()
void NoatunSystray::init()
{
- YHModule *cmod = new YHModule(TQT_TQOBJECT(this));
+ YHModule *cmod = new YHModule(this);
connect(cmod, TQT_SIGNAL(saved()), this, TQT_SLOT(slotLoadSettings()));
slotLoadSettings();
}
diff --git a/noatun/modules/voiceprint/voiceprint.cpp b/noatun/modules/voiceprint/voiceprint.cpp
index c0b1c859..4cfe5d21 100644
--- a/noatun/modules/voiceprint/voiceprint.cpp
+++ b/noatun/modules/voiceprint/voiceprint.cpp
@@ -35,7 +35,7 @@ VoicePrint::~VoicePrint()
void VoicePrint::init()
{
- Prefs *p=new Prefs(TQT_TQOBJECT(this));
+ Prefs *p=new Prefs(this);
p->reopen();
p->save();
resizeEvent(0);
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index a1ff8cdc..d5413414 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -138,7 +138,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode)
{
if (!winSkinVis)
{
- winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis");
+ winSkinVis=new WinSkinVis(this,"WinSkinVis");
connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks()));
}
}
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 961ed457..7e49da08 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -27,7 +27,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
CModule(i18n("Winskin"),
i18n("Skin Selection for the Winskin Plugin"),
"style",
- TQT_TQOBJECT(parent))
+ parent)
{
// Make a token horizontal layout box
vbox = new TQVBoxLayout(this);
diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp
index d701ccb4..51f8fc40 100644
--- a/tdemid/kdisptext.cpp
+++ b/tdemid/kdisptext.cpp
@@ -122,7 +122,7 @@ void KDisplayText::ClearEv(bool totally)
RemoveLinkedList();
if (totally)
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
autoscrollv=0;
resizeContents(0,0);
viewport()->repaint(TRUE);
@@ -425,7 +425,7 @@ void KDisplayText::PaintIn(int type)
autoscrollv+=qfmetr->lineSpacing();
if (b) startTimer(100);
else {
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(100/(autoscrollv/qfmetr->lineSpacing()+1));
}
}
@@ -484,7 +484,7 @@ void KDisplayText::gotomsec(ulong i)
}
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
autoscrollv=0;
setContentsPos(0,first_line->ypos);
viewport()->repaint();
diff --git a/tdemid/klcdnumber.cpp b/tdemid/klcdnumber.cpp
index 3fdf80c4..1d4bab00 100644
--- a/tdemid/klcdnumber.cpp
+++ b/tdemid/klcdnumber.cpp
@@ -299,7 +299,7 @@ void KLCDNumber::mousePressEvent (TQMouseEvent *e)
void KLCDNumber::timerEvent(TQTimerEvent *)
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
doubleclicked=false;
}
diff --git a/tdemid/ktrianglebutton.cpp b/tdemid/ktrianglebutton.cpp
index 34551627..0e2a1d3c 100644
--- a/tdemid/ktrianglebutton.cpp
+++ b/tdemid/ktrianglebutton.cpp
@@ -144,17 +144,17 @@ void KTriangleButton::mouseReleaseEvent(TQMouseEvent *e)
void KTriangleButton::timerEvent(TQTimerEvent *)
{
- if (!usingTimer) {TQT_TQOBJECT(this)->killTimers();return;};
+ if (!usingTimer) {this->killTimers();return;};
if (timeCount==0)
{
timeCount++;
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(120);
} else
if (timeCount==30)
{
timeCount=-1;
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer(80);
}
else if (timeCount>0) timeCount++;
diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp
index fbfaa4c0..609be7dd 100644
--- a/tdemid/tdemidframe.cpp
+++ b/tdemid/tdemidframe.cpp
@@ -68,7 +68,7 @@ tdemidFrame::tdemidFrame(const char *name)
/*
kKeysAccel=new TDEAccel(this);
kKeysAccel->insertItem(i18n("Play/Pause"),"Play/Pause", Key_Space);
- kKeysAccel->connectItem("Play/Pause", TQT_TQOBJECT(this), TQT_SLOT(spacePressed()));
+ kKeysAccel->connectItem("Play/Pause", this, TQT_SLOT(spacePressed()));
kKeysAccel->insertItem(i18n("Stop"),"Stop", Key_Backspace);
kKeysAccel->connectItem("Stop",tdemidclient,TQT_SLOT(song_Stop()));
kKeysAccel->insertItem(i18n("Previous Song"),"Previous Song", Key_Left);
@@ -86,34 +86,34 @@ tdemidFrame::tdemidFrame(const char *name)
kKeysAccel->readSettings();
*/
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_Open()), actionCollection());
- (void)new TDEAction(i18n("&Save Lyrics..."), 0, TQT_TQOBJECT(this),
+ KStdAction::open(this, TQT_SLOT(file_Open()), actionCollection());
+ (void)new TDEAction(i18n("&Save Lyrics..."), 0, this,
TQT_SLOT(file_SaveLyrics()), actionCollection(), "file_save_lyrics");
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
(void)new TDEAction(i18n("&Play"), "media-playback-start", TQt::Key_Space,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPlay()), actionCollection(), "song_play");
- (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, TQT_TQOBJECT(tdemidclient),
+ tdemidclient, TQT_SLOT(slotPlay()), actionCollection(), "song_play");
+ (void)new TDEAction(i18n("P&ause"), "media-playback-pause", TQt::Key_P, tdemidclient,
TQT_SLOT(slotPause()), actionCollection(), "song_pause");
(void)new TDEAction(i18n("&Stop"), "media-playback-stop", TQt::Key_Backspace,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotStop()), actionCollection(), "song_stop");
+ tdemidclient, TQT_SLOT(slotStop()), actionCollection(), "song_stop");
(void)new TDEAction(i18n("P&revious Song"), "media-skip-backward", Key_Left,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotPrevSong()), actionCollection(),
+ tdemidclient, TQT_SLOT(slotPrevSong()), actionCollection(),
"song_previous");
(void)new TDEAction(i18n("&Next Song"), "media-skip-forward", Key_Right,
- TQT_TQOBJECT(tdemidclient), TQT_SLOT(slotNextSong()), actionCollection(),
+ tdemidclient, TQT_SLOT(slotNextSong()), actionCollection(),
"song_next");
- (void)new TDEToggleAction(i18n("&Loop"), 0, TQT_TQOBJECT(this), TQT_SLOT(song_Loop()),
+ (void)new TDEToggleAction(i18n("&Loop"), 0, this, TQT_SLOT(song_Loop()),
actionCollection(), "song_loop");
- (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, TQT_TQOBJECT(tdemidclient),
+ (void)new TDEAction(i18n("Rewind"), "2leftarrow", 0, tdemidclient,
TQT_SLOT(slotRewind()), actionCollection(), "song_rewind");
- (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, TQT_TQOBJECT(tdemidclient),
+ (void)new TDEAction(i18n("Forward"), "2rightarrow", 0, tdemidclient,
TQT_SLOT(slotForward()), actionCollection(), "song_forward");
- (void)new TDEAction(i18n("&Organize..."), 0, TQT_TQOBJECT(this), TQT_SLOT(collect_organize()),
+ (void)new TDEAction(i18n("&Organize..."), 0, this, TQT_SLOT(collect_organize()),
actionCollection(), "collect_organize");
TQStringList playmodes;
@@ -125,7 +125,7 @@ tdemidFrame::tdemidFrame(const char *name)
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(collect_PlayOrder(int)));
act->setItems(playmodes);
- (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, TQT_TQOBJECT(this),
+ (void)new TDEToggleAction(i18n("Auto-Add to Collection"), 0, this,
TQT_SLOT(collect_AutoAdd()), actionCollection(), "collect_autoadd");
playmodes.clear();
@@ -147,29 +147,29 @@ tdemidFrame::tdemidFrame(const char *name)
connect(act,TQT_SIGNAL(activated(int)),this, TQT_SLOT(options_DisplayEvents(int)));
act->setItems(playmodes);
- (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, TQT_TQOBJECT(this),
+ (void)new TDEToggleAction(i18n("Automatic Text Chooser"), 0, this,
TQT_SLOT(options_AutomaticText()), actionCollection(),
"option_automatictext");
TDEToggleAction* togact = new TDEToggleAction(i18n("Show &Volume Bar"), "volume",
- 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
+ 0, this, TQT_SLOT(options_ShowVolumeBar()), actionCollection(),
"toggle_volumebar");
togact->setCheckedState(i18n("Hide &Volume Bar"));
togact = new TDEToggleAction(i18n("Show &Channel View"), "piano",
- 0, TQT_TQOBJECT(this), TQT_SLOT(options_ShowChannelView()), actionCollection(),
+ 0, this, TQT_SLOT(options_ShowChannelView()), actionCollection(),
"toggle_channelview");
togact->setCheckedState(i18n("Hide &Channel View"));
- (void)new TDEAction(i18n("Channel View &Options..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("Channel View &Options..."), 0, this,
TQT_SLOT(options_ChannelViewOptions()), actionCollection(),
"channelview_options");
- (void)new TDEAction(i18n("&Font Change..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("&Font Change..."), 0, this,
TQT_SLOT(options_FontChange()), actionCollection(),
"change_font");
- (void)new TDEAction(i18n("MIDI &Setup..."), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("MIDI &Setup..."), 0, this,
TQT_SLOT(options_MidiSetup()), actionCollection(), "midi_setup");