X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c1739d5c4d55401a03462467ed446763924be844..b9024361fa922d9cd423aa05721a337a59b98229:/src/views/versioncontrol/versioncontrolobserver.h

diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index f6b4d9b5f..a3777ef21 100644
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -40,36 +40,36 @@ class DOLPHIN_EXPORT VersionControlObserver : public QObject
     Q_OBJECT
 
 public:
-    explicit VersionControlObserver(QObject* parent = nullptr);
+    explicit VersionControlObserver(QObject *parent = nullptr);
     ~VersionControlObserver() override;
 
-    void setModel(KFileItemModel* model);
-    KFileItemModel* model() const;
-    void setView(DolphinView* view);
-    DolphinView* view() const;
+    void setModel(KFileItemModel *model);
+    KFileItemModel *model() const;
+    void setView(DolphinView *view);
+    DolphinView *view() const;
 
-    QList<QAction*> actions(const KFileItemList& items) const;
+    QList<QAction *> actions(const KFileItemList &items) const;
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted if an information message with the content \a msg
      * should be shown.
      */
-    void infoMessage(const QString& msg);
+    void infoMessage(const QString &msg);
 
     /**
      * Is emitted if an error message with the content \a msg
      * should be shown.
      */
-    void errorMessage(const QString& msg);
+    void errorMessage(const QString &msg);
 
     /**
      * Is emitted if an "operation completed" message with the content \a msg
      * should be shown.
      */
-    void operationCompletedMessage(const QString& msg);
+    void operationCompletedMessage(const QString &msg);
 
-private slots:
+private Q_SLOTS:
     /**
      * Invokes verifyDirectory() with a small delay. If delayedDirectoryVerification()
      * is invoked before the delay has been exceeded, the delay will be reset. This
@@ -89,13 +89,13 @@ private slots:
      * Invokes delayedDirectoryVerification() only if the itemsChanged() signal has not
      * been triggered by the VCS plugin itself.
      */
-    void slotItemsChanged(const KItemRangeList& itemRanges, const QSet<QByteArray>& roles);
+    void slotItemsChanged(const KItemRangeList &itemRanges, const QSet<QByteArray> &roles);
 
     void verifyDirectory();
 
     /**
      * Is invoked if the thread m_updateItemStatesThread has been finished
-     * and applys the item states.
+     * and applies the item states.
      */
     void slotThreadFinished();
 
@@ -117,14 +117,13 @@ private:
      *
      * @return          The number of (recursive) processed items.
      */
-    int createItemStatesList(QMap<QString, QVector<ItemState> >& itemStates,
-                             const int firstIndex = 0);
+    int createItemStatesList(QMap<QString, QVector<ItemState>> &itemStates, const int firstIndex = 0);
 
     /**
      * Returns a matching plugin for the given directory.
      * 0 is returned, if no matching plugin has been found.
      */
-    KVersionControlPlugin* searchPlugin(const QUrl& directory);
+    KVersionControlPlugin *searchPlugin(const QUrl &directory);
 
     /**
      * Returns true, if the directory contains a version control information.
@@ -137,20 +136,20 @@ private:
     bool m_pendingItemStatesUpdate;
     bool m_silentUpdate; // if true, no messages will be send during the update
                          // of version states
-    QString m_wcRoot;
+    QString m_localRepoRoot;
 
-    DolphinView* m_view;
-    KFileItemModel* m_model;
+    DolphinView *m_view;
+    KFileItemModel *m_model;
 
-    QTimer* m_dirVerificationTimer;
+    QTimer *m_dirVerificationTimer;
 
     bool m_pluginsInitialized;
-    KVersionControlPlugin* m_plugin;
-    QList<KVersionControlPlugin*> m_plugins;
-    UpdateItemStatesThread* m_updateItemStatesThread;
+    // directories have at most one plugin, this is the dectected current one.
+    KVersionControlPlugin *m_currentPlugin;
+    QList<KVersionControlPlugin *> m_plugins;
+    UpdateItemStatesThread *m_updateItemStatesThread;
 
     friend class UpdateItemStatesThread;
 };
 
 #endif // REVISIONCONTROLOBSERVER_H
-