Author: jghali
Date: Tue Mar 20 20:46:12 2018
New Revision: 22440
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22440
Log:
#15208: Fix build with Qt 5.11 (missing headers)
Modified:
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
trunk/Scribus/scribus/sclistboxpixmap.h
Modified:
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22440&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
(original)
+++
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
Tue Mar 20 20:46:12 2018
@@ -26,17 +26,20 @@
#include "meshdistortiondialog.h"
+#include <QGraphicsItem>
+#include <QGraphicsSceneHoverEvent>
+#include <QGraphicsSceneMouseEvent>
#include <QPainterPath>
-#include <QGraphicsItem>
+#include <QStyleOptionGraphicsItem>
#include "commonstrings.h"
#include "fpointarray.h"
+#include "iconmanager.h"
#include "pageitem.h"
#include "pageitem_group.h"
#include "sccolorengine.h"
#include "scpattern.h"
#include "selection.h"
-#include "iconmanager.h"
#include "util_math.h"
NodeItem::NodeItem(QRectF geom, uint num, MeshDistortionDialog *parent) :
QGraphicsEllipseItem(geom)
Modified:
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22440&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
==============================================================================
---
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
(original)
+++
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
Tue Mar 20 20:46:12 2018
@@ -31,12 +31,10 @@
#include <QList>
#include <QGraphicsEllipseItem>
#include <QGraphicsPathItem>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneHoverEvent>
+
#include "ui_meshdistortiondialog.h"
#include "pluginapi.h"
#include "scribusdoc.h"
-
#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
#define _USE_MATH_DEFINES
@@ -54,14 +52,19 @@
#include "third_party/lib2geom/transforms.h"
#include "third_party/lib2geom/scribushelper.h"
#include <vector>
+
//using namespace Geom;
class MeshDistortionDialog;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QStyleOptionGraphicsItem;
class PLUGIN_API NodeItem : public QGraphicsEllipseItem
{
public:
NodeItem(QRectF geom, uint num, MeshDistortionDialog *parent);
~NodeItem() {};
+
void paint(QPainter *painter, const QStyleOptionGraphicsItem *item,
QWidget *widget);
uint handle;
bool mouseMoving;
@@ -84,6 +87,7 @@
public:
MeshDistortionDialog(QWidget* parent, ScribusDoc *doc);
~MeshDistortionDialog() {};
+
void addItemsToScene(Selection* itemSelection, ScribusDoc *doc,
QGraphicsPathItem* parentItem, PageItem* parent);
void adjustHandles();
void updateMesh(bool gridOnly);
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22440&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp Tue Mar
20 20:46:12 2018
@@ -25,14 +25,20 @@
***************************************************************************/
#include "lensdialog.h"
+
#include <cmath>
+
+#include <QGraphicsSceneHoverEvent>
+#include <QGraphicsSceneMouseEvent>
#include <QRadialGradient>
+#include <QStyleOptionGraphicsItem>
+
+#include "commonstrings.h"
#include "iconmanager.h"
-#include "selection.h"
+#include "pageitem_group.h"
#include "sccolorengine.h"
#include "scpattern.h"
-#include "commonstrings.h"
-#include "pageitem_group.h"
+#include "selection.h"
LensItem::LensItem(QRectF geom, LensDialog *parent) : QGraphicsRectItem(geom)
{
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22440&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
(original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h Tue Mar
20 20:46:12 2018
@@ -33,19 +33,22 @@
#include <QGraphicsItem>
#include <QGraphicsRectItem>
#include <QGraphicsPathItem>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneHoverEvent>
+
#include "ui_lensdialogbase.h"
#include "pluginapi.h"
#include "scribusdoc.h"
class LensDialog;
+class QGraphicsSceneHoverEvent;
+class QGraphicsSceneMouseEvent;
+class QStyleOptionGraphicsItem;
class PLUGIN_API LensItem : public QGraphicsRectItem
{
public:
LensItem(QRectF geom, LensDialog *parent);
~LensItem() {};
+
void setStrength(double s);
void updateEffect();
QPainterPath lensDeform(const QPainterPath &source, const QPointF
&offset, double m_radius, double s);
@@ -54,6 +57,7 @@
double scaling;
int handle;
QPointF mousePoint;
+
protected:
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
void mousePressEvent(QGraphicsSceneMouseEvent *event);
@@ -72,6 +76,7 @@
public:
LensDialog(QWidget* parent, ScribusDoc *doc);
~LensDialog() {};
+
void addItemsToScene(Selection* itemSelection, ScribusDoc *doc,
QGraphicsPathItem* parentItem, PageItem* parent);
void lensSelected(LensItem *item);
void setLensPositionValues(QPointF p);
Modified: trunk/Scribus/scribus/sclistboxpixmap.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22440&path=/trunk/Scribus/scribus/sclistboxpixmap.h
==============================================================================
--- trunk/Scribus/scribus/sclistboxpixmap.h (original)
+++ trunk/Scribus/scribus/sclistboxpixmap.h Tue Mar 20 20:46:12 2018
@@ -9,11 +9,13 @@
#include <memory>
+#include <QAbstractItemDelegate>
#include <QApplication>
#include <QDebug>
#include <QPainter>
#include <QPixmap>
#include <QScopedPointer>
+#include <QStyleOptionViewItem>
#include <QVariant>
#include "scguardedptr.h"
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
