1 files changed, 32 insertions, 32 deletions

diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp
index bf779e39..e2e2f0c1 100644
--- a/noatun/library/equalizerview.cpp
+++ b/noatun/library/equalizerview.cpp
@@ -42,7 +42,7 @@ PresetList::PresetList(TQWidget *parent, const char *name)
 	header()->hide();
 	// a try to set a sne minimum width. unfortuately the custom item
 	// still doesn't draw all text with that minimum width
-	setMinimumWidth(kapp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin());
+	setMinimumWidth(tdeApp->fontMetrics().boundingRect(i18n("Custom")).width()+2*itemMargin());
 }
 
 void PresetList::rename(TQListViewItem *item, int c)
@@ -67,23 +67,23 @@ EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band)
 	TQVBoxLayout *layout = new TQVBoxLayout(this,
 		0, 0, "EqualizerLevel::layout");
 
-	mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider");
+	mSlider = new TQSlider(-200, 200, 25, 0, TQt::Vertical, this, "EqualizerLevel::mSlider");
 	mSlider->setTickmarks(TQSlider::Left);
 	mSlider->setTickInterval(25);
 	layout->addWidget(mSlider);
-	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
+	connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int)));
 	mLabel = new TQLabel("", this, "EqualizerLevel::mLabel");
 	mLabel->setAlignment(AlignHCenter | AlignVCenter);
 	layout->addWidget(mLabel);
 
 	setMinimumHeight(200);
-//	setMinimumWidth(kapp->fontMetrics().width("158kHz"));
-//	setMinimumWidth(kapp->fontMetrics().width("549kHz"));
+//	setMinimumWidth(tdeApp->fontMetrics().width("158kHz"));
+//	setMinimumWidth(tdeApp->fontMetrics().width("549kHz"));
 
 	setBand(band);
 
-	connect(EQ, TQT_SIGNAL(modified()), TQT_SLOT(changed()));
-	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int)));
+	connect(EQ, TQ_SIGNAL(modified()), TQ_SLOT(changed()));
+	connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed(int)));
 }
 
 void EqualizerLevel::setBand(VBand band)
@@ -126,30 +126,30 @@ void EqualizerView::show()
 		bandsLayout = new TQHBoxLayout(mWidget->bandsFrame,
 			0, KDialog::spacingHint(), "bandsLayout");
 
-		connect(mWidget->preampSlider, TQT_SIGNAL(valueChanged(int)),
-			this, TQT_SLOT(setPreamp(int)));
-		connect(EQ, TQT_SIGNAL(preampChanged(int)),
-			this, TQT_SLOT(changedPreamp(int)));
+		connect(mWidget->preampSlider, TQ_SIGNAL(valueChanged(int)),
+			this, TQ_SLOT(setPreamp(int)));
+		connect(EQ, TQ_SIGNAL(preampChanged(int)),
+			this, TQ_SLOT(changedPreamp(int)));
 
 		mWidget->bandCount->setRange(EQ->minBands(), EQ->maxBands());
-		connect(mWidget->bandCount, TQT_SIGNAL(valueChanged(int)),
-			EQ, TQT_SLOT(setBands(int)));
+		connect(mWidget->bandCount, TQ_SIGNAL(valueChanged(int)),
+			EQ, TQ_SLOT(setBands(int)));
 
 		TQVBoxLayout *l = new TQVBoxLayout(mWidget->presetFrame);
 		mPresets = new PresetList(mWidget->presetFrame, "mPresets");
 		l->addWidget(mPresets);
 
-		connect(mWidget->removePresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(remove()));
-		connect(mWidget->addPresetButton, TQT_SIGNAL(clicked()), TQT_SLOT(create()));
-		connect(mWidget->resetEqButton, TQT_SIGNAL(clicked()), TQT_SLOT(reset()));
+		connect(mWidget->removePresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(remove()));
+		connect(mWidget->addPresetButton, TQ_SIGNAL(clicked()), TQ_SLOT(create()));
+		connect(mWidget->resetEqButton, TQ_SIGNAL(clicked()), TQ_SLOT(reset()));
 
 		new TDEListViewItem(mPresets, i18n("Custom"));
 
-		connect(mPresets, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-			this, TQT_SLOT(select(TQListViewItem*)));
+		connect(mPresets, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+			this, TQ_SLOT(select(TQListViewItem*)));
 
-		connect(mPresets, TQT_SIGNAL(itemRenamed(TQListViewItem*)),
-			this, TQT_SLOT(rename(TQListViewItem*)));
+		connect(mPresets, TQ_SIGNAL(itemRenamed(TQListViewItem*)),
+			this, TQ_SLOT(rename(TQListViewItem*)));
 
 		// populate the preset list
 		TQValueList<VPreset> presets = EQ->presets();
@@ -159,20 +159,20 @@ void EqualizerView::show()
 			created(*it);
 		}
 
-		connect(EQ, TQT_SIGNAL(created(VPreset)), TQT_SLOT(created(VPreset)));
-		connect(EQ, TQT_SIGNAL(renamed(VPreset)), TQT_SLOT(renamed(VPreset)));
-		connect(EQ, TQT_SIGNAL(removed(VPreset)), TQT_SLOT(removed(VPreset)));
+		connect(EQ, TQ_SIGNAL(created(VPreset)), TQ_SLOT(created(VPreset)));
+		connect(EQ, TQ_SIGNAL(renamed(VPreset)), TQ_SLOT(renamed(VPreset)));
+		connect(EQ, TQ_SIGNAL(removed(VPreset)), TQ_SLOT(removed(VPreset)));
 
 		mWidget->enabledCheckBox->setChecked(EQ->isEnabled());
-		connect(mWidget->enabledCheckBox, TQT_SIGNAL(toggled(bool)),
-			EQ, TQT_SLOT(setEnabled(bool)));
-		connect(EQ, TQT_SIGNAL(enabled(bool)),
-			mWidget->enabledCheckBox, TQT_SLOT(setChecked(bool)));
-
-		connect(EQ, TQT_SIGNAL(changed()),
-			this, TQT_SLOT(changedEq()));
-		connect(EQ, TQT_SIGNAL(changedBands()),
-			this, TQT_SLOT(changedBands()));
+		connect(mWidget->enabledCheckBox, TQ_SIGNAL(toggled(bool)),
+			EQ, TQ_SLOT(setEnabled(bool)));
+		connect(EQ, TQ_SIGNAL(enabled(bool)),
+			mWidget->enabledCheckBox, TQ_SLOT(setChecked(bool)));
+
+		connect(EQ, TQ_SIGNAL(changed()),
+			this, TQ_SLOT(changedEq()));
+		connect(EQ, TQ_SIGNAL(changedBands()),
+			this, TQ_SLOT(changedBands()));
 
 		changedBands();
 		changedEq();