diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-07-12 18:18:30 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-07-12 18:18:30 +0900 |
| commit | 26bc61bf25b244d1a28cf643ed773878ccd52734 (patch) | |
| tree | 42aa44e8bdd4c0f39965c4eb0bfd500f393eccb0 | |
| parent | ac2f7261c7c021e78a275aca3841e3b50831cf82 (diff) | |
| download | kiosktool-26bc61bf25b244d1a28cf643ed773878ccd52734.tar.gz kiosktool-26bc61bf25b244d1a28cf643ed773878ccd52734.zip | |
Use TDESimpleConfig
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | kiosktool/desktopComponent.cpp | 10 | ||||
| -rw-r--r-- | kiosktool/filetypeeditComponent.cpp | 2 | ||||
| -rw-r--r-- | kiosktool/kioskrun.cpp | 26 | ||||
| -rw-r--r-- | kiosktool/kioskrun.h | 6 | ||||
| -rw-r--r-- | kiosktool/kiosksync.cpp | 4 | ||||
| -rw-r--r-- | kiosktool/kiosksync.h | 4 | ||||
| -rw-r--r-- | kiosktool/kiosktool-tdedirs.cpp | 4 | ||||
| -rw-r--r-- | kiosktool/menueditComponent.cpp | 2 | ||||
| -rw-r--r-- | kiosktool/panelComponent.cpp | 2 |
9 files changed, 30 insertions, 30 deletions
diff --git a/kiosktool/desktopComponent.cpp b/kiosktool/desktopComponent.cpp index 47b5656..75afa8e 100644 --- a/kiosktool/desktopComponent.cpp +++ b/kiosktool/desktopComponent.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kmimetype.h> #include <tdeprocess.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> @@ -84,7 +84,7 @@ void filterFileList(const TQString &path, TQStringList *files, TQStringList *old KMimeType::Ptr mime = KMimeType::findByURL(u, 0, true); if (mime->name() == "application/x-desktop") { - KSimpleConfig cfg(path+*it); + TDESimpleConfig cfg(path+*it); cfg.setDesktopGroup(); if (cfg.readBoolEntry("Hidden", false)) { @@ -117,7 +117,7 @@ DesktopComponent::setupFinished() disconnect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetupReady())); m_timer.stop(); - KSimpleConfig newCfg(m_iconPositionsFile, true); + TDESimpleConfig newCfg(m_iconPositionsFile, true); TQString desktop = KioskRun::self()->desktopPath(); @@ -128,7 +128,7 @@ DesktopComponent::setupFinished() KTempFile positionsFile; positionsFile.close(); - KSimpleConfig positions(positionsFile.name()); + TDESimpleConfig positions(positionsFile.name()); TQStringList newGroups = newCfg.groupList(); @@ -200,7 +200,7 @@ DesktopComponent::setupFinished() // Hide via "Hidden=True", not sure if this works KTempFile tmp; tmp.close(); - KSimpleConfig cfg(tmp.name()); + TDESimpleConfig cfg(tmp.name()); cfg.setDesktopGroup(); cfg.writeEntry("Hidden", true); cfg.sync(); diff --git a/kiosktool/filetypeeditComponent.cpp b/kiosktool/filetypeeditComponent.cpp index a857a95..7f7a9fd 100644 --- a/kiosktool/filetypeeditComponent.cpp +++ b/kiosktool/filetypeeditComponent.cpp @@ -28,7 +28,7 @@ #include <kmimetype.h> #include <tdeprocess.h> #include <ksavefile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kurl.h> diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index 5dd037f..0f52847 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -37,7 +37,7 @@ #include <tdemessagebox.h> #include <tdeprocess.h> #include <ksavefile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kurl.h> #include <kuser.h> @@ -647,7 +647,7 @@ KioskRun::configFile(const TQString &filename) setupConfigEnv(); TQString saveLocation = saveImmutableStatus(filename); - config = new KSimpleConfig(saveLocation); + config = new TDESimpleConfig(saveLocation); m_saveConfigCache.insert(filename, config); return config; @@ -712,7 +712,7 @@ KioskRun::mergeConfigFile(const TQString &filename) TDEConfig *saveCfg = configFile(filename); kdDebug() << "KioskRun::mergeConfigFile(" << (m_configDir + filename) << ")" << endl; - KSimpleConfig newCfg(m_configDir + filename); + TDESimpleConfig newCfg(m_configDir + filename); TQStringList groups = newCfg.groupList(); for(TQStringList::ConstIterator it = groups.begin(); @@ -1179,7 +1179,7 @@ KioskRun::getProfileInfo(const TQString &profile, TQString &description, TQStrin TQString profileInfoFile = installDir + ".kdeprofile"; if (TQFile::exists(profileInfoFile)) { - KSimpleConfig profileInfo(profileInfoFile, true); + TDESimpleConfig profileInfo(profileInfoFile, true); description = profileInfo.readEntry("Description"); installUser = profileInfo.readEntry("InstallUser", "root"); return; @@ -1193,7 +1193,7 @@ KioskRun::getProfileInfo(const TQString &profile, TQString &description, TQStrin installUser = config->readEntry("ProfileInstallUser", "root"); } -KSimpleConfig * +TDESimpleConfig * KioskRun::openKderc() { if (m_localKdercConfig) @@ -1233,7 +1233,7 @@ KioskRun::openKderc() } } - m_localKdercConfig = new KSimpleConfig(m_localKderc); + m_localKdercConfig = new TDESimpleConfig(m_localKderc); return m_localKdercConfig; } @@ -1264,7 +1264,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c installDir.append("/"); TQString saveProfileInfo = installDir + ".kdeprofile"; - KSimpleConfig profileInfo(saveProfileInfo, true); + TDESimpleConfig profileInfo(saveProfileInfo, true); TQString oldDescription = profileInfo.readEntry("Description"); TQString oldInstallUser = profileInfo.readEntry("InstallUser"); if (deleteProfile && !installDir.isEmpty()) @@ -1330,7 +1330,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c { TQString localProfileInfo = ::locateLocal("tmp", "kdeprofile_"+tdeApp->randomString(5)); ::unlink(TQFile::encodeName(localProfileInfo)); - KSimpleConfig newProfileInfo(localProfileInfo); + TDESimpleConfig newProfileInfo(localProfileInfo); newProfileInfo.writeEntry("Description", description); newProfileInfo.writeEntry("InstallUser", installUser); newProfileInfo.sync(); @@ -1355,7 +1355,7 @@ KioskRun::setProfileInfo(const TQString &profile, const TQString &description, c !deleteProfile) return true; // Nothing to do - KSimpleConfig *cfg = openKderc(); + TDESimpleConfig *cfg = openKderc(); if (!cfg) return false; @@ -1413,7 +1413,7 @@ KioskRun::setProfilePrefix(const TQString &_prefix) if (prefix == getProfilePrefix()) return true; // Nothing to do - KSimpleConfig *cfg = openKderc(); + TDESimpleConfig *cfg = openKderc(); if (!cfg) return false; @@ -1521,7 +1521,7 @@ KioskRun::getUserProfileMappings( ProfileMapping &groups, ProfileMapping &users, if (mapFile.isEmpty() || !TQFile::exists(mapFile)) return; - KSimpleConfig mapCfg(mapFile, true); + TDESimpleConfig mapCfg(mapFile, true); mapCfg.setGroup("General"); groupOrder = mapCfg.readListEntry("groups"); @@ -1557,7 +1557,7 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap { mapFile = "/etc/kde-user-profile"; - KSimpleConfig *cfg = openKderc(); + TDESimpleConfig *cfg = openKderc(); if (!cfg) return false; @@ -1570,7 +1570,7 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap TQString localMapFile = ::locateLocal("tmp", "kde-user-profile_"+tdeApp->randomString(5)); ::unlink(TQFile::encodeName(localMapFile)); - KSimpleConfig mapConfig(localMapFile); + TDESimpleConfig mapConfig(localMapFile); mapConfig.setGroup("General"); mapConfig.writeEntry("groups", groupOrder); diff --git a/kiosktool/kioskrun.h b/kiosktool/kioskrun.h index ffb4b4d..aad5a51 100644 --- a/kiosktool/kioskrun.h +++ b/kiosktool/kioskrun.h @@ -33,7 +33,7 @@ class ImmutableStatus; class TDEConfig; class TDEProcess; -class KSimpleConfig; +class TDESimpleConfig; class KioskGui; @@ -128,7 +128,7 @@ public: void deleteDir(const TQString &); // Open /etc/tderc for writing - KSimpleConfig *openKderc(); + TDESimpleConfig *openKderc(); // Install new /etc/tderc bool closeKderc(); @@ -207,7 +207,7 @@ private: TQString m_tderc; TQString m_localKderc; - KSimpleConfig *m_localKdercConfig; + TDESimpleConfig *m_localKdercConfig; }; diff --git a/kiosktool/kiosksync.cpp b/kiosktool/kiosksync.cpp index 1c5f5c9..ef1c4ce 100644 --- a/kiosktool/kiosksync.cpp +++ b/kiosktool/kiosksync.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> KioskSync::KioskSync( TQWidget* parent, const char* name) @@ -51,7 +51,7 @@ bool KioskSync::sync(bool incremental) { m_incremental = incremental; - m_timestamps = new KSimpleConfig(locateLocal("appdata", "profile-data")); + m_timestamps = new TDESimpleConfig(locateLocal("appdata", "profile-data")); bool canceled = false; diff --git a/kiosktool/kiosksync.h b/kiosktool/kiosksync.h index 58dd785..2aaa94c 100644 --- a/kiosktool/kiosksync.h +++ b/kiosktool/kiosksync.h @@ -27,7 +27,7 @@ #include "kioskrun.h" class TQWidget; -class KSimpleConfig; +class TDESimpleConfig; class KioskSync : public TQObject { @@ -72,7 +72,7 @@ private: SyncDirList m_syncDirs; TQWidget *m_parent; - KSimpleConfig *m_timestamps; + TDESimpleConfig *m_timestamps; TQStringList m_changedFiles; TQStringList m_changedDirs; bool m_incremental; diff --git a/kiosktool/kiosktool-tdedirs.cpp b/kiosktool/kiosktool-tdedirs.cpp index b911b03..0c08e04 100644 --- a/kiosktool/kiosktool-tdedirs.cpp +++ b/kiosktool/kiosktool-tdedirs.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> #include <kinstance.h> #include <kshell.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> static const char *description = I18N_NOOP("A tool to set $TDEDIRS according to the current user profile."); @@ -69,7 +69,7 @@ static TQStringList lookupProfiles(const TQString &mapFile) gid_t sup_gids[512]; int sup_gids_nr = getgroups(512, sup_gids); - KSimpleConfig mapCfg(mapFile, true); + TDESimpleConfig mapCfg(mapFile, true); mapCfg.setGroup("Users"); if (mapCfg.hasKey(user.data())) { diff --git a/kiosktool/menueditComponent.cpp b/kiosktool/menueditComponent.cpp index 81a68f2..806a64f 100644 --- a/kiosktool/menueditComponent.cpp +++ b/kiosktool/menueditComponent.cpp @@ -28,7 +28,7 @@ #include <kmimetype.h> #include <tdeprocess.h> #include <ksavefile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kurl.h> diff --git a/kiosktool/panelComponent.cpp b/kiosktool/panelComponent.cpp index 62a7f50..139cd39 100644 --- a/kiosktool/panelComponent.cpp +++ b/kiosktool/panelComponent.cpp @@ -26,7 +26,7 @@ #include <kmimetype.h> #include <tdeprocess.h> #include <ksavefile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kurl.h> |
