# HG changeset patch
# User Chris Cannam
# Date 1454584741 0
# Node ID 68ab0fe3bce42b518cffadc1f0460481930300b9
# Parent  aecd5bdfc71f88429aeb474f8e765d345c4b8dc6# Parent  83c60632bac02efd174220f2db8e14786cf57972
Merge from branch "tony-2.0-integration"

diff -r 83c60632bac0 -r 68ab0fe3bce4 framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Wed Oct 14 16:39:14 2015 +0100
+++ b/framework/MainWindowBase.cpp	Thu Feb 04 11:19:01 2016 +0000
@@ -196,6 +196,7 @@
     settings.setValue("view-font-size", viewFontSize);
     settings.endGroup();
 
+#ifdef NOT_DEFINED // This no longer works correctly on any platform AFAICS
     Preferences::BackgroundMode mode =
         Preferences::getInstance()->getBackgroundMode();
     m_initialDarkBackground = m_viewManager->getGlobalDarkBackground();
@@ -203,6 +204,7 @@
         m_viewManager->setGlobalDarkBackground
             (mode == Preferences::DarkBackground);
     }
+#endif
 
     m_paneStack = new PaneStack(0, m_viewManager);
     connect(m_paneStack, SIGNAL(currentPaneChanged(Pane *)),
diff -r 83c60632bac0 -r 68ab0fe3bce4 framework/SVFileReader.cpp
--- a/framework/SVFileReader.cpp	Wed Oct 14 16:39:14 2015 +0100
+++ b/framework/SVFileReader.cpp	Thu Feb 04 11:19:01 2016 +0000
@@ -1166,7 +1166,7 @@
 
 	for (QStringList::iterator i = data.begin(); i != data.end(); ++i) {
 
-	    if (values.size() == (int)dtdm->getHeight()) {
+	    if (int(values.size()) == dtdm->getHeight()) {
 		if (!warned) {
 		    cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row "
 			      << m_rowNumber << endl;