summaryrefslogtreecommitdiffstats
path: root/kmix
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 /kmix
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)
Diffstat (limited to 'kmix')
-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
8 files changed, 35 insertions, 35 deletions
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()) );
}