Replace kDebug/kWarning by categorized logging (org.kde.dolphin)

[dolphin.git] / src / views / versioncontrol / versioncontrolobserver.cpp

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index c41803c161cab573ffffab9409bcedcf260fbafe..47e3da357a01a6329bacdb1f0fe45bad64f940e7 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -21,9 +21,9 @@
 
 #include "dolphin_versioncontrolsettings.h"
 
 
 #include "dolphin_versioncontrolsettings.h"
 

-#include <KLocale>
+#include <KLocalizedString>

 #include <KService>
 #include <KService>

-#include <KDebug>
+#include "dolphindebug.h"

 #include <KServiceTypeTrader>
 #include <kitemviews/kfileitemmodel.h>
 #include <kversioncontrolplugin2.h>
 #include <KServiceTypeTrader>
 #include <kitemviews/kfileitemmodel.h>
 #include <kversioncontrolplugin2.h>


@@ -31,7 +31,6 @@
 #include "updateitemstatesthread.h"
 
 #include <QFile>
 #include "updateitemstatesthread.h"
 
 #include <QFile>

-#include <QMutexLocker>

 #include <QTimer>
 
 VersionControlObserver::VersionControlObserver(QObject* parent) :
 #include <QTimer>
 
 VersionControlObserver::VersionControlObserver(QObject* parent) :


@@ -95,7 +94,7 @@ QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) cons
     bool hasNullItems = false;
     foreach (const KFileItem& item, items) {
         if (item.isNull()) {
     bool hasNullItems = false;
     foreach (const KFileItem& item, items) {
         if (item.isNull()) {

-            kWarning() << "Requesting version-control-actions for empty items";
+            qCWarning(DolphinDebug) << "Requesting version-control-actions for empty items";

             hasNullItems = true;
             break;
         }
             hasNullItems = true;
             break;
         }


@@ -205,9 +204,11 @@ void VersionControlObserver::slotThreadFinished()
         const QVector<ItemState>& items = it.value();
 
         foreach (const ItemState& item, items) {
         const QVector<ItemState>& items = it.value();
 
         foreach (const ItemState& item, items) {

+            const KFileItem& fileItem = item.first;
+            const KVersionControlPlugin2::ItemVersion version = item.second;

             QHash<QByteArray, QVariant> values;
             QHash<QByteArray, QVariant> values;

-            values.insert("version", QVariant(item.version));
-            m_model->setData(m_model->index(item.item), values);
+            values.insert("version", QVariant(version));
+            m_model->setData(m_model->index(fileItem), values);

         }
     }
 
         }
     }
 


@@ -266,8 +267,8 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
 
         if (expansionLevel == currentExpansionLevel) {
             ItemState itemState;
 
         if (expansionLevel == currentExpansionLevel) {
             ItemState itemState;

-            itemState.item = m_model->fileItem(index);
-            itemState.version = KVersionControlPlugin2::UnversionedVersion;
+            itemState.first = m_model->fileItem(index);
+            itemState.second = KVersionControlPlugin2::UnversionedVersion;

 
             items.append(itemState);
         } else if (expansionLevel > currentExpansionLevel) {
 
             items.append(itemState);
         } else if (expansionLevel > currentExpansionLevel) {


@@ -279,14 +280,14 @@ int VersionControlObserver::createItemStatesList(QMap<QString, QVector<ItemState
     }
 
     if (items.count() > 0) {
     }
 
     if (items.count() > 0) {

-        const KUrl& url = items.first().item.url();
-        itemStates.insert(url.directory(KUrl::AppendTrailingSlash), items);
+        const QUrl& url = items.first().first.url();
+        itemStates.insert(url.adjusted(QUrl::RemoveFilename).path(), items);

     }
 
     return index - firstIndex; // number of processed items
 }
 
     }
 
     return index - firstIndex; // number of processed items
 }
 

-KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& directory) const
+KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& directory) const

 {
     static bool pluginsAvailable = true;
     static QList<KVersionControlPlugin*> plugins;
 {
     static bool pluginsAvailable = true;
     static QList<KVersionControlPlugin*> plugins;


@@ -325,7 +326,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director
     // Verify whether the current directory contains revision information
     // like .svn, .git, ...
     foreach (KVersionControlPlugin* plugin, plugins) {
     // Verify whether the current directory contains revision information
     // like .svn, .git, ...
     foreach (KVersionControlPlugin* plugin, plugins) {

-        const QString fileName = directory.path(KUrl::AddTrailingSlash) + plugin->fileName();
+        const QString fileName = directory.path() + '/' + plugin->fileName();

         if (QFile::exists(fileName)) {
             // The score of this plugin is 0 (best), so we can just return this plugin,
             // instead of going through the plugin scoring procedure, we can't find a better one ;)
         if (QFile::exists(fileName)) {
             // The score of this plugin is 0 (best), so we can just return this plugin,
             // instead of going through the plugin scoring procedure, we can't find a better one ;)


@@ -339,11 +340,11 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director
         // m_versionedDirectory. Drawback: Until e. g. Git is recognized, the root directory
         // must be shown at least once.
         if (m_versionedDirectory) {
         // m_versionedDirectory. Drawback: Until e. g. Git is recognized, the root directory
         // must be shown at least once.
         if (m_versionedDirectory) {

-            KUrl dirUrl(directory);
-            KUrl upUrl = dirUrl.upUrl();
+            QUrl dirUrl(directory);
+            QUrl upUrl = KIO::upUrl(dirUrl);

             int upUrlCounter = 1;
             while ((upUrlCounter < bestScore) && (upUrl != dirUrl)) {
             int upUrlCounter = 1;
             while ((upUrlCounter < bestScore) && (upUrl != dirUrl)) {

-                const QString fileName = dirUrl.path(KUrl::AddTrailingSlash) + plugin->fileName();
+                const QString fileName = dirUrl.path() + '/' + plugin->fileName();

                 if (QFile::exists(fileName)) {
                     if (upUrlCounter < bestScore) {
                         bestPlugin = plugin;
                 if (QFile::exists(fileName)) {
                     if (upUrlCounter < bestScore) {
                         bestPlugin = plugin;


@@ -352,7 +353,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const KUrl& director
                     break;
                 }
                 dirUrl = upUrl;
                     break;
                 }
                 dirUrl = upUrl;

-                upUrl = dirUrl.upUrl();
+                upUrl = KIO::upUrl(dirUrl);

                 ++upUrlCounter;
             }
         }
                 ++upUrlCounter;
             }
         }