Mercurial > hg > svgui
diff widgets/IconLoader.h @ 1216:dc2af6616c83
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Fri, 13 Jan 2017 10:29:50 +0000 |
parents | 4b5efd76a55c |
children | a34a2a25907c |
line wrap: on
line diff
--- a/widgets/IconLoader.h Fri Mar 04 12:23:31 2016 +0000 +++ b/widgets/IconLoader.h Fri Jan 13 10:29:50 2017 +0000 @@ -25,7 +25,15 @@ virtual ~IconLoader() { } QIcon load(QString name); - QPixmap loadPixmap(QString name); + +private: + bool shouldInvert() const; + bool shouldAutoInvert(QString) const; + QPixmap loadPixmap(QString, int); + QPixmap loadScalable(QString, int); + QPixmap invertPixmap(QPixmap); + QString makeScalableFilename(QString, bool); + QString makeNonScalableFilename(QString, int, bool); }; #endif