diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-07 18:49:52 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-07 18:49:52 -0600 |
commit | 544df55ba1dbdff64e48f9687b92e8e5dd6cc891 (patch) | |
tree | 2325d4345d9cd70c540d1dcb5ce5cc34f594f6f0 /kiosktool | |
parent | bae304940b0a65131c123f9731322457b2fed2a8 (diff) | |
download | kiosktool-544df55ba1dbdff64e48f9687b92e8e5dd6cc891.tar.gz kiosktool-544df55ba1dbdff64e48f9687b92e8e5dd6cc891.zip |
Rename KDEHOME and KDEDIR
Diffstat (limited to 'kiosktool')
-rw-r--r-- | kiosktool/kioskrun.cpp | 12 | ||||
-rw-r--r-- | kiosktool/kiosktool-kdedirs.cpp | 8 | ||||
-rw-r--r-- | kiosktool/userManagement.cpp | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index 7e96004..f215483 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -162,9 +162,9 @@ void KioskRun::applyEnvironment(KProcess *p) { p->setEnvironment("HOME", m_homeDir); - p->setEnvironment("KDEHOME", m_homeDir+"/.kde"); + p->setEnvironment("TDEHOME", m_homeDir+"/.kde"); p->setEnvironment("KDEROOTHOME", m_homeDir+"/.kde"); - p->setEnvironment("KDEDIRS", m_kdeDirs.join(":")); + p->setEnvironment("TDEDIRS", m_kdeDirs.join(":")); p->setEnvironment("XDG_DATA_HOME", m_homeDir+"/.local/share"); p->setEnvironment("XDG_DATA_DIRS", m_xdgDataDirs.join(":")); p->setEnvironment("XDG_CONFIG_HOME", m_homeDir+"/.config"); @@ -248,9 +248,9 @@ KioskRun::setupConfigEnv() SetEnv home("HOME", m_homeDir); TQString kdeHome = m_homeDir+"/.kde"; - SetEnv kdehome("KDEHOME", kdeHome); + SetEnv kdehome("TDEHOME", kdeHome); SetEnv kderoothome("KDEROOTHOME", kdeHome); - SetEnv kdedirs("KDEDIRS", m_kdeDirs.join(":")); + SetEnv kdedirs("TDEDIRS", m_kdeDirs.join(":")); SetEnv xdgDataHome("XDG_DATA_HOME", m_homeDir+"/.local/share"); SetEnv xdgDataDirs("XDG_DATA_DIRS", m_xdgDataDirs.join(":")); SetEnv xdgConfigHome("XDG_CONFIG_HOME", m_homeDir+"/.config"); @@ -286,7 +286,7 @@ KioskRun::setupConfigEnv() m_desktopPath.append('/'); { - SetEnv kdehome("KDEHOME", "-"); + SetEnv kdehome("TDEHOME", "-"); SetEnv kderoothome("KDEROOTHOME", "-"); SetEnv xdgDataHome("XDG_DATA_HOME", m_xdgDataDirs.first()); SetEnv xdgConfigHome("XDG_CONFIG_HOME", m_xdgConfigDirs.first()); @@ -1589,7 +1589,7 @@ KioskRun::setUserProfileMappings( const ProfileMapping &groups, const ProfileMap void KioskRun::forceSycocaUpdate() { - // Touch $KDEDIR/share/services/update_ksycoca + // Touch $TDEDIR/share/services/update_ksycoca KTempFile tempFile; tempFile.close(); TQString sycocaUpdateFile = locateSave("services", "update_ksycoca"); diff --git a/kiosktool/kiosktool-kdedirs.cpp b/kiosktool/kiosktool-kdedirs.cpp index 99f6548..8a9254d 100644 --- a/kiosktool/kiosktool-kdedirs.cpp +++ b/kiosktool/kiosktool-kdedirs.cpp @@ -36,7 +36,7 @@ #include <ksimpleconfig.h> #include <kstandarddirs.h> -static const char *description = I18N_NOOP("A tool to set $KDEDIRS according to the current user profile."); +static const char *description = I18N_NOOP("A tool to set $TDEDIRS according to the current user profile."); static TQString readEnvPath(const char *env) @@ -139,15 +139,15 @@ int main(int argc, char **argv) TQStringList kdedirList; - // begin KDEDIRS - TQString kdedirs = readEnvPath("KDEDIRS"); + // begin TDEDIRS + TQString kdedirs = readEnvPath("TDEDIRS"); if (!kdedirs.isEmpty()) { kdedirList = TQStringList::split(":", kdedirs); } else { - TQString kdedir = readEnvPath("KDEDIR"); + TQString kdedir = readEnvPath("TDEDIR"); if (!kdedir.isEmpty()) { kdedir = KShell::tildeExpand(kdedir); diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp index 04c32bb..29a05c7 100644 --- a/kiosktool/userManagement.cpp +++ b/kiosktool/userManagement.cpp @@ -80,9 +80,9 @@ void UserManagementPage::slotShowNotice() i18n("<qt>The profiles that you define here are automatically applied when the " "user logs in to %1 or newer.<p>" "If you want to use these profiles in combination with older versions you need " - "to manually set the $KDEDIRS environment variable from the <b>starttde</b> " + "to manually set the $TDEDIRS environment variable from the <b>starttde</b> " "script by adding the following line:<br><br>" - "<i>export KDEDIRS=$(kiosktool-kdedirs)</i><br><br>").tqarg(AVAILABLE_SINCE), + "<i>export TDEDIRS=$(kiosktool-kdedirs)</i><br><br>").tqarg(AVAILABLE_SINCE), i18n("Attention"), "user-profiles"); } |