forked from qt-creator/qt-creator
Git: Modernize
* Use auto * Use override * Use some member initializers Change-Id: I3ca000d1c8e4d02331d58b85e68e4d771c636b29 Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
committed by
Orgad Shaneh
parent
c83b5afa9b
commit
202d40f256
@@ -50,8 +50,8 @@ class MergeTool : public QObject
|
||||
};
|
||||
|
||||
public:
|
||||
explicit MergeTool(QObject *parent = 0);
|
||||
~MergeTool();
|
||||
explicit MergeTool(QObject *parent = nullptr);
|
||||
~MergeTool() override;
|
||||
bool start(const QString &workingDirectory, const QStringList &files = QStringList());
|
||||
|
||||
enum MergeType {
|
||||
|
||||
Reference in New Issue
Block a user