Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 22440 → Rev 22439

/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
26,20 → 26,17
 
#include "meshdistortiondialog.h"
 
#include <QPainterPath>
#include <QGraphicsItem>
#include <QGraphicsSceneHoverEvent>
#include <QGraphicsSceneMouseEvent>
#include <QPainterPath>
#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)
/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
31,11 → 31,13
#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
#endif
52,12 → 54,8
#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
{
64,7 → 62,6
public:
NodeItem(QRectF geom, uint num, MeshDistortionDialog *parent);
~NodeItem() {};
void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
uint handle;
bool mouseMoving;
87,7 → 84,6
public:
MeshDistortionDialog(QWidget* parent, ScribusDoc *doc);
~MeshDistortionDialog() {};
void addItemsToScene(Selection* itemSelection, ScribusDoc *doc, QGraphicsPathItem* parentItem, PageItem* parent);
void adjustHandles();
void updateMesh(bool gridOnly);
/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
25,20 → 25,14
***************************************************************************/
 
#include "lensdialog.h"
 
#include <cmath>
 
#include <QGraphicsSceneHoverEvent>
#include <QGraphicsSceneMouseEvent>
#include <QRadialGradient>
#include <QStyleOptionGraphicsItem>
 
#include "commonstrings.h"
#include "iconmanager.h"
#include "pageitem_group.h"
#include "selection.h"
#include "sccolorengine.h"
#include "scpattern.h"
#include "selection.h"
#include "commonstrings.h"
#include "pageitem_group.h"
 
LensItem::LensItem(QRectF geom, LensDialog *parent) : QGraphicsRectItem(geom)
{
/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
33,15 → 33,13
#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
{
48,7 → 46,6
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);
57,7 → 54,6
double scaling;
int handle;
QPointF mousePoint;
 
protected:
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
void mousePressEvent(QGraphicsSceneMouseEvent *event);
76,7 → 72,6
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);
/trunk/Scribus/scribus/sclistboxpixmap.h
9,13 → 9,11
 
#include <memory>
 
#include <QAbstractItemDelegate>
#include <QApplication>
#include <QDebug>
#include <QPainter>
#include <QPixmap>
#include <QScopedPointer>
#include <QStyleOptionViewItem>
#include <QVariant>
 
#include "scguardedptr.h"