SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / views / versioncontrol / kversioncontrolplugin.h

diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index 1696f975c76dfc378ba79035535bb33f72863e79..2879745349653126579ae2ebcff96222d221facd 100644 (file)
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -22,8 +22,9 @@
 
 #include <dolphinvcs_export.h>
 
-#include <QObject>
 #include <QAction>
+#include <QObject>
+
 class KFileItemList;
 class KFileItem;
 /**
@@ -136,7 +137,7 @@ public:
          */
         IgnoredVersion,
         /**
-         * The file is is tracked by the version control system, but
+         * The file is tracked by the version control system, but
          * is missing in the directory (e.g. by deleted without using
          * a version control command).
          * @since 4.8
@@ -144,8 +145,8 @@ public:
         MissingVersion
     };
 
-    KVersionControlPlugin(QObject* parent = 0);
-    virtual ~KVersionControlPlugin();
+    KVersionControlPlugin(QObject* parent = nullptr);
+    ~KVersionControlPlugin() override;
 
     /**
      * Returns the name of the file which stores