r21919 by craig - #14750: Fix build issue with correct return value

[scribus-commit]

Author: craig
Date: Sun Apr 16 15:38:45 2017
New Revision: 21919

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21919
Log:
#14750: Fix build issue with correct return value

Modified:
    trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
    trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h

Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21919&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	Sun Apr 16 15:38:45 2017
@@ -735,9 +735,9 @@
 		emit needsRelayout();
 }
 
-uint64_t PropertyWidget_FontFeatures::featureFlags()
-{
-	uint64_t flags = 0;
+quint64 PropertyWidget_FontFeatures::featureFlags()
+{
+	quint64 flags = 0;
 
 	if (ContextualCheck->isVisible())
 		flags |= 1;

Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21919&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeatures.h	Sun Apr 16 15:38:45 2017
@@ -22,7 +22,7 @@
 
 public:
 	PropertyWidget_FontFeatures(QWidget *parent);
-	~PropertyWidget_FontFeatures() {};
+	~PropertyWidget_FontFeatures() {}
 	void enableFeatures(QStringList fontFeatures);
 
 protected:
@@ -43,7 +43,7 @@
 	void setDoc(ScribusDoc *d);
 	void handleSelectionChanged();
 	void languageChange();
-	void unitChange() {};
+	void unitChange() {}
 	void showFontFeatures(QString s, QStringList availableFeatures);
 	void updateCharStyle(const CharStyle& charStyle);
 	void updateStyle(const ParagraphStyle& newCurrent);