summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <[email protected]>2017-10-15 18:32:39 +0200
committerFriedrich W. H. Kossebau <[email protected]>2017-10-15 18:32:39 +0200
commit966a757c4aa13484e425bc0cdbbd0932babe18ba (patch)
treee5bc98db3994a75c9de94bf3091eb010da47d06b
parent689c2ba79f613080b2c2186608f821acef7cd3b5 (diff)
Fix typos in comments
-rw-r--r--difference.cpp2
-rw-r--r--diffmodel.h2
-rw-r--r--komparemodellist.cpp4
-rw-r--r--levenshteintable.h2
-rw-r--r--tests/interactivedifftest.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/difference.cpp b/difference.cpp
index 8d9611a..d643c98 100644
--- a/difference.cpp
+++ b/difference.cpp
@@ -114,7 +114,7 @@ void Difference::determineInlineDifferences()
DifferenceString* dl = destinationLineAt(i);
DifferenceStringPair* pair = new DifferenceStringPair(sl, dl);
- // return value 0 means something went wrong creating the table so dont bother finding markers
+ // return value 0 means something went wrong creating the table so don't bother finding markers
if (table.createTable(pair) != 0)
table.createListsOfMarkers();
}
diff --git a/diffmodel.h b/diffmodel.h
index b38fa01..62aa599 100644
--- a/diffmodel.h
+++ b/diffmodel.h
@@ -109,7 +109,7 @@ public:
/**
* @p oldlines - lines that were removed.
* @p newLines - lines that were inserted.
- * @p startPos - number of line at which the change occured
+ * @p startPos - number of line at which the change occurred
*/
QPair<QList<Difference*>, QList<Difference*> > linesChanged(const QStringList& oldLines, const QStringList& newLines, int editLineNumber);
diff --git a/komparemodellist.cpp b/komparemodellist.cpp
index e89f142..410fc0c 100644
--- a/komparemodellist.cpp
+++ b/komparemodellist.cpp
@@ -327,7 +327,7 @@ bool KompareModelList::saveDestination(DiffModel* model)
{
qCDebug(LIBKOMPAREDIFF2) << "KompareModelList::saveDestination: ";
- // Unecessary safety check, we can guarantee there are unsaved changes!!!
+ // Unnecessary safety check, we can guarantee there are unsaved changes!!!
if (!model->hasUnsavedChanges())
return true;
@@ -399,7 +399,7 @@ bool KompareModelList::saveDestination(DiffModel* model)
// Make sure the destination directory exists, it is possible when using -N to not have the destination dir/file available
if (m_info->mode == Kompare::ComparingDirs)
{
- // Dont use destination which was used for creating the diff directly, use the original URL!!!
+ // Don't use destination which was used for creating the diff directly, use the original URL!!!
// FIXME!!! Wrong destination this way! Need to add the sub directory to the url!!!!
qCDebug(LIBKOMPAREDIFF2) << "Tempfilename (save) : " << temp.fileName();
qCDebug(LIBKOMPAREDIFF2) << "Model->path+file : " << model->destinationPath() << model->destinationFile();
diff --git a/levenshteintable.h b/levenshteintable.h
index 9b87159..24e89be 100644
--- a/levenshteintable.h
+++ b/levenshteintable.h
@@ -217,7 +217,7 @@ template<class SequencePair> void LevenshteinTable<SequencePair>::createListsOfM
unsigned int difference = getContent(x, y);
// If the number of differences is more than half the length of the largest string
- // dont bother to mark the individual changes
+ // don't bother to mark the individual changes
// Patch based on work by Felix Berger as put as attachment to bug 75794
if (!m_sequences->needFineGrainedOutput(difference))
{
diff --git a/tests/interactivedifftest.cpp b/tests/interactivedifftest.cpp
index de9258e..e26854a 100644
--- a/tests/interactivedifftest.cpp
+++ b/tests/interactivedifftest.cpp
@@ -252,7 +252,7 @@ void InteractiveDiffTest::testDifferenceContents_data()
DifferenceHash expectedDifferences;
expectedDifferences.insert(0, qMakePair(sourceLines, destinationLines));
- // The first exisiting difference inside the edit
+ // The first existing difference inside the edit
QTest::newRow("First inside") << patch << oldLines << newLines << 1 << true << 1 << expectedDifferences;
}
{