Commit 592e494d authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix typos

Reviewed-by: thorbjorn
parent 443a0377
......@@ -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).
......
......@@ -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;
......
......@@ -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();
......
......@@ -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);
}
......
......@@ -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();
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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
......
......@@ -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()
......
......@@ -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;
}
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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());
......
......@@ -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);
......
......@@ -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;
}
//
......
......@@ -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 //////////
......
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