r23700 by craig - Code cleanup fixing function parameters and initialisation
scribus-commit
scribus-commit at lists.scribus.net
Tue May 5 20:27:20 UTC 2020
Author: craig
Date: Tue May 5 20:27:20 2020
New Revision: 23700
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23700
Log:
Code cleanup fixing function parameters and initialisation
Modified:
trunk/Scribus/scribus/canvasmode_create.cpp
trunk/Scribus/scribus/canvasmode_create.h
trunk/Scribus/scribus/canvasmode_drawbezier.cpp
trunk/Scribus/scribus/canvasmode_drawbezier.h
trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
trunk/Scribus/scribus/canvasmode_edit.cpp
trunk/Scribus/scribus/canvasmode_editarc.cpp
trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
trunk/Scribus/scribus/canvasmode_editpolygon.cpp
trunk/Scribus/scribus/canvasmode_editspiral.cpp
trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
trunk/Scribus/scribus/canvasmode_eyedropper.cpp
trunk/Scribus/scribus/canvasmode_framelinks.cpp
trunk/Scribus/scribus/canvasmode_imageimport.cpp
trunk/Scribus/scribus/canvasmode_magnifier.cpp
trunk/Scribus/scribus/canvasmode_measurements.cpp
trunk/Scribus/scribus/canvasmode_nodeedit.cpp
trunk/Scribus/scribus/canvasmode_nodeedit.h
trunk/Scribus/scribus/canvasmode_normal.cpp
trunk/Scribus/scribus/canvasmode_objimport.cpp
trunk/Scribus/scribus/canvasmode_panning.cpp
trunk/Scribus/scribus/canvasmode_rotate.cpp
trunk/Scribus/scribus/fonts/ftface.h
trunk/Scribus/scribus/fonts/scface.cpp
trunk/Scribus/scribus/fonts/scface.h
trunk/Scribus/scribus/pdfoptionsio.h
trunk/Scribus/scribus/pluginmanager.cpp
trunk/Scribus/scribus/pluginmanager.h
trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
trunk/Scribus/scribus/rawimage.cpp
trunk/Scribus/scribus/rawimage.h
trunk/Scribus/scribus/sccolor.cpp
trunk/Scribus/scribus/sccolor.h
trunk/Scribus/scribus/scpattern.cpp
trunk/Scribus/scribus/scpattern.h
trunk/Scribus/scribus/scraction.h
trunk/Scribus/scribus/scribus.h
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusstructs.h
trunk/Scribus/scribus/text/frect.cpp
trunk/Scribus/scribus/text/frect.h
trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
trunk/Scribus/scribus/ui/applytemplatedialog.cpp
trunk/Scribus/scribus/ui/applytemplatedialog.h
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/checkDocument.h
trunk/Scribus/scribus/units.h
trunk/Scribus/scribus/util_math.h
Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Tue May 5 20:27:20 2020
@@ -177,7 +177,7 @@
// the following code was moved from scribusview.cpp:
-void CreateMode::enterEvent(QEvent *)
+void CreateMode::enterEvent(QEvent *e)
{
if (!m_MouseButtonPressed)
{
@@ -193,7 +193,7 @@
void CreateMode::activate(bool fromGesture)
{
-// qDebug() << "CreateMode::activate" << fromGesture;
+// qDebug() << "CreateMode::activate" << fromGesture;
CanvasMode::activate(fromGesture);
PageItem* currItem;
@@ -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;
Modified: trunk/Scribus/scribus/canvasmode_create.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_create.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.h (original)
+++ trunk/Scribus/scribus/canvasmode_create.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp Tue May 5 20:27:20 2020
@@ -98,7 +98,7 @@
// the following code was moved from scribusview.cpp:
-void BezierMode::enterEvent(QEvent *)
+void BezierMode::enterEvent(QEvent *e)
{
if (!m_mouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_drawbezier.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_drawbezier.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.h (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Tue May 5 20:27:20 2020
@@ -58,7 +58,7 @@
return (*pi) != nullptr;
}
-void CalligraphicMode::enterEvent(QEvent *)
+void CalligraphicMode::enterEvent(QEvent *e)
{
if (!m_mouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Tue May 5 20:27:20 2020
@@ -54,7 +54,7 @@
return (*pi) != nullptr;
}
-void FreehandMode::enterEvent(QEvent *)
+void FreehandMode::enterEvent(QEvent *e)
{
if (!m_mouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Tue May 5 20:27:20 2020
@@ -250,7 +250,7 @@
}
}
-void CanvasMode_Edit::enterEvent(QEvent *)
+void CanvasMode_Edit::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_editarc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_editarc.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editarc.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editarc.cpp Tue May 5 20:27:20 2020
@@ -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)
{
Modified: trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshgradient.cpp Tue May 5 20:27:20 2020
@@ -342,7 +342,7 @@
}
}
-void CanvasMode_EditMeshGradient::enterEvent(QEvent *)
+void CanvasMode_EditMeshGradient::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editmeshpatch.cpp Tue May 5 20:27:20 2020
@@ -271,7 +271,7 @@
}
}
-void CanvasMode_EditMeshPatch::enterEvent(QEvent *)
+void CanvasMode_EditMeshPatch::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_editpolygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_editpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editpolygon.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editpolygon.cpp Tue May 5 20:27:20 2020
@@ -128,7 +128,7 @@
}
}
-void CanvasMode_EditPolygon::enterEvent(QEvent *)
+void CanvasMode_EditPolygon::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
setModeCursor();
Modified: trunk/Scribus/scribus/canvasmode_editspiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_editspiral.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editspiral.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editspiral.cpp Tue May 5 20:27:20 2020
@@ -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)
{
Modified: trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_editweldpoint.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editweldpoint.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editweldpoint.cpp Tue May 5 20:27:20 2020
@@ -108,7 +108,7 @@
}
}
-void CanvasMode_EditWeldPoint::enterEvent(QEvent *)
+void CanvasMode_EditWeldPoint::enterEvent(QEvent *e)
{
if (!m_canvas->m_viewMode.m_MouseButtonPressed)
{
Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Tue May 5 20:27:20 2020
@@ -67,7 +67,7 @@
commonDrawControls(p, false);
}
-void CanvasMode_EyeDropper::enterEvent(QEvent *)
+void CanvasMode_EyeDropper::enterEvent(QEvent *e)
{
setModeCursor();
}
Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Tue May 5 20:27:20 2020
@@ -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)
{
Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp Tue May 5 20:27:20 2020
@@ -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();
Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp Tue May 5 20:27:20 2020
@@ -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();
Modified: trunk/Scribus/scribus/canvasmode_measurements.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_measurements.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_measurements.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_measurements.cpp Tue May 5 20:27:20 2020
@@ -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)
{
}
Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Tue May 5 20:27:20 2020
@@ -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()))
Modified: trunk/Scribus/scribus/canvasmode_nodeedit.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_nodeedit.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.h (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Tue May 5 20:27:20 2020
@@ -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)
{
Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp Tue May 5 20:27:20 2020
@@ -70,7 +70,7 @@
drawSelection(p, false);
}
-void CanvasMode_ObjImport::enterEvent(QEvent *)
+void CanvasMode_ObjImport::enterEvent(QEvent *e)
{
if (m_mimeData)
{
Modified: trunk/Scribus/scribus/canvasmode_panning.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_panning.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_panning.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_panning.cpp Tue May 5 20:27:20 2020
@@ -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)
{
Modified: trunk/Scribus/scribus/canvasmode_rotate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp Tue May 5 20:27:20 2020
@@ -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)
{
}
Modified: trunk/Scribus/scribus/fonts/ftface.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/fonts/ftface.h
==============================================================================
--- trunk/Scribus/scribus/fonts/ftface.h (original)
+++ trunk/Scribus/scribus/fonts/ftface.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/fonts/scface.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/fonts/scface.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scface.cpp (original)
+++ trunk/Scribus/scribus/fonts/scface.cpp Tue May 5 20:27:20 2020
@@ -405,8 +405,8 @@
ScFace::gid_type ScFace::emulateGlyph(uint ch) const
{
- if (ch == SpecialChars::LINEBREAK || ch == SpecialChars::PARSEP
- || ch == SpecialChars::FRAMEBREAK || ch == SpecialChars::COLBREAK
+ if (ch == SpecialChars::LINEBREAK || ch == SpecialChars::PARSEP
+ || ch == SpecialChars::FRAMEBREAK || ch == SpecialChars::COLBREAK
|| ch == SpecialChars::TAB || ch == SpecialChars::SHYPHEN
|| ch == SpecialChars::ZWSPACE || ch == SpecialChars::ZWNBSPACE || ch==SpecialChars::OBJECT)
return CONTROL_GLYPHS + ch;
Modified: trunk/Scribus/scribus/fonts/scface.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/fonts/scface.h
==============================================================================
--- trunk/Scribus/scribus/fonts/scface.h (original)
+++ trunk/Scribus/scribus/fonts/scface.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/pdfoptionsio.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/pdfoptionsio.h
==============================================================================
--- trunk/Scribus/scribus/pdfoptionsio.h (original)
+++ trunk/Scribus/scribus/pdfoptionsio.h Tue May 5 20:27:20 2020
@@ -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);
/**
Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Tue May 5 20:27:20 2020
@@ -500,52 +500,52 @@
return false;
}
-bool PluginManager::loadPlugin(PluginData & pda)
+bool PluginManager::loadPlugin(PluginData& pluginData)
{
typedef int (*getPluginAPIVersionPtr)();
typedef ScPlugin* (*getPluginPtr)();
getPluginAPIVersionPtr getPluginAPIVersion;
getPluginPtr getPlugin;
- Q_ASSERT(pda.plugin == nullptr);
- Q_ASSERT(pda.pluginDLL == nullptr);
- Q_ASSERT(!pda.enabled);
- pda.plugin = nullptr;
-
- pda.pluginDLL = loadDLL(pda.pluginFile);
- if (!pda.pluginDLL)
+ Q_ASSERT(pluginData.plugin == nullptr);
+ Q_ASSERT(pluginData.pluginDLL == nullptr);
+ Q_ASSERT(!pluginData.enabled);
+ pluginData.plugin = nullptr;
+
+ 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)();
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;
}
}
}
- unloadDLL(pda.pluginDLL);
- pda.pluginDLL = nullptr;
- Q_ASSERT(!pda.plugin);
+ unloadDLL(pluginData.pluginDLL);
+ pluginData.pluginDLL = nullptr;
+ Q_ASSERT(!pluginData.plugin);
return false;
}
Modified: trunk/Scribus/scribus/pluginmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/pluginmanager.h
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.h (original)
+++ trunk/Scribus/scribus/pluginmanager.h Tue May 5 20:27:20 2020
@@ -184,7 +184,7 @@
int initPlugin(const QString& fileName);
/*! \brief Reads available info and fills PluginData structure */
- bool loadPlugin(PluginData & pluginData);
+ bool loadPlugin(PluginData& pluginData);
/*! \brief Determines the plugin name from the file name and returns it. */
static QString getPluginName(const QString& fileName);
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/rawimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/rawimage.cpp
==============================================================================
--- trunk/Scribus/scribus/rawimage.cpp (original)
+++ trunk/Scribus/scribus/rawimage.cpp Tue May 5 20:27:20 2020
@@ -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 )
Modified: trunk/Scribus/scribus/rawimage.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/rawimage.h
==============================================================================
--- trunk/Scribus/scribus/rawimage.h (original)
+++ trunk/Scribus/scribus/rawimage.h Tue May 5 20:27:20 2020
@@ -14,22 +14,22 @@
class SCRIBUS_API RawImage : public QByteArray
{
-public:
- RawImage();
- RawImage( int width, int height, int channels);
- ~RawImage();
- bool create( int width, int height, int channels);
- int width() const { return m_width; };
- int height() const { return m_height; };
- int channels() const { return m_channels; };
- uchar *bits() const { return (uchar*)data(); };
- uchar *scanLine(int row);
- 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;
+ public:
+ RawImage();
+ RawImage( int width, int height, int channels);
+ ~RawImage();
+ bool create( int width, int height, int channels);
+ int width() const { return m_width; };
+ int height() const { return m_height; };
+ int channels() const { return m_channels; };
+ uchar *bits() const { return (uchar*)data(); };
+ uchar *scanLine(int row);
+ void setAlpha(int x, int y, int alpha);
+ QImage convertToQImage(bool cmyk, bool raw = false);
+ private:
+ int m_width {0};
+ int m_height {0};
+ int m_channels {0};
};
#endif
Modified: trunk/Scribus/scribus/sccolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/sccolor.cpp
==============================================================================
--- trunk/Scribus/scribus/sccolor.cpp (original)
+++ trunk/Scribus/scribus/sccolor.cpp Tue May 5 20:27:20 2020
@@ -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
Modified: trunk/Scribus/scribus/sccolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/sccolor.h
==============================================================================
--- trunk/Scribus/scribus/sccolor.h (original)
+++ trunk/Scribus/scribus/sccolor.h Tue May 5 20:27:20 2020
@@ -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>
Modified: trunk/Scribus/scribus/scpattern.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/scpattern.cpp
==============================================================================
--- trunk/Scribus/scribus/scpattern.cpp (original)
+++ trunk/Scribus/scribus/scpattern.cpp Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/scpattern.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/scpattern.h
==============================================================================
--- trunk/Scribus/scribus/scpattern.h (original)
+++ trunk/Scribus/scribus/scpattern.h Tue May 5 20:27:20 2020
@@ -41,7 +41,7 @@
QImage* getPattern();
void setDoc(ScribusDoc *theDoc);
- void setPattern(const QString& file);
+ void setPattern(const QString& filename);
void createPreview();
double scaleX;
Modified: trunk/Scribus/scribus/scraction.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/scraction.h
==============================================================================
--- trunk/Scribus/scribus/scraction.h (original)
+++ trunk/Scribus/scribus/scraction.h Tue May 5 20:27:20 2020
@@ -137,8 +137,8 @@
* \brief Connect the internal toggle connections. Fake toggle actions are toggle actions
* but we connect activated() only, eg itemLock. This means they can be setOn()
* to the status of an item's bool, eg isLocked(), without toggling anything.
- */
- void setToggleAction(bool isToggle, bool m_fakeToggle=false);
+ */
+ void setToggleAction(bool isToggle, bool m_fakeToggle = false);
/*!
\author Craig Bradney
Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Tue May 5 20:27:20 2020
@@ -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;
}
Modified: trunk/Scribus/scribus/scribusstructs.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/scribusstructs.h
==============================================================================
--- trunk/Scribus/scribus/scribusstructs.h (original)
+++ trunk/Scribus/scribus/scribusstructs.h Tue May 5 20:27:20 2020
@@ -165,9 +165,9 @@
struct LPIData
{
- int Frequency;
- int Angle;
- int SpotFunc;
+ int Frequency {0};
+ int Angle {0};
+ int SpotFunc {0};
};
struct Keys
Modified: trunk/Scribus/scribus/text/frect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/text/frect.cpp
==============================================================================
--- trunk/Scribus/scribus/text/frect.cpp (original)
+++ trunk/Scribus/scribus/text/frect.cpp Tue May 5 20:27:20 2020
@@ -646,7 +646,7 @@
\sa coords(), setRect()
*/
-void FRect::setCoords( qreal xp1, qreal yp1, qreal xp2, qreal yp2 )
+void FRect::setCoords(qreal xp1, qreal yp1, qreal xp2, qreal yp2 )
{
x1 = (qreal)xp1;
y1 = (qreal)yp1;
Modified: trunk/Scribus/scribus/text/frect.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/text/frect.h
==============================================================================
--- trunk/Scribus/scribus/text/frect.h (original)
+++ trunk/Scribus/scribus/text/frect.h Tue May 5 20:27:20 2020
@@ -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,12 +105,12 @@
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;
- qreal height() const;
+ qreal width() const;
+ qreal height() const;
void setWidth( qreal w );
void setHeight( qreal h );
void setSize( const FSize &s );
Modified: trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h
==============================================================================
--- trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h (original)
+++ trunk/Scribus/scribus/tt/simpletreemodel/treeitem.h Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/ui/applytemplatedialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/ui/applytemplatedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.cpp Tue May 5 20:27:20 2020
@@ -155,13 +155,13 @@
// no need to delete child widgets, Qt does it all for us
}
-void ApplyMasterPageDialog::setup(ScribusDoc *doc, QString Nam)
-{
- QString na = Nam == CommonStrings::masterPageNormal ? CommonStrings::trMasterPageNormal : Nam, in;
+void ApplyMasterPageDialog::setup(ScribusDoc *doc, const QString& Nam)
+{
+ 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);
Modified: trunk/Scribus/scribus/ui/applytemplatedialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/ui/applytemplatedialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.h (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.h Tue May 5 20:27:20 2020
@@ -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();
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Tue May 5 20:27:20 2020
@@ -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;
Modified: trunk/Scribus/scribus/ui/checkDocument.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/ui/checkDocument.h
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.h (original)
+++ trunk/Scribus/scribus/ui/checkDocument.h Tue May 5 20:27:20 2020
@@ -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.
Modified: trunk/Scribus/scribus/units.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/units.h
==============================================================================
--- trunk/Scribus/scribus/units.h (original)
+++ trunk/Scribus/scribus/units.h Tue May 5 20:27:20 2020
@@ -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);
Modified: trunk/Scribus/scribus/util_math.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23700&path=/trunk/Scribus/scribus/util_math.h
==============================================================================
--- trunk/Scribus/scribus/util_math.h (original)
+++ trunk/Scribus/scribus/util_math.h Tue May 5 20:27:20 2020
@@ -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);
More information about the scribus-commit
mailing list