Commit 1123dac1 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix minor typos

parent a782dfc1
......@@ -224,20 +224,20 @@ static int openFilesInRunningInstance(const QVector<UrlInfo>& files, qint64 pid)
QDBusInterface iface(service, QStringLiteral("/org/kdevelop/DocumentController"), QStringLiteral("org.kdevelop.DocumentController"));
QStringList urls;
bool errors_occured = false;
bool errors_occurred = false;
for (const UrlInfo& file : files) {
QDBusReply<bool> result = iface.call(QStringLiteral("openDocumentSimple"), file.url.toString(), file.cursor.line(), file.cursor.column());
if ( ! result.value() ) {
QTextStream err(stderr);
err << i18n("Could not open file '%1'.", file.url.toDisplayString(QUrl::PreferLocalFile)) << "\n";
errors_occured = true;
errors_occurred = true;
}
}
// make the window visible
QDBusMessage makeVisible = QDBusMessage::createMethodCall( service, QStringLiteral("/kdevelop/MainWindow"), QStringLiteral("org.kdevelop.MainWindow"),
QStringLiteral("ensureVisible") );
QDBusConnection::sessionBus().asyncCall( makeVisible );
return errors_occured;
return errors_occurred;
}
/// Performs a DBus call to open the given @p files in the running kdev instance identified by @p pid
......
......@@ -125,10 +125,10 @@ IF (NOT WIN32)
ENDFOREACH(_ARG)
ENDIF(NOT APU_CONFIG)
ELSE (NOT WIN32)
#search libaries for Windows
#search libraries for Windows
#this needs more work
# search for pathes
# search for paths
MACRO(FIND_SUB_INC targetvar include pathadd)
IF (SUBVERSION_INSTALL_PATH)
......
......@@ -76,7 +76,7 @@ public:
virtual void fetchMoreFrames() = 0;
Q_SIGNALS:
/* FIXME: It might make for a more conscise interface if those
/* FIXME: It might make for a more concise interface if those
two were removed, and the clients react to thread_or_frame_changed
event and compare the current thread/frame in the framestack model
with the one they are displaying. */
......
......@@ -76,7 +76,7 @@ public:
virtual QList<KDevelop::IDocument*> openDocuments() const = 0;
/**
* Returns the curently active or focused document.
* Returns the currently active or focused document.
*
* @return The active document.
*/
......
......@@ -853,7 +853,7 @@ DocumentChangeTracker* BackgroundParser::trackerForUrl(const KDevelop::IndexedSt
return nullptr;
}
if (!isValidURL(url)) {
qCWarning(LANGUAGE) << "Tracker requested for invalild URL:" << url.toUrl();
qCWarning(LANGUAGE) << "Tracker requested for invalid URL:" << url.toUrl();
}
Q_ASSERT(isValidURL(url));
......
......@@ -163,7 +163,7 @@ public:
/// Allows statically specifying an amount of features required for an url.
/// These features will automatically be or'ed with the minimumFeatures() returned
/// by any ParseJob with the given url.
/// Since this causes some additional complixity in update-checking, minimum features should not
/// Since this causes some additional complexity in update-checking, minimum features should not
/// be set permanently.
static void setStaticMinimumFeatures(const IndexedString& url, TopDUContext::Features features);
......
......@@ -97,7 +97,7 @@ void FilteredAllClassesFolder::updateFilterString(const QString& a_newFilterStri
if (isPopulated()) {
#if 1 // Choose speed over correctness.
// Close the node and re-open it should be quicker than reload each document
// and remove indevidual nodes (at the cost of loosing the current selection).
// and remove individual nodes (at the cost of loosing the current selection).
performPopulateNode(true);
#else
bool hadChanges = false;
......
......@@ -71,7 +71,7 @@ public:
};
/**
* @short A model that holds a convinient representation of the defined class in the project
* @short A model that holds a convenient representation of the defined class in the project
*
* This model doesn't have much code in it, it mostly acts as a glue between the different
* nodes and the tree view.
......
......@@ -62,7 +62,7 @@ void FilteredProjectFolder::updateFilterString(const QString& a_newFilterString)
if (isPopulated()) {
#if 1 // Choose speed over correctness.
// Close the node and re-open it should be quicker than reload each document
// and remove indevidual nodes (at the cost of loosing the current selection).
// and remove individual nodes (at the cost of loosing the current selection).
performPopulateNode(true);
#else
bool hadChanges = false;
......
......@@ -87,7 +87,7 @@ public:
KDevelop::TopDUContextPointer currentTopContext() const;
void setCurrentTopContext(const KDevelop::TopDUContextPointer& topContext);
///Whether the completion should be fully detailed. If false, it should be simplifed, so no argument-hints,
///Whether the completion should be fully detailed. If false, it should be simplified, so no argument-hints,
///no expanding information, no type-information, etc.
bool fullCompletion() const;
......@@ -98,7 +98,7 @@ public:
void clear();
///Returns the tree-element that belogns to the index, or zero
///Returns the tree-element that belongs to the index, or zero
QExplicitlySharedDataPointer<CompletionTreeElement> itemForIndex(const QModelIndex& index) const;
Q_SIGNALS:
......
......@@ -236,7 +236,7 @@ void BasicRefactoring::startInteractiveRename(const KDevelop::IndexedDeclaration
QFileInfo info(declaration->topContext()->url().str());
if (!info.isWritable()) {
KMessageBox::error(ICore::self()->uiController()->activeMainWindow(),
i18n("Declaration is located in non-writeable file %1.",
i18n("Declaration is located in non-writable file %1.",
declaration->topContext()->url().str()));
return;
}
......
......@@ -42,7 +42,7 @@ IdentifierValidator::~IdentifierValidator()
QValidator::State IdentifierValidator::validate(QString& input, int&) const
{
//I can't figure out why it wouln't compile when I tried to use Identifier identifier();
//I can't figure out why it wouldn't compile when I tried to use Identifier identifier();
Identifier identifier = Identifier(IndexedString(input));
if (identifier.isUnique())
......
......@@ -112,6 +112,7 @@ public:
protected:
/**
* Support another builder by tracking the current context.
* @param node the given node.
* @param context the context to use. Must be set when the given node has no context. When it has one attached, this parameter is not needed.
*/
virtual void supportBuild(T* node, DUContext* context = nullptr)
......
......@@ -194,7 +194,7 @@ public:
/**
* Changes whether this declaration is explicitly typed.
*
* Explicitly typed declaration has the type writen as part of the
* Explicitly typed declaration has the type written as part of the
* declaration. The opposite, implicitly typed declaration, has the type
* deduced by the compiler.
*
......@@ -327,7 +327,7 @@ public:
/**
* Return an indexed form of this declaration's type.
* Should be preferred, this is the fastest way, and the correct way for doing equality-comparsion.
* Should be preferred, this is the fastest way, and the correct way for doing equality-comparison.
*
* \returns the declaration's type.
*/
......@@ -439,7 +439,7 @@ public:
* \note The ranges are in the documents local revision,
* use \c DUChainUtils::transformFromRevision or \c usesCurrentRevision()
*
* \note The uses are unique, no 2 uses are returend that have the same range within the same file.
* \note The uses are unique, no 2 uses are returned that have the same range within the same file.
*
* \note This is a non-trivial operation and hence expensive.
*/
......@@ -458,7 +458,7 @@ public:
* The key of the returned map is an url of a file. The value
* is a list with all use-ranges of this declaration in that file.
*
* \note The uses are unique, no 2 uses are returend that have the same range within the same file.
* \note The uses are unique, no 2 uses are returned that have the same range within the same file.
*
* \warning This must be called only from within the foreground, or with the foreground lock locked.
*
......
......@@ -547,7 +547,7 @@ public:
KDevVarLengthArray<uint> topContextIndices;
{
//First store all the possible intices into the KDevVarLengthArray, so we can unlock the mutex before processing them.
//First store all the possible indices into the KDevVarLengthArray, so we can unlock the mutex before processing them.
QMutexLocker lock(m_environmentListInfo.mutex()); //Lock the mutex to make sure the item isn't changed while it's being iterated
const EnvironmentInformationListItem* item = m_environmentListInfo.itemFromIndex(listIndex);
......@@ -563,7 +563,7 @@ public:
if (p) {
ret << p;
} else {
qCDebug(LANGUAGE) << "Failed to load enviromment-information for" <<
qCDebug(LANGUAGE) << "Failed to load environment-information for" <<
TopDUContextDynamicData::loadUrl(topContextIndex).str();
}
}
......
......@@ -1291,7 +1291,7 @@ void DUContext::applyUpwardsAliases(SearchItem::PtrList& identifiers, const TopD
//We do this by prepending items to the current identifiers that equal the local scope identifier.
SearchItem::Ptr newItem(new SearchItem(d_func()->m_scopeIdentifier.identifier()));
//This will exclude explictly global identifiers
//This will exclude explicitly global identifiers
newItem->addToEachNode(identifiers);
if (!newItem->next.isEmpty()) {
......@@ -1378,7 +1378,7 @@ DUContext* DUContext::findContextAt(const CursorInRevision& position, bool inclu
{
ENSURE_CAN_READ
// qCDebug(LANGUAGE) << "searchign" << position << "in:" << scopeIdentifier(true).toString() << range() << includeRightBorder;
// qCDebug(LANGUAGE) << "searching" << position << "in:" << scopeIdentifier(true).toString() << range() << includeRightBorder;
if (!range().contains(position) && (!includeRightBorder || range().end != position)) {
// qCDebug(LANGUAGE) << "mismatch";
......
......@@ -803,7 +803,7 @@ private:
/**
* Returns the qualified identifier @p id with all aliases (for example namespace imports) applied
*
* @example: If the namespace 'Foo' is imported, and id is 'Bar',
* Example: If the namespace 'Foo' is imported, and id is 'Bar',
* then the returned list is 'Bar' and 'Foo::Bar'
*/
QVector<QualifiedIdentifier> fullyApplyAliases(const QualifiedIdentifier& id,
......
......@@ -25,7 +25,7 @@
#include "ducontextdata.h"
namespace KDevelop {
///This class contains data that is only runtime-dependant and does not need to be stored to disk
///This class contains data that is only runtime-dependent and does not need to be stored to disk
class DUContextDynamicData
{
private:
......
......@@ -39,7 +39,7 @@ namespace KDevelop {
class CodeRepresentation;
class IndexedDeclaration;
///A widget representing one use of a Declaration in a speicific context
///A widget representing one use of a Declaration in a specific context
class KDEVPLATFORMLANGUAGE_EXPORT OneUseWidget
: public QWidget
{
......
......@@ -139,7 +139,7 @@ public:
using FilteredDeclarationIterator =
ConvenientEmbeddedSetTreeFilterIterator<IndexedDeclaration, IndexedDeclarationHandler, IndexedTopDUContext,
CachedIndexedRecursiveImports, DeclarationTopContextExtractor>;
///Retrieves an iterator to all declarations of the given id, filtered by the visilibity given through @a visibility
///Retrieves an iterator to all declarations of the given id, filtered by the visibility given through @a visibility
///This is very efficient since it uses a cache
///The returned iterator is valid as long as the duchain read lock is held
FilteredDeclarationIterator filteredDeclarations(const IndexedQualifiedIdentifier& id,
......
......@@ -46,6 +46,7 @@ int KDEVPLATFORMLANGUAGE_EXPORT findCommaOrEnd(const QString& str, int pos, QCha
/**
* Skips in the string backwards over function-arguments, and stops at the right side of a "("
* @param str string to skip
* @param skippedArguments Will contain all skipped arguments
* @param argumentsStart Should be set to the position where the seeking should start, will be changed to the right side of a "(" when found. Should be at the right side of a '(', and may be max. str.length()
*/
......
......@@ -81,7 +81,7 @@ public:
///Stores this top-context to disk
void store();
///Stores all remainings of this top-context that are on disk. The top-context will be fully dynamic after this.
///Stores all remnants of this top-context that are on disk. The top-context will be fully dynamic after this.
void deleteOnDisk();
///Whether this top-context is on disk(Either has been loaded, or has been stored)
......
......@@ -140,7 +140,7 @@ public:
void setModifiers(quint32 modifiers);
/**
* Visitor method. Called by TypeVisitor to visit the type heirachy.
* Visitor method. Called by TypeVisitor to visit the type hierarchy.
* Do not reimplement this, reimplement accept0 instead.
*
* \param v visitor which is calling this function.
......
......@@ -43,7 +43,7 @@ public:
SignatureWhole /**< When this is given to toString(..), a string link "RETURNTYPE (ARGTYPE1, ARGTYPE1, ..)" is returned */,
SignatureReturn /**< When this is given, only a string that represents the return-type is returned */,
SignatureArguments /**< When this is given, a string that represents the arguments like "(ARGTYPE1, ARGTYPE1, ..)"
* is returend. This does _not_ include a trailing "const" if the function is constant */
* is returned. This does _not_ include a trailing "const" if the function is constant */
};
/// Default constructor
......
......@@ -29,7 +29,7 @@ class IntegralTypeData;
/**
* \short A type representing inbuilt data types.
*
* IntegralType is used to represent types which are native to a programming languge,
* IntegralType is used to represent types which are native to a programming language,
* such as (e.g.) int, float, double, char, bool etc.
*/
class KDEVPLATFORMLANGUAGE_EXPORT IntegralType
......
......@@ -38,7 +38,7 @@ class Declaration;
* and they only contain indices that represent the actual declaration used. Since the same
* Declarations are used over and over again, the actual declarations are stored and indexed centrally
* in the enclosing top-context. Additionally, because a use may refer to a not globally addressable item,
* each top-context contains a local map that maps declaration-indices to local decarations.
* each top-context contains a local map that maps declaration-indices to local declarations.
*
* Since only a small fraction of all files is loaded as document at any time, only few documents actually
* need smart-ranges. For that reason we do not store them here, but instead only map them to the uses
......
......@@ -92,7 +92,7 @@ void KDevelop::PersistentMovingRangePrivate::aboutToDeleteMovingInterfaceContent
m_range = KTextEditor::Range::invalid();
}
// No need to disconnect, as the document is being deleted. Simply set the referenes to zero.
// No need to disconnect, as the document is being deleted. Simply set the references to zero.
delete m_movingRange;
m_movingRange = nullptr;
m_tracker.clear();
......
......@@ -99,7 +99,7 @@ public:
///The referenced declaration
IndexedDeclaration declaration() const;
///If this code-context represents the use of a declaration, then this contains the exact position+range
///of that use. declaration() returnes the used declaration, and context() the context
///of that use. declaration() returns the used declaration, and context() the context
///that surrounds the use.
DocumentRange use() const;
......
......@@ -43,7 +43,7 @@ namespace KDevelop {
* What you need to do to use it:
*
* Reimplement itemText(..) to provide the text filtering
* should be performend on(This must be efficient).
* should be performed on (This must be efficient).
*
* Call setItems(..) when starting a new quickopen session, or when the content
* changes, to initialize the filter with your data.
......
......@@ -212,7 +212,7 @@ public:
QString dumpDotGraph() const;
//Returns an itrator that can be used to iterate over the contained indices
//Returns an iterator that can be used to iterate over the contained indices
Iterator iterator() const;
//Returns this set converted to a standard set that contains all indices contained by this set.
......
......@@ -54,7 +54,7 @@ public:
};
/**
* This filter stategy checks if a given line contains output
* This filter strategy checks if a given line contains output
* that is defined as an error (or an action) from a compiler.
**/
class KDEVPLATFORMOUTPUTVIEW_EXPORT CompilerFilterStrategy : public IFilterStrategy
......@@ -75,7 +75,7 @@ private:
};
/**
* This filter stategy filters out errors (no actions) from Python and PHP scripts.
* This filter strategy filters out errors (no actions) from Python and PHP scripts.
**/
class KDEVPLATFORMOUTPUTVIEW_EXPORT ScriptErrorFilterStrategy : public IFilterStrategy
{
......@@ -105,7 +105,7 @@ public:
};
/**
* This filter stategy filters out errors (no actions) from Static code analysis tools (Cppcheck,)
* This filter strategy filters out errors (no actions) from Static code analysis tools (Cppcheck,)
**/
class KDEVPLATFORMOUTPUTVIEW_EXPORT StaticAnalysisFilterStrategy : public IFilterStrategy
{
......
......@@ -23,7 +23,7 @@
#include <KIO/Job>
#include <QQueue>
// uncomment to time imort jobs
// uncomment to time import jobs
// #define TIME_IMPORT_JOB
#ifdef TIME_IMPORT_JOB
......@@ -65,7 +65,7 @@ private:
/// current base dir
ProjectFolderItem* m_item;
KIO::UDSEntryList entryList;
// kill does not delete the job instantaniously
// kill does not delete the job instantaneously
QAtomicInt m_aborted;
#ifdef TIME_IMPORT_JOB
......
......@@ -67,7 +67,7 @@ public:
~ProjectConfigPage() override
{
// we have to delete T::self otherwise we get the following message on the
// next call to T::intance(QString):
// next call to T::instance(QString):
// "T::instance called after the first use - ignoring"
// which means that we will continue using the old file
delete T::self();
......
......@@ -1369,7 +1369,7 @@ public:
ifDebugInfiniteRecursion(Q_ASSERT(walkBucketLinks(*bucketHashPosition, hash, intersect.second));
)
} else {
//State: intersect.first == 0 && intersect.second != 0. This means that whole compleet
//State: intersect.first == 0 && intersect.second != 0. This means that whole complete
//chain opened by *bucketHashPosition with the hash-value is also following useBucket,
//so useBucket can just be inserted at the top
......
......@@ -34,7 +34,7 @@
using namespace KDevelop;
namespace {
//If KDevelop crashed this many times consicutively, clean up the repository
//If KDevelop crashed this many times consecutively, clean up the repository
const int crashesBeforeCleanup = 1;
void setCrashCounter(QFile& crashesFile, int count)
......@@ -139,7 +139,7 @@ public:
void close();
};
//The global item-reposity registry
//The global item-repository registry
ItemRepositoryRegistry* ItemRepositoryRegistry::m_self = nullptr;
ItemRepositoryRegistry::ItemRepositoryRegistry(const QString& repositoryPath)
......
......@@ -33,7 +33,7 @@ class AbstractRepositoryManager;
class AbstractItemRepository;
/**
* Manages a set of item-repositores and allows loading/storing them all at once from/to disk.
* Manages a set of item-repositories and allows loading/storing them all at once from/to disk.
* Does not automatically store contained repositories on destruction.
* For the global registry, the storing is triggered from within duchain, so you don't need to care about it.
*/
......
......@@ -108,7 +108,7 @@ KAboutData createAboutData()
aboutData.addCredit( i18n("Cédric Pasteur"), i18n("astyle and indent support"), QStringLiteral("cedric.pasteur@free.fr") );
aboutData.addCredit( i18n("Evgeniy Ivanov"), i18n("Distributed VCS, Git, Mercurial"), QStringLiteral("powerfox@kde.ru") );
//Veritas is outside in playground currently.
//aboutData.addCredit( i18n("Manuel Breugelmanns"), i18n( "Veritas, QTest integraton"), "mbr.nxi@gmail.com" );
//aboutData.addCredit( i18n("Manuel Breugelmanns"), i18n( "Veritas, QTest integration"), "mbr.nxi@gmail.com" );
aboutData.addCredit( i18n("Robert Gruber") , i18n( "SnippetPart, debugger and usability patches" ), QStringLiteral("rgruber@users.sourceforge.net") );
aboutData.addCredit( i18n("Dukju Ahn"), i18n( "Subversion plugin, Custom Make Manager, Overall improvements" ), QStringLiteral("dukjuahn@gmail.com") );
aboutData.addAuthor( i18n("Niko Sams"), i18n( "GDB integration, Webdevelopment Plugins" ), QStringLiteral("niko.sams@gmail.com") );
......
......@@ -482,7 +482,7 @@ public:
}
else {
// The active document's buddy is not directly after it
// => no ploblem, insert after active document
// => no problem, insert after active document
area->addView(partView, activeView);
}
}
......
......@@ -309,7 +309,7 @@ bool FilteredProblemStorePrivate::match(const IProblem::Ptr &problem) const
}
else
{
if(!q->severities().testFlag(IProblem::Hint))//workaround for problems wothout correctly set severity
if(!q->severities().testFlag(IProblem::Hint))//workaround for problems without correctly set severity
return false;
}
......
......@@ -99,7 +99,7 @@ public:
virtual void setSeverities(KDevelop::IProblem::Severities severities);///new-style severity access
/// Retrives the severity filter settings
/// Retrieves the severity filter settings
int severity() const;///old-style severity access
KDevelop::IProblem::Severities severities() const;//new-style severity access
......@@ -125,7 +125,7 @@ public:
/// Sets the currently shown document (in the editor, it's triggered by the IDE)
void setCurrentDocument(const IndexedString &doc);
/// Retrives the path of the current document
/// Retrieves the path of the current document
const KDevelop::IndexedString& currentDocument() const;
Q_SIGNALS:
......
......@@ -596,7 +596,7 @@ void KDevelop::RunController::registerJob(KJob * job)
connect( job, &KJob::finished, this, &RunController::finished );
connect( job, &KJob::destroyed, this, &RunController::jobDestroyed );
// FIXME percent is a private signal and thus we cannot use new connext syntax
// FIXME percent is a private signal and thus we cannot use new connect syntax
connect(job, SIGNAL(percent(KJob*,ulong)), this, SLOT(jobPercentChanged()));
IRunController::registerJob(job);
......
......@@ -388,7 +388,7 @@ void TestShellBuddy::testsplitViewBuddies()
// check that it only contains pClassAHeaderSplitView
QVERIFY(pRightContainer->count() == 1 && pRightContainer->hasWidget(pClassAHeaderSplitView->widget()));
// now open the correponding definition file, classA.r.txt
// now open the corresponding definition file, classA.r.txt
IDocument *pClassAImplem = m_documentController->openDocument(QUrl::fromLocalFile(dirA.path() + "classA.r.txt"));
QVERIFY(pClassAImplem);
pMainWindow->activeView()->setObjectName(QStringLiteral("classA.r.txt"));
......
......@@ -71,7 +71,7 @@ public:
virtual QString documentSpecifier() const = 0;
/**
* If the document is in a state where data may be lost while closking,
* If the document is in a state where data may be lost while closing,
* asks the user whether he really wants to close the document.
*
* This function may also take actions like saving the document before closing
......
......@@ -339,7 +339,7 @@ Area::WalkerMode MainWindowPrivate::ViewCreator::operator() (AreaIndex *index)
{
if (!d->m_indexSplitters.value(index->parent())) {
// can happen in working set code, as that adds a view to a child index first
// hence, recursively reconstruct the parent indizes first
// hence, recursively reconstruct the parent indices first
operator()(index->parent());
}
QSplitter *parent = d->m_indexSplitters.value(index->parent());
......@@ -685,7 +685,7 @@ void MainWindowPrivate::aboutToRemoveView(Sublime::AreaIndex *index, Sublime::Vi
parentSplitter->setSizes(sizes);
}
qCDebug(SUBLIME) << "after deleation " << parent << " has "
qCDebug(SUBLIME) << "after deletion " << parent << " has "
<< parentSplitter->count() << " elements";
......
......@@ -137,7 +137,7 @@ void ActiveToolTipManager::doVisibility()
}
//Always include the mouse cursor in the full geometry, to avoid
//closing the tooltip inexpectedly
//closing the tooltip unexpectedly
fullGeometry = fullGeometry.united(QRect(QCursor::pos(), QCursor::pos()));
//Set bounding geometry, and remove old tooltips
......
......@@ -27,7 +27,7 @@
namespace KDevelop {
/**
* Simplifying the exeuction of a Command through (QK)Process.
* Simplifying the execution of a Command through (QK)Process.
*
* This class emits only very basic signals when the process writes something
* to stdout or stderr and for signaling completed and failed status of running
......
......@@ -49,7 +49,7 @@
*
* This is how the EXTERNAL mechanism works (I found this in a comment of some ruby dbus library):
* Take the user id (eg integer 1000) make a string out of it "1000", take
* each character and determin hex value "1" => 0x31, "0" => 0x30. You
* each character and determine hex value "1" => 0x31, "0" => 0x30. You
* obtain for "1000" => 31303030 This is what the server is expecting.
* Why? I dunno. How did I come to that conclusion? by looking at rbus
* code. I have no idea how he found that out.
......
......@@ -55,7 +55,7 @@ bool KDevFormatFile::find()
bool KDevFormatFile::read()
{
static const QChar delimeter = QLatin1Char(':');
static const QChar delimiter = QLatin1Char(':');
QFile formatFile(formatFileName);
if (!formatFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
......@@ -75,7 +75,7 @@ bool KDevFormatFile::read()
if (line.isEmpty() || line.startsWith(QLatin1Char('#')))
continue;
if (line.indexOf(delimeter) < 0) {
if (line.indexOf(delimiter) < 0) {
// We found the simple syntax without wildcards, and only with the command
wildcards.clear();
......@@ -83,8 +83,8 @@ bool KDevFormatFile::read()
} else {
// We found the correct syntax with "wildcards : command"
wildcards = line.section(delimeter, 0, 0).split(QLatin1Char(' '), QString::SkipEmptyParts);
command = line.section(delimeter, 1).trimmed();
wildcards = line.section(delimiter, 0, 0).split(QLatin1Char(' '), QString::SkipEmptyParts);
command = line.section(delimiter, 1).trimmed();
if (wildcards.isEmpty()) {
qStdOut() << formatFileName << ":" << lineNumber
......
......@@ -93,7 +93,7 @@ public:
/**
* @brief The result of this job
*
* This function only returns a correnct result after all the tests are completed.
* This function only returns a correct result after all the tests are completed.
* It is therefore best to call this after the KJob::result() signal is emitted.
*
* @sa ProjectTestResult
......
......@@ -61,7 +61,7 @@ public:
* if branch has this commit (after merge several branches can have one commit) properties[branch] is set to BRANCH.
*/
enum CommitType {
INITIAL, /**< Initial (first) commit, we should'n draw bottom line to connect with parent */
INITIAL, /**< Initial (first) commit, we shouldn't draw bottom line to connect with parent */
HEAD, /**< HEAD commit, we should use its for branch label, and shouldn't draw head line to connect with child */
BRANCH, /**< draw a circle in the branch column */
MERGE, /**< draw a square (current implementation requires drawing connections */
......
......@@ -153,7 +153,7 @@ QVariant DVcsJob::fetchResults()
void DVcsJob::start()
{
Q_ASSERT_X(d->status != JobRunning, "DVCSjob::start", "Another proccess was started using this job class");
Q_ASSERT_X(d->status != JobRunning, "DVCSjob::start", "Another process was started using this job class");
const QDir& workingdir = directory();
if( !workingdir.exists() ) {
......
......@@ -68,7 +68,7 @@ public:
* Switches to the desired branch inside the specified repository
*
* @param repository The repository path where the branch will be switched
* @param branchName The branch name that will be switched to inside the specified repostory
* @param branchName The branch name that will be switched to inside the specified repository
*/
virtual VcsJob* switchBranch(const QUrl &repository, const QString &branchName) = 0;
......
......@@ -71,7 +71,7 @@ public:
* @param rev Show information about the revision @p rev.
* @param repoLocation Any repository path that specifies what VCS server
* is to be queried. For VCS's that support global versioning, the actual
* path is unimportant (and ignored), as long as it contains the repoitory
* path is unimportant (and ignored), as long as it contains the repository
* root. Otherwise look up the change associated with the requested path.
*
* @note VcsRevision objects with type VcsRevision::FileNumber may store the
......
......@@ -46,7 +46,7 @@ static QString stateToString(KDevelop::VcsStatusInfo::State state)
case KDevelop::VcsStatusInfo::ItemDeleted:
return i18nc("file was deleted from versioncontrolsystem", "Deleted");
case KDevelop::VcsStatusInfo::ItemHasConflicts:
return i18nc("file is confilicting (versioncontrolsystem)", "Has Conflicts");
return i18nc("file is conflicting (versioncontrolsystem)", "Has Conflicts");
case KDevelop::VcsStatusInfo::ItemModified:
return i18nc("version controlled file was modified", "Modified");
case KDevelop::VcsStatusInfo::ItemUpToDate:
......
......@@ -72,7 +72,7 @@ void VcsItemEventModel::addItemEvents( const QList<KDevelop::VcsItemEvent>& list
: mimeDataBase.mimeTypeForUrl(repoUrl);
QList<QStandardItem*> rowItems{
new QStandardItem(QIcon::fromTheme(mime.iconName()), ev.repositoryLocation()),
new QStandardItem(actionStrings.join(i18nc("separes an action list", ", "))),
new QStandardItem(actionStrings.join(i18nc("separates an action list", ", "))),
};
QString loc = ev.repositoryCopySourceLocation();
if(!loc.isEmpty()) { //according to the documentation, those are optional. don't force them on the UI
......
......@@ -55,7 +55,7 @@ public:
/**
* Creates and returns a menu with common actions.
* Ownership of the actions in the menu stays with this VcsPluginHelper object.
* @param parent the parent widget set for the QMenu for memory menagement
* @param parent the parent widget set for the QMenu for memory management
*/
QMenu* commonActions(QWidget* parent);
......