Author: craig
Date: Wed Oct 23 05:18:38 2019
New Revision: 23272
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23272
Log:
Some code cleanup
Modified:
trunk/Scribus/scribus/annotation.h
trunk/Scribus/scribus/appmodehelper.cpp
trunk/Scribus/scribus/appmodehelper.h
trunk/Scribus/scribus/canvasgesture_cellselect.cpp
trunk/Scribus/scribus/canvasgesture_pan.cpp
trunk/Scribus/scribus/chartableview.h
trunk/Scribus/scribus/cmsettings.cpp
trunk/Scribus/scribus/cmsettings.h
trunk/Scribus/scribus/collect4output.cpp
trunk/Scribus/scribus/collect4output.h
trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp
trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h
trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
trunk/Scribus/scribus/pageitem.h
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribuscore.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusstructs.h
trunk/Scribus/scribus/tableborder.cpp
trunk/Scribus/scribus/tableborder.h
trunk/Scribus/scribus/tablecell.cpp
trunk/Scribus/scribus/tablecell.h
trunk/Scribus/scribus/tablepainter.h
trunk/Scribus/scribus/text/shapedtext.h
trunk/Scribus/scribus/ui/propertywidget_distance.cpp
trunk/Scribus/scribus/ui/tabmanager.cpp
trunk/Scribus/scribus/ui/tabmanager.h
trunk/Scribus/scribus/ui/tabpdfoptions.cpp
trunk/Scribus/scribus/ui/tabpdfoptions.h
trunk/Scribus/scribus/util_printer.cpp
trunk/Scribus/scribus/util_printer.h
Modified: trunk/Scribus/scribus/annotation.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/annotation.h
==============================================================================
--- trunk/Scribus/scribus/annotation.h (original)
+++ trunk/Scribus/scribus/annotation.h Wed Oct 23 05:18:38 2019
@@ -109,96 +109,96 @@
Flag_CommitOnSelChange = 67108864 // Bit
27
};
- bool isAcroFormField() const
- {
- return m_type == Annotation::Button ||
- m_type == Annotation::Textfield ||
- m_type == Annotation::Checkbox ||
- m_type == Annotation::Combobox ||
- m_type == Annotation::Listbox ||
- m_type == Annotation::RadioButton;
- }
-
- void setType(int newType) { m_type = newType; }
- void setAction(const QString& newAction) { m_action = newAction; }
- void setE_act(const QString& newE_act) { m_E_act = newE_act; }
- void setX_act(const QString& newX_act) { m_X_act = newX_act; }
- void setD_act(const QString& newD_act) { m_D_act = newD_act; }
- void setFo_act(const QString& newFo_act) { m_Fo_act = newFo_act; }
- void setBl_act(const QString& newBl_act) { m_Bl_act = newBl_act; }
- void setK_act(const QString& newK_act) { m_K_act = newK_act; }
- void setF_act(const QString& newF_act) { m_F_act = newF_act; }
- void setV_act(const QString& newV_act) { m_V_act = newV_act; }
- void setC_act(const QString& newC_act) { m_C_act = newC_act; }
- void setExtern(const QString& newExtern) { m_extern = newExtern; }
- void setZiel(int newZiel) { m_ziel = newZiel; }
- void setActionType(int newActType) { m_actType = newActType; }
- void setToolTip(const QString& newToolTip) { m_toolTip = newToolTip; }
- void setRollOver(const QString& newRollOver) { m_rollOver =
newRollOver; }
- void setDown(const QString& newDown) { m_down = newDown; }
- void setBorderColor(const QString& newBorderColor) { m_borderColor =
newBorderColor; }
- void setBorderWidth(int newBorderWidth) { m_borderWidth =
newBorderWidth; }
- void setBorderStyle(int newBorderStyle) { m_borderStyle =
newBorderStyle; }
- void setFeed(int newFeed) { m_feed = newFeed; }
- void setFlag(int newFlag) { m_flag = newFlag; }
- void addToFlag(int dFlag) { m_flag += dFlag; }
- void setMaxChar(int newMaxChar) { m_maxChar = newMaxChar; }
- void setVis(int newVis) { m_vis = newVis; }
- void setFont(int newFont) { m_font = newFont; }
- void setChkStil(int newChkStil) { m_chkStil = newChkStil; }
- void setFormat(int newFormat) { m_format = newFormat; }
- void setIsChk(bool newIsChk) { m_isChk = newIsChk; }
- void setCheckState(bool newCheckState) { tmp_Chk = newCheckState; }
- void setOpen(bool newIsOpen) { is_Open = newIsOpen; }
- void setOnState(bool newOnState) { on_State = newOnState; }
- void setAAact(bool newAAct) { m_aAact = newAAct; }
- void setHTML(int newHTML) { m_html = newHTML; }
- void setUseIcons(bool newUseIcons) { m_useIcons = newUseIcons; }
- void setIPlace(int newIPlace) { m_iPlace = newIPlace; }
- void setScaleW(int newScaleW) { m_scaleW = newScaleW; }
- void setAnOpen(bool newIsOpen) { m_isOpen = newIsOpen; }
- void setIcon(int newIcon) { m_icon = newIcon; }
-
- int Type() const { return m_type; }
- QString Action() const { return m_action; }
- QString E_act() const { return m_E_act; }
- QString X_act() const { return m_X_act; }
- QString D_act() const { return m_D_act; }
- QString Fo_act() const { return m_Fo_act; }
- QString Bl_act() const { return m_Bl_act; }
- QString K_act() const { return m_K_act; }
- QString F_act() const { return m_F_act; }
- QString V_act() const { return m_V_act; }
- QString C_act() const { return m_C_act; }
- QString Extern() const { return m_extern; }
- int Ziel() const { return m_ziel; }
- int ActionType() const { return m_actType; }
- QString ToolTip() const { return m_toolTip; }
- QString RollOver() const { return m_rollOver; }
- QString Down() const { return m_down; }
- QString borderColor() const { return m_borderColor; }
- int borderWidth() const { return m_borderWidth; }
- int borderStyle() const { return m_borderStyle; }
- int Feed() const { return m_feed; }
- int Flag() const { return m_flag; }
- int MaxChar() const { return m_maxChar; }
- int Vis() const { return m_vis; }
- int Font() const { return m_font; }
- int ChkStil() const { return m_chkStil; }
- int Format() const { return m_format; }
- bool IsChk() const { return m_isChk; }
- bool IsChecked() const { return tmp_Chk; }
- bool IsOpen() const { return is_Open; }
- bool IsOn() const { return on_State; }
- bool AAact() const { return m_aAact; }
- int HTML() const { return m_html; }
- bool UseIcons() const { return m_useIcons; }
- int IPlace() const { return m_iPlace; }
- int ScaleW() const { return m_scaleW; }
- bool IsAnOpen() const { return m_isOpen; }
- int Icon() const { return m_icon; }
-
- protected:
+ bool isAcroFormField() const
+ {
+ return m_type == Annotation::Button ||
+ m_type == Annotation::Textfield ||
+ m_type == Annotation::Checkbox ||
+ m_type == Annotation::Combobox ||
+ m_type == Annotation::Listbox ||
+ m_type == Annotation::RadioButton;
+ }
+
+ void setType(int newType) { m_type = newType; }
+ void setAction(const QString& newAction) { m_action =
newAction; }
+ void setE_act(const QString& newE_act) { m_E_act = newE_act; }
+ void setX_act(const QString& newX_act) { m_X_act = newX_act; }
+ void setD_act(const QString& newD_act) { m_D_act = newD_act; }
+ void setFo_act(const QString& newFo_act) { m_Fo_act =
newFo_act; }
+ void setBl_act(const QString& newBl_act) { m_Bl_act =
newBl_act; }
+ void setK_act(const QString& newK_act) { m_K_act = newK_act; }
+ void setF_act(const QString& newF_act) { m_F_act = newF_act; }
+ void setV_act(const QString& newV_act) { m_V_act = newV_act; }
+ void setC_act(const QString& newC_act) { m_C_act = newC_act; }
+ void setExtern(const QString& newExtern) { m_extern =
newExtern; }
+ void setZiel(int newZiel) { m_ziel = newZiel; }
+ void setActionType(int newActType) { m_actType = newActType; }
+ void setToolTip(const QString& newToolTip) { m_toolTip =
newToolTip; }
+ void setRollOver(const QString& newRollOver) { m_rollOver =
newRollOver; }
+ void setDown(const QString& newDown) { m_down = newDown; }
+ void setBorderColor(const QString& newBorderColor) {
m_borderColor = newBorderColor; }
+ void setBorderWidth(int newBorderWidth) { m_borderWidth =
newBorderWidth; }
+ void setBorderStyle(int newBorderStyle) { m_borderStyle =
newBorderStyle; }
+ void setFeed(int newFeed) { m_feed = newFeed; }
+ void setFlag(int newFlag) { m_flag = newFlag; }
+ void addToFlag(int dFlag) { m_flag += dFlag; }
+ void setMaxChar(int newMaxChar) { m_maxChar = newMaxChar; }
+ void setVis(int newVis) { m_vis = newVis; }
+ void setFont(int newFont) { m_font = newFont; }
+ void setChkStil(int newChkStil) { m_chkStil = newChkStil; }
+ void setFormat(int newFormat) { m_format = newFormat; }
+ void setIsChk(bool newIsChk) { m_isChk = newIsChk; }
+ void setCheckState(bool newCheckState) { tmp_Chk =
newCheckState; }
+ void setOpen(bool newIsOpen) { is_Open = newIsOpen; }
+ void setOnState(bool newOnState) { on_State = newOnState; }
+ void setAAact(bool newAAct) { m_aAact = newAAct; }
+ void setHTML(int newHTML) { m_html = newHTML; }
+ void setUseIcons(bool newUseIcons) { m_useIcons = newUseIcons; }
+ void setIPlace(int newIPlace) { m_iPlace = newIPlace; }
+ void setScaleW(int newScaleW) { m_scaleW = newScaleW; }
+ void setAnOpen(bool newIsOpen) { m_isOpen = newIsOpen; }
+ void setIcon(int newIcon) { m_icon = newIcon; }
+
+ int Type() const { return m_type; }
+ QString Action() const { return m_action; }
+ QString E_act() const { return m_E_act; }
+ QString X_act() const { return m_X_act; }
+ QString D_act() const { return m_D_act; }
+ QString Fo_act() const { return m_Fo_act; }
+ QString Bl_act() const { return m_Bl_act; }
+ QString K_act() const { return m_K_act; }
+ QString F_act() const { return m_F_act; }
+ QString V_act() const { return m_V_act; }
+ QString C_act() const { return m_C_act; }
+ QString Extern() const { return m_extern; }
+ int Ziel() const { return m_ziel; }
+ int ActionType() const { return m_actType; }
+ QString ToolTip() const { return m_toolTip; }
+ QString RollOver() const { return m_rollOver; }
+ QString Down() const { return m_down; }
+ QString borderColor() const { return m_borderColor; }
+ int borderWidth() const { return m_borderWidth; }
+ int borderStyle() const { return m_borderStyle; }
+ int Feed() const { return m_feed; }
+ int Flag() const { return m_flag; }
+ int MaxChar() const { return m_maxChar; }
+ int Vis() const { return m_vis; }
+ int Font() const { return m_font; }
+ int ChkStil() const { return m_chkStil; }
+ int Format() const { return m_format; }
+ bool IsChk() const { return m_isChk; }
+ bool IsChecked() const { return tmp_Chk; }
+ bool IsOpen() const { return is_Open; }
+ bool IsOn() const { return on_State; }
+ bool AAact() const { return m_aAact; }
+ int HTML() const { return m_html; }
+ bool UseIcons() const { return m_useIcons; }
+ int IPlace() const { return m_iPlace; }
+ int ScaleW() const { return m_scaleW; }
+ bool IsAnOpen() const { return m_isOpen; }
+ int Icon() const { return m_icon; }
+
+ private:
QString m_Bl_act;
QString m_C_act;
QString m_D_act;
Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Wed Oct 23 05:18:38 2019
@@ -44,13 +44,6 @@
AppModeHelper::AppModeHelper(QObject *parent) :
QObject(parent)
{
- a_actMgr=nullptr;
- a_scrActions=nullptr;
- a_scrRecentFileActions=nullptr;
- a_scrWindowsActions=nullptr;
- a_scrScrapActions=nullptr;
- a_scrLayersActions=nullptr;
- a_scrRecentPasteActions=nullptr;
}
void AppModeHelper::setup(ActionManager* am,
Modified: trunk/Scribus/scribus/appmodehelper.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/appmodehelper.h
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.h (original)
+++ trunk/Scribus/scribus/appmodehelper.h Wed Oct 23 05:18:38 2019
@@ -63,16 +63,14 @@
void AppModeChanged(int oldMode, int newMode);
void UpdateRequest(int updateFlags);
- public slots:
-
- protected:
- QMap<QString, QPointer<ScrAction> > *a_scrActions;
- QMap<QString, QPointer<ScrAction> > *a_scrRecentFileActions;
- QMap<QString, QPointer<ScrAction> > *a_scrWindowsActions;
- QMap<QString, QPointer<ScrAction> > *a_scrScrapActions;
- QMap<QString, QPointer<ScrAction> > *a_scrLayersActions;
- QMap<QString, QPointer<ScrAction> > *a_scrRecentPasteActions;
- ActionManager* a_actMgr;
+ private:
+ QMap<QString, QPointer<ScrAction> > *a_scrActions {nullptr};
+ QMap<QString, QPointer<ScrAction> > *a_scrRecentFileActions
{nullptr};
+ QMap<QString, QPointer<ScrAction> > *a_scrWindowsActions
{nullptr};
+ QMap<QString, QPointer<ScrAction> > *a_scrScrapActions
{nullptr};
+ QMap<QString, QPointer<ScrAction> > *a_scrLayersActions
{nullptr};
+ QMap<QString, QPointer<ScrAction> > *a_scrRecentPasteActions
{nullptr};
+ ActionManager* a_actMgr {nullptr};
};
#endif // APPMODEHELPER_H
Modified: trunk/Scribus/scribus/canvasgesture_cellselect.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/canvasgesture_cellselect.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_cellselect.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_cellselect.cpp Wed Oct 23 05:18:38 2019
@@ -26,12 +26,12 @@
#include "tableutils.h"
#include "ui/scmwmenumanager.h"
-void CellSelect::activate(bool fromGesture)
+void CellSelect::activate(bool /*fromGesture*/)
{
m_view->setCursor(Qt::IBeamCursor);
}
-void CellSelect::deactivate(bool forGesture)
+void CellSelect::deactivate(bool /*forGesture*/)
{
table()->clearSelection();
}
Modified: trunk/Scribus/scribus/canvasgesture_pan.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/canvasgesture_pan.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_pan.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_pan.cpp Wed Oct 23 05:18:38 2019
@@ -27,13 +27,13 @@
{
}
-void PanGesture::activate(bool fromGesture)
+void PanGesture::activate(bool /*fromGesture*/)
{
m_cursor = m_view->cursor();
m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
}
-void PanGesture::deactivate(bool forgesture)
+void PanGesture::deactivate(bool /*forgesture*/)
{
m_view->setCursor(m_cursor);
}
@@ -58,7 +58,7 @@
m_view->scrollBy(dx, dy);
}
-void PanGesture::mouseReleaseEvent(QMouseEvent* m)
+void PanGesture::mouseReleaseEvent(QMouseEvent* /*m*/)
{
m_view->stopGesture();
}
Modified: trunk/Scribus/scribus/chartableview.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/chartableview.h
==============================================================================
--- trunk/Scribus/scribus/chartableview.h (original)
+++ trunk/Scribus/scribus/chartableview.h Wed Oct 23 05:18:38 2019
@@ -41,7 +41,7 @@
//! \brief Calculate height of the last row to fit image size
void resizeLastRow();
-protected:
+private:
//! \brief Magnify dialog reference
CharZoom* zoom {nullptr};
Modified: trunk/Scribus/scribus/cmsettings.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/cmsettings.cpp
==============================================================================
--- trunk/Scribus/scribus/cmsettings.cpp (original)
+++ trunk/Scribus/scribus/cmsettings.cpp Wed Oct 23 05:18:38 2019
@@ -34,9 +34,7 @@
{
}
-CMSettings::~CMSettings()
-{
-}
+CMSettings::~CMSettings() = default;
bool CMSettings::useColorManagement() const
{
Modified: trunk/Scribus/scribus/cmsettings.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/cmsettings.h
==============================================================================
--- trunk/Scribus/scribus/cmsettings.h (original)
+++ trunk/Scribus/scribus/cmsettings.h Wed Oct 23 05:18:38 2019
@@ -36,67 +36,67 @@
class SCRIBUS_API CMSettings
{
-public:
- CMSettings(ScribusDoc* doc, const QString& profileName, eRenderIntent
intent);
- ~CMSettings();
-
- ScribusDoc* doc() const {return m_Doc;}
- QString profileName() const {return m_ProfileName;}
- eRenderIntent intent() const { return m_Intent; }
+ public:
+ CMSettings(ScribusDoc* doc, const QString& profileName,
eRenderIntent intent);
+ ~CMSettings();
- bool colorManagementAllowed() const { return m_colorManagementAllowed; }
- void allowColorManagement(bool allowed) { m_colorManagementAllowed =
allowed; }
+ ScribusDoc* doc() const {return m_Doc;}
+ QString profileName() const {return m_ProfileName;}
+ eRenderIntent intent() const { return m_Intent; }
- bool softProofingAllowed() const { return m_softProofingAllowed; }
- void allowSoftProofing(bool allowed) { m_softProofingAllowed = allowed;
}
+ bool colorManagementAllowed() const { return
m_colorManagementAllowed; }
+ void allowColorManagement(bool allowed) {
m_colorManagementAllowed = allowed; }
- bool useEmbeddedProfile() const { return m_useEmbeddedProfile; }
- void setUseEmbeddedProfile(bool useEmbedded) { m_useEmbeddedProfile =
useEmbedded; }
+ bool softProofingAllowed() const { return
m_softProofingAllowed; }
+ void allowSoftProofing(bool allowed) { m_softProofingAllowed =
allowed; }
- bool useOutputProfile() const { return !m_outputProfile.isNull(); }
- void setOutputProfile(const ScColorProfile& prof) { m_outputProfile =
prof; }
+ bool useEmbeddedProfile() const { return m_useEmbeddedProfile; }
+ void setUseEmbeddedProfile(bool useEmbedded) {
m_useEmbeddedProfile = useEmbedded; }
- bool useColorManagement() const;
+ bool useOutputProfile() const { return
!m_outputProfile.isNull(); }
+ void setOutputProfile(const ScColorProfile& prof) {
m_outputProfile = prof; }
- QString defaultMonitorProfile() const;
- QString defaultPrinterProfile() const;
- QString defaultImageRGBProfile() const;
- QString defaultImageCMYKProfile() const;
- QString defaultSolidColorRGBProfile() const;
- QString defaultSolidColorCMYKProfile() const;
+ bool useColorManagement() const;
- eRenderIntent colorRenderingIntent() const;
- eRenderIntent imageRenderingIntent() const;
+ QString defaultMonitorProfile() const;
+ QString defaultPrinterProfile() const;
+ QString defaultImageRGBProfile() const;
+ QString defaultImageCMYKProfile() const;
+ QString defaultSolidColorRGBProfile() const;
+ QString defaultSolidColorCMYKProfile() const;
- bool useBlackPoint() const;
- bool doSoftProofing() const;
- bool doGamutCheck() const;
+ eRenderIntent colorRenderingIntent() const;
+ eRenderIntent imageRenderingIntent() const;
- ScColorProfile monitorProfile() const;
- ScColorProfile printerProfile() const;
- ScColorProfile outputProfile() const;
+ bool useBlackPoint() const;
+ bool doSoftProofing() const;
+ bool doGamutCheck() const;
- ScColorTransform rgbColorDisplayTransform() const; // stdTransRGBMonG
- ScColorTransform rgbColorProofingTransform() const; // stdProofG
- ScColorTransform rgbImageDisplayTransform() const; // stdTransImgG
- ScColorTransform rgbImageProofingTransform() const; // stdProofImgG
- ScColorTransform rgbToCymkColorTransform() const; // stdTransCMYKG
- ScColorTransform rgbGamutCheckTransform() const; // stdProofGCG
+ ScColorProfile monitorProfile() const;
+ ScColorProfile printerProfile() const;
+ ScColorProfile outputProfile() const;
- ScColorTransform cmykColorDisplayTransform() const; // stdTransCMYKMonG
- ScColorTransform cmykColorProofingTransform() const; // stdProofCMYKG
- ScColorTransform cmykImageProofingTransform() const; // stdProofImgCMYK
- ScColorTransform cmykToRgbColorTransform() const; // stdTransRGBG
- ScColorTransform cmykGamutCheckTransform() const; //stdProofCMYKGCG
+ ScColorTransform rgbColorDisplayTransform() const; //
stdTransRGBMonG
+ ScColorTransform rgbColorProofingTransform() const; //
stdProofG
+ ScColorTransform rgbImageDisplayTransform() const; //
stdTransImgG
+ ScColorTransform rgbImageProofingTransform() const; //
stdProofImgG
+ ScColorTransform rgbToCymkColorTransform() const; //
stdTransCMYKG
+ ScColorTransform rgbGamutCheckTransform() const; //
stdProofGCG
-protected:
- ScribusDoc* m_Doc;
- bool m_colorManagementAllowed {true};
- bool m_softProofingAllowed {false};
- bool m_useEmbeddedProfile {false};
- QString m_ProfileName;
- eRenderIntent m_Intent;
- ScColorProfile m_outputProfile;
+ ScColorTransform cmykColorDisplayTransform() const; //
stdTransCMYKMonG
+ ScColorTransform cmykColorProofingTransform() const; //
stdProofCMYKG
+ ScColorTransform cmykImageProofingTransform() const; //
stdProofImgCMYK
+ ScColorTransform cmykToRgbColorTransform() const; //
stdTransRGBG
+ ScColorTransform cmykGamutCheckTransform() const;
//stdProofCMYKGCG
+
+ private:
+ ScribusDoc* m_Doc;
+ bool m_colorManagementAllowed {true};
+ bool m_softProofingAllowed {false};
+ bool m_useEmbeddedProfile {false};
+ QString m_ProfileName;
+ eRenderIntent m_Intent;
+ ScColorProfile m_outputProfile;
};
#endif
Modified: trunk/Scribus/scribus/collect4output.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/collect4output.cpp
==============================================================================
--- trunk/Scribus/scribus/collect4output.cpp (original)
+++ trunk/Scribus/scribus/collect4output.cpp Wed Oct 23 05:18:38 2019
@@ -31,13 +31,7 @@
#include <QString>
CollectForOutput::CollectForOutput(ScribusDoc* doc, const QString&
outputDirectory, bool withFonts, bool withProfiles, bool compressDoc)
- : QObject(ScCore),
- m_Doc(nullptr),
- profileCount(0),
- itemCount(0),
- fontCount(0),
- patternCount(0),
- uiCollect(false)
+ : QObject(ScCore)
{
m_Doc=doc;
if (!outputDirectory.isEmpty())
Modified: trunk/Scribus/scribus/collect4output.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/collect4output.h
==============================================================================
--- trunk/Scribus/scribus/collect4output.h (original)
+++ trunk/Scribus/scribus/collect4output.h Wed Oct 23 05:18:38 2019
@@ -45,7 +45,7 @@
protected:
/*! Doc to collect */
- ScribusDoc* m_Doc;
+ ScribusDoc* m_Doc {nullptr};
/*! Use compressed document. See the constructor */
bool m_compressDoc;
/*! Collect fonts too. See the constructor */
@@ -94,11 +94,11 @@
ProfilesL docProfiles;
QStringList patterns;
- int profileCount;
- int itemCount;
- int fontCount;
- int patternCount;
- bool uiCollect;
+ int profileCount {0};
+ int itemCount {0};
+ int fontCount {0};
+ int patternCount {0};
+ bool uiCollect {false};
signals:
void fontsCollected(int);
Modified: trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp (original)
+++ trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp Wed Oct 23
05:18:38 2019
@@ -159,3 +159,23 @@
}
return hasAlpha;
}
+
+bool ScColorMgmtStrategy::useBlackPointCompensation() const
+{
+ return m_useBlackPointCompensation;
+}
+
+void ScColorMgmtStrategy::setUseBlackPointCompensation(bool
useBlackPointCompensation)
+{
+ m_useBlackPointCompensation = useBlackPointCompensation;
+}
+
+bool ScColorMgmtStrategy::useBlackPreservation() const
+{
+ return m_useBlackPreservation;
+}
+
+void ScColorMgmtStrategy::setUseBlackPreservation(bool useBlackPreservation)
+{
+ m_useBlackPreservation = useBlackPreservation;
+}
Modified: trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h (original)
+++ trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.h Wed Oct 23
05:18:38 2019
@@ -103,15 +103,15 @@
class ScColorMgmtStrategy
{
-public:
- bool useBlackPointCompensation;
- bool useBlackPreservation;
+ public:
+ bool useBlackPointCompensation() const;
+ void setUseBlackPointCompensation(bool
useBlackPointCompensation);
+ bool useBlackPreservation() const;
+ void setUseBlackPreservation(bool useBlackPreservation);
- ScColorMgmtStrategy ()
- {
- useBlackPointCompensation = true;
- useBlackPreservation = false;
- }
+ private:
+ bool m_useBlackPointCompensation {true};
+ bool m_useBlackPreservation {false};
};
struct ScColorProfileInfo
Modified: trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp
(original)
+++ trunk/Scribus/scribus/colormgmt/sclcms2colormgmtengineimpl.cpp Wed Oct
23 05:18:38 2019
@@ -254,9 +254,9 @@
transformFlags &= (~Ctf_Softproofing);
transformFlags &= (~Ctf_GamutCheck);
long strategyFlags = 0;
- if (m_strategy.useBlackPointCompensation)
+ if (m_strategy.useBlackPointCompensation())
strategyFlags |= Ctf_BlackPointCompensation;
- if (m_strategy.useBlackPreservation)
+ if (m_strategy.useBlackPreservation())
strategyFlags |= Ctf_BlackPreservation;
ScColorTransformInfo transInfo;
@@ -328,9 +328,9 @@
return transform;
long strategyFlags = 0;
- if (m_strategy.useBlackPointCompensation)
+ if (m_strategy.useBlackPointCompensation())
strategyFlags |= Ctf_BlackPointCompensation;
- if (m_strategy.useBlackPreservation)
+ if (m_strategy.useBlackPreservation())
strategyFlags |= Ctf_BlackPreservation;
ScColorTransformInfo transInfo;
Modified: trunk/Scribus/scribus/pageitem.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/pageitem.h
==============================================================================
--- trunk/Scribus/scribus/pageitem.h (original)
+++ trunk/Scribus/scribus/pageitem.h Wed Oct 23 05:18:38 2019
@@ -426,9 +426,9 @@
virtual void currentTextProps(ParagraphStyle& parStyle) const;
void SetQColor(QColor *tmp, const QString& farbe, double shad);
void DrawPolyL(QPainter *p, const QPolygon& pts);
- const FPointArray shape() const { return PoLine; }
+ FPointArray shape() const { return PoLine; }
void setShape(const FPointArray& val) { PoLine = val; }
- const FPointArray contour() const { return ContourLine; }
+ FPointArray contour() const { return ContourLine; }
void setContour(const FPointArray& val) { ContourLine = val; }
bool flipPathText() const { return textPathFlipped; }
void setFlipPathText(bool val) { textPathFlipped = val; }
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Wed Oct 23
05:18:38 2019
@@ -1198,10 +1198,12 @@
/*int height = fm.height();
int ascent = fm.ascent();*/
- double startX = params[1], startY = params[0];
+ double startX = params[1];
+ double startY = params[0];
int textAlign = m_context.textAlign();
double textRotation = m_context.textRotation();
- if ( textAlign & 0x01 ) { // (left, top) position = current
logical position
+ if ( textAlign & 0x01 )
+ { // (left, top) position = current logical position
QPoint pos = m_context.position();
startX = pos.x();
startY = pos.y();
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Oct 23 05:18:38 2019
@@ -8451,7 +8451,7 @@
if (dia->exec())
{
ParagraphStyle newTabs(currItem->itemText.defaultStyle());
- newTabs.setTabValues(dia->tmpTab);
+ newTabs.setTabValues(dia->tabList());
currItem->itemText.setDefaultStyle(newTabs);
currItem->update();
slotDocCh();
Modified: trunk/Scribus/scribus/scribuscore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Wed Oct 23 05:18:38 2019
@@ -68,8 +68,8 @@
m_HaveTiffSep = false;
ScColorMgmtStrategy strategy;
- strategy.useBlackPointCompensation = true;
- strategy.useBlackPreservation = false;
+ strategy.setUseBlackPointCompensation(true);
+ strategy.setUseBlackPreservation(false);
defaultEngine.setStrategy(strategy);
}
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Oct 23 05:18:38 2019
@@ -822,15 +822,15 @@
stdProofLabGC = ScCore->defaultLabToRGBTrans;
}
-bool ScribusDoc::OpenCMSProfiles(ProfilesL InPo, ProfilesL InPoCMYK, ProfilesL
MoPo, ProfilesL PrPo)
+bool ScribusDoc::OpenCMSProfiles(ProfilesL InPo, ProfilesL InPoCMYK, ProfilesL
/*MoPo*/, ProfilesL PrPo)
{
HasCMS = false;
ScColorProfile inputProf;
colorEngine = colorMgmtEngineFactory.createDefaultEngine();
ScColorMgmtStrategy colorStrategy;
- colorStrategy.useBlackPointCompensation =
m_docPrefsData.colorPrefs.DCMSset.BlackPoint;
- colorStrategy.useBlackPreservation = false;
+
colorStrategy.setUseBlackPointCompensation(m_docPrefsData.colorPrefs.DCMSset.BlackPoint);
+ colorStrategy.setUseBlackPreservation(false);
colorEngine.setStrategy(colorStrategy);
DocDisplayProf = ScCore->monitorProfile;
Modified: trunk/Scribus/scribus/scribusstructs.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/scribusstructs.h
==============================================================================
--- trunk/Scribus/scribus/scribusstructs.h (original)
+++ trunk/Scribus/scribus/scribusstructs.h Wed Oct 23 05:18:38 2019
@@ -28,17 +28,16 @@
#include "scribusapi.h"
#include "annotation.h"
+#include "colormgmt/sccolormgmtstructs.h"
#include "fpointarray.h"
+#include "margins.h"
#include "pageitem.h"
-#include "margins.h"
#include "sccolorstructs.h"
#include "scfonts.h"
#include "scimagestructs.h"
#include "sctextstruct.h"
+#include "util_math.h"
#include "vgradient.h"
-#include "colormgmt/sccolormgmtstructs.h"
-
-extern bool SCRIBUS_API compareDouble(double, double);
struct CopyContentsBuffer
{
Modified: trunk/Scribus/scribus/tableborder.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/tableborder.cpp
==============================================================================
--- trunk/Scribus/scribus/tableborder.cpp (original)
+++ trunk/Scribus/scribus/tableborder.cpp Wed Oct 23 05:18:38 2019
@@ -7,6 +7,7 @@
for which a new license (GPL+exception) is in place.
*/
+#include <algorithm>
#include <QList>
#include <QString>
#include <QStringList>
@@ -20,20 +21,14 @@
* TableBorderLine definitions.
*/
-TableBorderLine::TableBorderLine()
-{
- setWidth(0.0);
- setStyle(Qt::SolidLine);
- setColor("Black");
- setShade(100);
-}
+TableBorderLine::TableBorderLine() = default;
TableBorderLine::TableBorderLine(double width, Qt::PenStyle style, const
QString& color, double shade)
{
- setWidth(width);
- setStyle(style);
- setColor(color);
- setShade(shade);
+ m_width = width;
+ m_style = style;
+ m_color = color;
+ m_shade = shade;
}
QString TableBorderLine::asString() const
@@ -66,7 +61,7 @@
void TableBorder::addBorderLine(const TableBorderLine& borderLine)
{
m_borderLines.append(borderLine);
- qStableSort(m_borderLines.begin(), m_borderLines.end(),
qGreater<TableBorderLine>());
+ std::stable_sort(m_borderLines.begin(), m_borderLines.end(),
qGreater<TableBorderLine>());
}
void TableBorder::removeBorderLine(int index)
@@ -83,7 +78,7 @@
return;
m_borderLines.replace(index, borderLine);
- qStableSort(m_borderLines.begin(), m_borderLines.end(),
qGreater<TableBorderLine>());
+ std::stable_sort(m_borderLines.begin(), m_borderLines.end(),
qGreater<TableBorderLine>());
}
QString TableBorder::asString() const
Modified: trunk/Scribus/scribus/tableborder.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/tableborder.h
==============================================================================
--- trunk/Scribus/scribus/tableborder.h (original)
+++ trunk/Scribus/scribus/tableborder.h Wed Oct 23 05:18:38 2019
@@ -68,13 +68,13 @@
private:
/// The width of the table border line.
- double m_width;
+ double m_width {0.0};
/// The pen style of the table border line.
- Qt::PenStyle m_style;
+ Qt::PenStyle m_style {Qt::SolidLine};
/// The color of the table border line.
- QString m_color;
+ QString m_color {"Black"};
/// The shade of the table border line
- double m_shade;
+ double m_shade {100};
};
Q_DECLARE_TYPEINFO(TableBorderLine, Q_MOVABLE_TYPE);
@@ -126,7 +126,7 @@
bool joinsWith(const TableBorder& other) const { return !isNull() &&
!other.isNull() && borderLines() == other.borderLines(); }
/// Returns <code>true</code> if this border has no border lines.
- bool isNull() const { return m_borderLines.size() == 0; }
+ bool isNull() const { return m_borderLines.empty(); }
/// Returns a string representation of the border.
QString asString() const;
Modified: trunk/Scribus/scribus/tablecell.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/tablecell.cpp
==============================================================================
--- trunk/Scribus/scribus/tablecell.cpp (original)
+++ trunk/Scribus/scribus/tablecell.cpp Wed Oct 23 05:18:38 2019
@@ -31,8 +31,7 @@
d->style.setContext(&d->table->doc()->cellStyles());
// Create a text frame for the cell.
- d->textFrame = new PageItem_TextFrame(d->table->m_Doc,
- 0, 0, 0, 0, 0, CommonStrings::None, CommonStrings::None);
+ d->textFrame = new PageItem_TextFrame(d->table->m_Doc, 0, 0, 0, 0, 0,
CommonStrings::None, CommonStrings::None);
d->textFrame->Parent = table;
d->textFrame->OwnPage = table->OwnPage;
d->textFrame->OnMasterPage = table->OnMasterPage;
Modified: trunk/Scribus/scribus/tablecell.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/tablecell.h
==============================================================================
--- trunk/Scribus/scribus/tablecell.h (original)
+++ trunk/Scribus/scribus/tablecell.h Wed Oct 23 05:18:38 2019
@@ -32,14 +32,7 @@
{
public:
/// Constructs data for an invalid cell.
- TableCellData() :
- isValid(false),
- row(-1),
- column(-1),
- rowSpan(-1),
- columnSpan(-1),
- textFrame(0),
- table(0) {}
+ TableCellData() = default;
/// Constructs data from data in @a other.
TableCellData(const TableCellData& other) : QSharedData(other),
isValid(other.isValid),
@@ -58,22 +51,22 @@
public:
/// Cell valid state.
- bool isValid;
+ bool isValid {false};
/// Row of the table the cell is in.
- int row;
+ int row {-1};
/// Column of the table the cell is in.
- int column;
+ int column {-1};
/// Number of rows the cell spans.
- int rowSpan;
+ int rowSpan {-1};
/// Number of columns the cell spans.
- int columnSpan;
+ int columnSpan {-1};
/// Text frame of the cell.
- PageItem_TextFrame *textFrame;
+ PageItem_TextFrame *textFrame {nullptr};
/// Style of the cell.
CellStyle style;
/// Table containing the cell.
- PageItem_Table *table;
+ PageItem_Table *table {nullptr};
};
/**
Modified: trunk/Scribus/scribus/tablepainter.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/tablepainter.h
==============================================================================
--- trunk/Scribus/scribus/tablepainter.h (original)
+++ trunk/Scribus/scribus/tablepainter.h Wed Oct 23 05:18:38 2019
@@ -23,7 +23,7 @@
public:
/// Creates a new table painter configured to paint @a table.
explicit TablePainter(PageItem_Table *table) : m_table(table) {};
- virtual ~TablePainter() {};
+ virtual ~TablePainter() = default;
/// Paints the table using @a p.
virtual void paintTable(ScPainter* p) = 0;
Modified: trunk/Scribus/scribus/text/shapedtext.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/text/shapedtext.h
==============================================================================
--- trunk/Scribus/scribus/text/shapedtext.h (original)
+++ trunk/Scribus/scribus/text/shapedtext.h Wed Oct 23 05:18:38 2019
@@ -40,7 +40,7 @@
friend class ShapedTextImplementation;
public:
- ShapedText(ITextSource* src, int firstChar, int lastChar, ITextContext*
ctx = 0);
+ ShapedText(ITextSource* src, int firstChar, int lastChar, ITextContext*
ctx = nullptr);
ShapedText(const ShapedText& other);
static ShapedText Invalid;
Modified: trunk/Scribus/scribus/ui/propertywidget_distance.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/ui/propertywidget_distance.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_distance.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_distance.cpp Wed Oct 23
05:18:38 2019
@@ -383,7 +383,7 @@
if (m_doc->appMode != modeEdit)
{
ParagraphStyle
newStyle(m_item->itemText.defaultStyle());
- newStyle.setTabValues(dia->tmpTab);
+ newStyle.setTabValues(dia->tabList());
Selection tempSelection(this, false);
tempSelection.addItem(m_item, true);
m_doc->itemSelection_ApplyParagraphStyle(newStyle, &tempSelection);
@@ -391,7 +391,7 @@
else
{
ParagraphStyle newStyle;
- newStyle.setTabValues(dia->tmpTab);
+ newStyle.setTabValues(dia->tabList());
m_doc->itemSelection_ApplyParagraphStyle(newStyle);
}
m_item->update();
Modified: trunk/Scribus/scribus/ui/tabmanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/ui/tabmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/tabmanager.cpp Wed Oct 23 05:18:38 2019
@@ -22,8 +22,8 @@
setModal(true);
setWindowTitle( tr( "Manage Tabulators" ) );
setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
- docUnitRatio = unitGetRatioFromIndex(dEin);
- tmpTab = inTab;
+ m_docUnitRatio = unitGetRatioFromIndex(dEin);
+ m_tabList = inTab;
TabManagerLayout = new QVBoxLayout( this );
TabManagerLayout->setMargin(5);
TabManagerLayout->setSpacing(5);
@@ -47,6 +47,16 @@
void TabManager::exitOK()
{
- tmpTab = TabList->getTabVals();
+ m_tabList = TabList->getTabVals();
accept();
}
+
+QList<ParagraphStyle::TabRecord> TabManager::tabList() const
+{
+ return m_tabList;
+}
+
+void TabManager::setTabList(const QList<ParagraphStyle::TabRecord>& tabList)
+{
+ m_tabList = tabList;
+}
Modified: trunk/Scribus/scribus/ui/tabmanager.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/ui/tabmanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/tabmanager.h (original)
+++ trunk/Scribus/scribus/ui/tabmanager.h Wed Oct 23 05:18:38 2019
@@ -23,20 +23,22 @@
public:
TabManager( QWidget* parent, int dEin, QList<ParagraphStyle::TabRecord>
inTab, double wid);
- ~TabManager() {};
- Tabruler* TabList;
- QPushButton* OKButton;
- QPushButton* CancelButton;
- QList<ParagraphStyle::TabRecord> tmpTab;
+ ~TabManager() = default;
public slots:
void exitOK();
-protected:
+ QList<ParagraphStyle::TabRecord> tabList() const;
+ void setTabList(const QList<ParagraphStyle::TabRecord>& tabList);
+
+ private:
+ QHBoxLayout* layout10;
+ QList<ParagraphStyle::TabRecord> m_tabList;
+ QPushButton* CancelButton;
+ QPushButton* OKButton;
QVBoxLayout* TabManagerLayout;
- QHBoxLayout* layout10;
-
- double docUnitRatio;
+ Tabruler* TabList;
+ double m_docUnitRatio {1.0};
};
#endif // TABMANAGER_H
Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp Wed Oct 23 05:18:38 2019
@@ -58,8 +58,7 @@
unitRatio(unitGetRatioFromIndex(doc->unitIndex())),
m_Doc(doc),
AllFonts(AllFonts),
- Opts(Optionen),
- cms(false)
+ Opts(Optionen)
{
setupUi(this);
Modified: trunk/Scribus/scribus/ui/tabpdfoptions.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/ui/tabpdfoptions.h
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.h (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.h Wed Oct 23 05:18:38 2019
@@ -47,7 +47,7 @@
const ProfilesL & PDFXProfiles,
const QMap<QString, int> & DocFonts,
ScribusDoc *doc);
- ~TabPDFOptions() {};
+ ~TabPDFOptions() = default;
void restoreDefaults(PDFOptions & Optionen,
const SCFonts &AllFonts,
@@ -120,7 +120,7 @@
ScribusDoc* const m_Doc;
const SCFonts & AllFonts;
PDFOptions & Opts;
- bool cms;
+ bool cms {false};
QStringList m_docFonts;
QMap<QString, QString> m_annotationFonts;
Modified: trunk/Scribus/scribus/util_printer.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/util_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/util_printer.cpp (original)
+++ trunk/Scribus/scribus/util_printer.cpp Wed Oct 23 05:18:38 2019
@@ -105,7 +105,7 @@
return true;
}
-PrintEngine PrinterUtil::getDefaultPrintEngine(const QString& printerName,
bool toFile)
+PrintEngine PrinterUtil::getDefaultPrintEngine(const QString&
/*printerName*/, bool toFile)
{
if (!toFile)
{
@@ -156,7 +156,7 @@
}
//Parameter needed on win32..
-bool PrinterUtil::isPostscriptPrinter(const QString& printerName)
+bool PrinterUtil::isPostscriptPrinter(const QString& /*printerName*/)
{
#ifdef _WIN32
HDC dc;
Modified: trunk/Scribus/scribus/util_printer.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23272&path=/trunk/Scribus/scribus/util_printer.h
==============================================================================
--- trunk/Scribus/scribus/util_printer.h (original)
+++ trunk/Scribus/scribus/util_printer.h Wed Oct 23 05:18:38 2019
@@ -21,8 +21,8 @@
class SCRIBUS_API PrinterUtil
{
public:
- PrinterUtil() {};
- ~PrinterUtil() {};
+ PrinterUtil() = default;
+ ~PrinterUtil() = default;
QStringList static getPrinterNames();
#if defined(_WIN32)
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
