Commit 83f12abd authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix minor typos

parent 867aae0b
...@@ -100,7 +100,7 @@ QString safeStringJoin(const QStringList& sl, char sepChar, char metaChar) ...@@ -100,7 +100,7 @@ QString safeStringJoin(const QStringList& sl, char sepChar, char metaChar)
{ {
// Join the strings in the list, using the separator ',' // Join the strings in the list, using the separator ','
// If a string contains the separator character, it will be replaced with "\,". // If a string contains the separator character, it will be replaced with "\,".
// Any occurences of "\" (one backslash) will be replaced with "\\" (2 backslashes) // Any occurrences of "\" (one backslash) will be replaced with "\\" (2 backslashes)
Q_ASSERT(sepChar != metaChar); Q_ASSERT(sepChar != metaChar);
......
...@@ -48,10 +48,10 @@ struct LineData ...@@ -48,10 +48,10 @@ struct LineData
const QChar* pFirstNonWhiteChar; const QChar* pFirstNonWhiteChar;
int size; int size;
LineData(){ pLine=nullptr; pFirstNonWhiteChar=nullptr; size=0; /*occurences=0;*/ LineData(){ pLine=nullptr; pFirstNonWhiteChar=nullptr; size=0; /*occurrences=0;*/
bContainsPureComment=false; } bContainsPureComment=false; }
int width(int tabSize) const; // Calcs width considering tabs. int width(int tabSize) const; // Calcs width considering tabs.
//int occurences; //int occurrences;
bool whiteLine() const { return pFirstNonWhiteChar-pLine == size; } bool whiteLine() const { return pFirstNonWhiteChar-pLine == size; }
bool bContainsPureComment; bool bContainsPureComment;
}; };
......
...@@ -112,7 +112,7 @@ void FileAccess::setFile(const QUrl& url, bool bWantToWrite) ...@@ -112,7 +112,7 @@ void FileAccess::setFile(const QUrl& url, bool bWantToWrite)
if(!m_url.scheme().isEmpty()) if(!m_url.scheme().isEmpty())
m_url.setScheme(QLatin1Literal("file")); m_url.setScheme(QLatin1Literal("file"));
if(m_url.isLocalFile() || !m_url.isValid() ) // Treate invalid urls as local files. if(m_url.isLocalFile() || !m_url.isValid() ) // Treat invalid urls as local files.
{ {
m_fileInfo = QFileInfo(m_url.path()); m_fileInfo = QFileInfo(m_url.path());
m_pParent = nullptr; m_pParent = nullptr;
...@@ -213,7 +213,7 @@ void FileAccess::addPath(const QString& txt) ...@@ -213,7 +213,7 @@ void FileAccess::addPath(const QString& txt)
S_IXGRP 00010 group has execute permission S_IXGRP 00010 group has execute permission
S_IRWXO 00007 mask for permissions for others (not in group) S_IRWXO 00007 mask for permissions for others (not in group)
S_IROTH 00004 others have read permission S_IROTH 00004 others have read permission
S_IWOTH 00002 others have write permisson S_IWOTH 00002 others have write permission
S_IXOTH 00001 others have execute permission S_IXOTH 00001 others have execute permission
*/ */
void FileAccess::setUdsEntry(const KIO::UDSEntry& e) void FileAccess::setUdsEntry(const KIO::UDSEntry& e)
...@@ -281,7 +281,7 @@ void FileAccess::setUdsEntry(const KIO::UDSEntry& e) ...@@ -281,7 +281,7 @@ void FileAccess::setUdsEntry(const KIO::UDSEntry& e)
m_name = m_url.fileName(); m_name = m_url.fileName();
m_bExists = m_fileInfo.exists(); m_bExists = m_fileInfo.exists();
//insure modifcation time is initialized if it wasn't already. //insure modification time is initialized if it wasn't already.
if(m_modificationTime.isNull()) if(m_modificationTime.isNull())
m_modificationTime = m_fileInfo.lastModified(); m_modificationTime = m_fileInfo.lastModified();
......
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
QDateTime lastModified() const; QDateTime lastModified() const;
QString fileName(bool needTmp = false) const; // Just the name-part of the path, without parent directories QString fileName(bool needTmp = false) const; // Just the name-part of the path, without parent directories
QString fileRelPath() const; // The path relitive to base comparison directory QString fileRelPath() const; // The path relative to base comparison directory
QString prettyAbsPath() const; QString prettyAbsPath() const;
QUrl url() const; QUrl url() const;
void setUrl(const QUrl inUrl) { m_url = inUrl; } void setUrl(const QUrl inUrl) { m_url = inUrl; }
......
...@@ -506,7 +506,7 @@ void KDiff3App::initActions(KActionCollection* ac) ...@@ -506,7 +506,7 @@ void KDiff3App::initActions(KActionCollection* ac)
{ {
if(ac == nullptr){ if(ac == nullptr){
KMessageBox::error(nullptr, "actionCollection==0"); KMessageBox::error(nullptr, "actionCollection==0");
exit(-1);//we cann't recover from this. exit(-1);//we cannot recover from this.
} }
fileOpen = KStandardAction::open(this, SLOT(slotFileOpen()), ac); fileOpen = KStandardAction::open(this, SLOT(slotFileOpen()), ac);
fileOpen->setStatusTip(i18n("Opens documents for comparison...")); fileOpen->setStatusTip(i18n("Opens documents for comparison..."));
......
...@@ -52,7 +52,7 @@ void initialiseCmdLineArgs(QCommandLineParser* cmdLineParser) ...@@ -52,7 +52,7 @@ void initialiseCmdLineArgs(QCommandLineParser* cmdLineParser)
} }
} }
} }
//support our own old preferances this is obsolete //support our own old preferences this is obsolete
QStringList sl = ignorableOptionsLine.split(','); QStringList sl = ignorableOptionsLine.split(',');
if(!sl.isEmpty()) if(!sl.isEmpty())
...@@ -146,9 +146,9 @@ int main(int argc, char* argv[]) ...@@ -146,9 +146,9 @@ int main(int argc, char* argv[])
cmdLineParser->addPositionalArgument(QLatin1String("[File3]"), i18n("file3 to open")); cmdLineParser->addPositionalArgument(QLatin1String("[File3]"), i18n("file3 to open"));
/* /*
Don't use QCommandLineParser::process as it auto terminates the program if an option is not reconized. Don't use QCommandLineParser::process as it auto terminates the program if an option is not recognized.
Further more errors are directed to the console alone if not running on windows. This makes for a bad Further more errors are directed to the console alone if not running on windows. This makes for a bad
user experiance when run from a graphical interface such as kde. Don't assume that this only happens user experience when run from a graphical interface such as kde. Don't assume that this only happens
when running from a commandline. when running from a commandline.
*/ */
if(!cmdLineParser->parse(QCoreApplication::arguments())) { if(!cmdLineParser->parse(QCoreApplication::arguments())) {
......
...@@ -1499,7 +1499,7 @@ public: ...@@ -1499,7 +1499,7 @@ public:
void OptionDialog::setupRegionalPage(void) void OptionDialog::setupRegionalPage(void)
{ {
/* /*
TODO: What is this line supposed to do besides leak memmory? Intruduced as is in .91 no explaination TODO: What is this line supposed to do besides leak memory? Introduced as is in .91 no explanation
new Utf8BOMCodec(); new Utf8BOMCodec();
*/ */
......
...@@ -2279,7 +2279,7 @@ void KDiff3App::slotNoRelevantChangesDetected() ...@@ -2279,7 +2279,7 @@ void KDiff3App::slotNoRelevantChangesDetected()
{ {
/* /*
QProcess doesn't check for single quotes and uses non-standard escaping syntax for double quotes. QProcess doesn't check for single quotes and uses non-standard escaping syntax for double quotes.
The distinction between single and double quotes is purly a command shell issue. So The distinction between single and double quotes is purely a command shell issue. So
we split the command string ourselves. we split the command string ourselves.
*/ */
QStringList args; QStringList args;
......
...@@ -258,7 +258,7 @@ void OpenDialog::internalSlot(int i) ...@@ -258,7 +258,7 @@ void OpenDialog::internalSlot(int i)
} }
// Clear the output-filename when any input-filename changed, // Clear the output-filename when any input-filename changed,
// because users forgot to change the output and accidently overwrote it with // because users forgot to change the output and accidentally overwrote it with
// wrong data during a merge. // wrong data during a merge.
void OpenDialog::inputFilenameChanged() void OpenDialog::inputFilenameChanged()
{ {
......
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