Mercurial > hg > svgui

diff view/PaneStack.cpp @ 908:4a578a360011 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More type fixes
author Chris Cannam
date Tue, 10 Mar 2015 13:22:10 +0000
parents 57efeb75880d
children 36cddc3de023
line wrap: on
line diff
--- a/view/PaneStack.cpp	Tue Mar 10 10:31:27 2015 +0000
+++ b/view/PaneStack.cpp	Tue Mar 10 13:22:10 2015 +0000
@@ -98,7 +98,7 @@
     currentIndicator->setScaledContents(true);
     currentIndicator->setVisible(m_showAccessories);
 
-    int initialCentreFrame = -1;
+    sv_frame_t initialCentreFrame = -1;
     if (!m_panes.empty()) {
         initialCentreFrame = m_panes[0].pane->getCentreFrame();
     }
@@ -156,8 +156,8 @@
             this, SLOT(paneDropAccepted(QStringList)));
     connect(pane, SIGNAL(dropAccepted(QString)),
             this, SLOT(paneDropAccepted(QString)));
-    connect(pane, SIGNAL(doubleClickSelectInvoked(int)),
-            this, SIGNAL(doubleClickSelectInvoked(int)));
+    connect(pane, SIGNAL(doubleClickSelectInvoked(sv_frame_t)),
+            this, SIGNAL(doubleClickSelectInvoked(sv_frame_t)));
 
     emit paneAdded(pane);
     emit paneAdded();
@@ -323,13 +323,13 @@
 int
 PaneStack::getPaneCount() const
 {
-    return m_panes.size();
+    return int(m_panes.size());
 }
 
 int
 PaneStack::getHiddenPaneCount() const
 {
-    return m_hiddenPanes.size();
+    return int(m_hiddenPanes.size());
 }
 
 void