[PlacesItemModelTest] Try to use an event loop instead of an hardcoded timeout

[dolphin.git] / src / panels / places / placesitemeditdialog.cpp

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 9722eb58669adad56ee3e05ecb8c5a782e1783fa..dfb5dda1090b604caf97de1b4fbb2df462ca6fa4 100644 (file)
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -23,18 +23,20 @@
 
 #include "placesitemeditdialog.h"
 
-#include <KAboutData>
 #include "dolphindebug.h"
+
+#include <KAboutData>
 #include <KFile>
 #include <KIconButton>
 #include <KLocalizedString>
-#include <QMimeDatabase>
 #include <KUrlRequester>
+
 #include <QCheckBox>
+#include <QDialogButtonBox>
 #include <QEvent>
 #include <QFormLayout>
-#include <QDialogButtonBox>
 #include <QLineEdit>
+#include <QMimeDatabase>
 
 PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
     QDialog(parent),
@@ -57,7 +59,7 @@ void PlacesItemEditDialog::setIcon(const QString& icon)
 
 QString PlacesItemEditDialog::icon() const
 {
-    return m_iconButton->icon();
+    return m_iconButton ? m_iconButton->icon() : m_icon;
 }
 
 void PlacesItemEditDialog::setText(const QString& text)
@@ -142,15 +144,17 @@ void PlacesItemEditDialog::initialize()
     m_urlEdit->setMinimumWidth(m_urlEdit->fontMetrics().height() * (40 / 2));
     connect(m_urlEdit, &KUrlRequester::textChanged, this, &PlacesItemEditDialog::slotUrlChanged);
 
-    m_iconButton = new KIconButton(mainWidget);
-    formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton);
-    m_iconButton->setIconSize(IconSize(KIconLoader::Desktop));
-    m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place);
-    if (m_icon.isEmpty()) {
-        QMimeDatabase db;
-        m_iconButton->setIcon(db.mimeTypeForUrl(m_url).iconName());
-    } else {
-        m_iconButton->setIcon(m_icon);
+    if (m_url.scheme() != QLatin1String("trash")) {
+        m_iconButton = new KIconButton(mainWidget);
+        formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton);
+        m_iconButton->setIconSize(IconSize(KIconLoader::Desktop));
+        m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place);
+        if (m_icon.isEmpty()) {
+            QMimeDatabase db;
+            m_iconButton->setIcon(db.mimeTypeForUrl(m_url).iconName());
+        } else {
+            m_iconButton->setIcon(m_icon);
+        }
     }
 
     if (m_allowGlobal) {