Fixed a bug with a >5.6 QMap API usage.

Author: josch1710

CMakeLists.txt

@@ -47,12 +47,12 @@ set(SOURCES
     src/rcl.cpp
     src/sdxprotocol.cpp
     src/sioworker.cpp
-        src/diskimages/diskimagepro.cpp
-        src/diskimages/diskimageatx.cpp
+    src/diskimages/diskimagepro.cpp
+    src/diskimages/diskimageatx.cpp
     src/optionsdialog.cpp
     src/aboutdialog.cpp
-        src/diskimages/diskimage.cpp
-        src/diskimages/folderimage.cpp
+    src/diskimages/diskimage.cpp
+    src/diskimages/folderimage.cpp
     src/diskbrowser/folderdisks.cpp
     src/diskbrowser/diskbrowserdlg.cpp
     src/diskbrowser/dbsettings.cpp
@@ -87,15 +87,15 @@ set(SOURCES
     src/printers/centronics.cpp
     src/printers/escp.cpp
     src/printers/atari1029.cpp
-        src/diskimages/diskimageatr.cpp
-        src/diskimages/disassembly810.cpp
-        src/diskimages/disassembly1050.cpp
+    src/diskimages/diskimageatr.cpp
+    src/diskimages/disassembly810.cpp
+    src/diskimages/disassembly1050.cpp
     src/printers/printerfactory.cpp
     src/printers/atari1025.cpp
     src/printers/passthrough.cpp
     src/printers/graphicsprimitive.cpp
     src/crc16.cpp
-        src/diskimages/cpu6502.cpp
+    src/diskimages/cpu6502.cpp
     src/filesystems/ataridirentry.cpp
     src/filesystems/atarifilesystem.cpp
     src/filesystems/dos10filesystem.cpp
@@ -104,7 +104,11 @@ set(SOURCES
     src/filesystems/mydosfilesystem.cpp
     src/filesystems/spartadosfilesystem.cpp
     src/diskimages/diskgeometry.cpp
-        src/diskimages/prosectorinfo.cpp src/diskimages/atxsectorinfo.cpp src/diskimages/atxtrackinfo.cpp src/diskimages/board.cpp)
+    src/diskimages/prosectorinfo.cpp
+    src/diskimages/atxsectorinfo.cpp
+    src/diskimages/atxtrackinfo.cpp
+    src/diskimages/board.cpp
+)
 
 set(HEADERS
     include/mainwindow.h
@@ -119,8 +123,8 @@ set(HEADERS
     include/sioworker.h
     include/optionsdialog.h
     include/aboutdialog.h
-        include/diskimages/diskimage.h
-        include/diskimages/folderimage.h
+    include/diskimages/diskimage.h
+    include/diskimages/folderimage.h
     include/diskbrowser/folderdisks.h
     include/diskbrowser/diskbrowserdlg.h
     include/diskbrowser/dbsettings.h
@@ -155,15 +159,15 @@ set(HEADERS
     include/printers/centronics.h
     include/printers/escp.h
     include/printers/atari1029.h
-        include/diskimages/disassembly810.h
-        include/diskimages/disassembly1050.h
+    include/diskimages/disassembly810.h
+    include/diskimages/disassembly1050.h
     include/printers/printerfactory.h
     include/printers/atari1025.h
     include/printers/passthrough.h
     include/smartdevice.h
     include/printers/graphicsprimitive.h
     include/crc16.h
-        include/diskimages/cpu6502.h
+    include/diskimages/cpu6502.h
     headers/atarisio.h
     include/filesystems/ataridirentry.h
     include/filesystems/atarifilesystem.h
@@ -173,7 +177,11 @@ set(HEADERS
     include/filesystems/mydosfilesystem.h
     include/filesystems/spartadosfilesystem.h
     include/diskimages/diskgeometry.h
-        include/diskimages/prosectorinfo.h include/diskimages/atxsectorinfo.h include/diskimages/atxtrackinfo.h include/diskimages/board.h)
+    include/diskimages/prosectorinfo.h
+    include/diskimages/atxsectorinfo.h
+    include/diskimages/atxtrackinfo.h
+    include/diskimages/board.h
+)
 
 set(FORMS
     ui/mainwindow.ui

include/diskbrowser/dbsettings.h

@@ -38,7 +38,7 @@ struct DirInfo
 //    - default pic for whole dir
 //    - ArtMap[disk name] -> FloppyArt { pic, label text }
 //
-typedef QMap<QString,DirInfo> DirMap;
+typedef QMap<QString, DirInfo> DirMap;
 
 
 struct LabelPos

src/respeqtsettings.cpp

@@ -1100,7 +1100,7 @@ void RespeqtSettings::setDbDataSource(DbDataSource newDbSource)
 
 DbDataSource RespeqtSettings::dbDataSource()
 {
-    assert(mSettings->group().isEmpty());
+    //assert(mSettings->group().isEmpty());
     return static_cast<DbDataSource>(mSettings->value("/DiskBrowserDlg/source", DbData_appSettings).toInt());
 }