diff --git a/src/diff.h b/src/diff.h
index 494cd66..c786591 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -1,458 +1,485 @@
 /***************************************************************************
                           diff.h  -  description
                              -------------------
     begin                : Mon Mar 18 2002
     copyright            : (C) 2002-2007 by Joachim Eibl
     email                : joachim.eibl at gmx.de
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef DIFF_H
 #define DIFF_H
 
 #include <QPainter>
 #include <QLinkedList>
 #include <QVector>
 #include <QTemporaryFile>
 
 #include "common.h"
 #include "fileaccess.h"
 #include "options.h"
 #include "gnudiff_diff.h"
 
 // Each range with matching elements is followed by a range with differences on either side.
 // Then again range of matching elements should follow.
 class Diff
 {
-   public:
-   LineRef nofEquals;
-
-   qint64 diff1;
-   qint64 diff2;
-
-   Diff(LineRef eq, qint64 d1, qint64 d2){nofEquals=eq; diff1=d1; diff2=d2; }
+  public:
+    LineRef nofEquals;
+
+    qint64 diff1;
+    qint64 diff2;
+
+    Diff(LineRef eq, qint64 d1, qint64 d2)
+    {
+        nofEquals = eq;
+        diff1 = d1;
+        diff2 = d2;
+    }
 };
 
 typedef std::list<Diff> DiffList;
 
 class LineData
 {
-   public:
-   const QChar* pLine;
-   const QChar* pFirstNonWhiteChar;
-   int size;
-
-   LineData(){ pLine=nullptr; pFirstNonWhiteChar=nullptr; size=0; /*occurrences=0;*/
-               bContainsPureComment=false; }
-   int width(int tabSize) const;  // Calcs width considering tabs.
-   //int occurrences;
-   bool whiteLine() const { return pFirstNonWhiteChar-pLine == size; }
-   bool bContainsPureComment;
+  public:
+    const QChar* pLine;
+    const QChar* pFirstNonWhiteChar;
+    int size;
+
+    LineData()
+    {
+        pLine = nullptr;
+        pFirstNonWhiteChar = nullptr;
+        size = 0; /*occurrences=0;*/
+        bContainsPureComment = false;
+    }
+    int width(int tabSize) const; // Calcs width considering tabs.
+    //int occurrences;
+    bool whiteLine() const { return pFirstNonWhiteChar - pLine == size; }
+    bool bContainsPureComment;
 };
 
 class Diff3LineList;
 class Diff3LineVector;
 
 class DiffBufferInfo
 {
-   public:
-   const LineData* m_pLineDataA;
-   const LineData* m_pLineDataB;
-   const LineData* m_pLineDataC;
-   LineRef m_sizeA;
-   LineRef m_sizeB;
-   LineRef m_sizeC;
-   const Diff3LineList* m_pDiff3LineList;
-   const Diff3LineVector* m_pDiff3LineVector;
-   void init( Diff3LineList* d3ll, const Diff3LineVector* d3lv,
-      const LineData* pldA, LineRef sizeA, const LineData* pldB, LineRef sizeB, const LineData* pldC, LineRef sizeC );
+  public:
+    const LineData* m_pLineDataA;
+    const LineData* m_pLineDataB;
+    const LineData* m_pLineDataC;
+    LineRef m_sizeA;
+    LineRef m_sizeB;
+    LineRef m_sizeC;
+    const Diff3LineList* m_pDiff3LineList;
+    const Diff3LineVector* m_pDiff3LineVector;
+    void init(Diff3LineList* d3ll, const Diff3LineVector* d3lv,
+              const LineData* pldA, LineRef sizeA, const LineData* pldB, LineRef sizeB, const LineData* pldC, LineRef sizeC);
 };
 
 class Diff3Line
 {
-   public:
-   LineRef lineA = -1;
-   LineRef lineB = -1;
-   LineRef lineC = -1;
-
-   bool bAEqC : 1;             // These are true if equal or only white-space changes exist.
-   bool bBEqC : 1;
-   bool bAEqB : 1;
-
-   bool bWhiteLineA : 1;
-   bool bWhiteLineB : 1;
-   bool bWhiteLineC : 1;
-
-   DiffList* pFineAB;          // These are 0 only if completely equal or if either source doesn't exist.
-   DiffList* pFineBC;
-   DiffList* pFineCA;
-
-   int linesNeededForDisplay; // Due to wordwrap
-   int sumLinesNeededForDisplay; // For fast conversion to m_diff3WrapLineVector
-
-   DiffBufferInfo* m_pDiffBufferInfo; // For convenience
-
-   Diff3Line()
-   {
-      lineA=-1; lineB=-1; lineC=-1;
-      bAEqC=false; bAEqB=false; bBEqC=false;
-      pFineAB=nullptr; pFineBC=nullptr; pFineCA=nullptr;
-      linesNeededForDisplay=1;
-      sumLinesNeededForDisplay=0;
-      bWhiteLineA=false; bWhiteLineB=false; bWhiteLineC=false;
-      m_pDiffBufferInfo=nullptr;
-   }
-
-   ~Diff3Line()
-   {
-      if (pFineAB!=nullptr) delete pFineAB;
-      if (pFineBC!=nullptr) delete pFineBC;
-      if (pFineCA!=nullptr) delete pFineCA;
-      pFineAB=nullptr; pFineBC=nullptr; pFineCA=nullptr;
-   }
-
-   bool operator==( const Diff3Line& d3l ) const
-   {
-      return lineA == d3l.lineA  &&  lineB == d3l.lineB  &&  lineC == d3l.lineC
-         && bAEqB == d3l.bAEqB  && bAEqC == d3l.bAEqC  && bBEqC == d3l.bBEqC;
-   }
-
-   const LineData* getLineData( int src ) const
-   {
-      Q_ASSERT( m_pDiffBufferInfo!=nullptr );
-      if ( src == 1 && lineA >= 0 ) return &m_pDiffBufferInfo->m_pLineDataA[lineA];
-      if ( src == 2 && lineB >= 0 ) return &m_pDiffBufferInfo->m_pLineDataB[lineB];
-      if ( src == 3 && lineC >= 0 ) return &m_pDiffBufferInfo->m_pLineDataC[lineC];
-      return nullptr;
-   }
-   QString getString( int src ) const
-   {
-      const LineData* pld = getLineData(src);
-      if ( pld )
-         return QString( pld->pLine, pld->size);
-      else
-         return QString();
-   }
-   LineRef getLineInFile( int src ) const
-   {
-      if ( src == 1 ) return lineA;
-      if ( src == 2 ) return lineB;
-      if ( src == 3 ) return lineC;
-      return -1;
-   }
+  public:
+    LineRef lineA = -1;
+    LineRef lineB = -1;
+    LineRef lineC = -1;
+
+    bool bAEqC : 1; // These are true if equal or only white-space changes exist.
+    bool bBEqC : 1;
+    bool bAEqB : 1;
+
+    bool bWhiteLineA : 1;
+    bool bWhiteLineB : 1;
+    bool bWhiteLineC : 1;
+
+    DiffList* pFineAB; // These are 0 only if completely equal or if either source doesn't exist.
+    DiffList* pFineBC;
+    DiffList* pFineCA;
+
+    int linesNeededForDisplay;    // Due to wordwrap
+    int sumLinesNeededForDisplay; // For fast conversion to m_diff3WrapLineVector
+
+    DiffBufferInfo* m_pDiffBufferInfo; // For convenience
+
+    Diff3Line()
+    {
+        lineA = -1;
+        lineB = -1;
+        lineC = -1;
+        bAEqC = false;
+        bAEqB = false;
+        bBEqC = false;
+        pFineAB = nullptr;
+        pFineBC = nullptr;
+        pFineCA = nullptr;
+        linesNeededForDisplay = 1;
+        sumLinesNeededForDisplay = 0;
+        bWhiteLineA = false;
+        bWhiteLineB = false;
+        bWhiteLineC = false;
+        m_pDiffBufferInfo = nullptr;
+    }
+
+    ~Diff3Line()
+    {
+        if(pFineAB != nullptr) delete pFineAB;
+        if(pFineBC != nullptr) delete pFineBC;
+        if(pFineCA != nullptr) delete pFineCA;
+        pFineAB = nullptr;
+        pFineBC = nullptr;
+        pFineCA = nullptr;
+    }
+
+    bool operator==(const Diff3Line& d3l) const
+    {
+        return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC && bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;
+    }
+
+    const LineData* getLineData(int src) const
+    {
+        Q_ASSERT(m_pDiffBufferInfo != nullptr);
+        if(src == 1 && lineA >= 0) return &m_pDiffBufferInfo->m_pLineDataA[lineA];
+        if(src == 2 && lineB >= 0) return &m_pDiffBufferInfo->m_pLineDataB[lineB];
+        if(src == 3 && lineC >= 0) return &m_pDiffBufferInfo->m_pLineDataC[lineC];
+        return nullptr;
+    }
+    QString getString(int src) const
+    {
+        const LineData* pld = getLineData(src);
+        if(pld)
+            return QString(pld->pLine, pld->size);
+        else
+            return QString();
+    }
+    LineRef getLineInFile(int src) const
+    {
+        if(src == 1) return lineA;
+        if(src == 2) return lineB;
+        if(src == 3) return lineC;
+        return -1;
+    }
 };
 
-
 class Diff3LineList : public QLinkedList<Diff3Line>
 {
 };
 class Diff3LineVector : public QVector<Diff3Line*>
 {
 };
 
 class Diff3WrapLine
 {
-public:
-   Diff3Line* pD3L;
-   int diff3LineIndex;
-   int wrapLineOffset;
-   int wrapLineLength;
+  public:
+    Diff3Line* pD3L;
+    int diff3LineIndex;
+    int wrapLineOffset;
+    int wrapLineLength;
 };
 
 typedef QVector<Diff3WrapLine> Diff3WrapLineVector;
 
-
 class TotalDiffStatus
 {
-public:
-   TotalDiffStatus(){ reset(); }
-   inline void reset() {bBinaryAEqC=false; bBinaryBEqC=false; bBinaryAEqB=false;
-                 bTextAEqC=false;   bTextBEqC=false;   bTextAEqB=false;
-                 nofUnsolvedConflicts=0; nofSolvedConflicts=0;
-                 nofWhitespaceConflicts=0;
-                }
-
-   inline int getUnsolvedConflicts() const { return nofUnsolvedConflicts; }
-   inline void setUnsolvedConflicts(const int unsolved) { nofUnsolvedConflicts = unsolved; }
-
-   inline int getSolvedConflicts() const { return nofSolvedConflicts; }
-   inline void setSolvedConflicts(const int solved) { nofSolvedConflicts = solved; }
-
-   inline int getWhitespaceConflicts() const { return nofWhitespaceConflicts; }
-   inline void setWhitespaceConflicts(const int wintespace) { nofWhitespaceConflicts = wintespace; }
-
-   inline int getNonWhitespaceConflicts() { return getUnsolvedConflicts() + getSolvedConflicts() - getWhitespaceConflicts(); }
-   
-   bool isBinaryEqualAC() const { return bBinaryAEqC; }
-   bool isBinaryEqualBC() const { return bBinaryBEqC; }
-   bool isBinaryEqualAB() const { return bBinaryAEqB; }
-
-   bool bBinaryAEqC = false;
-   bool bBinaryBEqC = false;
-   bool bBinaryAEqB = false;
-
-   bool bTextAEqC = false;
-   bool bTextBEqC = false;
-   bool bTextAEqB = false;
-
-private:
-   int nofUnsolvedConflicts;
-   int nofSolvedConflicts;
-   int nofWhitespaceConflicts;
+  public:
+    TotalDiffStatus() { reset(); }
+    inline void reset()
+    {
+        bBinaryAEqC = false;
+        bBinaryBEqC = false;
+        bBinaryAEqB = false;
+        bTextAEqC = false;
+        bTextBEqC = false;
+        bTextAEqB = false;
+        nofUnsolvedConflicts = 0;
+        nofSolvedConflicts = 0;
+        nofWhitespaceConflicts = 0;
+    }
+
+    inline int getUnsolvedConflicts() const { return nofUnsolvedConflicts; }
+    inline void setUnsolvedConflicts(const int unsolved) { nofUnsolvedConflicts = unsolved; }
+
+    inline int getSolvedConflicts() const { return nofSolvedConflicts; }
+    inline void setSolvedConflicts(const int solved) { nofSolvedConflicts = solved; }
+
+    inline int getWhitespaceConflicts() const { return nofWhitespaceConflicts; }
+    inline void setWhitespaceConflicts(const int wintespace) { nofWhitespaceConflicts = wintespace; }
+
+    inline int getNonWhitespaceConflicts() { return getUnsolvedConflicts() + getSolvedConflicts() - getWhitespaceConflicts(); }
+
+    bool isBinaryEqualAC() const { return bBinaryAEqC; }
+    bool isBinaryEqualBC() const { return bBinaryBEqC; }
+    bool isBinaryEqualAB() const { return bBinaryAEqB; }
+
+    bool bBinaryAEqC = false;
+    bool bBinaryBEqC = false;
+    bool bBinaryAEqB = false;
+
+    bool bTextAEqC = false;
+    bool bTextBEqC = false;
+    bool bTextAEqB = false;
+
+  private:
+    int nofUnsolvedConflicts;
+    int nofSolvedConflicts;
+    int nofWhitespaceConflicts;
 };
 
 // Three corresponding ranges. (Minimum size of a valid range is one line.)
 class ManualDiffHelpEntry
 {
-public:
-   ManualDiffHelpEntry() { lineA1=-1; lineA2=-1;
-                           lineB1=-1; lineB2=-1;
-                           lineC1=-1; lineC2=-1; }
-   LineRef lineA1;
-   LineRef lineA2;
-   LineRef lineB1;
-   LineRef lineB2;
-   LineRef lineC1;
-   LineRef lineC2;
-   LineRef& firstLine( int winIdx )
-   {
-      return winIdx==1 ? lineA1 : (winIdx==2 ? lineB1 : lineC1 );
-   }
-   LineRef& lastLine( int winIdx )
-   {
-      return winIdx==1 ? lineA2 : (winIdx==2 ? lineB2 : lineC2 );
-   }
-   bool isLineInRange( LineRef line, int winIdx )
-   {
-      return line>=0 && line>=firstLine(winIdx) && line<=lastLine(winIdx);
-   }
-   bool operator==(const ManualDiffHelpEntry& r) const
-   {
-      return lineA1 == r.lineA1   &&   lineB1 == r.lineB1   &&   lineC1 == r.lineC1  &&
-             lineA2 == r.lineA2   &&   lineB2 == r.lineB2   &&   lineC2 == r.lineC2;
-   }
+  public:
+    ManualDiffHelpEntry()
+    {
+        lineA1 = -1;
+        lineA2 = -1;
+        lineB1 = -1;
+        lineB2 = -1;
+        lineC1 = -1;
+        lineC2 = -1;
+    }
+    LineRef lineA1;
+    LineRef lineA2;
+    LineRef lineB1;
+    LineRef lineB2;
+    LineRef lineC1;
+    LineRef lineC2;
+    LineRef& firstLine(int winIdx)
+    {
+        return winIdx == 1 ? lineA1 : (winIdx == 2 ? lineB1 : lineC1);
+    }
+    LineRef& lastLine(int winIdx)
+    {
+        return winIdx == 1 ? lineA2 : (winIdx == 2 ? lineB2 : lineC2);
+    }
+    bool isLineInRange(LineRef line, int winIdx)
+    {
+        return line >= 0 && line >= firstLine(winIdx) && line <= lastLine(winIdx);
+    }
+    bool operator==(const ManualDiffHelpEntry& r) const
+    {
+        return lineA1 == r.lineA1 && lineB1 == r.lineB1 && lineC1 == r.lineC1 &&
+               lineA2 == r.lineA2 && lineB2 == r.lineB2 && lineC2 == r.lineC2;
+    }
 };
 
 // A list of corresponding ranges
 typedef std::list<ManualDiffHelpEntry> ManualDiffHelpList;
 
 void calcDiff3LineListUsingAB(
-   const DiffList* pDiffListAB,
-   Diff3LineList& d3ll
-   );
+    const DiffList* pDiffListAB,
+    Diff3LineList& d3ll);
 
 void calcDiff3LineListUsingAC(
-   const DiffList* pDiffListAC,
-   Diff3LineList& d3ll
-   );
+    const DiffList* pDiffListAC,
+    Diff3LineList& d3ll);
 
 void calcDiff3LineListUsingBC(
-   const DiffList* pDiffListBC,
-   Diff3LineList& d3ll
-   );
+    const DiffList* pDiffListBC,
+    Diff3LineList& d3ll);
 
-void correctManualDiffAlignment( Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList );
+void correctManualDiffAlignment(Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList);
 
 class SourceData
 {
-public:
-   SourceData();
-   ~SourceData();
-
-   void setOptions( Options* pOptions );
-
-   LineRef getSizeLines() const;
-   qint64 getSizeBytes() const;
-   const char* getBuf() const;
-   const QString& getText() const;
-   const LineData* getLineDataForDisplay() const;
-   const LineData* getLineDataForDiff() const;
-
-   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();
-   bool isEmpty();  // File was set
-   bool hasData();  // Data was readable
-   bool isText();   // is it pure text (vs. binary data)
-   bool isIncompleteConversion(); // true if some replacement characters were found
-   bool isFromBuffer();  // was it set via setData() (vs. setFileAccess() or setFilename())
-   QStringList setData( const QString& data );
-   bool isValid(); // Either no file is specified or reading was successful
-
-   // Returns a list of error messages if anything went wrong
-   QStringList readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode );
-   bool saveNormalDataAs( const QString& fileName );
-
-   bool isBinaryEqualWith( const SourceData& other ) const;
-
-   void reset();
-
-   QTextCodec* getEncoding() const { return m_pEncoding; }
-   e_LineEndStyle getLineEndStyle() const { return m_normalData.m_eLineEndStyle; }
-
-private:
-   QTextCodec* detectEncoding( const QString& fileName, QTextCodec* pFallbackCodec );
-   QString m_aliasName;
-   FileAccess m_fileAccess;
-   Options* m_pOptions;
-   QString m_tempInputFileName;
-   QTemporaryFile m_tempFile;//Created from clipboard content.
-
-   class FileData
-   {
-     private:
-       friend SourceData;
-       const char* m_pBuf = nullptr;
-       qint64 m_size = 0;
-       qint64 m_vSize = 0; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
-       QString m_unicodeBuf;
-       QVector<LineData> m_v;
-       bool m_bIsText = false;
-       bool m_bIncompleteConversion = false;
-       e_LineEndStyle m_eLineEndStyle = eLineEndStyleUndefined;
-    
-    public:
+  public:
+    SourceData();
+    ~SourceData();
+
+    void setOptions(Options* pOptions);
+
+    LineRef getSizeLines() const;
+    qint64 getSizeBytes() const;
+    const char* getBuf() const;
+    const QString& getText() const;
+    const LineData* getLineDataForDisplay() const;
+    const LineData* getLineDataForDiff() const;
+
+    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();
+    bool isEmpty();                // File was set
+    bool hasData();                // Data was readable
+    bool isText();                 // is it pure text (vs. binary data)
+    bool isIncompleteConversion(); // true if some replacement characters were found
+    bool isFromBuffer();           // was it set via setData() (vs. setFileAccess() or setFilename())
+    QStringList setData(const QString& data);
+    bool isValid(); // Either no file is specified or reading was successful
+
+    // Returns a list of error messages if anything went wrong
+    QStringList readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode);
+    bool saveNormalDataAs(const QString& fileName);
+
+    bool isBinaryEqualWith(const SourceData& other) const;
+
+    void reset();
+
+    QTextCodec* getEncoding() const { return m_pEncoding; }
+    e_LineEndStyle getLineEndStyle() const { return m_normalData.m_eLineEndStyle; }
+
+  private:
+    QTextCodec* detectEncoding(const QString& fileName, QTextCodec* pFallbackCodec);
+    QString m_aliasName;
+    FileAccess m_fileAccess;
+    Options* m_pOptions;
+    QString m_tempInputFileName;
+    QTemporaryFile m_tempFile; //Created from clipboard content.
+
+    class FileData
+    {
+      private:
+        friend SourceData;
+        const char* m_pBuf = nullptr;
+        qint64 m_size = 0;
+        qint64 m_vSize = 0; // Nr of lines in m_pBuf1 and size of m_v1, m_dv12 and m_dv13
+        QString m_unicodeBuf;
+        QVector<LineData> m_v;
+        bool m_bIsText = false;
+        bool m_bIncompleteConversion = false;
+        e_LineEndStyle m_eLineEndStyle = eLineEndStyleUndefined;
+
+      public:
         ~FileData() { reset(); }
-       bool readFile(const QString& filename);
-       bool writeFile(const QString& filename);
-       bool preprocess(bool bPreserveCR, QTextCodec* pEncoding);
-       void reset();
-       void removeComments();
-       void copyBufFrom(const FileData& src);
-
-       void checkLineForComments(
-           const QChar* p,          // pointer to start of buffer
-           int& i,                  // index of current position (in, out)
-           int size,                // size of buffer
-           bool& bWhite,            // false if this line contains nonwhite characters (in, out)
-           bool& bCommentInLine,    // true if any comment is within this line (in, out)
-           bool& bStartsOpenComment // true if the line ends within an comment (out)
-       );
-   };
-   FileData m_normalData;
-   FileData m_lmppData;
-   QTextCodec* m_pEncoding;
+        bool readFile(const QString& filename);
+        bool writeFile(const QString& filename);
+        bool preprocess(bool bPreserveCR, QTextCodec* pEncoding);
+        void reset();
+        void removeComments();
+        void copyBufFrom(const FileData& src);
+
+        void checkLineForComments(
+            const QChar* p,          // pointer to start of buffer
+            int& i,                  // index of current position (in, out)
+            int size,                // size of buffer
+            bool& bWhite,            // false if this line contains nonwhite characters (in, out)
+            bool& bCommentInLine,    // true if any comment is within this line (in, out)
+            bool& bStartsOpenComment // true if the line ends within an comment (out)
+        );
+    };
+    FileData m_normalData;
+    FileData m_lmppData;
+    QTextCodec* m_pEncoding;
 };
 
-void calcDiff3LineListTrim( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList );
-void calcWhiteDiff3Lines(   Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC );
+void calcDiff3LineListTrim(Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList);
+void calcWhiteDiff3Lines(Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC);
 
-void calcDiff3LineVector( Diff3LineList& d3ll, Diff3LineVector& d3lv );
+void calcDiff3LineVector(Diff3LineList& d3ll, Diff3LineVector& d3lv);
 
 // Helper class that swaps left and right for some commands.
 class MyPainter : public QPainter
 {
-   int m_factor;
-   int m_xOffset;
-   int m_fontWidth;
-public:
-   MyPainter(QPaintDevice* pd, bool bRTL, int width, int fontWidth)
-   : QPainter(pd)
-   {
-      if (bRTL)
-      {
-         m_fontWidth = fontWidth;
-         m_factor = -1;
-         m_xOffset = width-1;
-      }
-      else
-      {
-         m_fontWidth = 0;
-         m_factor = 1;
-         m_xOffset = 0;
-      }
-   }
-
-   void fillRect( int x, int y, int w, int h, const QBrush& b )
-   {
-      if (m_factor==1)
-         QPainter::fillRect( m_xOffset + x    , y, w, h, b );
-      else
-         QPainter::fillRect( m_xOffset - x - w, y, w, h, b );
-   }
-
-   void drawText( int x, int y, const QString& s, bool bAdapt=false )
-   {
-      Qt::LayoutDirection ld = (m_factor==1 || !bAdapt) ? Qt::LeftToRight : Qt::RightToLeft;
-      //QPainter::setLayoutDirection( ld );
-      if ( ld==Qt::RightToLeft ) // Reverse the text
-      {
-         QString s2;
-         for( int i=s.length()-1; i>=0; --i )
-         {
-            s2 += s[i];
-         }
-         QPainter::drawText( m_xOffset-m_fontWidth*s.length() + m_factor*x, y, s2 );
-         return;
-      }
-      QPainter::drawText( m_xOffset-m_fontWidth*s.length() + m_factor*x, y, s );
-   }
-
-   void drawLine( int x1, int y1, int x2, int y2 )
-   {
-      QPainter::drawLine( m_xOffset + m_factor*x1, y1, m_xOffset + m_factor*x2, y2 );
-   }
+    int m_factor;
+    int m_xOffset;
+    int m_fontWidth;
+
+  public:
+    MyPainter(QPaintDevice* pd, bool bRTL, int width, int fontWidth)
+        : QPainter(pd)
+    {
+        if(bRTL)
+        {
+            m_fontWidth = fontWidth;
+            m_factor = -1;
+            m_xOffset = width - 1;
+        }
+        else
+        {
+            m_fontWidth = 0;
+            m_factor = 1;
+            m_xOffset = 0;
+        }
+    }
+
+    void fillRect(int x, int y, int w, int h, const QBrush& b)
+    {
+        if(m_factor == 1)
+            QPainter::fillRect(m_xOffset + x, y, w, h, b);
+        else
+            QPainter::fillRect(m_xOffset - x - w, y, w, h, b);
+    }
+
+    void drawText(int x, int y, const QString& s, bool bAdapt = false)
+    {
+        Qt::LayoutDirection ld = (m_factor == 1 || !bAdapt) ? Qt::LeftToRight : Qt::RightToLeft;
+        //QPainter::setLayoutDirection( ld );
+        if(ld == Qt::RightToLeft) // Reverse the text
+        {
+            QString s2;
+            for(int i = s.length() - 1; i >= 0; --i)
+            {
+                s2 += s[i];
+            }
+            QPainter::drawText(m_xOffset - m_fontWidth * s.length() + m_factor * x, y, s2);
+            return;
+        }
+        QPainter::drawText(m_xOffset - m_fontWidth * s.length() + m_factor * x, y, s);
+    }
+
+    void drawLine(int x1, int y1, int x2, int y2)
+    {
+        QPainter::drawLine(m_xOffset + m_factor * x1, y1, m_xOffset + m_factor * x2, y2);
+    }
 };
 
-bool runDiff( const LineData* p1, LineRef size1, const LineData* p2, LineRef size2, DiffList& diffList, int winIdx1, int winIdx2,
-              ManualDiffHelpList *pManualDiffHelpList, Options *pOptions);
+bool runDiff(const LineData* p1, LineRef size1, const LineData* p2, LineRef size2, DiffList& diffList, int winIdx1, int winIdx2,
+             ManualDiffHelpList* pManualDiffHelpList, Options* pOptions);
 
 bool fineDiff(
-   Diff3LineList& diff3LineList,
-   int selector,
-   const LineData* v1,
-   const LineData* v2
-   );
-
-
-bool equal( const LineData& l1, const LineData& l2, bool bStrict );
+    Diff3LineList& diff3LineList,
+    int selector,
+    const LineData* v1,
+    const LineData* v2);
 
+bool equal(const LineData& l1, const LineData& l2, bool bStrict);
 
-
-
-inline bool isWhite( QChar c )
+inline bool isWhite(QChar c)
 {
-   return c==' ' || c=='\t' ||  c=='\r';
+    return c == ' ' || c == '\t' || c == '\r';
 }
 
 /** Returns the number of equivalent spaces at position outPos.
 */
-inline int tabber( int outPos, int tabSize )
+inline int tabber(int outPos, int tabSize)
 {
-   return tabSize - ( outPos % tabSize );
+    return tabSize - (outPos % tabSize);
 }
 
 /** Returns a line number where the linerange [line, line+nofLines] can
     be displayed best. If it fits into the currently visible range then
     the returned value is the current firstLine.
 */
-int getBestFirstLine( int line, int nofLines, int firstLine, int visibleLines );
+int getBestFirstLine(int line, int nofLines, int firstLine, int visibleLines);
 
 extern bool g_bIgnoreWhiteSpace;
 extern bool g_bIgnoreTrivialMatches;
 extern int g_bAutoSolve;
 
 // Cursor conversions that consider g_tabSize.
-int convertToPosInText( const QString& s, int posOnScreen, int tabSize );
-int convertToPosOnScreen( const QString& s, int posInText, int tabSize );
+int convertToPosInText(const QString& s, int posOnScreen, int tabSize);
+int convertToPosOnScreen(const QString& s, int posInText, int tabSize);
 
-enum e_CoordType { eFileCoords, eD3LLineCoords, eWrapCoords };
+enum e_CoordType
+{
+    eFileCoords,
+    eD3LLineCoords,
+    eWrapCoords
+};
 
-void calcTokenPos( const QString&, int posOnScreen, int& pos1, int& pos2, int tabSize );
+void calcTokenPos(const QString&, int posOnScreen, int& pos1, int& pos2, int tabSize);
 
-QString calcHistorySortKey( const QString& keyOrder, QRegExp& matchedRegExpr, const QStringList& parenthesesGroupList );
-bool findParenthesesGroups( const QString& s, QStringList& sl );
+QString calcHistorySortKey(const QString& keyOrder, QRegExp& matchedRegExpr, const QStringList& parenthesesGroupList);
+bool findParenthesesGroups(const QString& s, QStringList& sl);
 #endif
-