38640eb · unity8 · git.iko.soy

libs/UbuntuGestures/Pool.h−8

compare with xenial

unifiedsplit

@@ -60,14 +60,6 @@ public:

60 ItemType &operator*() const { return *item; }

61 ItemType &value() const { return *item; }

62

63− Iterator &operator= (const Iterator& other) {

64− index = other.index;

65− item = other.item;

66−

67− // by convention, always return *this

68− return *this;

69− }

70−

71 operator bool() const { return item != nullptr; }

63 operator bool() const { return item != nullptr; }

72

64

73 int index;

65 int index;

plugins/Cursor/CursorImageProvider.cpp+7−7

@@ -134,7 +134,7 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)

134 QString themeName;

135 QString cursorName;

136 {

137− QStringList themeAndNameList = cursorThemeAndName.split("/");

137+ QStringList themeAndNameList = cursorThemeAndName.split('/');

138 if (themeAndNameList.size() != 2) {

139 return nullptr;

140 }

@@ -151,20 +151,20 @@ CursorImage *CursorImageProvider::fetchCursor(const QString &themeName, const QS

151

152 // Try some fallbacks

153 if (cursorImage->qimage.isNull()) {

154− if (cursorName == "ibeam") {

154+ if (cursorName == QLatin1String("ibeam")) {

155 qDebug() << "CursorImageProvider: \"ibeam\" not found, falling back to \"xterm\"";

156− cursorImage = fetchCursorHelper(themeName, "xterm");

156+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("xterm"));

157− } else if (cursorName == "xterm") {

157+ } else if (cursorName == QLatin1String("xterm")) {

158 qDebug() << "CursorImageProvider: \"xterm\" not found, falling back to \"ibeam\"";

159− cursorImage = fetchCursorHelper(themeName, "ibeam");

159+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("ibeam"));

160 }

161 }

162

163 // if it all fails, there must be at least a left_ptr

164− if (cursorImage->qimage.isNull() && cursorName != "left_ptr") {

164+ if (cursorImage->qimage.isNull() && cursorName != QLatin1String("left_ptr")) {

165 qDebug() << "CursorImageProvider:" << cursorName

166 << "not found (nor its fallbacks, if any). Going for \"left_ptr\" as a last resort.";

167− cursorImage = fetchCursorHelper(themeName, "left_ptr");

167+ cursorImage = fetchCursorHelper(themeName, QStringLiteral("left_ptr"));

168 }

169

170 if (cursorImage->qimage.isNull()) {

plugins/Cursor/MousePointer.cpp+2−2

@@ -27,8 +27,8 @@

27

28MousePointer::MousePointer(QQuickItem *parent)

29 : MirMousePointerInterface(parent)

30− , m_cursorName("left_ptr")

30+ , m_cursorName(QStringLiteral("left_ptr"))

31− , m_themeName("default")

31+ , m_themeName(QStringLiteral("default"))

32 , m_hotspotX(0)

33 , m_hotspotY(0)

34{

plugins/Cursor/plugin.cpp+1−1

@@ -35,5 +35,5 @@ void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

35{

36 QQmlExtensionPlugin::initializeEngine(engine, uri);

37

38− engine->addImageProvider(QLatin1String("cursor"), new CursorImageProvider());

38+ engine->addImageProvider(QStringLiteral("cursor"), new CursorImageProvider());

39}

plugins/Dash/horizontaljournal.cpp+1−1

@@ -184,7 +184,7 @@ void HorizontalJournal::calculateImplicitHeight()

184

185void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

186{

187− Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

187+ Q_FOREACH(const QQmlChangeSet::Change remove, removes) {

188 for (int i = remove.count - 1; i >= 0; --i) {

189 const int indexToRemove = remove.index + i;

190 // We only support removing from the end so

plugins/Dash/listviewwithpageheader.cpp+3−3

@@ -941,7 +941,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

941// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

942 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

943

944− Q_FOREACH(const QQmlChangeSet::Change &remove, changeSet.removes()) {

944+ Q_FOREACH(const QQmlChangeSet::Change remove, changeSet.removes()) {

945// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

946 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

947 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

@@ -994,7 +994,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

994 }

995 }

996

997− Q_FOREACH(const QQmlChangeSet::Change &insert, changeSet.inserts()) {

997+ Q_FOREACH(const QQmlChangeSet::Change insert, changeSet.inserts()) {

998// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

999 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

1000 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

@@ -1052,7 +1052,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

1052 }

1053 }

1054

1055− Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1055+ Q_FOREACH(const QQmlChangeSet::Change change, changeSet.changes()) {

1056// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1057 for (int i = change.index; i < change.count; ++i) {

1058 ListItem *item = itemAtIndex(i);

plugins/Dash/organicgrid.cpp+3−3

@@ -32,7 +32,7 @@ QSizeF OrganicGrid::smallDelegateSize() const

32 return m_smallDelegateSize;

33}

34

35−void OrganicGrid::setSmallDelegateSize(const QSizeF &size)

35+void OrganicGrid::setSmallDelegateSize(const QSizeF size)

36{

37 if (m_smallDelegateSize != size) {

38 m_smallDelegateSize = size;

@@ -49,7 +49,7 @@ QSizeF OrganicGrid::bigDelegateSize() const

49 return m_bigDelegateSize;

50}

51

52−void OrganicGrid::setBigDelegateSize(const QSizeF &size)

52+void OrganicGrid::setBigDelegateSize(const QSizeF size)

53{

54 if (m_bigDelegateSize != size) {

55 m_bigDelegateSize = size;

@@ -237,7 +237,7 @@ void OrganicGrid::calculateImplicitHeight()

237

238void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

239{

240− Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

240+ Q_FOREACH(const QQmlChangeSet::Change remove, removes) {

241 for (int i = remove.count - 1; i >= 0; --i) {

242 const int indexToRemove = remove.index + i;

243 // We only support removing from the end

plugins/Dash/organicgrid.h+2−2

@@ -59,10 +59,10 @@ public:

59 OrganicGrid();

60

61 QSizeF smallDelegateSize() const;

62− void setSmallDelegateSize(const QSizeF &size);

62+ void setSmallDelegateSize(const QSizeF size);

63

64 QSizeF bigDelegateSize() const;

65− void setBigDelegateSize(const QSizeF &size);

65+ void setBigDelegateSize(const QSizeF size);

66

67Q_SIGNALS:

68 void smallDelegateSizeChanged();

plugins/Dash/verticaljournal.cpp+6−6

@@ -50,7 +50,7 @@ void VerticalJournal::setColumnWidth(qreal columnWidth)

50

51 if (isComponentComplete()) {

52 Q_FOREACH(const auto &column, m_columnVisibleItems) {

53− Q_FOREACH(const ViewItem &item, column) {

53+ Q_FOREACH(const ViewItem item, column) {

54 item.m_item->setWidth(columnWidth);

55 }

56 }

@@ -172,7 +172,7 @@ void VerticalJournal::cleanupExistingItems()

172 // Cleanup the existing items

173 for (int i = 0; i < m_columnVisibleItems.count(); ++i) {

174 QList<ViewItem> &column = m_columnVisibleItems[i];

175− Q_FOREACH(const ViewItem &item, column)

175+ Q_FOREACH(const ViewItem item, column)

176 releaseItem(item.m_item);

177 column.clear();

178 }

@@ -218,10 +218,10 @@ void VerticalJournal::doRelayout()

218

219 if (!allItems.isEmpty()) {

220 if (allItems.first().m_modelIndex == 0) {

221− Q_FOREACH(const ViewItem &item, allItems)

221+ Q_FOREACH(const ViewItem item, allItems)

222 addItemToView(item.m_modelIndex, item.m_item);

223 } else {

224− Q_FOREACH(const ViewItem &item, allItems)

224+ Q_FOREACH(const ViewItem item, allItems)

225 releaseItem(item.m_item);

226 }

227 }

@@ -230,7 +230,7 @@ void VerticalJournal::doRelayout()

230void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

231{

232 Q_FOREACH(const auto &column, m_columnVisibleItems) {

233− Q_FOREACH(const ViewItem &item, column) {

233+ Q_FOREACH(const ViewItem item, column) {

234 const bool cull = item.y() + item.height() <= visibleFromY || item.y() >= visibleToY;

235 QQuickItemPrivate::get(item.m_item)->setCulled(cull);

236 }

@@ -239,7 +239,7 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

239

240void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)

241{

242− Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {

242+ Q_FOREACH(const QQmlChangeSet::Change remove, removes) {

243 for (int i = remove.count - 1; i >= 0; --i) {

244 const int indexToRemove = remove.index + i;

245 // Since we only support removing from the end, indexToRemove

plugins/Dash/verticaljournal.h+1−1

@@ -76,7 +76,7 @@ private:

76 qreal x() const { return m_item->x(); }

77 qreal y() const { return m_item->y(); }

78 qreal height() const { return m_item->height(); }

79− bool operator<(const ViewItem &v) const { return m_modelIndex < v.m_modelIndex; }

79+ bool operator<(const ViewItem v) const { return m_modelIndex < v.m_modelIndex; }

80

81 QQuickItem *m_item;

82 int m_modelIndex;

plugins/GlobalShortcut/globalshortcutregistry.cpp+1−1

@@ -104,7 +104,7 @@ void GlobalShortcutRegistry::setupFilterOnWindow(qulonglong wid)

104 s_windowId = 0;

105 }

106

107− for(QWindow *window: qApp->allWindows()) {

107+ Q_FOREACH(QWindow *window, qApp->allWindows()) {

108 if (window && window->winId() == wid) {

109 m_filteredWindow = window;

110 window->installEventFilter(this);

plugins/IntegratedLightDM/liblightdm/Greeter.cpp+1−1

@@ -173,7 +173,7 @@ void Greeter::respond(const QString &response)

173

174void Greeter::sendAuthenticationComplete()

175{

176− if (qgetenv("UNITY_TESTING").isEmpty()) {

176+ if (qEnvironmentVariableIsEmpty("UNITY_TESTING")) {

177 // simulate PAM's delay

178 QTimer::singleShot(1000, this, &Greeter::authenticationComplete);

179 } else {

plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h+1−1

@@ -48,7 +48,7 @@ public:

48Q_SIGNALS:

49 void serviceChanged(const QString &service);

50 void dbusPathChanged(const QString &dbusPath);

51− void serviceReadyChanged(const bool &serviceReady);

51+ void serviceReadyChanged(const bool serviceReady);

52

53 void canceled(bool success);

54 void error(const QString &error);

plugins/Ubuntu/Gestures/Damper.h+2−2

@@ -67,12 +67,12 @@ public:

67

68 qreal maxDelta() const { return m_x.maxDelta(); }

69

70− void reset(const QPointF &point) {

70+ void reset(const QPointF point) {

71 m_x.reset(point.x());

72 m_y.reset(point.y());

73 }

74

75− void update(const QPointF &point) {

75+ void update(const QPointF point) {

76 m_x.update(point.x());

77 m_y.update(point.y());

78 }

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+3−3

@@ -614,7 +614,7 @@ void DirectionalDragAreaPrivate::setStatus(Status newStatus)

614 }

615}

616

617−void DirectionalDragAreaPrivate::setPublicPos(const QPointF &point)

617+void DirectionalDragAreaPrivate::setPublicPos(const QPointF point)

618{

619 bool xChanged = publicPos.x() != point.x();

620 bool yChanged = publicPos.y() != point.y();

@@ -653,7 +653,7 @@ void DirectionalDragAreaPrivate::setPublicPos(const QPointF &point)

653 }

654}

655

656−void DirectionalDragAreaPrivate::setPublicScenePos(const QPointF &point)

656+void DirectionalDragAreaPrivate::setPublicScenePos(const QPointF point)

657{

658 bool xChanged = publicScenePos.x() != point.x();

659 bool yChanged = publicScenePos.y() != point.y();

@@ -863,7 +863,7 @@ void DirectionalDragAreaPrivate::updateSceneDirectionVector()

863 sceneDirectionVector = sceneDirection - sceneOrigin;

864}

865

866−qreal DirectionalDragAreaPrivate::projectOntoDirectionVector(const QPointF &sceneVector) const

866+qreal DirectionalDragAreaPrivate::projectOntoDirectionVector(const QPointF sceneVector) const

867{

868 // same as dot product as sceneDirectionVector is a unit vector

869 return sceneVector.x() * sceneDirectionVector.x() +

plugins/Ubuntu/Gestures/DirectionalDragArea_p.h+3−3

@@ -84,13 +84,13 @@ public:

84 bool isPastMaxDistance() const;

85 const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);

86 void setStatus(Status newStatus);

87− void setPublicPos(const QPointF &point);

87+ void setPublicPos(const QPointF point);

88− void setPublicScenePos(const QPointF &point);

88+ void setPublicScenePos(const QPointF point);

89 bool isWithinTouchCompositionWindow();

90 void updateSceneDirectionVector();

91 // returns the scalar projection between the given vector (in scene coordinates)

92 // and m_sceneDirectionVector

93− qreal projectOntoDirectionVector(const QPointF &sceneVector) const;

93+ qreal projectOntoDirectionVector(const QPointF sceneVector) const;

94 void touchOwnershipEvent(TouchOwnershipEvent *event);

95 void unownedTouchEvent(UnownedTouchEvent *event);

96 void unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent);

plugins/Unity/Launcher/asadapter.h+3

@@ -28,6 +28,9 @@ public:

28 ASAdapter();

29 ~ASAdapter();

30

31+ ASAdapter(const ASAdapter&) = delete;

32+ ASAdapter& operator=(const ASAdapter&) = delete;

33+

31 void syncItems(const QList<LauncherItem*> &list);

34 void syncItems(const QList<LauncherItem*> &list);

32

35

33private:

36private:

plugins/Unity/Launcher/dbusinterface.cpp+8−7

@@ -159,11 +159,12 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec

159 return false;

160 }

161

162+ const QList<QVariant> messageArguments = message.arguments();

162− if (message.member() == QLatin1String("Get") && (message.arguments().count() != 2 || message.arguments()[0].toString() != QLatin1String("com.canonical.Unity.Launcher.Item"))) {

163+ if (message.member() == QLatin1String("Get") && (messageArguments.count() != 2 || messageArguments[0].toString() != QLatin1String("com.canonical.Unity.Launcher.Item"))) {

163 return false;

164 return false;

164 }

165 }

165

166

166− if (message.member() == QLatin1String("Set") && (message.arguments().count() != 3 || message.arguments()[0].toString() != QLatin1String("com.canonical.Unity.Launcher.Item"))) {

167+ if (message.member() == QLatin1String("Set") && (messageArguments.count() != 3 || messageArguments[0].toString() != QLatin1String("com.canonical.Unity.Launcher.Item"))) {

167 return false;

168 return false;

168 }

169 }

169

170

@@ -176,7 +177,7 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec

176

177

177 QVariantList retval;

178 QVariantList retval;

178 if (message.member() == QLatin1String("Get")) {

179 if (message.member() == QLatin1String("Get")) {

179− QString cachedString = message.arguments()[1].toString();

180+ QString cachedString = messageArguments[1].toString();

180 if (!item) {

181 if (!item) {

181 return false;

182 return false;

182 }

183 }

@@ -188,21 +189,21 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec

188 retval.append(QVariant::fromValue(QDBusVariant(item->progress())));

189 retval.append(QVariant::fromValue(QDBusVariant(item->progress())));

189 }

190 }

190 } else if (message.member() == QLatin1String("Set")) {

191 } else if (message.member() == QLatin1String("Set")) {

191− QString cachedString = message.arguments()[1].toString();

192+ QString cachedString = messageArguments[1].toString();

192 if (cachedString == QLatin1String("count")) {

193 if (cachedString == QLatin1String("count")) {

193− int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();

194+ int newCount = messageArguments[2].value<QDBusVariant>().variant().toInt();

194 if (!item || newCount != item->count()) {

195 if (!item || newCount != item->count()) {

195 Q_EMIT countChanged(appid, newCount);

196 Q_EMIT countChanged(appid, newCount);

196 notifyPropertyChanged(QStringLiteral("com.canonical.Unity.Launcher.Item"), encodeAppId(appid), QStringLiteral("count"), QVariant(newCount));

197 notifyPropertyChanged(QStringLiteral("com.canonical.Unity.Launcher.Item"), encodeAppId(appid), QStringLiteral("count"), QVariant(newCount));

197 }

198 }

198 } else if (cachedString == QLatin1String("countVisible")) {

199 } else if (cachedString == QLatin1String("countVisible")) {

199− bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();

200+ bool newVisible = messageArguments[2].value<QDBusVariant>().variant().toBool();

200 if (!item || newVisible != item->countVisible()) {

201 if (!item || newVisible != item->countVisible()) {

201 Q_EMIT countVisibleChanged(appid, newVisible);

202 Q_EMIT countVisibleChanged(appid, newVisible);

202 notifyPropertyChanged(QStringLiteral("com.canonical.Unity.Launcher.Item"), encodeAppId(appid), QStringLiteral("countVisible"), newVisible);

203 notifyPropertyChanged(QStringLiteral("com.canonical.Unity.Launcher.Item"), encodeAppId(appid), QStringLiteral("countVisible"), newVisible);

203 }

204 }

204 } else if (cachedString == QLatin1String("progress")) {

205 } else if (cachedString == QLatin1String("progress")) {

205− int newProgress = message.arguments()[2].value<QDBusVariant>().variant().toInt();

206+ int newProgress = messageArguments[2].value<QDBusVariant>().variant().toInt();

206 if (!item || newProgress != item->progress()) {

207 if (!item || newProgress != item->progress()) {

207 Q_EMIT progressChanged(appid, newProgress);

208 Q_EMIT progressChanged(appid, newProgress);

208 notifyPropertyChanged(QStringLiteral("com.canonical.Unity.Launcher.Item"), encodeAppId(appid), QStringLiteral("progress"), QVariant(newProgress));

209 notifyPropertyChanged(QStringLiteral("com.canonical.Unity.Launcher.Item"), encodeAppId(appid), QStringLiteral("progress"), QVariant(newProgress));

plugins/Unity/Platform/platform.cpp+2−2

@@ -20,7 +20,7 @@

20

21Platform::Platform(QObject *parent)

22 : QObject(parent)

23− , m_iface("org.freedesktop.hostname1", "/org/freedesktop/hostname1", "org.freedesktop.hostname1",

23+ , m_iface(QStringLiteral("org.freedesktop.hostname1"), QStringLiteral("/org/freedesktop/hostname1"), QStringLiteral("org.freedesktop.hostname1"),

24 QDBusConnection::systemBus(), this)

25{

26 QMetaObject::invokeMethod(this, "init");

@@ -29,7 +29,7 @@ Platform::Platform(QObject *parent)

29void Platform::init()

30{

31 m_chassis = m_iface.property("Chassis").toString();

32− m_isPC = (m_chassis == "desktop" || m_chassis == "laptop" || m_chassis == "server");

32+ m_isPC = (m_chassis == QLatin1String("desktop") || m_chassis == QLatin1String("laptop") || m_chassis == QLatin1String("server"));

33}

34

35QString Platform::chassis() const

plugins/Utils/constants.cpp+1−1

@@ -19,7 +19,7 @@

19Constants::Constants(QObject *parent)

20 : QObject(parent)

21{

22− if (qgetenv("QT_LOAD_TESTABILITY").isEmpty()) {

22+ if (qEnvironmentVariableIsEmpty("QT_LOAD_TESTABILITY")) {

23 m_indicatorValueTimeout = 30000;

24 } else {

25 m_indicatorValueTimeout = 5000;

plugins/Utils/easingcurve.cpp+1−1

@@ -32,7 +32,7 @@ QEasingCurve::Type EasingCurve::type() const

32 return m_easingCurve.type();

33}

34

35−void EasingCurve::setType(const QEasingCurve::Type &type)

35+void EasingCurve::setType(const QEasingCurve::Type type)

36{

37 // FIXME: Working around bug https://bugreports.qt-project.org/browse/QTBUG-38686 here

38 QEasingCurve newCurve;

plugins/Utils/easingcurve.h+1−1

@@ -46,7 +46,7 @@ public:

46 EasingCurve(QObject *parent = 0);

47

48 QEasingCurve::Type type() const;

49− void setType(const QEasingCurve::Type &type);

49+ void setType(const QEasingCurve::Type type);

50

51 qreal period() const;

52 void setPeriod(qreal period);

plugins/Utils/timezoneFormatter.cpp+1−1

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

29 if (tz.isValid()) {

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

31 // 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(QStringLiteral("ddd"))).arg(now.time().toString(Qt::DefaultLocaleShortDate));

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

33 }

34 return QString();

35}

plugins/Utils/windowstatestorage.cpp+5−5

@@ -66,10 +66,10 @@ WindowStateStorage::WindowState WindowStateStorage::getState(const QString &wind

66 if (!query.first()) {

67 return defaultValue;

68 }

69− return (WindowState)query.value("state").toInt();

69+ return (WindowState)query.value(QStringLiteral("state")).toInt();

70}

71

72−void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)

72+void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)

73{

74 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")

75 .arg(windowId)

@@ -94,7 +94,7 @@ void WindowStateStorage::executeAsyncQuery(const QString &queryString)

94 }

95}

96

97−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

97+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const

98{

99 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")

100 .arg(windowId);

@@ -120,9 +120,9 @@ void WindowStateStorage::initdb()

120 query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));

121 }

122

123− if (!m_db.tables().contains("state")) {

123+ if (!m_db.tables().contains(QStringLiteral("state"))) {

124 QSqlQuery query;

125− query.exec("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);");

125+ query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));

126 }

127}

128

plugins/Utils/windowstatestorage.h+2−2

@@ -35,8 +35,8 @@ public:

35 Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

36 Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;

37

38− Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);

38+ Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect rect);

39− Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;

39+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect defaultValue) const;

40

41private:

42 void initdb();

src/ShellApplication.cpp+3−3

@@ -103,7 +103,7 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

103 // (eg cloned desktop, several desktops, etc)

104 if (isMirServer && screens().count() == 2) {

105 m_shellView->setScreen(screens().at(1));

106− m_qmlArgs.setDeviceName("desktop");

106+ m_qmlArgs.setDeviceName(QStringLiteral("desktop"));

107

108 m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

109 m_secondaryWindow->setScreen(screens().at(0));

@@ -164,7 +164,7 @@ void ShellApplication::onScreenAdded(QScreen * /*screen*/)

164 // (eg cloned desktop, several desktops, etc)

165 if (screens().count() == 2) {

166 m_shellView->setScreen(screens().at(1));

167− m_qmlArgs.setDeviceName("desktop");

167+ m_qmlArgs.setDeviceName(QStringLiteral("desktop"));

168 // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having

169 // its backing QPlatformWindow recreated). So lets refocus it.

170 m_shellView->requestActivate();

@@ -188,7 +188,7 @@ void ShellApplication::onScreenAboutToBeRemoved(QScreen *screen)

188 Q_ASSERT(m_secondaryWindow);

189 delete m_secondaryWindow;

190 m_secondaryWindow = nullptr;

191− m_shellView->setScreen(screens().first());

191+ m_shellView->setScreen(screens().at(0));

192 m_qmlArgs.setDeviceName(m_deviceName);

193 // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having

194 // its backing QPlatformWindow recreated). So lets refocus it.