Use kde5rc instead of kde4rc naming convention, REVIEW: 114917

2 files changed, 10 insertions, 10 deletions

diff --git a/docs/README.kiosk b/docs/README.kiosk
index 4974acef..b89f731c 100644
--- a/docs/README.kiosk
+++ b/docs/README.kiosk
@@ -31,7 +31,7 @@ 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
-(notice the extra 'S'), via /etc/kde4rc and even via the kdeglobals config
+(notice the extra 'S'), via /etc/kde5rc 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.
@@ -693,7 +693,7 @@ Mapping profiles to users
 =========================
 
 A mapping file determines which profile(s) should be used for which user.
-The mapping file can be configured in /etc/kde4rc in the [Directories] group:
+The mapping file can be configured in /etc/kde5rc in the [Directories] group:
 
 	[Directories]
 	userProfileMapFile=/etc/kde-user-profile
@@ -780,7 +780,7 @@ user will be assigned the "default" profile.
 The Profile determines the directory prefixes
 =============================================
 
-The global KDE configuration file (e.g. kdeglobals or /etc/kde4rc) can
+The global KDE configuration file (e.g. kdeglobals or /etc/kde5rc) can
 contain config-groups that are associated with a certain user profile.
 Such a config-group is treated similar as the [Directories] config-group.
 
@@ -790,7 +790,7 @@ The name of a such config-group is [Directories-<ProfileName>]
 Integration with KIOSK Admin Tool
 =================================
 
-The KIOSK Admin Tool uses /etc/kde4rc as source for all its profile
+The KIOSK Admin Tool uses /etc/kde5rc as source for all its profile
 information. For this it uses the following keys in the
 [Directories-<ProfileName>] config-group:
 
@@ -807,7 +807,7 @@ as default installation directory for this profile.
 Default setting as example
 ==========================
 
-The following snipped could be added to /etc/kde4rc to define a "default" profile:
+The following snipped could be added to /etc/kde5rc to define a "default" profile:
 
 	[Directories-default]
 	ProfileDescription=Default profile
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index 4f5553d5..5b5fa3a7 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -74,9 +74,9 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags,
 
         etc_kderc =
 #ifdef Q_OS_WIN
-            QFile::decodeName(qgetenv("WINDIR") + "/kde4rc");
+            QFile::decodeName(qgetenv("WINDIR") + "/kde5rc");
 #else
-            QLatin1String("/etc/kde4rc");
+            QLatin1String("/etc/kde5rc");
 #endif
         if (!QFileInfo(etc_kderc).isReadable()) {
             etc_kderc.clear();
@@ -89,9 +89,9 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags,
 //            QExplicitlySharedDataPointer<KConfigBackend> backend = KConfigBackend::create(etc_kderc, QLatin1String("INI"));
 //            backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
 //        }
-//        const QString kde4rc(QDir::home().filePath(".kde4rc"));
-//        if (KStandardDirs::checkAccess(kde4rc, R_OK)) {
-//            QExplicitlySharedDataPointer<KConfigBackend> backend = KConfigBackend::create(kde4rc, QLatin1String("INI"));
+//        const QString kde5rc(QDir::home().filePath(".kde5rc"));
+//        if (KStandardDirs::checkAccess(kde5rc, R_OK)) {
+//            QExplicitlySharedDataPointer<KConfigBackend> backend = KConfigBackend::create(kde5rc, QLatin1String("INI"));
 //            backend->parseConfig( "en_US", tmp, KConfigBackend::ParseOptions());
 //        }
 //        KConfigBackend::registerMappings(tmp);