--- a/util/s60theme/s60themeconvert.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/util/s60theme/s60themeconvert.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -45,8 +45,6 @@
 #include <QtWebKit>
 
 static const int pictureSize = 256;
-static const char* const msgPartNotInTdf = "  Warning: The .tdf file does not have a part for ";
-static const char* const msgSvgNotFound = "  Fatal: Could not find part .svg ";
 
 void dumpPartPictures(const QHash<QString, QPicture> &partPictures) {
     foreach (const QString &partKey, partPictures.keys()) {
@@ -86,7 +84,6 @@
 WebKitSVGRenderer::WebKitSVGRenderer(QWidget *parent)
     : QWebView(parent)
 {
-
     connect(this, SIGNAL(loadFinished(bool)), SLOT(loadFinishedSlot(bool)));
     setFixedSize(pictureSize, pictureSize);
     QPalette pal = palette();
@@ -205,19 +202,11 @@
         return false;
     const QString tdfBasePath = QFileInfo(tdfFile).absolutePath();
     WebKitSVGRenderer renderer;
-    foreach (const QString &partKey, QS60Style::partKeys()) {
-        qDebug() << partKey;
-        QString tdfFullName;
-        if (parsedPartSvgs.contains(partKey)) {
-            tdfFullName = tdfBasePath + QDir::separator() + parsedPartSvgs.value(partKey);
-        } else {
-            qWarning() << msgPartNotInTdf << partKey;
-            tdfFullName = tdfBasePath + QDir::separator() + partKey + QLatin1String(".svg");
-        }
-        if (!QFile(tdfFullName).exists()) {
-            qWarning() << msgSvgNotFound << QDir::toNativeSeparators(tdfFullName);
-            return false;
-        }
+    foreach(const QString& partKey, parsedPartSvgs.keys()) {
+        const QString tdfFullName =
+            tdfBasePath + QDir::separator() + parsedPartSvgs.value(partKey);
+        if (!QFile(tdfFullName).exists())
+            qWarning() << "Could not find part:" << parsedPartSvgs.value(partKey);
         const QPicture partPicture = renderer.svgToQPicture(tdfFullName);
         parsedPartPictures.insert(partKey, partPicture);
     }
@@ -287,8 +276,8 @@
         const QString partFileName = partKey + QLatin1String(".svg");		
         const QString partFile(dir.absolutePath() + QDir::separator() + partFileName);
         if (!QFile::exists(partFile)) {
-            qWarning() << msgSvgNotFound << partFileName;
-            return false;
+            qWarning() << "Could not find part:" << partFileName;
+            continue;
         }
         const QPicture partPicture = renderer.svgToQPicture(partFile);
         partPictures.insert(partKey, partPicture);