Differential D25604 Diff 70537 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 // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. 188​ // To ensure the proper resources are available, the data root dir
189 // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend 189​ // needs to be available in the XDG_DATA_DIRS variable, with
190 // to set it to a list of paths *not* including the KDE prefix if it's not /usr or 190​ // the right preference.
191 // /usr/local. 191​ QString xdgDataDirsValue;
192 if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { 192​ if (qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
193 qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share"); 193​ xdgDataDirsValue = QString::fromLocal8Bit(qgetenv("XDG_DATA_DIRS"));
194​ } else {
195​ xdgDataDirsValue = QLatin1String("/usr/local/share:/usr/share");
196​ }
197​ const QString kdeInstallFullDataRootDir = QStringLiteral(KDE_INSTALL_FULL_DATAROOTDIR);
198​ QVector<QStringRef> xdgDataDirs = xdgDataDirsValue.splitRef(QLatin1Char(':'));
199​ if (!xdgDataDirs.contains(QStringRef(&kdeInstallFullDataRootDir))) {
200​ QString xdgDataDirsNewValue = kdeInstallFullDataRootDir + QLatin1Char(':') + xdgDataDirsValue;
201​ qputenv("XDG_DATA_DIRS", xdgDataDirsNewValue.toLocal8Bit());
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…
194 } 202​ }
195} 203​}
196204​
Context not available.
apolUnsubmitted
Not Done

Can do with splitRef.

apol: Can do with splitRef.