Read from X-DocPath only

3 files changed, 3 insertions, 10 deletions

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(':');