Commit a718df6d authored by Michael Reeves's avatar Michael Reeves

use default inlailizers

parent 621a3af5
......@@ -39,7 +39,6 @@ class SourceData
void setFilename(const QString& filename);
void setFileAccess(const FileAccess& fileAccess);
void setEncoding(QTextCodec* pEncoding);
//FileAccess& getFileAccess();
QString getFilename();
void setAliasName(const QString& name);
QString getAliasName();
......
......@@ -222,24 +222,21 @@ class TotalDiffStatus
bool bTextAEqB = false;
private:
int nofUnsolvedConflicts;
int nofSolvedConflicts;
int nofWhitespaceConflicts;
int nofUnsolvedConflicts = 0;
int nofSolvedConflicts = 0;
int nofWhitespaceConflicts = 0;
};
// Three corresponding ranges. (Minimum size of a valid range is one line.)
class ManualDiffHelpEntry
{
LineRef lineA1 = -1;
LineRef lineA2 = -1;
LineRef lineB1 = -1;
LineRef lineB2 = -1;
LineRef lineC1 = -1;
LineRef lineC2 = -1;
public:
ManualDiffHelpEntry()
{
lineA1 = -1;
lineA2 = -1;
lineB1 = -1;
lineB2 = -1;
lineC1 = -1;
lineC2 = -1;
}
LineRef lineA1;
LineRef lineA2;
LineRef lineB1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment