r24335 by jghali - Code cleanup

[scribus-commit]

Author: jghali
Date: Sat Dec 19 02:53:57 2020
New Revision: 24335

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24335
Log:
Code cleanup

Modified:
    trunk/Scribus/scribus/style.h
    trunk/Scribus/scribus/ui/propertiespalette_utils.h

Modified: trunk/Scribus/scribus/style.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24335&path=/trunk/Scribus/scribus/style.h
==============================================================================
--- trunk/Scribus/scribus/style.h	(original)
+++ trunk/Scribus/scribus/style.h	Sat Dec 19 02:53:57 2020
@@ -85,14 +85,7 @@
 
 	QString baseName() const;
 
-	virtual QString displayName() const = 0;/*{ 	
-		if ( hasName() || !hasParent() || !m_context)
-			return name();
-		//	else if ( inheritsAll() )
-		//		return parent()->displayName();
-		else 
-			return parentStyle()->displayName();
-	}*/
+	virtual QString displayName() const = 0;
 	
 	QString parent() const           { return m_parent; }
 	void setParent(const QString& p);

Modified: trunk/Scribus/scribus/ui/propertiespalette_utils.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24335&path=/trunk/Scribus/scribus/ui/propertiespalette_utils.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_utils.h	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_utils.h	Sat Dec 19 02:53:57 2020
@@ -85,9 +85,9 @@
 	Q_OBJECT
 	public:
 		LineStyleItemDelegate() : ScListBoxPixmap<37, 37>() {}
-		virtual int rtti() const { return 148523874; }
-		virtual QString text(const QVariant&) const;
-		virtual void redraw(const QVariant&) const;
+
+		QString text(const QVariant&) const override;
+		void redraw(const QVariant&) const override;
 };
 
 class SCRIBUS_API NameWidget : public QLineEdit