Browse Source

Read from X-DocPath only

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

+ 1
- 1
admin

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

+ 0
- 5
tdecore/kdesktopfile.cpp View File

@@ -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" );
}


+ 2
- 4
tdecore/kdesktopfile.h View File

@@ -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;

+ 1
- 1
tdecore/kprotocolinfo_tdecore.cpp View File

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

+ 1
- 1
tdeio/application.desktop View File

@@ -89,7 +89,7 @@ Name[zu]=Umyaleli
[PropertyDef::NoDisplay]
Type=bool

[PropertyDef::DocPath]
[PropertyDef::X-DocPath]
Type=TQString

[PropertyDef::X-TDE-SubstituteUID]

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

@@ -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

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

@@ -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()));
}

+ 1
- 1
tdeutils/kcmultidialog.h View File

@@ -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.
*

+ 1
- 1
tdeutils/tdecmoduleinfo.cpp View File

@@ -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 );

Loading…
Cancel
Save