Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 23699 → Rev 23700

/trunk/Scribus/scribus/canvasmode_create.cpp
177,7 → 177,7
// the following code was moved from scribusview.cpp:
 
 
void CreateMode::enterEvent(QEvent *)
void CreateMode::enterEvent(QEvent *e)
{
if (!m_MouseButtonPressed)
{
254,8 → 254,8
return;
if (GetItem(&currItem))
{
newX = mousePointDoc.x(); //m_view->translateToDoc(m->x(), m->y()).x());
newY = mousePointDoc.y(); //m_view->translateToDoc(m->x(), m->y()).y());
// newX = mousePointDoc.x(); //m_view->translateToDoc(m->x(), m->y()).x());
// newY = mousePointDoc.y(); //m_view->translateToDoc(m->x(), m->y()).y());
if (m_doc->DragP)
return;
/trunk/Scribus/scribus/canvasmode_create.h
38,8 → 38,8
explicit CreateMode(ScribusView* view);
~CreateMode() override = default;
 
void enterEvent(QEvent *) override;
void leaveEvent(QEvent *) override;
void enterEvent(QEvent *e) override;
void leaveEvent(QEvent *e) override;
void activate(bool) override;
void deactivate(bool) override;
/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
98,7 → 98,7
 
// the following code was moved from scribusview.cpp:
 
void BezierMode::enterEvent(QEvent *)
void BezierMode::enterEvent(QEvent *e)
{
if (!m_mouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_drawbezier.h
35,8 → 35,8
explicit BezierMode(ScribusView* view);
~BezierMode() override = default;
 
void enterEvent(QEvent *) override;
void leaveEvent(QEvent *) override;
void enterEvent(QEvent *e) override;
void leaveEvent(QEvent *e) override;
 
void activate(bool) override;
void deactivate(bool) override;
/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
58,7 → 58,7
return (*pi) != nullptr;
}
 
void CalligraphicMode::enterEvent(QEvent *)
void CalligraphicMode::enterEvent(QEvent *e)
{
if (!m_mouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
54,7 → 54,7
return (*pi) != nullptr;
}
 
void FreehandMode::enterEvent(QEvent *)
void FreehandMode::enterEvent(QEvent *e)
{
if (!m_mouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_edit.cpp
250,7 → 250,7
}
}
 
void CanvasMode_Edit::enterEvent(QEvent *)
void CanvasMode_Edit::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_editarc.cpp
135,7 → 135,7
psx->drawPoint(m_heightPoint);
}
 
void CanvasMode_EditArc::enterEvent(QEvent *)
void CanvasMode_EditArc::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
342,7 → 342,7
}
}
 
void CanvasMode_EditMeshGradient::enterEvent(QEvent *)
void CanvasMode_EditMeshGradient::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
271,7 → 271,7
}
}
 
void CanvasMode_EditMeshPatch::enterEvent(QEvent *)
void CanvasMode_EditMeshPatch::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_editpolygon.cpp
128,7 → 128,7
}
}
 
void CanvasMode_EditPolygon::enterEvent(QEvent *)
void CanvasMode_EditPolygon::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
setModeCursor();
/trunk/Scribus/scribus/canvasmode_editspiral.cpp
94,7 → 94,7
psx->drawPoint(m_endPoint);
}
 
void CanvasMode_EditSpiral::enterEvent(QEvent *)
void CanvasMode_EditSpiral::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
108,7 → 108,7
}
}
 
void CanvasMode_EditWeldPoint::enterEvent(QEvent *)
void CanvasMode_EditWeldPoint::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
67,7 → 67,7
commonDrawControls(p, false);
}
 
void CanvasMode_EyeDropper::enterEvent(QEvent *)
void CanvasMode_EyeDropper::enterEvent(QEvent *e)
{
setModeCursor();
}
/trunk/Scribus/scribus/canvasmode_framelinks.cpp
67,7 → 67,7
commonDrawControls(p, false);
}
 
void CanvasMode_FrameLinks::enterEvent(QEvent *)
void CanvasMode_FrameLinks::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_imageimport.cpp
90,7 → 90,7
commonDrawControls(p, false);
}
 
void CanvasMode_ImageImport::enterEvent(QEvent *)
void CanvasMode_ImageImport::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
setModeCursor();
/trunk/Scribus/scribus/canvasmode_magnifier.cpp
60,7 → 60,7
commonDrawControls(p, false);
}
 
void CanvasMode_Magnifier::enterEvent(QEvent *)
void CanvasMode_Magnifier::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
setModeCursor();
/trunk/Scribus/scribus/canvasmode_measurements.cpp
35,12 → 35,12
connect( m_palette, SIGNAL(paletteShown(bool)), this, SLOT(setActive(bool)));
}
 
void MeasurementsMode::enterEvent(QEvent *)
void MeasurementsMode::enterEvent(QEvent *e)
{
m_view->setCursor(QCursor(Qt::CrossCursor));
}
 
void MeasurementsMode::leaveEvent(QEvent *)
void MeasurementsMode::leaveEvent(QEvent *e)
{
}
 
/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
241,7 → 241,7
 
 
 
void CanvasMode_NodeEdit::enterEvent(QEvent *)
void CanvasMode_NodeEdit::enterEvent(QEvent *e)
{
}
 
495,7 → 495,7
commonkeyReleaseEvent(e);
}
 
void CanvasMode_NodeEdit::handleNodeEditPress(QMouseEvent* m, QRect)
void CanvasMode_NodeEdit::handleNodeEditPress(QMouseEvent* m, QRect r)
{
FPoint npf2;
bool edited = false;
959,7 → 959,7
 
 
 
bool CanvasMode_NodeEdit::handleNodeEditMove(QMouseEvent* m, QRect, PageItem* currItem, const QTransform&)
bool CanvasMode_NodeEdit::handleNodeEditMove(QMouseEvent* m, QRect r, PageItem* currItem, const QTransform&)
{
QTransform itemPos = currItem->getTransform();
if ((currItem->isSymbol() || currItem->isGroup()) && (!m_doc->nodeEdit.isContourLine()))
/trunk/Scribus/scribus/canvasmode_nodeedit.h
58,9 → 58,9
 
private:
inline bool GetItem(PageItem** pi);
void handleNodeEditPress(QMouseEvent*, QRect);
void handleNodeEditPress(QMouseEvent*, QRect r);
void handleNodeEditDrag(QMouseEvent*, PageItem*);
bool handleNodeEditMove(QMouseEvent*, QRect, PageItem*, const QTransform&);
bool handleNodeEditMove(QMouseEvent*, QRect r, PageItem*, const QTransform&);
 
ScribusMainWindow* m_ScMW;
 
/trunk/Scribus/scribus/canvasmode_normal.cpp
90,7 → 90,7
drawSelection(p, !m_doc->drawAsPreview);
}
 
void CanvasMode_Normal::enterEvent(QEvent *)
void CanvasMode_Normal::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_objimport.cpp
70,7 → 70,7
drawSelection(p, false);
}
 
void CanvasMode_ObjImport::enterEvent(QEvent *)
void CanvasMode_ObjImport::enterEvent(QEvent *e)
{
if (m_mimeData)
{
/trunk/Scribus/scribus/canvasmode_panning.cpp
41,7 → 41,7
commonDrawControls(p, false);
}
 
void CanvasMode_Panning::enterEvent(QEvent *)
void CanvasMode_Panning::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
/trunk/Scribus/scribus/canvasmode_rotate.cpp
182,7 → 182,7
CanvasMode::deactivate(forGesture);
}
 
void CanvasMode_Rotate::enterEvent(QEvent *)
void CanvasMode_Rotate::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
190,7 → 190,7
}
}
 
void CanvasMode_Rotate::leaveEvent(QEvent *)
void CanvasMode_Rotate::leaveEvent(QEvent *e)
{
}
 
/trunk/Scribus/scribus/fonts/ftface.h
89,7 → 89,7
 
static bool hasMicrosoftUnicodeCmap(FT_Face face);
static QString adobeGlyphName(FT_ULong charcode);
virtual bool glyphNames(ScFace::FaceEncoding& GList) const;
virtual bool glyphNames(ScFace::FaceEncoding& glyphList) const;
 
void load() const;
void unload() const;
/trunk/Scribus/scribus/fonts/scface.h
397,7 → 397,7
/// translate unicode to glyph index
gid_type char2CMap(uint ch) const;
 
gid_type emulateGlyph(uint u) const;
gid_type emulateGlyph(uint ch) const;
 
gid_type hyphenGlyph() const;
gid_type hyphenGlyph(const CharStyle& style) const;
/trunk/Scribus/scribus/pdfoptionsio.h
73,10 → 73,10
*
* @warning on failure, struct contents are undefined.
*
* @param inStream QIODevice to settings data from.
* @param inDevice QIODevice to settings data from.
* @return True for success.
*/
bool readFrom(QIODevice& inStream);
bool readFrom(QIODevice& inDevice);
bool readFrom(const QString& inFileName);
 
/**
/trunk/Scribus/scribus/pluginmanager.cpp
500,7 → 500,7
return false;
}
 
bool PluginManager::loadPlugin(PluginData & pda)
bool PluginManager::loadPlugin(PluginData& pluginData)
{
typedef int (*getPluginAPIVersionPtr)();
typedef ScPlugin* (*getPluginPtr)();
507,17 → 507,17
getPluginAPIVersionPtr getPluginAPIVersion;
getPluginPtr getPlugin;
 
Q_ASSERT(pda.plugin == nullptr);
Q_ASSERT(pda.pluginDLL == nullptr);
Q_ASSERT(!pda.enabled);
pda.plugin = nullptr;
Q_ASSERT(pluginData.plugin == nullptr);
Q_ASSERT(pluginData.pluginDLL == nullptr);
Q_ASSERT(!pluginData.enabled);
pluginData.plugin = nullptr;
 
pda.pluginDLL = loadDLL(pda.pluginFile);
if (!pda.pluginDLL)
pluginData.pluginDLL = loadDLL(pluginData.pluginFile);
if (!pluginData.pluginDLL)
return false;
 
getPluginAPIVersion = (getPluginAPIVersionPtr)
resolveSym(pda.pluginDLL, QString(pda.pluginName + "_getPluginAPIVersion").toLocal8Bit().data());
resolveSym(pluginData.pluginDLL, QString(pluginData.pluginName + "_getPluginAPIVersion").toLocal8Bit().data());
if (getPluginAPIVersion)
{
int gotVersion = (*getPluginAPIVersion)();
524,19 → 524,19
if ( gotVersion != PLUGIN_API_VERSION )
{
qDebug("API version mismatch when loading %s: Got %i, expected %i",
pda.pluginFile.toLocal8Bit().data(), gotVersion, PLUGIN_API_VERSION);
pluginData.pluginFile.toLocal8Bit().data(), gotVersion, PLUGIN_API_VERSION);
}
else
{
getPlugin = (getPluginPtr)
resolveSym(pda.pluginDLL, QString(pda.pluginName + "_getPlugin").toLocal8Bit().data());
resolveSym(pluginData.pluginDLL, QString(pluginData.pluginName + "_getPlugin").toLocal8Bit().data());
if (getPlugin)
{
pda.plugin = (*getPlugin)();
if (!pda.plugin)
pluginData.plugin = (*getPlugin)();
if (!pluginData.plugin)
{
qDebug("Unable to get ScPlugin when loading %s",
pda.pluginFile.toLocal8Bit().data());
pluginData.pluginFile.toLocal8Bit().data());
}
else
return true;
543,9 → 543,9
}
}
}
unloadDLL(pda.pluginDLL);
pda.pluginDLL = nullptr;
Q_ASSERT(!pda.plugin);
unloadDLL(pluginData.pluginDLL);
pluginData.pluginDLL = nullptr;
Q_ASSERT(!pluginData.plugin);
return false;
}
 
/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
59,8 → 59,8
QMap<int, int> itemRemap;
QMap<int, int> itemNext;
QList<PageItem*> FrameItems;
int itemCount;
bool newReplacement;
int itemCount {0};
bool newReplacement {false};
QMap<QString,QString> ReplacedFonts;
QMap<uint,QString> DoVorl;
uint VorlC;
/trunk/Scribus/scribus/rawimage.cpp
8,10 → 8,6
 
RawImage::RawImage()
{
m_width = 0;
m_height = 0;
m_channels = 0;
resize(0);
}
 
RawImage::RawImage( int width, int height, int channels )
/trunk/Scribus/scribus/rawimage.h
27,9 → 27,9
void setAlpha(int x, int y, int alpha);
QImage convertToQImage(bool cmyk, bool raw = false);
private:
int m_width;
int m_height;
int m_channels;
int m_width {0};
int m_height {0};
int m_channels {0};
};
 
#endif
/trunk/Scribus/scribus/sccolor.cpp
33,39 → 33,23
 
ScColor::ScColor()
{
// Model = colorModelCMYK;
// CR = MG = YB = K = 0;
m_Model = colorModelRGB;
m_values[0] = 0.6;
m_values[1] = 0.4;
m_values[2] = 0.2;
m_values[3] = 0.0;
m_L_val = m_a_val = m_b_val = 0;
m_Spot = false;
m_Regist = false;
}
 
ScColor::ScColor(int c, int m, int y, int k)
{
m_L_val = m_a_val = m_b_val = 0;
m_Spot = false;
m_Regist = false;
setColor(c, m, y, k);
}
ScColor::ScColor(int r, int g, int b)
{
m_values[3] = 0.0;
m_L_val = m_a_val = m_b_val = 0;
m_Spot = false;
m_Regist = false;
setRgbColor(r, g, b);
}
 
ScColor::ScColor(double l, double a, double b)
{
m_Spot = false;
m_Regist = false;
m_Model = colorModelLab;
 
m_L_val = l;
75,7 → 59,6
m_values[0] = 0.6;
m_values[1] = 0.4;
m_values[2] = 0.2;
m_values[3] = 0.0;
}
 
bool ScColor::operator==(const ScColor& other) const
/trunk/Scribus/scribus/sccolor.h
148,22 → 148,21
void setRegistrationColor(bool s);
 
private:
 
/** \brief Color values (depends of color model) */
double m_values[4];
double m_values[4] {0.0, 0.0, 0.0, 0.0};
/** \brief L component of Color */
double m_L_val;
double m_L_val {0.0};
/** \brief a component of Color */
double m_a_val;
double m_a_val {0.0};
/** \brief b component of Color */
double m_b_val;
double m_b_val {0.0};
 
/** \brief Flag, true if the Color is a Spotcolor */
bool m_Spot;
bool m_Spot {false};
/** \brief Flag, true if the Color is a Registration color */
bool m_Regist;
bool m_Regist {false};
/** \brief Color model of the current color */
colorModel m_Model;
colorModel m_Model {colorModelRGB};
};
 
class SCRIBUS_API ColorList : public QMap<QString,ScColor>
/trunk/Scribus/scribus/scpattern.cpp
61,12 → 61,12
return &pattern;
}
 
void ScPattern::setPattern(const QString& name)
void ScPattern::setPattern(const QString& filename)
{
items.clear();
doc->setLoading(true);
PageItem* newItem = new PageItem_ImageFrame(doc, 0, 0, 1, 1, 0, CommonStrings::None, CommonStrings::None);
if (newItem->loadImage(name, false, 72, false))
if (newItem->loadImage(filename, false, 72, false))
{
pattern = newItem->pixm.qImage().copy();
scaleX = (72.0 / newItem->pixm.imgInfo.xres) * newItem->pixm.imgInfo.lowResScale;
/trunk/Scribus/scribus/scpattern.h
41,7 → 41,7
 
QImage* getPattern();
void setDoc(ScribusDoc *theDoc);
void setPattern(const QString& file);
void setPattern(const QString& filename);
void createPreview();
 
double scaleX;
/trunk/Scribus/scribus/scribus.h
133,7 → 133,7
/*!
* \retval 0 - ok, 1 - no fonts, ...
*/
int initScMW(bool primaryMainwWindow);
int initScMW(bool primaryMainWindow);
void setupMainWindow();
int getScreenNumber() const;
QScreen* getScreen() const;
/trunk/Scribus/scribus/scribusdoc.cpp
2448,7 → 2448,7
}
 
 
ScPage* ScribusDoc::addPage(int pageIndex, const QString& masterPageName, bool addAutoFrame)
ScPage* ScribusDoc::addPage(int pageNumber, const QString& masterPageName, bool addAutoFrame)
{
assert(masterPageMode() == false);
ScPage* addedPage = new ScPage(m_docPrefsData.displayPrefs.scratch.left(), DocPages.count()*(m_docPrefsData.docSetupPrefs.pageHeight+m_docPrefsData.displayPrefs.scratch.bottom()+m_docPrefsData.displayPrefs.scratch.top())+m_docPrefsData.displayPrefs.scratch.top(), m_docPrefsData.docSetupPrefs.pageWidth, m_docPrefsData.docSetupPrefs.pageHeight);
2457,18 → 2457,18
addedPage->Margins.setTop(m_docPrefsData.docSetupPrefs.margins.top());
addedPage->Margins.setBottom(m_docPrefsData.docSetupPrefs.margins.bottom());
addedPage->initialMargins = m_docPrefsData.docSetupPrefs.margins;
addedPage->setPageNr(pageIndex);
addedPage->setPageNr(pageNumber);
addedPage->setSize(m_docPrefsData.docSetupPrefs.pageSize);
addedPage->setOrientation(m_docPrefsData.docSetupPrefs.pageOrientation);
addedPage->marginPreset = m_docPrefsData.docSetupPrefs.marginPreset;
DocPages.insert(pageIndex, addedPage);
assert(DocPages.at(pageIndex) != nullptr);
DocPages.insert(pageNumber, addedPage);
assert(DocPages.at(pageNumber) != nullptr);
setCurrentPage(addedPage);
if (!masterPageName.isEmpty())
applyMasterPage(masterPageName, pageIndex);
setLocationBasedPageLRMargins(pageIndex);
applyMasterPage(masterPageName, pageNumber);
setLocationBasedPageLRMargins(pageNumber);
if (addAutoFrame && m_automaticTextFrames)
addAutomaticTextFrame(pageIndex);
addAutomaticTextFrame(pageNumber);
return addedPage;
}
 
/trunk/Scribus/scribus/scribusstructs.h
165,9 → 165,9
 
struct LPIData
{
int Frequency;
int Angle;
int SpotFunc;
int Frequency {0};
int Angle {0};
int SpotFunc {0};
};
 
struct Keys
/trunk/Scribus/scribus/text/frect.h
91,7 → 91,7
FPoint center() const;
 
void rect( qreal *x, qreal *y, qreal *w, qreal *h ) const;
void coords( qreal *x1, qreal *y1, qreal *x2, qreal *y2 ) const;
void coords( qreal *xp1, qreal *yp1, qreal *xp2, qreal *yp2 ) const;
 
void moveLeft( qreal pos );
void moveTop( qreal pos );
105,8 → 105,8
void moveBy( qreal dx, qreal dy );
 
void setRect( qreal x, qreal y, qreal w, qreal h );
void setCoords( qreal x1, qreal y1, qreal x2, qreal y2 );
void addCoords( qreal x1, qreal y1, qreal x2, qreal y2 );
void setCoords( qreal xp1, qreal yp1, qreal xp2, qreal yp );
void addCoords( qreal xp1, qreal yp1, qreal xp2, qreal yp2 );
 
FSize size() const;
qreal width() const;
/trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
51,7 → 51,7
TreeItem(const QList<QVariant> &data, TreeItem *parent = 0);
~TreeItem();
 
void appendChild(TreeItem *child);
void appendChild(TreeItem *item);
 
TreeItem *child(int row);
int childCount() const;
/trunk/Scribus/scribus/ui/applytemplatedialog.cpp
155,13 → 155,13
// no need to delete child widgets, Qt does it all for us
}
 
void ApplyMasterPageDialog::setup(ScribusDoc *doc, QString Nam)
void ApplyMasterPageDialog::setup(ScribusDoc *doc, const QString& Nam)
{
QString na = Nam == CommonStrings::masterPageNormal ? CommonStrings::trMasterPageNormal : Nam, in;
QString na = (Nam == CommonStrings::masterPageNormal) ? CommonStrings::trMasterPageNormal : Nam, in;
int cc = 0;
for (QMap<QString,int>::Iterator it = doc->MasterNames.begin(); it != doc->MasterNames.end(); ++it)
{
in = it.key() == CommonStrings::masterPageNormal ? CommonStrings::trMasterPageNormal : it.key();
in = (it.key() == CommonStrings::masterPageNormal) ? CommonStrings::trMasterPageNormal : it.key();
masterPageComboBox->addItem(in, it.key());
if (in == na)
masterPageComboBox->setCurrentIndex(cc);
/trunk/Scribus/scribus/ui/applytemplatedialog.h
58,7 → 58,7
QPushButton* okButton;
QPushButton* cancelButton;
 
virtual void setup( ScribusDoc * view, QString Nam );
virtual void setup(ScribusDoc* doc, const QString& Nam);
virtual QString getMasterPageName();
virtual int getPageSelection();
virtual bool usingRange();
/trunk/Scribus/scribus/ui/checkDocument.cpp
38,12 → 38,7
// #define COLUMN_INFO 3
 
CheckDocument::CheckDocument( QWidget* parent, bool modal )
: ScrPaletteBase( parent, "checkDocument", modal, nullptr ),
m_Doc(nullptr),
pageGraveError(false),
itemError(false),
minResDPI(0),
maxResDPI(0)
: ScrPaletteBase( parent, "checkDocument", modal, nullptr )
{
showPagesWithoutErrors = PrefsManager::instance().appPrefs.verifierPrefs.showPagesWithoutErrors;
showNonPrintingLayerErrors = PrefsManager::instance().appPrefs.verifierPrefs.showNonPrintingLayerErrors;
/trunk/Scribus/scribus/ui/checkDocument.h
127,7 → 127,7
QMap<QTreeWidgetItem*, int> posMap;
 
//! \brief a reference to the current document
ScribusDoc* m_Doc;
ScribusDoc* m_Doc {nullptr};
//! \brief Icon for fatal error
QPixmap graveError;
//! \brief Icon for warning
170,13 → 170,13
QPushButton* reScan;
 
// bool globalGraveError;
bool pageGraveError;
bool itemError;
bool pageGraveError {false};
bool itemError {false};
bool showPagesWithoutErrors;
bool showNonPrintingLayerErrors;
 
int minResDPI;
int maxResDPI;
int minResDPI {0};
int maxResDPI {0};
 
/*! \brief Create content of QTreeWidgetItem based on error type
and pageItem state.
/trunk/Scribus/scribus/units.h
69,7 → 69,7
double SCRIBUS_API pts2p(double pts);
double SCRIBUS_API pts2cm(double pts);
double SCRIBUS_API pts2c(double pts);
double SCRIBUS_API pts2value(double Val, int unit);
double SCRIBUS_API pts2value(double unitValue, int unit);
double SCRIBUS_API value2pts(double unitValue, int unit);
double SCRIBUS_API value2value(double unitValue, int primaryUnit, int secondaryUnit);
QString SCRIBUS_API value2String(double unitValue, int unitIndex, bool round2Precision, bool appendSuffix);
/trunk/Scribus/scribus/util_math.h
34,7 → 34,7
FPoint SCRIBUS_API getMinClipF(const FPointArray* clip);
FPoint SCRIBUS_API projectPointOnLine(FPoint p, QPointF lineStart, QPointF lineEnd);
bool SCRIBUS_API regionContainsRect(const QRegion& shape, QRect rect);
QPolygon SCRIBUS_API flattenPath(const FPointArray& ina, QList<uint> &Segs);
QPolygon SCRIBUS_API flattenPath(const FPointArray& ina, QList<uint> &segments);
QList<QPainterPath> SCRIBUS_API decomposePath(QPainterPath &path);
QPainterPath SCRIBUS_API regularPolygonPath(double w, double h, uint c, bool star, double factor, double rota, double factor2 = 0.0, double innerRot = 0.0, double factor3 = 0.0);
QPainterPath SCRIBUS_API spiralPath(double spiralWidth, double spiralHeight, double spiralStartAngle, double spiralEndAngle, double spiralFactor);