Differential D25604 Diff 70536 startkde/startplasma.cpp

Changeset View

Standalone View

View Options

startkde/startplasma.cpp

Context not available.
185 } 185​ }
186 sourceFiles(scripts); 186​ sourceFiles(scripts);
187 187​
188 // If the kde installation is in a non-standard location (ie. with a dev build), 188​ // To ensure the proper resources are available, the data root dir
apolUnsubmitted
Not Done

Please reduce the amount of comments.
It's hard to read and not very descriptive. We can read the code as well. Instead of writing what it does, explain why if you really think it's necessary. At this point I'd be happy removing the comments overall.

apol: Please reduce the amount of comments. It's hard to read and not very descriptive. We can read…
189 // it is possible the data root is not in the XDG_DATA_DIRS variable yet. 189​ // needs to be available in the XDG_DATA_DIRS variable, with
190 // If that's the case prepend it to the value. Prepending ensures this kde 190​ // the right preference.
191 // installation's resources will get preference over another one whose prefix ​
192 // is also in the XDG_DATA_DIRS variable, like a system installation in ​
193 // /usr/share. ​
194 // ​
195 // If our data root is already in the XDG_DATA_DIRS variable do nothing. This ​
196 // includes leaving it unset if it was unset. By doing nothing in this case ​
197 // we don't mess with the preference order implied by the value. ​
198 QString xdgDataDirsValue; 191​ QString xdgDataDirsValue;
199 if (qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { 192​ if (qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
200 xdgDataDirsValue = QString::fromLocal8Bit(qgetenv("XDG_DATA_DIRS")); 193​ xdgDataDirsValue = QString::fromLocal8Bit(qgetenv("XDG_DATA_DIRS"));
201 } else { 194​ } else {
202 // If the environment variable is unset, the spec says to assume ​
203 // this value. Set it here, so we can still perform the regular ​
204 // check on the value even though the value was unset. ​
205 xdgDataDirsValue = QLatin1String("/usr/local/share:/usr/share"); 195​ xdgDataDirsValue = QLatin1String("/usr/local/share:/usr/share");
206 } 196​ }
207 QString kdeInstallFullDataRootDir = QStringLiteral(KDE_INSTALL_FULL_DATAROOTDIR); 197​ const QString kdeInstallFullDataRootDir = QStringLiteral(KDE_INSTALL_FULL_DATAROOTDIR);
208 QStringList xdgDataDirs = xdgDataDirsValue.split(QLatin1Char(':')); 198​ QVector<QStringRef> xdgDataDirs = xdgDataDirsValue.splitRef(QLatin1Char(':'));
209 if (!xdgDataDirs.contains(kdeInstallFullDataRootDir)) { 199​ if (!xdgDataDirs.contains(QStringRef(&kdeInstallFullDataRootDir))) {
210 QString xdgDataDirsNewValue = kdeInstallFullDataRootDir + QLatin1Char(':') + xdgDataDirsValue; 200​ QString xdgDataDirsNewValue = kdeInstallFullDataRootDir + QLatin1Char(':') + xdgDataDirsValue;
211 qputenv("XDG_DATA_DIRS", xdgDataDirsNewValue.toLocal8Bit()); 201​ qputenv("XDG_DATA_DIRS", xdgDataDirsNewValue.toLocal8Bit());
212 } 202​ }
Context not available.
apolUnsubmitted
Not Done

Can do with splitRef.

apol: Can do with splitRef.