X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/66ad27aba14cdfea777b9ebe1beb161f80f26463..dcf397ae512850805dbe37fc03ece82be2660bd0:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 2fc664f21..aa0bb9619 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -62,9 +62,9 @@
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
-#include "revisioncontrolobserver.h"
 #include "tooltips/tooltipmanager.h"
 #include "settings/dolphinsettings.h"
+#include "versioncontrolobserver.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 
@@ -105,7 +105,7 @@ DolphinView::DolphinView(QWidget* parent,
     m_proxyModel(proxyModel),
     m_previewGenerator(0),
     m_toolTipManager(0),
-    m_revisionControlObserver(0),
+    m_versionControlObserver(0),
     m_rootUrl(),
     m_activeItemUrl(),
     m_createdItemUrl(),
@@ -522,9 +522,9 @@ void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
         loadDirectory(url);
     }
 
-    // When changing the URL there is no need to keep the revision
+    // When changing the URL there is no need to keep the version
     // data of the previous URL.
-    m_dolphinModel->clearRevisionData();
+    m_dolphinModel->clearVersionData();
 
     emit startedPathLoading(url);
 }
@@ -613,11 +613,11 @@ QString DolphinView::statusBarText() const
     return text;
 }
 
-QList<QAction*> DolphinView::revisionControlActions(const KFileItemList& items) const
+QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
 {
     return items.isEmpty()
-           ? m_revisionControlObserver->contextMenuActions(url().path(KUrl::AddTrailingSlash))
-           : m_revisionControlObserver->contextMenuActions(items);
+           ? m_versionControlObserver->contextMenuActions(url().path(KUrl::AddTrailingSlash))
+           : m_versionControlObserver->contextMenuActions(items);
 }
 
 void DolphinView::setUrl(const KUrl& url)
@@ -1473,7 +1473,13 @@ void DolphinView::createView()
     m_previewGenerator = new KFilePreviewGenerator(view);
     m_previewGenerator->setPreviewShown(m_showPreview);
 
-    m_revisionControlObserver = new RevisionControlObserver(view);
+    m_versionControlObserver = new VersionControlObserver(view);
+    connect(m_versionControlObserver, SIGNAL(infoMessage(const QString&)),
+            this, SIGNAL(infoMessage(const QString&)));
+    connect(m_versionControlObserver, SIGNAL(errorMessage(const QString&)),
+            this, SIGNAL(errorMessage(const QString&)));
+    connect(m_versionControlObserver, SIGNAL(operationCompletedMessage(const QString&)),
+            this, SIGNAL(operationCompletedMessage(const QString&)));
 
     if (DolphinSettings::instance().generalSettings()->showToolTips()) {
         m_toolTipManager = new ToolTipManager(view, m_proxyModel);