Mercurial > hg > svgui

diff view/PaneStack.cpp @ 946:36cddc3de023 alignment_view

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:19:52 +0100
parents 99373ca20caf 4a578a360011
children a34a2a25907c
line wrap: on
line diff
--- a/view/PaneStack.cpp	Thu Jan 15 16:00:53 2015 +0000
+++ b/view/PaneStack.cpp	Mon Apr 20 09:19:52 2015 +0100
@@ -109,7 +109,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();
     }
@@ -174,8 +174,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();
@@ -366,13 +366,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