Merge branch 'Applications/18.12'

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

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 4ad1276a52dbdf498d11230c85ee9847f8cfb167..1ec2696e31a2d44761b588c4f396d6ed8a660dac 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>


@@ -32,16 +34,16 @@
 InformationPanel::InformationPanel(QWidget* parent) :
     Panel(parent),
     m_initialized(false),
 InformationPanel::InformationPanel(QWidget* parent) :
     Panel(parent),
     m_initialized(false),

-    m_infoTimer(0),
-    m_urlChangedTimer(0),
-    m_resetUrlTimer(0),
+    m_infoTimer(nullptr),
+    m_urlChangedTimer(nullptr),
+    m_resetUrlTimer(nullptr),

     m_shownUrl(),
     m_urlCandidate(),
     m_invalidUrlCandidate(),
     m_fileItem(),
     m_selection(),
     m_shownUrl(),
     m_urlCandidate(),
     m_invalidUrlCandidate(),
     m_fileItem(),
     m_selection(),

-    m_folderStatJob(0),
-    m_content(0)
+    m_folderStatJob(nullptr),
+    m_content(nullptr)

 {
 }
 
 {
 }
 


@@ -89,7 +91,7 @@ void InformationPanel::requestDelayedItemInfo(const KFileItem& item)
     if (item.isNull()) {
         // The cursor is above the viewport. If files are selected,
         // show information regarding the selection.
     if (item.isNull()) {
         // The cursor is above the viewport. If files are selected,
         // show information regarding the selection.

-        if (m_selection.size() > 0) {
+        if (!m_selection.isEmpty()) {

             m_fileItem = KFileItem();
             m_infoTimer->start();
         }
             m_fileItem = KFileItem();
             m_infoTimer->start();
         }


@@ -185,7 +187,7 @@ void InformationPanel::showItemInfo()
             // No item is hovered and no selection has been done: provide
             // an item for the currently shown directory.
             m_folderStatJob = KIO::stat(url(), KIO::HideProgressInfo);
             // No item is hovered and no selection has been done: provide
             // an item for the currently shown directory.
             m_folderStatJob = KIO::stat(url(), KIO::HideProgressInfo);

-            if (m_folderStatJob->ui()) {
+            if (m_folderStatJob->uiDelegate()) {

                 KJobWidgets::setWindow(m_folderStatJob, this);
             }
             connect(m_folderStatJob, &KIO::Job::result,
                 KJobWidgets::setWindow(m_folderStatJob, this);
             }
             connect(m_folderStatJob, &KIO::Job::result,


@@ -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));
 }


@@ -213,7 +215,7 @@ void InformationPanel::slotInfoTimeout()
 void InformationPanel::reset()
 {
     if (m_invalidUrlCandidate == m_shownUrl) {
 void InformationPanel::reset()
 {
     if (m_invalidUrlCandidate == m_shownUrl) {

-        m_invalidUrlCandidate = KUrl();
+        m_invalidUrlCandidate = QUrl();

 
         // The current URL is still invalid. Reset
         // the content to show the directory URL.
 
         // The current URL is still invalid. Reset
         // the content to show the directory URL.


@@ -226,11 +228,11 @@ void InformationPanel::reset()
 
 void InformationPanel::slotFileRenamed(const QString& source, const QString& dest)
 {
 
 void InformationPanel::slotFileRenamed(const QString& source, const QString& dest)
 {

-    if (m_shownUrl == KUrl(source)) {
-        m_shownUrl = KUrl(dest);
-        m_fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, m_shownUrl);
+    if (m_shownUrl == QUrl::fromLocalFile(source)) {
+        m_shownUrl = QUrl::fromLocalFile(dest);
+        m_fileItem = KFileItem(m_shownUrl);

 
 

-        if ((m_selection.count() == 1) && (m_selection[0].url() == KUrl(source))) {
+        if ((m_selection.count() == 1) && (m_selection[0].url() == QUrl::fromLocalFile(source))) {

             m_selection[0] = m_fileItem;
             // Implementation note: Updating the selection is only required if exactly one
             // item is selected, as the name of the item is shown. If this should change
             m_selection[0] = m_fileItem;
             // Implementation note: Updating the selection is only required if exactly one
             // item is selected, as the name of the item is shown. If this should change


@@ -244,10 +246,10 @@ void InformationPanel::slotFileRenamed(const QString& source, const QString& des
 
 void InformationPanel::slotFilesAdded(const QString& directory)
 {
 
 void InformationPanel::slotFilesAdded(const QString& directory)
 {

-    if (m_shownUrl == KUrl(directory)) {
+    if (m_shownUrl == QUrl::fromLocalFile(directory)) {

         // If the 'trash' icon changes because the trash has been emptied or got filled,
         // the signal filesAdded("trash:/") will be emitted.
         // If the 'trash' icon changes because the trash has been emptied or got filled,
         // the signal filesAdded("trash:/") will be emitted.

-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, KUrl(directory));
+        KFileItem item(QUrl::fromLocalFile(directory));

         requestDelayedItemInfo(item);
     }
 }
         requestDelayedItemInfo(item);
     }
 }


@@ -255,7 +257,7 @@ void InformationPanel::slotFilesAdded(const QString& directory)
 void InformationPanel::slotFilesChanged(const QStringList& files)
 {
     foreach (const QString& fileName, files) {
 void InformationPanel::slotFilesChanged(const QStringList& files)
 {
     foreach (const QString& fileName, files) {

-        if (m_shownUrl == KUrl(fileName)) {
+        if (m_shownUrl == QUrl::fromLocalFile(fileName)) {

             showItemInfo();
             break;
         }
             showItemInfo();
             break;
         }


@@ -265,7 +267,7 @@ void InformationPanel::slotFilesChanged(const QStringList& files)
 void InformationPanel::slotFilesRemoved(const QStringList& files)
 {
     foreach (const QString& fileName, files) {
 void InformationPanel::slotFilesRemoved(const QStringList& files)
 {
     foreach (const QString& fileName, files) {

-        if (m_shownUrl == KUrl(fileName)) {
+        if (m_shownUrl == QUrl::fromLocalFile(fileName)) {

             // the currently shown item has been removed, show
             // the parent directory as fallback
             markUrlAsInvalid();
             // the currently shown item has been removed, show
             // the parent directory as fallback
             markUrlAsInvalid();


@@ -276,15 +278,15 @@ void InformationPanel::slotFilesRemoved(const QStringList& files)
 
 void InformationPanel::slotEnteredDirectory(const QString& directory)
 {
 
 void InformationPanel::slotEnteredDirectory(const QString& directory)
 {

-    if (m_shownUrl == KUrl(directory)) {
-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, KUrl(directory));
+    if (m_shownUrl == QUrl::fromLocalFile(directory)) {
+        KFileItem item(QUrl::fromLocalFile(directory));

         requestDelayedItemInfo(item);
     }
 }
 
 void InformationPanel::slotLeftDirectory(const QString& directory)
 {
         requestDelayedItemInfo(item);
     }
 }
 
 void InformationPanel::slotLeftDirectory(const QString& directory)
 {

-    if (m_shownUrl == KUrl(directory)) {
+    if (m_shownUrl == QUrl::fromLocalFile(directory)) {

         // The signal 'leftDirectory' is also emitted when a media
         // has been unmounted. In this case no directory change will be
         // done in Dolphin, but the Information Panel must be updated to
         // The signal 'leftDirectory' is also emitted when a media
         // has been unmounted. In this case no directory change will be
         // done in Dolphin, but the Information Panel must be updated to


@@ -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();


@@ -308,9 +310,9 @@ void InformationPanel::cancelRequest()
     m_urlCandidate.clear();
 }
 
     m_urlCandidate.clear();
 }
 

-bool InformationPanel::isEqualToShownUrl(const KUrl& url) const
+bool InformationPanel::isEqualToShownUrl(const QUrl& url) const

 {
 {

-    return m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash);
+    return m_shownUrl.matches(url, QUrl::StripTrailingSlash);

 }
 
 void InformationPanel::markUrlAsInvalid()
 }
 
 void InformationPanel::markUrlAsInvalid()


@@ -361,4 +363,3 @@ void InformationPanel::init()
     m_initialized = true;
 }
 
     m_initialized = true;
 }
 

-#include "informationpanel.moc"