Read from X-DocPath only

pull/16/head
Timothy Pearson 10 years ago
parent d89a7e4c97
commit 6c097e6ff1

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

@ -364,11 +364,6 @@ void KDesktopFile::virtual_hook( int id, void* data )
TQString KDesktopFile::readDocPath() const 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" ); return readPathEntry( "X-DocPath" );
} }

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

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

@ -89,7 +89,7 @@ Name[zu]=Umyaleli
[PropertyDef::NoDisplay] [PropertyDef::NoDisplay]
Type=bool Type=bool
[PropertyDef::DocPath] [PropertyDef::X-DocPath]
Type=TQString Type=TQString
[PropertyDef::X-TDE-SubstituteUID] [PropertyDef::X-TDE-SubstituteUID]

@ -498,7 +498,7 @@ public:
/** /**
* Returns the documentation path for the specified protocol. * 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 * @param protocol the protocol to check
* @return the docpath of the protocol, or null if unknown * @return the docpath of the protocol, or null if unknown

@ -129,7 +129,7 @@ int main(int argc, char *argv[])
{ {
debug("Found it !"); debug("Found it !");
debug(TQString("Comment is %1").arg(se->comment())); 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 type is %1").arg(qv.typeName()));
debug(TQString("Property value is %1").arg(qv.toString())); debug(TQString("Property value is %1").arg(qv.toString()));
} }

@ -215,7 +215,7 @@ protected slots:
/** /**
* This slot is called when the user presses the "Help" Button. * 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, * module's .desktop file to find the path to the documentation,
* which it then attempts to load. * which it then attempts to load.
* *

@ -173,7 +173,7 @@ TDECModuleInfo::loadAll()
setIsHiddenByDefault( tmp.isValid() ? tmp.toBool() : false ); setIsHiddenByDefault( tmp.isValid() ? tmp.toBool() : false );
// get the documentation path // 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 ); tmp = _service->property( "X-TDE-Test-Module", TQVariant::Bool );
setNeedsTest( tmp.isValid() ? tmp.asBool() : false ); setNeedsTest( tmp.isValid() ? tmp.asBool() : false );

Loading…
Cancel
Save