# HG changeset patch
# User Chris Cannam
# Date 1363010122 0
# Node ID 2b3a8ae0459703aed83b359f1508be2c14e36f22
# Parent  3b2409646cc0ea92cb2d9be1d434901fa097d0b1
Get remainder of svcore building with Qt5

diff -r 3b2409646cc0 -r 2b3a8ae04597 data/fileio/FileSource.cpp
--- a/data/fileio/FileSource.cpp	Mon Mar 11 13:42:01 2013 +0000
+++ b/data/fileio/FileSource.cpp	Mon Mar 11 13:55:22 2013 +0000
@@ -31,7 +31,7 @@
 
 #include <unistd.h>
 
-#define DEBUG_FILE_SOURCE 1
+//#define DEBUG_FILE_SOURCE 1
 
 int
 FileSource::m_count = 0;
@@ -725,6 +725,17 @@
 }
 
 void
+FileSource::replyFailed(QNetworkReply::NetworkError)
+{
+    emit progress(100);
+    m_errorString = m_reply->errorString();
+    m_ok = false;
+    m_done = true;
+    cleanup();
+    emit ready();
+}
+
+void
 FileSource::deleteCacheFile()
 {
 #ifdef DEBUG_FILE_SOURCE
diff -r 3b2409646cc0 -r 2b3a8ae04597 data/fileio/test/AudioFileReaderTest.h
--- a/data/fileio/test/AudioFileReaderTest.h	Mon Mar 11 13:42:01 2013 +0000
+++ b/data/fileio/test/AudioFileReaderTest.h	Mon Mar 11 13:55:22 2013 +0000
@@ -78,7 +78,7 @@
         if (bits.length() > 2) nominalDepth = bits[2].toInt();
 
 	if (!reader) {
-	    QSKIP("Unsupported file, skipping", SkipSingle);
+	    QSKIP("Unsupported file, skipping");
 	}
 
         QCOMPARE((int)reader->getChannelCount(), nominalChannels);
diff -r 3b2409646cc0 -r 2b3a8ae04597 data/model/ModelDataTableModel.cpp
--- a/data/model/ModelDataTableModel.cpp	Mon Mar 11 13:42:01 2013 +0000
+++ b/data/model/ModelDataTableModel.cpp	Mon Mar 11 13:55:22 2013 +0000
@@ -129,7 +129,7 @@
 QModelIndex
 ModelDataTableModel::index(int row, int column, const QModelIndex &parent) const
 {
-    return createIndex(row, column, 0);
+    return createIndex(row, column, (void *)0);
 }
 
 QModelIndex
@@ -159,7 +159,7 @@
 {
     if (!m_model) return createIndex(0, 0);
     int row = m_model->getRowForFrame(frame);
-    return createIndex(getSorted(row), 0, 0);
+    return createIndex(getSorted(row), 0, (void *)0);
 }
 
 size_t 
@@ -206,7 +206,7 @@
     int current = getCurrentRow();
     if (current != prevCurrent) {
 //         std::cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << std::endl;
-         emit currentChanged(createIndex(current, 0, 0));
+        emit currentChanged(createIndex(current, 0, (void *)0));
     }
     emit layoutChanged();
 }