From 9cd27dbaa3e866ab5befdbcaadddf13b34e7b0bf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 4 Apr 2020 00:43:23 +0900 Subject: Fixed tde branding of services in tdebuildsycoca. This was creating old kde-* entries in profilerc when updating file type preferences. This relates to bug 3083. Signed-off-by: Michele Calgaro --- tdeio/tdeio/kservice.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tdeio') diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index c097146a3..05cf554c0 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -680,8 +680,8 @@ KService::Ptr KService::serviceByDesktopPath( const TQString& _name ) KService::Ptr KService::serviceByDesktopName( const TQString& _name ) { KService * s = KServiceFactory::self()->findServiceByDesktopName( _name.lower() ); - if (!s && !_name.startsWith("kde-")) - s = KServiceFactory::self()->findServiceByDesktopName( "kde-"+_name.lower() ); + if (!s && !_name.startsWith("tde-")) + s = KServiceFactory::self()->findServiceByDesktopName( "tde-"+_name.lower() ); return KService::Ptr( s ); } @@ -866,7 +866,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName { TQString base = suggestedName; if (!showInMenu) - base.prepend("kde-"); + base.prepend("tde-"); TQString result; for(int i = 1; true; i++) @@ -891,7 +891,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName } else { - TQString file = result.mid(4); // Strip "kde-" + TQString file = result.mid(4); // Strip "tde-" if (!locate("apps", ".hidden/"+file).isEmpty()) continue; } @@ -907,7 +907,7 @@ TQString KService::newServicePath(bool showInMenu, const TQString &suggestedName } else { - TQString file = result.mid(4); // Strip "kde-" + TQString file = result.mid(4); // Strip "tde-" return ::locateLocal("apps", ".hidden/"+file); } } -- cgit v1.2.1