r21883 by craig - Remove old duplicate resourcecollection.h

[scribus-commit]

Author: craig
Date: Tue Apr 11 20:25:24 2017
New Revision: 21883

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21883
Log:
Remove old duplicate resourcecollection.h

Modified:
    trunk/Scribus/scribus/ui/fontcombo.cpp
    trunk/Scribus/scribus/ui/fontcombo.h
    trunk/Scribus/scribus/ui/resourcecollection.h

Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21883&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp	Tue Apr 11 20:25:24 2017
@@ -51,7 +51,7 @@
 	psFont = IconManager::instance()->loadPixmap("font_type1_16.png");
 	substFont = IconManager::instance()->loadPixmap("font_subst16.png");
 	setEditable(true);
-	setItemDelegate(new fontFamilyDelegate(this));
+	setItemDelegate(new FontFamilyDelegate(this));
 	RebuildList(0);
 }
 
@@ -126,7 +126,7 @@
 	}
 	fontFamily = new ScComboBox(this);
 	fontFamily->setEditable(true);
-	fontFamily->setItemDelegate(new fontFamilyDelegate(this));
+	fontFamily->setItemDelegate(new FontFamilyDelegate(this));
 	fontComboLayout->addWidget(fontFamily,0,col);
 	fontStyle = new ScComboBox(this);
 	fontComboLayout->addWidget(fontStyle,1,col);
@@ -482,14 +482,14 @@
 	}
 }
 
-fontFamilyDelegate::fontFamilyDelegate(QObject *parent)
+FontFamilyDelegate::FontFamilyDelegate(QObject *parent)
 	: QAbstractItemDelegate(parent)
 	, writingSystem(QFontDatabase::Any)
 {
 	pixmapCache.setCacheLimit(64*1024);
 }
 
-void fontFamilyDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void FontFamilyDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
 	QString text(index.data(Qt::DisplayRole).toString());
 	QString wh=QString("-w%1h%2").arg(option.rect.width()).arg(option.rect.height());
@@ -608,7 +608,7 @@
 	pixmapCache.insert(cacheKey+"-selected", invPixmap);
 }
 
-QSize fontFamilyDelegate::sizeHint(const QStyleOptionViewItem &option,
+QSize FontFamilyDelegate::sizeHint(const QStyleOptionViewItem &option,
 								   const QModelIndex &index) const
 {
 	QString text(index.data(Qt::DisplayRole).toString());

Modified: trunk/Scribus/scribus/ui/fontcombo.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21883&path=/trunk/Scribus/scribus/ui/fontcombo.h
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.h	(original)
+++ trunk/Scribus/scribus/ui/fontcombo.h	Tue Apr 11 20:25:24 2017
@@ -104,11 +104,11 @@
 };
 
 // based on Qfontcombobox class from Qt project
-class fontFamilyDelegate : public QAbstractItemDelegate
+class FontFamilyDelegate : public QAbstractItemDelegate
 {
 	Q_OBJECT
 public:
-	explicit fontFamilyDelegate(QObject *parent);
+	explicit FontFamilyDelegate(QObject *parent);
 
 	// painting
 	void paint(QPainter *painter,