rendered paste bodyIndex: kiconloader.cpp
===================================================================
--- kiconloader.cpp (revision 733232)
+++ kiconloader.cpp (working copy)
@@ -761,11 +761,13 @@
return QString();
}
+ if (_name.isEmpty()
#ifdef Q_WS_WIN
- if (QDir::isRelativePath(name)) {
+ || !QDir::isRelativePath(_name))
#else
- if (_name.isEmpty() || _name[0] == '/') {
+ || _name[0] == '/')
#endif
+ {
// we have either an absolute path or nothing to work with
return _name;
}
@@ -852,11 +854,13 @@
name = KStandardDirs::locateLocal("cache", name+".png");
}
+ if (name.isEmpty()
#ifdef Q_WS_WIN
- if (QDir::isRelativePath(name)) {
+ && !QDir::isRelativePath(name))
#else
- if (!name.isEmpty() && name[0] == '/') {
+ && name[0] == '/')
#endif
+ {
absolutePath = true;
}