Additional fixes for QT5

diff --git a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
index 6172392509c678860a019fad5a2fb7cfb81175e6..f41e1effeb5f69f5e434aade8adb131eba4b1802 100644 (file)
--- a/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
+++ b/src/HEXABLOCKGUI/klinkitemselectionmodel.hxx
@@ -22,11 +22,16 @@
 #ifndef KLINKITEMSELECTIONMODEL_H
 #define KLINKITEMSELECTIONMODEL_H
 
-#include "HEXABLOCKGUI_Export.hxx"\r
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include <QtCore/QObject>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui/QItemSelectionModel>
 #include <QtGui/QAbstractProxyModel>
+#else
+#include <QtCore/QItemSelectionModel>
+#include <QtCore/QAbstractProxyModel>
+#endif
 
 #include <iostream>
 

diff --git a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
index a215ae0b5014fe07bb5eace2f75a28da7f53c329..28bc187ab3fcb98c7d21ba76c4c367a5196c7ac4 100644 (file)
--- a/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
+++ b/src/HEXABLOCKGUI/kmodelindexproxymapper.cxx
@@ -23,8 +23,13 @@
 
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QWeakPointer>
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 #include <QtGui/QAbstractProxyModel>
 #include <QtGui/QItemSelectionModel>
+#else 
+#include <QtCore/QAbstractProxyModel>
+#include <QtCore/QItemSelectionModel>
+#endif
 
 // #include "kdebug.h"
 
@@ -307,4 +312,4 @@ QItemSelection KModelIndexProxyMapper::mapSelectionRightToLeft(const QItemSelect
 }
 
 // #include "kmodelindexproxymapper_moc.cxx"
-// #include "kmodelindexproxymapper.moc"
\ No newline at end of file
+// #include "kmodelindexproxymapper.moc"