Some other fixlets forgotten
commitaa886ca0e9903d19b78eae325c93bbbd64512cab
authorAlbert Astals Cid <albert.astals@canonical.com>
dateMon 14 Sep 2015, 11:41 (11 years ago)
parent5b4dee9
plugins/Greeter/Unity/Launcher/launchermodelas.cpp+1−1
@@ -147,7 +147,7 @@ QString LauncherModel::getUrlForAppId(const QString &appId) const
147147 return QString();
148148 }
149149
150− if (!appId.contains(QStringLiteral("_"))) {
150+ if (!appId.contains('_')) {
151151 return "application:///" + appId + ".desktop";
152152 }
153153
plugins/IntegratedLightDM/Greeter.cpp+1−1
@@ -113,7 +113,7 @@ void Greeter::showPromptFilter(const QString &text, QLightDM::Greeter::PromptTyp
113113
114114 // Strip prompt of any colons at the end
115115 QString trimmedText = text.trimmed();
116− if (trimmedText.endsWith(QLatin1String(":")) || trimmedText.endsWith(QLatin1String("："))) {
116+ if (trimmedText.endsWith(':') || trimmedText.endsWith(QLatin1String("："))) {
117117 trimmedText.chop(1);
118118 }
119119
plugins/Unity/Indicators/indicatorsmanager.cpp+2−2
@@ -286,9 +286,9 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
286286 return new_indicator;
287287}
288288
289−QList<Indicator::Ptr> IndicatorsManager::indicators()
289+QVector<Indicator::Ptr> IndicatorsManager::indicators()
290290{
291− QList<Indicator::Ptr> list;
291+ QVector<Indicator::Ptr> list;
292292 Q_FOREACH(IndicatorData* data, m_indicatorsData)
293293 {
294294 Indicator::Ptr ret = indicator(data->m_name);
plugins/Unity/Indicators/indicatorsmanager.h+1−1
@@ -45,7 +45,7 @@ public:
4545
4646 Indicator::Ptr indicator(const QString& indicator_name);
4747
48− QList<Indicator::Ptr> indicators();
48+ QVector<Indicator::Ptr> indicators();
4949
5050 bool isLoaded() const;
5151
plugins/Unity/Launcher/desktopfilehandler.cpp+1−1
@@ -79,7 +79,7 @@ void DesktopFileHandler::load()
7979 helper.replace(dashPos, 1, '/');
8080 }
8181
82− if (helper.contains(QStringLiteral("/"))) {
82+ if (helper.contains('/')) {
8383 path += helper.split('/').at(0) + '/';
8484 helper.remove(QRegExp("^" + path));
8585 }