Merge lp:~gerboland/miral/no-unsigned-int-index into lp:miral

[Gerry Boland]

[miral-qt] Use signed int for model indexing. While unsigned more correct, Qt's apis use unsigned everywhere and all the casting is a pain

[Alan Griffiths (alan-griffiths)]

+ void windowAdded(const qtmir::WindowInfo, const int index);

You do know that top level const is meaningless in [member] function declarations?

review: Approve

[Gerry Boland (gerboland)]

> + void windowAdded(const qtmir::WindowInfo, const int index);
>
> You do know that top level const is meaningless in [member] function
> declarations?

Yeah, I do. It is a habit, I tend to use const as much as possible, as even if the compiler cannot use it, it might hint to developer how api is intended to be used. How useful that actually is, I cannot say. Welcome to remove them if they annoy you.

=== modified file 'miral-qt/src/common/windowmodelnotifierinterface.h'
--- miral-qt/src/common/windowmodelnotifierinterface.h	2016-08-17 16:12:40 +0000
+++ miral-qt/src/common/windowmodelnotifierinterface.h	2016-08-24 12:32:11 +0000
@@ -66,12 +66,12 @@
     virtual ~WindowModelNotifierInterface() = default;
 
 Q_SIGNALS:
-    void windowAdded(const qtmir::WindowInfo, const unsigned int index);
-    void windowRemoved(const unsigned int index);
-    void windowMoved(const QPoint topLeft, const unsigned int index);
-    void windowResized(const QSize size, const unsigned int index);
-    void windowFocused(const unsigned int index);
-    void windowInfoChanged(const qtmir::WindowInfo, const unsigned int index);
+    void windowAdded(const qtmir::WindowInfo, const int index);
+    void windowRemoved(const int index);
+    void windowMoved(const QPoint topLeft, const int index);
+    void windowResized(const QSize size, const int index);
+    void windowFocused(const int index);
+    void windowInfoChanged(const qtmir::WindowInfo, const int index);
 
 private:
     Q_DISABLE_COPY(WindowModelNotifierInterface)

=== modified file 'miral-qt/src/modules/Unity/Application/windowmodel.cpp'
--- miral-qt/src/modules/Unity/Application/windowmodel.cpp	2016-08-22 16:06:32 +0000
+++ miral-qt/src/modules/Unity/Application/windowmodel.cpp	2016-08-24 12:32:11 +0000
@@ -68,7 +68,7 @@
     return roleNames;
 }
 
-void WindowModel::onWindowAdded(const WindowInfo windowInfo, const unsigned int index)
+void WindowModel::onWindowAdded(const WindowInfo windowInfo, const int index)
 {
     qDebug() << "Window Added!" << index;
     auto mirSurface = new MirSurface(windowInfo, m_windowController);
@@ -78,7 +78,7 @@
     Q_EMIT countChanged();
 }
 
-void WindowModel::onWindowRemoved(const unsigned int index)
+void WindowModel::onWindowRemoved(const int index)
 {
     qDebug() << "Window Removed!" << index;
     beginRemoveRows(QModelIndex(), index, index);
@@ -87,19 +87,19 @@
     Q_EMIT countChanged();
 }
 
-void WindowModel::onWindowMoved(const QPoint topLeft, const unsigned int index)
+void WindowModel::onWindowMoved(const QPoint topLeft, const int index)
 {
     auto mirSurface = static_cast<MirSurface *>(m_windowModel.value(index));
     mirSurface->setPosition(topLeft);
 }
 
-void WindowModel::onWindowResized(const QSize size, const unsigned int index)
+void WindowModel::onWindowResized(const QSize size, const int index)
 {
     auto mirSurface = static_cast<MirSurface *>(m_windowModel.value(index));
     mirSurface->setSize(size);
 }
 
-void WindowModel::onWindowFocused(const unsigned int index)
+void WindowModel::onWindowFocused(const int index)
 {
     auto mirSurface = static_cast<MirSurface *>(m_windowModel.value(index));
     if (m_focusedWindow && m_focusedWindow != mirSurface) {
@@ -109,7 +109,7 @@
     m_focusedWindow = mirSurface;
 }
 
-void WindowModel::onWindowInfoChanged(const WindowInfo windowInfo, const unsigned int pos)
+void WindowModel::onWindowInfoChanged(const WindowInfo windowInfo, const int pos)
 {
     auto mirSurface = static_cast<MirSurface *>(m_windowModel.value(pos));
     mirSurface->updateWindowInfo(windowInfo);

=== modified file 'miral-qt/src/modules/Unity/Application/windowmodel.h'
--- miral-qt/src/modules/Unity/Application/windowmodel.h	2016-08-17 19:09:12 +0000
+++ miral-qt/src/modules/Unity/Application/windowmodel.h	2016-08-24 12:32:11 +0000
@@ -53,12 +53,12 @@
     void countChanged();
 
 private Q_SLOTS:
-    void onWindowAdded(const WindowInfo windowInfo, const unsigned int index);
-    void onWindowRemoved(const unsigned int index);
-    void onWindowMoved(const QPoint topLeft, const unsigned int index);
-    void onWindowResized(const QSize size, const unsigned int index);
-    void onWindowFocused(const unsigned int index);
-    void onWindowInfoChanged(const WindowInfo windowInfo, const unsigned int index);
+    void onWindowAdded(const WindowInfo windowInfo, const int index);
+    void onWindowRemoved(const int index);
+    void onWindowMoved(const QPoint topLeft, const int index);
+    void onWindowResized(const QSize size, const int index);
+    void onWindowFocused(const int index);
+    void onWindowInfoChanged(const WindowInfo windowInfo, const int index);
 
 private:
     void connectToWindowModelNotifier(WindowModelNotifierInterface *notifier);

=== modified file 'miral-qt/src/platforms/mirserver/windowmodelnotifier.cpp'
--- miral-qt/src/platforms/mirserver/windowmodelnotifier.cpp	2016-08-17 16:18:17 +0000
+++ miral-qt/src/platforms/mirserver/windowmodelnotifier.cpp	2016-08-24 12:32:11 +0000
@@ -43,7 +43,7 @@
 void WindowModelNotifier::addWindow(const miral::WindowInfo &windowInfo)
 {
     qDebug("WindowModelNotifier::addWindow");
-    auto stackPosition = static_cast<unsigned int>(m_windowStack.count());
+    auto stackPosition = m_windowStack.count();
     m_windowStack.push_back(windowInfo.window()); // ASSUMPTION: Mir should tell us where in stack
 
     Q_EMIT windowAdded(windowInfo, stackPosition);
@@ -58,8 +58,7 @@
         return;
     }
     m_windowStack.removeAt(pos);
-    auto upos = static_cast<unsigned int>(pos);
-    Q_EMIT windowRemoved(upos);
+    Q_EMIT windowRemoved(pos);
 }
 
 void WindowModelNotifier::focusWindow(const miral::WindowInfo &windowInfo, const bool focus)
@@ -69,11 +68,10 @@
         qDebug("Unknown window focused");
         return;
     }
-    auto upos = static_cast<unsigned int>(pos);
 
-    if (focus && m_focusedWindowIndex != upos) {
-        m_focusedWindowIndex = upos;
-        Q_EMIT windowFocused(upos);
+    if (focus && m_focusedWindowIndex != pos) {
+        m_focusedWindowIndex = pos;
+        Q_EMIT windowFocused(pos);
     }
 }
 
@@ -84,10 +82,9 @@
         qDebug("Unknown window moved");
         return;
     }
-    auto upos = static_cast<unsigned int>(pos);
 
     // Note: windowInfo.window() is in the state before the move
-    Q_EMIT windowMoved(toQPoint(topLeft), upos);
+    Q_EMIT windowMoved(toQPoint(topLeft), pos);
 }
 
 void WindowModelNotifier::resizeWindow(const miral::WindowInfo &windowInfo, mir::geometry::Size newSize)
@@ -97,10 +94,9 @@
         qDebug("Unknown window resized");
         return;
     }
-    auto upos = static_cast<unsigned int>(pos);
 
     // Note: windowInfo.window() is in the state before the resize
-    Q_EMIT windowResized(toQSize(newSize), upos);
+    Q_EMIT windowResized(toQSize(newSize), pos);
 }
 
 void WindowModelNotifier::raiseWindows(const std::vector<miral::Window> &/*windows*/)

=== modified file 'miral-qt/src/platforms/mirserver/windowmodelnotifier.h'
--- miral-qt/src/platforms/mirserver/windowmodelnotifier.h	2016-08-17 16:18:17 +0000
+++ miral-qt/src/platforms/mirserver/windowmodelnotifier.h	2016-08-24 12:32:11 +0000
@@ -43,7 +43,7 @@
 
 private:
     QVector<miral::Window> m_windowStack;
-    unsigned int m_focusedWindowIndex;
+    int m_focusedWindowIndex;
 };
 
 } // namespace qtmir