r23071 by craig - Convert scripter to override instead of virtual definitions

scribus-commit scribus-commit at lists.scribus.net
Mon Jul 8 21:02:54 UTC 2019


Author: craig
Date: Mon Jul  8 21:02:54 2019
New Revision: 23071

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23071
Log:
Convert scripter to override instead of virtual definitions

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23071&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Mon Jul  8 21:02:54 2019
@@ -1238,8 +1238,8 @@
 /// returns true if text is ending before that frame
 bool PageItem::frameUnderflows() const
 {
-    if (BackBox == nullptr)
-        return false;
+	if (BackBox == nullptr)
+		return false;
 	//FIX ME - I have found that condition if frame is empty
 	//and has been linked with previous frame
 	//if you will find any better solution - fix that function

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23071&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.h	Mon Jul  8 21:02:54 2019
@@ -25,16 +25,16 @@
 	public:
 		// Standard plugin implementation
 		ScriptPlugin();
-		virtual ~ScriptPlugin();
-		virtual bool initPlugin();
-		virtual bool cleanupPlugin();
-		virtual const QString fullTrName() const;
-		virtual const AboutData* getAboutData() const;
-		virtual void deleteAboutData(const AboutData* about) const;
-		virtual void languageChange();
-		virtual bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel,
-										 QString& caption, QPixmap& icon);
-		virtual void addToMainWindowMenu(ScribusMainWindow *);
+		~ScriptPlugin() override;
+		bool initPlugin() override;
+		bool cleanupPlugin() override;
+		const QString fullTrName() const override;
+		const AboutData* getAboutData() const override;
+		void deleteAboutData(const AboutData* about) const override;
+		void languageChange() override;
+		bool newPrefsPanelWidget(QWidget* parent, Prefs_Pane*& panel,
+										 QString& caption, QPixmap& icon) override;
+		void addToMainWindowMenu(ScribusMainWindow *) override;
 
 		// Special features (none)
 		QByteArray pythonHome;




More information about the scribus-commit mailing list