From f0cdc4b6d58c8db3d4334851449edf0bf5bf0870 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 13 Jul 2025 19:55:56 +0900 Subject: Use TDEDesktopFile Signed-off-by: Michele Calgaro --- ark/archiveformatinfo.cpp | 4 ++-- kgpg/kgpg.cpp | 4 ++-- kgpg/kgpgoptions.cpp | 6 +++--- kgpg/listkeys.cpp | 2 +- ksim/ksimpref.h | 2 +- ksim/ksimview.cpp | 12 ++++++------ ksim/ksimview.h | 6 +++--- ksim/library/pluginglobal.cpp | 6 +++--- ksim/library/pluginglobal.h | 6 +++--- ksim/library/pluginloader.cpp | 14 +++++++------- ksim/library/pluginloader.h | 6 +++--- ksim/monitorprefs.cpp | 4 ++-- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index d3c73a6..6ef5b7c 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -91,7 +91,7 @@ void ArchiveFormatInfo::addFormatInfo( ArchType type, TQString mime, TQString st { FormatInfo & info = find( type ); - KDesktopFile * desktopFile = new KDesktopFile( mime + ".desktop", true, "mime" ); + TDEDesktopFile * desktopFile = new TDEDesktopFile( mime + ".desktop", true, "mime" ); if( !desktopFile ) kdWarning( 1601 ) << "MimeType " << mime << " seems to be missing." << endl; KMimeType mimeType( desktopFile ); diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 0bae675..5073b96 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include "kgpgeditor.h" @@ -778,7 +778,7 @@ void MyView::installShred() KURL path; path.setPath(TDEGlobalSettings::desktopPath()); path.addPath("shredder.desktop"); - KDesktopFile configl2(path.path(), false); + TDEDesktopFile configl2(path.path(), false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); configl2.writeEntry("Type", "Application"); diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 26f9d63..c6dee50 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -465,7 +465,7 @@ void kgpgOptions::slotInstallSign(TQString mimetype) { TQString path=locateLocal("data","konqueror/servicemenus/signfile.desktop"); - KDesktopFile configl2(path, false); + TDEDesktopFile configl2(path, false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); configl2.writeEntry("X-TDE-ServiceTypes", mimetype); @@ -482,7 +482,7 @@ void kgpgOptions::slotInstallDecrypt(TQString mimetype) { TQString path=locateLocal("data","konqueror/servicemenus/decryptfile.desktop"); - KDesktopFile configl2(path, false); + TDEDesktopFile configl2(path, false); if (configl2.isImmutable() ==false) { configl2.setGroup("Desktop Entry"); configl2.writeEntry("X-TDE-ServiceTypes", mimetype); diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 4cc505e..94553f0 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index b5f1156..502e71a 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -24,7 +24,7 @@ #include class TQFrame; -class KDesktopFile; +class TDEDesktopFile; namespace KSim { class Config; diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 507e3af..67379c5 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -299,13 +299,13 @@ void KSim::MainView::reparseConfig(bool emitReload, for (it = list.begin(); it != list.end(); ++it) { if ((*it).isDifferent()) { if ((*it).isEnabled()) { // Go through the added/removed plugins and load/unload them - const KDesktopFile kdf((*it).filename()); + const TDEDesktopFile kdf((*it).filename()); addPlugin(kdf); m_prefDialog->createPage((*it).libName()); } else { m_prefDialog->removePage((*it).libName()); - const KDesktopFile kdf((*it).filename()); + const TDEDesktopFile kdf((*it).filename()); removePlugin(kdf); } } @@ -334,19 +334,19 @@ void KSim::MainView::addPlugins() TQStringList::ConstIterator it; for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it) { - const KDesktopFile kdf(*it, true); + const TDEDesktopFile kdf(*it, true); addPlugin(kdf); } } -void KSim::MainView::addPlugin(const KDesktopFile &file, bool force) +void KSim::MainView::addPlugin(const TDEDesktopFile &file, bool force) { if (force || m_config->enabledMonitor(file.readEntry("X-KSIM-LIBRARY"))) KSim::PluginLoader::self().loadPlugin(file); } // provided for convenience -void KSim::MainView::removePlugin(const KDesktopFile &file) +void KSim::MainView::removePlugin(const TDEDesktopFile &file) { KSim::PluginLoader::self().unloadPlugin(file.readEntry("X-KSIM-LIBRARY").local8Bit()); } diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 6526f2d..0ac2885 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -32,7 +32,7 @@ class TQBoxLayout; class TQHBoxLayout; class TQVBoxLayout; class TQPopupMenu; -class KDesktopFile; +class TDEDesktopFile; class TDEConfig; namespace KSim @@ -76,8 +76,8 @@ namespace KSim public slots: void reparseConfig(bool, const KSim::ChangedPluginList &); void addPlugins(); - void addPlugin(const KDesktopFile &, bool force = false); - void removePlugin(const KDesktopFile &); + void addPlugin(const TDEDesktopFile &, bool force = false); + void removePlugin(const TDEDesktopFile &); void addMonitor(const KSim::Plugin &); void runCommand(const TQCString &); void preferences(); diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp index 4d176bf..eb6d58f 100644 --- a/ksim/library/pluginglobal.cpp +++ b/ksim/library/pluginglobal.cpp @@ -21,7 +21,7 @@ #include "pluginmodule.h" #include -#include +#include #include #include @@ -75,7 +75,7 @@ KSim::Plugin::Plugin() : d(0) { } -KSim::Plugin::Plugin(KSim::PluginObject *plugin, const KDesktopFile &file) +KSim::Plugin::Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file) { init(plugin, file); @@ -190,7 +190,7 @@ KSim::PluginPage *KSim::Plugin::configPage() const return d ? d->page : 0; } -void KSim::Plugin::init(KSim::PluginObject *plugin, const KDesktopFile &file) +void KSim::Plugin::init(KSim::PluginObject *plugin, const TDEDesktopFile &file) { if (!plugin || file.fileName().isEmpty()) { d = 0; diff --git a/ksim/library/pluginglobal.h b/ksim/library/pluginglobal.h index 71ac049..cc1f7be 100644 --- a/ksim/library/pluginglobal.h +++ b/ksim/library/pluginglobal.h @@ -26,7 +26,7 @@ #include -class KDesktopFile; +class TDEDesktopFile; namespace KSim { @@ -48,7 +48,7 @@ namespace KSim /** * Constructs a Plugin */ - Plugin(KSim::PluginObject *plugin, const KDesktopFile &file); + Plugin(KSim::PluginObject *plugin, const TDEDesktopFile &file); /** * Copy constructor */ @@ -124,7 +124,7 @@ namespace KSim */ static KSim::Plugin null; private: - void init(KSim::PluginObject *plugin, const KDesktopFile &file); + void init(KSim::PluginObject *plugin, const TDEDesktopFile &file); class Private; Private *d; diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index ca2c8bd..35ea3fb 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ KSim::PluginLoader::~PluginLoader() delete d; } -bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) +bool KSim::PluginLoader::loadPlugin(const TDEDesktopFile &file) { switch (createPlugin(file)) { case KSim::PluginLoader::EmptyLibName: @@ -174,7 +174,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - KDesktopFile file((*it)); + TDEDesktopFile file((*it)); if (file.readName() == name) { location = (*it); break; @@ -186,7 +186,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, TQStringList files = TDEGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop"); TQStringList::ConstIterator it; for (it = files.begin(); it != files.end(); ++it) { - KDesktopFile file((*it)); + TDEDesktopFile file((*it)); if (file.readEntry("X-KSIM-LIBRARY") == name) { location = (*it); break; @@ -195,7 +195,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, break; } case DesktopFile: { - if (!KDesktopFile::isDesktopFile(name)) + if (!TDEDesktopFile::isDesktopFile(name)) return KSim::PluginInfo(); location = name; @@ -203,7 +203,7 @@ KSim::PluginInfo KSim::PluginLoader::findPluginInfo(const TQString &name, } } - KDesktopFile file(location); + TDEDesktopFile file(location); KSim::PluginInfo info; info.m_name = file.readName(); info.m_libName = file.readEntry("X-KSIM-LIBRARY").local8Bit(); @@ -292,7 +292,7 @@ void KSim::PluginLoader::cleanup() m_instance = 0; } -KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const KDesktopFile &file) +KSim::PluginLoader::ErrorCode KSim::PluginLoader::createPlugin(const TDEDesktopFile &file) { d->error = TQString(); TQCString pluginName(file.readEntry("X-KSIM-LIBRARY").local8Bit()); diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h index c0b332c..1dcd822 100644 --- a/ksim/library/pluginloader.h +++ b/ksim/library/pluginloader.h @@ -78,7 +78,7 @@ namespace KSim /** * loads a plugin, example: * 
-       *   KDesktopFile deskfile("/home/user/foo.desktop");
+       *   TDEDesktopFile deskfile("/home/user/foo.desktop");
        *   KSim::PluginLoader::self().loadPlugin(deskFile);
        *
* you can then use @ref pluginList() to access the plugin, view, @@ -86,7 +86,7 @@ namespace KSim * @param file is the desktop file of the lib * @return true if the plugin is successfully loaded */ - bool loadPlugin(const KDesktopFile &file); + bool loadPlugin(const TDEDesktopFile &file); /** * unloads a loaded plugin and removes plugin entries from pluginList() */ @@ -174,7 +174,7 @@ namespace KSim * Deletes the instance and cleans up after itself */ static void cleanup(); - ErrorCode createPlugin(const KDesktopFile &file); + ErrorCode createPlugin(const TDEDesktopFile &file); class Private; Private *d; diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp index 62f0252..88a2105 100644 --- a/ksim/monitorprefs.cpp +++ b/ksim/monitorprefs.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -49,7 +49,7 @@ KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) m_locatedFiles.sort(); TQStringList::ConstIterator it; for (it = m_locatedFiles.begin(); it != m_locatedFiles.end(); ++it) { - KDesktopFile file((*it), true); + TDEDesktopFile file((*it), true); (void)(new TQCheckListItem(this, file.readName(), TQCheckListItem::CheckBox))->setText(1, file.readComment()); } -- cgit v1.2.3