3125133 · unity8 · git.iko.soy

git.iko.soy/unity8

Clazy fixes

Wrap a const char * in QStringLiteral Do not call first() on non const lists since it detaches Approved by: Michael Zanetti

commit3125133b80fa281429c526e3b48c696c23d66556 authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 21 Oct 2015, 11:51 (11 years ago) parent642d31e 5dccba1

3 files changed+6−4

compare with xenial

unifiedsplit

plugins/Unity/Launcher/desktopfilehandler.cpp+3−2 plugins/Unity/Session/dbusunitysessionservice.cpp+2−1 plugins/Utils/timezoneFormatter.cpp+1−1

plugins/Unity/Launcher/desktopfilehandler.cpp+3−2

@@ -111,8 +111,9 @@ QString DesktopFileHandler::displayName() const

111111 settings.beginGroup(QStringLiteral("Desktop Entry"));

112112

113113 // First try to find Name[xx_YY] and Name[xx] in .desktop file

114− QString locale = QLocale().name();

115− QString shortLocale = locale.split('_').first();

114+ const QString locale = QLocale().name();

115+ const QStringList splitLocale = locale.split(QLatin1Char('_'));

116+ const QString shortLocale = splitLocale.first();

116117

117118 if (locale != shortLocale && settings.contains(QStringLiteral("Name[%1]").arg(locale))) {

118119 return settings.value(QStringLiteral("Name[%1]").arg(locale)).toString();

plugins/Unity/Session/dbusunitysessionservice.cpp+2−1

@@ -292,7 +292,8 @@ QString DBusUnitySessionService::RealName() const

292292 if (p) {

293293 const QString gecos = QString::fromLocal8Bit(p->pw_gecos);

294294 if (!gecos.isEmpty()) {

295− return gecos.split(QLatin1Char(',')).first();

295+ const QStringList splitGecos = gecos.split(QLatin1Char(','));

296+ return splitGecos.first();

296297 }

297298 }

298299

plugins/Utils/timezoneFormatter.cpp+1−1

@@ -29,7 +29,7 @@ QString TimezoneFormatter::currentTimeInTimezone(const QVariant &tzId) const

2929 if (tz.isValid()) {

3030 const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);

3131 // return locale-aware string in the form "day, hh:mm", e.g. "Mon 14:30" or "Mon 1:30 pm"

32− return QStringLiteral("%1 %2").arg(now.toString("ddd")).arg(now.time().toString(Qt::DefaultLocaleShortDate));

32+ return QStringLiteral("%1 %2").arg(now.toString(QStringLiteral("ddd"))).arg(now.time().toString(Qt::DefaultLocaleShortDate));

3333 }

3434 return QString();

3535}