Commit 5ae58248 authored by Michael Reeves's avatar Michael Reeves

Cleanup

*reconcile parameter names in definition and declaration
*use const referance where applicable
parent 3a77e055
......@@ -92,7 +92,7 @@ QPixmap pixCombiner2(const QPixmap* pm1, const QPixmap* pm2)
return pix;
}
void initPixmaps(QColor newest, QColor oldest, QColor middle, QColor notThere)
void initPixmaps(const QColor& newest, const QColor& oldest, const QColor& middle, const QColor& notThere)
{
if(s_pm_dir == nullptr || s_pm_file == nullptr)
{
......
......@@ -33,7 +33,7 @@ QPixmap pixCombiner(const QPixmap* pm1, const QPixmap* pm2);
// like pixCombiner but let the pm1 color shine through
QPixmap pixCombiner2(const QPixmap* pm1, const QPixmap* pm2);
void initPixmaps(QColor newest, QColor oldest, QColor middle, QColor notThere);
void initPixmaps(const QColor& newest, const QColor& oldest, const QColor& middle, const QColor& notThere);
QPixmap getOnePixmap(e_Age eAge, bool bLink, bool bDir);
......
......@@ -21,14 +21,14 @@ class CvsIgnoreList
public:
CvsIgnoreList() {}
void init(FileAccess& dir, const t_DirectoryList* pDirList);
bool matches(const QString& fileName, bool bCaseSensitive) const;
bool matches(const QString& text, bool bCaseSensitive) const;
private:
bool cvsIgnoreExists(const t_DirectoryList* pDirList);
void addEntriesFromString(const QString& str);
void addEntriesFromFile(const QString& name);
void addEntry(const QString& entry);
void addEntry(const QString& pattern);
QStringList m_exactPatterns;
QStringList m_startPatterns;
......
......@@ -105,13 +105,9 @@ bool equal(const LineData& l1, const LineData& l2, bool bStrict)
++nonWhite;
}
}
else
{
if(l1.size == l2.size && memcmp(p1, p2, l1.size) == 0)
return true;
else
return false;
return (l1.size == l2.size && memcmp(p1, p2, l1.size) == 0);
}
}
......
......@@ -48,7 +48,7 @@ struct LineData
const QChar* pFirstNonWhiteChar;
int size;
LineData(){ pLine=nullptr; pFirstNonWhiteChar=nullptr; size=0; /*occurrences=0;*/
LineData(){ pLine=nullptr; pFirstNonWhiteChar=nullptr; size=0; /*occurrences=0;*/
bContainsPureComment=false; }
int width(int tabSize) const; // Calcs width considering tabs.
//int occurrences;
......@@ -117,7 +117,7 @@ struct Diff3Line
bool operator==( const Diff3Line& d3l ) const
{
return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
&& bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;
}
......@@ -175,7 +175,7 @@ public:
nofUnsolvedConflicts=0; nofSolvedConflicts=0;
nofWhitespaceConflicts=0;
}
inline int getUnsolvedConflicts() const { return nofUnsolvedConflicts; }
inline void setUnsolvedConflicts(const int unsolved) { nofUnsolvedConflicts = unsolved; }
......@@ -207,8 +207,8 @@ private:
class ManualDiffHelpEntry
{
public:
ManualDiffHelpEntry() { lineA1=-1; lineA2=-1;
lineB1=-1; lineB2=-1;
ManualDiffHelpEntry() { lineA1=-1; lineA2=-1;
lineB1=-1; lineB2=-1;
lineC1=-1; lineC2=-1; }
LineRef lineA1;
LineRef lineA2;
......@@ -244,7 +244,7 @@ void calcDiff3LineListUsingAB(
);
void calcDiff3LineListUsingAC(
const DiffList* pDiffListBC,
const DiffList* pDiffListAC,
Diff3LineList& d3ll
);
......@@ -271,11 +271,11 @@ public:
const LineData* getLineDataForDiff() const;
void setFilename(const QString& filename);
void setFileAccess( const FileAccess& fa );
void setFileAccess( const FileAccess& fileAccess );
void setEncoding(QTextCodec* pEncoding);
//FileAccess& getFileAccess();
QString getFilename();
void setAliasName(const QString& a);
void setAliasName(const QString& name);
QString getAliasName();
bool isEmpty(); // File was set
bool hasData(); // Data was readable
......@@ -333,8 +333,8 @@ private:
);
};
FileData m_normalData;
FileData m_lmppData;
QTextCodec* m_pEncoding;
FileData m_lmppData;
QTextCodec* m_pEncoding;
};
void calcDiff3LineListTrim( Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList );
......@@ -349,10 +349,10 @@ class MyPainter : public QPainter
int m_xOffset;
int m_fontWidth;
public:
MyPainter(QPaintDevice* pd, bool bRTL, int width, int fontWidth)
MyPainter(QPaintDevice* pd, bool bRTL, int width, int fontWidth)
: QPainter(pd)
{
if (bRTL)
if (bRTL)
{
m_fontWidth = fontWidth;
m_factor = -1;
......
......@@ -32,7 +32,7 @@ public:
~DiffTextWindow() override;
void init(
const QString& fileName,
QTextCodec* pCodec,
QTextCodec* pTextCodec,
e_LineEndStyle eLineEndStyle,
const LineData* pLineData,
int size,
......@@ -65,7 +65,7 @@ public:
void getSelectionRange( int* firstLine, int* lastLine, e_CoordType coordType );
void setPaintingAllowed( bool bAllowPainting );
void recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int nofVisibleColumns);
void recalcWordWrap( bool bWordWrap, int wrapLineVectorSize, int visibleTextWidth);
void recalcWordWrapHelper( int wrapLineVectorSize, int visibleTextWidth, int cacheListIdx);
void print( MyPainter& painter, const QRect& r, int firstLine, int nofLinesPerPage );
Q_SIGNALS:
......
......@@ -203,7 +203,7 @@ class DirectoryMergeWindow::DirectoryMergeWindowPrivate : public QAbstractItemMo
void mergeContinue(bool bStart, bool bVerbose);
void prepareListView(ProgressProxy& pp);
void calcSuggestedOperation(const QModelIndex& mi, e_MergeOperation eDefaultOperation);
void calcSuggestedOperation(const QModelIndex& mi, e_MergeOperation eDefaultMergeOp);
void setAllMergeOperations(e_MergeOperation eDefaultOperation);
bool canContinue();
......@@ -355,7 +355,7 @@ class DirectoryMergeWindow::DirectoryMergeWindowPrivate : public QAbstractItemMo
QAction* m_pDirSaveMergeState;
QAction* m_pDirLoadMergeState;
bool init(QSharedPointer<DirectoryInfo> dirInfo, bool bDirectoryMerge, bool bReload);
bool init(const QSharedPointer<DirectoryInfo> &dirInfo, bool bDirectoryMerge, bool bReload);
void setOpStatus(const QModelIndex& mi, e_OperationStatus eOpStatus)
{
if(MergeFileInfos* pMFI = getMFI(mi))
......@@ -852,7 +852,7 @@ struct t_ItemInfo {
};
bool DirectoryMergeWindow::init(
QSharedPointer<DirectoryInfo> dirInfo,
const QSharedPointer<DirectoryInfo> &dirInfo,
bool bDirectoryMerge,
bool bReload)
{
......@@ -898,7 +898,7 @@ void DirectoryMergeWindow::DirectoryMergeWindowPrivate::buildMergeMap(const QSha
}
bool DirectoryMergeWindow::DirectoryMergeWindowPrivate::init(
QSharedPointer<DirectoryInfo> dirInfo,
const QSharedPointer<DirectoryInfo> &dirInfo,
bool bDirectoryMerge,
bool bReload)
{
......@@ -2209,19 +2209,19 @@ void DirectoryMergeWindow::DirectoryMergeWindowPrivate::sort(int column, Qt::Sor
endResetModel();
}
void DirectoryMergeWindow::DirectoryMergeWindowPrivate::setMergeOperation(const QModelIndex& mi, e_MergeOperation eMOp, bool bRecursive)
void DirectoryMergeWindow::DirectoryMergeWindowPrivate::setMergeOperation(const QModelIndex& mi, e_MergeOperation eMergeOp, bool bRecursive)
{
MergeFileInfos* pMFI = getMFI(mi);
if(pMFI == nullptr)
return;
if(eMOp != pMFI->m_eMergeOperation)
if(eMergeOp != pMFI->m_eMergeOperation)
{
pMFI->m_bOperationComplete = false;
setOpStatus(mi, eOpStatusNone);
}
pMFI->m_eMergeOperation = eMOp;
pMFI->m_eMergeOperation = eMergeOp;
if(bRecursive)
{
e_MergeOperation eChildrenMergeOp = pMFI->m_eMergeOperation;
......
......@@ -43,7 +43,7 @@ public:
~DirectoryMergeWindow() override;
void setDirectoryMergeInfo(DirectoryMergeInfo* p);
bool init(
QSharedPointer<DirectoryInfo> dirInfo,
const QSharedPointer<DirectoryInfo> &dirInfo,
bool bDirectoryMerge,
bool bReload = false
);
......@@ -137,10 +137,10 @@ class DirectoryMergeInfo : public QFrame
public:
explicit DirectoryMergeInfo( QWidget* pParent );
void setInfo(
const FileAccess& APath,
const FileAccess& BPath,
const FileAccess& CPath,
const FileAccess& DestPath,
const FileAccess& dirA,
const FileAccess& dirB,
const FileAccess& dirC,
const FileAccess& dirDest,
MergeFileInfos& mfi );
QTreeWidget* getInfoList() {return m_pInfoList;}
bool eventFilter( QObject* o, QEvent* e ) override;
......
......@@ -80,7 +80,7 @@ FileAccess::~FileAccess()
/*
Needed only during directory listing right now.
*/
void FileAccess::setFile(FileAccess* pParent, QFileInfo fi)
void FileAccess::setFile(FileAccess* pParent, const QFileInfo &fi)
{
reset();
......@@ -741,13 +741,13 @@ void FileAccess::filterList(t_DirectoryList *pDirList, const QString& filePatter
{
t_DirectoryList::iterator i2 = i;
++i2;
QString fn = i->fileName();
QString fileName = i->fileName();
if( (i->isFile() &&
(!Utils::wildcardMultiMatch(filePattern, fn, bCaseSensitive) ||
Utils::wildcardMultiMatch(fileAntiPattern, fn, bCaseSensitive))) ||
(i->isDir() && Utils::wildcardMultiMatch(dirAntiPattern, fn, bCaseSensitive)) ||
(bUseCvsIgnore && cvsIgnoreList.matches(fn, bCaseSensitive)))
(!Utils::wildcardMultiMatch(filePattern, fileName, bCaseSensitive) ||
Utils::wildcardMultiMatch(fileAntiPattern, fileName, bCaseSensitive))) ||
(i->isDir() && Utils::wildcardMultiMatch(dirAntiPattern, fileName, bCaseSensitive)) ||
(bUseCvsIgnore && cvsIgnoreList.matches(fileName, bCaseSensitive)))
{
// Remove it
pDirList->erase(i);
......
......@@ -36,8 +36,8 @@ public:
~FileAccess();
explicit FileAccess( const QString& name, bool bWantToWrite=false ); // name: local file or dirname or url (when supported)
void setFile( const QString& name, bool bWantToWrite=false );
void setFile( const QUrl& name, bool bWantToWrite = false);
void setFile( FileAccess* pParent, QFileInfo fi );
void setFile( const QUrl& url, bool bWantToWrite = false);
void setFile( FileAccess* pParent, const QFileInfo& fi );
void loadData();
......@@ -61,7 +61,7 @@ public:
QString fileRelPath() const; // The path relative to base comparison directory
QString prettyAbsPath() const;
QUrl url() const;
void setUrl(const QUrl inUrl) { m_url = inUrl; }
void setUrl(const QUrl &inUrl) { m_url = inUrl; }
QString absoluteFilePath() const;
bool isLocal() const;
......@@ -93,7 +93,7 @@ public:
QString getStatusText();
FileAccess* parent() const; // !=0 for listDir-results, but only valid if the parent was not yet destroyed.
void doError();
void filterList(t_DirectoryList* pDirList, const QString& filePattern,
const QString& fileAntiPattern, const QString& dirAntiPattern,
......@@ -110,7 +110,7 @@ public:
QUrl m_url;
bool m_bValidData;
//long m_fileType; // for testing only
FileAccess* m_pParent;
......@@ -131,7 +131,7 @@ public:
bool m_bReadable;
bool m_bExecutable;
bool m_bHidden;
QString m_statusText; // Might contain an error string, when the last operation didn't succeed.
};
......@@ -154,7 +154,7 @@ public:
const QString& dirAntiPattern, bool bFollowDirLinks, bool bUseCvsIgnore );
bool mkDir( const QString& dirName );
bool rmDir( const QString& dirName );
bool removeFile( const QUrl& dirName );
bool removeFile( const QUrl& fileName );
bool symLink( const QUrl& linkTarget, const QUrl& linkLocation );
private:
......
......@@ -58,6 +58,7 @@
#define ID_STATUS_MSG 1
#define MAIN_TOOLBAR_NAME QLatin1String("mainToolBar")
void printDiffTextWindow(MyPainter& painter, const QRect& view, const QString& headerText, DiffTextWindow* pDiffTextWindow, int line, int linesPerPage, const QColor& fgColor);
KActionCollection* KDiff3App::actionCollection()
{
if(m_pKDiff3Shell == nullptr)
......@@ -97,10 +98,10 @@ bool KDiff3App::isDirComparison()
return m_bDirCompare;
}
KDiff3App::KDiff3App(QWidget* pParent, const QString /*name*/, KDiff3Part* pKDiff3Part)
KDiff3App::KDiff3App(QWidget* pParent, const QString& name, KDiff3Part* pKDiff3Part)
: QSplitter(pParent) //previously KMainWindow
{
setObjectName("KDiff3App");
setObjectName(name);
m_pKDiff3Part = pKDiff3Part;
m_pKDiff3Shell = qobject_cast<KParts::MainWindow*>(pParent);
......@@ -765,7 +766,7 @@ void KDiff3App::slotFileSaveAs()
slotStatusMsg(i18n("Ready."));
}
void printDiffTextWindow(MyPainter& painter, const QRect& view, const QString& headerText, DiffTextWindow* pDiffTextWindow, int line, int linesPerPage, QColor fgColor)
void printDiffTextWindow(MyPainter& painter, const QRect& view, const QString& headerText, DiffTextWindow* pDiffTextWindow, int line, int linesPerPage, const QColor &fgColor)
{
QRect clipRect = view;
clipRect.setTop(0);
......
......@@ -100,7 +100,7 @@ class KDiff3App : public QSplitter
public:
/** constructor of KDiff3App, calls all init functions to create the application.
*/
KDiff3App(QWidget* parent, const QString name, KDiff3Part* pKDiff3Part);
KDiff3App(QWidget* parent, const QString& name, KDiff3Part* pKDiff3Part);
~KDiff3App() override;
bool isPart();
......@@ -145,8 +145,8 @@ class KDiff3App : public QSplitter
/** open a file and load it into the document*/
void slotFileOpen();
void slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
QString an1, QString an2, QString an3, const QSharedPointer<TotalDiffStatus> &pTotalDiffStatus);
void slotFileOpen2(const QString& fn1, const QString& fn2, const QString& fn3, const QString& ofn,
const QString& an1, const QString &an2, const QString& an3, const QSharedPointer<TotalDiffStatus> &pTotalDiffStatus);
void slotFileNameChanged(const QString& fileName, int winIdx);
......@@ -411,7 +411,7 @@ class KDiff3App : public QSplitter
KParts::MainWindow* m_pKDiff3Shell;
bool m_bAutoFlag;
bool m_bAutoMode;
void recalcWordWrap(int nofVisibleColumns = -1);
void recalcWordWrap(int visibleTextWidthForPrinting = -1);
bool m_bRecalcWordWrapPosted;
void setHScrollBarRange();
......
......@@ -35,7 +35,6 @@
#include <KToolBar>
KDiff3Shell::KDiff3Shell(bool bCompleteInit)
: KParts::MainWindow()
{
m_bUnderConstruction = true;
// set the shell's ui resource file
......
......@@ -13,8 +13,8 @@
#include <list>
Merger::Merger(const DiffList* pDiffListAB, const DiffList* pDiffListCA)
: md1(pDiffListAB, 0), md2(pDiffListCA, 1)
Merger::Merger(const DiffList* pDiffList1, const DiffList* pDiffList2)
: md1(pDiffList1, 0), md2(pDiffList2, 1)
{
}
......
......@@ -1212,7 +1212,7 @@ QString calcHistorySortKey(const QString& keyOrder, QRegExp& matchedRegExpr, con
}
void MergeResultWindow::collectHistoryInformation(
int src, Diff3LineList::const_iterator iHistoryBegin, Diff3LineList::const_iterator iHistoryEnd,
int src, Diff3LineList::const_iterator &iHistoryBegin, Diff3LineList::const_iterator &iHistoryEnd,
HistoryMap& historyMap,
std::list<HistoryMap::iterator>& hitList // list of iterators
)
......
......@@ -190,7 +190,7 @@ private:
class MergeEditLine
{
public:
explicit MergeEditLine(Diff3LineList::const_iterator i, int src=0){m_id3l=i; m_src=src; m_bLineRemoved=false; }
explicit MergeEditLine(const Diff3LineList::const_iterator &i, int src=0){m_id3l=i; m_src=src; m_bLineRemoved=false; }
void setConflict() { m_src=0; m_bLineRemoved=false; m_str=QString(); }
bool isConflict() { return m_src==0 && !m_bLineRemoved && m_str.isEmpty(); }
void setRemoved(int src=0) { m_src=src; m_bLineRemoved=true; m_str=QString(); }
......@@ -258,9 +258,9 @@ private:
}
private:
void ds(int deltaSize)
void ds(int deltaSize)
{
m_size+=deltaSize;
m_size+=deltaSize;
if (m_pTotalSize!=nullptr) *m_pTotalSize+=deltaSize;
}
};
......@@ -285,7 +285,7 @@ private:
MergeEditLineList mergeEditLineList;
void split( MergeLine& ml2, int d3lLineIdx2 ) // The caller must insert the ml2 after this ml in the m_mergeLineList
{
if ( d3lLineIdx2<d3lLineIdx || d3lLineIdx2 >= d3lLineIdx + srcRangeLength )
if ( d3lLineIdx2<d3lLineIdx || d3lLineIdx2 >= d3lLineIdx + srcRangeLength )
return; //Error
ml2.mergeDetails = mergeDetails;
ml2.bConflict = bConflict;
......@@ -336,7 +336,7 @@ private:
bool staysInPlace( bool bThreeInputs, Diff3LineList::const_iterator& iHistoryEnd );
};
typedef std::map<QString,HistoryMapEntry> HistoryMap;
void collectHistoryInformation( int src, Diff3LineList::const_iterator iHistoryBegin, Diff3LineList::const_iterator iHistoryEnd, HistoryMap& historyMap, std::list< HistoryMap::iterator >& hitList );
void collectHistoryInformation( int src, Diff3LineList::const_iterator &iHistoryBegin, Diff3LineList::const_iterator &iHistoryEnd, HistoryMap& historyMap, std::list< HistoryMap::iterator >& hitList );
typedef std::list<MergeLine> MergeLineList;
MergeLineList m_mergeLineList;
......@@ -439,7 +439,7 @@ public:
void setFileName(const QString& fileName );
QString getFileName();
void setEncodings( QTextCodec* pCodecForA, QTextCodec* pCodecForB, QTextCodec* pCodecForC );
void setEncoding( QTextCodec* pCodec );
void setEncoding( QTextCodec* pEncoding );
void setLineEndStyles( e_LineEndStyle eLineEndStyleA, e_LineEndStyle eLineEndStyleB, e_LineEndStyle eLineEndStyleC);
e_LineEndStyle getLineEndStyle();
......
......@@ -122,7 +122,7 @@ class OptionItemT : public OptionItem
class OptionCheckBox : public QCheckBox, public OptionItemT<bool>
{
public:
OptionCheckBox(QString text, bool bDefaultVal, const QString& saveName, bool* pbVar,
OptionCheckBox(const QString &text, bool bDefaultVal, const QString& saveName, bool* pbVar,
QWidget* pParent)
: QCheckBox(text, pParent), OptionItemT<bool>(saveName)
{
......@@ -142,7 +142,7 @@ class OptionCheckBox : public QCheckBox, public OptionItemT<bool>
class OptionRadioButton : public QRadioButton, public OptionItemT<bool>
{
public:
OptionRadioButton(QString text, bool bDefaultVal, const QString& saveName, bool* pbVar,
OptionRadioButton(const QString& text, bool bDefaultVal, const QString& saveName, bool* pbVar,
QWidget* pParent)
: QRadioButton(text, pParent), OptionItemT<bool>(saveName)
{
......@@ -272,7 +272,7 @@ class OptionFontChooser : public FontChooser, public OptionItemT<QFont>
class OptionColorButton : public KColorButton, public OptionItemT<QColor>
{
public:
OptionColorButton(QColor defaultVal, const QString& saveName, QColor* pVar, QWidget* pParent)
OptionColorButton(const QColor &defaultVal, const QString& saveName, QColor* pVar, QWidget* pParent)
: KColorButton(pParent), OptionItemT<QColor>(saveName)
{
m_pVar = pVar;
......
......@@ -1039,8 +1039,8 @@ void KDiff3App::slotFileOpen()
slotStatusMsg(i18n("Ready."));
}
void KDiff3App::slotFileOpen2(QString fn1, QString fn2, QString fn3, QString ofn,
QString an1, QString an2, QString an3, const QSharedPointer<TotalDiffStatus> &pTotalDiffStatus)
void KDiff3App::slotFileOpen2(const QString& fn1, const QString& fn2, const QString& fn3, const QString& ofn,
const QString& an1, const QString& an2, const QString& an3, const QSharedPointer<TotalDiffStatus> &pTotalDiffStatus)
{
if(!canContinue()) return;
......
......@@ -56,17 +56,17 @@ public:
void hide();
void hideStatusBarWidget();
void delayedHideStatusBarWidget();
void timerEvent(QTimerEvent*) override;
public slots:
void recalc(bool bRedrawUpdate);
void recalc(bool bUpdate);
private:
struct ProgressLevelData
{
ProgressLevelData()
{
m_current=0; m_maxNofSteps=1; m_dRangeMin=0; m_dRangeMax=1;
m_current=0; m_maxNofSteps=1; m_dRangeMin=0; m_dRangeMax=1;
m_dSubRangeMin = 0; m_dSubRangeMax = 1;
}
QAtomicInteger<qint64> m_current;
......@@ -77,7 +77,7 @@ private:
double m_dSubRangeMin;
};
QList<ProgressLevelData> m_progressStack;
int m_progressDelayTimer;
int m_delayedHideTimer;
int m_delayedHideStatusBarWidgetTimer;
......@@ -115,7 +115,7 @@ class ProgressProxy: public QObject
public:
ProgressProxy();
~ProgressProxy() override;
void setInformation( const QString& info, bool bRedrawUpdate=true );
void setInformation( const QString& info, int current, bool bRedrawUpdate=true );
void setCurrent( qint64 current, bool bRedrawUpdate=true );
......
......@@ -548,7 +548,7 @@ RegExpTester::RegExpTester(QWidget* pParent, const QString& autoMergeRegExpToolT
resize(800, sizeHint().height());
}
void RegExpTester::init(const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString historySortKeyOrder)
void RegExpTester::init(const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString& historySortKeyOrder)
{
m_pAutoMergeRegExpEdit->setText(autoMergeRegExp);
m_pHistoryStartRegExpEdit->setText(historyStartRegExp);
......
......@@ -107,7 +107,7 @@ private:
public:
RegExpTester( QWidget* pParent, const QString& autoMergeRegExpToolTip, const QString& historyStartRegExpToolTip,
const QString& historyEntryStartRegExpToolTip, const QString& historySortKeyOrderToolTip );
void init( const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString sortKeyOrder );
void init( const QString& autoMergeRegExp, const QString& historyStartRegExp, const QString& historyEntryStartRegExp, const QString& sortKeyOrder );
QString autoMergeRegExp();
QString historyStartRegExp();
QString historyEntryStartRegExp();
......
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