1 files changed, 36 insertions, 36 deletions

diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index eb96f682a..622cec32c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -38,8 +38,8 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kservice.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
 #include <ktrader.h>
 
 #include "ikwsopts.h"
@@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults )
       m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true);
 
     // Connect all the signals/slots...
-    connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
-            TQT_SLOT(setWebShortcutState()));
-    connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this,
-            TQT_SLOT(configChanged()));
-
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-           this, TQT_SLOT(updateSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
-           this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)),
-           this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-    connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)),
-           this, TQT_SLOT(checkFavoritesChanged()));
-
-
-    connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this,
-            TQT_SLOT(configChanged()));
-    connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this,
-            TQT_SLOT(configChanged()));
-
-    connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider()));
-    connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider()));
-    connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider()));
+    connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this,
+            TQ_SLOT(setWebShortcutState()));
+    connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this,
+            TQ_SLOT(configChanged()));
+
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+           this, TQ_SLOT(updateSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(doubleClicked(TQListViewItem *)),
+           this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(returnPressed(TQListViewItem *)),
+           this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(executed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(spacePressed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(pressed(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+    connect(m_dlg->lvSearchProviders, TQ_SIGNAL(clicked(TQListViewItem *)),
+           this, TQ_SLOT(checkFavoritesChanged()));
+
+
+    connect(m_dlg->cmbDefaultEngine, TQ_SIGNAL(activated(const TQString &)), this,
+            TQ_SLOT(configChanged()));
+    connect(m_dlg->cmbDelimiter, TQ_SIGNAL(activated(const TQString &)), this,
+            TQ_SLOT(configChanged()));
+
+    connect(m_dlg->pbNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSearchProvider()));
+    connect(m_dlg->pbChange, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSearchProvider()));
+    connect(m_dlg->pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSearchProvider()));
 
     emit changed( useDefaults );
 }
@@ -223,7 +223,7 @@ void FilterOptions::save()
   // kdDebug () << "Engine: " << m_defaultEngineMap[engine] << endl;
 
   int changedProviderCount = 0;
-  TQString path = kapp->dirs()->saveLocation("services", "searchproviders/");
+  TQString path = tdeApp->dirs()->saveLocation("services", "searchproviders/");
 
   m_favoriteEngines.clear();
 
@@ -274,7 +274,7 @@ void FilterOptions::save()
         }
       }
 
-      KSimpleConfig service(path + name + ".desktop");
+      TDESimpleConfig service(path + name + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
       service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
@@ -291,7 +291,7 @@ void FilterOptions::save()
   for (TQStringList::ConstIterator it = m_deletedProviders.begin();
       it != m_deletedProviders.end(); ++it)
   {
-      TQStringList matches = kapp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
+      TQStringList matches = tdeApp->dirs()->findAllResources("services", "searchproviders/" + *it + ".desktop");
 
       // Shouldn't happen
       if (!matches.count())
@@ -304,7 +304,7 @@ void FilterOptions::save()
           TQFile::remove(matches[0]);
           continue;
       }
-      KSimpleConfig service(path + *it + ".desktop");
+      TDESimpleConfig service(path + *it + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
       service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
@@ -332,7 +332,7 @@ void FilterOptions::defaults()
 
 void FilterOptions::configChanged()
 {
-  // kdDebug () << "FilterOptions::configChanged: TRUE" << endl;
+  // kdDebug () << "FilterOptions::configChanged: true" << endl;
   emit changed(true);
 }