kdelibs/kdelibs-3.92.0-kde4home.diff

diff -ur kdelibs-3.92.0/cmake/modules/FindKDE4Internal.cmake kdelibs-3.92.0-kde4home/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-3.92.0/cmake/modules/FindKDE4Internal.cmake	2007-07-26 12:39:52.000000000 +0200
+++ kdelibs-3.92.0-kde4home/cmake/modules/FindKDE4Internal.cmake	2007-07-29 17:02:19.000000000 +0200
@@ -254,7 +254,7 @@
   # this file contains all dependencies of all libraries of kdelibs, Alex
   include("${kde_cmake_module_dir}/KDELibsDependencies.cmake")
 
-  # allow searching cmake modules in all given kde install locations (KDEDIRS based)
+  # allow searching cmake modules in all given kde install locations (KDE4DIRS based)
   execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
   file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
   foreach(dir ${_data_DIR})
diff -ur kdelibs-3.92.0/doc/common/README.Doxygen kdelibs-3.92.0-kde4home/doc/common/README.Doxygen
--- kdelibs-3.92.0/doc/common/README.Doxygen	2007-05-03 10:42:54.000000000 +0200
+++ kdelibs-3.92.0-kde4home/doc/common/README.Doxygen	2007-07-29 17:02:20.000000000 +0200
@@ -57,7 +57,7 @@
 --doxdatadir=<dir> Locate the HTML header files and support graphics.
               In kdelibs, the subdirectory doc/common/ contains these
               files (and this README). In an installed KDE system, 
-              $KDEDIR/share/doc/HTML/en/common/ contains a copy.
+              $KDE4DIR/share/doc/HTML/en/common/ contains a copy.
               This argument is mandatory if doxygen.sh can't guess where
               the doxdata lives.
 --installdir=<dir> Locate the directory where apidox from other modules
diff -ur kdelibs-3.92.0/doc/kdelibs/man-kbuildsycoca4.8.docbook kdelibs-3.92.0-kde4home/doc/kdelibs/man-kbuildsycoca4.8.docbook
--- kdelibs-3.92.0/doc/kdelibs/man-kbuildsycoca4.8.docbook	2007-05-03 10:42:54.000000000 +0200
+++ kdelibs-3.92.0-kde4home/doc/kdelibs/man-kbuildsycoca4.8.docbook	2007-07-29 17:02:20.000000000 +0200
@@ -191,7 +191,7 @@
 <title>Environment Variables</title>
 <variablelist>
 <varlistentry>
-<term>$<envar>KDEDIRS</envar></term>
+<term>$<envar>KDE4DIRS</envar></term>
 <listitem>
 <para>Specifies which directories are part of the KDE
 installations</para>
diff -ur kdelibs-3.92.0/kate/syntax/data/language.dtd kdelibs-3.92.0-kde4home/kate/syntax/data/language.dtd
--- kdelibs-3.92.0/kate/syntax/data/language.dtd	2007-07-26 12:39:53.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kate/syntax/data/language.dtd	2007-07-29 17:02:21.000000000 +0200
@@ -30,7 +30,7 @@
 	 (don't use a space between the two - That's just because XML
          comments don't allow that:-(
 
-        To use your syntax file, copy it to .kde/share/apps/katepart/syntax/ in
+        To use your syntax file, copy it to .kde4/share/apps/katepart/syntax/ in
         your home directory. You have to open a new instance of kwrite/kate to use
         the new syntax file.
 
diff -ur kdelibs-3.92.0/kate/tests/test_regression.cpp kdelibs-3.92.0-kde4home/kate/tests/test_regression.cpp
--- kdelibs-3.92.0/kate/tests/test_regression.cpp	2007-07-26 12:39:54.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kate/tests/test_regression.cpp	2007-07-29 17:02:21.000000000 +0200
@@ -446,7 +446,7 @@
 
     QString kh(UNIQUE_HOME_DIR);
     kh = kh.arg( pw->pw_name );
-    setenv( "KDEHOME", kh.toLatin1().constData(), 1 );
+    setenv( "KDE4HOME", kh.toLatin1().constData(), 1 );
     setenv( "LC_ALL", "C", 1 );
     setenv( "LANG", "C", 1 );
 
diff -ur kdelibs-3.92.0/kconf_update/README.kconf_update kdelibs-3.92.0-kde4home/kconf_update/README.kconf_update
--- kdelibs-3.92.0/kconf_update/README.kconf_update	2007-06-27 12:52:45.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kconf_update/README.kconf_update	2007-07-29 17:02:21.000000000 +0200
@@ -27,7 +27,7 @@
 ============
 
 Applications can install so called "update files" under 
-$KDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
+$KDE4DIR/share/apps/kconf_update. An update file has ".upd" as extension and
 contains instructions for transferring/converting configuration information 
 from one place to another.
 
@@ -90,7 +90,7 @@
 A workaround for KDE 3.1.x and older is to install a .sh script in
 $(kde_datadir) that contains a simple exec:
 
-    exec "`kde-config --prefix`/bin/kconf_update_bin/my_update_app"
+    exec "`kde4-config --prefix`/bin/kconf_update_bin/my_update_app"
 
 This is equivalent to what KDE 3.2 can do directly, but of course the .upd
 file now points to the .sh script instead of the binary application.
@@ -214,10 +214,10 @@
 manually call it through a pipe. If you want to test the update script for
 your application KHello's config file khellorc, you can test by using
 
-    cat ~/.kde/share/config/khellorc | khello_conf_update.sh
+    cat ~/.kde4/share/config/khellorc | khello_conf_update.sh
 
-(assuming khello_conf_update.sh is the kconf_update script and ~/.kde is your
-$KDEHOME). This is easier than making install every time, but has the obvious
+(assuming khello_conf_update.sh is the kconf_update script and ~/.kde4 is your
+$KDE4HOME). This is easier than making install every time, but has the obvious
 downside that you need to 'parse' your script's output yourself instead of
 letting kconf_update do it and check the resulting output file.
 
@@ -238,7 +238,7 @@
 again, without you having to increase the version number.
 
 If you want to know what kconf_update has been up to lately, have a look
-at $KDEHOME/share/apps/kconf_update/update.log
+at $KDE4HOME/share/apps/kconf_update/update.log
 
 
 Common Problems
diff -ur kdelibs-3.92.0/kde3support/kdecore/k3tempfile.h kdelibs-3.92.0-kde4home/kde3support/kdecore/k3tempfile.h
--- kdelibs-3.92.0/kde3support/kdecore/k3tempfile.h	2007-05-03 10:43:35.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kde3support/kdecore/k3tempfile.h	2007-07-29 17:02:21.000000000 +0200
@@ -60,7 +60,7 @@
     * Creates a temporary file with the name:
     *  \<filePrefix>\<six letters>\<fileExtension>
     *
-    * The default @p filePrefix is "$KDEHOME/tmp-$HOST/appname/"
+    * The default @p filePrefix is "$KDE4HOME/tmp-$HOST/appname/"
     * The default @p fileExtension is ".tmp"
     * @param filePrefix the prefix of the file name, or QString()
     *        for the default value
diff -ur kdelibs-3.92.0/kdecore/config/kconfigini.cpp kdelibs-3.92.0-kde4home/kdecore/config/kconfigini.cpp
--- kdelibs-3.92.0/kdecore/config/kconfigini.cpp	2007-07-26 12:41:11.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/config/kconfigini.cpp	2007-07-29 17:02:21.000000000 +0200
@@ -348,22 +348,22 @@
 
     // Parse the general config files
     if (useKDEGlobals) {
-        QStringList kdercs = pConfig->componentData().dirs()->
+        QStringList kde4rcs = pConfig->componentData().dirs()->
                              findAllResources("config", QLatin1String("kdeglobals"));
 
 #ifdef Q_WS_WIN
-        QString etc_kderc = QFile::decodeName( QByteArray(getenv("WINDIR")) + "\\kde4rc" );
+        QString etc_kde4rc = QFile::decodeName( QByteArray(getenv("WINDIR")) + "\\kde4rc" );
 #else
-        QString etc_kderc = QLatin1String("/etc/kde4rc");
+        QString etc_kde4rc = QLatin1String("/etc/kde4rc");
 #endif
 
-        if (KStandardDirs::checkAccess(etc_kderc, R_OK))
-            kdercs += etc_kderc;
+        if (KStandardDirs::checkAccess(etc_kde4rc, R_OK))
+            kde4rcs += etc_kde4rc;
 
-        kdercs += pConfig->componentData().dirs()->
+        kde4rcs += pConfig->componentData().dirs()->
                   findAllResources("config", QLatin1String("system.kdeglobals"));
 
-        QListIterator<QString> it( kdercs );
+        QListIterator<QString> it( kde4rcs );
         it.toBack();
         while (it.hasPrevious()) {
             QFile aConfigFile( it.previous() );
diff -ur kdelibs-3.92.0/kdecore/doc/DESIGN.kconfig kdelibs-3.92.0-kde4home/kdecore/doc/DESIGN.kconfig
--- kdelibs-3.92.0/kdecore/doc/DESIGN.kconfig	2007-02-19 10:56:05.000000000 +0100
+++ kdelibs-3.92.0-kde4home/kdecore/doc/DESIGN.kconfig	2007-07-29 17:02:21.000000000 +0200
@@ -52,7 +52,7 @@
 
 Note that there is a subtle difference between revertToDefault() and deleteEntry().
 revertToDefault() will change the entry to the default value set by the system 
-administrator (Via e.g. $KDEDIR/share/config) or, if no such default was set,
+administrator (Via e.g. $KDE4DIR/share/config) or, if no such default was set,
 non-existant.
 deleteEntry() will make the entry non-existant.
 
@@ -123,7 +123,7 @@
 
 
 Instead of relying on the defaults that are hard-coded in the application, 
-rely on default configuration files being installed in $KDEDIR. The technical
+rely on default configuration files being installed in $KDE4DIR. The technical
 changes required for this are very minimal, it is mostly a change in policy.
 
 Type information can be provide by preceding every entry with a formalized 
diff -ur kdelibs-3.92.0/kdecore/doc/README.kiosk kdelibs-3.92.0-kde4home/kdecore/doc/README.kiosk
--- kdelibs-3.92.0/kdecore/doc/README.kiosk	2007-07-26 12:41:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/doc/README.kiosk	2007-07-29 17:02:21.000000000 +0200
@@ -24,17 +24,17 @@
 sounds, menu-descriptions and configuration files. 
 
 In KDE1 there were two locations were resources could be located: The 
-resources provided by the system were located under $KDEDIR and user-
-specific resources were located under $HOME/.kde.
+resources provided by the system were located under $KDE4DIR and user-
+specific resources were located under $HOME/.kde4.
 
 In KDE2 resource management has been largely abstracted by the introduction
 of the KStandardDirs class and has become much more flexible. The user /
 administrator can now specify a variable number of locations where resources
-can be found. A list of locations can either be specified via $KDEDIRS
+can be found. A list of locations can either be specified via $KDE4DIRS
 (notice the extra 'S'), via /etc/kde4rc and even via the kdeglobals config 
 file. The location where user-specific resources can be found can be
-set with $KDEHOME (The default is $HOME/.kde). Changes made by the user
-are always written back to $KDEHOME.
+set with $KDE4HOME (The default is $HOME/.kde4). Changes made by the user
+are always written back to $KDE4HOME.
 
 Both KDE1 and KDE2 feature so called "cascading configuration files": There
 can be multiple configuration files with the same name in the various 
@@ -42,29 +42,29 @@
 all these configuration files is combined on a key by key basis. If the same
 key (within a certain group) is defined in more than one place, the value
 of the key for the config file that was read last will override any previously
-read values. Configuration files under $KDEHOME are always read last. This
+read values. Configuration files under $KDE4HOME are always read last. This
 ensures that after a configuration entry is written, the same value wil be
 read back.
 
 In KDE3 two important changes have been made:
 
 * Default values are no longer written.
-When a configuration file in a location other than $KDEHOME defines a value 
+When a configuration file in a location other than $KDE4HOME defines a value 
 for a key and the application subsequently writes out a new configuration file
-to $KDEHOME, that configuration file will only contain an entry for the key
+to $KDE4HOME, that configuration file will only contain an entry for the key
 if its value differs from the value read from the other file.
 
 This counters the problem that changing default configuration files under 
-$KDEDIR would not take effect for users, since these users would most likely
-have their own copy of these settings under $KDEHOME. KDE3 will make sure 
-not to copy these settings so changes made under $KDEDIR will affect all users
+$KDE4DIR would not take effect for users, since these users would most likely
+have their own copy of these settings under $KDE4HOME. KDE3 will make sure 
+not to copy these settings so changes made under $KDE4DIR will affect all users
 that haven't explicitly changed the affected settings to something else.
 
 * Configuration entries can be marked "immutable".
 Starting with KDE3, configuration entries can be marked "immutable". When a
 configuration entry is immutable it means that configuration files that are
 read later will not be able to override its value. Immutable entries cannot
-be changed via KConfig and if the entry is present under $KDEHOME it will 
+be changed via KConfig and if the entry is present under $KDE4HOME it will 
 be ignored.
 
 Entries can be marked immutable on 4 different levels:
@@ -102,8 +102,8 @@
 example use the commands below.
 
 Example:
-chown root.root /home/user/.kde/share/config/kickerrc
-chmod 644 /home/user/.kde/share/config/kickerrc
+chown root.root /home/user/.kde4/share/config/kickerrc
+chmod 644 /home/user/.kde4/share/config/kickerrc
 
 If you do this, the user will be warned that the configuration file is not
 writable. Since you will normally not want that, you can add the following
@@ -383,8 +383,8 @@
           option (Alt-F2) can be used to run shell-commands and arbitrary  
           executables. Likewise, executables placed in the user's
           Autostart folder will no longer be executed. Applications can
-          still be autostarted by placing .desktop files in the $KDEHOME/Autostart
-          or $KDEDIR/share/autostart directory.
+          still be autostarted by placing .desktop files in the $KDE4HOME/Autostart
+          or $KDE4DIR/share/autostart directory.
           See also run_desktop_files.
 
 custom_config 
@@ -416,13 +416,13 @@
           part of the default desktop, KDE menu, registered services and
           autostarting services.
           * The default desktop includes the files under 
-            $KDEDIR/share/kdesktop/Desktop but _NOT_ the files under
+            $KDE4DIR/share/kdesktop/Desktop but _NOT_ the files under
             $HOME/Desktop. 
-          * The KDE menu includes all files under $KDEDIR/share/applnk and
+          * The KDE menu includes all files under $KDE4DIR/share/applnk and
             $XDGDIR/applications
-          * Registered services includes all files under $KDEDIR/share/services. 
-          * Autostarting services include all files under $KDEDIR/share/autostart 
-            but _NOT_ the files under $KDEHOME/Autostart
+          * Registered services includes all files under $KDE4DIR/share/services. 
+          * Autostarting services include all files under $KDE4DIR/share/autostart 
+            but _NOT_ the files under $KDE4HOME/Autostart
 
           You probably also want to activate the following resource
           restictions:
@@ -432,7 +432,7 @@
           "services" - To restrict registered services.
           "autostart" - To restrict autostarting services.
           Otherwise users can still execute .desktop files by placing them
-          in e.g. $KDEHOME/share/kdesktop/Desktop
+          in e.g. $KDE4HOME/share/kdesktop/Desktop
 
 lineedit_text_completion
         - defines whether input lines should have the potential to remember 
@@ -553,14 +553,14 @@
 KDE3 Resource Restrictions
 ==========================
 Most KDE applications make use of additional resource files that are typically
-located in directories under $KDEDIR/share. By default KDE allows users to
+located in directories under $KDE4DIR/share. By default KDE allows users to
 override any of these resources by placing files in the same location 
-under $KDEHOME/share. For example, Konsole stores profiles under 
-$KDEDIR/share/apps/konsole and users can add additional profiles by 
-installing files in $KDEHOME/share/apps/konsole.
+under $KDE4HOME/share. For example, Konsole stores profiles under 
+$KDE4DIR/share/apps/konsole and users can add additional profiles by 
+installing files in $KDE4HOME/share/apps/konsole.
 
 KDE3 Resource Restrictions make it possible to restrict the lookup of files
-to directories outside of $KDEHOME only.
+to directories outside of $KDE4HOME only.
 
 The following resources are defined:
 
@@ -589,7 +589,7 @@
 To restrict resources the kdeglobals file should contain the
 group "[KDE Resource Restrictions]", each resource can then be restricted by
 adding "<resource>=false". E.g. to restrict the "wallpaper" resource to 
-$KDEDIR/share/wallpapers one would add:
+$KDE4DIR/share/wallpapers one would add:
 [KDE Resource Restrictions][$i]
 wallpaper=false
 
diff -ur kdelibs-3.92.0/kdecore/io/ktempdir.h kdelibs-3.92.0-kde4home/kdecore/io/ktempdir.h
--- kdelibs-3.92.0/kdecore/io/ktempdir.h	2007-05-03 10:43:25.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/io/ktempdir.h	2007-07-29 17:02:21.000000000 +0200
@@ -53,7 +53,7 @@
     * Creates a temporary directory with the name:
     *  \p \<directoryPrefix\>\<six letters\>
     *
-    * The default \p directoryPrefix is "$KDEHOME/tmp-$HOST/appname"
+    * The default \p directoryPrefix is "$KDE4HOME/tmp-$HOST/appname"
     * @param directoryPrefix the prefix of the file name, or
     *        QString() for the default value
     * @param mode the file permissions,
diff -ur kdelibs-3.92.0/kdecore/kdebugrc kdelibs-3.92.0-kde4home/kdecore/kdebugrc
--- kdelibs-3.92.0/kdecore/kdebugrc	2007-06-27 12:53:51.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/kdebugrc	2007-07-29 17:02:21.000000000 +0200
@@ -2,7 +2,7 @@
 # This allows to leave the kDebug* calls in the code, but still have them
 # disabled for most users.
 #
-# This file will be installed as $KDEDIR/share/config/kdebugrc
+# This file will be installed as $KDE4DIR/share/config/kdebugrc
 #
 # There are four levels of output: Info, Warn, Error and Fatal
 # corresponding to kDebug(), kdWarn(), kError(), kFatal()
diff -ur kdelibs-3.92.0/kdecore/kernel/kstandarddirs.cpp kdelibs-3.92.0-kde4home/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-3.92.0/kdecore/kernel/kstandarddirs.cpp	2007-07-26 12:40:59.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/kernel/kstandarddirs.cpp	2007-07-29 17:31:40.000000000 +0200
@@ -399,7 +399,7 @@
 {
     if (priority && !prefixes.isEmpty())
     {
-        // Add in front but behind $KDEHOME
+        // Add in front but behind $KDE4HOME
         QStringList::iterator it = prefixes.begin();
         it++;
         prefixes.insert(it, dir);
@@ -1531,8 +1531,8 @@
 
     QStringList kdedirList;
 
-    // begin KDEDIRS
-    QString kdedirs = readEnvPath("KDEDIRS");
+    // begin KDE4DIRS
+    QString kdedirs = readEnvPath("KDE4DIRS");
     if (!kdedirs.isEmpty())
     {
         tokenize(kdedirList, kdedirs, QString(QChar(KPATH_SEPARATOR)));
@@ -1550,7 +1550,7 @@
 
     // We treat root differently to prevent a "su" shell messing up the
     // file permissions in the user's home directory.
-    QString localKdeDir = readEnvPath(getuid() ? "KDEHOME" : "KDEROOTHOME");
+    QString localKdeDir = readEnvPath(getuid() ? "KDE4HOME" : "KDE4ROOTHOME");
     if (!localKdeDir.isEmpty())
     {
         if (localKdeDir[localKdeDir.length()-1] != '/')
@@ -1561,7 +1561,7 @@
 #ifdef Q_WS_MACX
         localKdeDir =  QDir::homePath() + "/Library/Preferences/KDE/";
 #else
-        localKdeDir =  QDir::homePath() + "/.kde/";
+        localKdeDir =  QDir::homePath() + "/.kde4/";
 #endif
     }
 
@@ -1578,7 +1578,7 @@
         const QString dir = KShell::tildeExpand(*it);
         addPrefix(dir);
     }
-    // end KDEDIRS
+    // end KDE4DIRS
 
     // begin XDG_CONFIG_XXX
     QStringList xdgdirList;
diff -ur kdelibs-3.92.0/kdecore/kernel/kstandarddirs.h kdelibs-3.92.0-kde4home/kdecore/kernel/kstandarddirs.h
--- kdelibs-3.92.0/kdecore/kernel/kstandarddirs.h	2007-07-26 12:40:59.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/kernel/kstandarddirs.h	2007-07-29 17:02:21.000000000 +0200
@@ -52,7 +52,7 @@
  * The main idea behind KStandardDirs is that there are several
  * toplevel prefixes below which the files lie. One of these prefixes is
  * the one where the user installed kdelibs, one is where the
- * application was installed, and one is <tt>$HOME/.kde</tt>, but there
+ * application was installed, and one is <tt>$HOME/.kde4</tt>, but there
  * may be even more. Under these prefixes there are several well
  * defined suffixes where specific resource types are to be found.
  * For example, for the resource type @c "html" the suffixes could be
@@ -62,7 +62,7 @@
  * To make the thing even more complex, it's also possible to register
  * absolute paths that KStandardDirs looks up after not finding anything
  * in the former steps. They can be useful if the user wants to provide
- * specific directories that aren't in his <tt>$HOME/.kde</tt> directory for,
+ * specific directories that aren't in his <tt>$HOME/.kde4</tt> directory for,
  * for example, icons.
  *
  * <b>Standard resources that kdelibs allocates are:</b>\n
@@ -110,16 +110,16 @@
  *
  * <b>KStandardDirs supports the following environment variables:</b>
  *
- * @li @c KDEDIRS - This may set an additional number of directory prefixes to
+ * @li @c KDE4DIRS - This may set an additional number of directory prefixes to
  *          search for resources. The directories should be separated
  *          by <tt>':'</tt>. The directories are searched in the order they are
  *          specified.
- * @li @c KDEHOME - The directory where changes are saved to. This directory is
- *          used to search for resources first. If @c KDEHOME is not
- *          specified it defaults to @c "$HOME/.kde"
- * @li @c KDEROOTHOME - Like KDEHOME, but used for the root user.
- *          If @c KDEROOTHOME is not set it defaults to the <tt>.kde</tt> directory in the
- *          home directory of root, usually @c "/root/.kde".
+ * @li @c KDE4HOME - The directory where changes are saved to. This directory is
+ *          used to search for resources first. If @c KDE4HOME is not
+ *          specified it defaults to @c "$HOME/.kde4"
+ * @li @c KDE4ROOTHOME - Like KDE4HOME, but used for the root user.
+ *          If @c KDE4ROOTHOME is not set it defaults to the <tt>.kde</tt> directory in the
+ *          home directory of root, usually @c "/root/.kde4".
  *          Note that the setting of @c $HOME is ignored in this case.
  *
  * @see KGlobalSettings
@@ -132,7 +132,7 @@
  *
  * 1) A resource file is read but is never written. A system
  *    default is supplied but the user can override this
- *    default in his local .kde directory:
+ *    default in his local .kde4 directory:
  *
  *    @code
  *    // Code example
@@ -143,7 +143,7 @@
  * 2) A resource file is read and written. If the user has no
  *    local version of the file the system default is used.
  *    The resource file is always written to the users local
- *    .kde directory.
+ *    .kde4 directory.
  *
  *    @code
  *    // Code example
@@ -159,7 +159,7 @@
  * 3) A resource file is read and written. No system default
  *    is used if the user has no local version of the file.
  *    The resource file is always written to the users local
- *    .kde directory.
+ *    .kde4 directory.
  *
  *    @code
  *    // Code example
@@ -195,7 +195,7 @@
      * Adds another search dir to front of the @p fsstnd list.
      *
      * @li When compiling kdelibs, the prefix is added to this.
-     * @li @c KDEDIRS is taken into account
+     * @li @c KDE4DIRS is taken into account
      * @li Additional dirs may be loaded from kdeglobals.
      *
      * @param dir The directory to append relative paths to.
@@ -304,7 +304,7 @@
      * for resources. So is a way to get the path to libkdecore.la
      * to findResource("lib", "libkdecore.la"). KStandardDirs will
      * then look into the subdir lib of all elements of all prefixes
-     * ($KDEDIRS) for a file libkdecore.la and return the path to
+     * ($KDE4DIRS) for a file libkdecore.la and return the path to
      * the first one it finds (e.g. /opt/kde/lib/libkdecore.la)
      *
      * @param type The type of the wanted resource
@@ -323,7 +323,7 @@
      *
      * E.g. by restricting the @c "wallpaper" resource, only system-wide
      * installed wallpapers will be found by this class. Wallpapers
-     * installed under the @c $KDEHOME directory will be ignored.
+     * installed under the @c $KDE4HOME directory will be ignored.
      *
      * @param type The type of the resource to check
      * @param relPath A relative path in the resource.
@@ -355,7 +355,7 @@
      * specified type and a relative path. So would
      * findDirs("apps", "Settings") return
      * @li /opt/kde/share/applnk/Settings/
-     * @li /home/joe/.kde/share/applnk/Settings/
+     * @li /home/joe/.kde4/share/applnk/Settings/
      *
      * Note that it appends @c / to the end of the directories,
      * so you can use this right away as directory names.
@@ -646,7 +646,7 @@
 
     /**
      * Returns the toplevel directory in which KStandardDirs
-     * will store things. Most likely <tt>$HOME/.kde</tt>.
+     * will store things. Most likely <tt>$HOME/.kde4</tt>.
      * Don't use this function if you can use locateLocal()
      * @return the toplevel directory
      */
@@ -776,7 +776,7 @@
 
     // Like their public counter parts but with an extra priority argument
     // If priority is true, the directory is added directly after
-    // $KDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
+    // $KDE4HOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
     void addPrefix( const QString& dir, bool priority );
     void addXdgConfigPrefix( const QString& dir, bool priority );
     void addXdgDataPrefix( const QString& dir, bool priority );
diff -ur kdelibs-3.92.0/kdecore/services/kservice.h kdelibs-3.92.0-kde4home/kdecore/services/kservice.h
--- kdelibs-3.92.0/kdecore/services/kservice.h	2007-06-27 12:53:47.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/services/kservice.h	2007-07-29 17:02:22.000000000 +0200
@@ -162,7 +162,7 @@
      * is stored.
      *
      * This is a relative path if the desktop entry was found in any
-     * of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop")
+     * of the locations pointed to by $KDE4DIRS (e.g. "Internet/kppp.desktop")
      * It is a full path if the desktop entry originates from another
      * location.
      * @return the path of the service's desktop file,
diff -ur kdelibs-3.92.0/kdecore/services/kservicetype.h kdelibs-3.92.0-kde4home/kdecore/services/kservicetype.h
--- kdelibs-3.92.0/kdecore/services/kservicetype.h	2007-05-03 10:43:12.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/services/kservicetype.h	2007-07-29 17:02:22.000000000 +0200
@@ -37,7 +37,7 @@
  * A service type is, well, a type of service, where a service is an application or plugin.
  * For instance, "KOfficeFilter", which is the type of all koffice filters, is a service type.
  * In order to discover services of a given type, using KServiceTypeTrader.
- * Service types are stored as desktop files in $KDEDIR/share/servicetypes.
+ * Service types are stored as desktop files in $KDE4DIR/share/servicetypes.
  * @see KService, KServiceTypeTrader
  */
 class KDECORE_EXPORT KServiceType : public KSycocaEntry
diff -ur kdelibs-3.92.0/kdecore/sycoca/ksycoca.h kdelibs-3.92.0-kde4home/kdecore/sycoca/ksycoca.h
--- kdelibs-3.92.0/kdecore/sycoca/ksycoca.h	2007-06-27 16:01:36.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/sycoca/ksycoca.h	2007-07-29 17:02:22.000000000 +0200
@@ -118,7 +118,7 @@
     * @internal - returns update signature of database
     *
     * Signature that keeps track of changes to
-    * $KDEDIR/share/services/update_ksycoca
+    * $KDE4DIR/share/services/update_ksycoca
     *
     * Touching this file causes the database to be recreated
     * from scratch.
diff -ur kdelibs-3.92.0/kdecore/tests/kconfigtest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/kconfigtest.cpp
--- kdelibs-3.92.0/kdecore/tests/kconfigtest.cpp	2007-07-26 12:41:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/kconfigtest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -131,7 +131,7 @@
 
 void KConfigTest::cleanupTestCase()
 {
-  QDir local = QDir::homePath() + "/.kde-unit-test/share/config";
+  QDir local = QDir::homePath() + "/.kde4-unit-test/share/config";
 
   foreach(const QString &file, local.entryList(QDir::Files))
     if(!local.remove(file))
diff -ur kdelibs-3.92.0/kdecore/tests/kdatetimetest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/kdatetimetest.cpp
--- kdelibs-3.92.0/kdecore/tests/kdatetimetest.cpp	2007-07-26 12:41:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/kdatetimetest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -40,7 +40,7 @@
 {
     cleanupTestCase();
 
-    mDataDir = QDir::homePath() + "/.kde-unit-test/kdatetimetest";
+    mDataDir = QDir::homePath() + "/.kde4-unit-test/kdatetimetest";
     QVERIFY(QDir().mkpath(mDataDir));
     QFile f;
     f.setFileName(mDataDir + QLatin1String("/zone.tab"));
@@ -77,12 +77,12 @@
     removeDir(QLatin1String("kdatetimetest/Europe"));
     removeDir(QLatin1String("kdatetimetest"));
     removeDir(QLatin1String("share/config"));
-    QDir().rmpath(QDir::homePath() + "/.kde-unit-test/share");
+    QDir().rmpath(QDir::homePath() + "/.kde4-unit-test/share");
 }
 
 void KDateTimeTest::removeDir(const QString &subdir)
 {
-    QDir local = QDir::homePath() + QLatin1String("/.kde-unit-test/") + subdir;
+    QDir local = QDir::homePath() + QLatin1String("/.kde4-unit-test/") + subdir;
     foreach(const QString &file, local.entryList(QDir::Files))
         if(!local.remove(file))
             qWarning("%s: removing failed", qPrintable( file ));
diff -ur kdelibs-3.92.0/kdecore/tests/klocaletest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/klocaletest.cpp
--- kdelibs-3.92.0/kdecore/tests/klocaletest.cpp	2007-07-26 12:41:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/klocaletest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -116,7 +116,7 @@
 	QDate date;
 
         // Ensure that user configuration isn't messing with us;
-        // shouldn't happen though, since qtest_kde.h sets KDEHOME.
+        // shouldn't happen though, since qtest_kde.h sets KDE4HOME.
         QCOMPARE(locale.dateFormat(), QString("%A %d %B %Y"));
 
 	date.setYMD(2002, 5, 3);
@@ -201,7 +201,7 @@
 	QDateTime qdt;
 
         // Ensure that user configuration isn't messing with us;
-        // shouldn't happen though, since qtest_kde.h sets KDEHOME.
+        // shouldn't happen though, since qtest_kde.h sets KDE4HOME.
         QCOMPARE(locale.dateFormat(), QString("%A %d %B %Y"));
 
 	qdt = QDateTime(QDate(2002, 5, 3), QTime(10, 20, 30));
diff -ur kdelibs-3.92.0/kdecore/tests/kmimetypetest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/kmimetypetest.cpp
--- kdelibs-3.92.0/kdecore/tests/kmimetypetest.cpp	2007-07-26 12:41:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/kmimetypetest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -69,7 +69,7 @@
     }
 
     if ( mustUpdateKSycoca ) {
-        // Update ksycoca in ~/.kde-unit-test after creating the above
+        // Update ksycoca in ~/.kde4-unit-test after creating the above
         QProcess::execute( KGlobal::dirs()->findExe(KBUILDSYCOCA_EXENAME), QStringList() << "--noincremental" );
     }
 }
diff -ur kdelibs-3.92.0/kdecore/tests/kstandarddirstest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-3.92.0/kdecore/tests/kstandarddirstest.cpp	2007-06-27 12:53:48.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/kstandarddirstest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -33,13 +33,13 @@
 {
     const QString configLocal = KStandardDirs::locateLocal( "config", "ksomethingrc" );
     // KStandardDirs resolves symlinks, so we must compare with canonicalPath()
-    QCOMPARE( configLocal, QDir::home().canonicalPath() + "/.kde-unit-test/share/config/ksomethingrc" );
+    QCOMPARE( configLocal, QDir::home().canonicalPath() + "/.kde4-unit-test/share/config/ksomethingrc" );
 }
 
 void KStandarddirsTest::testSaveLocation()
 {
     const QString saveLoc = KGlobal::dirs()->saveLocation( "appdata" );
-    QCOMPARE( saveLoc, QDir::home().canonicalPath() + "/.kde-unit-test/share/apps/qttest/" );
+    QCOMPARE( saveLoc, QDir::home().canonicalPath() + "/.kde4-unit-test/share/apps/qttest/" );
 }
 
 void KStandarddirsTest::testAppData()
@@ -47,12 +47,12 @@
     // In addition to testSaveLocation(), we want to also check other KComponentDatas
     KComponentData cData("foo");
     const QString fooAppData = cData.dirs()->saveLocation( "appdata" );
-    QCOMPARE( fooAppData, QDir::home().canonicalPath() + "/.kde-unit-test/share/apps/foo/" );
+    QCOMPARE( fooAppData, QDir::home().canonicalPath() + "/.kde4-unit-test/share/apps/foo/" );
 }
 
 static bool isKdelibsInstalled()
 {
-    // If there's only one dir, it's the local one (~/.kde-unit-test/share/apps/),
+    // If there's only one dir, it's the local one (~/.kde4-unit-test/share/apps/),
     // meaning that kdelibs wasn't installed (or we don't find where, the environment isn't right).
     return KGlobal::dirs()->resourceDirs( "data" ).count() > 1;
 }
diff -ur kdelibs-3.92.0/kdecore/tests/ktimezonestest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/ktimezonestest.cpp
--- kdelibs-3.92.0/kdecore/tests/ktimezonestest.cpp	2007-07-26 12:41:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/ktimezonestest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -31,7 +31,7 @@
 {
     cleanupTestCase();
 
-    mDataDir = QDir::homePath() + "/.kde-unit-test/ktimezonestest";
+    mDataDir = QDir::homePath() + "/.kde4-unit-test/ktimezonestest";
     QVERIFY(QDir().mkpath(mDataDir));
     QFile f;
     f.setFileName(mDataDir + QLatin1String("/zone.tab"));
@@ -66,12 +66,12 @@
     removeDir(QLatin1String("ktimezonestest/Europe"));
     removeDir(QLatin1String("ktimezonestest"));
     removeDir(QLatin1String("share/config"));
-    QDir().rmpath(QDir::homePath() + "/.kde-unit-test/share");
+    QDir().rmpath(QDir::homePath() + "/.kde4-unit-test/share");
 }
 
 void KTimeZonesTest::removeDir(const QString &subdir)
 {
-    QDir local = QDir::homePath() + QLatin1String("/.kde-unit-test/") + subdir;
+    QDir local = QDir::homePath() + QLatin1String("/.kde4-unit-test/") + subdir;
     foreach(const QString &file, local.entryList(QDir::Files))
         if(!local.remove(file))
             qWarning("%s: removing failed", qPrintable( file ));
diff -ur kdelibs-3.92.0/kdecore/tests/kurltest.cpp kdelibs-3.92.0-kde4home/kdecore/tests/kurltest.cpp
--- kdelibs-3.92.0/kdecore/tests/kurltest.cpp	2007-06-27 12:53:48.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/tests/kurltest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -85,7 +85,7 @@
   url1 = "KDE";
   QVERIFY( url1.isValid() ); // KDE3 difference: was FALSE
 
-  url1 = "$HOME/.kde/share/config";
+  url1 = "$HOME/.kde4/share/config";
   QVERIFY( url1.isValid() ); // KDE3 difference: was FALSE
 }
 
diff -ur kdelibs-3.92.0/kdecore/util/qtest_kde.h kdelibs-3.92.0-kde4home/kdecore/util/qtest_kde.h
--- kdelibs-3.92.0/kdecore/util/qtest_kde.h	2007-07-26 12:41:18.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdecore/util/qtest_kde.h	2007-07-29 17:02:22.000000000 +0200
@@ -77,7 +77,7 @@
 int main(int argc, char *argv[]) \
 { \
     setenv("LC_ALL", "C", 1); \
-    setenv("KDEHOME", QFile::encodeName( QDir::homePath() + "/.kde-unit-test" ), 1); \
+    setenv("KDE4HOME", QFile::encodeName( QDir::homePath() + "/.kde4-unit-test" ), 1); \
     KAboutData aboutData( componentName, 0, ki18n("qttest"), "version" );  \
     KDEMainFlags mainFlags = flags;                         \
     KComponentData cData(&aboutData); \
@@ -118,7 +118,7 @@
 int main(int argc, char *argv[]) \
 { \
     setenv("LC_ALL", "C", 1); \
-    setenv("KDEHOME", QFile::encodeName( QDir::homePath() + "/.kde-unit-test" ), 1); \
+    setenv("KDE4HOME", QFile::encodeName( QDir::homePath() + "/.kde4-unit-test" ), 1); \
     KAboutData aboutData( "qttest", 0, ki18n("qttest"), "version" );  \
     KComponentData cData(&aboutData); \
     QCoreApplication app( argc, argv ); \
diff -ur kdelibs-3.92.0/kded/HOWTO kdelibs-3.92.0-kde4home/kded/HOWTO
--- kdelibs-3.92.0/kded/HOWTO	2006-10-26 04:27:31.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kded/HOWTO	2007-07-29 17:02:22.000000000 +0200
@@ -9,7 +9,7 @@
 
 It also needs to provide a desktop file that defines the service provided by
 the module. The desktop file needs to be installed under 
-$KDEDIR/share/services/kded/. The name of the desktop file must match with 
+$KDE4DIR/share/services/kded/. The name of the desktop file must match with 
 the name of the DCOP object that is implemented by the module.
 
 The desktop file needs to define the library in which the module is 
diff -ur kdelibs-3.92.0/kded/kbuildsycoca.cpp kdelibs-3.92.0-kde4home/kded/kbuildsycoca.cpp
--- kdelibs-3.92.0/kded/kbuildsycoca.cpp	2007-07-26 12:42:38.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kded/kbuildsycoca.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -568,7 +568,7 @@
       (*m_str) << aOffset;
    }
    (*m_str) << (qint32) 0; // No more factories.
-   // Write KDEDIRS
+   // Write KDE4DIRS
    (*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
    (*m_str) << newTimestamp;
    (*m_str) << KGlobal::locale()->language();
@@ -729,8 +729,8 @@
 
    if (bGlobalDatabase)
    {
-     setenv("KDEHOME", "-", 1);
-     setenv("KDEROOTHOME", "-", 1);
+     setenv("KDE4HOME", "-", 1);
+     setenv("KDE4ROOTHOME", "-", 1);
    }
 
 #ifdef KBUILDSYCOCA_GUI
diff -ur kdelibs-3.92.0/kded/kded.cpp kdelibs-3.92.0-kde4home/kded/kded.cpp
--- kdelibs-3.92.0/kded/kded.cpp	2007-07-26 12:42:38.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kded/kded.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -178,7 +178,7 @@
 {
      m_dontLoad.clear();
      KSharedConfig::Ptr config = KGlobal::config();
-     bool kde_running = !( getenv( "KDE_FULL_SESSION" ) == NULL || getenv( "KDE_FULL_SESSION" )[ 0 ] == '\0' );
+     bool kde_running = !( getenv( "KDE4_FULL_SESSION" ) == NULL || getenv( "KDE4_FULL_SESSION" )[ 0 ] == '\0' );
     // not the same user like the one running the session (most likely we're run via sudo or something)
     if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid())
         kde_running = false;
diff -ur kdelibs-3.92.0/kded/README.kded kdelibs-3.92.0-kde4home/kded/README.kded
--- kdelibs-3.92.0/kded/README.kded	2006-10-26 04:27:31.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kded/README.kded	2007-07-29 17:02:22.000000000 +0200
@@ -80,7 +80,7 @@
 the CPU load and/or network traffic. Shorter intervals are not recommended.
 
 Please note that in previous versions of KDE these options where listed in 
-the kderc file.
+the kde4rc file.
 
 Example kdeglobals fragment:
 
diff -ur kdelibs-3.92.0/kded/test/kmimefileparsertest.cpp kdelibs-3.92.0-kde4home/kded/test/kmimefileparsertest.cpp
--- kdelibs-3.92.0/kded/test/kmimefileparsertest.cpp	2007-06-27 12:56:20.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kded/test/kmimefileparsertest.cpp	2007-07-29 17:02:22.000000000 +0200
@@ -52,7 +52,7 @@
 void KMimeFileParserTest::initTestCase()
 {
     if ( !KSycoca::isAvailable() ) {
-        // Create ksycoca4 in ~/.kde-unit-test
+        // Create ksycoca4 in ~/.kde4-unit-test
         QProcess::execute( KGlobal::dirs()->findExe(KBUILDSYCOCA_EXENAME), QStringList() << "--noincremental" );
     }
     // Create factory on the heap and don't delete it.
diff -ur kdelibs-3.92.0/kdesu/client.cpp kdelibs-3.92.0-kde4home/kdesu/client.cpp
--- kdelibs-3.92.0/kdesu/client.cpp	2007-06-27 12:53:43.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdesu/client.cpp	2007-07-29 17:02:23.000000000 +0200
@@ -387,7 +387,7 @@
 static QString findDaemon()
 {
     QString daemon = KStandardDirs::locate("bin", "kdesud");
-    if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH
+    if (daemon.isEmpty()) // if not in KDE4DIRS, rely on PATH
 	daemon = KStandardDirs::findExe("kdesud");
 
     if (daemon.isEmpty())
diff -ur kdelibs-3.92.0/kdesu/process.cpp kdelibs-3.92.0-kde4home/kdesu/process.cpp
--- kdelibs-3.92.0/kdesu/process.cpp	2007-07-26 12:40:51.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdesu/process.cpp	2007-07-29 17:02:23.000000000 +0200
@@ -317,7 +317,7 @@
     {
         putenv(const_cast<char *>(d->env.at(i).constData()));
     }
-    unsetenv("KDE_FULL_SESSION");
+    unsetenv("KDE4_FULL_SESSION");
 
     // set temporarily LC_ALL to C, for su (to be able to parse "Password:")
     const char* old_lc_all = getenv( "LC_ALL" );
diff -ur kdelibs-3.92.0/kdeui/dialogs/kedittoolbar.h kdelibs-3.92.0-kde4home/kdeui/dialogs/kedittoolbar.h
--- kdelibs-3.92.0/kdeui/dialogs/kedittoolbar.h	2007-06-27 12:56:34.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/dialogs/kedittoolbar.h	2007-07-29 17:02:23.000000000 +0200
@@ -331,7 +331,7 @@
 
   /**
    * Save any changes the user made.  The file will be in the user's
-   * local directory (usually $HOME/.kde/share/apps/\<appname\>).  The
+   * local directory (usually $HOME/.kde4/share/apps/\<appname\>).  The
    * filename will be the one specified in the constructor.. or the
    * made up one if the filename was NULL.
    *
diff -ur kdelibs-3.92.0/kdeui/kernel/kapplication_mac.cpp kdelibs-3.92.0-kde4home/kdeui/kernel/kapplication_mac.cpp
--- kdelibs-3.92.0/kdeui/kernel/kapplication_mac.cpp	2007-07-26 12:43:01.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/kernel/kapplication_mac.cpp	2007-07-29 17:02:23.000000000 +0200
@@ -42,7 +42,7 @@
 
     /* temporary until we implement autolaunch for dbus  on Mac OS X */
     QString dbusSession;
-    QStringList path = QFile::decodeName(getenv("KDEDIRS")).split(':').replaceInStrings(QRegExp("$"), "/bin");
+    QStringList path = QFile::decodeName(getenv("KDE4DIRS")).split(':').replaceInStrings(QRegExp("$"), "/bin");
     path << QFile::decodeName(getenv("PATH")).split(':') << "/opt/kde4-deps/bin" << "/sw/bin" << "/usr/local/bin";
     for (int i = 0; i < path.size(); ++i) {
         // QString testSession = QString(newPath.at(i)).append("/start-session-bus.sh");
diff -ur kdelibs-3.92.0/kdeui/tests/kconfig_compiler/test9main.cpp kdelibs-3.92.0-kde4home/kdeui/tests/kconfig_compiler/test9main.cpp
--- kdelibs-3.92.0/kdeui/tests/kconfig_compiler/test9main.cpp	2007-05-03 10:46:22.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/tests/kconfig_compiler/test9main.cpp	2007-07-29 17:02:23.000000000 +0200
@@ -33,7 +33,7 @@
 
   // add another path
   QStringList newlist;
-  myPathsList2 << QDir::homePath() + QString::fromLatin1("/.kde");
+  myPathsList2 << QDir::homePath() + QString::fromLatin1("/.kde4");
   kWarning() << myPathsList2 << endl;
 
   t->setMyPathsList2(myPathsList2);
diff -ur kdelibs-3.92.0/kdeui/tests/kconfigguitest.cpp kdelibs-3.92.0-kde4home/kdeui/tests/kconfigguitest.cpp
--- kdelibs-3.92.0/kdeui/tests/kconfigguitest.cpp	2007-05-03 10:46:23.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/tests/kconfigguitest.cpp	2007-07-29 17:02:23.000000000 +0200
@@ -55,7 +55,7 @@
 
 void KConfigTest::cleanupTestCase()
 {
-  QDir local = QDir::homePath() + "/.kde-unit-test/share/config";
+  QDir local = QDir::homePath() + "/.kde4-unit-test/share/config";
 
   foreach(const QString &file, local.entryList(QDir::Files))
     if(!local.remove(file))
diff -ur kdelibs-3.92.0/kdeui/tests/testqtargs.cpp kdelibs-3.92.0-kde4home/kdeui/tests/testqtargs.cpp
--- kdelibs-3.92.0/kdeui/tests/testqtargs.cpp	2007-07-26 12:43:08.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/tests/testqtargs.cpp	2007-07-29 17:02:24.000000000 +0200
@@ -4,8 +4,8 @@
   I used the following compile options:
 
   g++ -g -Wall -o testqtargs testqtargs.cpp  -I/usr/X11R6/include \
-  -I/opt/qt3/include -I/opt/kde3/include -L/usr/X11R6/lib -L/opt/qt3/lib \
-  -L/opt/kde3/lib -lqt -lkdecore
+  -I/opt/qt3/include -I/opt/kde4/include -L/usr/X11R6/lib -L/opt/qt3/lib \
+  -L/opt/kde4/lib -lqt -lkdecore
 
   if invoked like this ./testqtargs --bg blue --caption something --hello hi
 
diff -ur kdelibs-3.92.0/kdeui/util/kcrash.cpp kdelibs-3.92.0-kde4home/kdeui/util/kcrash.cpp
--- kdelibs-3.92.0/kdeui/util/kcrash.cpp	2007-07-26 12:43:23.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/util/kcrash.cpp	2007-07-29 17:02:24.000000000 +0200
@@ -481,14 +481,14 @@
 #define MAX_SOCK_FILE 255
   char sock_file[MAX_SOCK_FILE + 1];
   const char *home_dir = getenv("HOME");
-  const char *kde_home = getenv("KDEHOME");
+  const char *kde_home = getenv("KDE4HOME");
   char *display;
 
   sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;
 
   if (!kde_home || !kde_home[0])
   {
-     kde_home = "~/.kde/";
+     kde_home = "~/.kde4/";
   }
 
   if (kde_home[0] == '~')
diff -ur kdelibs-3.92.0/kdeui/util/knotification.h kdelibs-3.92.0-kde4home/kdeui/util/knotification.h
--- kdelibs-3.92.0/kdeui/util/knotification.h	2007-05-03 10:46:33.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdeui/util/knotification.h	2007-07-29 17:02:24.000000000 +0200
@@ -58,7 +58,7 @@
  * 
  * \section file The global config file
  * On installation, there should be a file called 
- *  <em>$KDEDIR/share/apps/appname/appname.notifyrc</em>
+ *  <em>$KDE4DIR/share/apps/appname/appname.notifyrc</em>
  *  This file contains  mainly 3 parts
  *   <ol><li>\ref global "Global information"</li>
  *       <li>\ref context "Context information"</li>
diff -ur kdelibs-3.92.0/kdewidgets/README kdelibs-3.92.0-kde4home/kdewidgets/README
--- kdelibs-3.92.0/kdewidgets/README	2007-05-03 10:43:08.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdewidgets/README	2007-07-29 17:02:24.000000000 +0200
@@ -7,7 +7,7 @@
 
 This directory contains KDE custom widgets for Qt Designer which comes with
 Qt 4. Just make sure that QT_PLUGIN_PATH includes
-$KDEDIR/lib/kde4/plugins . With the KDE build system nothing special 
+$KDE4DIR/lib/kde4/plugins . With the KDE build system nothing special 
 (i.e. editing the plugin path) is needed, as uic will automatically be
 called with -L <path to the kdewidgets plugin> .
 
diff -ur kdelibs-3.92.0/kdoctools/kio_help.upd kdelibs-3.92.0-kde4home/kdoctools/kio_help.upd
--- kdelibs-3.92.0/kdoctools/kio_help.upd	2006-10-26 04:27:28.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kdoctools/kio_help.upd	2007-07-29 17:02:26.000000000 +0200
@@ -1,3 +1,3 @@
-# Move kio_help cache from $KDEHOME/share/apps/kio_help/cache to $KDEHOME/cache-$HOST/kio_help
+# Move kio_help cache from $KDE4HOME/share/apps/kio_help/cache to $KDE4HOME/cache-$HOST/kio_help
 Id=kde3_2
 Script=move_kio_help_cache.sh,sh
diff -ur kdelibs-3.92.0/khtml/BUILDING-TESTREGRESSION kdelibs-3.92.0-kde4home/khtml/BUILDING-TESTREGRESSION
--- kdelibs-3.92.0/khtml/BUILDING-TESTREGRESSION	2007-06-27 12:54:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/khtml/BUILDING-TESTREGRESSION	2007-07-29 17:02:26.000000000 +0200
@@ -8,7 +8,7 @@
 make sure to do "make confclean" first.
 3. Build & Install Qt
 4. Configure kdelibs:
-cmake /path/to/kdelibs-src/ -DCMAKE_INSTALL_PREFIX=$KDEDIR -DCMAKE_BUILD_TYPE=debug  -DKDE4_BUILD_TESTREGRESSION=true
+cmake /path/to/kdelibs-src/ -DCMAKE_INSTALL_PREFIX=$KDE4DIR -DCMAKE_BUILD_TYPE=debug  -DKDE4_BUILD_TESTREGRESSION=true
 Obviously, you may use whatever prefix and other flags you want, but you must pass 
 -DKDE4_BUILD_TESTREGRESSION=true and must use a debug or debugfull build type.
 5. Build & Install kdelibs
diff -ur kdelibs-3.92.0/khtml/java/kjavaprocess.h kdelibs-3.92.0-kde4home/khtml/java/kjavaprocess.h
--- kdelibs-3.92.0/khtml/java/kjavaprocess.h	2007-06-27 12:53:58.000000000 +0200
+++ kdelibs-3.92.0-kde4home/khtml/java/kjavaprocess.h	2007-07-29 17:02:26.000000000 +0200
@@ -75,7 +75,7 @@
 
     /**
      * This will set the classpath the Java process will use.  It's used as a the
-     * -cp command line option.  It adds every jar file stored in $KDEDIRS/share/apps/kjava/
+     * -cp command line option.  It adds every jar file stored in $KDE4DIRS/share/apps/kjava/
      * to the classpath, and then adds the $CLASSPATH environmental variable.  This allows
      * users to simply drop the JSSE (Java Secure Sockets Extension classes into that directory
      * without having to modify the jvm configuration files.
diff -ur kdelibs-3.92.0/khtml/test_regression.cpp kdelibs-3.92.0-kde4home/khtml/test_regression.cpp
--- kdelibs-3.92.0/khtml/test_regression.cpp	2007-07-26 12:41:31.000000000 +0200
+++ kdelibs-3.92.0-kde4home/khtml/test_regression.cpp	2007-07-29 17:02:27.000000000 +0200
@@ -577,7 +577,7 @@
 
     QString kh("/var/tmp/%1_non_existant");
     kh = kh.arg( pw->pw_name );
-    setenv( "KDEHOME", kh.toLatin1(), 1 );
+    setenv( "KDE4HOME", kh.toLatin1(), 1 );
     setenv( "LC_ALL", "C", 1 );
     setenv( "LANG", "C", 1 );
 
diff -ur kdelibs-3.92.0/kinit/kinit.cpp kdelibs-3.92.0-kde4home/kinit/kinit.cpp
--- kdelibs-3.92.0/kinit/kinit.cpp	2007-07-26 12:40:24.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/kinit.cpp	2007-07-29 17:02:27.000000000 +0200
@@ -1702,7 +1702,7 @@
    if (keep_running)
    {
       /*
-       * Create ~/.kde/tmp-<hostname>/kdeinit4-<display> socket for incoming wrapper
+       * Create ~/.kde4/tmp-<hostname>/kdeinit4-<display> socket for incoming wrapper
        * requests.
        */
       init_kdeinit_socket();
diff -ur kdelibs-3.92.0/kinit/kioslave.cpp kdelibs-3.92.0-kde4home/kinit/kioslave.cpp
--- kdelibs-3.92.0/kinit/kioslave.cpp	2007-06-27 12:53:15.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/kioslave.cpp	2007-07-29 17:02:27.000000000 +0200
@@ -62,12 +62,12 @@
      if (!lib.load() || !lib.isLoaded() )
      {
 #ifdef Q_WS_WIN
-        if (!getenv("KDEDIRS")) {
-          qDebug("not able to find '%s' because KDEDIRS environment variable is not set.\n"
-                 "Set KDEDIRS to the KDE installation root dir and restart klauncher to fix this problem.",libpath.data());
+        if (!getenv("KDE4DIRS")) {
+          qDebug("not able to find '%s' because KDE4DIRS environment variable is not set.\n"
+                 "Set KDE4DIRS to the KDE installation root dir and restart klauncher to fix this problem.",libpath.data());
           exit(1);
         }
-        QString pathes = getenv("KDEDIRS");
+        QString pathes = getenv("KDE4DIRS");
         QStringList pathlist = pathes.split(";");
         for (int i = 0; i < pathlist.size(); ++i) 
         {
diff -ur kdelibs-3.92.0/kinit/lnusertemp.c kdelibs-3.92.0-kde4home/kinit/lnusertemp.c
--- kdelibs-3.92.0/kinit/lnusertemp.c	2007-06-27 12:53:14.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/lnusertemp.c	2007-07-29 17:02:27.000000000 +0200
@@ -104,7 +104,7 @@
   char tmp_buf[PATH_MAX+1];
   int uid = getuid();
   const char *home_dir = getenv("HOME");
-  const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
+  const char *kde_home = uid ? getenv("KDE4HOME") : getenv("KDE4ROOTHOME");
   int result;
   struct stat stat_buf;
 
@@ -123,7 +123,7 @@
 
   if (!kde_home || !kde_home[0])
   {
-     kde_home = "~/.kde/";
+     kde_home = "~/.kde4/";
   }
 
   if (kde_home[0] == '~')
@@ -178,7 +178,7 @@
   result = lstat(kde_tmp_dir, &stat_buf);
   if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
   {
-     /* $KDEHOME/tmp is a normal directory. Do nothing. */
+     /* $KDE4HOME/tmp is a normal directory. Do nothing. */
 #ifndef NDEBUG
      fprintf(stderr,"Directory \"%s\" already exists.\n", kde_tmp_dir);
 #endif
diff -ur kdelibs-3.92.0/kinit/README.autostart kdelibs-3.92.0-kde4home/kinit/README.autostart
--- kdelibs-3.92.0/kinit/README.autostart	2006-10-26 04:25:13.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/README.autostart	2007-07-29 17:02:27.000000000 +0200
@@ -12,7 +12,7 @@
 in either autostart phase 1 or phase 2. Autostart phase 1 is the original
 autostart phase; phase 2 was introduced in KDE 3. To run in either phase, an
 application's .desktop file must be located in a KDE autostart directory such
-as $KDEDIR/share/autostart or $KDEHOME/share/autostart. The .desktop file can
+as $KDE4DIR/share/autostart or $KDE4HOME/share/autostart. The .desktop file can
 contain the following optional entries to control its autostart:
 
    X-KDE-autostart-condition = rcfile:group:entry:default
diff -ur kdelibs-3.92.0/kinit/README.DCOP kdelibs-3.92.0-kde4home/kinit/README.DCOP
--- kdelibs-3.92.0/kinit/README.DCOP	2006-10-26 04:25:13.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/README.DCOP	2007-07-29 17:02:27.000000000 +0200
@@ -34,8 +34,8 @@
  * Start a service by desktop path.
  *
  * 'serviceName' refers to a desktop file describing the service.
- * This may be an absolute path or a path relative to $KDEDIRS/applnk
- * and/or $KDEDIRS/services
+ * This may be an absolute path or a path relative to $KDE4DIRS/applnk
+ * and/or $KDE4DIRS/services
  * E.g. it should have the form "Applications/korganizer.desktop" or
  * "/opt/kde/share/applnk/Applications/korganizer.desktop".
  *
@@ -57,8 +57,8 @@
  * Start a service by desktop name.
  *
  * 'serviceName' refers to a desktop file describing the service.
- * The service is looked up anywhere in $KDEDIR/applnk and/or
- * $KDEDIR/services.
+ * The service is looked up anywhere in $KDE4DIR/applnk and/or
+ * $KDE4DIR/services.
  * E.g. it should have the form "korganizer".
  *
  * 'url', if not empty, will be passed to the service as
diff -ur kdelibs-3.92.0/kinit/README.wrapper kdelibs-3.92.0-kde4home/kinit/README.wrapper
--- kdelibs-3.92.0/kinit/README.wrapper	2007-05-03 10:42:59.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/README.wrapper	2007-07-29 17:02:27.000000000 +0200
@@ -3,8 +3,8 @@
 kdeinit4_wrapper, kshell4 and kwrapper4 are programs that
 start programs via kdeinit4.
 
-E.g. You can make a symbolic link from $KDEDIR/bin/konsole to 
-$KDEDIR/bin/kdeinit4_wrapper. Typing 'konsole' on the command line 
+E.g. You can make a symbolic link from $KDE4DIR/bin/konsole to 
+$KDE4DIR/bin/kdeinit4_wrapper. Typing 'konsole' on the command line 
 will then start 'konsole.so' through kdeinit instead.
 
 kdeinit4_wrapper is the simplest form, it only passes the program
diff -ur kdelibs-3.92.0/kinit/wrapper.c kdelibs-3.92.0-kde4home/kinit/wrapper.c
--- kdelibs-3.92.0/kinit/wrapper.c	2007-06-27 12:53:15.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kinit/wrapper.c	2007-07-29 17:02:27.000000000 +0200
@@ -135,14 +135,14 @@
 #define MAX_SOCK_FILE 255
   char sock_file[MAX_SOCK_FILE + 1];
   const char *home_dir = getenv("HOME");
-  const char *kde_home = getenv("KDEHOME");
+  const char *kde_home = getenv("KDE4HOME");
   char *display;
 
   sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;
 
   if (!kde_home || !kde_home[0])
   {
-     kde_home = "~/.kde/";
+     kde_home = "~/.kde4/";
   }
 
   if (kde_home[0] == '~')
diff -ur kdelibs-3.92.0/kio/bookmarks/kbookmarkmanager.h kdelibs-3.92.0-kde4home/kio/bookmarks/kbookmarkmanager.h
--- kdelibs-3.92.0/kio/bookmarks/kbookmarkmanager.h	2007-07-26 12:40:34.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kio/bookmarks/kbookmarkmanager.h	2007-07-29 17:02:27.000000000 +0200
@@ -67,7 +67,7 @@
      * called.
      *
      * @param bookmarksFile full path to the bookmarks file,
-     * Use ~/.kde/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
+     * Use ~/.kde4/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
      *
      * @param dbusObjectName a unique name that represents this bookmark collection,
      * usually your kinstance (e.g. kapplication) name. This is "konqueror" for the
@@ -189,7 +189,7 @@
      * instantiate it before this method is ever called.
      *
      * @param bookmarksFile full path to the bookmarks file,
-     * Use ~/.kde/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
+     * Use ~/.kde4/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
      *
      * @param dbusObjectName a unique name that represents this bookmark collection,
      * usually your kinstance (e.g. kapplication) name. This is "konqueror" for the
diff -ur kdelibs-3.92.0/kio/kfile/ChangeLog kdelibs-3.92.0-kde4home/kio/kfile/ChangeLog
--- kdelibs-3.92.0/kio/kfile/ChangeLog	2007-05-03 10:43:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kio/kfile/ChangeLog	2007-07-29 17:02:27.000000000 +0200
@@ -643,7 +643,7 @@
 Sun Feb 15 23:13:47 1998 Richard Moore <rich@kde.org>
 	
 	* More work on the bookmarks - they should work properly now, you
-	must create the directory ~/.kde/share/apps/kdeui to store the
+	must create the directory ~/.kde4/share/apps/kdeui to store the
 	bookmarks in.
 	
 	* Regenerated docs
diff -ur kdelibs-3.92.0/kio/kfile/kpropertiesdialog.cpp kdelibs-3.92.0-kde4home/kio/kfile/kpropertiesdialog.cpp
--- kdelibs-3.92.0/kio/kfile/kpropertiesdialog.cpp	2007-07-26 12:40:36.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kio/kfile/kpropertiesdialog.cpp	2007-07-29 17:34:33.000000000 +0200
@@ -1409,7 +1409,7 @@
   assert( properties->item() );
   assert( !properties->item()->url().isEmpty() );
 
-  // Save the file where we can -> usually in ~/.kde/...
+  // Save the file where we can -> usually in ~/.kde4/...
   if (KBindingPropsPlugin::supports(properties->items()) && !d->m_sRelativePath.isEmpty())
   {
     KUrl newURL;
diff -ur kdelibs-3.92.0/kio/kssl/kopenssl.cpp kdelibs-3.92.0-kde4home/kio/kssl/kopenssl.cpp
--- kdelibs-3.92.0/kio/kssl/kopenssl.cpp	2007-06-27 12:53:34.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kio/kssl/kopenssl.cpp	2007-07-29 17:02:28.000000000 +0200
@@ -307,7 +307,7 @@
    		<< "/usr/local/bin"
    		<< "/usr/local/openssl/bin"
    		<< "/opt/openssl/bin"
-   		<< "/opt/kde3/bin"
+   		<< "/opt/kde4/bin"
    		<< "";
 
    libnamess << "cygssl-0.9.7.dll"
diff -ur kdelibs-3.92.0/kio/tests/jobtest.cpp kdelibs-3.92.0-kde4home/kio/tests/jobtest.cpp
--- kdelibs-3.92.0/kio/tests/jobtest.cpp	2007-07-26 12:40:41.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kio/tests/jobtest.cpp	2007-07-29 17:02:28.000000000 +0200
@@ -53,7 +53,7 @@
 
 static QString homeTmpDir()
 {
-    return QFile::decodeName( getenv( "KDEHOME" ) ) + "/jobtest/";
+    return QFile::decodeName( getenv( "KDE4HOME" ) ) + "/jobtest/";
 }
 
 static QString otherTmpDir()
@@ -69,15 +69,15 @@
 static KUrl systemTmpDir()
 {
 #ifdef Q_WS_WIN
-    return KUrl( "system:" + QDir::homePath() + "/.kde-unit-test/jobtest-system/" );
+    return KUrl( "system:" + QDir::homePath() + "/.kde4-unit-test/jobtest-system/" );
 #else
-    return KUrl( "system:/home/.kde-unit-test/jobtest-system/" );
+    return KUrl( "system:/home/.kde4-unit-test/jobtest-system/" );
 #endif
 }
 
 static QString realSystemPath()
 {
-    return QFile::decodeName( getenv( "KDEHOME" ) ) + "/jobtest-system/";
+    return QFile::decodeName( getenv( "KDE4HOME" ) ) + "/jobtest-system/";
 }
 
 void JobTest::initTestCase()
diff -ur kdelibs-3.92.0/kio/tests/ksycocatest.cpp kdelibs-3.92.0-kde4home/kio/tests/ksycocatest.cpp
--- kdelibs-3.92.0/kio/tests/ksycocatest.cpp	2007-07-26 12:40:41.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kio/tests/ksycocatest.cpp	2007-07-29 17:02:28.000000000 +0200
@@ -52,7 +52,7 @@
 // should be moved to kmimetypetest, and then kmimetypetest can be renamed ksycocatest.
 //
 // But it's still convenient to have an interactive test program, for checking things
-// in the user's ksycoca instead of checking them in the safe .kde-unit-test one.
+// in the user's ksycoca instead of checking them in the safe .kde4-unit-test one.
 //
 int main(int argc, char *argv[])
 {
diff -ur kdelibs-3.92.0/knewstuff/doc/tutorial.txt kdelibs-3.92.0-kde4home/knewstuff/doc/tutorial.txt
--- kdelibs-3.92.0/knewstuff/doc/tutorial.txt	2007-06-27 12:53:43.000000000 +0200
+++ kdelibs-3.92.0-kde4home/knewstuff/doc/tutorial.txt	2007-07-29 17:02:29.000000000 +0200
@@ -113,8 +113,8 @@
 
 # # Where to install? Exactly one of the lines below
 # # Note: if all three are missing, entry is considered remote resource
-# StandardResource=wallpapers # becomes $KDEHOME/share/wallpapers
-# TargetDir=appname/datadir # becomes $KDEHOME/share/apps/appname/datadir
+# StandardResource=wallpapers # becomes $KDE4HOME/share/wallpapers
+# TargetDir=appname/datadir # becomes $KDE4HOME/share/apps/appname/datadir
 # InstallPath=.dir/subdir # becomes $HOME/.dir/subdir
 
 # # How to name the files?
diff -ur kdelibs-3.92.0/knewstuff/knewstuff2/core/coreengine.cpp kdelibs-3.92.0-kde4home/knewstuff/knewstuff2/core/coreengine.cpp
--- kdelibs-3.92.0/knewstuff/knewstuff2/core/coreengine.cpp	2007-07-26 12:40:53.000000000 +0200
+++ kdelibs-3.92.0-kde4home/knewstuff/knewstuff2/core/coreengine.cpp	2007-07-29 17:02:29.000000000 +0200
@@ -179,7 +179,7 @@
 #endif
 	}
 
-	// FIXME: LocalRegistryDir must be created in $KDEHOME if missing?
+	// FIXME: LocalRegistryDir must be created in $KDE4HOME if missing?
 	// FIXME: if registry dir is per application, make cache dir per app too?
 
 	if(!m_localregistrydir.isEmpty())
diff -ur kdelibs-3.92.0/knotify/PORTING.html kdelibs-3.92.0-kde4home/knotify/PORTING.html
--- kdelibs-3.92.0/knotify/PORTING.html	2006-10-26 04:24:16.000000000 +0200
+++ kdelibs-3.92.0-kde4home/knotify/PORTING.html	2007-07-29 17:02:29.000000000 +0200
@@ -6,7 +6,7 @@
 
 <h3>Before</h3>
 
-<p>there was a file in <tt>$KDEDIR/share/apps/kopete/eventsrc</tt></p>
+<p>there was a file in <tt>$KDE4DIR/share/apps/kopete/eventsrc</tt></p>
 
 
 <pre>
@@ -26,7 +26,7 @@
 
 <h3>After</h3>
 <ul>
-<li>The file is now installed in <tt>$KDEDIR/share/apps/kopete/kopete.notifyrc</tt>
+<li>The file is now installed in <tt>$KDE4DIR/share/apps/kopete/kopete.notifyrc</tt>
 <li>[!Global!] becomes [Global]</li>
 <li>events group name begin now with  Event/</li>
 <li>"default_presentation" bitmask is replaced by an "Action" field wich is a string of default action separated by '|'  </li>
diff -ur kdelibs-3.92.0/kparts/browserview.desktop kdelibs-3.92.0-kde4home/kparts/browserview.desktop
--- kdelibs-3.92.0/kparts/browserview.desktop	2007-07-26 12:42:34.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kparts/browserview.desktop	2007-07-29 17:02:29.000000000 +0200
@@ -134,6 +134,6 @@
 # If the part has a plugin for KHTML Javascript's window.navigator.plugins
 # array, it should create a plugin info file and set this propery to the
 # file path here. The path should be relative to KDE's data dir
-# ($KDEDIR/share/apps)
+# ($KDE4DIR/share/apps)
 [PropertyDef::X-KDE-BrowserView-PluginsInfo]
 Type=QString
diff -ur kdelibs-3.92.0/kparts/plugin.h kdelibs-3.92.0-kde4home/kparts/plugin.h
--- kdelibs-3.92.0/kparts/plugin.h	2007-05-03 10:46:04.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kparts/plugin.h	2007-07-29 17:02:29.000000000 +0200
@@ -43,7 +43,7 @@
  *
  * If you want this plugin to be used by a part, you need to
  * install the rc file under the directory
- * "data" (KDEDIR/share/apps usually)+"/instancename/kpartplugins/"
+ * "data" (KDE4DIR/share/apps usually)+"/instancename/kpartplugins/"
  * where instancename is the name of the part's instance.
  *
  * You should also install a "plugin info" .desktop file with the same name.
diff -ur kdelibs-3.92.0/kparts/tests/README kdelibs-3.92.0-kde4home/kparts/tests/README
--- kdelibs-3.92.0/kparts/tests/README	2006-10-26 04:27:29.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kparts/tests/README	2007-07-29 17:02:29.000000000 +0200
@@ -1,5 +1,5 @@
 In order to test embedding the notepad part in konqueror, you need
 to "make install", to install the libs, and to copy notepad.desktop
-into $KDEDIR/share/services/, and remove kwrite.desktop from
-$KDEDIR/share/applnk/... (at least the ServiceTypes line of it)
+into $KDE4DIR/share/services/, and remove kwrite.desktop from
+$KDE4DIR/share/applnk/... (at least the ServiceTypes line of it)
 
diff -ur kdelibs-3.92.0/kstyles/kthemestyle/kthemestyle.h kdelibs-3.92.0-kde4home/kstyles/kthemestyle/kthemestyle.h
--- kdelibs-3.92.0/kstyles/kthemestyle/kthemestyle.h	2007-06-27 12:53:40.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kstyles/kthemestyle/kthemestyle.h	2007-07-29 17:02:29.000000000 +0200
@@ -70,7 +70,7 @@
      *
      * @param configDir The directory which has the KConfig file.
      * @param configFile A KConfig file to use as the theme configuration.
-     * Defaults to ~/.kderc.
+     * Defaults to ~/.kde4rc.
      */
     explicit KThemeStyle( const QString& configDir,
                           const QString &configFile = QString() );
diff -ur kdelibs-3.92.0/kutils/kdeglobals.kcfg kdelibs-3.92.0-kde4home/kutils/kdeglobals.kcfg
--- kdelibs-3.92.0/kutils/kdeglobals.kcfg	2007-06-27 12:53:42.000000000 +0200
+++ kdelibs-3.92.0-kde4home/kutils/kdeglobals.kcfg	2007-07-29 17:02:29.000000000 +0200
@@ -450,7 +450,7 @@
   <entry key="Autostart" type="Path" >
     <label>Path to the autostart directory</label>
     <whatsthis>Path to the directory containing executables to be run on session login</whatsthis>
-    <default>$KDEHOME/Autostart</default>
+    <default>$KDE4HOME/Autostart</default>
   </entry>
   <entry key="Desktop" type="Path" >
     <label>Path to the desktop directory</label>