Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tobias Hunger
qt-creator
Commits
592e494d
Commit
592e494d
authored
Jan 11, 2010
by
Tobias Hunger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos
Reviewed-by: thorbjorn
parent
443a0377
Changes
51
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
92 additions
and
90 deletions
+92
-90
src/libs/utils/fancylineedit.h
src/libs/utils/fancylineedit.h
+1
-1
src/plugins/bookmarks/bookmarkmanager.cpp
src/plugins/bookmarks/bookmarkmanager.cpp
+1
-1
src/plugins/cmakeprojectmanager/cmakeproject.cpp
src/plugins/cmakeprojectmanager/cmakeproject.cpp
+2
-2
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+1
-1
src/plugins/coreplugin/dialogs/settingsdialog.h
src/plugins/coreplugin/dialogs/settingsdialog.h
+1
-1
src/plugins/coreplugin/fancytabwidget.cpp
src/plugins/coreplugin/fancytabwidget.cpp
+1
-1
src/plugins/coreplugin/inavigationwidgetfactory.h
src/plugins/coreplugin/inavigationwidgetfactory.h
+1
-1
src/plugins/coreplugin/ioutputpane.h
src/plugins/coreplugin/ioutputpane.h
+3
-3
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/mainwindow.cpp
+1
-1
src/plugins/coreplugin/manhattanstyle.cpp
src/plugins/coreplugin/manhattanstyle.cpp
+1
-1
src/plugins/coreplugin/messagemanager.cpp
src/plugins/coreplugin/messagemanager.cpp
+1
-1
src/plugins/coreplugin/mimedatabase.cpp
src/plugins/coreplugin/mimedatabase.cpp
+1
-1
src/plugins/coreplugin/settingsdatabase.cpp
src/plugins/coreplugin/settingsdatabase.cpp
+3
-3
src/plugins/debugger/cdb/cdbassembler.cpp
src/plugins/debugger/cdb/cdbassembler.cpp
+1
-1
src/plugins/debugger/cdb/cdbdumperhelper.cpp
src/plugins/debugger/cdb/cdbdumperhelper.cpp
+2
-2
src/plugins/debugger/cdb/cdbstacktracecontext.cpp
src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+1
-1
src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+1
-1
src/plugins/debugger/debuggeragents.cpp
src/plugins/debugger/debuggeragents.cpp
+1
-1
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/gdbengine.cpp
+10
-10
src/plugins/debugger/gdb/gdbengine.h
src/plugins/debugger/gdb/gdbengine.h
+1
-1
src/plugins/debugger/gdb/trkgdbadapter.cpp
src/plugins/debugger/gdb/trkgdbadapter.cpp
+4
-4
src/plugins/debugger/watchhandler.cpp
src/plugins/debugger/watchhandler.cpp
+1
-1
src/plugins/debugger/watchhandler.h
src/plugins/debugger/watchhandler.h
+2
-2
src/plugins/designer/formeditorw.cpp
src/plugins/designer/formeditorw.cpp
+1
-1
src/plugins/designer/qtcreatorintegration.cpp
src/plugins/designer/qtcreatorintegration.cpp
+1
-1
src/plugins/projectexplorer/abstractprocessstep.h
src/plugins/projectexplorer/abstractprocessstep.h
+2
-2
src/plugins/projectexplorer/buildconfiguration.h
src/plugins/projectexplorer/buildconfiguration.h
+8
-6
src/plugins/projectexplorer/buildstep.h
src/plugins/projectexplorer/buildstep.h
+2
-2
src/plugins/projectexplorer/debugginghelper.cpp
src/plugins/projectexplorer/debugginghelper.cpp
+1
-1
src/plugins/projectexplorer/environmenteditmodel.cpp
src/plugins/projectexplorer/environmenteditmodel.cpp
+1
-1
src/plugins/projectexplorer/project.cpp
src/plugins/projectexplorer/project.cpp
+3
-3
src/plugins/projectexplorer/session.cpp
src/plugins/projectexplorer/session.cpp
+1
-1
src/plugins/qmldesigner/components/formeditor/anchormanipulator.h
...ins/qmldesigner/components/formeditor/anchormanipulator.h
+1
-1
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
...gins/qmldesigner/components/formeditor/formeditorview.cpp
+1
-1
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
...ldesigner/components/propertyeditor/propertyeditorvalue.h
+1
-1
src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
...lugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
+1
-1
src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
+5
-5
src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
...esigner/core/instances/qmlpropertychangesnodeinstance.cpp
+1
-1
src/plugins/qmldesigner/core/model/abstractproperty.cpp
src/plugins/qmldesigner/core/model/abstractproperty.cpp
+1
-1
src/plugins/qt4projectmanager/makestep.cpp
src/plugins/qt4projectmanager/makestep.cpp
+1
-1
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+3
-3
src/plugins/qt4projectmanager/qt4buildconfiguration.h
src/plugins/qt4projectmanager/qt4buildconfiguration.h
+4
-4
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/qt4project.cpp
+1
-1
src/plugins/qt4projectmanager/qt4runconfiguration.h
src/plugins/qt4projectmanager/qt4runconfiguration.h
+1
-1
src/plugins/qt4projectmanager/qtoptionspage.cpp
src/plugins/qt4projectmanager/qtoptionspage.cpp
+1
-1
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
+2
-2
src/plugins/texteditor/basetexteditor.h
src/plugins/texteditor/basetexteditor.h
+1
-1
src/plugins/texteditor/itexteditable.h
src/plugins/texteditor/itexteditable.h
+1
-1
src/shared/indenter/indenter_impl.h
src/shared/indenter/indenter_impl.h
+1
-1
src/shared/qrceditor/undocommands_p.h
src/shared/qrceditor/undocommands_p.h
+1
-1
src/shared/qtlockedfile/qtlockedfile.cpp
src/shared/qtlockedfile/qtlockedfile.cpp
+2
-2
No files found.
src/libs/utils/fancylineedit.h
View file @
592e494d
...
...
@@ -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 focus
s
ed 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).
...
...
src/plugins/bookmarks/bookmarkmanager.cpp
View file @
592e494d
...
...
@@ -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 whet
h
er 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
;
...
...
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View file @
592e494d
...
...
@@ -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 be
e
ing 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 whet
h
er folder nodes can be removed
foreach
(
ProjectExplorer
::
FileNode
*
fn
,
deleted
)
{
ProjectExplorer
::
FolderNode
*
parent
=
fn
->
parentFolderNode
();
// qDebug()<<"removed"<<fn->path();
...
...
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View file @
592e494d
...
...
@@ -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 whet
h
er this project is already opened
return
new
CMakeProject
(
this
,
fileName
);
}
...
...
src/plugins/coreplugin/dialogs/settingsdialog.h
View file @
592e494d
...
...
@@ -65,7 +65,7 @@ public:
const
QString
&
initialPage
=
QString
());
~
SettingsDialog
();
// Run the dialog and return true if 'Ok' was cho
o
sen or 'Apply' was invoked
// Run the dialog and return true if 'Ok' was chosen or 'Apply' was invoked
// at least once
bool
execDialog
();
...
...
src/plugins/coreplugin/fancytabwidget.cpp
View file @
592e494d
...
...
@@ -207,7 +207,7 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
bool
hover
=
(
tabIndex
==
m_hoverIndex
);
#ifdef Q_WS_MAC
hover
=
false
;
// Do
n
t hover on Mac
hover
=
false
;
// Do
no
t hover on Mac
#endif
QColor
background
=
QColor
(
0
,
0
,
0
,
10
);
...
...
src/plugins/coreplugin/inavigationwidgetfactory.h
View file @
592e494d
...
...
@@ -64,7 +64,7 @@ public:
virtual
NavigationView
createWidget
()
=
0
;
// Read and store settings for the widget, created by this factory
// and be
e
ing 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
);
...
...
src/plugins/coreplugin/ioutputpane.h
View file @
592e494d
...
...
@@ -62,10 +62,10 @@ public:
// This function is called to give the outputwindow focus
virtual
void
setFocus
()
=
0
;
// Wheter the outputpane has focus
// Whet
h
er the outputpane has focus
virtual
bool
hasFocus
()
=
0
;
// Wheter the outputpane can be focused at the moment.
// (E.g. the search result window does
n't want to be focus
sed if the are no results.)
// Whet
h
er the outputpane can be focused at the moment.
// (E.g. the search result window does
not want to be focu
sed if the are no results.)
virtual
bool
canFocus
()
=
0
;
virtual
bool
canNavigate
()
=
0
;
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
592e494d
...
...
@@ -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 initi
a
lized before
m_outputView
=
new
Core
::
StatusBarWidget
;
m_outputView
->
setWidget
(
OutputPaneManager
::
instance
()
->
buttonsWidget
());
m_outputView
->
setPosition
(
Core
::
StatusBarWidget
::
Second
);
...
...
src/plugins/coreplugin/manhattanstyle.cpp
View file @
592e494d
...
...
@@ -79,7 +79,7 @@ bool panelWidget(const QWidget *widget)
if
(
!
widget
)
return
false
;
// Do
n
t style dialogs or explicitly ignored widgets
// Do
no
t style dialogs or explicitly ignored widgets
if
(
qobject_cast
<
const
QDialog
*>
(
widget
->
window
()))
return
false
;
...
...
src/plugins/coreplugin/messagemanager.cpp
View file @
592e494d
...
...
@@ -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);
}
...
...
src/plugins/coreplugin/mimedatabase.cpp
View file @
592e494d
...
...
@@ -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 cho
o
sen
* 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
...
...
src/plugins/coreplugin/settingsdatabase.cpp
View file @
592e494d
...
...
@@ -238,18 +238,18 @@ QString SettingsDatabase::group() const
QStringList
SettingsDatabase
::
childKeys
()
const
{
QStringList
child
s
;
QStringList
child
ren
;
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
)
{
child
s
.
append
(
key
.
mid
(
g
.
length
()
+
1
));
child
ren
.
append
(
key
.
mid
(
g
.
length
()
+
1
));
}
}
return
child
s
;
return
child
ren
;
}
void
SettingsDatabase
::
sync
()
...
...
src/plugins/debugger/cdb/cdbassembler.cpp
View file @
592e494d
...
...
@@ -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 dis
as
samble at 0x%1: %2"
).
arg
(
offset
,
0
,
16
).
arg
(
msgComFailed
(
"OutputDisassemblyLines"
,
hr
));
return
false
;
}
...
...
src/plugins/debugger/cdb/cdbdumperhelper.cpp
View file @
592e494d
...
...
@@ -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 occur
r
ing 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
(
"Ad
d
ress is missing for '%1' (%2)."
).
arg
(
wd
.
exp
,
wd
.
type
);
return
DumpNotHandled
;
}
...
...
src/plugins/debugger/cdb/cdbstacktracecontext.cpp
View file @
592e494d
...
...
@@ -168,7 +168,7 @@ CdbStackFrameContext *CdbStackTraceContext::frameContextAt(int index, QString *e
*
errorMessage
=
msgFrameContextFailed
(
index
,
m_frames
.
at
(
index
),
*
errorMessage
);
return
0
;
}
// Exclude uni
tialized variables if desired
// Exclude uni
nitialized variables if desired
QStringList
uninitializedVariables
;
if
(
theDebuggerAction
(
UseCodeModel
)
->
isChecked
())
{
const
StackFrame
&
frame
=
m_frames
.
at
(
index
);
...
...
src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
View file @
592e494d
...
...
@@ -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 uni
ni
tialized 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
());
...
...
src/plugins/debugger/debuggeragents.cpp
View file @
592e494d
...
...
@@ -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 dis
s
assembler 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
);
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
592e494d
...
...
@@ -276,7 +276,7 @@ void GdbEngine::initializeVariables()
m_gdbVersion
=
100
;
m_gdbBuildVersion
=
-
1
;
m_isMacGdb
=
false
;
m_isSynchron
e
ous
=
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 inter
r
upt 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_isSynchron
e
ous
=
true
;
m_isSynchronous
=
true
;
}
else
{
m_isSynchron
e
ous
=
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 regular
i
ly.
// 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
)
{
// retr
ei
ve list of dumpable classes
// retr
ie
ve 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 w
ould
get no feedback whatsoever
//
Custom DebuggingHelper crashs which happen regularily for
when accessing
// uninitialized variables.
// We need "print" as otherwise we w
ill
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_isSynchron
e
ous
;
return
m_isSynchronous
;
}
//
...
...
src/plugins/debugger/gdb/gdbengine.h
View file @
592e494d
...
...
@@ -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_isSynchron
eous
;
// Can act synchrone
ously?
bool
m_isSynchron
ous
;
// Can act synchron
ously?
private:
////////// Inferior Management //////////
...
...
src/plugins/debugger/gdb/trkgdbadapter.cpp
View file @
592e494d
...
...
@@ -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 transfer
r
ed"
);
}
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 transfer
r
ed"
);
}
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 transfer
r
ed"
);
}
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 auxil
i
ary "
"vector (%1, %2) not implemented."
).
arg
(
offset
).
arg
(
length
);
logMessage
(
msgGdbPacket
(
msg
));
sendGdbServerMessage
(
"E20"
,
msg
.
toLatin1
());
...
...
src/plugins/debugger/watchhandler.cpp
View file @
592e494d
...
...
@@ -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 through
t
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
)
...
...
src/plugins/debugger/watchhandler.h
View file @
592e494d
...
...
@@ -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 ad
d
ress
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 prefer
r
ed expanded state to the view
ActiveDataRole
,
// used for tooltip
TypeFormatListRole
,
TypeFormatRole
,
// used to communicate alternative formats to the view
...
...
src/plugins/designer/formeditorw.cpp
View file @
592e494d
...
...
@@ -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 focus
s
ed.
* "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.
...
...
src/plugins/designer/qtcreatorintegration.cpp
View file @
592e494d
...
...
@@ -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' com
m
ing 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
(
' '
));
...
...
src/plugins/projectexplorer/abstractprocessstep.h
View file @
592e494d
...
...
@@ -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 whet
h
er 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 suc
c
ess even if the return value indicates otherwise
/// should be called from init
void
setIgnoreReturnValue
(
bool
b
);
/// Set the Environment for running the command
...
...
src/plugins/projectexplorer/buildconfiguration.h
View file @
592e494d
...
...
@@ -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
;
//
c
lones a given BuildConfiguration, should not add it to the project
//
C
lones 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:
...
...
src/plugins/projectexplorer/buildstep.h
View file @
592e494d
...
...
@@ -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 transfer
r
ed 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 whet
h
er 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
;
...
...
src/plugins/projectexplorer/debugginghelper.cpp
View file @
592e494d
...
...
@@ -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
...
...
src/plugins/projectexplorer/environmenteditmodel.cpp
View file @
592e494d
...
...
@@ -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 whet
h
er this environment variable exists in m_items
if
(
changes
(
m_resultEnvironment
.
key
(
m_resultEnvironment
.
constBegin
()
+
index
.
row
())))
{
QFont
f
;
f
.
setBold
(
true
);
...
...
src/plugins/projectexplorer/project.cpp
View file @
592e494d
...
...
@@ -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 compa
ti
bility 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 compa
ti
bility
// 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 compa
ti
bility
QStringList
cleanStepNames
=
cleanStepsVariant
.
toStringList
();
// restoring BuildSteps from settings
int
pos
=
0
;
...
...
src/plugins/projectexplorer/session.cpp
View file @
592e494d
...
...
@@ -997,7 +997,7 @@ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
QStringList
SessionManager
::
sessions
()
const
{
if
(
m_sessions
.
isEmpty
())
{
// We are
n'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
();
...
...
src/plugins/qmldesigner/components/formeditor/anchormanipulator.h
View file @
592e494d
...
...
@@ -57,7 +57,7 @@ public:
FormEditorItem
*
beginFormEditorItem
()
const
;
private:
// fu
cn
tions
private:
// fu
nc
tions
void
setMargin
(
FormEditorItem
*
endItem
,
AnchorLine
::
Type
endAnchorLine
);
private:
// variables
...
...
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
View file @
592e494d
...
...
@@ -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 init
i
al FormEditorItem tree in the scene
void
FormEditorView
::
setupFormEditorItemTree
(
const
QmlItemNode
&
qmlItemNode
)
{
m_scene
->
addFormEditorItem
(
qmlItemNode
);
...
...
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
View file @
592e494d
...
...
@@ -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
;
};
...
...
src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
View file @
592e494d
...
...
@@ -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
;
...
...
src/plugins/qmldesigner/core/instances/nodeinstanceview.cpp
View file @
592e494d
...
...
@@ -78,7 +78,7 @@ namespace QmlDesigner {
/*! \brief Constructor
The class will be rendered offscreen if not set
ted
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 set
ted
for the NodeInstance.
The property will be set for the NodeInstance.
\param state ModelNode to wich the Property belongs
\param state ModelNode to w
h
ich 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 set
ted
for the NodeInstance.
The property will be set for the NodeInstance.
\param state ModelNode to wich the Property belongs
\param state ModelNode to w
h
ich the Property belongs
\param property AbstractProperty which was changed
\param newValue New Value of the property
\param oldValue Old Value of the property
...
...
src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
View file @
592e494d
...
...
@@ -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-exist
a
nt property"
<<
property
;
qWarning
()
<<
"Cannot assign to non-exist
e
nt property"
<<
property
;
return
QmlMetaProperty
();
}
else
if
(
!
prop
.
isWritable
())
{
qWarning
()
<<
"Cannot assign to read-only property"
<<
property
;
...
...
src/plugins/qmldesigner/core/model/abstractproperty.cpp
View file @
592e494d
...
...
@@ -234,7 +234,7 @@ PropertyMetaInfo AbstractProperty::metaInfo() const
}
/*!
\brief returns wether the property is the default property for the model node.
\brief returns w
h
ether the property is the default property for the model node.
*/
bool
AbstractProperty
::
isDefaultProperty
()
const
{
...
...
src/plugins/qt4projectmanager/makestep.cpp
View file @
592e494d
...
...
@@ -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 alr
e
ady clean project
setIgnoreReturnValue
(
m_clean
);
QStringList
args
=
m_userArgs
;
if
(
!
m_clean
)
{
...
...
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View file @
592e494d
...
...
@@ -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 directory
s, thus no
t
/// still
be a in
source build
/// source directory as the shadow build directory
, thus i
t
/// 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 cho
osen not to override the settings
// Easy one
: the user has ch
osen not to override the settings
actualSpec
=
version
->
mkspec
();
}
...
...
src/plugins/qt4projectmanager/qt4buildconfiguration.h
View file @
592e494d