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

[dolphin.git] / src / panels / information / informationpanel.cpp

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 850d94d92234ace1a7b1b8fe4f758d1647a2b2ac..042849b2511baa90dae257cdea8e782cc830ab61 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -20,10 +20,12 @@
 #include "informationpanel.h"
 
 #include "informationpanelcontent.h"
 #include "informationpanel.h"
 
 #include "informationpanelcontent.h"

+

 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 #include <KDirNotify>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 #include <KDirNotify>

+

 #include <QApplication>
 #include <QShowEvent>
 #include <QVBoxLayout>
 #include <QApplication>
 #include <QShowEvent>
 #include <QVBoxLayout>


@@ -198,7 +200,7 @@ void InformationPanel::showItemInfo()
 
 void InformationPanel::slotFolderStatFinished(KJob* job)
 {
 
 void InformationPanel::slotFolderStatFinished(KJob* job)
 {

-    m_folderStatJob = 0;
+    m_folderStatJob = nullptr;

     const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
     m_content->showItem(KFileItem(entry, m_shownUrl));
 }
     const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
     m_content->showItem(KFileItem(entry, m_shownUrl));
 }


@@ -296,7 +298,7 @@ void InformationPanel::slotLeftDirectory(const QString& directory)
 void InformationPanel::cancelRequest()
 {
     delete m_folderStatJob;
 void InformationPanel::cancelRequest()
 {
     delete m_folderStatJob;

-    m_folderStatJob = 0;
+    m_folderStatJob = nullptr;

 
     m_infoTimer->stop();
     m_resetUrlTimer->stop();
 
     m_infoTimer->stop();
     m_resetUrlTimer->stop();