[Tora-cvs] SF.net SVN: tora:[5164] trunk/tora/extlibs/libermodel

[<ibr...@us...>]

Revision: 5164
          http://sourceforge.net/p/tora/code/5164
Author:   ibre5041
Date:     2014-11-24 20:02:56 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
Experimental support for QT5

Modified Paths:
--------------
    trunk/tora/extlibs/libermodel/CMakeLists.txt
    trunk/tora/extlibs/libermodel/dotgraph.cpp
    trunk/tora/extlibs/libermodel/dotgraphview.cpp
    trunk/tora/extlibs/libermodel/dotgraphview.h

Modified: trunk/tora/extlibs/libermodel/CMakeLists.txt
===================================================================
--- trunk/tora/extlibs/libermodel/CMakeLists.txt	2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/CMakeLists.txt	2014-11-24 20:02:56 UTC (rev 5164)
@@ -32,7 +32,11 @@
   dotgraph.h
 )
 
+if(QT5_BUILD)
+QT5_WRAP_CPP(ERMODEL_MOC_SOURCES ${ERMODEL_MOC_CLASSES})
+else()
 QT4_WRAP_CPP(ERMODEL_MOC_SOURCES ${ERMODEL_MOC_CLASSES})
+endif()
 
 INCLUDE_DIRECTORIES(${graphviz_INCLUDE_DIRECTORIES})
 

Modified: trunk/tora/extlibs/libermodel/dotgraph.cpp
===================================================================
--- trunk/tora/extlibs/libermodel/dotgraph.cpp	2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/dotgraph.cpp	2014-11-24 20:02:56 UTC (rev 5164)
@@ -44,7 +44,7 @@
 #include <QtCore/QProcess>
 #include <QtCore/QMutexLocker>
 #include <QtCore/QUuid>
-#include <QtGui/QMessageBox>
+#include <QMessageBox>
 
 using namespace boost;
 using namespace boost::spirit::classic;

Modified: trunk/tora/extlibs/libermodel/dotgraphview.cpp
===================================================================
--- trunk/tora/extlibs/libermodel/dotgraphview.cpp	2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/dotgraphview.cpp	2014-11-24 20:02:56 UTC (rev 5164)
@@ -49,7 +49,7 @@
 
 #include <QtGui/QMatrix>
 #include <QtGui/QPainter>
-#include <QtGui/QStyle>
+#include <QStyle>
 #include <QtGui/QImage>
 #include <QtGui/QContextMenuEvent>
 #include <QtGui/QKeyEvent>
@@ -59,13 +59,13 @@
 #include <QtGui/QFocusEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QWheelEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QGraphicsSimpleTextItem>
-#include <QtGui/QScrollBar>
-#include <QtGui/QActionGroup>
-#include <QtGui/QInputDialog>
-#include <QtGui/QApplication>
-#include <QtGui/QFileDialog>
+#include <QMenu>
+#include <QGraphicsSimpleTextItem>
+#include <QScrollBar>
+#include <QActionGroup>
+#include <QInputDialog>
+#include <QApplication>
+#include <QFileDialog>
 
 #include <QMessageBox> // TODO just a test - remove me
 
@@ -481,7 +481,7 @@
         font->setPointSize(fontSize);
         fm = QFontMetrics(*font);
       }
-      QGraphicsSimpleTextItem* labelView = new QGraphicsSimpleTextItem(str, 0, m_canvas);
+      QGraphicsSimpleTextItem* labelView = new QGraphicsSimpleTextItem(str, 0/* obsolete parameter, m_canvas*/);
       labelView->setFont(*font);
       labelView->setPos(
                   (scaleX *

Modified: trunk/tora/extlibs/libermodel/dotgraphview.h
===================================================================
--- trunk/tora/extlibs/libermodel/dotgraphview.h	2014-11-24 20:00:27 UTC (rev 5163)
+++ trunk/tora/extlibs/libermodel/dotgraphview.h	2014-11-24 20:02:56 UTC (rev 5164)
@@ -36,7 +36,7 @@
 ///#include <kactioncollection.h>
 ///#include <kconfiggroup.h>
 
-#include <QtGui/QGraphicsView>
+#include <QGraphicsView>
 #include <QtCore/QSet>
 #include <QtCore/QMap>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.