22 files changed, 133 insertions, 211 deletions
diff --git a/kded/CMakeL10n.txt b/kded/CMakeL10n.txt
new file mode 100644
index 000000000..58abfbd25
--- /dev/null
+++ b/kded/CMakeL10n.txt
@@ -0,0 +1,7 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kdedmodule.desktop/"
+    SOURCES kdedmodule.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 1a4433b99..a8b64b6e5 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -34,7 +34,10 @@ install( FILES kdedmodule.h DESTINATION ${INCLUDE_INSTALL_DIR} )
 
 ##### other data ################################
 
-install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kdedmodule.desktop
+  DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
 install( FILES tde-applications.menu tde-applications.menu-no-kde DESTINATION ${XDG_MENU_INSTALL_DIR} )
 install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
 
diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox
index 52c0d8285..95ba4a4cf 100644
--- a/kded/Mainpage.dox
+++ b/kded/Mainpage.dox
@@ -1,11 +1,11 @@
-/** @mainpage The Trinity Daemon
+/** @mainpage The Trinity Daemon (KDED)
 
-TrinityD runs in the background and performs a number of small tasks.  Some
+KDED runs in the background and performs a number of small tasks.  Some
 of these tasks are built in, others are started on demand.
 <p>
 The chances are you are looking here because you want to write a
-TrinityD module.  For that, see TrinityDModule in tdecore and the
-<a href="http://websvn.kde.org/trunk/Trinity/tdelibs/kded/README.kded?view=markup">TrinityD
+KDED module.  For that, see KDEDModule in tdecore and the
+<a href="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/src/branch/master/kded">KDED
 README</a>.
 
 
@@ -22,5 +22,4 @@ Waldo Bastian \<bastian@kde.org\>
 */
 
 // DOXYGEN_REFERENCES = tdecore tdeui tdeio
-// DOXYGEN_SET_PROJECT_NAME = TrinityD
-// vim:ts=4:sw=4:expandtab:filetype=doxygen
+// DOXYGEN_SET_PROJECT_NAME = KDED
diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index b5873cad8..afb2c81a6 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -21,7 +21,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <assert.h>
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index 921e55ab9..4259e69c7 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -22,7 +22,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 6f127caf2..54c09ac9c 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -24,7 +24,7 @@
 #include "kmimetype.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -80,7 +80,7 @@ KBuildServiceFactory::createEntry( const TQString& file, const char *resource )
   if (!name.endsWith(".desktop") && !name.endsWith(".kdelnk"))
       return 0;
 
-  KDesktopFile desktopFile(file, true, resource);
+  TDEDesktopFile desktopFile(file, true, resource);
 
   KService * serv = new KService( &desktopFile );
 
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index 3903a6b39..a28eab9e9 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -22,7 +22,7 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index da2863347..7599c43a0 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -22,12 +22,12 @@
 #include "kresourcelist.h"
 
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <assert.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 
 template class TQDict<KMimeType>;
 
@@ -78,7 +78,7 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource
   if (name.isEmpty())
      return 0;
 
-  KDesktopFile desktopFile(file, true, resource);
+  TDEDesktopFile desktopFile(file, true, resource);
 
   if ( desktopFile.readBoolEntry( "Hidden", false ) == true )
       return 0;
@@ -106,7 +106,7 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource
          || (mime == "media/builtin-trash")
          || (mime == "media/builtin-webbrowser") )
     e = new KDEDesktopMimeType( &desktopFile );
-  else if ( mime == "application/x-executable" || mime == "application/x-shellscript" )
+  else if ( mime == "application/x-executable" || mime == "application/x-pie-executable" || mime == "application/x-shellscript" )
     e = new KExecMimeType( &desktopFile );
   else if ( !mime.isEmpty() )
     e = new KMimeType( &desktopFile );
diff --git a/kded/kded.cpp b/kded/kded.cpp
index e1b3b6b33..85d796652 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -23,7 +23,7 @@
 #include "kdedmodule.h"
 
 #include <kresourcelist.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -35,20 +35,20 @@
 
 #include <dcopclient.h>
 
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kdatastream.h>
 #include <tdeio/global.h>
 #include <kservicetype.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -75,7 +75,7 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
       dataStream << TQString("tdebuildsycoca") << args;
       TQCString _launcher = TDEApplication::launcher();
 
-      kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
+      tdeApp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
@@ -110,9 +110,9 @@ Kded::Kded(bool checkUpdates, bool new_startup)
   else
      cPath = tdesycoca_env;
   m_pTimer = new TQTimer(this);
-  connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate()));
+  connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(recreate()));
 
-  TQTimer::singleShot(100, this, TQT_SLOT(installCrashHandler()));
+  TQTimer::singleShot(100, this, TQ_SLOT(installCrashHandler()));
 
   m_pDirWatch = 0;
 
@@ -148,14 +148,14 @@ bool Kded::process(const TQCString &obj, const TQCString &fun,
   if (!module)
      return false;
 
-  module->setCallingDcopClient(kapp->dcopClient());
+  module->setCallingDcopClient(tdeApp->dcopClient());
   return module->process(fun, data, replyType, replyData);
 }
 
 void Kded::initModules()
 {
      m_dontLoad.clear();
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      bool tde_running = !( getenv( "TDE_FULL_SESSION" ) == NULL || getenv( "TDE_FULL_SESSION" )[ 0 ] == '\0' );
     // not the same user like the one running the session (most likely we're run via sudo or something)
     if( getenv( "TDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "TDE_SESSION_UID" ))) != getuid())
@@ -227,7 +227,7 @@ void Kded::initModules()
 void Kded::loadSecondPhase()
 {
      kdDebug(7020) << "Loading second phase autoload" << endl;
-     TDEConfig *config = kapp->config();
+     TDEConfig *config = tdeApp->config();
      KService::List kdedModules = KServiceType::offers("KDEDModule");
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
@@ -316,7 +316,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)
         {
           m_modules.insert(obj, module);
           m_libs.insert(obj, lib);
-          connect(module, TQT_SIGNAL(moduleDeleted(KDEDModule *)), TQT_SLOT(slotKDEDModuleRemoved(KDEDModule *)));
+          connect(module, TQ_SIGNAL(moduleDeleted(KDEDModule *)), TQ_SLOT(slotKDEDModuleRemoved(KDEDModule *)));
           kdDebug(7020) << "Successfully loaded module '" << obj << "'\n";
           return module;
         }
@@ -400,12 +400,12 @@ void Kded::updateDirWatch()
   delete m_pDirWatch;
   m_pDirWatch = new KDirWatch;
 
-  TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
-           this, TQT_SLOT(update(const TQString&)));
-  TQObject::connect( m_pDirWatch, TQT_SIGNAL(created(const TQString&)),
-           this, TQT_SLOT(update(const TQString&)));
-  TQObject::connect( m_pDirWatch, TQT_SIGNAL(deleted(const TQString&)),
-           this, TQT_SLOT(dirDeleted(const TQString&)));
+  TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)),
+           this, TQ_SLOT(update(const TQString&)));
+  TQObject::connect( m_pDirWatch, TQ_SIGNAL(created(const TQString&)),
+           this, TQ_SLOT(update(const TQString&)));
+  TQObject::connect( m_pDirWatch, TQ_SIGNAL(deleted(const TQString&)),
+           this, TQ_SLOT(dirDeleted(const TQString&)));
 
   // For each resource
   for( TQStringList::ConstIterator it = m_allResourceDirs.begin();
@@ -480,7 +480,7 @@ void Kded::recreate(bool initial)
    if (!initial)
    {
       updateDirWatch(); // Update tree first, to be sure to miss nothing.
-      runBuildSycoca(this, TQT_SLOT(recreateDone()));
+      runBuildSycoca(this, TQ_SLOT(recreateDone()));
    }
    else
    {
@@ -491,7 +491,7 @@ void Kded::recreate(bool initial)
       if(delayedCheck)
       {
          // do a proper tdesycoca check after a delay
-         TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck()));
+         TQTimer::singleShot( 60000, this, TQ_SLOT( runDelayedCheck()));
          m_needDelayedCheck = true;
          delayedCheck = false;
       }
@@ -510,7 +510,7 @@ void Kded::recreateDone()
       TQByteArray replyData;
       DCOPClientTransaction *transaction = m_recreateRequests.first();
       if (transaction)
-         kapp->dcopClient()->endTransaction(transaction, replyType, replyData);
+         tdeApp->dcopClient()->endTransaction(transaction, replyType, replyData);
       m_recreateRequests.remove(m_recreateRequests.begin());
    }
    m_recreateBusy = false;
@@ -553,7 +553,7 @@ bool Kded::process(const TQCString &fun, const TQByteArray &data,
        }
        m_recreateCount++;
     }
-    m_recreateRequests.append(kapp->dcopClient()->beginTransaction());
+    m_recreateRequests.append(tdeApp->dcopClient()->beginTransaction());
     replyType = "void";
     return true;
   } else {
@@ -659,17 +659,17 @@ void Kded::unregisterWindowId(long windowId)
 
 static void sighandler(int /*sig*/)
 {
-    if (kapp)
-       kapp->quit();
+    if (tdeApp)
+       tdeApp->quit();
 }
 
 KUpdateD::KUpdateD()
 {
     m_pDirWatch = new KDirWatch;
     m_pTimer = new TQTimer;
-    connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runKonfUpdate()));
-    TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
-           this, TQT_SLOT(slotNewUpdateFile()));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runKonfUpdate()));
+    TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)),
+           this, TQ_SLOT(slotNewUpdateFile()));
 
     TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update");
     for( TQStringList::ConstIterator it = dirs.begin();
@@ -704,7 +704,7 @@ void KUpdateD::slotNewUpdateFile()
 KHostnameD::KHostnameD(int pollInterval)
 {
     m_Timer.start(pollInterval, false /* repetitive */ );
-    connect(&m_Timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkHostname()));
+    connect(&m_Timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkHostname()));
     checkHostname();
 }
 
@@ -751,9 +751,9 @@ public:
   virtual bool process(const TQCString &fun, const TQByteArray &data,
                        TQCString& replyType, TQByteArray &replyData)
     {
-      if ( kapp && (fun == "quit()") )
+      if ( tdeApp && (fun == "quit()") )
       {
-        kapp->quit();
+        tdeApp->quit();
         replyType = "void";
         return true;
       }
@@ -768,10 +768,10 @@ public:
     }
 };
 
-class KDEDApplication : public KUniqueApplication
+class KDEDApplication : public TDEUniqueApplication
 {
 public:
-  KDEDApplication() : KUniqueApplication( )
+  KDEDApplication() : TDEUniqueApplication( )
     {
        startup = true;
        dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()",
@@ -785,7 +785,7 @@ public:
           if( Kded::self()->newStartup())
              Kded::self()->initModules();
           else
-	     TQTimer::singleShot(500, Kded::self(), TQT_SLOT(initModules()));
+	     TQTimer::singleShot(500, Kded::self(), TQ_SLOT(initModules()));
        } else 
           runBuildSycoca();
 
@@ -794,7 +794,7 @@ public:
 
   QCStringList functions()
     {
-       QCStringList res = KUniqueApplication::functions();
+       QCStringList res = TDEUniqueApplication::functions();
        res += "bool loadModule(TQCString)";
        res += "bool unloadModule(TQCString)";
        res += "void registerWindowId(long int)";
@@ -869,14 +869,14 @@ public:
       replyType = "void";
       return true;
     }
-    return KUniqueApplication::process(fun, data, replyType, replyData);
+    return TDEUniqueApplication::process(fun, data, replyType, replyData);
   }
 
   bool startup;
   KDEDQtDCOPObject kdedQtDcopObject;
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
 {
      TDEAboutData aboutData( "kded", I18N_NOOP("TDE Daemon"),
         "$Id$",
@@ -886,7 +886,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 
      TDECmdLineArgs::init(argc, argv, &aboutData);
 
-     KUniqueApplication::addCmdLineOptions();
+     TDEUniqueApplication::addCmdLineOptions();
 
      TDECmdLineArgs::addCmdLineOptions( options );
 
@@ -922,13 +922,13 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
         exit(0);
      }
 
-     if (!KUniqueApplication::start())
+     if (!TDEUniqueApplication::start())
      {
         fprintf(stderr, "[kded] Daemon (kded) is already running.\n");
         exit(0);
      }
 
-     KUniqueApplication::dcopClient()->setQtBridgeEnabled(false);
+     TDEUniqueApplication::dcopClient()->setQtBridgeEnabled(false);
 
      config->setGroup("General");
      int HostnamePollInterval = config->readNumEntry("HostnamePollInterval", 5000);
@@ -954,9 +954,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      if (bCheckHostname)
         (void) new KHostnameD(HostnamePollInterval); // Watch for hostname changes
 
-     DCOPClient *client = kapp->dcopClient();
-     TQObject::connect(client, TQT_SIGNAL(applicationRemoved(const TQCString&)),
-             kded, TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+     DCOPClient *client = tdeApp->dcopClient();
+     TQObject::connect(client, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+             kded, TQ_SLOT(slotApplicationRemoved(const TQCString&)));
      client->setNotifications(true);
      client->setDaemonMode( true );
 
@@ -969,7 +969,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      TQByteArray data;
      client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data );
      client->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kded"));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
      XEvent e;
      e.xclient.type = ClientMessage;
      e.xclient.message_type = XInternAtom( tqt_xdisplay(), "_KDE_SPLASH_PROGRESS", False );
diff --git a/kded/kded.h b/kded/kded.h
index a4968624a..ad6a8353c 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -40,7 +40,7 @@ class KService;
 // No need for this in libtdeio - apps only get readonly access
 class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
    Kded(bool checkUpdates, bool new_startup);
    virtual ~Kded();
@@ -175,7 +175,7 @@ private:
 
 class KUpdateD : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KUpdateD();
    ~KUpdateD();
@@ -202,7 +202,7 @@ private:
 
 class KHostnameD : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KHostnameD(int pollInterval);
    ~KHostnameD();
diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp
index 61da755b3..230f08db2 100644
--- a/kded/kdedmodule.cpp
+++ b/kded/kdedmodule.cpp
@@ -41,7 +41,7 @@ KDEDModule::KDEDModule(const TQCString &name) : TQObject(), DCOPObject(name)
    d = new KDEDModulePrivate;
    d->objMap = 0;
    d->timeout = 0;
-   connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(idle()));
+   connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(idle()));
 }
   
 KDEDModule::~KDEDModule()
diff --git a/kded/kdedmodule.desktop b/kded/kdedmodule.desktop
index 55370e58c..a29b43213 100644
--- a/kded/kdedmodule.desktop
+++ b/kded/kdedmodule.desktop
@@ -2,86 +2,6 @@
 Type=ServiceType
 X-TDE-ServiceType=KDEDModule
 Comment=KDED Module
-Comment[ar]=وحدة KDED
-Comment[az]=KDED Modulu
-Comment[be]=Модуль KDED
-Comment[bg]=Модул KDED
-Comment[bn]=KDED মডিইল
-Comment[br]=Mollad KDED
-Comment[bs]=KDED modul
-Comment[ca]=Mòdul per a KDED
-Comment[cs]=KDED modul
-Comment[csb]=Mòduł KDED
-Comment[cy]=Modiwl KDED
-Comment[da]=KDED-modul
-Comment[de]=KDED-Modul
-Comment[el]=Άρθρωμα KDED
-Comment[eo]=KDED-Modulo
-Comment[es]=Módulo de KDED
-Comment[et]=KDED moodul
-Comment[eu]=KDED modulua
-Comment[fa]=پیمانۀ KDED
-Comment[fi]=KDED-moduuli
-Comment[fr]=Module KDED
-Comment[fy]=KDED-module
-Comment[ga]=Modúl KDED
-Comment[gl]=Módulo de KDED
-Comment[he]=מודול KDED
-Comment[hi]=KDED-घटक (मॉड्यूल)
-Comment[hr]=KDED modul
-Comment[hsb]=KDED-modul
-Comment[hu]=KDED modul
-Comment[id]=Modul KDED
-Comment[is]=KDED eining
-Comment[it]=Modulo di KDED
-Comment[ja]=KDED モジュール
-Comment[ka]=KDED მოდული
-Comment[kk]=KDED модулі
-Comment[km]=ម៉ូឌុល KDED
-Comment[ko]=KDED 모듈
-Comment[lb]=KDED-Modul
-Comment[lt]=KDED modulis
-Comment[lv]=KDED Modulis
-Comment[mk]=KDED модул
-Comment[mn]=KDED-Модул
-Comment[ms]=Modul KDED
-Comment[mt]=Modulu KDED
-Comment[nb]=KDED-modul
-Comment[nds]=KDED-Moduul
-Comment[ne]=KDED मोड्युल
-Comment[nn]=KDED-modul
-Comment[nso]=Seripa sa KDED
-Comment[pa]=KDED ਮੈਡੀਊਲ
-Comment[pl]=Moduł KDED
-Comment[pt]=Módulo do KDED
-Comment[pt_BR]=Módulo KDED
-Comment[ro]=Modul KDED
-Comment[ru]=Служба KDED
-Comment[rw]=Igice KDED
-Comment[se]=KDED-moduvla
-Comment[sk]=KDED modul
-Comment[sl]=Modul KDED
-Comment[sq]=KDED Modula
-Comment[sr]=KDED модул
-Comment[sr@Latn]=KDED modul
-Comment[ss]=Sahluko se KDED
-Comment[sv]=KDED-modul
-Comment[ta]=KDED கூறு
-Comment[te]=కెడిఈడి మాడ్యూల్
-Comment[tg]=Модули KDED
-Comment[th]=โมดูล KDED
-Comment[tr]=KDED Modülü
-Comment[tt]=KDED Modulı
-Comment[uk]=Модуль KDED
-Comment[uz]=KDED moduli
-Comment[uz@cyrillic]=KDED модули
-Comment[ven]=Modulu wa KDED
-Comment[vi]=Mô-đun KDED
-Comment[xh]=KDED Isichatshulwa
-Comment[zh_CN]=KDED 模块
-Comment[zh_HK]=KDED 模組
-Comment[zh_TW]=KDED 模組
-Comment[zu]=Ingxenye ye-KDED
 [PropertyDef::X-TDE-FactoryName]
 Type=TQString
 [PropertyDef::X-TDE-Kded-autoload]
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index f3954e842..0619e7d87 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -40,7 +40,7 @@ class Kded;
  *
  * \code
  *   extern "C" {
- *     KDE_EXPORT KDEDModule *create_xyz(TQCString *name)
+ *     TDE_EXPORT KDEDModule *create_xyz(TQCString *name)
  *     {
  *       return new XYZ(name);
  *     }
@@ -52,9 +52,9 @@ class Kded;
  * @author Waldo Bastian <bastian@kde.org>
  */
 
-class KDE_EXPORT KDEDModule : public TQObject, public DCOPObject
+class TDE_EXPORT KDEDModule : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 // For inclusion in KDE4 (since it's BIC) long-needed fix for allowing
 // DCOP-based kdedmodules -- Gav <gav@kde.org>.
 //  K_DCOP
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index c78152b97..ba9ba7d95 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -16,6 +16,8 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -33,8 +35,8 @@
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <kde_file.h>
 
 static TDECmdLineOptions options[] = {
@@ -236,7 +238,7 @@ void KHostName::changeDcop()
       ::symlink(fname.data(), compatLink.data()); // Compatibility link
 
       // Update .ICEauthority
-      TQString cmd = "iceauth list "+TDEProcess::quote("netid="+oldNetId);
+      TQString cmd = ICEAUTH_COMMAND " list "+TDEProcess::quote("netid="+oldNetId);
       FILE *iceFile = popen(TQFile::encodeName(cmd), "r");
       if (!iceFile)
       {
@@ -271,7 +273,7 @@ void KHostName::changeDcop()
          if (netId != oldNetId)
             continue;
 
-         cmd = "iceauth add ";
+         cmd = ICEAUTH_COMMAND " add ";
          cmd += TDEProcess::quote(protName);
          cmd += " '' ";
          cmd += TDEProcess::quote(newNetId);
@@ -288,7 +290,7 @@ void KHostName::changeDcop()
    char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME");
    if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname))
    {
-      TQString cmd = "iceauth remove "+TDEProcess::quote("netid="+oldNetId);
+      TQString cmd = ICEAUTH_COMMAND " remove "+TDEProcess::quote("netid="+oldNetId);
       system(TQFile::encodeName(cmd));
       unlink(origFName.data());
       origFName = DCOPClient::dcopServerFileOld(oldName); // Compatibility link
diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp
index 4cf7a843e..945d70e91 100644
--- a/kded/tde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -30,7 +30,7 @@
 #include "tdelocale.h"
 #include "kservice.h"
 #include "kservicegroup.h"
-#include "kstandarddirs.h"
+#include "tdestandarddirs.h"
 
 static TDECmdLineOptions options[] = {
    { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 },
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index f7ae2ce3b..830d8c31e 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -45,12 +45,12 @@
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <ksavefile.h>
 #include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kcrash.h>
+#include <tdecrash.h>
 
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
                         // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
@@ -63,7 +63,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
-#include <memory> // auto_ptr
+#include <memory>
 
 typedef TQDict<KSycocaEntry> KBSEntryDict;
 typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList;
@@ -376,8 +376,8 @@ bool KBuildSycoca::build()
      if (!m_trackId.isEmpty())
         g_vfolder->setTrackId(m_trackId);
 
-     connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
-             this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
+     connect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)),
+             this, TQ_SLOT(slotCreateEntry(const TQString &, KService **)));
              
      VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true);
 
@@ -390,8 +390,8 @@ bool KBuildSycoca::build()
      (void) existingResourceDirs();
      *g_allResourceDirs += g_vfolder->allDirectories();
 
-     disconnect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
-             this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
+     disconnect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)),
+             this, TQ_SLOT(slotCreateEntry(const TQString &, KService **)));
 
      if (g_changed || !g_allEntries)
      {
@@ -462,13 +462,13 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
 bool KBuildSycoca::recreate()
 {
   TQString path(sycocaPath());
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   printf("tdebuildsycoca: path='%s'\n", (const char*)path);
 #endif
 
   // KSaveFile first writes to a temp file.
   // Upon close() it moves the stuff to the right place.
-  std::auto_ptr<KSaveFile> database( new KSaveFile(path) );
+  std::unique_ptr<KSaveFile> database( new KSaveFile(path) );
   if (database->status() == EACCES && TQFile::exists(path))
   {
     TQFile::remove( path );
@@ -709,13 +709,13 @@ static TDECmdLineOptions options[] = {
 static const char appName[] = "tdebuildsycoca";
 static const char appVersion[] = "1.1";
 
-class WaitForSignal : public QObject
+class WaitForSignal : public TQObject
 {
 public:
-   ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }
+   ~WaitForSignal() { tdeApp->eventLoop()->exitLoop(); }
 };
 
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
 {
    TDELocale::setMainCatalogue("tdelibs");
    TDEAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
@@ -747,7 +747,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 #ifdef KBUILDSYCOCA_GUI
    silent = args->isSet("silent");
    showprogress = args->isSet("showprogress");
-   TQLabel progress( TQString("<p><br><nobr>    %1    </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | Qt::WStyle_DialogBorder  | Qt::WStyle_Customize| Qt::WStyle_Title );
+   TQLabel progress( TQString("<p><br><nobr>    %1    </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", TQt::WType_Dialog | TQt::WStyle_DialogBorder  | TQt::WStyle_Customize| TQt::WStyle_Title );
    TQString capt = i18n("TDE Configuration Manager");
    if (!silent) {
      if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload TDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload")))
@@ -790,9 +790,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      while (dcopClient->isApplicationRegistered(appName))
      {
        WaitForSignal *obj = new WaitForSignal;
-       obj->connect(dcopClient, TQT_SIGNAL(applicationRemoved(const TQCString &)),
-               TQT_SLOT(deleteLater()));
-       kapp->eventLoop()->enterLoop();
+       obj->connect(dcopClient, TQ_SIGNAL(applicationRemoved(const TQCString &)),
+               TQ_SLOT(deleteLater()));
+       tdeApp->eventLoop()->enterLoop();
      }
      dcopClient->setNotifications( false );
    }
diff --git a/kded/tdebuildsycoca.h b/kded/tdebuildsycoca.h
index 51e7af337..77b685a41 100644
--- a/kded/tdebuildsycoca.h
+++ b/kded/tdebuildsycoca.h
@@ -37,7 +37,7 @@ class TQDataStream;
 // No need for this in libtdeio - apps only get readonly access
 class KBuildSycoca : public KSycoca
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KBuildSycoca();
    virtual ~KBuildSycoca();
diff --git a/kded/tdemimelist.cpp b/kded/tdemimelist.cpp
index 673520e52..8c70cc8f5 100644
--- a/kded/tdemimelist.cpp
+++ b/kded/tdemimelist.cpp
@@ -2,7 +2,7 @@
 #include <kservice.h>
 #include <kmimetype.h>
 #include <assert.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservicegroup.h>
 #include <kimageio.h>
 #include <kuserprofile.h>
diff --git a/kded/test/test.cpp b/kded/test/test.cpp
index 8d2aa91b9..f5f84e52e 100644
--- a/kded/test/test.cpp
+++ b/kded/test/test.cpp
@@ -34,7 +34,7 @@ void TestModule::registerMe(const TQCString &app)
 }
 
 extern "C" { 
-  KDE_EXPORT KDEDModule *create_test(const TQCString &obj)
+  TDE_EXPORT KDEDModule *create_test(const TQCString &obj)
   {
      return new TestModule(obj);
   }
diff --git a/kded/test/test.h b/kded/test/test.h
index 9382a6fba..5ce672e0d 100644
--- a/kded/test/test.h
+++ b/kded/test/test.h
@@ -8,7 +8,7 @@
 
 class TestModule : public KDEDModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    TestModule(const TQCString &obj);
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index 2e04965ea..6faace11f 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <kservice.h>
 #include <kde_file.h>
 
@@ -311,25 +311,6 @@ VFolderMenu::~VFolderMenu()
    delete m_rootMenu;
 }
 
-#define FOR_ALL_APPLICATIONS(it) \
-   for(appsInfo *info = m_appsInfoStack.first(); \
-       info; info = m_appsInfoStack.next()) \
-   { \
-      for(TQDictIterator<KService> it( info->applications ); \
-          it.current(); ++it ) \
-      {
-#define FOR_ALL_APPLICATIONS_END } }
-
-#define FOR_CATEGORY(category, it) \
-   for(appsInfo *info = m_appsInfoStack.first(); \
-       info; info = m_appsInfoStack.next()) \
-   { \
-      KService::List *list = info->dictCategories.find(category); \
-      if (list) for(KService::List::ConstIterator it = list->begin(); \
-             it != list->end(); ++it) \
-      {
-#define FOR_CATEGORY_END } }
-
 KService *
 VFolderMenu::findApplication(const TQString &relPath)
 {
@@ -934,12 +915,14 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
    }
    else if (domElem.tagName() == "Not")
    {
-      FOR_ALL_APPLICATIONS(it)
-      {
-         KService *s = it.current();
-         items->replace(s->menuId(), s);
-      }
-      FOR_ALL_APPLICATIONS_END
+		 for (appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next())
+		 {
+			 for (TQDictIterator<KService> it( info->applications ); it.current(); ++it )
+			 {
+				 KService *s = it.current();
+				 items->replace(s->menuId(), s);
+			 }
+		 }
 
       TQDict<KService> notItems;
       TQDomNode n = domElem.firstChild();
@@ -955,21 +938,29 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
    }
    else if (domElem.tagName() == "Category")
    {
-      FOR_CATEGORY(domElem.text(), it)
-      {
-         KService *s = *it;
-         items->replace(s->menuId(), s);
-      }
-      FOR_CATEGORY_END
+		 for (appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next())
+		 {
+			 KService::List *list = info->dictCategories.find(domElem.text());
+			 if (list)
+			 {
+				 for(KService::List::ConstIterator it = list->begin(); it != list->end(); ++it)
+				 {
+					 KService *s = *it;
+					 items->replace(s->menuId(), s);
+				 }
+			 }
+		 }
    }
    else if (domElem.tagName() == "All")
    {
-      FOR_ALL_APPLICATIONS(it)
-      {
-         KService *s = it.current();
-         items->replace(s->menuId(), s);
-      }
-      FOR_ALL_APPLICATIONS_END
+		 for (appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next())
+		 {
+			 for (TQDictIterator<KService> it( info->applications ); it.current(); ++it )
+			 {
+				 KService *s = it.current();
+				 items->replace(s->menuId(), s);
+			 }
+		 }
    }
    else if (domElem.tagName() == "Filename")
    {
diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h
index a2536af7d..98f09702c 100644
--- a/kded/vfolder_menu.h
+++ b/kded/vfolder_menu.h
@@ -31,7 +31,7 @@
 
 class VFolderMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   class appsInfo;
   class SubMenu {