From 6c097e6ff1c26c8c0e0fe0d8be2442d72a16fd70 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 7 Nov 2014 22:30:02 -0600
Subject: [PATCH] Read from X-DocPath only

---
 admin                             | 2 +-
 tdecore/kdesktopfile.cpp          | 5 -----
 tdecore/kdesktopfile.h            | 6 ++----
 tdecore/kprotocolinfo_tdecore.cpp | 2 +-
 tdeio/application.desktop         | 2 +-
 tdeio/tdeio/kprotocolinfo.h       | 2 +-
 tdeio/tests/tdesycocatest.cpp     | 2 +-
 tdeutils/kcmultidialog.h          | 2 +-
 tdeutils/tdecmoduleinfo.cpp       | 2 +-
 9 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/admin b/admin
index 04db46062..4dd97fad9 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit 4dd97fad9e0c3f39abfd16d13e5b4c93d508513c
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index 9798a1ff2..fa1626701 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -364,11 +364,6 @@ void KDesktopFile::virtual_hook( int id, void* data )
 
 TQString KDesktopFile::readDocPath() const
 {
-  // Depreciated, remove in KDE4 or 5?
-  // See: http://www.freedesktop.org/Standards/desktop-entry-spec
-  if(hasKey( "DocPath" ))
-    return readPathEntry( "DocPath" );
-
   return readPathEntry( "X-DocPath" );
 }
 
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index 60e9fc096..cfdc5488c 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -200,10 +200,8 @@ public:
   TQString resource() const;
 
   /**
-   * Returns the value of the "X-DocPath=" Or "DocPath=" entry.
-	 * X-DocPath should be used and DocPath is depreciated and will
-	 * one day be not supported.
-   * @return The value of the "X-DocPath=" Or "DocPath=" entry.
+   * Returns the value of the "X-DocPath=" entry.
+   * @return The value of the "X-DocPath=" entry.
    * @since 3.1
    */
   TQString readDocPath() const;
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 86a9a6fcc..4377ec9ce 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -105,7 +105,7 @@ KProtocolInfo::KProtocolInfo(const TQString &path)
   else
     m_outputType = KProtocolInfo::T_NONE;
 
-  d->docPath = config.readPathEntry( "DocPath" );
+  d->docPath = config.readPathEntry( "X-DocPath" );
   d->protClass = config.readEntry( "Class" ).lower();
   if (d->protClass[0] != ':')
      d->protClass.prepend(':');
diff --git a/tdeio/application.desktop b/tdeio/application.desktop
index d45e49578..014bc56c3 100644
--- a/tdeio/application.desktop
+++ b/tdeio/application.desktop
@@ -89,7 +89,7 @@ Name[zu]=Umyaleli
 [PropertyDef::NoDisplay]
 Type=bool
 
-[PropertyDef::DocPath]
+[PropertyDef::X-DocPath]
 Type=TQString
 
 [PropertyDef::X-TDE-SubstituteUID]
diff --git a/tdeio/tdeio/kprotocolinfo.h b/tdeio/tdeio/kprotocolinfo.h
index 592978e78..3cf142b69 100644
--- a/tdeio/tdeio/kprotocolinfo.h
+++ b/tdeio/tdeio/kprotocolinfo.h
@@ -498,7 +498,7 @@ public:
   /**
    * Returns the documentation path for the specified protocol.
    *
-   * This corresponds to the "DocPath=" field in the protocol description file.
+   * This corresponds to the "X-DocPath=" field in the protocol description file.
    *
    * @param protocol the protocol to check
    * @return the docpath of the protocol, or null if unknown
diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp
index 719d90da8..67b6b55ba 100644
--- a/tdeio/tests/tdesycocatest.cpp
+++ b/tdeio/tests/tdesycocatest.cpp
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
    {
      debug("Found it !");
      debug(TQString("Comment is %1").arg(se->comment()));
-     TQVariant qv = se->property("DocPath");
+     TQVariant qv = se->property("X-DocPath");
      debug(TQString("Property type is %1").arg(qv.typeName()));
      debug(TQString("Property value is %1").arg(qv.toString()));
    }
diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 4a90f5d0c..444f2f4db 100644
--- a/tdeutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -215,7 +215,7 @@ protected slots:
 
     /**
      * This slot is called when the user presses the "Help" Button.
-     * It reads the DocPath field of the currently selected KControl
+     * It reads the X-DocPath field of the currently selected KControl
      * module's .desktop file to find the path to the documentation,
      * which it then attempts to load.
      * 
diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index 4869bb1ef..0b0f7f4e8 100644
--- a/tdeutils/tdecmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
@@ -173,7 +173,7 @@ TDECModuleInfo::loadAll()
   setIsHiddenByDefault( tmp.isValid() ? tmp.toBool() : false );
 
   // get the documentation path
-  setDocPath( _service->property( "DocPath", TQVariant::String ).toString() );
+  setDocPath( _service->property( "X-DocPath", TQVariant::String ).toString() );
 
   tmp = _service->property( "X-TDE-Test-Module", TQVariant::Bool );
   setNeedsTest( tmp.isValid() ? tmp.asBool() : false );