Merge branch 'dev' of https://github.com/DIP-SEM/OpenBoard into dev

src/core/main.cpp

@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 
     //app.initialize(false); // should not be needed anymore
 
-    QObject::connect(&app, SIGNAL(messageReceived(const QString&)), &app, SLOT(handleOpenMessage(const QString&)));
+    QObject::connect(&app, SIGNAL(messageReceived(const QString&, QObject*)), &app, SLOT(handleOpenMessage(const QString&)));
 
     qDebug() << "file name argument" << fileToOpen;
     int result = app.exec(fileToOpen);

src/domain/UBGraphicsPolygonItem.cpp

@@ -211,16 +211,6 @@ void UBGraphicsPolygonItem::paint ( QPainter * painter, const QStyleOptionGraphi
     QGraphicsPolygonItem::paint(painter, option, widget);
 }
 
-QPainterPath UBGraphicsPolygonItem::shape() const
-{
-
-    QPainterPath path;
-    path.addRect(boundingRect());
-
-    return path;
-}
-
-
 UBGraphicsScene* UBGraphicsPolygonItem::scene()
 {
     return qobject_cast<UBGraphicsScene*>(QGraphicsPolygonItem::scene());

src/domain/UBGraphicsPolygonItem.h

@@ -132,7 +132,6 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem
 
     protected:
         void paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget);
-        QPainterPath shape () const;
 
 
     private: