r22918 by jghali - Use c++11 override specifier in PDF import plugin in order to detect poppler changes (2)
scribus-commit
scribus-commit at lists.scribus.net
Thu Mar 28 23:39:04 UTC 2019
Author: jghali
Date: Thu Mar 28 23:39:04 2019
New Revision: 22918
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22918
Log:
Use c++11 override specifier in PDF import plugin in order to detect poppler changes (2)
Modified:
trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22918&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h Thu Mar 28 23:39:04 2019
@@ -64,12 +64,14 @@
LinkSubmitForm(Object *actionObj);
// Destructor.
virtual ~LinkSubmitForm();
+
// Was the LinkImportData created successfully?
- virtual GBool isOk() POPPLER_CONST { return fileName != nullptr; }
+ GBool isOk() POPPLER_CONST override { return fileName != nullptr; }
// Accessors.
- virtual LinkActionKind getKind() POPPLER_CONST { return actionUnknown; }
+ LinkActionKind getKind() POPPLER_CONST override { return actionUnknown; }
GooString *getFileName() { return fileName; }
int getFlags() { return m_flags; }
+
private:
GooString *fileName; // file name
int m_flags;
@@ -86,11 +88,13 @@
LinkImportData(Object *actionObj);
// Destructor.
virtual ~LinkImportData();
+
// Was the LinkImportData created successfully?
- virtual GBool isOk() POPPLER_CONST { return fileName != nullptr; }
+ GBool isOk() POPPLER_CONST override { return fileName != nullptr; }
// Accessors.
- virtual LinkActionKind getKind() POPPLER_CONST { return actionUnknown; }
+ LinkActionKind getKind() POPPLER_CONST override { return actionUnknown; }
GooString *getFileName() { return fileName; }
+
private:
GooString *fileName; // file name
};
@@ -140,6 +144,7 @@
double m_fontSize;
GooString *m_fontName;
GooString *m_itemText;
+
private:
QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade);
ScribusDoc* m_doc;
More information about the scribus-commit
mailing list