Update XDG information in support of bug report 892.

7 files changed, 56 insertions, 56 deletions

diff --git a/kded/README.kded b/kded/README.kded
index b530d707d..f0ff64d41 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -106,7 +106,7 @@ A KDED module should install a .desktop file with
 	ServicesTypes=KDEDModule
 
 A KDED module will be loaded on KDE startup if it has a line
-	X-KDE-Kded-autoload=true
+	X-TDE-Kded-autoload=true
 
 Note that this flag doesn't cause the module to be loaded if the KDE desktop
 is not running (i.e. when running a KDE application in another environment).
@@ -114,12 +114,12 @@ is not running (i.e. when running a KDE application in another environment).
 Normally KDED modules are loaded whenever they are accessed, so you don't
 need autoloading enabled. On demand loading can be disabled by putting
 the following line in the .desktop file:
-	X-KDE-Kded-load-on-demand=false
+	X-TDE-Kded-load-on-demand=false
 
 Further it should contain:
-	X-KDE-ModuleType=Library
-	X-KDE-Library=foo
-	X-KDE-FactoryName=foo
+	X-TDE-ModuleType=Library
+	X-TDE-Library=foo
+	X-TDE-FactoryName=foo
 
 Which means that kded_foo.la is the name of the library that contains 
 the module and KDEDModule *create_foo(const QCString &) is the factory 
diff --git a/kded/applications.menu b/kded/applications.menu
index 418e57517..a432da802 100644
--- a/kded/applications.menu
+++ b/kded/applications.menu
@@ -26,10 +26,10 @@
     <OnlyUnallocated/>
     <Include>
       <Not>
-        <!-- Don't list non-KDE core applications -->
+        <!-- Don't list non-TDE core applications -->
         <And>
           <Category>Core</Category>
-          <Not><Category>KDE</Category></Not>
+          <Not><Category>TDE</Category></Not>
         </And>
         <!-- Don't list SUSE's YaST in here -->
         <Category>X-SuSE-YaST</Category>
@@ -40,12 +40,12 @@
     <Name>Development</Name>
     <Directory>tde-development.directory</Directory>
     <Menu>
-      <Name>X-KDE-KDevelopIDE</Name>
+      <Name>X-TDE-KDevelopIDE</Name>
       <Directory>tde-development-tdevelop.directory</Directory>
       <Include>
         <And>
         <Category>Development</Category>
-        <Category>X-KDE-KDevelopIDE</Category>
+        <Category>X-TDE-KDevelopIDE</Category>
         </And>
       </Include>
     </Menu>
@@ -72,7 +72,7 @@
       <Include>
         <And>
         <Category>Development</Category>
-        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
+        <Not><Category>X-TDE-KDevelopIDE</Category></Not>
         <Not><Category>Translation</Category></Not>
         <Not><Category>WebDevelopment</Category></Not>
         </And>
@@ -108,7 +108,7 @@
         <Category>Education</Category>
         <Or>
         <Category>Languages</Category>
-        <Category>X-KDE-Edu-Language</Category>
+        <Category>X-TDE-Edu-Language</Category>
         </Or>
         </And>
       </Include>
@@ -131,11 +131,11 @@
         <Category>Education</Category>
         <Not>
         <Category>Languages</Category>
-        <Category>X-KDE-Edu-Language</Category>
+        <Category>X-TDE-Edu-Language</Category>
         <Category>Math</Category>
         <Category>Science</Category>
         <Category>Teaching</Category>
-        <Category>X-KDE-Edu-Teaching</Category>
+        <Category>X-TDE-Edu-Teaching</Category>
         </Not>
         </And>
       </Include>
@@ -158,7 +158,7 @@
         <Category>Education</Category>
         <Or>
         <Category>Teaching</Category>
-        <Category>X-KDE-Edu-Teaching</Category>
+        <Category>X-TDE-Edu-Teaching</Category>
         </Or>
         </And>
       </Include>
@@ -204,7 +204,7 @@
         <And>
         <Category>Game</Category>
         <Or>
-        <Category>X-KDE-KidsGame</Category>
+        <Category>X-TDE-KidsGame</Category>
         <Category>KidsGame</Category>
         </Or>
         </And>
@@ -227,7 +227,7 @@
       <Category>ArcadeGame</Category>
       <Category>BoardGame</Category>
       <Category>CardGame</Category>
-      <Category>X-KDE-KidsGame</Category>
+      <Category>X-TDE-KidsGame</Category>
       <Category>KidsGame</Category>
       <Category>StrategyGame</Category>
       </Not>
@@ -240,7 +240,7 @@
     <Include>
       <And>
       <Category>Graphics</Category>
-      <Not><Category>X-KDE-More</Category></Not>
+      <Not><Category>X-TDE-More</Category></Not>
       <Not><Filename>ooo-draw.desktop</Filename></Not>
       </And>
     </Include>
@@ -250,7 +250,7 @@
       <Include>
         <And>
         <Category>Graphics</Category>
-        <Category>X-KDE-More</Category>
+        <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
@@ -261,7 +261,7 @@
     <Include>
       <And>
       <Category>Network</Category>
-      <Not><Category>X-KDE-More</Category></Not>
+      <Not><Category>X-TDE-More</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -274,7 +274,7 @@
       <Include>
         <And>
         <Category>Network</Category>
-        <Category>X-KDE-More</Category>
+        <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
@@ -285,7 +285,7 @@
     <Include>
       <And>
       <Category>AudioVideo</Category>
-      <Not><Category>X-KDE-More</Category></Not>
+      <Not><Category>X-TDE-More</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -294,7 +294,7 @@
       <Include>
         <And>
         <Category>AudioVideo</Category>
-        <Category>X-KDE-More</Category>
+        <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
@@ -311,7 +311,7 @@
     <Include>
       <And>
       <Category>Office</Category>
-        <Not><Category>X-KDE-More</Category></Not>
+        <Not><Category>X-TDE-More</Category></Not>
       </And>
     <Filename>ooo-draw.desktop</Filename>
     </Include>
@@ -321,7 +321,7 @@
       <Include>
         <And>
           <Category>Office</Category>
-          <Category>X-KDE-More</Category>
+          <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
@@ -339,7 +339,7 @@
     <Include>
       <And>
       <Category>System</Category>
-      <Not><Category>X-KDE-More</Category></Not>
+      <Not><Category>X-TDE-More</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -347,8 +347,8 @@
       <Directory>tde-system-su.directory</Directory>
       <Include>
         <And>
-        <Category>X-KDE-System-su</Category>
-        <Not><Category>X-KDE-More</Category></Not>
+        <Category>X-TDE-System-su</Category>
+        <Not><Category>X-TDE-More</Category></Not>
         </And>
       </Include>
     </Menu>
@@ -358,7 +358,7 @@
       <Include>
         <And>
         <Category>System</Category>
-        <Category>X-KDE-More</Category>
+        <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
@@ -378,10 +378,10 @@
       <And>
       <Category>Utility</Category>
       <Not><Category>Accessibility</Category></Not>
-      <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-      <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-      <Not><Category>X-KDE-Utilities-PIM</Category></Not>
-      <Not><Category>X-KDE-More</Category></Not>
+      <Not><Category>X-TDE-Utilities-Desktop</Category></Not>
+      <Not><Category>X-TDE-Utilities-Peripherals</Category></Not>
+      <Not><Category>X-TDE-Utilities-PIM</Category></Not>
+      <Not><Category>X-TDE-More</Category></Not>
       </And>
     </Include>
     <Menu>
@@ -400,7 +400,7 @@
       <Include>
         <And>
         <Category>Utility</Category>
-        <Category>X-KDE-Utilities-Desktop</Category>
+        <Category>X-TDE-Utilities-Desktop</Category>
         </And>
       </Include>
     </Menu>
@@ -417,7 +417,7 @@
       <Include>
         <And>
         <Category>Utility</Category>
-        <Category>X-KDE-Utilities-PIM</Category>
+        <Category>X-TDE-Utilities-PIM</Category>
         </And>
       </Include>
     </Menu>
@@ -438,7 +438,7 @@
       <Include>
         <And>
         <Category>Utility</Category>
-        <Category>X-KDE-More</Category>
+        <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
@@ -448,14 +448,14 @@
       <Include>
         <And>
         <Category>Utility</Category>
-        <Category>X-KDE-More</Category>
+        <Category>X-TDE-More</Category>
         </And>
       </Include>
     </Menu>
   </Menu>
   <Include>
     <And>
-    <Category>KDE</Category>
+    <Category>TDE</Category>
     <Category>Core</Category>
     </And>
   </Include>
diff --git a/kded/kbuildservicegroupfactory.h b/kded/kbuildservicegroupfactory.h
index b4d303502..23666fd0f 100644
--- a/kded/kbuildservicegroupfactory.h
+++ b/kded/kbuildservicegroupfactory.h
@@ -53,7 +53,7 @@ public:
    * Adds the entry @p newEntry to the "parent group" @p parent, creating
    * the group if necassery.
    * A "parent group" is a group of services that all have the same
-   * "X-KDE-ParentApp".
+   * "X-TDE-ParentApp".
    */
   KServiceGroup *addNewChild( const TQString &parent, const char *resource, KSycocaEntry *newEntry);
  
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 27b55176d..c017a91e1 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -85,7 +85,7 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource
 
   // TODO check Type field first
   TQString mime = desktopFile.readEntry( "MimeType" );
-  TQString service = desktopFile.readEntry( "X-KDE-ServiceType" );
+  TQString service = desktopFile.readEntry( "X-TDE-ServiceType" );
 
   if ( mime.isEmpty() && service.isEmpty() )
   {
diff --git a/kded/kded.cpp b/kded/kded.cpp
index a438fa546..4b891d48a 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -172,7 +172,7 @@ void Kded::initModules()
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
          KService::Ptr service = *it;
-         bool autoload = service->property("X-KDE-Kded-autoload", TQVariant::Bool).toBool();
+         bool autoload = service->property("X-TDE-Kded-autoload", TQVariant::Bool).toBool();
          config->setGroup(TQString("Module-%1").arg(service->desktopEntryName()));
          autoload = config->readBoolEntry("autoload", autoload);
          for (TQStringList::Iterator module = blacklist.begin(); module != blacklist.end(); ++module)
@@ -186,7 +186,7 @@ void Kded::initModules()
          if( m_newStartup )
          {
             // see ksmserver's README for description of the phases
-            TQVariant phasev = service->property("X-KDE-Kded-phase", TQVariant::Int );
+            TQVariant phasev = service->property("X-TDE-Kded-phase", TQVariant::Int );
             int phase = phasev.isValid() ? phasev.toInt() : 2;
             bool prevent_autoload = false;
             switch( phase )
@@ -211,7 +211,7 @@ void Kded::initModules()
                loadModule(service, false);
          }
          bool dontLoad = false;
-         TQVariant p = service->property("X-KDE-Kded-load-on-demand", TQVariant::Bool);
+         TQVariant p = service->property("X-TDE-Kded-load-on-demand", TQVariant::Bool);
          if (p.isValid() && (p.toBool() == false))
             dontLoad = true;
          if (dontLoad)
@@ -230,10 +230,10 @@ void Kded::loadSecondPhase()
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
          KService::Ptr service = *it;
-         bool autoload = service->property("X-KDE-Kded-autoload", TQVariant::Bool).toBool();
+         bool autoload = service->property("X-TDE-Kded-autoload", TQVariant::Bool).toBool();
          config->setGroup(TQString("Module-%1").arg(service->desktopEntryName()));
          autoload = config->readBoolEntry("autoload", autoload);
-         TQVariant phasev = service->property("X-KDE-Kded-phase", TQVariant::Int );
+         TQVariant phasev = service->property("X-TDE-Kded-phase", TQVariant::Int );
          int phase = phasev.isValid() ? phasev.toInt() : 2;
          if( phase == 2 && autoload )
             loadModule(service, false);
@@ -266,7 +266,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)
 
     if (onDemand)
     {
-      TQVariant p = s->property("X-KDE-Kded-load-on-demand", TQVariant::Bool);
+      TQVariant p = s->property("X-TDE-Kded-load-on-demand", TQVariant::Bool);
       if (p.isValid() && (p.toBool() == false))
       {
          noDemandLoad(s->desktopEntryName());
@@ -277,12 +277,12 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)
 
     KLibLoader *loader = KLibLoader::self();
 
-    TQVariant v = s->property("X-KDE-FactoryName", TQVariant::String);
+    TQVariant v = s->property("X-TDE-FactoryName", TQVariant::String);
     TQString factory = v.isValid() ? v.toString() : TQString::null;
     if (factory.isEmpty())
     {
        // Stay bugward compatible
-       v = s->property("X-KDE-Factory", TQVariant::String);
+       v = s->property("X-TDE-Factory", TQVariant::String);
        factory = v.isValid() ? v.toString() : TQString::null;
     }
     if (factory.isEmpty())
diff --git a/kded/kdedmodule.desktop b/kded/kdedmodule.desktop
index 09b1dafb6..55370e58c 100644
--- a/kded/kdedmodule.desktop
+++ b/kded/kdedmodule.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KDEDModule
+X-TDE-ServiceType=KDEDModule
 Comment=KDED Module
 Comment[ar]=وحدة KDED
 Comment[az]=KDED Modulu
@@ -82,9 +82,9 @@ Comment[zh_CN]=KDED 模块
 Comment[zh_HK]=KDED 模組
 Comment[zh_TW]=KDED 模組
 Comment[zu]=Ingxenye ye-KDED
-[PropertyDef::X-KDE-FactoryName]
+[PropertyDef::X-TDE-FactoryName]
 Type=TQString
-[PropertyDef::X-KDE-Kded-autoload]
+[PropertyDef::X-TDE-Kded-autoload]
 Type=bool
-[PropertyDef::X-KDE-Kded-load-on-demand]
+[PropertyDef::X-TDE-Kded-load-on-demand]
 Type=bool
diff --git a/kded/test/test.desktop b/kded/test/test.desktop
index b70407f93..8751a8479 100644
--- a/kded/test/test.desktop
+++ b/kded/test/test.desktop
@@ -2,11 +2,11 @@
 Type=Service
 
 ServiceTypes=KDEDModule
-X-KDE-ModuleType=Library
-X-KDE-Library=test
-X-KDE-Factory=test
-X-KDE-Kded-autoload=false
-X-KDE-Kded-load-on-demand=true
+X-TDE-ModuleType=Library
+X-TDE-Library=test
+X-TDE-Factory=test
+X-TDE-Kded-autoload=false
+X-TDE-Kded-load-on-demand=true
 
 Name=KDED Test Module
 Name[af]=Kded Toets Module