Rename additional KDE strings

4 files changed, 25 insertions, 25 deletions

diff --git a/kiosktool/Makefile.am b/kiosktool/Makefile.am
index 91082c9..3a19511 100644
--- a/kiosktool/Makefile.am
+++ b/kiosktool/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = . kcms
 
 # this is the program that gets installed.  it's name is used for all
 # of the other Makefile.am variables
-bin_PROGRAMS = kiosktool kiosktool-kdedirs
+bin_PROGRAMS = kiosktool kiosktool-tdedirs
 
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
@@ -32,13 +32,13 @@ kiosktool_SOURCES =	main.cpp kioskgui.cpp kioskdata.cpp kioskrun.cpp \
 	kiosksync.cpp
 
 # the library search path. 
-kiosktool_kdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kiosktool_tdedirs_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
-kiosktool_kdedirs_LDADD   = $(LIB_TDECORE)
+kiosktool_tdedirs_LDADD   = $(LIB_TDECORE)
 
 # which sources should be compiled for kiosktool
-kiosktool_kdedirs_SOURCES = kiosktool-kdedirs.cpp
+kiosktool_tdedirs_SOURCES = kiosktool-tdedirs.cpp
 
 # these are the headers for your project
 noinst_HEADERS   = kioskgui.h
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp
index f215483..8164dc8 100644
--- a/kiosktool/kioskrun.cpp
+++ b/kiosktool/kioskrun.cpp
@@ -163,7 +163,7 @@ KioskRun::applyEnvironment(KProcess *p)
 {
    p->setEnvironment("HOME", m_homeDir);
    p->setEnvironment("TDEHOME", m_homeDir+"/.kde");
-   p->setEnvironment("KDEROOTHOME", m_homeDir+"/.kde");
+   p->setEnvironment("TDEROOTHOME", m_homeDir+"/.kde");
    p->setEnvironment("TDEDIRS", m_kdeDirs.join(":"));
    p->setEnvironment("XDG_DATA_HOME", m_homeDir+"/.local/share");
    p->setEnvironment("XDG_DATA_DIRS", m_xdgDataDirs.join(":"));
@@ -248,9 +248,9 @@ KioskRun::setupConfigEnv()
 
    SetEnv home("HOME", m_homeDir);
    TQString kdeHome = m_homeDir+"/.kde";
-   SetEnv kdehome("TDEHOME", kdeHome);
-   SetEnv kderoothome("KDEROOTHOME", kdeHome);
-   SetEnv kdedirs("TDEDIRS", m_kdeDirs.join(":"));
+   SetEnv tdehome("TDEHOME", kdeHome);
+   SetEnv tderoothome("TDEROOTHOME", kdeHome);
+   SetEnv tdedirs("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,8 +286,8 @@ KioskRun::setupConfigEnv()
       m_desktopPath.append('/');
    
    {
-      SetEnv kdehome("TDEHOME", "-");
-      SetEnv kderoothome("KDEROOTHOME", "-");
+      SetEnv tdehome("TDEHOME", "-");
+      SetEnv tderoothome("TDEROOTHOME", "-");
       SetEnv xdgDataHome("XDG_DATA_HOME", m_xdgDataDirs.first());
       SetEnv xdgConfigHome("XDG_CONFIG_HOME", m_xdgConfigDirs.first());
 
diff --git a/kiosktool/kiosktool-kdedirs.cpp b/kiosktool/kiosktool-kdedirs.cpp
index 8a9254d..47d8ee2 100644
--- a/kiosktool/kiosktool-kdedirs.cpp
+++ b/kiosktool/kiosktool-kdedirs.cpp
@@ -1,5 +1,5 @@
 /*
- * kiosktool-kdedirs.cpp
+ * kiosktool-tdedirs.cpp
  *
  *   Copyright (C) 2004 Waldo Bastian <bastian@kde.org>
  *
@@ -122,12 +122,12 @@ static KCmdLineOptions options[] = {
 int main(int argc, char **argv)
 {
     KLocale::setMainCatalogue("kiosktool");
-    KAboutData about("kiosktool-kdedirs", "kiosktool-kdedirs", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
+    KAboutData about("kiosktool-tdedirs", "kiosktool-tdedirs", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian");
     KCmdLineArgs::init( argc, argv, &about);
     KCmdLineArgs::addCmdLineOptions(options);
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
-    KInstance a("kiosktool-kdedirs");
+    KInstance a("kiosktool-tdedirs");
 
     if (args->isSet("check"))
     {
@@ -137,21 +137,21 @@ int main(int argc, char **argv)
        return 0;
     }
 
-    TQStringList kdedirList;
+    TQStringList tdedirList;
 
     // begin TDEDIRS
-    TQString kdedirs = readEnvPath("TDEDIRS");
-    if (!kdedirs.isEmpty())
+    TQString tdedirs = readEnvPath("TDEDIRS");
+    if (!tdedirs.isEmpty())
     {
-	kdedirList = TQStringList::split(":", kdedirs);
+	tdedirList = TQStringList::split(":", tdedirs);
     }
     else
     {
-	TQString kdedir = readEnvPath("TDEDIR");
-	if (!kdedir.isEmpty())
+	TQString tdedir = readEnvPath("TDEDIR");
+	if (!tdedir.isEmpty())
         {
-           kdedir = KShell::tildeExpand(kdedir);
-	   kdedirList.append(kdedir);
+           tdedir = KShell::tildeExpand(tdedir);
+	   tdedirList.append(tdedir);
         }
     }
 
@@ -171,14 +171,14 @@ int main(int argc, char **argv)
         TQStringList list = config->readListEntry("prefixes");
         for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++)
         {
-            kdedirList.prepend(*it);
+            tdedirList.prepend(*it);
 	}
         if (list.isEmpty() && !profile.isEmpty() && !profileDirsPrefix.isEmpty())
         {
-	   kdedirList.prepend(profileDirsPrefix + profile);
+	   tdedirList.prepend(profileDirsPrefix + profile);
         }
     }
-    printf("%s\n", TQFile::encodeName(kdedirList.join(":")).data());
+    printf("%s\n", TQFile::encodeName(tdedirList.join(":")).data());
 
     return 0;
 }
diff --git a/kiosktool/userManagement.cpp b/kiosktool/userManagement.cpp
index 29a05c7..2cca956 100644
--- a/kiosktool/userManagement.cpp
+++ b/kiosktool/userManagement.cpp
@@ -82,7 +82,7 @@ void UserManagementPage::slotShowNotice()
               "If you want to use these profiles in combination with older versions you need "
               "to manually set the $TDEDIRS environment variable from the <b>starttde</b> "
               "script by adding the following line:<br><br>"
-              "<i>export TDEDIRS=$(kiosktool-kdedirs)</i><br><br>").tqarg(AVAILABLE_SINCE),
+              "<i>export TDEDIRS=$(kiosktool-tdedirs)</i><br><br>").tqarg(AVAILABLE_SINCE),
          i18n("Attention"), "user-profiles");
 }