diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-08-17 20:31:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-08-17 20:31:38 -0500 |
| commit | 365f03061337a81bcffb4a45c4ad637edad27019 (patch) | |
| tree | bc8bf3df607d88c0efc8efbde69bf98eb38f76ac /tdeio | |
| parent | 8825cf6535b4e3a920db1cc4a0e0228b4535bebf (diff) | |
| download | tdelibs-365f03061337a81bcffb4a45c4ad637edad27019.tar.gz tdelibs-365f03061337a81bcffb4a45c4ad637edad27019.zip | |
Add compilation support to enable/disable
[KDE4] suffix in KDE4 menu items.
This resolves bug report 1563.
Diffstat (limited to 'tdeio')
| -rw-r--r-- | tdeio/tdeio/kservice.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index bbcbed5c9..67031d06d 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -236,9 +236,11 @@ KService::init( KDesktopFile *config ) m_strComment = config->readComment(); entryMap.remove("Comment"); m_strGenName = config->readGenericName(); +#ifdef KDE4_MENU_SUFFIX if (kde4application) { m_strGenName += " [KDE4]"; } +#endif entryMap.remove("GenericName"); TQString untranslatedGenericName = config->readEntryUntranslated( "GenericName" ); if (!untranslatedGenericName.isEmpty()) @@ -496,12 +498,12 @@ public: void reparseConfiguration() { } - KEntryMap internalEntryMap( const TQString &pGroup) const + KEntryMap internalEntryMap( const TQString &pGroup) const { Q_UNUSED(pGroup); return KEntryMap(); } KEntryMap internalEntryMap() const { return KEntryMap(); } - void putData(const KEntryKey &_key, const KEntry& _data, bool _checkGroup) + void putData(const KEntryKey &_key, const KEntry& _data, bool _checkGroup) { Q_UNUSED(_key); Q_UNUSED(_data); Q_UNUSED(_checkGroup); } KEntry lookupData(const KEntryKey &_key) const @@ -771,10 +773,10 @@ bool KService::noDisplay() const { return true; #endif } - + if (!kapp->authorizeControlModule(d->menuId)) return true; - + return false; } |