kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Remove xpmMap from BitmapFactory

Browse Source 
No longer used since:
6ca8b2daae ("update hardcoded XPMs to .svg files. Updated .svg icons for clarity.", 2024-03-23)
This commit is contained in:
Chris Mayo
2024-07-24 19:26:38 +01:00
committed by Chris Hennes
parent a4ab97bdd5
commit fbeaeee7e7
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Gui/BitmapFactory.cpp
View File

@@ -52,7 +52,6 @@ namespace Gui {
class BitmapFactoryInstP
{
public:
QMap<std::string, const char**> xpmMap;
QMap<std::string, QPixmap> xpmCache;
bool useIconTheme;
@@ -164,11 +163,6 @@ QStringList BitmapFactoryInst::findIconFiles() const
return files;
}
void BitmapFactoryInst::addXPM(const char* name, const char** pXPM)
{
d->xpmMap[name] = pXPM;
}
void BitmapFactoryInst::addPixmapToCache(const char* name, const QPixmap& icon)
{
d->xpmCache[name] = icon;
@@ -247,16 +241,11 @@ QPixmap BitmapFactoryInst::pixmap(const char* name) const
if (it != d->xpmCache.end())
return it.value();
// now try to find it in the built-in XPM
QPixmap icon;
QMap<std::string,const char**>::Iterator It = d->xpmMap.find(name);
if (It != d->xpmMap.end())
icon = QPixmap(It.value());
// Try whether an absolute path is given
QString fn = QString::fromUtf8(name);
if (icon.isNull())
loadPixmap(fn, icon);
loadPixmap(fn, icon);
// try to find it in the 'icons' search paths
if (icon.isNull()) {
@@ -364,8 +353,6 @@ QPixmap BitmapFactoryInst::pixmapFromSvg(const QByteArray& originalContents, con
QStringList BitmapFactoryInst::pixmapNames() const
{
QStringList names;
for (QMap<std::string,const char**>::Iterator It = d->xpmMap.begin(); It != d->xpmMap.end(); ++It)
names << QString::fromUtf8(It.key().c_str());
for (QMap<std::string, QPixmap>::Iterator It = d->xpmCache.begin(); It != d->xpmCache.end(); ++It) {
QString item = QString::fromUtf8(It.key().c_str());
if (!names.contains(item))

2
src/Gui/BitmapFactory.h
View File

@@ -66,8 +66,6 @@ public:
/// Returns the absolute file names of icons found in the given search paths
QStringList findIconFiles() const;
/// Adds a build in XPM pixmap under a given name
void addXPM(const char* name, const char** pXPM);
/// Adds a build in XPM pixmap under a given name
void addPixmapToCache(const char* name, const QPixmap& icon);
/// Checks whether the pixmap is already registered.
bool findPixmapInCache(const char* name, QPixmap& icon) const;