r23018 by jghali - Fix compiler warning caused by virtual function having slightly different arguments from the function declared by its parent class
scribus-commit
scribus-commit at lists.scribus.net
Tue Jun 11 18:38:50 UTC 2019
Author: jghali
Date: Tue Jun 11 18:38:50 2019
New Revision: 23018
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23018
Log:
Fix compiler warning caused by virtual function having slightly different arguments from the function declared by its parent class
Modified:
trunk/Scribus/scribus/pageitem_latexframe.cpp
trunk/Scribus/scribus/pageitem_latexframe.h
Modified: trunk/Scribus/scribus/pageitem_latexframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23018&path=/trunk/Scribus/scribus/pageitem_latexframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_latexframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_latexframe.cpp Tue Jun 11 18:38:50 2019
@@ -158,7 +158,7 @@
}
}
-bool PageItem_LatexFrame::loadImage(const QString & filename, const bool reload, const int gsResolution, bool showMsg)
+bool PageItem_LatexFrame::loadImage(const QString & filename, bool reload, int gsResolution, bool showMsg)
{
//Save state and restore afterwards
double xres, yres;
Modified: trunk/Scribus/scribus/pageitem_latexframe.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23018&path=/trunk/Scribus/scribus/pageitem_latexframe.h
==============================================================================
--- trunk/Scribus/scribus/pageitem_latexframe.h (original)
+++ trunk/Scribus/scribus/pageitem_latexframe.h Tue Jun 11 18:38:50 2019
@@ -61,7 +61,7 @@
* @brief Load an image into an image frame, moved from ScribusView
* @return True if load succeeded
*/
- bool loadImage(const QString& filename, const bool reload, const int gsResolution = -1, bool showMsg = false) override;
+ bool loadImage(const QString& filename, bool reload, int gsResolution = -1, bool showMsg = false) override;
/** @brief Perform undo/redo action */
void restore(UndoState *state, bool isUndo) override;
More information about the scribus-commit
mailing list