diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index 01139a518b41992a0222218816a781e1717e1911..a99409826b3322dbf5dd9a9d819decf2a5c73bf4 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -40,7 +40,7 @@ class FancyLineEditPrivate;
/* A line edit with an embedded pixmap on one side that is connected to
* a menu. Additionally, it can display a grayed hintText (like "Type Here to")
- * when not focussed and empty. When connecting to the changed signals and
+ * when not focused and empty. When connecting to the changed signals and
* querying text, one has to be aware that the text is set to that hint
* text if isShowingHintText() returns true (that is, does not contain
* valid user input).
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 326638fc1bf2cc2bfcdf670caf30e4ef805e53d7..9ace86ec35117de3de5e0d6c13dd115f3e6b2191 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -150,7 +150,7 @@ void BookmarkDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
painter->drawText(6, 2 + opt.rect.top() + fm.ascent(), topLeft);
QString topRight = index.data(BookmarkManager::LineNumber).toString();
- // Check wheter we need to be fancy and paint some background
+ // Check whether we need to be fancy and paint some background
int fwidth = fm.width(topLeft);
if (fwidth + lwidth > opt.rect.width()) {
int left = opt.rect.right() - lwidth;
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 111da656f884c4480c4ba8f66f7523a0b73f9609..5e7697f16207e4a4a95d8182364dbbe8836e30ad 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -279,7 +279,7 @@ bool CMakeProject::parseCMakeLists()
//qDebug()<<" Executable:"<<ct.executable<<"WD:"<<ct.workingDirectory;
ProjectExplorer::RunConfiguration *rc(new CMakeRunConfiguration(this, ct.executable, ct.workingDirectory, ct.title));
addRunConfiguration(rc);
- // The first one gets the honour of beeing the active one
+ // The first one gets the honour of being the active one
if (setActive) {
setActiveRunConfiguration(rc);
setActive = false;
@@ -378,7 +378,7 @@ void CMakeProject::buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::
rootNode->addFileNodes(QList<ProjectExplorer::FileNode *>()<< fn, folder);
}
- // remove old file nodes and check wheter folder nodes can be removed
+ // remove old file nodes and check whether folder nodes can be removed
foreach (ProjectExplorer::FileNode *fn, deleted) {
ProjectExplorer::FolderNode *parent = fn->parentFolderNode();
// qDebug()<<"removed"<<fn->path();
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 229547503c2e36737d3d4ab8a5b0bd0d68079caa..68fcaf0b0ba4963040f2fd0d9f132893cc99b069 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -68,7 +68,7 @@ int CMakeManager::projectLanguage() const
ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName)
{
- // TODO check wheter this project is already opened
+ // TODO check whether this project is already opened
return new CMakeProject(this, fileName);
}
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h
index cfc57d5f1c4bd7ea33aea82c608112b2f527d9cb..dd506d8c9f2229bc8405b30ea8e57c4a9e2d7711 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -65,7 +65,7 @@ public:
const QString &initialPage = QString());
~SettingsDialog();
- // Run the dialog and return true if 'Ok' was choosen or 'Apply' was invoked
+ // Run the dialog and return true if 'Ok' was chosen or 'Apply' was invoked
// at least once
bool execDialog();
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 5f4bdf473b4f0f36a76423b578c1d0d71eef92ef..3ee85e84a05b59863733e38b22ff6ee4fa10c706 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -207,7 +207,7 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
bool hover = (tabIndex == m_hoverIndex);
#ifdef Q_WS_MAC
- hover = false; // Dont hover on Mac
+ hover = false; // Do not hover on Mac
#endif
QColor background = QColor(0, 0, 0, 10);
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h
index f8b7377a5ae64f01b47c4a96b2f35213f20662a1..25d2b71cafdb66577437b9393143102f8548c6a4 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -64,7 +64,7 @@ public:
virtual NavigationView createWidget() = 0;
// Read and store settings for the widget, created by this factory
- // and beeing at position position. (The position is important since
+ // and being at position position. (The position is important since
// a certain type of widget could exist multiple times.)
virtual void saveSettings(int position, QWidget *widget);
virtual void restoreSettings(int position, QWidget *widget);
diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index a4321bd7b219b7c84c8f31b0754b4a1d14ea7d34..7a90b390f09482b5101d994d4933b84032903618 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -62,10 +62,10 @@ public:
// This function is called to give the outputwindow focus
virtual void setFocus() = 0;
- // Wheter the outputpane has focus
+ // Whether the outputpane has focus
virtual bool hasFocus() = 0;
- // Wheter the outputpane can be focused at the moment.
- // (E.g. the search result window doesn't want to be focussed if the are no results.)
+ // Whether the outputpane can be focused at the moment.
+ // (E.g. the search result window does not want to be focused if the are no results.)
virtual bool canFocus() = 0;
virtual bool canNavigate() = 0;
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index 4ab4bdaf56d42431ec212c1245e848c5fc3436c6..1d028b98e7d6abbc824282c8968e8df2d249d569 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -298,7 +298,7 @@ bool MainWindow::init(QString *errorMessage)
pm->addObject(m_shortcutSettings);
// Add widget to the bottom, we create the view here instead of inside the
- // OutputPaneManager, since the StatusBarManager needs to be initilized before
+ // OutputPaneManager, since the StatusBarManager needs to be initialized before
m_outputView = new Core::StatusBarWidget;
m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
m_outputView->setPosition(Core::StatusBarWidget::Second);
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index d608fb99cffcdd9a7722701da84c06e3320eb49b..76e2b2008c7b927d9518e1c2a61aae1d06c0e7af 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -79,7 +79,7 @@ bool panelWidget(const QWidget *widget)
if (!widget)
return false;
- // Dont style dialogs or explicitly ignored widgets
+ // Do not style dialogs or explicitly ignored widgets
if (qobject_cast<const QDialog *>(widget->window()))
return false;
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index 7ff9cee01cdf6bd03e9857fb72dbd1855a80248f..05ffdd65c7ef6bd1446091531049adadce852f2a 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -70,7 +70,7 @@ void MessageManager::showOutputPane()
void MessageManager::displayStatusBarMessage(const QString & /*text*/, int /*ms*/)
{
- // TODO: Currently broken, but noone really notices, so...
+ // TODO: Currently broken, but no one really notices, so...
//m_mainWindow->statusBar()->showMessage(text, ms);
}
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index acfd1905a978d0d2d23a80206d95987753f8f011..29b708b99c74d9650e8c0fdbdc93341db8451964 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -807,7 +807,7 @@ MimeMapEntry::MimeMapEntry(const MimeType &t, int aLevel) :
* - Multiple inheritance (several subClassesOf) can occur
* - Provide quick lookup by name
* - Provide quick lookup by file type.
- * This basically rules out some pointer-based tree, so the structure choosen
+ * This basically rules out some pointer-based tree, so the structure chosen
* is:
* - An alias map <QString->QString> for mapping aliases to types
* - A Map <QString-MimeMapEntry> for the types (MimeMapEntry being a pair of
diff --git a/src/plugins/coreplugin/settingsdatabase.cpp b/src/plugins/coreplugin/settingsdatabase.cpp
index 87d3a70e63d31513dfd063a44dbad3774421490f..02030363456f49826bff4bf778f9fcd20e443ada 100644
--- a/src/plugins/coreplugin/settingsdatabase.cpp
+++ b/src/plugins/coreplugin/settingsdatabase.cpp
@@ -238,18 +238,18 @@ QString SettingsDatabase::group() const
QStringList SettingsDatabase::childKeys() const
{
- QStringList childs;
+ QStringList children;
const QString g = group();
QMapIterator<QString, QVariant> i(d->m_settings);
while (i.hasNext()) {
const QString &key = i.next().key();
if (key.startsWith(g) && key.indexOf(QLatin1Char('/'), g.length() + 1) == -1) {
- childs.append(key.mid(g.length() + 1));
+ children.append(key.mid(g.length() + 1));
}
}
- return childs;
+ return children;
}
void SettingsDatabase::sync()
diff --git a/src/plugins/debugger/cdb/cdbassembler.cpp b/src/plugins/debugger/cdb/cdbassembler.cpp
index 43d698ab62783f6ee76ebcef476bdcb517b228e1..268c664ddb0e20fe527f44ac6ff42f0a5c1f56b8 100644
--- a/src/plugins/debugger/cdb/cdbassembler.cpp
+++ b/src/plugins/debugger/cdb/cdbassembler.cpp
@@ -236,7 +236,7 @@ bool dissassemble(CIDebugClient *client,
beforeLines, beforeLines + afterLines,
offset, flags, 0, 0, 0, 0);
if (FAILED(hr)) {
- *errorMessage= QString::fromLatin1("Unable to dissamble at 0x%1: %2").
+ *errorMessage= QString::fromLatin1("Unable to disassamble at 0x%1: %2").
arg(offset, 0, 16).arg(msgComFailed("OutputDisassemblyLines", hr));
return false;
}
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index 2ebac2710fd0fe024148d01d4eee5a3069d6eba9..852f3f929b3db8a2b8547d21135a5b2384de8d14 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -86,7 +86,7 @@ static const char *dumperPrefixC = "dumper:";
* that complex functions only work from 'well-defined' breakpoints
* (such as main()) and otherwise cause access violation exceptions
* (for example LoadLibrary).
- * Exceptions occuring in the functions to be called must be handled
+ * Exceptions occurring in the functions to be called must be handled
* by __try/__except (they show up in the debugger and must acknowledged
* by gN (go not handled). */
@@ -669,7 +669,7 @@ CdbDumperHelper::DumpResult CdbDumperHelper::dumpTypeI(const WatchData &wd, bool
return DumpNotHandled;
}
if (wd.addr.isEmpty()) {
- *errorMessage = QString::fromLatin1("Adress is missing for '%1' (%2).").arg(wd.exp, wd.type);
+ *errorMessage = QString::fromLatin1("Address is missing for '%1' (%2).").arg(wd.exp, wd.type);
return DumpNotHandled;
}
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
index e0c4ba0c798f4b50d06bd239af388a158cafd202..8eb1998e71dc09be95908bbce77beee2447f77e9 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
@@ -168,7 +168,7 @@ CdbStackFrameContext *CdbStackTraceContext::frameContextAt(int index, QString *e
*errorMessage = msgFrameContextFailed(index, m_frames.at(index), *errorMessage);
return 0;
}
- // Exclude unitialized variables if desired
+ // Exclude uninitialized variables if desired
QStringList uninitializedVariables;
if (theDebuggerAction(UseCodeModel)->isChecked()) {
const StackFrame &frame = m_frames.at(index);
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index 4466cac0daf646901a763c4766c5a9f037ffeeb6..b45c631f469fb2925c0cb85f5680d8c1c511b99e 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -489,7 +489,7 @@ WatchData CdbSymbolGroupContext::watchDataAt(unsigned long index) const
wd.addr = hexSymbolOffset(m_symbolGroup, index).toLatin1();
const QString type = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);
wd.setType(type);
- // Check for unitialized variables at level 0 only.
+ // Check for uninitialized variables at level 0 only.
const DEBUG_SYMBOL_PARAMETERS &p = m_symbolParameters.at(index);
if (p.ParentSymbol == DEBUG_ANY_ID && m_uninitializedVariables.contains(fullShadowedName)) {
wd.setError(WatchData::msgNotInScope());
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index 28fcd111d01f575b167a67b8c041bcef08e29d42..e4e52910fc9184d64e3e56fe95dbf96ed7e3f6ff 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -236,7 +236,7 @@ void DisassemblerViewAgent::setFrame(const StackFrame &frame)
if (!frame.function.isEmpty() && frame.function != _("??")) {
QHash<QString, QString>::ConstIterator it = d->cache.find(frameKey(frame));
if (it != d->cache.end()) {
- QString msg = _("Use cache dissassembler for '%1' in '%2'")
+ QString msg = _("Use cache disassembler for '%1' in '%2'")
.arg(frame.function).arg(frame.file);
d->manager->showDebuggerOutput(msg);
setContents(*it);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 74749e057d2af79ff8dbae0ecec28b8cb26b2278..4becc17c36d401115bed8b29dca38b469772ce44 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -276,7 +276,7 @@ void GdbEngine::initializeVariables()
m_gdbVersion = 100;
m_gdbBuildVersion = -1;
m_isMacGdb = false;
- m_isSynchroneous = false;
+ m_isSynchronous = false;
m_registerNamesListed = false;
m_fullToShortName.clear();
@@ -1113,7 +1113,7 @@ void GdbEngine::handleAqcuiredInferior()
#ifndef Q_OS_MAC
// intentionally after tryLoadDebuggingHelpers(),
- // otherwise we'd interupt solib loading.
+ // otherwise we'd interrupt solib loading.
if (theDebuggerBoolSetting(AllPluginBreakpoints)) {
postCommand("set auto-solib-add on");
postCommand("set stop-on-solib-events 0");
@@ -1467,9 +1467,9 @@ void GdbEngine::handleIsSynchroneous(const GdbResponse &response)
{
Q_UNUSED(response);
if (response.resultClass == GdbResultDone) {
- m_isSynchroneous = true;
+ m_isSynchronous = true;
} else {
- m_isSynchroneous = false;
+ m_isSynchronous = false;
}
}
@@ -2136,7 +2136,7 @@ void GdbEngine::extractDataFromInfoBreak(const QString &output, BreakpointData *
data->bpLineNumber = re.cap(4).toLatin1();
QString full = fullName(re.cap(3));
if (full.isEmpty()) {
- // FIXME: This happens without UsePreciseBreakpoints regularily.
+ // FIXME: This happens without UsePreciseBreakpoints regularly.
// We need to revive that "fill full name mapping bit by bit"
// approach of 1.2.x
//qDebug() << "NO FULL NAME KNOWN FOR" << re.cap(3);
@@ -4168,7 +4168,7 @@ void GdbEngine::tryQueryDebuggingHelpers()
void GdbEngine::recheckDebuggingHelperAvailability()
{
if (m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperNotAvailable) {
- // retreive list of dumpable classes
+ // retrieve list of dumpable classes
postCommand("call (void*)qDumpObjectData440(1,0,0,0,0,0,0,0)");
postCommand("p (char*)&qDumpOutBuffer", CB(handleQueryDebuggingHelper));
}
@@ -4511,9 +4511,9 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
// Pass means let program see this signal;
// otherwise program doesn't know.
// Pass and Stop may be combined.
- // We need "print" as otherwise we would get no feedback whatsoever
- // Custom DebuggingHelper crashs which happen regularily for when accessing
- // uninitialized variables.
+ // We need "print" as otherwise we will get no feedback whatsoever
+ // when Custom DebuggingHelper crash (which happen regularly when accessing
+ // uninitialized variables).
postCommand("handle SIGSEGV nopass stop print");
// This is useful to kill the inferior whenever gdb dies.
@@ -4700,7 +4700,7 @@ QMessageBox * GdbEngine::showMessageBox(int icon, const QString &title,
bool GdbEngine::isSynchroneous() const
{
- return m_isSynchroneous;
+ return m_isSynchronous;
}
//
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 3aff52504690e7f4fbd401c4590da8e2429c8f40..e7fb08ab2015d2b40c2a1a73ec86a49fcf87e020 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -274,7 +274,7 @@ private: ////////// Gdb Output, State & Capability Handling //////////
int m_gdbVersion; // 6.8.0 is 60800
int m_gdbBuildVersion; // MAC only?
bool m_isMacGdb;
- bool m_isSynchroneous; // Can act synchroneously?
+ bool m_isSynchronous; // Can act synchronously?
private: ////////// Inferior Management //////////
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index 2b972ac3266d7c715e31a781e70c2ba0de1499f3..fa4b728e76db9514cc63ebdfe098615cdd80fe58 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -792,7 +792,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
+ ",TextSeg=" + hexNumber(lib.codeseg)
+ ",DataSeg=" + hexNumber(lib.dataseg);
}
- sendGdbServerMessage(response, "library information transfered");
+ sendGdbServerMessage(response, "library information transferred");
} else {
sendGdbServerMessage("l", "library information transfer finished");
}
@@ -844,7 +844,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
// FIXME: Limit packet length by using qsThreadInfo packages?
qDebug() << "CURRENT THREAD: " << m_session.tid;
response += hexNumber(m_session.tid);
- sendGdbServerMessage(response, "thread information transfered");
+ sendGdbServerMessage(response, "thread information transferred");
} else {
sendGdbServerMessage("l", "thread information transfer finished");
}
@@ -866,7 +866,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
response += "</library>";
}
response += "</library-list>";
- sendGdbServerMessage(response, "library information transfered");
+ sendGdbServerMessage(response, "library information transferred");
}
else if (cmd == "QStartNoAckMode") {
@@ -967,7 +967,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
.toInt(&ok1, 16);
const int length = data.mid(commaPos + 1).toInt(&ok2, 16);
if (ok1 && ok2) {
- const QString msg = _("Read of OS auxilary "
+ const QString msg = _("Read of OS auxiliary "
"vector (%1, %2) not implemented.").arg(offset).arg(length);
logMessage(msgGdbPacket(msg));
sendGdbServerMessage("E20", msg.toLatin1());
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 8028695349c08aa02c300302701b6e85cae1ce4f..a33bfa3e1620c6ac87b3e4a8c6e419660dd97a56 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -646,7 +646,7 @@ static QString formattedValue(const WatchData &data, int format)
reinterpret_cast<void *>(data.value.toULongLong(&ok, 0));
if (!ok || !addr)
return data.value;
- // FIXME: add a round trip throught the debugger to prevent crashs?
+ // FIXME: add a round trip through the debugger to prevent crashs?
if (format == Latin1StringFormat)
return QString::fromLatin1(static_cast<const char *>(addr));
if (format == Local8BitStringFormat)
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 6a56ca1a3328a6556a6cc5ba091bee8c7b38a70e..f401cf9b6e2583f1adbd195d55c393ec63f3bde5 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -128,7 +128,7 @@ public:
QString type; // type for further processing
QString displayedType;// displayed type (optional)
QByteArray variable; // name of internal Gdb variable if created
- QByteArray addr; // displayed adress
+ QByteArray addr; // displayed address
QByteArray saddr; // stored address (pointer in container)
QString framekey; // key for type cache
QScriptValue scriptValue; // if needed...
@@ -150,7 +150,7 @@ enum WatchRoles
{
INameRole = Qt::UserRole,
ExpressionRole,
- ExpandedRole, // used to communicate prefered expanded state to the view
+ ExpandedRole, // used to communicate preferred expanded state to the view
ActiveDataRole, // used for tooltip
TypeFormatListRole,
TypeFormatRole, // used to communicate alternative formats to the view
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index b00497cd19d7ba7f3cd31881be24601c532f791f..ad54240de6858e0b240fea478271cfeb86bb9afb 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -90,7 +90,7 @@ static const char *settingsGroup = "Designer";
/* Actions of the designer plugin:
* Designer provides a toolbar which is subject to a context change (to
- * "edit mode" context) when it is focussed.
+ * "edit mode" context) when it is focused.
* In order to prevent its actions from being disabled/hidden by that context
* change, the actions are registered on the global context. In currentEditorChanged(),
* the ones that are present in the global edit menu are set visible/invisible manually.
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index 3f59839641a6ee6406f038940daa2743eaca8cd3..990748349ca13efbf903ab6e2799ff2e073e81a8 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -421,7 +421,7 @@ static void addDeclaration(const QString &docFileName, const Class *cl, const QS
if (ITextEditable *editable = editableAt(docFileName, line, column)) {
unsigned dl, dc; // this position is the beginning of return value: "^void foo(...)"
decl->getStartPosition(&dl, &dc);
- dc--; // if the first character in line is 'v' comming from "void" getStartPosition returns 1, not 0, so we always decrement it.
+ dc--; // if the first character in line is 'v' coming from "void" getStartPosition returns 1, not 0, so we always decrement it.
editable->gotoLine(dl, dc);
editable->position(ITextEditor::StartOfLine);
const QString indentation = QString(dc, QLatin1Char(' '));
diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h
index 1f197a9117fe62ead82482e6c27c776d719dbe26..300ed30aed8e106bd23e44a8ae208b8da4680065 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.h
+++ b/src/plugins/projectexplorer/abstractprocessstep.h
@@ -59,7 +59,7 @@ class IOutputParser;
The two functions processStarted() and processFinished() are called after starting/finishing the process.
By default they add a message to the output window.
- Use setEnabled() to control wheter the BuildStep needs to run. (A disabled BuildStep immediately returns true,
+ Use setEnabled() to control whether the BuildStep needs to run. (A disabled BuildStep immediately returns true,
from the run function.)
*/
@@ -103,7 +103,7 @@ public:
void setEnabled(bool b);
/// If ignoreReturnValue is set to true, then the abstractprocess step will
- /// return sucess even if the return value indicates otherwise
+ /// return success even if the return value indicates otherwise
/// should be called from init
void setIgnoreReturnValue(bool b);
/// Set the Environment for running the command
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 8116927462b8e557ee637be6d5348b36932427fb..213934c37e2826a5f03ecc838e5db6432452c177 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -99,20 +99,22 @@ public:
IBuildConfigurationFactory(QObject *parent = 0);
virtual ~IBuildConfigurationFactory();
- // used to show the list of possible additons to a project, returns a list of types
+ // Used to show the list of possible additons to a project.
+ // Returns a list of ids.
virtual QStringList availableCreationIds() const = 0;
// used to translate the types to names to display to the user
virtual QString displayNameForId(const QString &id) const = 0;
- // creates build configuration(s) for given type and adds them to project
- // if successfull returns the BuildConfiguration that should be shown in the
- // project mode for editing
+ // Creates build configuration(s) for the given id and adds them to
+ // the project.
+ // If successful it returns the BuildConfiguration that should be shown in
+ // project mode.
virtual BuildConfiguration *create(const QString &id) const = 0;
- // clones a given BuildConfiguration, should not add it to the project
+ // Clones a given BuildConfiguration, should not add it to the project
virtual BuildConfiguration *clone(BuildConfiguration *source) const = 0;
- // restores a BuildConfiguration with the name and adds it to the project
+ // Restores a BuildConfiguration with the data given and adds it to the project.
virtual BuildConfiguration *restore(const QVariantMap &values) const = 0;
signals:
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 7f8ce3a1c7b8def7af51a094d8a5fa90f9200152..7ce799ae4bb527b7692a53db7e632f06a0e9db85 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -93,7 +93,7 @@ public:
virtual QString displayName() = 0;
// the Widget shown in the project settings dialog for this buildStep
- // ownership is transfered to the caller
+ // ownership is transferred to the caller
virtual BuildStepConfigWidget *createConfigWidget() = 0;
// if this function returns true, the user can't delete this BuildStep for this project
@@ -129,7 +129,7 @@ class PROJECTEXPLORER_EXPORT IBuildStepFactory
public:
IBuildStepFactory();
virtual ~IBuildStepFactory();
- /// Called to check wheter this factory can restore the named BuildStep
+ /// Called to check whether this factory can restore the named BuildStep
virtual bool canCreate(const QString &id) const = 0;
/// Called to restore a buildstep
virtual BuildStep *create(BuildConfiguration *bc, const QString &id) const = 0;
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index 87822143d94fc94b5e7eeec44fd429f8861327ad..2cf802c41a12abd1c21cb2c0bda91d4611d01e96 100644
--- a/src/plugins/projectexplorer/debugginghelper.cpp
+++ b/src/plugins/projectexplorer/debugginghelper.cpp
@@ -259,7 +259,7 @@ QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath)
QStringList DebuggingHelperLibrary::possibleQMakeCommands()
{
- // On windows noone has renamed qmake, right?
+ // On windows no one has renamed qmake, right?
#ifdef Q_OS_WIN
return QStringList(QLatin1String("qmake.exe"));
#else
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 5fb6e59e3e8c276e86333abc15e01e85711e4d7c..13c2c5154f57b1db7e890783a7b60974007abf58 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -113,7 +113,7 @@ QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
}
}
if (role == Qt::FontRole) {
- // check wheter this environment variable exists in m_items
+ // check whether this environment variable exists in m_items
if (changes(m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row()))) {
QFont f;
f.setBold(true);
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index bb70b2d113036a9d0d05c8bf04e1b2389dfe2af9..49cc387b7e560db6502a82256337fd9c88c9554a 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -141,7 +141,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
{
const QList<BuildConfiguration *> bcs = buildConfigurations();
- // For compability with older versions the "name" is saved as a string instead of a number
+ // For compatibility with older versions the "name" is saved as a string instead of a number
writer.saveValue("activebuildconfiguration", QString::number(bcs.indexOf(m_activeBuildConfiguration)));
//save buildsettings
@@ -288,7 +288,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
//Build Settings
QVariant buildStepsVariant = reader.restoreValue("buildsteps");
if (buildStepsVariant.isValid()) {
- // Old code path for 1.3 compability
+ // Old code path for 1.3 compatibility
// restoring BuildSteps from settings
int pos = 0;
QStringList buildStepNames = buildStepsVariant.toStringList();
@@ -320,7 +320,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
QVariant cleanStepsVariant = reader.restoreValue("cleansteps");
if (cleanStepsVariant.isValid()) {
- // Old code path for 1.3 compability
+ // Old code path for 1.3 compatibility
QStringList cleanStepNames = cleanStepsVariant.toStringList();
// restoring BuildSteps from settings
int pos = 0;
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 4d4edf548452a05c427b6b7a68f9b3f63259234a..8e815b0b11d7e73c97d174149e978925eada2e34 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -997,7 +997,7 @@ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
QStringList SessionManager::sessions() const
{
if (m_sessions.isEmpty()) {
- // We aren't yet initalized, so do that now
+ // We are not initialized yet, so do that now
QDirIterator dirIter(QFileInfo(m_core->settings()->fileName()).path() + "/qtcreator/");
while (dirIter.hasNext()) {
dirIter.next();
diff --git a/src/plugins/qmldesigner/components/formeditor/anchormanipulator.h b/src/plugins/qmldesigner/components/formeditor/anchormanipulator.h
index b44238a4e107927ac54c43d30e2ba6ba3723ccfd..fedcde933f9bd28297b20de39b2f627253b78500 100644
--- a/src/plugins/qmldesigner/components/formeditor/anchormanipulator.h
+++ b/src/plugins/qmldesigner/components/formeditor/anchormanipulator.h
@@ -57,7 +57,7 @@ public:
FormEditorItem *beginFormEditorItem() const;
-private: // fucntions
+private: // functions
void setMargin(FormEditorItem *endItem, AnchorLine::Type endAnchorLine);
private: // variables
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index a994c3c328d718b86dcf39273964546cb0b82402..48a69dee24e9bf86b79b7da5ccd586fab40c3ec3 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -107,7 +107,7 @@ void FormEditorView::modelAttached(Model *model)
}
-//This method does the setup of the inital FormEditorItem tree in the scene
+//This method does the setup of the initial FormEditorItem tree in the scene
void FormEditorView::setupFormEditorItemTree(const QmlItemNode &qmlItemNode)
{
m_scene->addFormEditorItem(qmlItemNode);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
index d07ec846cb71153e0e337463454e7997e7ae3dcf..25374346fa93d20ce763da4ba8d22dd26df1d2aa 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
@@ -143,7 +143,7 @@ private: //variables
bool m_isInSubState;
bool m_isInModel;
bool m_isBound;
- bool m_isValid; //if the property value belongs to an non existant complexProperty it is invalid
+ bool m_isValid; // if the property value belongs to a non-existing complexProperty it is invalid
PropertyEditorNodeWrapper *m_complexNode;
};
diff --git a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
index ce95b03bad6d600ec63843a27bae4fe70728cf34..71c4b87be03db0af961125f1b47ddaac484755fc 100644
--- a/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
+++ b/src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
@@ -214,7 +214,7 @@ bool MoveObjectVisitor::visit(UiArrayBinding *ast)
moveInfo.leadingCharsToRemove = objectLocation - start;
moveInfo.trailingCharsToRemove = end - moveInfo.objectEnd;
} else {
- // we're the last member, but not the only member, so remove the preceeding comma too
+ // we are the last member, but not the only member, so remove the preceding comma, too
Q_ASSERT(currentMember->commaToken.isValid());
int start = currentMember->commaToken.offset;
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
index 8e75d82160df8422c6fc162d3be9dd7027979ad7..a9102ca10ee733d9019ddbeb780826a2d5c98bcb 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
@@ -78,7 +78,7 @@ namespace QmlDesigner {
/*! \brief Constructor
- The class will be rendered offscreen if not setted otherwise.
+ The class will be rendered offscreen if not set otherwise.
\param Parent of this object. If this parent is deleted this instance is
deleted too.
@@ -153,9 +153,9 @@ void NodeInstanceView::nodeRemoved(const ModelNode &/*removedNode*/, const NodeA
/*! \brief Notifing the view that a AbstractProperty was added to a ModelNode.
- The property will be setted for the NodeInstance.
+ The property will be set for the NodeInstance.
-\param state ModelNode to wich the Property belongs
+\param state ModelNode to which the Property belongs
\param property AbstractProperty which was added
\see AbstractProperty NodeInstance ModelNode
*/
@@ -224,9 +224,9 @@ void NodeInstanceView::bindingPropertiesChanged(const QList<BindingProperty>& pr
/*! \brief Notifing the view that a AbstractProperty value was changed to a ModelNode.
- The property will be setted for the NodeInstance.
+ The property will be set for the NodeInstance.
-\param state ModelNode to wich the Property belongs
+\param state ModelNode to which the Property belongs
\param property AbstractProperty which was changed
\param newValue New Value of the property
\param oldValue Old Value of the property
diff --git a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
index 35cb2322303adceed3b17da0486f52c9dbc6d17b..9747284c78f8bf3b95e14ec5612c3f91d29471a5 100644
--- a/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
@@ -105,7 +105,7 @@ QmlMetaProperty QmlPropertyChangesObject::metaProperty(const QString &property)
{
QmlMetaProperty prop = QmlMetaProperty::createProperty(m_targetObject.data(), property);
if (!prop.isValid()) {
- qWarning() << "Cannot assign to non-existant property" << property;
+ qWarning() << "Cannot assign to non-existent property" << property;
return QmlMetaProperty();
} else if (!prop.isWritable()) {
qWarning() << "Cannot assign to read-only property" << property;
diff --git a/src/plugins/qmldesigner/core/model/abstractproperty.cpp b/src/plugins/qmldesigner/core/model/abstractproperty.cpp
index 2d7eec926a545effbef9e87530926f86ffba81e9..8cac43a3e74b5446401830a71896d603469a5b17 100644
--- a/src/plugins/qmldesigner/core/model/abstractproperty.cpp
+++ b/src/plugins/qmldesigner/core/model/abstractproperty.cpp
@@ -234,7 +234,7 @@ PropertyMetaInfo AbstractProperty::metaInfo() const
}
/*!
- \brief returns wether the property is the default property for the model node.
+ \brief returns whether the property is the default property for the model node.
*/
bool AbstractProperty::isDefaultProperty() const
{
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 254465c64a3f90ac6e463564a6e2306e379e5150..50046b88e5f0d16b8a1643b6df14117ab5b0164f 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -124,7 +124,7 @@ bool MakeStep::init()
// If we are cleaning, then make can fail with a error code, but that doesn't mean
// we should stop the clean queue
- // That is mostly so that rebuild works on a alrady clean project
+ // That is mostly so that rebuild works on a already clean project
setIgnoreReturnValue(m_clean);
QStringList args = m_userArgs;
if (!m_clean) {
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 2a2a9d49bd3c17541e509e618f3a42a1ec170eda..4262fca1646fb28d298af9552c658f3e7b003956 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -184,8 +184,8 @@ QString Qt4BuildConfiguration::buildDirectory() const
/// returns whether this is a shadow build configuration or not
/// note, even if shadowBuild() returns true, it might be using the
-/// source directory as the shadow build directorys, thus not
-/// still be a insource build
+/// source directory as the shadow build directory, thus it
+/// still is a in-source build
bool Qt4BuildConfiguration::shadowBuild() const
{
return m_shadowBuild;
@@ -391,7 +391,7 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
// and compare that on its own
QString actualSpec = extractSpecFromArgumentList(qs->userArguments(), workingDirectory, version);
if (actualSpec.isEmpty()) {
- // Easy one the user has choosen not to override the settings
+ // Easy one: the user has chosen not to override the settings
actualSpec = version->mkspec();
}
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 57246663a225fd6e4c9ce5bb92f84af76defb893..146195f783f6b09ca4747d68e98b7d4a6dc5365e 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -72,7 +72,7 @@ public:
//returns the qtVersion, if the project is set to use the default qt version, then
// that is returned
- // to check wheter the project uses the default qt version use qtVersionId
+ // to check whether the project uses the default qt version use qtVersionId
QtVersion *qtVersion() const;
// returns the id of the qt version, if the project is using the default qt version
@@ -93,8 +93,8 @@ public:
void getConfigCommandLineArguments(QStringList *addedUserConfigs, QStringList *removedUserConfigs) const;
// Those functions are used in a few places.
- // The drawback is that we shouldn't actually depend on them beeing always there
- // That is generally the stuff that is asked should normally be transfered to
+ // The drawback is that we shouldn't actually depend on them being always there
+ // That is generally the stuff that is asked should normally be transferred to
// Qt4Project *
// So that we can later enable people to build qt4projects the way they would like
QMakeStep *qmakeStep() const;
@@ -113,7 +113,7 @@ signals:
/// emitted if the qt version changes (either directly, or because the default qt version changed
/// or because the user changed the settings for the qt version
void qtVersionChanged();
- /// emitted iff the setToolChainType() funciton is called, not emitted for qtversion changes
+ /// emitted iff the setToolChainType() function is called, not emitted for qtversion changes
/// even if those result in a toolchain change
void toolChainTypeChanged();
/// emitted for setQMakeBuildConfig, not emitted for qt version changes, even
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 6f1a9c3adc225c8da7c0ccbafd56f6fd8e042813..cbfc7081fccac1b21676e470b2c48f834cdb1b6d 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -997,7 +997,7 @@ void Qt4Project::projectTypeChanged(Qt4ProFileNode *node, const Qt4ProjectType o
{
if (oldType == Internal::ApplicationTemplate
|| oldType == Internal::ScriptTemplate) {
- // check wheter we need to delete a Run Configuration
+ // check whether we need to delete a Run Configuration
checkForDeletedApplicationProjects();
}
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.h b/src/plugins/qt4projectmanager/qt4runconfiguration.h
index 8df1a4b58c59fc43a1aceec7389ec5206daa0b78..55b57daa8f3d7e54146a2a0b135ab51717d94863 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.h
@@ -105,7 +105,7 @@ signals:
void baseEnvironmentChanged();
void userEnvironmentChangesChanged(const QList<ProjectExplorer::EnvironmentItem> &diff);
- // note those signals might not emited for every change
+ // Note: These signals might not get emitted for every change!
void effectiveTargetInformationChanged();
private slots:
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 08e490acf00c8917fcb31b5efc651d95d64fbd31..7b0554cd19f232d163920cff3122467cd07ad239 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -651,7 +651,7 @@ void QtOptionsPageWidget::fixQtVersionName(int index)
// Same name, find new name
QRegExp regexp("^(.*)\\((\\d)\\)$");
if (regexp.exactMatch(name)) {
- // Alreay in Name (#) format
+ // Already in Name (#) format
name = regexp.cap(1) + "(" + QString().setNum(regexp.cap(2).toInt() + 1) + ")";
} else {
name = name + " (2)";
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 10530a54e8960394022f859711e522015bf9486c..7e2c927896efbabca23e0728dacb124aeaf459a4 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -696,7 +696,7 @@ void QtVersion::updateSourcePath()
// Returns the version that was used to build the project in that directory
// That is returns the directory
-// To find out wheter we already have a qtversion for that directory call
+// To find out whether we already have a qtversion for that directory call
// QtVersion *QtVersionManager::qtVersionForDirectory(const QString directory);
QString QtVersionManager::findQMakeBinaryFromMakefile(const QString &directory)
{
@@ -755,7 +755,7 @@ QPair<QtVersion::QmakeBuildConfigs, QStringList> QtVersionManager::scanMakeFile(
line = trimLine(line);
QStringList parts = splitLine(line);
if (debug)
- qDebug()<<"Splitted into"<<parts;
+ qDebug()<<"Split into"<<parts;
QList<QMakeAssignment> assignments;
QList<QMakeAssignment> afterAssignments;
QStringList additionalArguments;
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 572a54f9187524cbe46a87bb13ad2ccfe96a9d03..b8b48cc1cc7fe7c1d90e107111a1a4483b4d160e 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -578,7 +578,7 @@ protected:
/*!
Reimplement this function if you want to customize the way a link is
- opened. Returns whether the link was opened succesfully.
+ opened. Returns whether the link was opened successfully.
*/
virtual bool openLink(const Link &link);
diff --git a/src/plugins/texteditor/itexteditable.h b/src/plugins/texteditor/itexteditable.h
index 62a113eab5c09ccca4b02ef15c7595b828c8ef6b..3d4f532516c2bcaf3c3dee742461e4f95fb58e59 100644
--- a/src/plugins/texteditor/itexteditable.h
+++ b/src/plugins/texteditor/itexteditable.h
@@ -42,7 +42,7 @@ public:
ITextEditable() {}
virtual ~ITextEditable() {}
- /* Removes 'length' characteres to the right of the cursor. */
+ /* Removes 'length' characters to the right of the cursor. */
virtual void remove(int length) = 0;
/* Inserts the given string to the right of the cursor. */
diff --git a/src/shared/indenter/indenter_impl.h b/src/shared/indenter/indenter_impl.h
index 7255cfa8c92b212e72b5377e4a0395e8d8177585..5c472a4fd1d1afd427f722838ccc387d6a17c2eb 100644
--- a/src/shared/indenter/indenter_impl.h
+++ b/src/shared/indenter/indenter_impl.h
@@ -930,7 +930,7 @@ int Indenter<Iterator>::indentForContinuationLine()
}
d;
- Still, we're striving to go back as little as possible to accomodate
+ Still, we are striving to go back as little as possible to accommodate
people with irregular indentation schemes. A hook line near at hand
is much more reliable than a remote one.
*/
diff --git a/src/shared/qrceditor/undocommands_p.h b/src/shared/qrceditor/undocommands_p.h
index c9c823fdfc51f6ecb4e306a5752d1a44ae4bcb0d..6bf973cc83348a2994990bd894ab8fe5862566b5 100644
--- a/src/shared/qrceditor/undocommands_p.h
+++ b/src/shared/qrceditor/undocommands_p.h
@@ -59,7 +59,7 @@ protected:
\class ModelIndexViewCommand
Provides a mean to store/restore a \l QModelIndex as it cannot
- be stored savely in most cases. This is an abstract class.
+ be stored safely in most cases. This is an abstract class.
*/
class ModelIndexViewCommand : public ViewCommand
{
diff --git a/src/shared/qtlockedfile/qtlockedfile.cpp b/src/shared/qtlockedfile/qtlockedfile.cpp
index 7da3643d6a34f992a31128f1e01ceb1d71ab97f9..55067d630f965bd39f0553555d2cfd75998425de 100644
--- a/src/shared/qtlockedfile/qtlockedfile.cpp
+++ b/src/shared/qtlockedfile/qtlockedfile.cpp
@@ -123,9 +123,9 @@ QtLockedFile::LockMode QtLockedFile::lockMode() const
Obtains a lock of type \a mode.
If \a block is true, this
- function will block until the lock is aquired. If \a block is
+ function will block until the lock is acquired. If \a block is
false, this function returns \e false immediately if the lock cannot
- be aquired.
+ be acquired.
If this object already has a lock of type \a mode, this function returns \e true immediately. If this object has a lock of a different type than \a mode, the lock
is first released and then a new lock is obtained.