Browse Source

Read from X-DocPath only

tags/r14.0.0
Timothy Pearson 4 years ago
parent
commit
6c097e6ff1

+ 1
- 1
admin

@@ -1 +1 @@
1
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
1
+Subproject commit 4dd97fad9e0c3f39abfd16d13e5b4c93d508513c

+ 0
- 5
tdecore/kdesktopfile.cpp View File

@@ -364,11 +364,6 @@ void KDesktopFile::virtual_hook( int id, void* data )
364 364
 
365 365
 TQString KDesktopFile::readDocPath() const
366 366
 {
367
-  // Depreciated, remove in KDE4 or 5?
368
-  // See: http://www.freedesktop.org/Standards/desktop-entry-spec
369
-  if(hasKey( "DocPath" ))
370
-    return readPathEntry( "DocPath" );
371
-
372 367
   return readPathEntry( "X-DocPath" );
373 368
 }
374 369
 

+ 2
- 4
tdecore/kdesktopfile.h View File

@@ -200,10 +200,8 @@ public:
200 200
   TQString resource() const;
201 201
 
202 202
   /**
203
-   * Returns the value of the "X-DocPath=" Or "DocPath=" entry.
204
-	 * X-DocPath should be used and DocPath is depreciated and will
205
-	 * one day be not supported.
206
-   * @return The value of the "X-DocPath=" Or "DocPath=" entry.
203
+   * Returns the value of the "X-DocPath=" entry.
204
+   * @return The value of the "X-DocPath=" entry.
207 205
    * @since 3.1
208 206
    */
209 207
   TQString readDocPath() const;

+ 1
- 1
tdecore/kprotocolinfo_tdecore.cpp View File

@@ -105,7 +105,7 @@ KProtocolInfo::KProtocolInfo(const TQString &path)
105 105
   else
106 106
     m_outputType = KProtocolInfo::T_NONE;
107 107
 
108
-  d->docPath = config.readPathEntry( "DocPath" );
108
+  d->docPath = config.readPathEntry( "X-DocPath" );
109 109
   d->protClass = config.readEntry( "Class" ).lower();
110 110
   if (d->protClass[0] != ':')
111 111
      d->protClass.prepend(':');

+ 1
- 1
tdeio/application.desktop View File

@@ -89,7 +89,7 @@ Name[zu]=Umyaleli
89 89
 [PropertyDef::NoDisplay]
90 90
 Type=bool
91 91
 
92
-[PropertyDef::DocPath]
92
+[PropertyDef::X-DocPath]
93 93
 Type=TQString
94 94
 
95 95
 [PropertyDef::X-TDE-SubstituteUID]

+ 1
- 1
tdeio/tdeio/kprotocolinfo.h View File

@@ -498,7 +498,7 @@ public:
498 498
   /**
499 499
    * Returns the documentation path for the specified protocol.
500 500
    *
501
-   * This corresponds to the "DocPath=" field in the protocol description file.
501
+   * This corresponds to the "X-DocPath=" field in the protocol description file.
502 502
    *
503 503
    * @param protocol the protocol to check
504 504
    * @return the docpath of the protocol, or null if unknown

+ 1
- 1
tdeio/tests/tdesycocatest.cpp View File

@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
129 129
    {
130 130
      debug("Found it !");
131 131
      debug(TQString("Comment is %1").arg(se->comment()));
132
-     TQVariant qv = se->property("DocPath");
132
+     TQVariant qv = se->property("X-DocPath");
133 133
      debug(TQString("Property type is %1").arg(qv.typeName()));
134 134
      debug(TQString("Property value is %1").arg(qv.toString()));
135 135
    }

+ 1
- 1
tdeutils/kcmultidialog.h View File

@@ -215,7 +215,7 @@ protected slots:
215 215
 
216 216
     /**
217 217
      * This slot is called when the user presses the "Help" Button.
218
-     * It reads the DocPath field of the currently selected KControl
218
+     * It reads the X-DocPath field of the currently selected KControl
219 219
      * module's .desktop file to find the path to the documentation,
220 220
      * which it then attempts to load.
221 221
      * 

+ 1
- 1
tdeutils/tdecmoduleinfo.cpp View File

@@ -173,7 +173,7 @@ TDECModuleInfo::loadAll()
173 173
   setIsHiddenByDefault( tmp.isValid() ? tmp.toBool() : false );
174 174
 
175 175
   // get the documentation path
176
-  setDocPath( _service->property( "DocPath", TQVariant::String ).toString() );
176
+  setDocPath( _service->property( "X-DocPath", TQVariant::String ).toString() );
177 177
 
178 178
   tmp = _service->property( "X-TDE-Test-Module", TQVariant::Bool );
179 179
   setNeedsTest( tmp.isValid() ? tmp.asBool() : false );

Loading…
Cancel
Save