4 files changed, 19 insertions, 19 deletions

diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp
index c1ff81338..7f32c438a 100644
--- a/kcontrol/privacy/kprivacymanager.cpp
+++ b/kcontrol/privacy/kprivacymanager.cpp
@@ -22,13 +22,13 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <ksimpleconfig.h>
-#include <kprocess.h>
+#include <tdesimpleconfig.h>
+#include <tdeprocess.h>
 #include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tderecentdocument.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqstringlist.h>
 #include <tqfile.h>
@@ -36,8 +36,8 @@
 
 KPrivacyManager::KPrivacyManager()
 {
-  if (!kapp->dcopClient()->isAttached())
-    kapp->dcopClient()->attach();
+  if (!tdeApp->dcopClient()->isAttached())
+    tdeApp->dcopClient()->attach();
 
   m_error = false;
 }
@@ -75,12 +75,12 @@ bool KPrivacyManager::clearThumbnails()
 
 bool KPrivacyManager::clearRunCommandHistory() const
 {
-  return kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "clearCommandHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearAllCookies() const
 {
-  return kapp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
+  return tdeApp->dcopClient()->send( "kded", "kcookiejar", "deleteAllCookies()", TQString("") );
 }
 
 bool KPrivacyManager::clearSavedClipboardContents()
@@ -98,7 +98,7 @@ bool KPrivacyManager::clearSavedClipboardContents()
     return true;
   }
 
-  return kapp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
+  return tdeApp->dcopClient()->send( "klipper", "klipper", "clearClipboardHistory()", TQString("") );
 }
 
 bool KPrivacyManager::clearFormCompletion() const
@@ -123,7 +123,7 @@ bool KPrivacyManager::clearRecentDocuments() const
 
 bool KPrivacyManager::clearQuickStartMenu() const
 {
-  return kapp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
+  return tdeApp->dcopClient()->send( "kicker", "kicker", "clearQuickStartMenu()", TQString("") );
 }
 
 bool KPrivacyManager::clearWebHistory()
@@ -134,10 +134,10 @@ bool KPrivacyManager::clearWebHistory()
   if(!isApplicationRegistered("konqueror"))
   {
     kdDebug() << "couldn't find Konqueror instance, preloading." << endl;
-    kapp->tdeinitExec("konqueror", args, 0,0);
+    tdeApp->tdeinitExec("konqueror", args, 0,0);
   }
 
-  return kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
+  return tdeApp->dcopClient()->send( "konqueror*", "KonqHistoryManager",
                                    "notifyClear(TQCString)", TQString("") );
 }
 
@@ -170,7 +170,7 @@ bool KPrivacyManager::clearKPDFDocData()
 bool KPrivacyManager::isApplicationRegistered(const TQString &appName)
 {
 
-  QCStringList regApps = kapp->dcopClient()->registeredApplications();
+  QCStringList regApps = tdeApp->dcopClient()->registeredApplications();
 
   for ( QCStringList::Iterator it = regApps.begin(); it != regApps.end(); ++it )
     if((*it).find(appName.latin1()) != -1) return true;
diff --git a/kcontrol/privacy/kprivacymanager.h b/kcontrol/privacy/kprivacymanager.h
index 70d7b77cf..b0649c7c2 100644
--- a/kcontrol/privacy/kprivacymanager.h
+++ b/kcontrol/privacy/kprivacymanager.h
@@ -29,7 +29,7 @@
 
 class KPrivacyManager : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     KPrivacyManager();
 
diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp
index 71fc3313b..87247547e 100644
--- a/kcontrol/privacy/privacy.cpp
+++ b/kcontrol/privacy/privacy.cpp
@@ -126,7 +126,7 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites"));
   clearKPDFDocData->setText(1, i18n("Clears all KPDF document data files"));
 
-  connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed()));
+  connect(sw, TQ_SIGNAL(selectionChanged()), TQ_SLOT(changed()));
 
   // store all entries in a list for easy access later on
   checklist.append(clearThumbnails);
@@ -141,9 +141,9 @@ Privacy::Privacy(TQWidget *parent, const char *name)
   checklist.append(clearFavIcons);
   checklist.append(clearKPDFDocData);
 
-  connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup()));
-  connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll()));
-  connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone()));
+  connect(cleaningDialog->cleanupButton, TQ_SIGNAL(clicked()), TQ_SLOT(cleanup()));
+  connect(cleaningDialog->selectAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectAll()));
+  connect(cleaningDialog->selectNoneButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectNone()));
 
   load();
 }
@@ -318,7 +318,7 @@ void Privacy::cleanup()
 extern "C"
 {
 
-  KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
+  TDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/)
   {
     TDEGlobal::locale()->insertCatalogue("privacy");
     return new Privacy(parent, "Privacy");
diff --git a/kcontrol/privacy/privacy.h b/kcontrol/privacy/privacy.h
index 74d199dcf..808bf3f98 100644
--- a/kcontrol/privacy/privacy.h
+++ b/kcontrol/privacy/privacy.h
@@ -30,7 +30,7 @@
 
 class Privacy: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Privacy( TQWidget *parent=0, const char *name=0 );