diff --git a/krArc/krarc.h b/krArc/krarc.h --- a/krArc/krarc.h +++ b/krArc/krarc.h @@ -114,7 +114,7 @@ bool extArcReady; //< Used for RPM & DEB files. QString password; //< Password for the archives KConfig krConf; //< The configuration file for krusader - KConfigGroup confGrp; //< the 'Dependencies' config group + KConfigGroup dependGrp; //< the 'Dependencies' config group QString lastData; QString encryptedArchPath; diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -150,7 +150,7 @@ password(QString()), krConf("krusaderrc"), codec(nullptr) { KRFUNC; - confGrp = KConfigGroup(&krConf, "Dependencies"); + dependGrp = KConfigGroup(&krConf, "Dependencies"); KConfigGroup group(&krConf, "General"); QString tmpDirPath = group.readEntry("Temp Directory", _TempDirectory); @@ -1862,7 +1862,7 @@ // Note: KRFUNC was not used here in order to avoid filling the log with too much information KRDEBUG(name); - QString supposedName = confGrp.readEntry(name, QString()); + QString supposedName = dependGrp.readEntry(name, QString()); if (QFileInfo::exists(supposedName)) return supposedName; @@ -1871,7 +1871,7 @@ // Because an executable file has been found, its path is remembered // in order to avoid some future searches - confGrp.writeEntry(name, supposedName); + dependGrp.writeEntry(name, supposedName); return supposedName; } diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp --- a/krusader/krservices.cpp +++ b/krusader/krservices.cpp @@ -42,8 +42,8 @@ // changes must also be applied to `KrServices::fullPathName()` // and `kio_krarcProtocol::fullPathName()` - KConfigGroup group(krConfig, "Dependencies"); - QString supposedName = group.readEntry(cmdName, QString()); + KConfigGroup dependGrp(krConfig, "Dependencies"); + QString supposedName = dependGrp.readEntry(cmdName, QString()); if (QFileInfo::exists(supposedName)) return true; @@ -52,7 +52,7 @@ // Because an executable file has been found, its path is remembered // in order to avoid some future searches - group.writeEntry(cmdName, supposedName); + dependGrp.writeEntry(cmdName, supposedName); return true; } @@ -66,8 +66,8 @@ if (confName.isNull()) confName = name; - KConfigGroup config(krConfig, "Dependencies"); - QString supposedName = config.readEntry(confName, QString()); + KConfigGroup dependGrp(krConfig, "Dependencies"); + QString supposedName = dependGrp.readEntry(confName, QString()); if (QFileInfo::exists(supposedName)) return supposedName; @@ -76,7 +76,7 @@ // Because an executable file has been found, its path is remembered // in order to avoid some future searches - config.writeEntry(confName, supposedName); + dependGrp.writeEntry(confName, supposedName); return supposedName; }