1 files changed, 11 insertions, 11 deletions
diff --git a/amor/amordialog.cpp b/amor/amordialog.cpp
index 5abb0e3..ad5d3a2 100644
--- a/amor/amordialog.cpp
+++ b/amor/amordialog.cpp
@@ -30,13 +30,13 @@
 #include <tqslider.h>
 #include <tqpainter.h>
 #include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include "amordialog.h"
 #include "amordialog.moc"
 #include "version.h"
 #include <tdelocale.h>
 #include <tqvbox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 //---------------------------------------------------------------------------
 //
@@ -57,7 +57,7 @@ AmorDialog::AmorDialog()
     TQLabel *label = new TQLabel(i18n("Theme:"), themeBox);
 
     mThemeListBox = new TQListBox(themeBox);
-    connect(mThemeListBox,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotHighlighted(int)));
+    connect(mThemeListBox,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotHighlighted(int)));
     mThemeListBox->setMinimumSize( fontMetrics().maxWidth()*20,
 				   fontMetrics().lineSpacing()*6 );
 
@@ -74,24 +74,24 @@ AmorDialog::AmorDialog()
     label = new TQLabel(i18n("Offset:"), offsetBox);
 
     TQSlider *slider = new TQSlider(-40, 40, 5, mConfig.mOffset,
-                                    Qt::Vertical, offsetBox);
-    connect(slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotOffset(int)));
+                                    TQt::Vertical, offsetBox);
+    connect(slider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotOffset(int)));
 
     // Always on top
     TQCheckBox *checkBox = new TQCheckBox(i18n("Always on top"), mainwidget);
-    connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOnTop(bool)));
+    connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOnTop(bool)));
     checkBox->setChecked(mConfig.mOnTop);
 
     checkBox = new TQCheckBox(i18n("Show random tips"), mainwidget);
-    connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTips(bool)));
+    connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTips(bool)));
     checkBox->setChecked(mConfig.mTips); // always keep this one after the connect, or the TQPtrList would not be grayed when it should
 
     checkBox = new TQCheckBox(i18n("Use a random character"), mainwidget);
-    connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRandomTheme(bool)));
+    connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRandomTheme(bool)));
     checkBox->setChecked(mConfig.mRandomTheme);
 
     checkBox = new TQCheckBox(i18n("Allow application tips"), mainwidget);
-    connect(checkBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotApplicationTips(bool)));
+    connect(checkBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotApplicationTips(bool)));
     checkBox->setChecked(mConfig.mAppTips);
 
     readThemes();
@@ -129,7 +129,7 @@ void AmorDialog::readThemes()
 //
 void AmorDialog::addTheme(const TQString& file)
 {
-    KSimpleConfig config(locate("appdata", file), true);
+    TDESimpleConfig config(locate("appdata", file), true);
 
     config.setGroup("Config");
 
@@ -251,7 +251,7 @@ void AmorDialog::slotApply()
 void AmorDialog::slotCancel()
 {
     // restore offset
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     TDEConfigGroupSaver cs(config, "General");
     emit offsetChanged(config->readNumEntry("Offset"));
     reject();