OSDN Git Service

better error messages
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 4 Apr 2011 13:37:31 +0000 (15:37 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 18 Apr 2011 12:10:12 +0000 (14:10 +0200)
it's only qWarning()s, but anyway ...

src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
src/plugins/qmldesigner/components/propertyeditor/layoutwidget.cpp

index 1a0fbdc..4415691 100644 (file)
@@ -447,7 +447,7 @@ public:
             QString styleSheet(file.readAll());
             q->setStyleSheet(styleSheet);
         } else {
-            qWarning() << QLatin1String("setStyleSheetFile: ") << url << QLatin1String(" not found!");
+            qWarning() << QString::fromLatin1("setStyleSheetFile: %1: %2").arg(fileName, file.errorString());
         }
 
     }
@@ -636,10 +636,10 @@ private:
         if (file.open(QIODevice::ReadOnly)) {
             QPixmap pixmap(path);
             if (pixmap.isNull())
-                qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+                qWarning() << "setIconFromFile: failed to load" << path;
             pb->setIcon(pixmap);
         } else {
-            qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+            qWarning() << QString::fromLatin1("setIconFromFile: %1: %2").arg(path, file.errorString());
         }
 
     }
@@ -701,10 +701,10 @@ private:
         if (file.open(QIODevice::ReadOnly)) {
             QPixmap pixmap(path);
             if (pixmap.isNull())
-                qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+                qWarning() << "setIconFromFile: failed to load" << path;
             lb->setPixmap(pixmap);
         } else {
-            qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+            qWarning() << QString::fromLatin1("setIconFromFile: %1: %2").arg(path, file.errorString());
         }
 
     }
@@ -773,10 +773,10 @@ private:
         if (file.open(QIODevice::ReadOnly)) {
             QPixmap pixmap(path);
             if (pixmap.isNull())
-                qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+                qWarning() << "setIconFromFile: failed to load" << path;
             pb->setIcon(pixmap);
         } else {
-            qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+            qWarning() << QString::fromLatin1("setIconFromFile: %1: %2").arg(path, file.errorString());
         }
 
     }
index 49aee2c..fefecb5 100644 (file)
@@ -98,7 +98,8 @@ LayoutWidget::~LayoutWidget()
                 QPixmap pixmap(url.toLocalFile());
                 button->setIcon(pixmap);
             } else {
-                qWarning() << QLatin1String("setIconFromFile: ") << url << QLatin1String(" not found!");
+                qWarning() << QString::fromLatin1("setIconFromFile: %1: %2").arg(
+                                  file.fileName(), file.errorString());
             }
         }
  }