Git commit 78bfdcb9180f96230b5e11505bb5ad2c2c04816b by Michael Reeves. Committed on 09/05/2023 at 20:27. Pushed by mreeves into branch 'master'.
Fix typos M +1 -1 doc/en/index.docbook M +3 -3 src/LineRef.h M +2 -2 src/SourceData.cpp M +1 -1 src/guiutils.h M +5 -5 src/kdiff3.cpp M +1 -1 src/mergeresultwindow.cpp M +7 -7 src/optiondialog.cpp M +6 -6 src/pdiff.cpp https://invent.kde.org/sdk/kdiff3/commit/78bfdcb9180f96230b5e11505bb5ad2c2c04816b diff --git a/doc/en/index.docbook b/doc/en/index.docbook index d89d866d..75ebffd3 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -522,7 +522,7 @@ They will appear in the usage help like in this example:</para> </para><para> &kdiff3; offers automatic merge for these items at <guilabel>Merge</guilabel> item in the settings dialog. For simple lines that match the <guilabel>Auto merge regular expression</guilabel> option in all input-files &kdiff3; will choose the line from <guilabel>B</guilabel> or - if available - from <guilabel>C</guilabel>. (Additionally it is necessary that the lines in question line up in the comparison and the previous line contains no conflict.) This auto merge can either be run immediately after a merge starts (activate the option <guilabel>Run regular expression auto merge on merge start</guilabel>) or later via <menuchoice><guimenu>Merge</guimenu><guimenuitem>Run Regular Expression Auto Merge</guimenuitem></menuchoice> menu item. </para><para> - Automatic merge for version control history (also called "log") is also supported. The history automerge can either run immediately when the merge starts by activating the option <guilabel>Merge version control history on merge start</guilabel> at <guilabel>Merge</guilabel> item in the settings dialog or later via the <menuchoice><guimenu>Merge</guimenu><guimenuitem>Automatically Solve History Conflicts</guimenuitem></menuchoice> menu item. + Automatic merge for version control history (also called "log") is also supported. The history auto-merge can either run immediately when the merge starts by activating the option <guilabel>Merge version control history on merge start</guilabel> at <guilabel>Merge</guilabel> item in the settings dialog or later via the <menuchoice><guimenu>Merge</guimenu><guimenuitem>Automatically Solve History Conflicts</guimenuitem></menuchoice> menu item. </para><para> Usually the version control history begins with a line containing the keyword "<literal>$Log$</literal>". This must be matched by the <guilabel>History start regular expression:</guilabel> option. &kdiff3; detects which subsequent lines are in the history by analysing the leading characters that came before the "<literal>$Log$</literal>" keyword. If the same "leading comment" characters also appears in the following lines, then they are also included in the history. </para><para> diff --git a/src/LineRef.h b/src/LineRef.h index ac1e4b8b..db9dd7c0 100644 --- a/src/LineRef.h +++ b/src/LineRef.h @@ -92,11 +92,11 @@ class LineRef /* This is here because its easy to unknowingly break these conditions. The resulting - compiler errors are numerous and may be a bit cryptic if you aren't famialar with the C++ language. + compiler errors are numerous and may be a bit cryptic if you aren't familiar with the C++ language. Also some IDEs with clangd or ccls integration can automatically check static_asserts without doing a full compile. */ -static_assert(std::is_copy_constructible<LineRef>::value, "LineRef must be copy constuctible."); +static_assert(std::is_copy_constructible<LineRef>::value, "LineRef must be copy constructible."); static_assert(std::is_copy_assignable<LineRef>::value, "LineRef must copy assignable."); static_assert(std::is_move_constructible<LineRef>::value, "LineRef must be move constructible."); static_assert(std::is_move_assignable<LineRef>::value, "LineRef must be move assignable."); @@ -105,6 +105,6 @@ static_assert(std::is_convertible<int, LineRef>::value, "Can not convert int to using LineType = LineRef::LineType; -//Break in an obvious way if way cann't get LineCounts from Qt supplied ints without overflow issues. +//Break in an obvious way if way can't get LineCounts from Qt supplied ints without overflow issues. static_assert(sizeof(LineType) >= sizeof(QtNumberType)); //Generally assumed by KDiff3 #endif diff --git a/src/SourceData.cpp b/src/SourceData.cpp index fb8d8c8e..8876b0f6 100644 --- a/src/SourceData.cpp +++ b/src/SourceData.cpp @@ -309,7 +309,7 @@ bool SourceData::FileData::writeFile(const QString& filename) return bSuccess; } -//Depriated +//Deprecated void SourceData::FileData::copyBufFrom(const FileData& src) //TODO: Remove me. { reset(); @@ -553,7 +553,7 @@ void SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicod { qint64 vSize = std::min(m_normalData.lineCount(), m_lmppData.lineCount()); assert(vSize < limits<qint32>::max()); - //Perform explcit cast to insure well defined behavior comparing 32-bit to a 64-bit value + //Perform explicit cast to insure well defined behavior comparing 32-bit to a 64-bit value for(qint32 i = 0; (qint64)i < vSize; ++i) { //TODO: Phase this out. We should not be messing with these flags outside the parser. diff --git a/src/guiutils.h b/src/guiutils.h index 57b4696a..e8d4e5ed 100644 --- a/src/guiutils.h +++ b/src/guiutils.h @@ -19,7 +19,7 @@ namespace GuiUtils { /* Use std::enable_if since compilers don't disambiguate overloads based on return type alone. Further more KToggleAction is actually a subclass of QAction which would leave the call - ambigous even as a parameter. + ambiguous even as a parameter. */ template <class T, class Receiver, class Func> inline typename std::enable_if<std::is_same<T, QAction>::value, QAction>::type* createAction( diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 1db6d2b7..cca701ee 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -383,7 +383,7 @@ bool KDiff3App::canCut() } /* - Please do not add logic for MerdgeResultWindow or DiffTextWindow here they have their own handlers. + Please do not add logic for MergeResultWindow or DiffTextWindow here they have their own handlers. This function is only concerned with qt objects that don't support canCopy. allowCopy() or's the results from all canCopy signals sent via boost. @@ -581,7 +581,7 @@ void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QStri KDiff3App::~KDiff3App() { - // Prevent spurious focus change signals from Qt from being picked up by KDiff3App during distruction. + // Prevent spurious focus change signals from Qt from being picked up by KDiff3App during destruction. QObject::disconnect(qApp, &QApplication::focusChanged, this, &KDiff3App::slotFocusChanged); }; @@ -665,8 +665,8 @@ void KDiff3App::initActions(KActionCollection* ac) mGoBottom = GuiUtils::createAction<QAction>(i18n("Go to Last Delta"), QIcon(QPixmap(downend)), i18n("Last\nDelta"), this, &KDiff3App::slotGoBottom, ac, "go_bottom"); - QString omitsWhitespace = ".\n" + i18nc("Tooltip explaination text", "(Skips white space differences when \"Show White Space\" is disabled.)"); - QString includeWhitespace = ".\n" + i18nc("Tooltip explaination text", "(Does not skip white space differences even when \"Show White Space\" is disabled.)"); + QString omitsWhitespace = ".\n" + i18nc("Tooltip explanation text", "(Skips white space differences when \"Show White Space\" is disabled.)"); + QString includeWhitespace = ".\n" + i18nc("Tooltip explanation text", "(Does not skip white space differences even when \"Show White Space\" is disabled.)"); mGoPrevDelta = GuiUtils::createAction<QAction>(i18n("Go to Previous Delta"), QIcon(QPixmap(up1arrow)), i18n("Prev\nDelta"), QKeySequence(Qt::CTRL + Qt::Key_Up), this, &KDiff3App::slotGoPrevDelta, ac, "go_prev_delta"); mGoPrevDelta->setToolTip(mGoPrevDelta->text() + omitsWhitespace); mGoNextDelta = GuiUtils::createAction<QAction>(i18n("Go to Next Delta"), QIcon(QPixmap(down1arrow)), i18n("Next\nDelta"), QKeySequence(Qt::CTRL + Qt::Key_Down), this, &KDiff3App::slotGoNextDelta, ac, "go_next_delta"); @@ -684,7 +684,7 @@ void KDiff3App::initActions(KActionCollection* ac) chooseA = GuiUtils::createAction<KToggleAction>(i18nc("Title for menu item", "Select Line(s) From A"), QIcon(QPixmap(iconA)), i18nc("Text used for select A toolbar button.", "Choose\nA"), QKeySequence(Qt::CTRL + Qt::Key_1), this, &KDiff3App::slotChooseA, ac, "merge_choose_a"); chooseB = GuiUtils::createAction<KToggleAction>(i18nc("Title for menu item", "Select Line(s) From B"), QIcon(QPixmap(iconB)), i18nc("Text used for select B when toolbar button.", "Choose\nB"), QKeySequence(Qt::CTRL + Qt::Key_2), this, &KDiff3App::slotChooseB, ac, "merge_choose_b"); chooseC = GuiUtils::createAction<KToggleAction>(i18nc("Title for menu item", "Select Line(s) From C"), QIcon(QPixmap(iconC)), i18nc("Text used for select C toolbar button.", "Choose\nC"), QKeySequence(Qt::CTRL + Qt::Key_3), this, &KDiff3App::slotChooseC, ac, "merge_choose_c"); - autoAdvance = GuiUtils::createAction<KToggleAction>(i18nc("Title for menu item", "Automatically Go to Next Unsolved Conflict After Source Selection"), QIcon(QPixmap(autoadvance)), i18nc("Auto goto next unsolced toolbar text.", "Auto\nNext"), this, &KDiff3App::slotAutoAdvanceToggled, ac, "merge_autoadvance"); + autoAdvance = GuiUtils::createAction<KToggleAction>(i18nc("Title for menu item", "Automatically Go to Next Unsolved Conflict After Source Selection"), QIcon(QPixmap(autoadvance)), i18nc("Auto goto next unsolved toolbar text.", "Auto\nNext"), this, &KDiff3App::slotAutoAdvanceToggled, ac, "merge_autoadvance"); showWhiteSpaceCharacters = GuiUtils::createAction<KToggleAction>(i18n("Show Space && Tabulator Characters"), QIcon(QPixmap(showwhitespacechars)), i18nc("Show whitespace toolbar text.", "White\nCharacters"), this, &KDiff3App::slotShowWhiteSpaceToggled, ac, "diff_show_whitespace_characters"); showWhiteSpace = GuiUtils::createAction<KToggleAction>(i18n("Show White Space"), QIcon(QPixmap(showwhitespace)), i18nc("Show whitespace changes toolbar text.", "White\nDeltas"), this, &KDiff3App::slotShowWhiteSpaceToggled, ac, "diff_show_whitespace"); diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index 7431dc89..943afcfc 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -1309,7 +1309,7 @@ void MergeResultWindow::slotRegExpAutoMerge() // This doesn't detect user modifications and should only be called after automatic merge // This will only do something for three file merge. // Irrelevant changes are those where all contributions from B are already contained in C. -// Also irrelevant are conflicts automatically solved (automerge regexp and history automerge) +// Also irrelevant are conflicts automatically solved (auto-merge regexp and history auto-merge) // Precondition: The VCS-keyword would also be C. bool MergeResultWindow::doRelevantChangesExist() { diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 37f51dbc..3f2d01d0 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -1054,7 +1054,7 @@ void OptionDialog::setupMergePage() m_pHistoryAutoMerge = new OptionCheckBox(i18n("Merge version control history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m_options->m_bRunHistoryAutoMergeOnMergeStart, page); gbox->addWidget(m_pHistoryAutoMerge, line, 0, 1, 2); - m_pHistoryAutoMerge->setToolTip(i18nc("Tool Tip", "Run version control history automerge on merge start.")); + m_pHistoryAutoMerge->setToolTip(i18nc("Tool Tip", "Run version control history auto-merge on merge start.")); ++line; OptionIntEdit* pMaxNofHistoryEntries = new OptionIntEdit(-1, "MaxNofHistoryEntries", &m_options->m_maxNofHistoryEntries, -1, 1000, page); @@ -1076,9 +1076,9 @@ void OptionDialog::setupMergePage() OptionLineEdit* pLE = new OptionLineEdit("", "IrrelevantMergeCmd", &m_options->m_IrrelevantMergeCmd, page); gbox->addWidget(pLE, line, 1); - label->setToolTip(i18nc("Tool Tip", "If specified this script is run after automerge\n" - "when no other relevant changes were detected.\n" - "Called with the parameters: filename1 filename2 filename3")); + label->setToolTip(i18nc("Tool Tip", "If specified this script is run after auto-merge\n" + "when no other relevant changes were detected.\n" + "Called with the parameters: filename1 filename2 filename3")); ++line; OptionCheckBox* pAutoSaveAndQuit = new OptionCheckBox(i18n("Auto save and quit on merge without conflicts"), false, @@ -1159,8 +1159,8 @@ void OptionDialog::setupDirectoryMergePage() gbox->addWidget(pUseCvsIgnore, line, 0, 1, 2); pUseCvsIgnore->setToolTip(i18nc("Tool Tip", - "Extends the antipattern to anything that would be ignored by source control.\n" - "Via local ignore files this can be folder-specific.")); + "Extends the anti-pattern to anything that would be ignored by source control.\n" + "Via local ignore files this can be folder-specific.")); ++line; OptionCheckBox* pFindHidden = new OptionCheckBox(i18n("Find hidden files and folders"), true, "FindHidden", &m_options->m_bDmFindHidden, page); @@ -1516,7 +1516,7 @@ void OptionDialog::resetToDefaults() slotEncodingChanged(); } -/** Initialise the widgets using the values in the public varibles. */ +/** Initialise the widgets using the values in the public variables. */ void OptionDialog::setState() { Options::setToCurrent(); diff --git a/src/pdiff.cpp b/src/pdiff.cpp index 19860772..4928eb12 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -109,12 +109,12 @@ void KDiff3App::mainInit(TotalDiffStatus* pTotalDiffStatus, const InitFlags inFl } } - // Because of the progressdialog paintevents can occur, but data is invalid, + // Because of the progress dialog paint events can occur, but data is invalid, // so painting must be suppressed setLockPainting(true); } - //insure merge result window never has stale iterators/[poiners. + //insure merge result window never has stale iterators/pointers. if(m_pMergeResultWindow) m_pMergeResultWindow->reset(); //Clear stale pointers in DiffTextWindow. if(m_pDiffTextWindow1) m_pDiffTextWindow1->reset(); @@ -344,7 +344,7 @@ void KDiff3App::mainInit(TotalDiffStatus* pTotalDiffStatus, const InitFlags inFl m_neededLines = (QtNumberType)m_diff3LineList.size(); else { - mErrors.append(i18n("Too many lines in diff. Skiping file.")); + mErrors.append(i18n("Too many lines in diff. Skipping file.")); } //initView does first time setup for ui. Why is called it here? @@ -1181,7 +1181,7 @@ void KDiff3App::slotGoToLine() QVBoxLayout* l = new QVBoxLayout(&pDialog); QLineEdit* pLineNumEdit = new QLineEdit(); - //Limit imput to valid 1 based line numbers + //Limit input to valid 1 based line numbers pLineNumEdit->setValidator(new QIntValidator(1, DiffTextWindow::mVScrollBar->maximum(), pLineNumEdit)); QPushButton* pOkButton = new QPushButton(i18n("Ok")); @@ -1525,7 +1525,7 @@ void KDiff3App::recalcWordWrap(int visibleTextWidthForPrinting) } else { - //don't leave proccessing incomplete if m_diff3LineList isEmpty as when an error occurs during reading. + //don't leave processing incomplete if m_diff3LineList isEmpty as when an error occurs during reading. slotFinishRecalcWordWrap(visibleTextWidthForPrinting); } } @@ -1692,7 +1692,7 @@ bool KDiff3App::doDirectoryCompare(const bool bCreateNewInstance) return true; } /* - If A is targetted to an existing file and the paths point to directories attempt to find that file in the corrisponding + If A is targetted to an existing file and the paths point to directories attempt to find that file in the corresponding directory. If it exists then the filename from A will be appended to the path. */ void KDiff3App::improveFilenames()
