Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

17 files changed, 68 insertions, 68 deletions

diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index 40bf6cfb..980ce18d 100644
--- a/kmix/KMixApp.cpp
+++ b/kmix/KMixApp.cpp
@@ -49,7 +49,7 @@ KMixApp::newInstance()
 	else
 	{
 		m_kmix = new KMixWindow;
-		connect(this, TQT_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQT_SLOT(stopVisibilityUpdates()));
+		connect(this, TQ_SIGNAL(stopUpdatesOnVisibility()), m_kmix, TQ_SLOT(stopVisibilityUpdates()));
 		if ( isRestored() && TDEMainWindow::canBeRestored(0) )
 		{
 			m_kmix->restore(0, FALSE);
diff --git a/kmix/dialogselectmaster.cpp b/kmix/dialogselectmaster.cpp
index b2020397..abeca6e4 100644
--- a/kmix/dialogselectmaster.cpp
+++ b/kmix/dialogselectmaster.cpp
@@ -62,7 +62,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
 
     // Default or user selected
     TQButtonGroup *bgMasterSelection = new TQButtonGroup(1, TQt::Vertical, i18n("KMix master channel selection"), m_mainFrame);
-    connect(bgMasterSelection, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(masterSelectionChanged(int)));
+    connect(bgMasterSelection, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(masterSelectionChanged(int)));
     _layout->add(bgMasterSelection);
     m_defaultMaster = new TQRadioButton(i18n("Default"), bgMasterSelection);
     m_userMaster = new TQRadioButton(i18n("Custom"), bgMasterSelection);
@@ -82,7 +82,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
       m_cMixer = new KComboBox( FALSE, hboxMixerName, "mixerCombo" );
       m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
       TQToolTip::add(m_cMixer, i18n("Current mixer"));
-      connect(m_cMixer, TQT_SIGNAL(activated(int)), this, TQT_SLOT(createPageByID(int)));
+      connect(m_cMixer, TQ_SIGNAL(activated(int)), this, TQ_SLOT(createPageByID(int)));
 
       for ( Mixer *mixer = Mixer::mixers().first(); mixer !=0; mixer = Mixer::mixers().next() ) {
 	m_cMixer->insertItem(mixer->mixerName());
@@ -97,7 +97,7 @@ void DialogSelectMaster::createWidgets(Mixer *ptr_mixer)
     m_buttonGroupForScrollView = new TQButtonGroup(this); // invisible TQButtonGroup
     m_buttonGroupForScrollView->hide();
 
-    connect( this, TQT_SIGNAL(okClicked()) , this, TQT_SLOT(apply()) );
+    connect( this, TQ_SIGNAL(okClicked()) , this, TQ_SLOT(apply()) );
 }
 
 void DialogSelectMaster::show(Mixer *curr_mixer)
diff --git a/kmix/dialogviewconfiguration.cpp b/kmix/dialogviewconfiguration.cpp
index d6deb523..81a411fe 100644
--- a/kmix/dialogviewconfiguration.cpp
+++ b/kmix/dialogviewconfiguration.cpp
@@ -59,7 +59,7 @@ DialogViewConfiguration::DialogViewConfiguration( TQWidget*, ViewBase& view)
     }
     _layout->activate();
     resize(_layout->sizeHint() );
-    connect( this, TQT_SIGNAL(okClicked())   , this, TQT_SLOT(apply()) );
+    connect( this, TQ_SIGNAL(okClicked())   , this, TQ_SLOT(apply()) );
 }
 
 DialogViewConfiguration::~DialogViewConfiguration()
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index c4c7a9e6..8db11212 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -97,7 +97,7 @@ KMixWindow::KMixWindow()
 	{
         hide();
 	}
-	connect( kapp, TQT_SIGNAL( aboutToQuit()), TQT_SLOT( saveSettings()) );
+	connect( kapp, TQ_SIGNAL( aboutToQuit()), TQ_SLOT( saveSettings()) );
 }
 
 
@@ -111,25 +111,25 @@ void
 KMixWindow::initActions()
 {
 	// file menu
-	KStdAction::quit( this, TQT_SLOT(quit()), actionCollection());
+	KStdAction::quit( this, TQ_SLOT(quit()), actionCollection());
 
 	// settings menu
-	KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBar()), actionCollection());
-        KStdAction::preferences( this, TQT_SLOT(showSettings()), actionCollection());
+	KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBar()), actionCollection());
+        KStdAction::preferences( this, TQ_SLOT(showSettings()), actionCollection());
 	new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this,
-		TQT_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
-	KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+		TQ_SLOT( configureGlobalShortcuts() ), actionCollection(), "settings_global" );
+	KStdAction::keyBindings( guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
 
-	(void) new TDEAction( i18n( "Hardware &Information" ), 0, this, TQT_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
-	(void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQT_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
+	(void) new TDEAction( i18n( "Hardware &Information" ), 0, this, TQ_SLOT( slotHWInfo() ), actionCollection(), "hwinfo" );
+	(void) new TDEAction( i18n( "Hide Mixer Window" ), Key_Escape, this, TQ_SLOT(hide()), actionCollection(), "hide_kmixwindow" );
 
 	m_globalAccel = new TDEGlobalAccel(this, "KMix");
 	m_globalAccel->insert( "Increase volume", i18n( "Increase Volume of Master Channel"), TQString(),
-			TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotIncreaseVolume() ) );
+			TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotIncreaseVolume() ) );
 	m_globalAccel->insert( "Decrease volume", i18n( "Decrease Volume of Master Channel"), TQString(),
-			TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotDecreaseVolume() ) );
+			TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotDecreaseVolume() ) );
 	m_globalAccel->insert( "Toggle mute", i18n( "Toggle Mute of Master Channel"), TQString(),
-			TDEShortcut(), TDEShortcut(), this, TQT_SLOT( slotToggleMuted() ) );
+			TDEShortcut(), TDEShortcut(), this, TQ_SLOT( slotToggleMuted() ) );
 	m_globalAccel->readSettings();
 	m_globalAccel->updateConnections();
 
@@ -157,7 +157,7 @@ KMixWindow::initWidgets()
 	qlbl->setFixedHeight(qlbl->sizeHint().height());
 	m_cMixer = new KComboBox( FALSE, mixerNameLayout, "mixerCombo" );
 	m_cMixer->setFixedHeight(m_cMixer->sizeHint().height());
-	connect( m_cMixer, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( showSelectedMixer( int ) ) );
+	connect( m_cMixer, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( showSelectedMixer( int ) ) );
 	TQToolTip::add( m_cMixer, i18n("Current mixer" ) );
 
 	// Add first layout to widgets
@@ -370,7 +370,7 @@ KMixWindow::showSettings()
    cfg->addPage(cfgx, i18n("Experimental"), "bug");
 #endif
 
-   connect(cfg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(applyPrefs()));
+   connect(cfg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPrefs()));
 
    cfg->show();
 }
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index a4770993..19bfcbdb 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -208,7 +208,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
 	m_errorLabel->setGeometry(0, 0, m_errorLabel->sizeHint().width(),  m_errorLabel->sizeHint().height() );
 	TQToolTip::add(m_errorLabel, "Select one of the available mixers");
 	resize( m_errorLabel->sizeHint() );
-	connect( m_errorLabel, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectMixer()) );
+	connect( m_errorLabel, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectMixer()) );
     }
     else {
 	// We know which mixer to use: Call positionChange(), which does all the creating
@@ -288,7 +288,7 @@ void KMixApplet::loadConfig( TDEConfig *config, const TQString &grp )
     if ( m_mixerWidget ) {
 	//config->setGroup( grp );
 	KMixToolBox::loadConfig(m_mixerWidget->_mdws, config, grp, "PanelApplet" );
-	connect(m_mixerWidget, TQT_SIGNAL(selectMixer()), this, TQT_SLOT(selectMixer()));
+	connect(m_mixerWidget, TQ_SIGNAL(selectMixer()), this, TQ_SLOT(selectMixer()));
     }
 }
 
@@ -369,7 +369,7 @@ void KMixApplet::positionChange(Position pos) {
 	    delete m_mixerWidget;
 	}
 	m_mixerWidget = new ViewApplet( this, _mixer->name(), _mixer, 0, pos );
-	connect ( m_mixerWidget, TQT_SIGNAL(appletContentChanged()), this, TQT_SLOT(updateGeometrySlot()) );
+	connect ( m_mixerWidget, TQ_SIGNAL(appletContentChanged()), this, TQ_SLOT(updateGeometrySlot()) );
 	m_mixerWidget->createDeviceWidgets();
 	_layout->add(m_mixerWidget);
 	_layout->activate();
@@ -383,7 +383,7 @@ void KMixApplet::positionChange(Position pos) {
 	//setFixedSize(panelAppletConstrainedSize.width(), panelAppletConstrainedSize.height() );
 	//kdDebug(67100) << "KMixApplet::positionChange(). New MDW is at " << panelAppletConstrainedSize << endl;
 	m_mixerWidget->show();
-	//connect( _mixer, TQT_SIGNAL(newVolumeLevels()), m_mixerWidget, TQT_SLOT(refreshVolumeLevels()) );
+	//connect( _mixer, TQ_SIGNAL(newVolumeLevels()), m_mixerWidget, TQ_SLOT(refreshVolumeLevels()) );
     }
 }
 
@@ -479,8 +479,8 @@ void KMixApplet::preferences()
     if ( !m_pref )
     {
         m_pref = new AppletConfigDialog( this );
-        connect(m_pref, TQT_SIGNAL(finished()), TQT_SLOT(preferencesDone()));
-        connect( m_pref, TQT_SIGNAL(applied()), TQT_SLOT(applyPreferences()) );
+        connect(m_pref, TQ_SIGNAL(finished()), TQ_SLOT(preferencesDone()));
+        connect( m_pref, TQ_SIGNAL(applied()), TQ_SLOT(applyPreferences()) );
 
         m_pref->setActiveColors(_colors.high     , _colors.low     , _colors.back);
         m_pref->setMutedColors (_colors.mutedHigh, _colors.mutedLow, _colors.mutedBack);
diff --git a/kmix/kmixdockwidget.cpp b/kmix/kmixdockwidget.cpp
index 5876956b..574a996c 100644
--- a/kmix/kmixdockwidget.cpp
+++ b/kmix/kmixdockwidget.cpp
@@ -71,7 +71,7 @@ KMixDockWidget::KMixDockWidget( Mixer *mixer, TQWidget *parent, const char *name
     }
     createActions();
     createMasterVolWidget();
-    connect(this, TQT_SIGNAL(quitSelected()), kapp, TQT_SLOT(quitExtended()));
+    connect(this, TQ_SIGNAL(quitSelected()), kapp, TQ_SLOT(quitExtended()));
 }
 
 KMixDockWidget::~KMixDockWidget()
@@ -89,7 +89,7 @@ void KMixDockWidget::createActions()
     TDEPopupMenu *popupMenu = contextMenu();
 
     // Put "Mute" selector in context menu
-    (void)new TDEToggleAction(i18n("M&ute"), 0, this, TQT_SLOT(dockMute()),
+    (void)new TDEToggleAction(i18n("M&ute"), 0, this, TQ_SLOT(dockMute()),
                               actionCollection(), "dock_mute");
     TDEAction *a = actionCollection()->action("dock_mute");
     if (a)
@@ -100,7 +100,7 @@ void KMixDockWidget::createActions()
     // Put "Select Master Channel" dialog in context menu
     if (m_mixer)
     {
-        (void)new TDEAction(i18n("Select Master Channel..."), 0, this, TQT_SLOT(selectMaster()),
+        (void)new TDEAction(i18n("Select Master Channel..."), 0, this, TQ_SLOT(selectMaster()),
                             actionCollection(), "select_master");
         a = actionCollection()->action("select_master");
         if (a)
@@ -178,8 +178,8 @@ void KMixDockWidget::createMasterVolWidget()
      * Refreshing the Icon
      *
      */
-    connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip()));
-    connect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap()));
+    connect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(setVolumeTip()));
+    connect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(slotUpdatePixmap()));
 }
 
 void KMixDockWidget::deleteMasterVolWidget()
@@ -191,8 +191,8 @@ void KMixDockWidget::deleteMasterVolWidget()
     }
     if (m_mixer)
     {
-        disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(setVolumeTip()));
-        disconnect(m_mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(slotUpdatePixmap()));
+        disconnect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(setVolumeTip()));
+        disconnect(m_mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(slotUpdatePixmap()));
     }
 }
 
@@ -206,7 +206,7 @@ void KMixDockWidget::selectMaster()
    if (!_dsm)
    {
        _dsm = new DialogSelectMaster(m_mixer);
-       connect(_dsm, TQT_SIGNAL(newMasterSelected(bool, int, const TQString&)), TQT_SLOT( handleNewMaster(bool, int, const TQString&)));
+       connect(_dsm, TQ_SIGNAL(newMasterSelected(bool, int, const TQString&)), TQ_SLOT( handleNewMaster(bool, int, const TQString&)));
    }
    _dsm->show(m_mixer);
 }
diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp
index e1d6a307..cc12c7dd 100644
--- a/kmix/kmixerwidget.cpp
+++ b/kmix/kmixerwidget.cpp
@@ -151,7 +151,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags)
     balanceAndDetail->addWidget( mixerName );
     balanceAndDetail->addSpacing( 10 );
 
-    connect( m_balanceSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(balanceChanged(int)) );
+    connect( m_balanceSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(balanceChanged(int)) );
     TQToolTip::add( m_balanceSlider, i18n("Left/Right balancing") );
 
     // --- "MenuBar" toggling from the various View's ---
@@ -170,7 +170,7 @@ void KMixerWidget::possiblyAddView(ViewBase* vbase)
 		_views.push_back(vbase);
 		vbase ->createDeviceWidgets();
 		m_ioTab->addTab( vbase , vbase->caption() );
-		connect( vbase, TQT_SIGNAL(toggleMenuBar()), parentWidget(), TQT_SLOT(toggleMenuBar()) );
+		connect( vbase, TQ_SIGNAL(toggleMenuBar()), parentWidget(), TQ_SLOT(toggleMenuBar()) );
 	}
 }
 
diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp
index 9e8006a9..5a685772 100644
--- a/kmix/mdwenum.cpp
+++ b/kmix/mdwenum.cpp
@@ -53,15 +53,15 @@ MDWEnum::MDWEnum(Mixer *mixer, MixDevice* md,
     // create actions (on _mdwActions, see MixDeviceWidget)
 
     // KStdAction::showMenubar() is in MixDeviceWidget now
-    new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
-    new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+    new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" );
+    new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" );
 
     // create widgets
     createWidgets();
 
     /* !!! remove this for production version */
     m_keys->insert( "Next Value", i18n( "Next Value" ), TQString(),
-		    TDEShortcut(), TDEShortcut(), this, TQT_SLOT( nextEnumId() ) );
+		    TDEShortcut(), TDEShortcut(), this, TQ_SLOT( nextEnumId() ) );
 
     installEventFilter( this ); // filter for popup
 }
@@ -99,7 +99,7 @@ void MDWEnum::createWidgets()
 	// ------------ fill ComboBox end --------------
 	_layout->addWidget(_enumCombo);
         _enumCombo->setFixedHeight(_enumCombo->sizeHint().height());
-        connect( _enumCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setEnumId( int ) ) );
+        connect( _enumCombo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setEnumId( int ) ) );
         TQToolTip::add( _enumCombo, m_mixdevice->name() );
 	
 	//_layout->addSpacing( 4 );
diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp
index 169c2810..c8302c54 100644
--- a/kmix/mdwslider.cpp
+++ b/kmix/mdwslider.cpp
@@ -64,29 +64,29 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
 {
 	// create actions (on _mdwActions, see MixDeviceWidget)
 
-	new TDEToggleAction( i18n("&Split Channels"), 0, this, TQT_SLOT(toggleStereoLinked()),
+	new TDEToggleAction( i18n("&Split Channels"), 0, this, TQ_SLOT(toggleStereoLinked()),
 			_mdwActions, "stereo" );
-	new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
+	new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" );
 
 	TDEToggleAction *a = new TDEToggleAction(i18n("&Muted"), 0, 0, 0, _mdwActions, "mute" );
-	connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleMuted()) );
+	connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleMuted()) );
 
 	if( m_mixdevice->isRecordable() ) {
 		a = new TDEToggleAction( i18n("Set &Record Source"), 0, 0, 0, _mdwActions, "recsrc" );
-		connect( a, TQT_SIGNAL(toggled(bool)), TQT_SLOT( toggleRecsrc()) );
+		connect( a, TQ_SIGNAL(toggled(bool)), TQ_SLOT( toggleRecsrc()) );
 	}
 
-	new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+	new TDEAction( i18n("C&onfigure Global Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" );
 
 	// create widgets
 	createWidgets( showMuteLED, showRecordLED );
 
 	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
-			TDEShortcut(), TDEShortcut(), this, TQT_SLOT( increaseVolume() ) );
+			TDEShortcut(), TDEShortcut(), this, TQ_SLOT( increaseVolume() ) );
 	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
-			TDEShortcut(), TDEShortcut(), this, TQT_SLOT( decreaseVolume() ) );
+			TDEShortcut(), TDEShortcut(), this, TQ_SLOT( decreaseVolume() ) );
 	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
-			TDEShortcut(), TDEShortcut(), this, TQT_SLOT( toggleMuted() ) );
+			TDEShortcut(), TDEShortcut(), this, TQ_SLOT( toggleMuted() ) );
 
 	installEventFilter( this ); // filter for popup
 
@@ -232,7 +232,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 			 m_muteLED->resize( TQSize(16, 16) );
 			 ledlayout->addWidget( m_muteLED );
 			 TQToolTip::add( m_muteLED, i18n( "Mute" ) );
-			 connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) );
+			 connect( m_muteLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(toggleMuted()) );
 			 m_muteLED->installEventFilter( this );
 			 ledlayout->addStretch();
 		 } // has Mute LED
@@ -316,7 +316,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 		 slinumLayout->addWidget( slider );  // add to layout
 		 m_sliders.append ( slider );   // add to list
 		 _slidersChids.append(chid);        // Remember slider-chid association
-		 connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) );
+		 connect( slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(volumeChange(int)) );
 	 } // for all channels of this device
 
 
@@ -343,7 +343,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED )
 					 KLed::Sunken, KLed::Circular, this, "RecordLED" );
 			 m_recordLED->setFixedSize( TQSize(16, 16) );
 			 reclayout->addWidget( m_recordLED );
-			 connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool)));
+			 connect(m_recordLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(setRecsrc(bool)));
 			 m_recordLED->installEventFilter( this );
                          TQToolTip::add( m_recordLED, i18n( "Record" ) );
 			 reclayout->addStretch();
diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp
index 93ebaad2..2fcd228c 100644
--- a/kmix/mdwswitch.cpp
+++ b/kmix/mdwswitch.cpp
@@ -54,14 +54,14 @@ MDWSwitch::MDWSwitch(Mixer *mixer, MixDevice* md,
     // create actions (on _mdwActions, see MixDeviceWidget)
 
     // KStdAction::showMenubar() is in MixDeviceWidget now
-    new TDEToggleAction( i18n("&Hide"), 0, this, TQT_SLOT(setDisabled()), _mdwActions, "hide" );
-    new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQT_SLOT(defineKeys()), _mdwActions, "keys" );
+    new TDEToggleAction( i18n("&Hide"), 0, this, TQ_SLOT(setDisabled()), _mdwActions, "hide" );
+    new TDEAction( i18n("C&onfigure Shortcuts..."), 0, this, TQ_SLOT(defineKeys()), _mdwActions, "keys" );
 
     // create widgets
     createWidgets();
 
     m_keys->insert( "Toggle switch", i18n( "Toggle Switch" ), TQString(),
-		    TDEShortcut(), TDEShortcut(), this, TQT_SLOT( toggleSwitch() ) );
+		    TDEShortcut(), TDEShortcut(), this, TQ_SLOT( toggleSwitch() ) );
 
     // The keys are loaded in KMixerWidget::loadConfig, see kmixerwidget.cpp (now: kmixtoolbox.cpp)
     //m_keys->readSettings();
@@ -124,7 +124,7 @@ void MDWSwitch::createWidgets()
 		 _switchLED->installEventFilter( this );
 		 _label->installEventFilter( this );
 	 }
-    connect( _switchLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleSwitch()) );
+    connect( _switchLED, TQ_SIGNAL(stateChanged(bool)), this, TQ_SLOT(toggleSwitch()) );
     _layout->addSpacing( 4 );
 }
 
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 150b196d..953afce9 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -89,7 +89,7 @@ Mixer::Mixer( int driver, int device ) : DCOPObject( "Mixer" )
   m_profiles.setAutoDelete( true );
 
   _pollingTimer = new TQTimer(); // will be started on open() and stopped on close()
-  connect( _pollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(readSetFromHW()));
+  connect( _pollingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(readSetFromHW()));
 
   TQCString objid;
 #ifndef KMIX_DCOP_OBJID_TEST
@@ -207,7 +207,7 @@ int Mixer::open()
       else {
           _mixerBackend->prepareSignalling(this);
           // poll once to give the GUI a chance to rebuild it's info
-          TQTimer::singleShot( 50, this, TQT_SLOT( readSetFromHW() ) );
+          TQTimer::singleShot( 50, this, TQ_SLOT( readSetFromHW() ) );
       }
       return err;
 }
@@ -516,7 +516,7 @@ void Mixer::setVolume( int deviceidx, int percentage )
   _mixerBackend->writeVolumeToHW(deviceidx, vol);
   // Make sure volume reading is synced
   readSetFromHWforceUpdate();
-  TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
+  TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW()));
 }
 
 /**
@@ -534,7 +534,7 @@ void Mixer::commitVolumeChange( MixDevice* md ) {
   // Muting/unmuting PulseAudio directly does not send back any notification to the mixer
   // so we make sure we always update the tray icon after each operation.
   readSetFromHWforceUpdate();
-  TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
+  TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW()));
 }
 
 // @dcop only
@@ -586,7 +586,7 @@ void Mixer::setAbsoluteVolume( int deviceidx, long absoluteVolume ) {
   _mixerBackend->writeVolumeToHW(deviceidx, vol);
   // Make sure volume reading is synced
   readSetFromHWforceUpdate();
-  TQTimer::singleShot(50, this, TQT_SLOT(readSetFromHW()));
+  TQTimer::singleShot(50, this, TQ_SLOT(readSetFromHW()));
 }
 
 // @dcop , especially for use in KMilo
diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index 22303b43..aaf6a109 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -418,7 +418,7 @@ void Mixer_ALSA::prepareSignalling( Mixer *mixer )
     {
         kdDebug() << "socket " << i << endl;
         m_sns[i] = new TQSocketNotifier(m_fds[i].fd, TQSocketNotifier::Read);
-        mixer->connect(m_sns[i], TQT_SIGNAL(activated(int)), mixer, TQT_SLOT(readSetFromHW()));
+        mixer->connect(m_sns[i], TQ_SIGNAL(activated(int)), mixer, TQ_SLOT(readSetFromHW()));
     }
 }
 
diff --git a/kmix/mixer_sun.cpp b/kmix/mixer_sun.cpp
index 12806bda..ac5fe03f 100644
--- a/kmix/mixer_sun.cpp
+++ b/kmix/mixer_sun.cpp
@@ -105,7 +105,7 @@ const uint_t MixerSunPortMasks[] =
 
 
 //======================================================================
-// FUNCTION/TQT_METHOD DEFINITIONS
+// FUNCTION/METHOD DEFINITIONS
 //======================================================================
 
 
diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp
index 125479ba..ccd6080e 100644
--- a/kmix/viewapplet.cpp
+++ b/kmix/viewapplet.cpp
@@ -41,8 +41,8 @@ ViewApplet::ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBas
 {
     setBackgroundOrigin(AncestorOrigin);
     // remove the menu bar action, that is put by the "ViewBase" constructor in _actions.
-    //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
-    _actions->remove( KStdAction::showMenubar(this, TQT_SLOT(toggleMenuBarSlot()), _actions) );
+    //TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBarSlot()), _actions ));
+    _actions->remove( KStdAction::showMenubar(this, TQ_SLOT(toggleMenuBarSlot()), _actions) );
 
 
     if ( position == KPanelApplet::pLeft || position == KPanelApplet::pRight ) {
diff --git a/kmix/viewbase.cpp b/kmix/viewbase.cpp
index ddacd4d8..41d26f6a 100644
--- a/kmix/viewbase.cpp
+++ b/kmix/viewbase.cpp
@@ -51,7 +51,7 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
 
     // Plug in the "showMenubar" action, if the caller wants it. Typically this is only neccesary for views in the KMix main window.
     if ( vflags & ViewBase::HasMenuBar ) {
-	TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQT_SLOT(toggleMenuBarSlot()), _actions ));
+	TDEToggleAction *m = static_cast<TDEToggleAction*>(KStdAction::showMenubar( this, TQ_SLOT(toggleMenuBarSlot()), _actions ));
 	if ( vflags & ViewBase::MenuBarVisible ) {
 	    m->setChecked(true);
 	}
@@ -59,9 +59,9 @@ ViewBase::ViewBase(TQWidget* parent, const char* name, const TQString & caption,
 	    m->setChecked(false);
 	}
     }
-    new TDEAction(i18n("&Channels"), 0, this, TQT_SLOT(configureView()), _actions, "toggle_channels");
-    new TDEAction(i18n("&Select Mixer"), 0, this, TQT_SLOT(selectMixerSlot()), _actions, "select_mixer");
-    connect ( _mixer, TQT_SIGNAL(newVolumeLevels()), this, TQT_SLOT(refreshVolumeLevels()) );
+    new TDEAction(i18n("&Channels"), 0, this, TQ_SLOT(configureView()), _actions, "toggle_channels");
+    new TDEAction(i18n("&Select Mixer"), 0, this, TQ_SLOT(selectMixerSlot()), _actions, "select_mixer");
+    connect ( _mixer, TQ_SIGNAL(newVolumeLevels()), this, TQ_SLOT(refreshVolumeLevels()) );
 }
 
 ViewBase::~ViewBase() {
diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp
index 21b5d8d9..79d8cfc4 100644
--- a/kmix/viewdockareapopup.cpp
+++ b/kmix/viewdockareapopup.cpp
@@ -137,7 +137,7 @@ TQWidget* ViewDockAreaPopup::add(MixDevice *md)
 
     // Add button to show main panel
     _showPanelBox = new TQPushButton( i18n("Mixer"), _frame, "MixerPanel" );
-    connect ( _showPanelBox, TQT_SIGNAL( clicked() ), TQT_SLOT( showPanelSlot() ) );
+    connect ( _showPanelBox, TQ_SIGNAL( clicked() ), TQ_SLOT( showPanelSlot() ) );
     _layoutMDW->addMultiCellWidget( _showPanelBox, 1, 1, 0, 2 );
 
     return _mdw;
diff --git a/kmix/viewinput.cpp b/kmix/viewinput.cpp
index eeadc61b..412b773b 100644
--- a/kmix/viewinput.cpp
+++ b/kmix/viewinput.cpp
@@ -29,7 +29,7 @@ ViewInput::ViewInput(TQWidget* parent, const char* name, const TQString & captio
       : ViewSliders(parent, name, caption, mixer, vflags)
 {
     init();
-    connect ( _mixer, TQT_SIGNAL(newRecsrc())      , this, TQT_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources
+    connect ( _mixer, TQ_SIGNAL(newRecsrc())      , this, TQ_SLOT(refreshVolumeLevels()) ); // only the input widget has record sources
 }
 
 ViewInput::~ViewInput() {