r20865 by craig -
scribus-commit
scribus-commit at lists.scribus.net
Mon Feb 1 21:50:47 UTC 2016
Author: craig
Date: Mon Feb 1 21:50:47 2016
New Revision: 20865
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20865
Log:
coverity #1350077: copy paste error
Modified:
trunk/Scribus/scribus/iconmanager.cpp
trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
Modified: trunk/Scribus/scribus/iconmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20865&path=/trunk/Scribus/scribus/iconmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/iconmanager.cpp (original)
+++ trunk/Scribus/scribus/iconmanager.cpp Mon Feb 1 21:50:47 2016
@@ -273,7 +273,7 @@
if (QFile::exists(iconFilePath))
return iconFilePath;
- //qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
+ qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
iconFilePath=QString("%1%2%3").arg(ScPaths::instance().iconDir()).arg(primaryIconSubdir).arg(nam);
if (QFile::exists(iconFilePath))
@@ -282,7 +282,7 @@
return iconFilePath;
}
- //qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
+ qWarning("pathForIcon: Unable to load icon %s: File not found", iconFilePath.toLatin1().constData());
return "";
}
Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20865&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Mon Feb 1 21:50:47 2016
@@ -2169,7 +2169,7 @@
ts >> cpos;
ts >> colRef;
QString gCol = "Black";
- if (XarColorMap.contains(colRef1))
+ if (XarColorMap.contains(colRef))
gCol = XarColorMap[colRef].name;
if (gCol != CommonStrings::None)
{
More information about the scribus-commit
mailing list