summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-29 21:33:57 +0100
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-29 21:33:57 +0100
commita6ca348636dd92ab1445cff2286b3293163f5cea (patch)
treea7eba2d2bf7928ebff553f300dd4bacd824bce75
parent07da7ccfdf6e991c282dafdc9b4337db81a1a054 (diff)
downloadqt-creator-a6ca348636dd92ab1445cff2286b3293163f5cea.tar.gz
remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
-rw-r--r--doc/addressbook-sdk.qdoc4
-rw-r--r--doc/coding-style.qdoc20
-rwxr-xr-xscripts/snapshots/cleanup_snapshots.sh2
-rwxr-xr-xscripts/snapshots/create_nullbyte_snapshots.sh2
-rw-r--r--share/qtcreator/gdbmacros/gdbmacros.cpp12
-rw-r--r--share/qtcreator/gdbmacros/gdbmacros.pro6
-rw-r--r--share/qtcreator/gdbmacros/test/main.cpp4
-rw-r--r--src/libs/cplusplus/PreprocessorClient.cpp4
-rw-r--r--src/libs/cplusplus/ResolveExpression.cpp16
-rw-r--r--src/libs/extensionsystem/optionsparser.h6
-rw-r--r--src/libs/extensionsystem/plugindetailsview.h2
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp4
-rw-r--r--src/libs/extensionsystem/pluginview.cpp2
-rw-r--r--src/libs/utils/abstractprocess_win.cpp2
-rw-r--r--src/libs/utils/savedaction.cpp16
-rw-r--r--src/libs/utils/savedaction.h2
-rw-r--r--src/libs/utils/submiteditorwidget.cpp6
-rw-r--r--src/libs/utils/submitfieldwidget.cpp4
-rw-r--r--src/libs/utils/utils.pro2
-rw-r--r--src/libs/utils/winutils.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp4
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp4
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro2
-rw-r--r--src/plugins/coreplugin/actionmanager/command_p.h2
-rw-r--r--src/plugins/coreplugin/actionmanager/commandsfile.h2
-rw-r--r--src/plugins/coreplugin/coreplugin.pro2
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.h2
-rw-r--r--src/plugins/coreplugin/editormanager/editorview.h2
-rw-r--r--src/plugins/coreplugin/editormanager/openeditorsview.h2
-rw-r--r--src/plugins/coreplugin/fancytabwidget.cpp2
-rw-r--r--src/plugins/coreplugin/inavigationwidgetfactory.h2
-rw-r--r--src/plugins/coreplugin/outputpane.cpp2
-rw-r--r--src/plugins/coreplugin/styleanimator.h6
-rw-r--r--src/plugins/coreplugin/versiondialog.cpp4
-rw-r--r--src/plugins/cppeditor/cppclasswizard.cpp2
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp4
-rw-r--r--src/plugins/cppeditor/cppplugin.cpp2
-rw-r--r--src/plugins/cpptools/cppfilesettingspage.h4
-rw-r--r--src/plugins/cpptools/cppmodelmanagerinterface.h2
-rw-r--r--src/plugins/debugger/breakhandler.cpp10
-rw-r--r--src/plugins/debugger/breakwindow.cpp2
-rw-r--r--src/plugins/debugger/cdb/cdb.pri2
-rw-r--r--src/plugins/debugger/cdb/cdbbreakpoint.cpp4
-rw-r--r--src/plugins/debugger/cdb/cdbdebugengine.cpp20
-rw-r--r--src/plugins/debugger/cdb/cdbdebugengine.h6
-rw-r--r--src/plugins/debugger/cdb/cdbdebugengine_p.h4
-rw-r--r--src/plugins/debugger/cdb/cdbdebugeventcallback.cpp6
-rw-r--r--src/plugins/debugger/cdb/cdbdumperhelper.cpp4
-rw-r--r--src/plugins/debugger/cdb/cdbexceptionutils.cpp2
-rw-r--r--src/plugins/debugger/cdb/cdbmodules.cpp4
-rw-r--r--src/plugins/debugger/cdb/cdbstackframecontext.cpp2
-rw-r--r--src/plugins/debugger/cdb/cdbstackframecontext.h2
-rw-r--r--src/plugins/debugger/cdb/cdbstacktracecontext.cpp10
-rw-r--r--src/plugins/debugger/cdb/cdbstacktracecontext.h2
-rw-r--r--src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp6
-rw-r--r--src/plugins/debugger/cdb/cdbsymbolgroupcontext.h2
-rw-r--r--src/plugins/debugger/debugger.pro2
-rw-r--r--src/plugins/debugger/debuggeractions.cpp4
-rw-r--r--src/plugins/debugger/debuggeractions.h4
-rw-r--r--src/plugins/debugger/debuggeragents.cpp6
-rw-r--r--src/plugins/debugger/debuggerconstants.h2
-rw-r--r--src/plugins/debugger/debuggerdialogs.cpp4
-rw-r--r--src/plugins/debugger/debuggermanager.cpp6
-rw-r--r--src/plugins/debugger/debuggermanager.h6
-rw-r--r--src/plugins/debugger/debuggeroutputwindow.h2
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp6
-rw-r--r--src/plugins/debugger/debuggertooltip.cpp2
-rw-r--r--src/plugins/debugger/gdb/abstractgdbadapter.h2
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp58
-rw-r--r--src/plugins/debugger/gdb/gdbmi.cpp2
-rw-r--r--src/plugins/debugger/gdb/gdbmi.h92
-rw-r--r--src/plugins/debugger/gdb/gdboptionspage.cpp4
-rw-r--r--src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h4
-rw-r--r--src/plugins/debugger/gdb/trkgdbadapter.cpp22
-rw-r--r--src/plugins/debugger/gdb/trkgdbadapter.h2
-rw-r--r--src/plugins/debugger/idebuggerengine.h2
-rw-r--r--src/plugins/debugger/moduleshandler.cpp4
-rw-r--r--src/plugins/debugger/moduleswindow.cpp4
-rw-r--r--src/plugins/debugger/name_demangler.cpp8
-rw-r--r--src/plugins/debugger/name_demangler.h2
-rw-r--r--src/plugins/debugger/registerhandler.cpp2
-rw-r--r--src/plugins/debugger/registerhandler.h4
-rw-r--r--src/plugins/debugger/registerwindow.cpp2
-rw-r--r--src/plugins/debugger/script/script.pri4
-rw-r--r--src/plugins/debugger/script/scriptengine.cpp10
-rw-r--r--src/plugins/debugger/shared/backtrace.cpp2
-rw-r--r--src/plugins/debugger/shared/backtrace.h2
-rw-r--r--src/plugins/debugger/shared/dbgwinutils.cpp2
-rw-r--r--src/plugins/debugger/shared/peutils.cpp4
-rw-r--r--src/plugins/debugger/shared/peutils.h2
-rw-r--r--src/plugins/debugger/shared/shared.pri4
-rw-r--r--src/plugins/debugger/sourcefileswindow.cpp8
-rw-r--r--src/plugins/debugger/sourcefileswindow.h2
-rw-r--r--src/plugins/debugger/stackhandler.cpp6
-rw-r--r--src/plugins/debugger/stackwindow.cpp4
-rw-r--r--src/plugins/debugger/stackwindow.h2
-rw-r--r--src/plugins/debugger/threadswindow.h2
-rw-r--r--src/plugins/debugger/watchhandler.cpp30
-rw-r--r--src/plugins/debugger/watchhandler.h4
-rw-r--r--src/plugins/debugger/watchutils.cpp6
-rw-r--r--src/plugins/debugger/watchwindow.cpp26
-rw-r--r--src/plugins/debugger/watchwindow.h2
-rw-r--r--src/plugins/designer/cpp/formclasswizardparameters.cpp2
-rw-r--r--src/plugins/designer/formtemplatewizardpage.cpp2
-rw-r--r--src/plugins/designer/formwindoweditor.cpp2
-rw-r--r--src/plugins/designer/qt_private/formwindowbase_p.h2
-rw-r--r--src/plugins/fakevim/fakevimactions.cpp6
-rw-r--r--src/plugins/fakevim/fakevimactions.h6
-rw-r--r--src/plugins/fakevim/fakevimhandler.cpp2
-rw-r--r--src/plugins/fakevim/fakevimplugin.cpp42
-rw-r--r--src/plugins/genericprojectmanager/genericprojectfileseditor.h2
-rw-r--r--src/plugins/genericprojectmanager/genericprojectwizard.cpp2
-rw-r--r--src/plugins/git/gitcommand.cpp2
-rw-r--r--src/plugins/git/gitorious/gitorioushostwidget.cpp2
-rw-r--r--src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp2
-rw-r--r--src/plugins/git/gitsubmiteditorwidget.cpp6
-rw-r--r--src/plugins/helloworld/helloworld.pro2
-rw-r--r--src/plugins/help/centralwidget.cpp4
-rw-r--r--src/plugins/help/generalsettingspage.cpp4
-rw-r--r--src/plugins/perforce/perforcesettings.cpp2
-rw-r--r--src/plugins/perforce/perforcesubmiteditorwidget.h2
-rw-r--r--src/plugins/projectexplorer/buildmanager.cpp2
-rw-r--r--src/plugins/projectexplorer/customexecutablerunconfiguration.h2
-rw-r--r--src/plugins/projectexplorer/environmenteditmodel.cpp2
-rw-r--r--src/plugins/projectexplorer/outputwindow.h2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.h2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.pro2
-rw-r--r--src/plugins/projectexplorer/runconfiguration.h6
-rw-r--r--src/plugins/projectexplorer/taskwindow.cpp2
-rw-r--r--src/plugins/projectexplorer/toolchain.cpp2
-rw-r--r--src/plugins/projectexplorer/toolchain.h2
-rw-r--r--src/plugins/qmleditor/qmleditorplugin.cpp2
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectfileseditor.h2
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectwizard.cpp2
-rw-r--r--src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri2
-rw-r--r--src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp8
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h6
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp6
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60manager.cpp4
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qt4runconfiguration.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qtoptionspage.cpp2
-rw-r--r--src/plugins/qt4projectmanager/wizards/filespage.h2
-rw-r--r--src/plugins/qt4projectmanager/wizards/guiappwizard.cpp4
-rw-r--r--src/plugins/qt4projectmanager/wizards/librarywizard.cpp2
-rw-r--r--src/plugins/qtscripteditor/qtscripteditorplugin.cpp2
-rw-r--r--src/plugins/snippets/snippets.pro4
-rw-r--r--src/plugins/subversion/subversionplugin.cpp2
-rw-r--r--src/plugins/texteditor/basefilefind.cpp2
-rw-r--r--src/plugins/vcsbase/checkoutprogresswizardpage.cpp4
-rw-r--r--src/plugins/vcsbase/nicknamedialog.cpp2
-rw-r--r--src/plugins/vcsbase/vcsbaseeditor.cpp6
-rw-r--r--src/plugins/vcsbase/vcsbasesubmiteditor.cpp4
-rw-r--r--src/rpath.pri2
-rw-r--r--src/shared/cpaster/cgi.cpp2
-rw-r--r--src/shared/cpaster/splitter.cpp2
-rw-r--r--src/shared/cplusplus/Parser.cpp2
-rw-r--r--src/shared/designerintegrationv2/formresizer.h2
-rw-r--r--src/shared/help/bookmarkmanager.cpp4
-rw-r--r--src/shared/help/bookmarkmanager.h6
-rw-r--r--src/shared/help/indexwindow.cpp2
-rw-r--r--src/shared/help/topicchooser.cpp2
-rw-r--r--src/shared/help/topicchooser.h4
-rw-r--r--src/shared/proparser/procommandmanager.cpp4
-rw-r--r--src/shared/proparser/procommandmanager.h4
-rw-r--r--src/shared/proparser/proeditormodel.cpp6
-rw-r--r--src/shared/proparser/proeditormodel.h8
-rw-r--r--src/shared/proparser/proiteminfo.cpp2
-rw-r--r--src/shared/proparser/prowriter.cpp6
-rw-r--r--src/shared/proparser/proxml.cpp6
-rw-r--r--src/shared/qrceditor/resourcefile_p.h2
-rw-r--r--src/shared/qrceditor/resourceview.h2
-rw-r--r--src/shared/qtlockedfile/qtlockedfile.h6
-rw-r--r--src/shared/qtlockedfile/qtlockedfile_unix.cpp12
-rw-r--r--src/shared/trk/bluetoothlistener.cpp2
-rw-r--r--src/shared/trk/bluetoothlistener_gui.cpp2
-rw-r--r--src/shared/trk/launcher.cpp2
-rw-r--r--src/shared/trk/launcher.h2
-rw-r--r--src/shared/trk/trkdevice.cpp18
-rw-r--r--src/shared/trk/trkdevice.h2
-rw-r--r--src/shared/trk/trkutils.h2
-rw-r--r--src/tools/makespy/makespy.pro2
-rw-r--r--src/tools/qdebugger/lean.h2
-rw-r--r--src/tools/qdebugger/mainwindow.cpp12
-rw-r--r--src/tools/qdebugger/mainwindow.h2
-rw-r--r--src/tools/qdebugger/qdebugger.pro6
-rw-r--r--src/tools/qtcreatorwidgets/customwidgets.cpp2
-rw-r--r--src/tools/qtcreatorwidgets/customwidgets.h2
-rw-r--r--src/tools/qtcreatorwidgets/qtcreatorwidgets.pro2
-rw-r--r--src/tools/qtlibspatcher/binpatch.cpp2
-rw-r--r--src/tools/qtlibspatcher/binpatch.h2
-rw-r--r--src/tools/qtlibspatcher/qtlibspatcher.pro2
-rw-r--r--src/tools/texteditor/mainwindow.cpp6
-rw-r--r--src/tools/texteditor/mainwindow.h2
-rw-r--r--src/tools/texteditor/texteditor.pro4
-rw-r--r--tests/auto/debugger/tst_dumpers.cpp10
-rw-r--r--tests/auto/debugger/tst_gdb.cpp126
-rw-r--r--tests/auto/debugger/tst_plugin.cpp2
-rw-r--r--tests/auto/fakevim/main.cpp16
-rw-r--r--tests/manual/binding/binding.pro4
-rw-r--r--tests/manual/cdbdebugger/cdbdebugger.pro4
-rw-r--r--tests/manual/cdbdebugger/debugger.cpp2
-rw-r--r--tests/manual/cdbdebugger/mainwindow.cpp2
-rw-r--r--tests/manual/cdbdebugger/windbgthread.cpp2
-rw-r--r--tests/manual/fakevim/main.cpp4
-rw-r--r--tests/manual/gdbdebugger/simple/plugin.cpp2
-rw-r--r--tests/manual/gdbdebugger/spacy path/app with space.cpp10
-rw-r--r--tests/manual/gdbdebugger/spacy path/plugin with space.cpp2
-rw-r--r--tests/manual/gdbdebugger/spacy-file/app with space.cpp10
-rw-r--r--tests/manual/gdbdebugger/spacy-file/plugin with space.cpp2
-rw-r--r--tests/manual/proparser/proparser.pro4
-rw-r--r--tests/manual/proparser/test.pro2
-rwxr-xr-xtests/manual/trk/runner.cpp4
-rw-r--r--tests/manual/trk/swapendian.pro2
-rw-r--r--tests/manual/trklauncher/main.cpp2
217 files changed, 604 insertions, 604 deletions
diff --git a/doc/addressbook-sdk.qdoc b/doc/addressbook-sdk.qdoc
index 9737100f25..d8f5c463f2 100644
--- a/doc/addressbook-sdk.qdoc
+++ b/doc/addressbook-sdk.qdoc
@@ -215,8 +215,8 @@
\snippet examples/addressbook-sdk/part1/main.cpp main function
- The code constructs a new \c AddressBook widget on the stack and
- invokes its \l{QWidget::}{show()} function to display it.
+ The code constructs a new \c AddressBook widget on the stack and
+ invokes its \l{QWidget::}{show()} function to display it.
However, the widget will not be shown until the application's event
loop is started. This is done by calling the application's
\l{QApplication::}{exec()} function. Finally, the result returned by
diff --git a/doc/coding-style.qdoc b/doc/coding-style.qdoc
index fff5a4bd0f..7ab82fa519 100644
--- a/doc/coding-style.qdoc
+++ b/doc/coding-style.qdoc
@@ -32,8 +32,8 @@ that you:
the case that you have better ideas, discuss them with other developers
before writing the code.
\o Take advantage of Qt. Don't re-invent the wheel. Think about what parts
- of your code are generic enough that they might be incorporated into
- Qt proper.
+ of your code are generic enough that they might be incorporated into
+ Qt proper.
\o Document interfaces. Right now we use qdoc, but changing to doxygen
is being considered.
\endlist
@@ -108,7 +108,7 @@ in C++.
\endcode
-\o Using Qt's foreach is ok in non-time critical code when using a QTL
+\o Using Qt's foreach is ok in non-time critical code when using a QTL
container. It is a nice way to keep line noise down and to give the
loop variable a proper name:
@@ -122,14 +122,14 @@ in C++.
for (Container::iterator it = container.begin(); it != end; ++it)
doSomething(*it);
\endcode
-
- If the loop variable can be made const, do so. This can prevent
+
+ If the loop variable can be made const, do so. This can prevent
unnecessary detaching of shared data in some cases. So:
\code
foreach (const QString &name, someListOfNames)
doSomething(name);
-
+
- NOT -
foreach (QString name, someListOfNames)
@@ -157,7 +157,7 @@ Only one declaration on each line.
-NOT-
QString a = "Joe", b = "Foo"; // not used in Qt Creator
\endcode
- [Note that 'QString a = "Joe"' is formally calling a copy constructor
+ [Note that 'QString a = "Joe"' is formally calling a copy constructor
on a temporary constructed from a string literal and therefore has the
potential of being more expensive then direct construction by
'QString a("joe")'. However the compiler is allowed to elide the copy
@@ -166,7 +166,7 @@ Only one declaration on each line.
line with the traditional C-style initialization, _and_ cannot be
mistaken as function declaration, _and_ reduces the level of nested
parantheses in more initializations.]
-
+
\section2 Pointers and references
@@ -439,7 +439,7 @@ Line breaks
\section2 File headers
- If you create a new file, the top of the file should include a
+ If you create a new file, the top of the file should include a
header comment equal to the one found in other source files of Qt Creator.
\section2 Include order
@@ -474,7 +474,7 @@ Line breaks
You document for the other developers, not for yourself.
In the header you should document interfaces, i.e. what the function does,
not the implementation.
- In the .cpp files you document the implementation if the implementation
+ In the .cpp files you document the implementation if the implementation
in non-obvious.
diff --git a/scripts/snapshots/cleanup_snapshots.sh b/scripts/snapshots/cleanup_snapshots.sh
index db283edd44..3d60dddc67 100755
--- a/scripts/snapshots/cleanup_snapshots.sh
+++ b/scripts/snapshots/cleanup_snapshots.sh
@@ -83,5 +83,5 @@ exit 0
## Properly close subshell
-)
+)
exit $?
diff --git a/scripts/snapshots/create_nullbyte_snapshots.sh b/scripts/snapshots/create_nullbyte_snapshots.sh
index 9099d183d2..33af90ead1 100755
--- a/scripts/snapshots/create_nullbyte_snapshots.sh
+++ b/scripts/snapshots/create_nullbyte_snapshots.sh
@@ -54,5 +54,5 @@ exit 0
## Properly close subshell
-)
+)
exit $?
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 6463538c5b..47d3937ee8 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -1075,7 +1075,7 @@ static void qDumpQAbstractItem(QDumper &d)
{
ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi);
mm->r = mm->c = 0;
- mm->p = mm->m = 0;
+ mm->p = mm->m = 0;
static const char *printFormat = sizeof(void *) == sizeof(long) ?
"%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c, &mm->p, &mm->m);
@@ -2147,7 +2147,7 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
case QVariant::KeySequence:
#ifndef QT_NO_SHORTCUT
*value = qvariant_cast<QKeySequence>(*v).toString();
- #else
+ #else
*value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT");
#endif
break;
@@ -2800,7 +2800,7 @@ static void qDumpQSharedPointer(QDumper &d)
const QSharedPointer<int> &ptr =
*reinterpret_cast<const QSharedPointer<int> *>(d.data);
- if (ptr.isNull()) {
+ if (ptr.isNull()) {
d.putItem("value", "<null>");
d.putItem("valueeditable", "false");
d.putItem("numchild", 0);
@@ -3743,9 +3743,9 @@ static inline void dumpSizes(QDumper &d)
const SizeMap::const_iterator cend = sizeMap.constEnd();
for (SizeMap::const_iterator it = sizeMap.constBegin(); it != cend; ++it) {
// new size list
- if (it.key() != lastSize) {
+ if (it.key() != lastSize) {
if (lastSize)
- d.put("],");
+ d.put("],");
d.put("[\"");
d.put(it.key());
lastSize = it.key();
@@ -3755,7 +3755,7 @@ static inline void dumpSizes(QDumper &d)
d.put(it.value());
d.put('"');
}
- d.put("]]");
+ d.put("]]");
}
extern "C" Q_DECL_EXPORT
diff --git a/share/qtcreator/gdbmacros/gdbmacros.pro b/share/qtcreator/gdbmacros/gdbmacros.pro
index 0f1bc0f77e..812b1fe262 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.pro
+++ b/share/qtcreator/gdbmacros/gdbmacros.pro
@@ -1,15 +1,15 @@
TEMPLATE = lib
CONFIG += shared
-linux-* {
+linux-* {
CONFIG -= release
CONFIG += debug
}
SOURCES = gdbmacros.cpp
-false {
+false {
DEFINES += USE_QT_GUI=0
QT = core
}
-else {
+else {
DEFINES += USE_QT_GUI=1
QT = core \
gui
diff --git a/share/qtcreator/gdbmacros/test/main.cpp b/share/qtcreator/gdbmacros/test/main.cpp
index de8fc9f91f..ba573600b9 100644
--- a/share/qtcreator/gdbmacros/test/main.cpp
+++ b/share/qtcreator/gdbmacros/test/main.cpp
@@ -245,7 +245,7 @@ static int dumpQMapQStringString()
test.insert(QLatin1String("42s"), QLatin1String("fortytwo"));
test.insert(QLatin1String("423"), QLatin1String("fortytree"));
}
- prepareInBuffer("QMap", "local.qmapqstringqstring", "local.qmapqstringqstring", "QString@QString");
+ prepareInBuffer("QMap", "local.qmapqstringqstring", "local.qmapqstringqstring", "QString@QString");
qDumpObjectData440(2, 42, testAddress(&test), 1, sizeof(QString), sizeof(QString), sizeof(mapNode), valueOffset);
fputs(qDumpOutBuffer, stdout);
fputc('\n', stdout);
@@ -451,7 +451,7 @@ static int dumpStdQStringSet()
static int dumpStdMapIntString()
{
- std::map<int,std::string> test;
+ std::map<int,std::string> test;
std::map<int,std::string>::value_type entry(42, std::string("fortytwo"));
if (!optEmptyContainers) {
test.insert(entry);
diff --git a/src/libs/cplusplus/PreprocessorClient.cpp b/src/libs/cplusplus/PreprocessorClient.cpp
index 5b57baa7b2..89dfcd4b06 100644
--- a/src/libs/cplusplus/PreprocessorClient.cpp
+++ b/src/libs/cplusplus/PreprocessorClient.cpp
@@ -62,10 +62,10 @@ using namespace CPlusPlus;
/*!
\fn void Client::startExpandingMacro(unsigned offset, const Macro &macro, const QByteArray &originalText, bool inCondition = false, const QVector<MacroArgumentReference> &actuals = QVector<MacroArgumentReference>())
-
+
Called when starting to expand a macro. The parameter \a inCondition indicates whether the
expansion is happening inside a preprocessor conditional.
-
+
\sa stopExpandingMacro()
*/
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 46403036ae..3fa4fca178 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -477,7 +477,7 @@ bool ResolveExpression::visit(CallAST *ast)
}
}
- } else if (Function *funTy = ty->asFunctionType()) {
+ } else if (Function *funTy = ty->asFunctionType()) {
if (maybeValidPrototype(funTy, actualArgumentCount))
addResult(funTy->returnType().simplified(), lastVisibleSymbol);
@@ -601,7 +601,7 @@ ResolveExpression::resolveBaseExpression(const QList<Result> &baseResults, int a
Name *arrowAccessOp = control()->operatorNameId(OperatorNameId::ArrowOp);
const QList<Symbol *> candidates = resolveClass(namedTy->name(), result, _context);
- foreach (Symbol *classObject, candidates) {
+ foreach (Symbol *classObject, candidates) {
const QList<Result> overloads = resolveMember(arrowAccessOp, classObject->asClass(),
namedTy->name());
@@ -715,16 +715,16 @@ ResolveExpression::resolveMember(Name *memberName, Class *klass,
foreach (Symbol *candidate, candidates) {
FullySpecifiedType ty = candidate->type();
Name *unqualifiedNameId = className;
-
+
if (QualifiedNameId *q = className->asQualifiedNameId())
unqualifiedNameId = q->unqualifiedNameId();
-
+
if (TemplateNameId *templId = unqualifiedNameId->asTemplateNameId()) {
GenTemplateInstance::Substitution subst;
-
+
for (unsigned i = 0; i < templId->templateArgumentCount(); ++i) {
FullySpecifiedType templArgTy = templId->templateArgumentAt(i);
-
+
if (i < klass->templateParameterCount()) {
Name *templArgName = klass->templateParameterAt(i)->name();
if (templArgName && templArgName->identifier()) {
@@ -733,11 +733,11 @@ ResolveExpression::resolveMember(Name *memberName, Class *klass,
}
}
}
-
+
GenTemplateInstance inst(_context, subst);
ty = inst(candidate);
}
-
+
results.append(Result(ty, candidate));
}
diff --git a/src/libs/extensionsystem/optionsparser.h b/src/libs/extensionsystem/optionsparser.h
index 377d94ca97..435ea956a2 100644
--- a/src/libs/extensionsystem/optionsparser.h
+++ b/src/libs/extensionsystem/optionsparser.h
@@ -46,7 +46,7 @@ public:
QMap<QString, QString> *foundAppOptions,
QString *errorString,
PluginManagerPrivate *pmPrivate);
-
+
bool parse();
static const char *NO_LOAD_OPTION;
@@ -63,13 +63,13 @@ private:
enum TokenType { OptionalToken, RequiredToken };
bool nextToken(TokenType type = OptionalToken);
-
+
const QStringList &m_args;
const QMap<QString, bool> &m_appOptions;
QMap<QString, QString> *m_foundAppOptions;
QString *m_errorString;
PluginManagerPrivate *m_pmPrivate;
-
+
// state
QString m_currentArg;
QStringList::const_iterator m_it;
diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h
index b8d36ebd49..a0fd41a1a1 100644
--- a/src/libs/extensionsystem/plugindetailsview.h
+++ b/src/libs/extensionsystem/plugindetailsview.h
@@ -52,7 +52,7 @@ class EXTENSIONSYSTEM_EXPORT PluginDetailsView : public QWidget
public:
PluginDetailsView(QWidget *parent = 0);
~PluginDetailsView();
-
+
void update(PluginSpec *spec);
private:
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index 8cf365b670..68c7042d4d 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -328,12 +328,12 @@ QList<PluginSpec *> PluginManager::plugins() const
The caller (the application) may register itself for options via the \a appOptions list, containing pairs
of "option string" and a bool that indicates if the option requires an argument.
Application options always override any plugin's options.
-
+
\a foundAppOptions is set to pairs of ("option string", "argument") for any application options that were found.
The command line options that were not processed can be retrieved via the arguments() method.
If an error occurred (like missing argument for an option that requires one), \a errorString contains
a descriptive message of the error.
-
+
Returns if there was an error.
*/
bool PluginManager::parseOptions(const QStringList &args,
diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index fa595cdac8..2ac3dec9fe 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -72,7 +72,7 @@ Q_DECLARE_METATYPE(ExtensionSystem::PluginSpec*);
given plugin \a manager with a given \a parent widget.
*/
PluginView::PluginView(PluginManager *manager, QWidget *parent)
- : QWidget(parent),
+ : QWidget(parent),
m_ui(new Internal::Ui::PluginView),
p(new Internal::PluginViewPrivate)
{
diff --git a/src/libs/utils/abstractprocess_win.cpp b/src/libs/utils/abstractprocess_win.cpp
index 70aa028e1c..a4fce52cf5 100644
--- a/src/libs/utils/abstractprocess_win.cpp
+++ b/src/libs/utils/abstractprocess_win.cpp
@@ -31,7 +31,7 @@
#include <windows.h>
-namespace Utils {
+namespace Utils {
QStringList AbstractProcess::fixWinEnvironment(const QStringList &env)
{
diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp
index e3833bebb6..6882d40f95 100644
--- a/src/libs/utils/savedaction.cpp
+++ b/src/libs/utils/savedaction.cpp
@@ -55,7 +55,7 @@ using namespace Utils;
/*!
\class Utils::SavedAction
-
+
\brief The SavedAction class is a helper class for actions with persistent
state.
@@ -233,7 +233,7 @@ QAction *SavedAction::updatedAction(const QString &text0)
}
/*
- Uses \c settingsGroup() and \c settingsKey() to restore the
+ Uses \c settingsGroup() and \c settingsKey() to restore the
item from \a settings,
\sa settingsKey(), settingsGroup(), writeSettings()
@@ -254,7 +254,7 @@ void SavedAction::readSettings(QSettings *settings)
}
/*
- Uses \c settingsGroup() and \c settingsKey() to write the
+ Uses \c settingsGroup() and \c settingsKey() to write the
item to \a settings,
\sa settingsKey(), settingsGroup(), readSettings()
@@ -268,12 +268,12 @@ void SavedAction::writeSettings(QSettings *settings)
//qDebug() << "WRITING: " << m_settingsKey << " -> " << toString();
settings->endGroup();
}
-
+
/*
A \c SavedAction can be connected to a widget, typically a
checkbox, radiobutton, or a lineedit in some configuration dialog.
- The widget will retrieve its contents from the SavedAction's
+ The widget will retrieve its contents from the SavedAction's
value, and - depending on the \a ApplyMode - either write
changes back immediately, or when \s SavedAction::apply()
is called explicitly.
@@ -286,7 +286,7 @@ void SavedAction::connectWidget(QWidget *widget, ApplyMode applyMode)
qDebug() << "ALREADY CONNECTED: " << widget << m_widget << toString(); return);
m_widget = widget;
m_applyMode = applyMode;
-
+
if (QAbstractButton *button = qobject_cast<QAbstractButton *>(widget)) {
if (button->isCheckable()) {
button->setChecked(m_value.toBool());
@@ -298,14 +298,14 @@ void SavedAction::connectWidget(QWidget *widget, ApplyMode applyMode)
}
} else if (QSpinBox *spinBox = qobject_cast<QSpinBox *>(widget)) {
spinBox->setValue(m_value.toInt());
- //qDebug() << "SETTING VALUE" << spinBox->value();
+ //qDebug() << "SETTING VALUE" << spinBox->value();
connect(spinBox, SIGNAL(valueChanged(int)),
this, SLOT(spinBoxValueChanged(int)));
connect(spinBox, SIGNAL(valueChanged(QString)),
this, SLOT(spinBoxValueChanged(QString)));
} else if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget)) {
lineEdit->setText(m_value.toString());
- //qDebug() << "SETTING TEXT" << lineEdit->text();
+ //qDebug() << "SETTING TEXT" << lineEdit->text();
connect(lineEdit, SIGNAL(editingFinished()),
this, SLOT(lineEditEditingFinished()));
} else if (PathChooser *pathChooser = qobject_cast<PathChooser *>(widget)) {
diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h
index 4306a800bd..06cfd0a6df 100644
--- a/src/libs/utils/savedaction.h
+++ b/src/libs/utils/savedaction.h
@@ -72,7 +72,7 @@ public:
virtual void readSettings(QSettings *settings);
Q_SLOT virtual void writeSettings(QSettings *settings);
-
+
virtual void connectWidget(QWidget *widget, ApplyMode applyMode = DeferedApply);
virtual void disconnectWidget();
Q_SLOT virtual void apply(QSettings *settings);
diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index 3433329d52..2dc2297345 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -236,7 +236,7 @@ static QString wrappedText(const QTextEdit *e)
const QChar newLine = QLatin1Char('\n');
QString rc;
QTextCursor cursor(e->document());
- cursor.movePosition(QTextCursor::Start);
+ cursor.movePosition(QTextCursor::Start);
while (!cursor.atEnd()) {
cursor.select(QTextCursor::LineUnderCursor);
rc += cursor.selectedText();
@@ -272,7 +272,7 @@ void SubmitEditorWidget::setLineWrap(bool v)
qDebug() << Q_FUNC_INFO << v;
if (v) {
m_d->m_ui.description->setLineWrapColumnOrWidth(m_d->m_lineWidth);
- m_d->m_ui.description->setLineWrapMode(QTextEdit::FixedColumnWidth);
+ m_d->m_ui.description->setLineWrapMode(QTextEdit::FixedColumnWidth);
} else {
m_d->m_ui.description->setLineWrapMode(QTextEdit::NoWrap);
}
@@ -488,7 +488,7 @@ void SubmitEditorWidget::insertDescriptionEditContextMenuAction(int pos, QAction
void SubmitEditorWidget::editorCustomContextMenuRequested(const QPoint &pos)
{
- QMenu *menu = m_d->m_ui.description->createStandardContextMenu();
+ QMenu *menu = m_d->m_ui.description->createStandardContextMenu();
// Extend
foreach (const SubmitEditorWidgetPrivate::AdditionalContextMenuAction &a, m_d->descriptionEditContextMenuActions) {
if (a.second) {
diff --git a/src/libs/utils/submitfieldwidget.cpp b/src/libs/utils/submitfieldwidget.cpp
index 7b1e34ca2b..91e7248de9 100644
--- a/src/libs/utils/submitfieldwidget.cpp
+++ b/src/libs/utils/submitfieldwidget.cpp
@@ -104,7 +104,7 @@ void FieldEntry::deleteGuiLater()
clearButton->deleteLater();
browseButton->deleteLater();
toolBar->deleteLater();
- lineEdit->deleteLater();
+ lineEdit->deleteLater();
combo->deleteLater();
layout->deleteLater();
}
@@ -193,7 +193,7 @@ void SubmitFieldWidget::setFields(const QStringList & f)
{
// remove old fields
for (int i = m_d->fieldEntries.size() - 1 ; i >= 0 ; i--)
- removeField(i);
+ removeField(i);
m_d->fields = f;
if (!f.empty())
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 14a984654d..bd6a369e8d 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -37,7 +37,7 @@ SOURCES += reloadpromptutils.cpp \
fancymainwindow.cpp \
detailsbutton.cpp \
detailswidget.cpp
-win32 {
+win32 {
SOURCES += abstractprocess_win.cpp \
consoleprocess_win.cpp \
winutils.cpp
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 4e7d31c3fc..8b04589180 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -98,7 +98,7 @@ QTCREATOR_UTILS_EXPORT QString winGetDLLVersion(WinDLLVersionType t,
if (!(*verQueryValueW)(data, TEXT("\\"), &versionInfo, &len)) {
*errorMessage = QString::fromLatin1("Unable to determine version string of %1: %2").arg(name, winErrorMessage(GetLastError()));
return QString();
- }
+ }
QString rc;
switch (t) {
case WinDLLFileVersion:
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index d18b3fb0ec..9d3a75140d 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -368,7 +368,7 @@ void CMakeRunPage::initializePage()
}
}
}
- }
+ }
m_generatorComboBox->clear();
// Find out whether we have multiple msvc versions
QStringList msvcVersions = ProjectExplorer::ToolChain::availableMSVCVersions();
@@ -412,7 +412,7 @@ void CMakeRunPage::runCMake()
generator = "-GCodeBlocks - NMake Makefiles";
m_cmakeWizard->setMsvcVersion(version);
}
- }
+ }
}
#else // Q_OS_WIN
QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles");
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index d0b683c8b3..7975e1e312 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -51,7 +51,7 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage)
{
Core::UniqueIDManager *uidm = Core::UniqueIDManager::instance();
m_projectContext = uidm->uniqueIdentifier(CMakeProjectManager::Constants::PROJECTCONTEXT);
- m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
+ m_projectLanguage = uidm->uniqueIdentifier(ProjectExplorer::Constants::LANG_CXX);
}
int CMakeManager::projectContext() const
@@ -115,7 +115,7 @@ void CMakeManager::createXmlFile(QProcess *proc, const QStringList &arguments, c
proc->setProcessChannelMode(QProcess::MergedChannels);
proc->setEnvironment(env.toStringList());
- const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ? QString(QLatin1Char('.')) : sourceDirectory;
+ const QString srcdir = buildDirectory.exists(QLatin1String("CMakeCache.txt")) ? QString(QLatin1Char('.')) : sourceDirectory;
proc->start(cmakeExecutable(), QStringList() << srcdir << arguments << generator);
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index fe516111f6..7b79a5afab 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
@@ -20,6 +20,6 @@ SOURCES = cmakeproject.cpp \
cmakeopenprojectwizard.cpp \
cmakebuildenvironmentwidget.cpp
RESOURCES += cmakeproject.qrc
-FORMS +=
+FORMS +=
OTHER_FILES += CMakeProjectManager.pluginspec
diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h
index 176866dfee..0ad9aba35a 100644
--- a/src/plugins/coreplugin/actionmanager/command_p.h
+++ b/src/plugins/coreplugin/actionmanager/command_p.h
@@ -126,7 +126,7 @@ public:
protected:
void updateToolTipWithKeySequence();
-
+
QAction *m_action;
QList<CommandLocation> m_locations;
QString m_toolTip;
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h
index 8cf7a06d80..5ca48b5300 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.h
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.h
@@ -40,7 +40,7 @@ namespace Core {
namespace Internal {
struct ShortcutItem;
-
+
class CommandsFile : public QObject
{
Q_OBJECT
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index f92509e61d..3097355c5d 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -166,7 +166,7 @@ FORMS += dialogs/newdialog.ui \
generalsettings.ui
RESOURCES += core.qrc \
fancyactionbar.qrc
-unix:!macx {
+unix:!macx {
images.files = images/qtcreator_logo_*.png
images.path = /share/pixmaps
INSTALLS += images
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 06e88b8bf9..90d360a70b 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -120,7 +120,7 @@ public:
const QString &contents = QString());
bool openExternalEditor(const QString &fileName, const QString &editorKind);
-
+
QStringList getOpenFileNames() const;
QString getOpenWithEditorKind(const QString &fileName, bool *isExternalEditor = 0) const;
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 76d5233b1d..a4ab1e1977 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -170,7 +170,7 @@ public:
inline bool isView() const { return m_view != 0; }
inline bool isRoot() const { return m_isRoot; }
-
+
inline bool isSplitter() const { return m_splitter != 0; }
inline Core::IEditor *editor() const { return m_view ? m_view->currentEditor() : 0; }
inline QList<Core::IEditor *> editors() const { return m_view ? m_view->editors() : QList<Core::IEditor*>(); }
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h
index 706b3d3637..5f5216f470 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.h
@@ -26,7 +26,7 @@
** contact the sales department at http://qt.nokia.com/contact.
**
**************************************************************************/
-
+
#ifndef OPENEDITORSVIEW_H
#define OPENEDITORSVIEW_H
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 8cf175651b..3f7804372b 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -284,7 +284,7 @@ public:
void mousePressEvent(QMouseEvent *ev)
{
- if (ev->modifiers() & Qt::ShiftModifier)
+ if (ev->modifiers() & Qt::ShiftModifier)
Utils::StyleHelper::setBaseColor(QColorDialog::getColor(Utils::StyleHelper::baseColor(), m_parent));
}
private:
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h
index f8b7377a5a..d246458e3c 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -58,7 +58,7 @@ public:
virtual QString displayName() = 0;
virtual QKeySequence activationSequence();
// This design is not optimal, think about it again once we need to extend it
- // It could be implemented as returning an object which has both the widget
+ // It could be implemented as returning an object which has both the widget
// and the docktoolbar widgets
// Similar to how IView
virtual NavigationView createWidget() = 0;
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 7b46cbd23a..75dd2e5a97 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -138,7 +138,7 @@ static OutputPaneManager *m_instance = 0;
void OutputPaneManager::create()
{
- m_instance = new OutputPaneManager;
+ m_instance = new OutputPaneManager;
}
void OutputPaneManager::destroy()
diff --git a/src/plugins/coreplugin/styleanimator.h b/src/plugins/coreplugin/styleanimator.h
index 5b81827add..29578006b7 100644
--- a/src/plugins/coreplugin/styleanimator.h
+++ b/src/plugins/coreplugin/styleanimator.h
@@ -37,13 +37,13 @@
#include <QtGui/QPainter>
#include <QtGui/QWidget>
-/*
+/*
* This is a set of helper classes to allow for widget animations in
* the style. Its mostly taken from Vista style so it should be fully documented
* there.
*
*/
-
+
class Animation
{
public :
@@ -92,7 +92,7 @@ public:
void startAnimation(Animation *);
void stopAnimation(const QWidget *);
Animation* widgetAnimation(const QWidget *) const;
-
+
private:
QBasicTimer animationTimer;
QList <Animation*> animations;
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp
index d951d171bf..eb3e9e1595 100644
--- a/src/plugins/coreplugin/versiondialog.cpp
+++ b/src/plugins/coreplugin/versiondialog.cpp
@@ -82,8 +82,8 @@ VersionDialog::VersionDialog(QWidget *parent)
"The program is provided AS IS with NO WARRANTY OF ANY KIND, "
"INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
"PARTICULAR PURPOSE.<br/>")
- .arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize),
- QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(IDE_YEAR),
+ .arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize),
+ QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(IDE_YEAR),
(QLatin1String(IDE_AUTHOR)), ideRev);
QLabel *copyRightLabel = new QLabel(description);
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index 199f56573c..c40e36adf3 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -78,7 +78,7 @@ ClassNamePage::ClassNamePage(QWidget *parent) :
connect(m_newClassWidget, SIGNAL(validChanged()), this, SLOT(slotValidChanged()));
- QVBoxLayout *pageLayout = new QVBoxLayout(this);
+ QVBoxLayout *pageLayout = new QVBoxLayout(this);
pageLayout->addWidget(m_newClassWidget);
QSpacerItem *vSpacer = new QSpacerItem(0, 0, QSizePolicy::Ignored, QSizePolicy::Expanding);
pageLayout->addItem(vSpacer);
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 754192a465..3de7b22ae5 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -759,7 +759,7 @@ CPlusPlus::Symbol *CPPEditor::findCanonicalSymbol(const QTextCursor &cursor,
void CPPEditor::findUsages()
-{
+{
if (Symbol *canonicalSymbol = markSymbols()) {
m_modelManager->findUsages(canonicalSymbol);
}
@@ -1802,7 +1802,7 @@ const char *CPPEditorEditable::kind() const
bool CPPEditorEditable::open(const QString & fileName)
{
- bool b = TextEditor::BaseTextEditorEditable::open(fileName);
+ bool b = TextEditor::BaseTextEditorEditable::open(fileName);
editor()->setMimeType(Core::ICore::instance()->mimeDatabase()->findByFile(QFileInfo(fileName)).type());
return b;
}
diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp
index a4476d6d90..b0de43d01c 100644
--- a/src/plugins/cppeditor/cppplugin.cpp
+++ b/src/plugins/cppeditor/cppplugin.cpp
@@ -259,7 +259,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess
| TextEditor::TextEditorActionHandler::UnCollapseAll);
m_actionHandler->initializeActions();
-
+
contextMenu->addAction(createSeparator(am, this, context, CppEditor::Constants::SEPARATOR));
cmd = am->command(TextEditor::Constants::AUTO_INDENT_SELECTION);
diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index 7649ce67a2..265382576c 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -55,7 +55,7 @@ struct CppFileSettings {
void toSettings(QSettings *) const;
void fromSettings(QSettings *);
- bool applySuffixesToMimeDB();
+ bool applySuffixesToMimeDB();
// Convenience to return a license template completely formatted.
// Currently made public in
@@ -77,7 +77,7 @@ public:
CppFileSettings settings() const;
void setSettings(const CppFileSettings &s);
-private slots:
+private slots:
void slotEdit();
private:
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index 1976df75ea..e722d23637 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -104,7 +104,7 @@ public:
public Q_SLOTS:
void updateModifiedSourceFiles();
- virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;
+ virtual void updateSourceFiles(const QStringList &sourceFiles) = 0;
virtual void GC() = 0;
};
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index b207360bd7..79a30efd95 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -130,7 +130,7 @@ public:
// return;
if (m_data->markerLineNumber != lineNumber) {
m_data->markerLineNumber = lineNumber;
- // FIXME: should we tell gdb about the change?
+ // FIXME: should we tell gdb about the change?
// Ignore it for now, as we would require re-compilation
// and debugger re-start anyway.
if (0 && !m_data->bpLineNumber.isEmpty()) {
@@ -171,10 +171,10 @@ BreakpointData::BreakpointData(BreakHandler *handler)
bpMultiple = false;
//#if defined(Q_OS_MAC)
// // full names do not work on Mac/MI
- useFullPath = false;
+ useFullPath = false;
//#else
// //where = m_manager->shortName(data->fileName);
-// useFullPath = true;
+// useFullPath = true;
//#endif
}
@@ -491,7 +491,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
// str = data->markerFileName;
str = str.isEmpty() ? empty : str;
if (data->useFullPath)
- str = "/.../" + str;
+ str = "/.../" + str;
return str;
}
if (role == Qt::UserRole)
@@ -574,7 +574,7 @@ bool BreakHandler::setData(const QModelIndex &mi, const QVariant &value, int rol
}
return true;
}
- default: {
+ default: {
return false;
}
}
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index 1e499f9a39..f96267182f 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -318,7 +318,7 @@ void BreakWindow::resizeColumnsToContents()
void BreakWindow::setAlwaysResizeColumnsToContents(bool on)
{
m_alwaysResizeColumnsToContents = on;
- QHeaderView::ResizeMode mode = on
+ QHeaderView::ResizeMode mode = on
? QHeaderView::ResizeToContents : QHeaderView::Interactive;
for (int i = model()->columnCount(); --i >= 0; )
header()->setResizeMode(i, mode);
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
index 6ac5997efa..807ec13db7 100644
--- a/src/plugins/debugger/cdb/cdb.pri
+++ b/src/plugins/debugger/cdb/cdb.pri
@@ -1,5 +1,5 @@
# Detect presence of "Debugging Tools For Windows"
-# in case VS compilers are used.
+# in case VS compilers are used.
win32 {
contains(QMAKE_CXX, cl) {
diff --git a/src/plugins/debugger/cdb/cdbbreakpoint.cpp b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
index adc9b16e6b..1711203f21 100644
--- a/src/plugins/debugger/cdb/cdbbreakpoint.cpp
+++ b/src/plugins/debugger/cdb/cdbbreakpoint.cpp
@@ -105,7 +105,7 @@ void CDBBreakPoint::clear()
ignoreCount = 0;
oneShot = false;
enabled = true;
- clearExpressionData();
+ clearExpressionData();
}
void CDBBreakPoint::clearExpressionData()
@@ -516,7 +516,7 @@ bool CDBBreakPoint::synchronizeBreakPoints(CIDebugControl* debugControl,
CIDebugSymbols *syms,
BreakHandler *handler,
QString *errorMessage, QStringList *warnings)
-{
+{
errorMessage->clear();
warnings->clear();
// Do an initial check whether we are in a state that allows
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index ae17ff1ea0..782b5cfd58 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -308,7 +308,7 @@ CdbDebugEnginePrivate::CdbDebugEnginePrivate(DebuggerManager *manager,
m_eventThreadId(-1),
m_interruptArticifialThreadId(-1),
m_ignoreInitialBreakPoint(false),
- m_interrupted(false),
+ m_interrupted(false),
m_watchTimer(-1),
m_debugEventCallBack(engine),
m_engine(engine),
@@ -788,7 +788,7 @@ bool CdbDebugEngine::startDebuggerWithExecutable(DebuggerStartMode sm, QString *
}
void CdbDebugEnginePrivate::processCreatedAttached(ULONG64 processHandle, ULONG64 initialThreadHandle)
-{
+{
m_engine->setState(InferiorRunningRequested, Q_FUNC_INFO, __LINE__);
setDebuggeeHandles(reinterpret_cast<HANDLE>(processHandle), reinterpret_cast<HANDLE>(initialThreadHandle));
ULONG currentThreadId;
@@ -845,7 +845,7 @@ bool CdbDebugEnginePrivate::endInferior(EndInferiorAction action, QString *error
}
bool success = false;
switch (action) {
- case DetachInferior: {
+ case DetachInferior: {
const HRESULT hr = m_cif.debugClient->DetachCurrentProcess();
if (SUCCEEDED(hr)) {
success = true;
@@ -1089,7 +1089,7 @@ bool CdbDebugEngine::step(unsigned long executionStatus)
str << 'p';
break;
case DEBUG_STATUS_STEP_INTO:
- str << 't';
+ str << 't';
break;
case CdbExtendedExecutionStatusStepOut:
str << "gu";
@@ -1126,7 +1126,7 @@ void CdbDebugEngine::nextExec()
}
void CdbDebugEngine::stepIExec()
-{
+{
stepExec(); // Step into by instruction (figured out by step)
}
@@ -1143,7 +1143,7 @@ void CdbDebugEngine::stepOutExec()
void CdbDebugEngine::continueInferior()
{
- QString errorMessage;
+ QString errorMessage;
if (!m_d->continueInferior(&errorMessage))
warning(msgFunctionFailed(Q_FUNC_INFO, errorMessage));
}
@@ -1381,7 +1381,7 @@ void CdbDebugEngine::activateFrame(int frameIndex)
QString errorMessage;
bool success = false;
StackHandler *stackHandler = manager()->stackHandler();
- do {
+ do {
WatchHandler *watchHandler = manager()->watchHandler();
const int oldIndex = stackHandler->currentIndex();
if (frameIndex >= stackHandler->stackSize()) {
@@ -1493,7 +1493,7 @@ void CdbDebugEngine::fetchDisassembler(DisassemblerViewAgent *agent,
bool ok = false;
QString errorMessage;
do {
- // get address
+ // get address
QString address;
if (!frame.file.isEmpty())
address = frame.address;
@@ -1780,7 +1780,7 @@ bool CdbDebugEnginePrivate::setCDBThreadId(unsigned long threadId, QString *erro
return false;
}
const QString msg = CdbDebugEngine::tr("Changing threads: %1 -> %2").arg(currentThreadId).arg(threadId);
- m_engine->showStatusMessage(msg, 500);
+ m_engine->showStatusMessage(msg, 500);
return true;
}
@@ -1855,7 +1855,7 @@ void CdbDebugEnginePrivate::updateStackTrace()
break;
}
// Visibly warn the users about missing top frames/all frames, as they otherwise
- // might think stepping is broken.
+ // might think stepping is broken.
if (!stackFrames.at(0).isUsable()) {
const QString topFunction = count ? stackFrames.at(0).function : QString();
const QString msg = current >= 0 ?
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.h b/src/plugins/debugger/cdb/cdbdebugengine.h
index 077faf4e14..7f5210332a 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine.h
@@ -73,8 +73,8 @@ public:
virtual void nextExec();
virtual void stepIExec();
virtual void nextIExec();
-
- virtual void continueInferior();
+
+ virtual void continueInferior();
virtual void interruptInferior();
virtual void runToLineExec(const QString &fileName, int lineNumber);
@@ -110,7 +110,7 @@ protected:
private slots:
void slotConsoleStubStarted();
void slotConsoleStubError(const QString &msg);
- void slotConsoleStubTerminated();
+ void slotConsoleStubTerminated();
void warning(const QString &w);
private:
diff --git a/src/plugins/debugger/cdb/cdbdebugengine_p.h b/src/plugins/debugger/cdb/cdbdebugengine_p.h
index 89a7fa15f7..2c5fefad95 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine_p.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine_p.h
@@ -157,7 +157,7 @@ struct CdbDebugEnginePrivate
const QSharedPointer<CdbOptions> m_options;
HANDLE m_hDebuggeeProcess;
HANDLE m_hDebuggeeThread;
- bool m_interrupted;
+ bool m_interrupted;
int m_currentThreadId;
int m_eventThreadId;
int m_interruptArticifialThreadId;
@@ -167,7 +167,7 @@ struct CdbDebugEnginePrivate
int m_watchTimer;
CdbComInterfaces m_cif;
CdbDebugEventCallback m_debugEventCallBack;
- CdbDebugOutput m_debugOutputCallBack;
+ CdbDebugOutput m_debugOutputCallBack;
QSharedPointer<CdbDumperHelper> m_dumper;
QString m_baseImagePath;
diff --git a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
index 26c24b2058..07df1708d7 100644
--- a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
@@ -121,7 +121,7 @@ STDMETHODIMP CdbDebugEventCallbackBase::CreateProcess(
__in ULONG64 /* ThreadDataOffset */,
__in ULONG64 /* StartOffset */
)
-{
+{
return S_OK;
}
@@ -143,7 +143,7 @@ STDMETHODIMP CdbDebugEventCallbackBase::LoadModule(
__in ULONG /* CheckSum */,
__in ULONG /* TimeDateStamp */
)
-{
+{
return S_OK;
}
@@ -196,7 +196,7 @@ STDMETHODIMP CdbDebugEventCallbackBase::ChangeSymbolState(
__in ULONG /* Flags */,
__in ULONG64 /* Argument */
)
-{
+{
return S_OK;
}
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index 2ebac2710f..ffd7a3a860 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -331,7 +331,7 @@ void CdbDumperInitThread ::run()
case CdbDumperHelper::Loaded: // Injection load succeeded, ideally
break;
}
- // Perform remaining initialization
+ // Perform remaining initialization
emit statusMessage(QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "Initializing dumpers..."), 60000);
m_ok = m_helper.initResolveSymbols(m_errorMessage) && m_helper.initKnownTypes(m_errorMessage);
}
@@ -656,7 +656,7 @@ CdbDumperHelper::DumpResult CdbDumperHelper::dumpTypeI(const WatchData &wd, bool
{
errorMessage->clear();
// Check failure cache and supported types
- if (m_state == Disabled) {
+ if (m_state == Disabled) {
*errorMessage =m_msgDisabled;
return DumpNotHandled;
}
diff --git a/src/plugins/debugger/cdb/cdbexceptionutils.cpp b/src/plugins/debugger/cdb/cdbexceptionutils.cpp
index 2c9b49d413..c73d81ad42 100644
--- a/src/plugins/debugger/cdb/cdbexceptionutils.cpp
+++ b/src/plugins/debugger/cdb/cdbexceptionutils.cpp
@@ -85,7 +85,7 @@ ExceptionBlocker::ExceptionBlocker(CIDebugControl *ctrl, ULONG code, Mode m) :
{
// Retrieve current state
memset(&m_oldParameters, 0, sizeof(DEBUG_EXCEPTION_FILTER_PARAMETERS));
- if (getExceptionParameters(ctrl, code, &m_oldParameters, &m_errorString)) {
+ if (getExceptionParameters(ctrl, code, &m_oldParameters, &m_errorString)) {
// Are we in a nested instantiation?
const ULONG desiredExOption = m == IgnoreException ? DEBUG_FILTER_IGNORE : DEBUG_FILTER_OUTPUT;
const bool isAlreadyBlocked = m_oldParameters.ExecutionOption == desiredExOption
diff --git a/src/plugins/debugger/cdb/cdbmodules.cpp b/src/plugins/debugger/cdb/cdbmodules.cpp
index fd2653cc93..6fd4a22b52 100644
--- a/src/plugins/debugger/cdb/cdbmodules.cpp
+++ b/src/plugins/debugger/cdb/cdbmodules.cpp
@@ -64,7 +64,7 @@ bool getModuleNameList(CIDebugSymbols *syms, QStringList *modules, QString *erro
}
bool getModuleList(CIDebugSymbols *syms, QList<Module> *modules, QString *errorMessage)
-{
+{
ULONG count;
modules->clear();
if (!getModuleCount(syms, &count, errorMessage))
@@ -105,7 +105,7 @@ bool getModuleList(CIDebugSymbols *syms, QList<Module> *modules, QString *errorM
bool searchSymbols(CIDebugSymbols *syms, const QString &pattern,
QStringList *matches, QString *errorMessage)
{
- matches->clear();
+ matches->clear();
ULONG64 handle = 0;
// E_NOINTERFACE means "no match". Apparently, it does not always
// set handle.
diff --git a/src/plugins/debugger/cdb/cdbstackframecontext.cpp b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
index f64f0366a1..af5446dc38 100644
--- a/src/plugins/debugger/cdb/cdbstackframecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstackframecontext.cpp
@@ -130,7 +130,7 @@ WatchHandleDumperInserter::WatchHandleDumperInserter(WatchHandler *wh,
// Prevent recursion of the model by setting value and type
static inline bool fixDumperType(WatchData *wd, const WatchData *source = 0)
-{
+{
const bool missing = wd->isTypeNeeded() || wd->type.isEmpty();
if (missing) {
static const QString unknownType = QCoreApplication::translate("CdbStackFrameContext", "<Unknown Type>");
diff --git a/src/plugins/debugger/cdb/cdbstackframecontext.h b/src/plugins/debugger/cdb/cdbstackframecontext.h
index 61f77a91a4..99f1464f02 100644
--- a/src/plugins/debugger/cdb/cdbstackframecontext.h
+++ b/src/plugins/debugger/cdb/cdbstackframecontext.h
@@ -54,7 +54,7 @@ public:
explicit CdbStackFrameContext(const QSharedPointer<CdbDumperHelper> &dumper,
CdbSymbolGroupContext *symbolContext);
- ~CdbStackFrameContext();
+ ~CdbStackFrameContext();
bool assignValue(const QString &iname, const QString &value,
QString *newValue /* = 0 */, QString *errorMessage);
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
index e0c4ba0c79..56ff1f7de1 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
@@ -58,7 +58,7 @@ CdbStackTraceContext::CdbStackTraceContext(const QSharedPointer<CdbDumperHelper>
CdbStackTraceContext *CdbStackTraceContext::create(const QSharedPointer<CdbDumperHelper> &dumper,
unsigned long threadId,
QString *errorMessage)
-{
+{
if (debugCDB)
qDebug() << Q_FUNC_INFO << threadId;
// fill the DEBUG_STACK_FRAME array
@@ -124,7 +124,7 @@ bool CdbStackTraceContext::init(unsigned long frameCount, QString * /*errorMessa
}
int CdbStackTraceContext::indexOf(const QString &function) const
-{
+{
const QChar exclamationMark = QLatin1Char('!');
const int count = m_frames.size();
@@ -168,9 +168,9 @@ CdbStackFrameContext *CdbStackTraceContext::frameContextAt(int index, QString *e
*errorMessage = msgFrameContextFailed(index, m_frames.at(index), *errorMessage);
return 0;
}
- // Exclude unitialized variables if desired
+ // Exclude unitialized variables if desired
QStringList uninitializedVariables;
- if (theDebuggerAction(UseCodeModel)->isChecked()) {
+ if (theDebuggerAction(UseCodeModel)->isChecked()) {
const StackFrame &frame = m_frames.at(index);
getUninitializedVariables(DebuggerManager::instance()->cppCodeModelSnapshot(), frame.function, frame.file, frame.line, &uninitializedVariables);
}
@@ -267,7 +267,7 @@ static inline bool getStoppedThreadState(const CdbComInterfaces &cif,
}
ULONG frameCount;
// Ignore the top frame if it is "ntdll!KiFastSystemCallRet", which is
- // not interesting for display.
+ // not interesting for display.
DEBUG_STACK_FRAME frames[MaxFrames];
hr = cif.debugControl->GetStackTrace(0, 0, 0, frames, MaxFrames, &frameCount);
if (FAILED(hr)) {
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.h b/src/plugins/debugger/cdb/cdbstacktracecontext.h
index ac9cb030b0..17fd77c272 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.h
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.h
@@ -55,7 +55,7 @@ struct ThreadData;
* Maintains an on-demand constructed list of CdbStackFrameContext
* containining the local variables of the stack. */
-class CdbStackTraceContext
+class CdbStackTraceContext
{
Q_DISABLE_COPY(CdbStackTraceContext)
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
index 72f7a59e84..b4fdab8150 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.cpp
@@ -411,7 +411,7 @@ static bool inline getUnsignedHexValue(QString stringValue, quint64 *value)
return false;
stringValue.remove(0, 2);
// Remove 64bit separator
- if (stringValue.size() > 9) {
+ if (stringValue.size() > 9) {
const int sepPos = stringValue.size() - 9;
if (stringValue.at(sepPos) == QLatin1Char('`'))
stringValue.remove(sepPos, 1);
@@ -487,8 +487,8 @@ WatchData CdbSymbolGroupContext::watchDataAt(unsigned long index) const
const QString fullShadowedName = WatchData::shadowedName(name, shadowedNumber);
wd.name = WatchData::shadowedName(removeInnerTemplateType(name), shadowedNumber);
wd.addr = hexSymbolOffset(m_symbolGroup, index);
- const QString type = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);
- wd.setType(type);
+ const QString type = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);
+ wd.setType(type);
// Check for unitialized variables at level 0 only.
const DEBUG_SYMBOL_PARAMETERS &p = m_symbolParameters.at(index);
if (p.ParentSymbol == DEBUG_ANY_ID && m_uninitializedVariables.contains(fullShadowedName)) {
diff --git a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
index 2db042423f..0ec5e349ec 100644
--- a/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
+++ b/src/plugins/debugger/cdb/cdbsymbolgroupcontext.h
@@ -74,7 +74,7 @@ class CdbSymbolGroupContext
public:
~CdbSymbolGroupContext();
- static CdbSymbolGroupContext *create(const QString &prefix,
+ static CdbSymbolGroupContext *create(const QString &prefix,
CIDebugSymbolGroup *symbolGroup,
const QStringList &uninitializedVariables,
QString *errorMessage);
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index da2dd21175..ae9f94bdce 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -77,7 +77,7 @@ FORMS += attachexternaldialog.ui \
startexternaldialog.ui \
startremotedialog.ui
RESOURCES += debugger.qrc
-false {
+false {
SOURCES += $$PWD/modeltest.cpp
HEADERS += $$PWD/modeltest.h
DEFINES += USE_MODEL_TEST=1
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index c57118e960..f6e0db8046 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -60,7 +60,7 @@ DebuggerSettings::~DebuggerSettings()
{
qDeleteAll(m_items);
}
-
+
void DebuggerSettings::insertItem(int code, SavedAction *item)
{
QTC_ASSERT(!m_items.contains(code),
@@ -81,7 +81,7 @@ void DebuggerSettings::writeSettings(QSettings *settings) const
foreach (SavedAction *item, m_items)
item->writeSettings(settings);
}
-
+
SavedAction *DebuggerSettings::item(int code) const
{
QTC_ASSERT(m_items.value(code, 0), qDebug() << "CODE: " << code; return 0);
diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h
index bcb23b175f..2ba34ee502 100644
--- a/src/plugins/debugger/debuggeractions.h
+++ b/src/plugins/debugger/debuggeractions.h
@@ -60,7 +60,7 @@ public slots:
void writeSettings(QSettings *settings) const;
private:
- QHash<int, Utils::SavedAction *> m_items;
+ QHash<int, Utils::SavedAction *> m_items;
};
@@ -87,7 +87,7 @@ enum DebuggerActionCode
DebugDebuggingHelpers,
UseCodeModel,
-
+
UseToolTipsInMainEditor,
UseToolTipsInLocalsView,
UseToolTipsInBreakpointsView,
diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp
index ed2d161575..55f2326743 100644
--- a/src/plugins/debugger/debuggeragents.cpp
+++ b/src/plugins/debugger/debuggeragents.cpp
@@ -76,7 +76,7 @@ MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, quint64 addr)
}
MemoryViewAgent::MemoryViewAgent(DebuggerManager *manager, const QString &addr)
- : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager)
+ : QObject(manager), m_engine(manager->currentEngine()), m_manager(manager)
{
bool ok = true;
init(addr.toULongLong(&ok, 0));
@@ -242,7 +242,7 @@ void DisassemblerViewAgent::setFrame(const StackFrame &frame)
setContents(*it);
return;
}
- }
+ }
IDebuggerEngine *engine = d->manager->currentEngine();
QTC_ASSERT(engine, return);
engine->fetchDisassembler(this, frame);
@@ -296,7 +296,7 @@ void DisassemblerViewAgent::setContents(const QString &contents)
bool DisassemblerViewAgent::contentsCoversAddress(const QString &contents) const
{
QTC_ASSERT(d, return false);
- for (int pos = 0, line = 0; ; ++line, ++pos) {
+ for (int pos = 0, line = 0; ; ++line, ++pos) {
if (contents.midRef(pos, d->frame.address.size()) == d->frame.address)
return true;
pos = contents.indexOf('\n', pos + 1);
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 6640b4033d..d9c3f30901 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -116,7 +116,7 @@ enum LogChannel
LogStatus, // Used for status changed messages
LogTime, // Used for time stamp messages
LogDebug,
- LogMisc
+ LogMisc
};
} // namespace Debugger
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 204be58845..7cc5f2d779 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -388,9 +388,9 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent)
m_ui->serverStartScript->setExpectedKind(Utils::PathChooser::File);
m_ui->serverStartScript->setPromptDialogTitle(tr("Select Executable"));
- connect(m_ui->useServerStartScriptCheckBox, SIGNAL(toggled(bool)),
+ connect(m_ui->useServerStartScriptCheckBox, SIGNAL(toggled(bool)),
this, SLOT(updateState()));
-
+
connect(m_ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(m_ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 9a836aa899..08474b8d0f 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -664,7 +664,7 @@ void DebuggerManager::setSimpleDockWidgetArrangement()
}
foreach (QDockWidget *dockWidget, dockWidgets) {
- if (dockWidget == d->m_outputDock)
+ if (dockWidget == d->m_outputDock)
d->m_mainWindow->addDockWidget(Qt::TopDockWidgetArea, dockWidget);
else
d->m_mainWindow->addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
@@ -990,7 +990,7 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
d->m_startParameters->toolChainType, &errorMessage);
break;
default:
- d->m_engine = determineDebuggerEngine(d->m_startParameters->executable,
+ d->m_engine = determineDebuggerEngine(d->m_startParameters->executable,
d->m_startParameters->toolChainType, &errorMessage, &settingsIdHint);
break;
}
@@ -1427,7 +1427,7 @@ void DebuggerManager::showDebuggerInput(int channel, const QString &msg)
{
if (d->m_outputWindow)
emit emitShowInput(channel, msg);
- else
+ else
qDebug() << "INPUT: " << channel << msg;
}
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 045d99fe29..ddaf38d96d 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -137,8 +137,8 @@ enum DebuggerEngineTypeFlags
ScriptEngineType = 0x02,
CdbEngineType = 0x04,
AllEngineTypes = GdbEngineType
- | ScriptEngineType
- | CdbEngineType
+ | ScriptEngineType
+ | CdbEngineType
};
QDebug operator<<(QDebug d, DebuggerState state);
@@ -280,7 +280,7 @@ private:
Internal::ThreadsHandler *threadsHandler() const;
Internal::WatchHandler *watchHandler() const;
Internal::SourceFilesWindow *sourceFileWindow() const;
- QWidget *threadsWindow() const;
+ QWidget *threadsWindow() const;
Internal::DebuggerManagerActions debuggerManagerActions() const;
diff --git a/src/plugins/debugger/debuggeroutputwindow.h b/src/plugins/debugger/debuggeroutputwindow.h
index c67719a4bd..696d5454fb 100644
--- a/src/plugins/debugger/debuggeroutputwindow.h
+++ b/src/plugins/debugger/debuggeroutputwindow.h
@@ -53,7 +53,7 @@ public:
void bringPaneToForeground() { emit showPage(); }
void setCursor(const QCursor &cursor);
-
+
QString combinedContents() const;
QString inputContents() const;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 753fc4e48b..70157665f5 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -348,16 +348,16 @@ QWidget *CommonOptionsPage::createPage(QWidget *parent)
m_ui.checkBoxUseMessageBoxForSignals);
m_group.insert(theDebuggerAction(SkipKnownFrames),
m_ui.checkBoxSkipKnownFrames);
- m_group.insert(theDebuggerAction(UseToolTipsInMainEditor),
+ m_group.insert(theDebuggerAction(UseToolTipsInMainEditor),
m_ui.checkBoxUseToolTipsInMainEditor);
m_group.insert(theDebuggerAction(AutoDerefPointers), 0);
m_group.insert(theDebuggerAction(UseToolTipsInLocalsView), 0);
m_group.insert(theDebuggerAction(UseToolTipsInBreakpointsView), 0);
m_group.insert(theDebuggerAction(UseAddressInBreakpointsView), 0);
m_group.insert(theDebuggerAction(UseAddressInStackView), 0);
- m_group.insert(theDebuggerAction(EnableReverseDebugging),
+ m_group.insert(theDebuggerAction(EnableReverseDebugging),
m_ui.checkBoxEnableReverseDebugging);
- m_group.insert(theDebuggerAction(MaximalStackDepth),
+ m_group.insert(theDebuggerAction(MaximalStackDepth),
m_ui.spinBoxMaximalStackDepth);
m_group.insert(theDebuggerAction(GdbWatchdogTimeout), 0);
m_group.insert(theDebuggerAction(LogTimeStamps), 0);
diff --git a/src/plugins/debugger/debuggertooltip.cpp b/src/plugins/debugger/debuggertooltip.cpp
index c26ba6a727..2ec8d86b40 100644
--- a/src/plugins/debugger/debuggertooltip.cpp
+++ b/src/plugins/debugger/debuggertooltip.cpp
@@ -125,7 +125,7 @@ int ToolTipWidget::computeHeight(const QModelIndex &index) const
return s;
}
-Q_SLOT void ToolTipWidget::computeSize()
+Q_SLOT void ToolTipWidget::computeSize()
{
int columns = 0;
for (int i = 0; i < 3; ++i) {
diff --git a/src/plugins/debugger/gdb/abstractgdbadapter.h b/src/plugins/debugger/gdb/abstractgdbadapter.h
index 8685e98a81..c36be54684 100644
--- a/src/plugins/debugger/gdb/abstractgdbadapter.h
+++ b/src/plugins/debugger/gdb/abstractgdbadapter.h
@@ -92,7 +92,7 @@ signals:
// The adapter is still running just fine, but it failed to acquire a debuggee.
void inferiorStartFailed(const QString &msg);
-
+
protected:
DebuggerState state() const
{ return m_engine->state(); }
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index eaa4c6fd9b..916e43b90c 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -213,7 +213,7 @@ void GdbEngine::connectDebuggingHelperActions()
connect(theDebuggerAction(RecheckDebuggingHelpers), SIGNAL(triggered()),
this, SLOT(recheckDebuggingHelperAvailability()));
}
-
+
void GdbEngine::disconnectDebuggingHelperActions()
{
disconnect(theDebuggerAction(UseDebuggingHelpers), 0, this, 0);
@@ -412,8 +412,8 @@ void GdbEngine::handleResponse(const QByteArray &buff)
while (from != to) {
GdbMi data;
if (*from != ',') {
- // happens on archer where we get
- // 23^running <NL> *running,thread-id="all" <NL> (gdb)
+ // happens on archer where we get
+ // 23^running <NL> *running,thread-id="all" <NL> (gdb)
result.m_type = GdbMi::Tuple;
break;
}
@@ -448,22 +448,22 @@ void GdbEngine::handleResponse(const QByteArray &buff)
showStatusMessage(tr("Library %1 unloaded.").arg(_(id)));
invalidateSourcesList();
} else if (asyncClass == "thread-group-created") {
- // Archer has "{id="28902"}"
+ // Archer has "{id="28902"}"
QByteArray id = result.findChild("id").data();
showStatusMessage(tr("Thread group %1 created.").arg(_(id)));
int pid = id.toInt();
if (pid != inferiorPid())
handleInferiorPidChanged(pid);
} else if (asyncClass == "thread-created") {
- //"{id="1",group-id="28902"}"
+ //"{id="1",group-id="28902"}"
QByteArray id = result.findChild("id").data();
showStatusMessage(tr("Thread %1 created.").arg(_(id)));
} else if (asyncClass == "thread-group-exited") {
- // Archer has "{id="28902"}"
+ // Archer has "{id="28902"}"
QByteArray id = result.findChild("id").data();
showStatusMessage(tr("Thread group %1 exited.").arg(_(id)));
} else if (asyncClass == "thread-exited") {
- //"{id="1",group-id="28902"}"
+ //"{id="1",group-id="28902"}"
QByteArray id = result.findChild("id").data();
QByteArray groupid = result.findChild("group-id").data();
showStatusMessage(tr("Thread %1 in group %2 exited.")
@@ -471,7 +471,7 @@ void GdbEngine::handleResponse(const QByteArray &buff)
} else if (asyncClass == "thread-selected") {
QByteArray id = result.findChild("id").data();
showStatusMessage(tr("Thread %1 selected.").arg(_(id)));
- //"{id="2"}"
+ //"{id="2"}"
#if defined(Q_OS_MAC)
} else if (asyncClass == "shlibs-updated") {
// MAC announces updated libs
@@ -615,7 +615,7 @@ void GdbEngine::readGdbStandardError()
void GdbEngine::readGdbStandardOutput()
{
- if (m_commandTimer->isActive())
+ if (m_commandTimer->isActive())
m_commandTimer->start(); // Retrigger
int newstart = 0;
@@ -682,7 +682,7 @@ void GdbEngine::maybeHandleInferiorPidChanged(const QString &pid0)
}
if (pid == inferiorPid())
return;
- debugMessage(_("FOUND PID %1").arg(pid));
+ debugMessage(_("FOUND PID %1").arg(pid));
handleInferiorPidChanged(pid);
if (m_dumperInjectionLoad)
@@ -841,7 +841,7 @@ void GdbEngine::commandTimeout()
"the operation.\nYou can choose between waiting "
"longer or abort debugging.").arg(timeOut / 1000);
QMessageBox *mb = showMessageBox(QMessageBox::Critical,
- tr("Gdb not responding"), msg,
+ tr("Gdb not responding"), msg,
QMessageBox::Ok | QMessageBox::Cancel);
mb->button(QMessageBox::Cancel)->setText(tr("Give gdb more time"));
mb->button(QMessageBox::Ok)->setText(tr("Stop debugging"));
@@ -885,7 +885,7 @@ void GdbEngine::handleResultRecord(GdbResponse *response)
tr("Executable failed"), QString::fromLocal8Bit(msg));
showStatusMessage(tr("Process failed to start."));
shutdown();
- } else if (msg == "\"finish\" not meaningful in the outermost frame.") {
+ } else if (msg == "\"finish\" not meaningful in the outermost frame.") {
// Handle a case known to appear on gdb 6.4 symbianelf when
// the stack is cut due to access to protected memory.
debugMessage(_("APPLYING WORKAROUND #2"));
@@ -1011,7 +1011,7 @@ void GdbEngine::updateAll()
if (supportsThreads())
postCommand(_("-thread-list-ids"), WatchUpdate, CB(handleStackListThreads), 0);
manager()->reloadRegisters();
- updateLocals();
+ updateLocals();
}
void GdbEngine::handleQuerySources(const GdbResponse &response)
@@ -1576,7 +1576,7 @@ void GdbEngine::detachDebugger()
{
QTC_ASSERT(state() == InferiorStopped, /**/);
QTC_ASSERT(startMode() != AttachCore, /**/);
- postCommand(_("detach"));
+ postCommand(_("detach"));
setState(InferiorShuttingDown);
setState(InferiorShutDown);
shutdown();
@@ -1642,7 +1642,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter(const DebuggerStartParametersPtr &s
void GdbEngine::startDebugger(const DebuggerStartParametersPtr &sp)
{
QTC_ASSERT(state() == EngineStarting, qDebug() << state());
- // This should be set by the constructor or in exitDebugger()
+ // This should be set by the constructor or in exitDebugger()
// via initializeVariables()
//QTC_ASSERT(m_debuggingHelperState == DebuggingHelperUninitialized,
// initializeVariables());
@@ -1947,7 +1947,7 @@ void GdbEngine::sendInsertBreakpoint(int index)
void GdbEngine::reloadBreakListInternal()
{
- m_breakListUpdating = true;
+ m_breakListUpdating = true;
postCommand(_("-break-list"), NeedsStop, CB(handleBreakList));
}
@@ -2416,7 +2416,7 @@ void GdbEngine::handleStackSelectThread(const GdbResponse &)
showStatusMessage(tr("Retrieving data for stack view..."), 3000);
manager()->reloadRegisters();
reloadStack(true);
- updateLocals();
+ updateLocals();
}
void GdbEngine::reloadFullStack()
@@ -2512,7 +2512,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
targetFrame = i;
}
- bool canExpand = !cookie.isFull
+ bool canExpand = !cookie.isFull
&& (n >= theDebuggerAction(MaximalStackDepth)->value().toInt());
theDebuggerAction(ExpandStack)->setEnabled(canExpand);
manager()->stackHandler()->setFrames(stackFrames, canExpand);
@@ -2538,7 +2538,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
// For targetFrame == 0 we already issued a 'gotoLocation'
// when reading the *stopped message.
bool jump = (m_isMacGdb || targetFrame != 0);
-
+
manager()->stackHandler()->setCurrentIndex(targetFrame);
if (jump || cookie.gotoLocation) {
const StackFrame &frame = manager()->stackHandler()->currentFrame();
@@ -2956,7 +2956,7 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
data.setValue(_("<unavailable>"));
data.setHasChildren(false);
insertData(data);
- return;
+ return;
}
m_processedNames.insert(processedName);
@@ -3053,7 +3053,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
#if DEBUG_SUBITEM
qDebug() << "IT'S A POINTER";
#endif
-
+
if (theDebuggerBoolSetting(AutoDerefPointers)) {
// Try automatic dereferentiation
data.exp = _("(*(") + data.exp + _("))");
@@ -3196,7 +3196,7 @@ void GdbEngine::updateWatchData(const WatchData &data)
data1.setValue(_("<unavailable>"));
data1.setHasChildren(false);
insertData(data1);
- return;
+ return;
}
m_processedNames.insert(processedName);
@@ -3640,7 +3640,7 @@ void GdbEngine::handleStackFrame(const GdbResponse &response)
}
GdbMi all("[" + out + "]");
//GdbMi all(out);
-
+
//qDebug() << "\n\n\nALL: " << all.toString() << "\n";
GdbMi locals = all.findChild("locals");
//qDebug() << "\n\n\nLOCALS: " << locals.toString() << "\n";
@@ -3770,10 +3770,10 @@ WatchData GdbEngine::localVariable(const GdbMi &item,
data.setError(WatchData::msgNotInScope());
return data;
}
- //: Type of local variable or parameter shadowed by another
+ //: Type of local variable or parameter shadowed by another
//: variable of the same name in a nested block.
setWatchDataValue(data, item.findChild("value"));
- data.setType(GdbEngine::tr("<shadowed>"));
+ data.setType(GdbEngine::tr("<shadowed>"));
data.setHasChildren(false);
return data;
}
@@ -4030,7 +4030,7 @@ void GdbEngine::tryLoadDebuggingHelpers()
// Load at least gdb macro based dumpers.
QFile file(_(":/gdb/gdbmacros.txt"));
file.open(QIODevice::ReadOnly);
- QByteArray contents = file.readAll();
+ QByteArray contents = file.readAll();
m_debuggingHelperState = DebuggingHelperLoadTried;
postCommand(_(contents));
return;
@@ -4206,7 +4206,7 @@ void GdbEngine::fetchDisassemblerByAddress(DisassemblerViewAgent *agent,
QString end = QString::number(address + 100, 16);
// -data-disassemble [ -s start-addr -e end-addr ]
// | [ -f filename -l linenum [ -n lines ] ] -- mode
- if (useMixedMode)
+ if (useMixedMode)
postCommand(_("-data-disassemble -s 0x%1 -e 0x%2 -- 1").arg(start).arg(end),
Discardable, CB(handleFetchDisassemblerByAddress1),
QVariant::fromValue(DisassemblerAgentCookie(agent)));
@@ -4266,7 +4266,7 @@ QString GdbEngine::parseDisassembler(const GdbMi &lines)
if (line >= 0 && line < fileContents.size())
ba += " " + fileContents.at(line) + '\n';
GdbMi insn = child.findChild("line_asm_insn");
- foreach (const GdbMi &line, insn.children())
+ foreach (const GdbMi &line, insn.children())
ba += parseLine(line);
} else {
// the non-mixed version
@@ -4468,7 +4468,7 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
}
}
if (m_gdbAdapter->dumperHandling() == AbstractGdbAdapter::DumperLoadedByGdbPreload
- && checkDebuggingHelpers()) {
+ && checkDebuggingHelpers()) {
QString cmd = _("set environment ");
cmd += _(Debugger::Constants::Internal::LD_PRELOAD_ENV_VAR);
cmd += _c(' ');
diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp
index ffac5d76d1..60377aa60c 100644
--- a/src/plugins/debugger/gdb/gdbmi.cpp
+++ b/src/plugins/debugger/gdb/gdbmi.cpp
@@ -306,7 +306,7 @@ QByteArray GdbMi::toString(bool multiline, int indent) const
else
result += "Invalid";
break;
- case Const:
+ case Const:
if (!m_name.isEmpty())
result += m_name + "=";
result += "\"" + escapeCString(m_data) + "\"";
diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h
index 24295afea6..54ad204b60 100644
--- a/src/plugins/debugger/gdb/gdbmi.h
+++ b/src/plugins/debugger/gdb/gdbmi.h
@@ -39,50 +39,50 @@ namespace Internal {
/*
-output ==>
- ( out-of-band-record )* [ result-record ] "(gdb)" nl
-result-record ==>
- [ token ] "^" result-class ( "," result )* nl
-out-of-band-record ==>
- async-record | stream-record
-async-record ==>
- exec-async-output | status-async-output | notify-async-output
-exec-async-output ==>
- [ token ] "*" async-output
-status-async-output ==>
- [ token ] "+" async-output
-notify-async-output ==>
- [ token ] "=" async-output
-async-output ==>
- async-class ( "," result )* nl
-result-class ==>
- "done" | "running" | "connected" | "error" | "exit"
-async-class ==>
- "stopped" | others (where others will be added depending on the needs--this is still in development).
-result ==>
- variable "=" value
-variable ==>
- string
-value ==>
- const | tuple | list
-const ==>
- c-string
-tuple ==>
- "{}" | "{" result ( "," result )* "}"
-list ==>
- "[]" | "[" value ( "," value )* "]" | "[" result ( "," result )* "]"
-stream-record ==>
- console-stream-output | target-stream-output | log-stream-output
-console-stream-output ==>
- "~" c-string
-target-stream-output ==>
- "@" c-string
-log-stream-output ==>
- "&" c-string
-nl ==>
- CR | CR-LF
-token ==>
- any sequence of digits.
+output ==>
+ ( out-of-band-record )* [ result-record ] "(gdb)" nl
+result-record ==>
+ [ token ] "^" result-class ( "," result )* nl
+out-of-band-record ==>
+ async-record | stream-record
+async-record ==>
+ exec-async-output | status-async-output | notify-async-output
+exec-async-output ==>
+ [ token ] "*" async-output
+status-async-output ==>
+ [ token ] "+" async-output
+notify-async-output ==>
+ [ token ] "=" async-output
+async-output ==>
+ async-class ( "," result )* nl
+result-class ==>
+ "done" | "running" | "connected" | "error" | "exit"
+async-class ==>
+ "stopped" | others (where others will be added depending on the needs--this is still in development).
+result ==>
+ variable "=" value
+variable ==>
+ string
+value ==>
+ const | tuple | list
+const ==>
+ c-string
+tuple ==>
+ "{}" | "{" result ( "," result )* "}"
+list ==>
+ "[]" | "[" value ( "," value )* "]" | "[" result ( "," result )* "]"
+stream-record ==>
+ console-stream-output | target-stream-output | log-stream-output
+console-stream-output ==>
+ "~" c-string
+target-stream-output ==>
+ "@" c-string
+log-stream-output ==>
+ "&" c-string
+nl ==>
+ CR | CR-LF
+token ==>
+ any sequence of digits.
*/
@@ -120,7 +120,7 @@ public:
inline const QList<GdbMi> &children() const { return m_children; }
inline int childCount() const { return m_children.size(); }
- const GdbMi &childAt(int index) const { return m_children[index]; }
+ const GdbMi &childAt(int index) const { return m_children[index]; }
GdbMi &childAt(int index) { return m_children[index]; }
GdbMi findChild(const char *name) const;
@@ -146,7 +146,7 @@ private:
enum GdbResultClass
{
- // "done" | "running" | "connected" | "error" | "exit"
+ // "done" | "running" | "connected" | "error" | "exit"
GdbResultUnknown,
GdbResultDone,
GdbResultRunning,
diff --git a/src/plugins/debugger/gdb/gdboptionspage.cpp b/src/plugins/debugger/gdb/gdboptionspage.cpp
index cc740e1d06..53edb4b227 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.cpp
+++ b/src/plugins/debugger/gdb/gdboptionspage.cpp
@@ -79,9 +79,9 @@ QWidget *GdbOptionsPage::createPage(QWidget *parent)
m_ui.scriptFileChooser);
m_group.insert(theDebuggerAction(GdbEnvironment),
m_ui.environmentEdit);
- m_group.insert(theDebuggerAction(UsePreciseBreakpoints),
+ m_group.insert(theDebuggerAction(UsePreciseBreakpoints),
m_ui.checkBoxUsePreciseBreakpoints);
- m_group.insert(theDebuggerAction(GdbWatchdogTimeout),
+ m_group.insert(theDebuggerAction(GdbWatchdogTimeout),
m_ui.spinBoxGdbWatchdogTimeout);
diff --git a/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h b/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h
index 234afa2c2c..1fbf16a9c8 100644
--- a/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h
+++ b/src/plugins/debugger/gdb/s60debuggerbluetoothstarter.h
@@ -43,7 +43,7 @@ namespace Internal {
* Provides a static convenience to prompt for both connection types. */
class S60DebuggerBluetoothStarter : public trk::AbstractBluetoothStarter
-{
+{
public:
static trk::PromptStartCommunicationResult
startCommunication(const TrkDevicePtr &trkDevice,
@@ -52,7 +52,7 @@ public:
QWidget *msgBoxParent,
QString *errorMessage);
-protected:
+protected:
virtual trk::BluetoothListener *createListener();
private:
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.cpp b/src/plugins/debugger/gdb/trkgdbadapter.cpp
index debfc55494..c42a065385 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/trkgdbadapter.cpp
@@ -155,7 +155,7 @@ void Snapshot::insertMemory(const MemoryRange &range, const QByteArray &ba)
{
QTC_ASSERT(range.size() == uint(ba.size()),
qDebug() << "RANGE: " << range << " BA SIZE: " << ba.size(); return);
-
+
MEMORY_DEBUG("INSERT: " << range);
// Try to combine with existing chunk.
Snapshot::Memory::iterator it = memory.begin();
@@ -660,7 +660,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
// Kill inferior process
logMessage(msgGdbPacket(QLatin1String("kill")));
sendTrkMessage(0x41, TrkCB(handleDeleteProcess),
- trkDeleteProcessMessage(), "Delete process");
+ trkDeleteProcessMessage(), "Delete process");
}
else if (cmd.startsWith("m")) {
@@ -924,7 +924,7 @@ i */
if (data.startsWith("auxv:read::")) {
const int offsetPos = data.lastIndexOf(':') + 1;
const int commaPos = data.lastIndexOf(',');
- if (commaPos != -1) {
+ if (commaPos != -1) {
bool ok1 = false, ok2 = false;
const int offset = data.mid(offsetPos, commaPos - offsetPos)
.toUInt(&ok1, 16);
@@ -1176,7 +1176,7 @@ void TrkGdbAdapter::handleReadRegisters(const TrkResult &result)
const char *data = result.data.data() + 1; // Skip ok byte
for (int i = 0; i < RegisterCount; ++i)
m_snapshot.registers[i] = extractInt(data + 4 * i);
-}
+}
void TrkGdbAdapter::handleWriteRegister(const TrkResult &result)
{
@@ -1187,7 +1187,7 @@ void TrkGdbAdapter::handleWriteRegister(const TrkResult &result)
return;
}
sendGdbServerMessage("OK");
-}
+}
void TrkGdbAdapter::reportRegisters()
{
@@ -1312,7 +1312,7 @@ void TrkGdbAdapter::tryAnswerGdbMemoryRequest(bool buffered)
Snapshot::Memory::const_iterator et = m_snapshot.memory.end();
for ( ; it != et; ++it) {
MEMORY_DEBUG(" NEEDED: " << needed);
- needed -= it.key();
+ needed -= it.key();
}
MEMORY_DEBUG("NEEDED: " << needed);
@@ -1475,7 +1475,7 @@ void TrkGdbAdapter::handleClearBreakpoint(const TrkResult &result)
if (result.errorCode()) {
logMessage("ERROR: " + result.errorString());
//return;
- }
+ }
sendGdbServerMessage("OK");
}
@@ -1568,7 +1568,7 @@ void TrkGdbAdapter::startAdapter()
logMessage(QLatin1String("### Starting TrkGdbAdapter"));
m_trkDevice->setSerialFrame(effectiveTrkDeviceType() != TrkOptions::BlueTooth);
// Prompt the user to start communication
- QString message;
+ QString message;
const trk::PromptStartCommunicationResult src =
S60DebuggerBluetoothStarter::startCommunication(m_trkDevice,
effectiveTrkDevice(),
@@ -1752,16 +1752,16 @@ void TrkGdbAdapter::handleDirectWrite1(const TrkResult &response)
appendByte(&ba, 0xe5);
#else
// Thumb:
- // subs r0, #16
+ // subs r0, #16
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
- // subs r0, #16
+ // subs r0, #16
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
//
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
- // subs r0, #16
+ // subs r0, #16
appendByte(&ba, 0x08);
appendByte(&ba, 0x3b);
#endif
diff --git a/src/plugins/debugger/gdb/trkgdbadapter.h b/src/plugins/debugger/gdb/trkgdbadapter.h
index c59894ffd0..dbb73717dd 100644
--- a/src/plugins/debugger/gdb/trkgdbadapter.h
+++ b/src/plugins/debugger/gdb/trkgdbadapter.h
@@ -246,7 +246,7 @@ private:
QByteArray trkWriteMemoryMessage(uint addr, const QByteArray &date);
QByteArray trkBreakpointMessage(uint addr, uint len, bool armMode = true);
QByteArray trkStepRangeMessage(byte option);
- QByteArray trkDeleteProcessMessage();
+ QByteArray trkDeleteProcessMessage();
QByteArray trkInterruptMessage();
QSharedPointer<trk::TrkDevice> m_trkDevice;
diff --git a/src/plugins/debugger/idebuggerengine.h b/src/plugins/debugger/idebuggerengine.h
index 7766b73b7c..e1b5e11cad 100644
--- a/src/plugins/debugger/idebuggerengine.h
+++ b/src/plugins/debugger/idebuggerengine.h
@@ -83,7 +83,7 @@ public:
virtual void nextExec() = 0;
virtual void stepIExec() = 0;
virtual void nextIExec() = 0;
-
+
virtual void continueInferior() = 0;
virtual void interruptInferior() = 0;
diff --git a/src/plugins/debugger/moduleshandler.cpp b/src/plugins/debugger/moduleshandler.cpp
index e57ed94193..0a75475032 100644
--- a/src/plugins/debugger/moduleshandler.cpp
+++ b/src/plugins/debugger/moduleshandler.cpp
@@ -84,7 +84,7 @@ QVariant ModulesModel::headerData(int section,
{
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
static QString headers[] = {
- tr("Module name") + " ",
+ tr("Module name") + " ",
tr("Symbols read") + " ",
tr("Start address") + " ",
tr("End address") + " "
@@ -115,7 +115,7 @@ QVariant ModulesModel::data(const QModelIndex &index, int role) const
break;
case 1:
if (role == Qt::DisplayRole)
- return module.symbolsRead ? "yes" : "no";
+ return module.symbolsRead ? "yes" : "no";
break;
case 2:
if (role == Qt::DisplayRole)
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 6d46dda03c..95229f10bb 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -175,7 +175,7 @@ void ModulesWindow::resizeColumnsToContents()
void ModulesWindow::setAlwaysResizeColumnsToContents(bool on)
{
m_alwaysResizeColumnsToContents = on;
- QHeaderView::ResizeMode mode = on
+ QHeaderView::ResizeMode mode = on
? QHeaderView::ResizeToContents : QHeaderView::Interactive;
header()->setResizeMode(0, mode);
header()->setResizeMode(1, mode);
@@ -189,7 +189,7 @@ void ModulesWindow::setModel(QAbstractItemModel *model)
QTreeView::setModel(model);
setAlwaysResizeColumnsToContents(true);
}
-
+
void ModulesWindow::showSymbols(const QString &name)
{
if (name.isEmpty())
diff --git a/src/plugins/debugger/name_demangler.cpp b/src/plugins/debugger/name_demangler.cpp
index 8c6fc5e5f1..4e3cf92cdb 100644
--- a/src/plugins/debugger/name_demangler.cpp
+++ b/src/plugins/debugger/name_demangler.cpp
@@ -51,7 +51,7 @@
#endif // DO_TRACE
namespace Debugger {
-namespace Internal {
+namespace Internal {
class NameDemanglerPrivate
{
@@ -138,7 +138,7 @@ private:
QLatin1String(""))
{
}
-
+
const QString makeExpr(const QStringList &exprs) const
{
Q_ASSERT(exprs.size() == 2);
@@ -166,7 +166,7 @@ private:
QLatin1String(""))
{
}
-
+
const QString makeExpr(const QStringList &exprs) const
{
Q_ASSERT(exprs.size() == 2);
@@ -182,7 +182,7 @@ private:
QLatin1String(""))
{
}
-
+
virtual const QString makeExpr(const QStringList &exprs) const
{
Q_ASSERT(exprs.size() == 3);
diff --git a/src/plugins/debugger/name_demangler.h b/src/plugins/debugger/name_demangler.h
index 2a13f1e2a8..461324efe9 100644
--- a/src/plugins/debugger/name_demangler.h
+++ b/src/plugins/debugger/name_demangler.h
@@ -54,7 +54,7 @@ public:
bool demangle(const QString &mangledName);
/*
- * A textual description of the error encountered, if there was one.
+ * A textual description of the error encountered, if there was one.
* Only valid if demangle() returned false.
*/
const QString &errorString() const;
diff --git a/src/plugins/debugger/registerhandler.cpp b/src/plugins/debugger/registerhandler.cpp
index cbff586239..9b6cb4e015 100644
--- a/src/plugins/debugger/registerhandler.cpp
+++ b/src/plugins/debugger/registerhandler.cpp
@@ -100,7 +100,7 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
if (role == RegisterChangedRole)
return reg.changed;
-
+
return QVariant();
}
diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h
index d7f16d0463..e6d99c0906 100644
--- a/src/plugins/debugger/registerhandler.h
+++ b/src/plugins/debugger/registerhandler.h
@@ -39,7 +39,7 @@ enum RegisterRole
{
RegisterNumberBaseRole = Qt::UserRole, // Currently used number base
RegisterAddressRole, // Start value for opening memory view
- RegisterChangedRole // Used for painting changed values
+ RegisterChangedRole // Used for painting changed values
};
class Register
@@ -76,7 +76,7 @@ private:
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const;
Qt::ItemFlags flags(const QModelIndex &idx) const;
-
+
QList<Register> m_registers;
int m_base;
int m_strlen; // approximate width of an value in chars
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index ddaedbd808..092efb445e 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -205,7 +205,7 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
menu.addAction(theDebuggerAction(SettingsDialog));
QAction *act = menu.exec(ev->globalPos());
-
+
if (act == actAdjust)
resizeColumnsToContents();
else if (act == actAlwaysAdjust)
diff --git a/src/plugins/debugger/script/script.pri b/src/plugins/debugger/script/script.pri
index 99a1d14703..48d9460aa5 100644
--- a/src/plugins/debugger/script/script.pri
+++ b/src/plugins/debugger/script/script.pri
@@ -4,6 +4,6 @@ HEADERS += \
SOURCES += \
$$PWD/scriptengine.cpp \
-FORMS +=
+FORMS +=
-RESOURCES +=
+RESOURCES +=
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index b8436f1084..8a09cbca06 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -104,7 +104,7 @@ public:
private:
void maybeBreakNow(bool byFunction);
- ScriptEngine *q;
+ ScriptEngine *q;
};
ScriptAgent::ScriptAgent(ScriptEngine *debugger, QScriptEngine *script)
@@ -204,7 +204,7 @@ void ScriptEngine::executeDebuggerCommand(const QString &command)
void ScriptEngine::shutdown()
{
- exitDebugger();
+ exitDebugger();
}
void ScriptEngine::exitDebugger()
@@ -573,7 +573,7 @@ void ScriptEngine::maybeBreakNow(bool byFunction)
showStatusMessage(tr("Stopped."), 5000);
StackFrame frame;
- frame.file = fileName;
+ frame.file = fileName;
frame.line = lineNumber;
manager()->gotoLocation(frame, true);
updateLocals();
@@ -587,7 +587,7 @@ void ScriptEngine::updateLocals()
//
// Build stack
- //
+ //
QList<StackFrame> stackFrames;
int i = 0;
for (QScriptContext *c = context; c; c = c->parentContext(), ++i) {
@@ -599,7 +599,7 @@ void ScriptEngine::updateLocals()
frame.from = QString::number(info.functionStartLineNumber());
frame.to = QString::number(info.functionEndLineNumber());
frame.line = info.lineNumber();
-
+
if (frame.function.isEmpty())
frame.function = "<global scope>";
//frame.address = ...;
diff --git a/src/plugins/debugger/shared/backtrace.cpp b/src/plugins/debugger/shared/backtrace.cpp
index 6b81e9339e..c535b023f9 100644
--- a/src/plugins/debugger/shared/backtrace.cpp
+++ b/src/plugins/debugger/shared/backtrace.cpp
@@ -35,7 +35,7 @@
#include <stdio.h>
#include <signal.h>
#include <execinfo.h>
-#endif
+#endif
namespace Debugger {
namespace Internal {
diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h
index 771ec2a3d1..88d80bb08e 100644
--- a/src/plugins/debugger/shared/backtrace.h
+++ b/src/plugins/debugger/shared/backtrace.h
@@ -37,7 +37,7 @@ namespace Internal {
void dumpBacktrace(int maxdepth = -1);
-} // namespace Internal
+} // namespace Internal
} // namespace Debugger
#endif // DEBUGGER_BACKTRACE_H
diff --git a/src/plugins/debugger/shared/dbgwinutils.cpp b/src/plugins/debugger/shared/dbgwinutils.cpp
index 842c9631b2..09ab75fd83 100644
--- a/src/plugins/debugger/shared/dbgwinutils.cpp
+++ b/src/plugins/debugger/shared/dbgwinutils.cpp
@@ -37,7 +37,7 @@
namespace Debugger {
namespace Internal {
-
+
#ifdef USE_PSAPI
static inline QString imageName(DWORD processId)
{
diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp
index 0fb5350fbb..6c9fd3e717 100644
--- a/src/plugins/debugger/shared/peutils.cpp
+++ b/src/plugins/debugger/shared/peutils.cpp
@@ -160,7 +160,7 @@ static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders,
#endif
// Empty. This is the case for MinGW binaries
if (debugDirSize == 0)
- return true;
+ return true;
// Look up in file
DWORD debugDirOffset;
if (!getFileOffsetFromRVA(ntHeaders, debugDirRva, &debugDirOffset)) {
@@ -221,7 +221,7 @@ static void collectPDBfiles(void *fileMemory, IMAGE_DEBUG_DIRECTORY *directoryBa
namespace Debugger {
namespace Internal {
-
+
bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage)
{
HANDLE hFile = NULL;
diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h
index c2deef4a51..5a6fadaf58 100644
--- a/src/plugins/debugger/shared/peutils.h
+++ b/src/plugins/debugger/shared/peutils.h
@@ -45,7 +45,7 @@ namespace Internal {
// Return a list of Program-Database (*.pdb) files a PE executable refers to. */
bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage);
-} // namespace Internal
+} // namespace Internal
} // namespace Debugger
#endif // DEBUGGER_PEUTILS_H
diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri
index bd69e956ce..760b012a44 100644
--- a/src/plugins/debugger/shared/shared.pri
+++ b/src/plugins/debugger/shared/shared.pri
@@ -1,7 +1,7 @@
SOURCES += $$PWD/backtrace.cpp
-HEADERS += $$PWD/backtrace.h
+HEADERS += $$PWD/backtrace.h
win32 {
@@ -19,6 +19,6 @@ contains(QMAKE_CXX, cl) {
# For the Privilege manipulation functions in sharedlibraryinjector.cpp.
# Not required for MinGW.
LIBS += advapi32.lib
-}
+}
}
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index 52341c6285..f429320fe1 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -95,7 +95,7 @@ QVariant SourceFilesModel::headerData(int section,
{
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
static QString headers[] = {
- tr("Internal name") + " ",
+ tr("Internal name") + " ",
tr("Full name") + " ",
};
return headers[section];
@@ -178,7 +178,7 @@ SourceFilesWindow::SourceFilesWindow(QWidget *parent)
setRootIsDecorated(false);
setIconSize(QSize(10, 10));
//header()->setDefaultAlignment(Qt::AlignLeft);
-
+
connect(this, SIGNAL(activated(QModelIndex)),
this, SLOT(sourceFileActivated(QModelIndex)));
connect(act, SIGNAL(toggled(bool)),
@@ -210,7 +210,7 @@ void SourceFilesWindow::contextMenuEvent(QContextMenuEvent *ev)
act2 = new QAction(tr("Open file \"%1\"'").arg(name), &menu);
act2->setEnabled(true);
}
-
+
menu.addAction(act1);
menu.addAction(act2);
menu.addSeparator();
@@ -235,5 +235,5 @@ void SourceFilesWindow::removeAll()
m_model->setSourceFiles(QMap<QString, QString>());
header()->setResizeMode(0, QHeaderView::ResizeToContents);
}
-
+
#include "sourcefileswindow.moc"
diff --git a/src/plugins/debugger/sourcefileswindow.h b/src/plugins/debugger/sourcefileswindow.h
index 9a003eab30..d5be1b6741 100644
--- a/src/plugins/debugger/sourcefileswindow.h
+++ b/src/plugins/debugger/sourcefileswindow.h
@@ -43,7 +43,7 @@ namespace Debugger {
namespace Internal {
class SourceFilesModel;
-
+
class SourceFilesWindow : public QTreeView
{
Q_OBJECT
diff --git a/src/plugins/debugger/stackhandler.cpp b/src/plugins/debugger/stackhandler.cpp
index d2b146b913..08985110d6 100644
--- a/src/plugins/debugger/stackhandler.cpp
+++ b/src/plugins/debugger/stackhandler.cpp
@@ -139,9 +139,9 @@ QVariant StackHandler::data(const QModelIndex &index, int role) const
return QVariant();
if (index.row() == m_stackFrames.size()) {
- if (role == Qt::DisplayRole && index.column() == 0)
+ if (role == Qt::DisplayRole && index.column() == 0)
return tr("...");
- if (role == Qt::DisplayRole && index.column() == 1)
+ if (role == Qt::DisplayRole && index.column() == 1)
return tr("<More>");
if (role == Qt::DecorationRole && index.column() == 0)
return m_emptyIcon;
@@ -209,7 +209,7 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const
}
StackFrame StackHandler::currentFrame() const
-{
+{
QTC_ASSERT(m_currentIndex >= 0, return StackFrame());
QTC_ASSERT(m_currentIndex < m_stackFrames.size(), return StackFrame());
return m_stackFrames.at(m_currentIndex);
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index afc5d25729..d39172f1ea 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -93,7 +93,7 @@ void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
QModelIndex idx = indexAt(ev->pos());
StackFrame frame = model()->data(idx, Qt::UserRole).value<StackFrame>();
QString address = frame.address;
-
+
QMenu menu;
menu.addAction(theDebuggerAction(ExpandStack));
@@ -107,7 +107,7 @@ void StackWindow::contextMenuEvent(QContextMenuEvent *ev)
actShowMemory->setEnabled(false);
} else {
actShowMemory->setText(tr("Open memory editor at %1").arg(address));
- }
+ }
QAction *actShowDisassembler = menu.addAction(QString());
if (address.isEmpty()) {
diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h
index 7ea221d6fe..c8e847b08a 100644
--- a/src/plugins/debugger/stackwindow.h
+++ b/src/plugins/debugger/stackwindow.h
@@ -43,7 +43,7 @@ class DebuggerManager;
namespace Internal {
class DisassemblerViewAgent;
-
+
class StackWindow : public QTreeView
{
Q_OBJECT
diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h
index 0d47e3687c..bc1a252be2 100644
--- a/src/plugins/debugger/threadswindow.h
+++ b/src/plugins/debugger/threadswindow.h
@@ -34,7 +34,7 @@
namespace Debugger {
namespace Internal {
-
+
class ThreadsWindow : public QTreeView
{
Q_OBJECT
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 661df2cc8a..b4f7dbe559 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -61,7 +61,7 @@
#if DEBUG_MODEL
# define MODEL_DEBUG(s) qDebug() << s
#else
-# define MODEL_DEBUG(s)
+# define MODEL_DEBUG(s)
#endif
#define MODEL_DEBUGX(s) qDebug() << s
@@ -101,7 +101,7 @@ public:
// WatchData
//
////////////////////////////////////////////////////////////////////
-
+
WatchData::WatchData() :
hasChildren(false),
generation(-1),
@@ -173,7 +173,7 @@ void WatchData::setValue(const QString &value0)
// column. No need to duplicate it here.
if (value.startsWith("(" + type + ") 0x"))
value = value.section(" ", -1, -1);
-
+
setValueUnneeded();
}
@@ -499,7 +499,7 @@ QString niceType(const QString typeIn)
for (int i = 0; i < 10; ++i) {
int start = type.indexOf("std::allocator<");
if (start == -1)
- break;
+ break;
// search for matching '>'
int pos;
int level = 0;
@@ -691,7 +691,7 @@ bool WatchModel::hasChildren(const QModelIndex &parent) const
WatchItem *WatchModel::watchItem(const QModelIndex &idx) const
{
- return idx.isValid()
+ return idx.isValid()
? static_cast<WatchItem*>(idx.internalPointer()) : m_root;
}
@@ -700,7 +700,7 @@ QModelIndex WatchModel::watchIndex(const WatchItem *item) const
return watchIndexHelper(item, m_root, QModelIndex());
}
-QModelIndex WatchModel::watchIndexHelper(const WatchItem *needle,
+QModelIndex WatchModel::watchIndexHelper(const WatchItem *needle,
const WatchItem *parentItem, const QModelIndex &parentIndex) const
{
if (needle == parentItem)
@@ -715,7 +715,7 @@ QModelIndex WatchModel::watchIndexHelper(const WatchItem *needle,
return QModelIndex();
}
-void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
+void WatchModel::emitDataChanged(int column, const QModelIndex &parentIndex)
{
QModelIndex idx1 = index(0, column, parentIndex);
QModelIndex idx2 = index(rowCount(parentIndex) - 1, column, parentIndex);
@@ -785,7 +785,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
case ActiveDataRole:
qDebug() << "ASK FOR" << data.iname;
return true;
-
+
case TypeFormatListRole:
if (isIntType(data.type))
return QStringList() << tr("decimal") << tr("hexadecimal")
@@ -807,7 +807,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const
}
default:
- break;
+ break;
}
return QVariant();
}
@@ -825,7 +825,7 @@ bool WatchModel::setData(const QModelIndex &index, const QVariant &value, int ro
}
} else if (role == TypeFormatRole) {
m_handler->setFormat(data.type, value.toInt());
- } else if (role == IndividualFormatRole) {
+ } else if (role == IndividualFormatRole) {
const int format = value.toInt();
if (format == -1) {
m_handler->m_individualFormats.remove(data.iname);
@@ -879,7 +879,7 @@ QVariant WatchModel::headerData(int section, Qt::Orientation orientation, int ro
case 2: return QString(tr("Type") + QLatin1String(" "));
}
}
- return QVariant();
+ return QVariant();
}
struct IName : public QString
@@ -899,7 +899,7 @@ bool iNameLess(const QString &iname1, const QString &iname2)
return i1 < i2;
}
}
- return name1 < name2;
+ return name1 < name2;
}
bool operator<(const IName &iname1, const IName &iname2)
@@ -916,7 +916,7 @@ static int findInsertPosition(const QList<WatchItem *> &list, const WatchItem *i
{
QList<WatchItem *>::const_iterator it =
qLowerBound(list.begin(), list.end(), item, iNameSorter);
- return it - list.begin();
+ return it - list.begin();
}
void WatchModel::insertData(const WatchData &data)
@@ -967,7 +967,7 @@ void WatchModel::insertData(const WatchData &data)
void WatchModel::insertBulkData(const QList<WatchData> &list)
{
#if 0
- for (int i = 0; i != list.size(); ++i)
+ for (int i = 0; i != list.size(); ++i)
insertData(list.at(i));
return;
#endif
@@ -1436,7 +1436,7 @@ WatchModel *WatchHandler::model(WatchType type) const
QTC_ASSERT(false, /**/);
return 0;
}
-
+
WatchModel *WatchHandler::modelForIName(const QString &iname) const
{
if (iname.startsWith(QLatin1String("local")))
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index dfd36da559..0a86a43dc6 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -114,7 +114,7 @@ public:
bool isLocal() const { return iname.startsWith(QLatin1String("local.")); }
bool isWatcher() const { return iname.startsWith(QLatin1String("watch.")); }
bool isValid() const { return !iname.isEmpty(); }
-
+
bool isEqual(const WatchData &other) const;
static QString msgNotInScope();
@@ -171,7 +171,7 @@ enum IntegerFormat
enum DumpableFormat
{
PrettyFormat = 0, // keep that at 0 as default
- PlainFomat,
+ PlainFomat,
};
class WatchModel : public QAbstractItemModel
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index f5ef9250e7..23e12f9670 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -332,7 +332,7 @@ static void blockRecursion(const CPlusPlus::Overview &overview,
it = seenHash->insert(name, 0);
} else {
++(it.value());
- }
+ }
// Is the declaration on or past the current line, that is,
// the variable not initialized.
if (symbol->line() >= line)
@@ -1388,7 +1388,7 @@ static void gbdMiToWatchData(const GdbMi &root,
{
if (debug > 1)
qDebug() << Q_FUNC_INFO << '\n' << root.toString(false, 0);
- WatchData w;
+ WatchData w;
QString v;
// Check for name/iname and use as expression default
if (ctx.recursionLevel == 0) {
@@ -1427,7 +1427,7 @@ static void gbdMiToWatchData(const GdbMi &root,
w.exp = v;
gdbMiGetStringValue(&w.addr, root, "addr");
gdbMiGetStringValue(&w.saddr, root, "saddr");
- gdbMiGetBoolValue(&w.valueEnabled, root, "valueenabled");
+ gdbMiGetBoolValue(&w.valueEnabled, root, "valueenabled");
gdbMiGetBoolValue(&w.valueEditable, root, "valueeditable");
if (gdbMiGetStringValue(&v, root, "valuetooltip", "valuetooltipencoded"))
w.setValue(v);
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index 005aa5954b..b9855ff04b 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -76,7 +76,7 @@ public:
{
QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor);
QTC_ASSERT(lineEdit, return);
- if (index.column() == 1)
+ if (index.column() == 1)
lineEdit->setText(index.model()->data(index, Qt::DisplayRole).toString());
else
lineEdit->setText(index.model()->data(index, ExpressionRole).toString());
@@ -140,15 +140,15 @@ WatchWindow::WatchWindow(Type type, DebuggerManager *manager, QWidget *parent)
this, SLOT(expandNode(QModelIndex)));
connect(this, SIGNAL(collapsed(QModelIndex)),
this, SLOT(collapseNode(QModelIndex)));
-}
-
-void WatchWindow::expandNode(const QModelIndex &idx)
-{
+}
+
+void WatchWindow::expandNode(const QModelIndex &idx)
+{
model()->setData(idx, true, ExpandedRole);
-}
-
-void WatchWindow::collapseNode(const QModelIndex &idx)
-{
+}
+
+void WatchWindow::collapseNode(const QModelIndex &idx)
+{
model()->setData(idx, false, ExpandedRole);
}
@@ -208,7 +208,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
QString exp = model()->data(mi0, ExpressionRole).toString();
QString type = model()->data(mi2).toString();
- QStringList alternativeFormats =
+ QStringList alternativeFormats =
model()->data(mi0, TypeFormatListRole).toStringList();
const int typeFormat = qMax(int(DecimalFormat), model()->data(mi0, TypeFormatRole).toInt());
const int individualFormat = model()->data(mi0, IndividualFormatRole).toInt();
@@ -286,7 +286,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
menu.addAction(actClearCodeModelSnapshot);
menu.addSeparator();
menu.addAction(theDebuggerAction(UseToolTipsInLocalsView));
-
+
menu.addAction(theDebuggerAction(AutoDerefPointers));
QAction *actAdjustColumnWidths =
@@ -322,7 +322,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
m_manager->clearCppCodeModelSnapshot();
} else if (clearIndividualFormatAction && act == clearIndividualFormatAction) {
model()->setData(mi1, -1, IndividualFormatRole);
- } else {
+ } else {
for (int i = 0; i != alternativeFormats.size(); ++i) {
if (act == typeFormatActions.at(i))
model()->setData(mi1, i, TypeFormatRole);
@@ -343,7 +343,7 @@ void WatchWindow::setAlwaysResizeColumnsToContents(bool on)
if (!header())
return;
m_alwaysResizeColumnsToContents = on;
- QHeaderView::ResizeMode mode = on
+ QHeaderView::ResizeMode mode = on
? QHeaderView::ResizeToContents : QHeaderView::Interactive;
header()->setResizeMode(0, mode);
header()->setResizeMode(1, mode);
diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h
index 3e497e6895..916e2254dd 100644
--- a/src/plugins/debugger/watchwindow.h
+++ b/src/plugins/debugger/watchwindow.h
@@ -53,7 +53,7 @@ public:
WatchWindow(Type type, DebuggerManager *manager, QWidget *parent = 0);
void setType(Type type) { m_type = type; }
Type type() const { return m_type; }
-
+
public slots:
void resizeColumnsToContents();
void setAlwaysResizeColumnsToContents(bool on = true);
diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp
index e05079f8da..50eea36dcc 100644
--- a/src/plugins/designer/cpp/formclasswizardparameters.cpp
+++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp
@@ -57,7 +57,7 @@ class FormClassWizardGenerationParametersPrivate : public QSharedData
{
public:
FormClassWizardGenerationParametersPrivate();
- void fromSettings(const QSettings *);
+ void fromSettings(const QSettings *);
void toSettings(QSettings *) const;
bool equals(const FormClassWizardGenerationParametersPrivate &rhs) const;
diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp
index 36a4cc8091..2a55feda4a 100644
--- a/src/plugins/designer/formtemplatewizardpage.cpp
+++ b/src/plugins/designer/formtemplatewizardpage.cpp
@@ -327,7 +327,7 @@ QString FormTemplateWizardPage::changeUiClassName(const QString &uiXml, const QS
qDebug() << '<' << Q_FUNC_INFO << newUiClassName << rc;
return rc;
}
-#endif // USE_XSLT
+#endif // USE_XSLT
} // namespace Internal
} // namespace Designer
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 2623f1b9df..1f6f74e509 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -374,7 +374,7 @@ QString FormWindowEditor::contents() const
return QString::null;
// Activate once all Qt branches around have integrated 4.5.2
// (Kinetic)
-/*
+/*
#if QT_VERSION > 0x040501
// Quiet save as of Qt 4.5.2
qdesigner_internal::FormWindowBase *fwb = qobject_cast<qdesigner_internal::FormWindowBase *>(m_formWindow);
diff --git a/src/plugins/designer/qt_private/formwindowbase_p.h b/src/plugins/designer/qt_private/formwindowbase_p.h
index 269931ee79..0d26c004e6 100644
--- a/src/plugins/designer/qt_private/formwindowbase_p.h
+++ b/src/plugins/designer/qt_private/formwindowbase_p.h
@@ -183,7 +183,7 @@ private slots:
private:
void syncGridFeature();
- FormWindowBasePrivate *m_d;
+ FormWindowBasePrivate *m_d;
};
} // namespace qdesigner_internal
diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index 272c2d10fe..106808867c 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -29,7 +29,7 @@
#include "fakevimactions.h"
-// Please do not add any direct dependencies to other Qt Creator code here.
+// Please do not add any direct dependencies to other Qt Creator code here.
// Instead emit signals and let the FakeVimPlugin channel the information to
// Qt Creator. The idea is to keep this file here in a "clean" state that
// allows easy reuse with any QTextEdit or QPlainTextEdit derived class.
@@ -66,7 +66,7 @@ FakeVimSettings::~FakeVimSettings()
{
qDeleteAll(m_items);
}
-
+
void FakeVimSettings::insertItem(int code, SavedAction *item,
const QString &longName, const QString &shortName)
{
@@ -92,7 +92,7 @@ void FakeVimSettings::writeSettings(QSettings *settings)
foreach (SavedAction *item, m_items)
item->writeSettings(settings);
}
-
+
SavedAction *FakeVimSettings::item(int code)
{
QTC_ASSERT(m_items.value(code, 0), qDebug() << "CODE: " << code; return 0);
diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h
index 2a5a5e4cbe..5e20e66d45 100644
--- a/src/plugins/fakevim/fakevimactions.h
+++ b/src/plugins/fakevim/fakevimactions.h
@@ -77,9 +77,9 @@ public:
void writeSettings(QSettings *settings);
private:
- QHash<int, Utils::SavedAction *> m_items;
- QHash<QString, int> m_nameToCode;
- QHash<int, QString> m_codeToName;
+ QHash<int, Utils::SavedAction *> m_items;
+ QHash<QString, int> m_nameToCode;
+ QHash<int, QString> m_codeToName;
};
FakeVimSettings *theFakeVimSettings();
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index d690a3452c..2cc9c9b779 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -214,7 +214,7 @@ struct Range
: beginPos(qMin(b, e)), endPos(qMax(b, e)), rangemode(m)
{}
- QString toString() const
+ QString toString() const
{
return QString("%1-%2 (mode: %3)").arg(beginPos).arg(endPos)
.arg(rangemode);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 4246e1d133..7eedfda0cc 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -137,28 +137,28 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent)
m_ui.setupUi(w);
m_group.clear();
- m_group.insert(theFakeVimSetting(ConfigUseFakeVim),
+ m_group.insert(theFakeVimSetting(ConfigUseFakeVim),
m_ui.checkBoxUseFakeVim);
- m_group.insert(theFakeVimSetting(ConfigExpandTab),
+ m_group.insert(theFakeVimSetting(ConfigExpandTab),
m_ui.checkBoxExpandTab);
- m_group.insert(theFakeVimSetting(ConfigHlSearch),
+ m_group.insert(theFakeVimSetting(ConfigHlSearch),
m_ui.checkBoxHlSearch);
- m_group.insert(theFakeVimSetting(ConfigShiftWidth),
+ m_group.insert(theFakeVimSetting(ConfigShiftWidth),
m_ui.lineEditShiftWidth);
- m_group.insert(theFakeVimSetting(ConfigSmartTab),
+ m_group.insert(theFakeVimSetting(ConfigSmartTab),
m_ui.checkBoxSmartTab);
- m_group.insert(theFakeVimSetting(ConfigStartOfLine),
+ m_group.insert(theFakeVimSetting(ConfigStartOfLine),
m_ui.checkBoxStartOfLine);
- m_group.insert(theFakeVimSetting(ConfigTabStop),
+ m_group.insert(theFakeVimSetting(ConfigTabStop),
m_ui.lineEditTabStop);
- m_group.insert(theFakeVimSetting(ConfigBackspace),
+ m_group.insert(theFakeVimSetting(ConfigBackspace),
m_ui.lineEditBackspace);
- m_group.insert(theFakeVimSetting(ConfigAutoIndent),
+ m_group.insert(theFakeVimSetting(ConfigAutoIndent),
m_ui.checkBoxAutoIndent);
- m_group.insert(theFakeVimSetting(ConfigIncSearch),
+ m_group.insert(theFakeVimSetting(ConfigIncSearch),
m_ui.checkBoxIncSearch);
connect(m_ui.pushButtonCopyTextEditorSettings, SIGNAL(clicked()),
@@ -173,9 +173,9 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent)
void FakeVimOptionPage::copyTextEditorSettings()
{
- TextEditor::TabSettings ts =
+ TextEditor::TabSettings ts =
TextEditor::TextEditorSettings::instance()->tabSettings();
-
+
m_ui.checkBoxExpandTab->setChecked(ts.m_spacesForTabs);
m_ui.lineEditTabStop->setText(QString::number(ts.m_tabSize));
m_ui.lineEditShiftWidth->setText(QString::number(ts.m_indentSize));
@@ -271,7 +271,7 @@ private:
} // namespace FakeVim
FakeVimPluginPrivate::FakeVimPluginPrivate(FakeVimPlugin *plugin)
-{
+{
q = plugin;
m_fakeVimOptionsPage = 0;
}
@@ -300,7 +300,7 @@ bool FakeVimPluginPrivate::initialize()
m_fakeVimOptionsPage = new FakeVimOptionPage;
q->addObject(m_fakeVimOptionsPage);
theFakeVimSettings()->readSettings(Core::ICore::instance()->settings());
-
+
Core::Command *cmd = 0;
cmd = actionManager->registerAction(theFakeVimSetting(ConfigUseFakeVim),
Constants::INSTALL_HANDLER, globalcontext);
@@ -407,7 +407,7 @@ void FakeVimPluginPrivate::editorOpened(Core::IEditor *editor)
// we can only handle QTextEdit and QPlainTextEdit
if (!qobject_cast<QTextEdit *>(widget) && !qobject_cast<QPlainTextEdit *>(widget))
return;
-
+
//qDebug() << "OPENING: " << editor << editor->widget()
// << "MODE: " << theFakeVimSetting(ConfigUseFakeVim)->value();
@@ -440,7 +440,7 @@ void FakeVimPluginPrivate::editorOpened(Core::IEditor *editor)
handler->setCurrentFileName(editor->file()->fileName());
handler->installEventFilter();
-
+
// pop up the bar
if (theFakeVimSetting(ConfigUseFakeVim)->value().toBool())
showCommandBuffer("");
@@ -457,8 +457,8 @@ void FakeVimPluginPrivate::setUseFakeVim(const QVariant &value)
//qDebug() << "SET USE FAKEVIM" << value;
bool on = value.toBool();
if (on) {
- Core::EditorManager::instance()->showEditorStatusBar(
- QLatin1String(Constants::MINI_BUFFER),
+ Core::EditorManager::instance()->showEditorStatusBar(
+ QLatin1String(Constants::MINI_BUFFER),
"vi emulation mode. Type :q to leave. Use , Ctrl-R to trigger run.",
tr("Quit FakeVim"), this, SLOT(quitFakeVim()));
foreach (Core::IEditor *editor, m_editorToHandler.keys())
@@ -499,7 +499,7 @@ void FakeVimPluginPrivate::writeFile(bool *handled,
file->save(fileName);
Core::ICore::instance()->fileManager()->unblockFileChange(file);
*handled = true;
- }
+ }
}
void FakeVimPluginPrivate::handleExCommand(const QString &cmd)
@@ -606,7 +606,7 @@ void FakeVimPluginPrivate::indentRegion(int *amount, int beginLine, int endLine,
if (!bt)
return;
- TextEditor::TabSettings tabSettings =
+ TextEditor::TabSettings tabSettings =
TextEditor::TextEditorSettings::instance()->tabSettings();
typedef SharedTools::Indenter<TextEditor::TextBlockIterator> Indenter;
Indenter &indenter = Indenter::instance();
@@ -646,7 +646,7 @@ void FakeVimPluginPrivate::quitFakeVim()
void FakeVimPluginPrivate::showCommandBuffer(const QString &contents)
{
//qDebug() << "SHOW COMMAND BUFFER" << contents;
- Core::EditorManager::instance()->showEditorStatusBar(
+ Core::EditorManager::instance()->showEditorStatusBar(
QLatin1String(Constants::MINI_BUFFER), contents,
tr("Quit FakeVim"), this, SLOT(quitFakeVim()));
}
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index 35c04523ce..721e0533f8 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -51,7 +51,7 @@ class ProjectFilesFactory: public Core::IEditorFactory
public:
ProjectFilesFactory(Manager *manager, TextEditor::TextEditorActionHandler *handler);
virtual ~ProjectFilesFactory();
-
+
Manager *manager() const;
virtual Core::IEditor *createEditor(QWidget *parent);
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 46bdecf414..f9bc0bd716 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -300,7 +300,7 @@ bool GenericProjectWizard::isValidDir(const QFileInfo &fileInfo) const
return false;
else if (fileName == QLatin1String("CVS"))
- return false;
+ return false;
// ### user include/exclude
diff --git a/src/plugins/git/gitcommand.cpp b/src/plugins/git/gitcommand.cpp
index ea6c17dab1..e69495f11a 100644
--- a/src/plugins/git/gitcommand.cpp
+++ b/src/plugins/git/gitcommand.cpp
@@ -150,7 +150,7 @@ void GitCommand::run()
output += process.readAllStandardOutput();
error += QString::fromLocal8Bit(process.readAllStandardError());
switch (m_reportTerminationMode) {
- case NoReport:
+ case NoReport:
break;
case ReportStdout:
output += msgTermination(process.exitCode(), m_binaryPath, m_jobs.at(j).arguments).toUtf8();
diff --git a/src/plugins/git/gitorious/gitorioushostwidget.cpp b/src/plugins/git/gitorious/gitorioushostwidget.cpp
index a35c7cb7ae..26370dccf7 100644
--- a/src/plugins/git/gitorious/gitorioushostwidget.cpp
+++ b/src/plugins/git/gitorious/gitorioushostwidget.cpp
@@ -228,7 +228,7 @@ void GitoriousHostWidget::slotBrowse()
}
void GitoriousHostWidget::slotDelete()
-{
+{
const QModelIndex index = ui->hostView->selectionModel()->currentIndex();
ui->hostView->selectionModel()->clear();
if (index.isValid()) {
diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
index 7a59bd638c..ab9384b87c 100644
--- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
+++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
@@ -81,7 +81,7 @@ GitoriousRepositoryWizardPage::GitoriousRepositoryWizardPage(const GitoriousProj
{
QStringList headers;
headers << tr("Name") << tr("Owner") << tr("Description");
- m_model->setHorizontalHeaderLabels(headers);
+ m_model->setHorizontalHeaderLabels(headers);
// Filter on all columns
m_filterModel->setSourceModel(m_model);
m_filterModel->setFilterKeyColumn(-1);
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index d735611b6e..8361b5d1ba 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -55,13 +55,13 @@ static QTextCharFormat commentFormat()
// keywords (words in front of a colon as in 'Task: <bla>').
class GitSubmitHighlighter : QSyntaxHighlighter {
-public:
+public:
explicit GitSubmitHighlighter(QTextEdit *parent);
virtual void highlightBlock(const QString &text);
private:
enum State { Header, Comment, Other };
- const QTextCharFormat m_commentFormat;
+ const QTextCharFormat m_commentFormat;
const QRegExp m_keywordPattern;
const QChar m_hashChar;
};
@@ -87,7 +87,7 @@ void GitSubmitHighlighter::highlightBlock(const QString &text)
state = Comment;
}
// Apply format.
- switch (state) {
+ switch (state) {
case Header: {
QTextCharFormat charFormat = format(0);
charFormat.setFontWeight(QFont::Bold);
diff --git a/src/plugins/helloworld/helloworld.pro b/src/plugins/helloworld/helloworld.pro
index 82313b6dd1..a4268409e2 100644
--- a/src/plugins/helloworld/helloworld.pro
+++ b/src/plugins/helloworld/helloworld.pro
@@ -9,4 +9,4 @@ HEADERS += helloworldplugin.h \
SOURCES += helloworldplugin.cpp \
helloworldwindow.cpp
-
+
diff --git a/src/plugins/help/centralwidget.cpp b/src/plugins/help/centralwidget.cpp
index 0080f062b8..ea50c448ff 100644
--- a/src/plugins/help/centralwidget.cpp
+++ b/src/plugins/help/centralwidget.cpp
@@ -433,7 +433,7 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, int zoom)
viewer->setZoom(zoom);
viewer->setSource(url);
viewer->setFocus(Qt::OtherFocusReason);
-
+
#if defined(QT_NO_WEBKIT)
QFont font = viewer->font();
font.setPointSize(font.pointSize() + int(zoom));
@@ -551,7 +551,7 @@ void CentralWidget::showTabBarContextMenu(const QPoint &point)
closePages->setEnabled(enableAction);
menu.addSeparator();
-
+
QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page..."));
const QString &url = viewer->source().toString();
if (url.isEmpty() || url == QLatin1String("about:blank"))
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index cc3ce0a178..7b8fb035ea 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -101,7 +101,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
QString homePage = m_helpEngine->customValue(QLatin1String("HomePage"),
QString()).toString();
-
+
if (homePage.isEmpty()) {
homePage = m_helpEngine->customValue(QLatin1String("DefaultHomePage"),
QLatin1String("about:blank")).toString();
@@ -114,7 +114,7 @@ QWidget *GeneralSettingsPage::createPage(QWidget *parent)
index = m_helpEngine->customValue(QLatin1String("ContextHelpOption"), 0).toInt();
m_ui.contextHelpComboBox->setCurrentIndex(index);
-
+
connect(m_ui.currentPageButton, SIGNAL(clicked()), this, SLOT(setCurrentPage()));
connect(m_ui.blankPageButton, SIGNAL(clicked()), this, SLOT(setBlankPage()));
connect(m_ui.defaultPageButton, SIGNAL(clicked()), this, SLOT(setDefaultPage()));
diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp
index 8c72774a29..a0514008e8 100644
--- a/src/plugins/perforce/perforcesettings.cpp
+++ b/src/plugins/perforce/perforcesettings.cpp
@@ -213,7 +213,7 @@ void PerforceSettings::toSettings(QSettings *settings) const
}
void PerforceSettings::setSettings(const Settings &newSettings)
-{
+{
if (newSettings != m_settings) {
// trigger check
m_settings = newSettings;
diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.h b/src/plugins/perforce/perforcesubmiteditorwidget.h
index 6afeca66aa..cec80ecad3 100644
--- a/src/plugins/perforce/perforcesubmiteditorwidget.h
+++ b/src/plugins/perforce/perforcesubmiteditorwidget.h
@@ -35,7 +35,7 @@
namespace Perforce {
namespace Internal {
-
+
/* Submit editor widget with additional information pane
* at the top. */
class PerforceSubmitEditorWidget : public Utils::SubmitEditorWidget
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 14ecc4bfd0..e2e51395b8 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -308,7 +308,7 @@ void BuildManager::nextStep()
m_watcher.setFuture(QtConcurrent::run(&BuildStep::run, m_currentBuildStep));
} else {
m_running = false;
- m_previousBuildStepProject = 0;
+ m_previousBuildStepProject = 0;
m_progressFutureInterface->reportFinished();
m_progressWatcher.setFuture(QFuture<void>());
delete m_progressFutureInterface;
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.h b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
index 46c871bd67..0ee937e251 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.h
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.h
@@ -55,7 +55,7 @@ namespace Internal {
class PROJECTEXPLORER_EXPORT CustomExecutableRunConfiguration : public LocalApplicationRunConfiguration
{
// the configuration widget needs to setExecutable setWorkingDirectory and setCommandLineArguments
- friend class Internal::CustomExecutableConfigurationWidget;
+ friend class Internal::CustomExecutableConfigurationWidget;
Q_OBJECT
public:
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index b34a7d64b2..ba3b7b3114 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -494,7 +494,7 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, QWidget *additionalDetails
vbox2->addLayout(horizontalLayout);
vbox->addWidget(m_detailsContainer);
-
+
connect(m_model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
this, SLOT(updateButtons()));
diff --git a/src/plugins/projectexplorer/outputwindow.h b/src/plugins/projectexplorer/outputwindow.h
index ce81025bdb..8a4ff8bb47 100644
--- a/src/plugins/projectexplorer/outputwindow.h
+++ b/src/plugins/projectexplorer/outputwindow.h
@@ -87,7 +87,7 @@ public:
void appendOutput(RunControl *rc, const QString &out);
void appendOutputInline(RunControl *rc, const QString &out);
void showTabFor(RunControl *rc);
-
+
public slots:
void projectRemoved();
void coreAboutToClose();
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 1d0d49afb8..ed1dc3748e 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -227,7 +227,7 @@ private:
Internal::ProjectFileFactory *findProjectFileFactory(const QString &filename) const;
static ProjectExplorerPlugin *m_instance;
- ProjectExplorerPluginPrivate *d;
+ ProjectExplorerPluginPrivate *d;
};
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 8382fcffc7..c00b97f931 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -128,7 +128,7 @@ FORMS += processstep.ui \
removefiledialog.ui \
projectexplorersettingspage.ui \
projectwelcomepagewidget.ui
-win32 {
+win32 {
SOURCES += applicationlauncher_win.cpp \
winguiprocess.cpp
HEADERS += winguiprocess.h
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index d775856cd7..82d90e791c 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -57,10 +57,10 @@ class BuildConfiguration;
* Note that all RunControls and the project hold a shared pointer to the RunConfiguration.
* That is the lifetime of the RunConfiguration might exceed the life of the project.
* The user might still have a RunControl running (or output tab of that RunControl open)
- * and yet unloaded the project.
- * Also a RunConfiguration might be already removed from the list of RunConfigurations
+ * and yet unloaded the project.
+ * Also a RunConfiguration might be already removed from the list of RunConfigurations
* for a project, but stil be runnable via the output tab.
-
+
*/
class PROJECTEXPLORER_EXPORT RunConfiguration : public QObject
{
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 1194211018..256e1ad423 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -641,7 +641,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
painter->drawPixmap(2, opt.rect.top() + 2, icon.pixmap(16, 16));
int width = opt.rect.width() - model->sizeOfFile() - model->sizeOfLineNumber() - 12 - 22;
- if (!selected) {
+ if (!selected) {
// in small mode we lay out differently
QString bottom = index.data(TaskModel::Description).toString();
painter->drawText(22, 2 + opt.rect.top() + fm.ascent(), bottom);
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 585836423a..323b65e347 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -373,7 +373,7 @@ QByteArray MSVCToolChain::predefinedMacros()
}
QByteArray newDefine = "#define " + key + " " + value + '\n';
m_predefinedMacros.append(newDefine);
- }
+ }
}
QFile::remove(tmpFilePath);
}
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index b3a11cb7be..4b0417edcb 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -97,7 +97,7 @@ public:
ToolChain();
virtual ~ToolChain();
-
+
static bool equals(ToolChain *, ToolChain *);
// Factory methods
static ToolChain *createGccToolChain(const QString &gcc);
diff --git a/src/plugins/qmleditor/qmleditorplugin.cpp b/src/plugins/qmleditor/qmleditorplugin.cpp
index 5958ab469a..6a77f7fc08 100644
--- a/src/plugins/qmleditor/qmleditorplugin.cpp
+++ b/src/plugins/qmleditor/qmleditorplugin.cpp
@@ -134,7 +134,7 @@ bool QmlEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err
m_completion->setCaseSensitivity(caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
settings->endGroup();
settings->endGroup();
-
+
error_message->clear();
return true;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h b/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h
index cd9a785a7f..ef4a21ac0b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectfileseditor.h
@@ -51,7 +51,7 @@ class ProjectFilesFactory: public Core::IEditorFactory
public:
ProjectFilesFactory(Manager *manager, TextEditor::TextEditorActionHandler *handler);
virtual ~ProjectFilesFactory();
-
+
Manager *manager() const;
virtual Core::IEditor *createEditor(QWidget *parent);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
index c797e461cf..5b619d3c7c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectwizard.cpp
@@ -244,7 +244,7 @@ bool QmlProjectWizard::isValidDir(const QFileInfo &fileInfo) const
return false;
else if (fileName == QLatin1String("CVS"))
- return false;
+ return false;
// ### user include/exclude
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
index 374fca6aec..2494093aeb 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.pri
@@ -23,4 +23,4 @@ FORMS += \
$$PWD/classdefinition.ui \
$$PWD/customwidgetwidgetswizardpage.ui \
$$PWD/customwidgetpluginwizardpage.ui
-
+
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
index c7fa053a7f..ff522e1f61 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
@@ -178,7 +178,7 @@ void copyRecursive(const QDir& from, const QDir& to, const QString& dir)
}
foreach(const QString& roDir, src.entryList(QDir::NoDotAndDotDot|QDir::Dirs)) {
copyRecursive(src, dest, QDir(roDir).dirName());
- }
+ }
}
} // namespace
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index e230758e15..9af4679f26 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -395,11 +395,11 @@ QSharedPointer<RunConfiguration> S60DeviceRunConfigurationFactory::create(Projec
// ======== S60DeviceRunControlBase
S60DeviceRunControlBase::S60DeviceRunControlBase(const QSharedPointer<RunConfiguration> &runConfiguration) :
- RunControl(runConfiguration),
+ RunControl(runConfiguration),
m_makesis(new QProcess(this)),
m_signsis(new QProcess(this)),
m_launcher(0)
-{
+{
connect(m_makesis, SIGNAL(readyReadStandardError()),
this, SLOT(readStandardError()));
connect(m_makesis, SIGNAL(readyReadStandardOutput()),
@@ -616,7 +616,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
initLauncher(runFileName, m_launcher);
emit addToOutputWindow(this, tr("Package: %1\nDeploying application to '%2'...").arg(lsFile(copySrc), m_serialPortFriendlyName));
QString errorMessage;
- // Prompt the user to start up the Blue tooth connection
+ // Prompt the user to start up the Blue tooth connection
const trk::PromptStartCommunicationResult src =
S60RunConfigBluetoothStarter::startCommunication(m_launcher->trkDevice(),
m_serialPortName,
@@ -722,7 +722,7 @@ void S60DeviceRunControlBase::slotWaitingForTrkClosed()
{
if (m_launcher && m_launcher->state() == trk::Launcher::WaitingForTrk) {
stop();
- error(this, tr("Canceled."));
+ error(this, tr("Canceled."));
emit finished();
}
}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 52fa3ed200..0c74103f7e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -109,7 +109,7 @@ private:
bool m_cachedTargetInformationValid;
QString m_serialPortName;
int m_communicationType;
- SigningMode m_signingMode;
+ SigningMode m_signingMode;
QString m_customSignaturePath;
QString m_customKeyPath;
};
@@ -174,7 +174,7 @@ private slots:
void slotLauncherStateChanged(int);
void slotWaitingForTrkClosed();
-private:
+private:
bool createPackageFileFromTemplate(QString *errorMessage);
QString m_serialPortName;
@@ -230,7 +230,7 @@ public:
virtual void stop();
-protected:
+protected:
virtual void initLauncher(const QString &executable, trk::Launcher *);
virtual void handleLauncherFinished();
virtual bool checkConfiguration(QString *errorMessage,
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
index 7fbbf9f7fc..58de3d7767 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
@@ -97,7 +97,7 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
formLayout->addRow(nameLabel, m_nameLineEdit);
formLayout->addRow(tr("Install File:"), m_sisxFileLabel);
- updateSerialDevices();
+ updateSerialDevices();
connect(S60Manager::instance()->serialDeviceLister(), SIGNAL(updated()),
this, SLOT(updateSerialDevices()));
// Serial devices control
@@ -271,7 +271,7 @@ void S60DeviceRunConfigurationWidget::updateSummary()
tr("<No Device>");
const QString signature = m_runConfiguration->signingMode() == S60DeviceRunConfiguration::SignCustom ?
tr("(custom certificate)") :
- tr("(self-signed certificate)");
+ tr("(self-signed certificate)");
m_detailsWidget->setSummaryText(tr("Summary: Run on '%1' %2").arg(device, signature));
}
@@ -351,7 +351,7 @@ void S60DeviceRunConfigurationWidget::updateDeviceInfo()
};
if (!m_infoLauncher->startServer(&message)) {
setDeviceInfoLabel(message, true);
- m_infoLauncher->deleteLater();
+ m_infoLauncher->deleteLater();
return;
}
// Wait for either timeout or results
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
index 74e9ceb0b6..db7e36e192 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
@@ -102,10 +102,10 @@ S60Manager::S60Manager(QObject *parent)
m_serialDeviceLister(new SerialDeviceLister(this))
{
m_instance = this;
-
+
addAutoReleasedObject(new S60DevicesPreferencePane(m_devices, this));
m_devices->detectQtForDevices(); // Order!
-
+
addAutoReleasedObject(new S60EmulatorRunConfigurationFactory(this));
addAutoReleasedObject(new RunControlFactory<S60EmulatorRunControl,
S60EmulatorRunConfiguration>
diff --git a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp
index 35e2b64254..bcfac48f4a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp
@@ -124,7 +124,7 @@ QList<CommunicationDevice> SerialDeviceLister::blueToothDevices() const
const QString friendlyFormat = QLatin1String("Bluetooth device (%1)");
for (int d = 0; d < 4; d++) {
CommunicationDevice device(BlueToothCommunication, prefix + QString::number(d));
- if (d == 0 || QFileInfo(device.portName).exists()) {
+ if (d == 0 || QFileInfo(device.portName).exists()) {
device.friendlyName = friendlyFormat.arg(device.portName);
rc.push_back(device);
}
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 468e9a260a..a5baa45ea0 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -103,7 +103,7 @@ static Core::Command *createSeparator(Core::ActionManager *am,
bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments)
-
+
Core::ICore *core = Core::ICore::instance();
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":qt4projectmanager/Qt4ProjectManager.mimetypes.xml"), errorMessage))
return false;
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 586e894ba9..343ace6110 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -405,7 +405,7 @@ void Qt4RunConfiguration::save(PersistentSettingsWriter &writer) const
}
void Qt4RunConfiguration::restore(const PersistentSettingsReader &reader)
-{
+{
LocalApplicationRunConfiguration::restore(reader);
const QDir projectDir = QFileInfo(project()->file()->fileName()).absoluteDir();
m_commandLineArguments = reader.restoreValue("CommandLineArguments").toStringList();
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index c41f096ffe..7268c14215 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -241,7 +241,7 @@ bool QtOptionsPageWidget::eventFilter(QObject *o, QEvent *e)
// Set the items tooltip, which may cause costly initialization
// of QtVersion and must be up-to-date
if (o != m_ui->qtdirList || e->type() != QEvent::ToolTip)
- return false;
+ return false;
QHelpEvent *helpEvent = static_cast<QHelpEvent *>(e);
const QPoint treePos = helpEvent->pos() - QPoint(0, m_ui->qtdirList->header()->height());
QTreeWidgetItem *item = m_ui->qtdirList->itemAt(treePos);
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h
index a12aa88e3c..93d14a3713 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.h
+++ b/src/plugins/qt4projectmanager/wizards/filespage.h
@@ -66,7 +66,7 @@ public:
bool formInputCheckable() const;
bool formInputChecked() const;
QStringList baseClassChoices() const;
- bool lowerCaseFiles() const;
+ bool lowerCaseFiles() const;
bool isClassTypeComboVisible() const;
void setSuffixes(const QString &header, const QString &source, const QString &form = QString());
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 2c4a7d2c86..9d638f1467 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -88,7 +88,7 @@ QWizard *GuiAppWizard::createWizardDialog(QWidget *parent,
// Order! suffixes first to generate files correctly
dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
- dialog->setBaseClasses(baseClasses());
+ dialog->setBaseClasses(baseClasses());
return dialog;
}
@@ -151,7 +151,7 @@ Core::GeneratedFiles GuiAppWizard::generateFiles(const QWizard *w,
form = QSharedPointer<Core::GeneratedFile>(new Core::GeneratedFile(formName));
if (!parametrizeTemplate(templatePath, QLatin1String("widget.ui"), params, &contents, errorMessage))
return Core::GeneratedFiles();
- form->setContents(contents);
+ form->setContents(contents);
if (!generateFormClass(params, *form, &formSource, &formHeader, errorMessage))
return Core::GeneratedFiles();
} else {
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index 9247d26b3c..fa88655942 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -61,7 +61,7 @@ QWizard *LibraryWizard::createWizardDialog(QWidget *parent,
LibraryWizardDialog *dialog = new LibraryWizardDialog(name(), icon(), extensionPages, parent);
dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
dialog->setPath(defaultPath.isEmpty() ? Utils::PathChooser::homePath() : defaultPath);
- dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
+ dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
return dialog;
}
diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
index 266d2d4820..cb04be4dd9 100644
--- a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp
@@ -121,7 +121,7 @@ bool QtScriptEditorPlugin::initialize(const QStringList & /*arguments*/, QString
m_completion->setCaseSensitivity(caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
settings->endGroup();
settings->endGroup();
-
+
error_message->clear();
return true;
diff --git a/src/plugins/snippets/snippets.pro b/src/plugins/snippets/snippets.pro
index 99d391e73f..8c6eb285cd 100644
--- a/src/plugins/snippets/snippets.pro
+++ b/src/plugins/snippets/snippets.pro
@@ -13,12 +13,12 @@ HEADERS += snippetsplugin.h \
snippetswindow.h \
snippetspec.h \
snippetscompletion.h \
- inputwidget.h
+ inputwidget.h
SOURCES += snippetsplugin.cpp \
snippetswindow.cpp \
snippetspec.cpp \
snippetscompletion.cpp \
- inputwidget.cpp
+ inputwidget.cpp
RESOURCES += snippets.qrc
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 0060e02395..43cbbc48cd 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -783,7 +783,7 @@ void SubversionPlugin::annotate(const QString &file)
if (Core::IEditor *editor = locateEditor("annotateFileName", file)) {
editor->createNew(response.stdOut);
VCSBase::VCSBaseEditor::gotoLineOfEditor(editor, lineNumber);
- Core::EditorManager::instance()->activateEditor(editor);
+ Core::EditorManager::instance()->activateEditor(editor);
} else {
const QString title = QString::fromLatin1("svn annotate %1").arg(QFileInfo(file).fileName());
Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VCSBase::AnnotateOutput, file, codec);
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 97479b37c2..56a1207538 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -98,7 +98,7 @@ void BaseFileFind::findAll(const QString &txt, QTextDocument::FindFlags findFlag
m_watcher.setFuture(Utils::findInFilesRegExp(txt, files(), findFlags, ITextEditor::openedTextEditorsContents()));
else
m_watcher.setFuture(Utils::findInFiles(txt, files(), findFlags, ITextEditor::openedTextEditorsContents()));
- Core::FutureProgress *progress =
+ Core::FutureProgress *progress =
Core::ICore::instance()->progressManager()->addTask(m_watcher.future(),
"Search",
Constants::TASK_SEARCH,
diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
index 8fcaef51fc..c0b5c8bd9a 100644
--- a/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
+++ b/src/plugins/vcsbase/checkoutprogresswizardpage.cpp
@@ -63,7 +63,7 @@ void CheckoutProgressWizardPage::start(const QSharedPointer<AbstractCheckoutJob>
connect(job.data(), SIGNAL(succeeded()), this, SLOT(slotSucceeded()));
QApplication::setOverrideCursor(Qt::WaitCursor);
ui->logPlainTextEdit->clear();
- setSubTitle(tr("Checkout started..."));
+ setSubTitle(tr("Checkout started..."));
m_state = Running;
// Note: Process jobs can emit failed() right from
// the start() method on Windows.
@@ -84,7 +84,7 @@ void CheckoutProgressWizardPage::slotFailed(const QString &why)
void CheckoutProgressWizardPage::slotSucceeded()
{
if (m_state == Running) {
- m_state = Succeeded;
+ m_state = Succeeded;
QApplication::restoreOverrideCursor();
setSubTitle(tr("Succeeded."));
emit completeChanged();
diff --git a/src/plugins/vcsbase/nicknamedialog.cpp b/src/plugins/vcsbase/nicknamedialog.cpp
index 2620186330..822149b677 100644
--- a/src/plugins/vcsbase/nicknamedialog.cpp
+++ b/src/plugins/vcsbase/nicknamedialog.cpp
@@ -118,7 +118,7 @@ QString NickNameEntry::nickName() const
QList<QStandardItem *> NickNameEntry::toModelRow() const
{
- const QVariant nickNameData = nickName();
+ const QVariant nickNameData = nickName();
const Qt::ItemFlags flags = Qt::ItemIsSelectable|Qt::ItemIsEnabled;
QStandardItem *i1 = new QStandardItem(name);
i1->setFlags(flags);
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 4536445054..ca222831a4 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -270,11 +270,11 @@ void VCSBaseEditor::slotPopulateDiffBrowser()
}
}
-void VCSBaseEditor::slotDiffBrowse(int index)
+void VCSBaseEditor::slotDiffBrowse(int index)
{
// goto diffed file as indicated by index/line number
if (index < 0 || index >= d->m_diffSections.size())
- return;
+ return;
const int lineNumber = d->m_diffSections.at(index);
Core::EditorManager *editorManager = Core::EditorManager::instance();
editorManager->addCurrentPositionToNavigationHistory();
@@ -300,7 +300,7 @@ void VCSBaseEditor::slotDiffCursorPositionChanged()
// Adapt diff file browse combo to new position
// if the cursor goes across a file line.
QTC_ASSERT(d->m_parameters->type == DiffOutput, return)
- const int newCursorLine = textCursor().blockNumber();
+ const int newCursorLine = textCursor().blockNumber();
if (newCursorLine == d->m_cursorLine)
return;
// Which section does it belong to?
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 82efcb537b..6392a1f27b 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -204,7 +204,7 @@ void VCSBaseSubmitEditor::createUserFields(const QString &fieldConfigFile)
Utils::SubmitFieldWidget *fieldWidget = new Utils::SubmitFieldWidget;
connect(fieldWidget, SIGNAL(browseButtonClicked(int,QString)),
- this, SLOT(slotSetFieldNickName(int)));
+ this, SLOT(slotSetFieldNickName(int)));
fieldWidget->setCompleter(completer);
fieldWidget->setAllowDuplicateFields(true);
fieldWidget->setHasBrowseButton(true);
@@ -557,7 +557,7 @@ bool VCSBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
if (!checkProcess.waitForFinished()) {
*errorMessage = tr("The check script '%1' could not be run: %2").arg(checkScript, checkProcess.errorString());
return false;
- }
+ }
const int exitCode = checkProcess.exitCode();
if (exitCode != 0) {
*errorMessage = QString::fromLocal8Bit(checkProcess.readAllStandardError());
diff --git a/src/rpath.pri b/src/rpath.pri
index e11b171c8e..750d0ed4d8 100644
--- a/src/rpath.pri
+++ b/src/rpath.pri
@@ -5,7 +5,7 @@ macx {
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
-
+
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR =
}
diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp
index a6c37904ff..91ef6b7281 100644
--- a/src/shared/cpaster/cgi.cpp
+++ b/src/shared/cpaster/cgi.cpp
@@ -39,7 +39,7 @@ QString CGI::encodeURL(const QString &rawText)
QByteArray utf = rawText.toUtf8();
QString enc;
enc.reserve(utf.length()); // Make sure we at least have space for a normal US-ASCII URL
-
+
QByteArray::const_iterator it = utf.constBegin();
while (it != utf.constEnd()) {
char ch = *it;
diff --git a/src/shared/cpaster/splitter.cpp b/src/shared/cpaster/splitter.cpp
index e08411d52c..34e13ca0e1 100644
--- a/src/shared/cpaster/splitter.cpp
+++ b/src/shared/cpaster/splitter.cpp
@@ -62,7 +62,7 @@ FileDataList splitDiffToFiles(const QByteArray &data)
// The algorithm works like this:
// On the first match we only get the filename of the first patch part
// On the second match (if any) we get the diff content, and the name of the next file patch
-
+
while (-1 != (splitIndex = splitExpr.indexIn(strData,splitIndex))) {
if (!filename.isEmpty()) {
QString content = strData.mid(previousSplit, splitIndex - previousSplit);
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index bad5233f02..670ba02fed 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -2206,7 +2206,7 @@ bool Parser::maybeAmbiguousStatement(DeclarationStatementAST *ast) const
if (declarator->postfix_declarators && declarator->postfix_declarators->asFunctionDeclarator()
&& ! declarator->initializer) {
return false;
- }
+ }
}
return true;
diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h
index fc46e18e65..fb283f2a7f 100644
--- a/src/shared/designerintegrationv2/formresizer.h
+++ b/src/shared/designerintegrationv2/formresizer.h
@@ -52,7 +52,7 @@ class SizeHandleRect;
* | |
* | |
* Handles QVBoxLayout [margin: SELECTION_MARGIN]
- * |
+ * |
* Frame [margin: lineWidth]
* |
* QVBoxLayout
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index 4a088bee51..e804ffbb2c 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -610,7 +610,7 @@ BookmarkManager::BookmarkManager(QHelpEngineCore* _helpEngine)
{
bookmarkIcon = QIcon(QLatin1String(":/help/images/bookmark.png"));
folderIcon = QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon);
-
+
connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this,
SLOT(itemChanged(QStandardItem*)));
}
@@ -719,7 +719,7 @@ void BookmarkManager::addNewBookmark(const QModelIndex& index,
item->setIcon(bookmarkIcon);
item->setData(false, Qt::UserRole + 11);
item->setData(url, Qt::UserRole + 10);
-
+
if (index.isValid())
treeModel->itemFromIndex(index)->appendRow(item);
else
diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h
index e0fba25ae2..76ae6256f2 100644
--- a/src/shared/help/bookmarkmanager.h
+++ b/src/shared/help/bookmarkmanager.h
@@ -64,7 +64,7 @@ class BookmarkDialog : public QDialog
Q_OBJECT
public:
- BookmarkDialog(BookmarkManager *manager, const QString &title,
+ BookmarkDialog(BookmarkManager *manager, const QString &title,
const QString &url, QWidget *parent = 0);
~BookmarkDialog();
@@ -77,7 +77,7 @@ private slots:
void selectBookmarkFolder(const QString &folderName);
void customContextMenuRequested(const QPoint &point);
void currentChanged(const QModelIndex& current);
-
+
private:
bool eventFilter(QObject *object, QEvent *e);
@@ -175,7 +175,7 @@ public:
private slots:
void itemChanged(QStandardItem *item);
-private:
+private:
QString uniqueFolderName() const;
void removeBookmarkFolderItems(QStandardItem *item);
void readBookmarksRecursive(const QStandardItem *item, QDataStream &stream,
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index c1eea45e54..10ca5e7aae 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -183,7 +183,7 @@ void IndexWindow::open(QHelpIndexWidget* indexWidget, const QModelIndex &index)
QUrl url;
if (links.count() > 1) {
TopicChooser tc(this, keyword, links);
- if (tc.exec() == QDialog::Accepted)
+ if (tc.exec() == QDialog::Accepted)
url = tc.link();
} else if (links.count() == 1) {
url = links.constBegin().value();
diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp
index dea020f615..f2db5acd0d 100644
--- a/src/shared/help/topicchooser.cpp
+++ b/src/shared/help/topicchooser.cpp
@@ -45,7 +45,7 @@ TopicChooser::TopicChooser(QWidget *parent, const QString &keyword,
QMap<QString, QUrl>::const_iterator it = m_links.constBegin();
for (; it != m_links.constEnd(); ++it)
ui.listWidget->addItem(it.key());
-
+
if (ui.listWidget->count() != 0)
ui.listWidget->setCurrentRow(0);
ui.listWidget->setFocus();
diff --git a/src/shared/help/topicchooser.h b/src/shared/help/topicchooser.h
index c75945425f..9258fe48ee 100644
--- a/src/shared/help/topicchooser.h
+++ b/src/shared/help/topicchooser.h
@@ -48,8 +48,8 @@ public:
TopicChooser(QWidget *parent, const QString &keyword,
const QMap<QString, QUrl> &links);
- QUrl link() const;
-
+ QUrl link() const;
+
private:
Ui::TopicChooser ui;
QMap<QString, QUrl> m_links;
diff --git a/src/shared/proparser/procommandmanager.cpp b/src/shared/proparser/procommandmanager.cpp
index 745fc7a270..e501bd1b86 100644
--- a/src/shared/proparser/procommandmanager.cpp
+++ b/src/shared/proparser/procommandmanager.cpp
@@ -67,7 +67,7 @@ ProCommandManager::ProCommandManager(QObject *parent)
ProCommandManager::~ProCommandManager()
{
- qDeleteAll(m_groups);
+ qDeleteAll(m_groups);
}
void ProCommandManager::beginGroup(const QString &name)
@@ -80,7 +80,7 @@ void ProCommandManager::beginGroup(const QString &name)
delete m_groups.takeLast();
m_pos = m_groups.count();
}
-
+
m_group = new ProCommandGroup(name);
}
diff --git a/src/shared/proparser/procommandmanager.h b/src/shared/proparser/procommandmanager.h
index 4929ee210e..5165346de0 100644
--- a/src/shared/proparser/procommandmanager.h
+++ b/src/shared/proparser/procommandmanager.h
@@ -40,7 +40,7 @@ QT_END_NAMESPACE
namespace Qt4ProjectManager {
namespace Internal {
-
+
class ProCommand
{
public:
@@ -97,7 +97,7 @@ signals:
private:
ProCommandGroup *m_group;
QList<ProCommandGroup *> m_groups;
-
+
int m_pos;
ProCommandGroup *m_savepoint;
};
diff --git a/src/shared/proparser/proeditormodel.cpp b/src/shared/proparser/proeditormodel.cpp
index dcdab35fe2..c4e0122dc4 100644
--- a/src/shared/proparser/proeditormodel.cpp
+++ b/src/shared/proparser/proeditormodel.cpp
@@ -42,7 +42,7 @@ using namespace Qt4ProjectManager::Internal;
namespace Qt4ProjectManager {
namespace Internal {
-
+
class ProAddCommand : public ProCommand
{
public:
@@ -707,7 +707,7 @@ bool ProEditorModel::insertModelItem(ProItem *item, int row, const QModelIndex &
beginInsertRows(parent, row, row);
block->setItems(proitems);
endInsertRows();
-
+
markProFileModified(parent);
return true;
}
@@ -728,7 +728,7 @@ bool ProEditorModel::insertItem(ProItem *item, int row, const QModelIndex &paren
void ProEditorModel::markProFileModified(QModelIndex index)
{
- while (index.isValid()) {
+ while (index.isValid()) {
if (proItem(index)->kind() == ProItem::BlockKind) {
ProBlock * block = proBlock(index);
if (block->blockKind() == ProBlock::ProFileKind) {
diff --git a/src/shared/proparser/proeditormodel.h b/src/shared/proparser/proeditormodel.h
index 00ba4bb710..5c5b518b7c 100644
--- a/src/shared/proparser/proeditormodel.h
+++ b/src/shared/proparser/proeditormodel.h
@@ -77,7 +77,7 @@ public:
ProBlock *proBlock(const QModelIndex &index) const;
ProVariable *proVariable(const QModelIndex &index) const;
- QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &index) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -118,12 +118,12 @@ class ProScopeFilter : public QSortFilterProxyModel
Q_OBJECT
public:
- enum CheckableType {
+ enum CheckableType {
None,
- Variable,
+ Variable,
Blocks
};
-
+
void setVariableFilter(const QStringList &vars);
void setCheckable( CheckableType ct );
diff --git a/src/shared/proparser/proiteminfo.cpp b/src/shared/proparser/proiteminfo.cpp
index 165a96aea5..ff38c5d778 100644
--- a/src/shared/proparser/proiteminfo.cpp
+++ b/src/shared/proparser/proiteminfo.cpp
@@ -93,7 +93,7 @@ ProVariableInfo::~ProVariableInfo()
void ProVariableInfo::addValue(ProValueInfo *value)
{
- m_values.insert(value->id(), value);
+ m_values.insert(value->id(), value);
}
void ProVariableInfo::setMultiple(bool multiple)
diff --git a/src/shared/proparser/prowriter.cpp b/src/shared/proparser/prowriter.cpp
index 39236c0656..543434cc45 100644
--- a/src/shared/proparser/prowriter.cpp
+++ b/src/shared/proparser/prowriter.cpp
@@ -45,7 +45,7 @@ bool ProWriter::write(ProFile *profile, const QString &fileName)
m_out.setDevice(&data);
writeItem(profile, QString());
data.close();
-
+
return true;
}
@@ -64,7 +64,7 @@ QString ProWriter::contents(ProFile *profile)
QString ProWriter::fixComment(const QString &comment, const QString &indent) const
{
QString result = comment;
- result = result.replace(QLatin1Char('\n'),
+ result = result.replace(QLatin1Char('\n'),
QLatin1Char('\n') + indent + QLatin1String("# "));
return QLatin1String("# ") + result;
}
@@ -75,7 +75,7 @@ void ProWriter::writeValue(ProValue *value, const QString &indent)
m_out << indent << QLatin1String(" ");
m_writeState &= ~NewLine;
}
-
+
m_out << value->value();
if (!(m_writeState & LastItem))
diff --git a/src/shared/proparser/proxml.cpp b/src/shared/proparser/proxml.cpp
index 8e31271bf2..2556f00394 100644
--- a/src/shared/proparser/proxml.cpp
+++ b/src/shared/proparser/proxml.cpp
@@ -48,7 +48,7 @@ QString ProXmlParser::itemToString(ProItem *item)
QDomNode ProXmlParser::createItemNode(QDomDocument doc, ProItem *item) const
{
-
+
QDomElement tag;
if (item->kind() == ProItem::ValueKind) {
tag = doc.createElement(QLatin1String("value"));
@@ -106,14 +106,14 @@ QDomNode ProXmlParser::createItemNode(QDomDocument doc, ProItem *item) const
tag.appendChild(childNode);
}
}
-
+
QString comment = item->comment();
comment = comment.replace('\\', QLatin1String("\\\\"));
comment = comment.replace('\n', QLatin1String("\\n"));
if (!comment.isEmpty())
tag.setAttribute(QLatin1String("comment"), comment);
-
+
return tag;
}
diff --git a/src/shared/qrceditor/resourcefile_p.h b/src/shared/qrceditor/resourcefile_p.h
index 3d02d596cb..cb4bc2a368 100644
--- a/src/shared/qrceditor/resourcefile_p.h
+++ b/src/shared/qrceditor/resourcefile_p.h
@@ -145,7 +145,7 @@ public:
void removePrefix(int prefix_idx);
void removeFile(int prefix_idx, int file_idx);
-
+
void replacePrefix(int prefix_idx, const QString &prefix);
void replaceLang(int prefix_idx, const QString &lang);
void replaceAlias(int prefix_idx, int file_idx, const QString &alias);
diff --git a/src/shared/qrceditor/resourceview.h b/src/shared/qrceditor/resourceview.h
index a7d75748d5..503249837b 100644
--- a/src/shared/qrceditor/resourceview.h
+++ b/src/shared/qrceditor/resourceview.h
@@ -94,7 +94,7 @@ public:
bool isDirty() const;
void setDirty(bool dirty);
- void enableContextMenu(bool enable);
+ void enableContextMenu(bool enable);
void addFiles(QStringList fileList, const QModelIndex &index);
diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h
index ebf7217182..3ee58a8076 100644
--- a/src/shared/qtlockedfile/qtlockedfile.h
+++ b/src/shared/qtlockedfile/qtlockedfile.h
@@ -52,18 +52,18 @@ namespace SharedTools {
class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile
{
-public:
+public:
enum LockMode { NoLock = 0, ReadLock, WriteLock };
QtLockedFile();
QtLockedFile(const QString &name);
~QtLockedFile();
-
+
bool lock(LockMode mode, bool block = true);
bool unlock();
bool isLocked() const;
LockMode lockMode() const;
-
+
private:
#ifdef Q_OS_WIN
Qt::HANDLE m_semaphore_hnd;
diff --git a/src/shared/qtlockedfile/qtlockedfile_unix.cpp b/src/shared/qtlockedfile/qtlockedfile_unix.cpp
index b83129e370..32930ef003 100644
--- a/src/shared/qtlockedfile/qtlockedfile_unix.cpp
+++ b/src/shared/qtlockedfile/qtlockedfile_unix.cpp
@@ -42,10 +42,10 @@ bool QtLockedFile::lock(LockMode mode, bool block)
qWarning("QtLockedFile::lock(): file is not opened");
return false;
}
-
+
if (mode == NoLock)
return unlock();
-
+
if (mode == m_lock_mode)
return true;
@@ -59,14 +59,14 @@ bool QtLockedFile::lock(LockMode mode, bool block)
fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK;
int cmd = block ? F_SETLKW : F_SETLK;
int ret = fcntl(handle(), cmd, &fl);
-
+
if (ret == -1) {
if (errno != EINTR && errno != EAGAIN)
qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
return false;
}
-
+
m_lock_mode = mode;
return true;
}
@@ -88,12 +88,12 @@ bool QtLockedFile::unlock()
fl.l_len = 0;
fl.l_type = F_UNLCK;
int ret = fcntl(handle(), F_SETLKW, &fl);
-
+
if (ret == -1) {
qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
return false;
}
-
+
m_lock_mode = NoLock;
return true;
}
diff --git a/src/shared/trk/bluetoothlistener.cpp b/src/shared/trk/bluetoothlistener.cpp
index 1f5ccbe51b..08392320be 100644
--- a/src/shared/trk/bluetoothlistener.cpp
+++ b/src/shared/trk/bluetoothlistener.cpp
@@ -172,7 +172,7 @@ bool BluetoothListener::start(const QString &device, QString *errorMessage)
return true;
}
-void BluetoothListener::slotStdOutput()
+void BluetoothListener::slotStdOutput()
{
emitMessage(QString::fromLocal8Bit(d->process.readAllStandardOutput()));
}
diff --git a/src/shared/trk/bluetoothlistener_gui.cpp b/src/shared/trk/bluetoothlistener_gui.cpp
index 9b6dbd3bc6..7463a03060 100644
--- a/src/shared/trk/bluetoothlistener_gui.cpp
+++ b/src/shared/trk/bluetoothlistener_gui.cpp
@@ -61,7 +61,7 @@ PromptStartCommunicationResult
QMessageBox messageBox(QMessageBox::Information, msgBoxTitle, msgBoxText, QMessageBox::Cancel, msgBoxParent);
QObject::connect(&starter, SIGNAL(connected()), &messageBox, SLOT(close()));
QObject::connect(&starter, SIGNAL(timeout()), &messageBox, SLOT(close()));
- messageBox.exec();
+ messageBox.exec();
// Only starter.state() is reliable here to obtain the state.
switch (starter.state()) {
case AbstractBluetoothStarter::Running:
diff --git a/src/shared/trk/launcher.cpp b/src/shared/trk/launcher.cpp
index 8be5dcd132..b354a7e1db 100644
--- a/src/shared/trk/launcher.cpp
+++ b/src/shared/trk/launcher.cpp
@@ -88,7 +88,7 @@ Launcher::Launcher(Actions startupActions,
d(new LauncherPrivate(dev))
{
d->m_startupActions = startupActions;
- connect(d->m_device.data(), SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult)));
+ connect(d->m_device.data(), SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult)));
connect(this, SIGNAL(finished()), d->m_device.data(), SLOT(close()));
}
diff --git a/src/shared/trk/launcher.h b/src/shared/trk/launcher.h
index c70b05c879..a17bace477 100644
--- a/src/shared/trk/launcher.h
+++ b/src/shared/trk/launcher.h
@@ -84,7 +84,7 @@ public:
void setInstallFileName(const QString &name);
void setCommandLineArgs(const QStringList &args);
bool startServer(QString *errorMessage);
- void setVerbose(int v);
+ void setVerbose(int v);
void setSerialFrame(bool b);
bool serialFrame() const;
// Close device or leave it open
diff --git a/src/shared/trk/trkdevice.cpp b/src/shared/trk/trkdevice.cpp
index a76cff79c2..b2316f99ec 100644
--- a/src/shared/trk/trkdevice.cpp
+++ b/src/shared/trk/trkdevice.cpp
@@ -134,7 +134,7 @@ namespace trk {
///////////////////////////////////////////////////////////////////////
class TrkWriteQueue
-{
+{
Q_DISABLE_COPY(TrkWriteQueue)
public:
explicit TrkWriteQueue();
@@ -325,7 +325,7 @@ DeviceContext::DeviceContext() :
class WriterThread : public QThread {
Q_OBJECT
Q_DISABLE_COPY(WriterThread)
-public:
+public:
explicit WriterThread(const QSharedPointer<DeviceContext> &context);
// Enqueue messages.
@@ -350,7 +350,7 @@ public slots:
private slots:
void invokeNoopMessage(const trk::TrkMessage &);
-private:
+private:
bool write(const QByteArray &data, QString *errorMessage);
inline int writePendingMessage();
@@ -658,7 +658,7 @@ int WinReaderThread::tryRead()
if (!ClearCommError(m_context->device, NULL, &comStat)){
emit error(QString::fromLatin1("ClearCommError failed: %1").arg(winErrorMessage(GetLastError())));
return -7;
- }
+ }
const DWORD bytesToRead = qMax(DWORD(1), qMin(comStat.cbInQue, DWORD(BufSize)));
// Trigger read
DWORD bytesRead = 0;
@@ -674,7 +674,7 @@ int WinReaderThread::tryRead()
if (readError != ERROR_IO_PENDING) {
emit error(QString::fromLatin1("Read error: %1").arg(winErrorMessage(readError)));
return -1;
- }
+ }
// Wait for either termination or data
const DWORD wr = WaitForMultipleObjects(HandleCount, m_handles, false, INFINITE);
if (wr == WAIT_FAILED) {
@@ -749,7 +749,7 @@ private:
int m_terminatePipeFileDescriptors[2];
};
-UnixReaderThread::UnixReaderThread(const QSharedPointer<DeviceContext> &context) :
+UnixReaderThread::UnixReaderThread(const QSharedPointer<DeviceContext> &context) :
ReaderThreadBase(context)
{
m_terminatePipeFileDescriptors[0] = m_terminatePipeFileDescriptors[1] = -1;
@@ -943,8 +943,8 @@ bool TrkDevice::open(const QString &port, QString *errorMessage)
d->writerThread = QSharedPointer<WriterThread>(new WriterThread(d->deviceContext));
connect(d->writerThread.data(), SIGNAL(error(QString)), this, SLOT(emitError(QString)),
- Qt::QueuedConnection);
- d->writerThread->start();
+ Qt::QueuedConnection);
+ d->writerThread->start();
if (d->verbose)
qDebug() << "Opened" << port;
@@ -1009,7 +1009,7 @@ void TrkDevice::setVerbose(int b)
void TrkDevice::slotMessageReceived(const trk::TrkResult &result, const QByteArray &rawData)
{
d->writerThread->slotHandleResult(result);
- emit messageReceived(result);
+ emit messageReceived(result);
if (!rawData.isEmpty())
emit rawDataReceived(rawData);
}
diff --git a/src/shared/trk/trkdevice.h b/src/shared/trk/trkdevice.h
index 632dea1b24..fd6a961b08 100644
--- a/src/shared/trk/trkdevice.h
+++ b/src/shared/trk/trkdevice.h
@@ -51,7 +51,7 @@ struct TrkDevicePrivate;
* Trk communications. Provides synchronous write and asynchronous
* read operation.
* The serialFrames property specifies whether packets are encapsulated in
- * "0x90 <length>" frames, which is currently the case for serial ports.
+ * "0x90 <length>" frames, which is currently the case for serial ports.
* Contains a write message queue allowing
* for queueing messages with a notification callback. If the message receives
* an ACK, the callback is invoked.
diff --git a/src/shared/trk/trkutils.h b/src/shared/trk/trkutils.h
index 4ba51fa42b..824c67bb9e 100644
--- a/src/shared/trk/trkutils.h
+++ b/src/shared/trk/trkutils.h
@@ -109,7 +109,7 @@ struct Library
struct TrkAppVersion {
TrkAppVersion();
- void reset();
+ void reset();
int trkMajor;
int trkMinor;
diff --git a/src/tools/makespy/makespy.pro b/src/tools/makespy/makespy.pro
index 604f309a26..ac7d7ea51f 100644
--- a/src/tools/makespy/makespy.pro
+++ b/src/tools/makespy/makespy.pro
@@ -3,4 +3,4 @@ CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp
-HEADERS +=
+HEADERS +=
diff --git a/src/tools/qdebugger/lean.h b/src/tools/qdebugger/lean.h
index b01038f512..a2d63af4ba 100644
--- a/src/tools/qdebugger/lean.h
+++ b/src/tools/qdebugger/lean.h
@@ -141,7 +141,7 @@ public:
return result;
}
-public:
+public:
QString m_fileName;
};
diff --git a/src/tools/qdebugger/mainwindow.cpp b/src/tools/qdebugger/mainwindow.cpp
index 3f2d16540c..4a80587358 100644
--- a/src/tools/qdebugger/mainwindow.cpp
+++ b/src/tools/qdebugger/mainwindow.cpp
@@ -189,7 +189,7 @@ MainWindow::MainWindow()
//
// Files
- //
+ //
QDockWidget *filesDock = new QDockWidget(this);
filesDock->setObjectName("FilesDock");
filesDock->setGeometry(QRect(0, 0, 200, 200));
@@ -235,7 +235,7 @@ MainWindow::MainWindow()
debugMenu->addAction(m_manager->m_breakAction);
//debugMenu->addAction(m_startDebuggerAction);
menuBar()->addMenu(debugMenu);
-
+
//
// Toolbar
//
@@ -306,7 +306,7 @@ void MainWindow::loadFiles(const QStringList &fileNames)
return;
foreach (const QString &fileName, fileNames)
loadFile(fileName);
- startDebuggingRequest();
+ startDebuggingRequest();
}
void MainWindow::startDebuggingRequest()
@@ -434,7 +434,7 @@ void MainWindow::gotoLocation(const QString &fileName, int line, bool setMarker)
Q_UNUSED(setMarker)
TextViewer *textViewer = findOrCreateTextViewer(fileName);
m_textViewers->setCurrentWidget(textViewer);
-
+
const int blockNumber = line - 1;
const QTextBlock &block = textViewer->document()->findBlockByNumber(blockNumber);
if (block.isValid()) {
@@ -479,7 +479,7 @@ void MainWindow::fileOpen()
settings().setValue("FileOpen/LastDir", QFileInfo(fileName).dir().dirName());
if (fileName.isEmpty())
return;
- loadFile(fileName);
+ loadFile(fileName);
}
void MainWindow::queryCurrentTextEditor(QString *fileName, int *line, QObject **object)
@@ -531,7 +531,7 @@ void MainWindow::handleDataDumpersUnavailable()
{
QMessageBox::warning(this, tr("Cannot find special data dumpers"),
tr("The debugged binary does not contain information needed for "
- "nice display of Qt data types.\n\n"
+ "nice display of Qt data types.\n\n"
"Make sure you use something like\n\n"
"SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp\n\n"
"in your .pro file.")
diff --git a/src/tools/qdebugger/mainwindow.h b/src/tools/qdebugger/mainwindow.h
index 924cc8c0b2..6af0dfbcad 100644
--- a/src/tools/qdebugger/mainwindow.h
+++ b/src/tools/qdebugger/mainwindow.h
@@ -37,7 +37,7 @@
namespace GdbDebugger {
namespace Internal {
-class DebuggerManager;
+class DebuggerManager;
} // namespace Internal
} // namespace GdbDebugger
diff --git a/src/tools/qdebugger/qdebugger.pro b/src/tools/qdebugger/qdebugger.pro
index 0b28902f2c..1ec685a708 100644
--- a/src/tools/qdebugger/qdebugger.pro
+++ b/src/tools/qdebugger/qdebugger.pro
@@ -14,7 +14,7 @@ DEFINES += GDBDEBUGGERLEAN
INCLUDEPATH += $${QTCREATOR}
INCLUDEPATH += $${QTCREATOR}/gdbdebugger
-HEADERS += \
+HEADERS += \
lean.h \
mainwindow.h \
$${QTCREATOR}/gdbdebugger/attachexternaldialog.h \
@@ -83,13 +83,13 @@ FORMS += \
true {
DEFINES += USE_BASETEXTEDITOR
-DEFINES += TEXTEDITOR_STANDALONE
+DEFINES += TEXTEDITOR_STANDALONE
INCLUDEPATH += $${QTCREATOR}
INCLUDEPATH += $${QTCREATOR}/texteditor
INCLUDEPATH += $${QTCREATOR}/../libs
-HEADERS += \
+HEADERS += \
$${QTCREATOR}/texteditor/basetextdocument.h \
$${QTCREATOR}/texteditor/basetexteditor.h \
$${QTCREATOR}/texteditor/storagesettings.h \
diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp
index 011e819908..8054ddc8d8 100644
--- a/src/tools/qtcreatorwidgets/customwidgets.cpp
+++ b/src/tools/qtcreatorwidgets/customwidgets.cpp
@@ -219,7 +219,7 @@ QString DetailsWidget_CW::domXml() const
void DetailsWidget_CW::initialize(QDesignerFormEditorInterface *core)
{
const bool firstTime = !initialized();
- CustomWidget<Utils::DetailsWidget>::initialize(core);
+ CustomWidget<Utils::DetailsWidget>::initialize(core);
if (firstTime)
if (QExtensionManager *manager = core->extensionManager())
manager->registerExtensions(new DetailsWidgetExtensionFactory(manager), Q_TYPEID(QDesignerContainerExtension));
diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h
index 0543c78764..41d2d87a42 100644
--- a/src/tools/qtcreatorwidgets/customwidgets.h
+++ b/src/tools/qtcreatorwidgets/customwidgets.h
@@ -238,7 +238,7 @@ public:
virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const;
private:
- QList<QDesignerCustomWidgetInterface*> m_plugins;
+ QList<QDesignerCustomWidgetInterface*> m_plugins;
};
#endif // CUSTOMWIDGETS_H
diff --git a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
index 6dd4d90958..93822c2c33 100644
--- a/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
+++ b/src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
@@ -5,7 +5,7 @@ TEMPLATE = lib
HEADERS = customwidgets.h \
customwidget.h
-SOURCES = customwidgets.cpp
+SOURCES = customwidgets.cpp
# Link against the qtcreator utils lib
diff --git a/src/tools/qtlibspatcher/binpatch.cpp b/src/tools/qtlibspatcher/binpatch.cpp
index 057cd8853b..ee2ae72aa8 100644
--- a/src/tools/qtlibspatcher/binpatch.cpp
+++ b/src/tools/qtlibspatcher/binpatch.cpp
@@ -70,7 +70,7 @@ bool BinPatch::endsWithTokens(const char *data)
while(token != NULL) {
// check if it ends with the token
- if ((tlen >= strlen(token))
+ if ((tlen >= strlen(token))
&& (strcasecmp((data+tlen)-strlen(token), token) == 0))
return true;
token = strtok(NULL, ";");
diff --git a/src/tools/qtlibspatcher/binpatch.h b/src/tools/qtlibspatcher/binpatch.h
index 3d7c7aed68..f24e6163f9 100644
--- a/src/tools/qtlibspatcher/binpatch.h
+++ b/src/tools/qtlibspatcher/binpatch.h
@@ -58,7 +58,7 @@ private:
long getBufferStringLength(char *data, char *end);
bool endsWithTokens(const char *data);
- bool patchHelper(char *inbuffer, const char *oldstr,
+ bool patchHelper(char *inbuffer, const char *oldstr,
const char *newstr, size_t len, long *rw);
bool useLength;
diff --git a/src/tools/qtlibspatcher/qtlibspatcher.pro b/src/tools/qtlibspatcher/qtlibspatcher.pro
index 453c4fc7df..83eab9088f 100644
--- a/src/tools/qtlibspatcher/qtlibspatcher.pro
+++ b/src/tools/qtlibspatcher/qtlibspatcher.pro
@@ -5,7 +5,7 @@
CONFIG += console
QT -= gui
TEMPLATE = app
-TARGET =
+TARGET =
DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = .
diff --git a/src/tools/texteditor/mainwindow.cpp b/src/tools/texteditor/mainwindow.cpp
index 693e079b99..e3deadde01 100644
--- a/src/tools/texteditor/mainwindow.cpp
+++ b/src/tools/texteditor/mainwindow.cpp
@@ -78,9 +78,9 @@ public:
{
return new MyEditable(this);
}
-
+
void setPlainText(const QString &contents)
- {
+ {
qDebug() << "Setting contents to:\n" << contents;
QPlainTextEdit::setPlainText(contents);
}
@@ -188,7 +188,7 @@ void MainWindow::fileOpen()
settings().setValue("FileOpen/LastDir", QFileInfo(fileName).dir().dirName());
if (fileName.isEmpty())
return;
- loadFile(fileName);
+ loadFile(fileName);
}
diff --git a/src/tools/texteditor/mainwindow.h b/src/tools/texteditor/mainwindow.h
index 57d51b1f22..2155b013ff 100644
--- a/src/tools/texteditor/mainwindow.h
+++ b/src/tools/texteditor/mainwindow.h
@@ -63,7 +63,7 @@ private:
QHash<QString, Editor *> m_textViewerFromName;
Editor *findOrCreateTextViewer(const QString &fileName);
Editor *currentTextViewer();
-
+
QSettings &settings();
QAction * m_fileOpenAction;
QAction * m_quitAction;
diff --git a/src/tools/texteditor/texteditor.pro b/src/tools/texteditor/texteditor.pro
index 9e118dba4e..55240168ad 100644
--- a/src/tools/texteditor/texteditor.pro
+++ b/src/tools/texteditor/texteditor.pro
@@ -3,7 +3,7 @@ QTCREATOR = ../../plugins
TARGET = ../../../bin/texteditor
-QT += gui
+QT += gui
CONFIG -= release
CONFIG += debug
@@ -13,7 +13,7 @@ DEFINES += TEXTEDITOR_STANDALONE
INCLUDEPATH += $${QTCREATOR}
INCLUDEPATH += $${QTCREATOR}/texteditor
-HEADERS += \
+HEADERS += \
mainwindow.h \
$${QTCREATOR}/texteditor/basetextdocument.h \
$${QTCREATOR}/texteditor/basetexteditor.h \
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index b9ed42aa4b..9308835057 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -42,7 +42,7 @@ static QByteArray &operator<<=(QByteArray &ba, const QByteArray &replacement)
}
-template <typename T>
+template <typename T>
inline QByteArray N(T t) { return QByteArray::number(t); }
static const char gdbmi1[] =
@@ -409,7 +409,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
for (int i = 0; i < l1.size() && i < l2.size(); ++i) {
if (l1.at(i) == l2.at(i))
qWarning() << "== " << l1.at(i);
- else
+ else
//qWarning() << "!= " << l1.at(i).right(30) << l2.at(i).right(30);
qWarning() << "!= " << l1.at(i) << l2.at(i);
}
@@ -932,7 +932,7 @@ void tst_Debugger::dumpQDateTimeHelper(const QDateTime &d, bool isNull)
QByteArray value;
if (d.isNull())
value = "value='(null)'";
- else
+ else
value = QByteArray("value='%',valueencoded='2'")
<< utfToBase64(d.toString());
@@ -2003,7 +2003,7 @@ void tst_Debugger::dumpQObjectSignalList()
"numchild='0',addr='$A',type='"NS"QObjectSignal'},"
"{name='21',value='columnsMoved(QModelIndex,int,int,QModelIndex,int)',"
"numchild='0',addr='$A',type='"NS"QObjectSignal'}]";
-
+
testDumper(expected << "0" << "0" << "0" << "0" << "0" << "0",
&m, NS"QObjectSignalList", true);
@@ -2425,7 +2425,7 @@ void tst_Debugger::initTestCase()
QVERIFY(sizeof(int) == sizeof(d.weakref));
QVERIFY(sizeof(int) == sizeof(d.strongref));
const size_t qObjectPrivateSize = sizeof(QObjectPrivate);
- const size_t objectPrivateSize = sizeof(ObjectPrivate);
+ const size_t objectPrivateSize = sizeof(ObjectPrivate);
QVERIFY2(qObjectPrivateSize == objectPrivateSize, QString::fromLatin1("QObjectPrivate=%1 ObjectPrivate=%2").arg(qObjectPrivateSize).arg(objectPrivateSize).toLatin1().constData());
VERIFY_OFFSETOF(threadData);
VERIFY_OFFSETOF(extraData);
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 8af3f2e610..fd5888509f 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -67,7 +67,7 @@ public:
~Foo()
{
- }
+ }
void doit()
{
static QObject ob;
@@ -509,7 +509,7 @@ void Thread::readStandardOutput()
QByteArray ba = m_proc->readAllStandardOutput();
DEBUG("THREAD GDB OUT: " << ba);
// =library-loaded...
- if (ba.startsWith("="))
+ if (ba.startsWith("="))
return;
if (ba.startsWith("*stopped")) {
m_lastStopped = ba;
@@ -523,7 +523,7 @@ void Thread::readStandardOutput()
}
// The "call" is always aborted with a message like:
- // "~"2321\t /* A */ QString s;\n" "
+ // "~"2321\t /* A */ QString s;\n" "
// "&"The program being debugged stopped while in a function called ..."
// "^error,msg="The program being debugged stopped ..."
// Extract the "2321" from this
@@ -604,7 +604,7 @@ void tst_Gdb::initTestCase()
{
#ifndef Q_CC_GNU
QSKIP("gdb test not applicable for compiler", SkipAll);
-#endif
+#endif
//qDebug() << "\nTHREAD RUN" << getpid() << gettid();
QProcess *gdbProc = new QProcess;
QStringList args;
@@ -695,7 +695,7 @@ void tst_Gdb::run(const QByteArray &label, const QByteArray &expected0,
} else {
qWarning() << "!= size: " << l1.size() << l2.size();
}
-
+
if (!ok) {
int i = 0;
for ( ; i < l1.size() && i < l2.size(); ++i) {
@@ -707,9 +707,9 @@ void tst_Gdb::run(const QByteArray &label, const QByteArray &expected0,
ok = false;
}
}
- for ( ; i < l2.size(); ++i)
+ for ( ; i < l2.size(); ++i)
qWarning() << "!= " << "-----" << l2.at(i);
- for ( ; i < l1.size(); ++i)
+ for ( ; i < l1.size(); ++i)
qWarning() << "!= " << l1.at(i) << "-----";
if (l1.size() != l2.size()) {
ok = false;
@@ -1203,7 +1203,7 @@ void tst_Gdb::dump_QDateTimeHelper(const QDateTime &d)
QByteArray value;
if (d.isNull())
value = "value='(null)'";
- else
+ else
value = QByteArray("value='%',valueencoded='2'")
<< utfToBase64(d.toString());
@@ -1547,7 +1547,7 @@ void tst_Gdb::dump_QObject()
"type='"NS"QObject',value='<not in scope>',"
"numchild='0'}");
next(4);
-
+
run("F","{iname='local.ob',name='ob',type='"NS"QObject',valueencoded='7',"
"value='41006e0020004f0062006a00650063007400',numchild='4',children=["
"{name='parent',type='"NS"QObject *',"
@@ -2665,7 +2665,7 @@ void tst_Gdb::dump_QSharedPointer()
"local.simplePtr,local.simplePtr2,local.simplePtr3,local.simplePtr4,"
"local.compositePtr,local.compositePtr,local.compositePtr,"
"local.compositePtr");
-
+
#endif
}
@@ -2735,7 +2735,7 @@ void tst_Gdb::dump_QStack()
void dump_QString()
{
/* A */ QString s;
- /* B */ s = "hallo";
+ /* B */ s = "hallo";
/* C */ s += "x";
/* D */ (void) 0;
}
@@ -2936,165 +2936,165 @@ void tst_Gdb::dump_QVariant()
prepare("dump_QVariant");
if (checkUninitialized) /*<not in scope>*/
run("A","{"PRE"'value=<not in scope>',numchild='0'}");
- next();
+ next();
run("<invalid>", "{"PRE"value='<invalid>',numchild='0'}");
- next();
+ next();
run("QBitArray", "{"PRE"value='("NS"QBitArray)',numchild='1',children=["
"{name='data',type='"NS"QBitArray',value='{...}',numchild='1'}]}",
"local.v");
- next();
+ next();
//run("QBitMap", "{"PRE"value="NS"QBitMap'',numchild='1',children=["
// "]}", "local.v");
- next();
+ next();
run("bool", "{"PRE"value='true',numchild='0'}", "local.v");
- next();
+ next();
//run("QBrush", "{"PRE"value='"NS"QBrush',numchild='1',children=["
// "]}", "local.v");
- next();
+ next();
run("QByteArray", "{"PRE"value='("NS"QByteArray)',numchild='1',"
"children=[{name='data',type='"NS"QByteArray',valueencoded='6',"
"value='616263',numchild='3'}]}", "local.v");
- next();
+ next();
run("QChar", "{"PRE"value='("NS"QChar)',numchild='1',"
"children=[{name='data',type='"NS"QChar',value=''x', ucs=120',numchild='0'}]}", "local.v");
- next();
+ next();
//run("QColor", "{"PRE"value='("NS"QColor)',numchild='1',children=["
// "]}", "local.v");
- next();
+ next();
//run("QCursor", "{"PRE"value='',numchild='1',children=["
// "]}", "local.v");
- next();
+ next();
run("QDate", "{"PRE"value='("NS"QDate)',numchild='1',children=["
"{name='data',type='"NS"QDate',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QDateTime", "{"PRE"value='("NS"QDateTime)',numchild='1',children=["
"{name='data',type='"NS"QDateTime',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("double", "{"PRE"value='46',numchild='0'}", "local.v");
- next();
+ next();
//run("QFont", "{"PRE"value='(NS"QFont")',numchild='1',children=["
// "{name='data',type='"NS"QFont',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QVariantHash", "{"PRE"value='("NS"QVariantHash)',numchild='1',children=["
"{name='data',type='"NS"QHash<"NS"QString, "NS"QVariant>',"
"value='<0 items>',numchild='0'}]}", "local.v");
- next();
+ next();
//run("QIcon", "{"PRE"value='("NS"QIcon)',numchild='1',children=["
// "{name='data',type='"NS"QIcon',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QImage", "{"PRE"value='("NS"QImage)',numchild='1',children=["
// "{name='data',type='"NS"QImage',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("int", "{"PRE"value='42',numchild='0'}", "local.v");
- next();
+ next();
//run("QKeySequence", "{"PRE"value='("NS"QKeySequence)',numchild='1'",
// "local.v");
- next();
+ next();
run("QLine", "{"PRE"value='("NS"QLine)',numchild='1',children=["
"{name='data',type='"NS"QLine',value='{...}',numchild='2'}]}", "local.v");
- next();
+ next();
run("QLineF", "{"PRE"value='("NS"QLineF)',numchild='1',children=["
"{name='data',type='"NS"QLineF',value='{...}',numchild='2'}]}", "local.v");
- next();
+ next();
run("QVariantList", "{"PRE"value='("NS"QVariantList)',numchild='1',children=["
"{name='data',type='"NS"QList<"NS"QVariant>',"
"value='<0 items>',numchild='0'}]}", "local.v");
- next();
+ next();
run("QLocale", "{"PRE"value='("NS"QLocale)',numchild='1',children=["
"{name='data',type='"NS"QLocale',value='{...}',numchild='2'}]}", "local.v");
- next();
+ next();
run("qlonglong", "{"PRE"value='44',numchild='0'}", "local.v");
- next();
+ next();
run("QVariantMap", "{"PRE"value='("NS"QVariantMap)',numchild='1',children=["
"{name='data',type='"NS"QMap<"NS"QString, "NS"QVariant>',"
"value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QTransform", "{"PRE"value='("NS"QTransform)',numchild='1',children=["
// "{name='data',type='"NS"QTransform',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QMatrix4x4", "{"PRE"value='("NS"QMatrix4x4)',numchild='1',children=["
// "{name='data',type='"NS"QMatrix4x4',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QPalette", "{"PRE"value='("NS"QPalette)',numchild='1',children=["
// "{name='data',type='"NS"QPalette',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QPen", "{"PRE"value='("NS"QPen)',numchild='1',children=["
// "{name='data',type='"NS"QPen',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QPixmap", "{"PRE"value='("NS"QPixmap)',numchild='1',children=["
// "{name='data',type='"NS"QPixmap',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QPoint", "{"PRE"value='("NS"QPoint)',numchild='1',children=["
"{name='data',type='"NS"QPoint',value='(45, 46)',numchild='2'}]}",
"local.v");
- next();
+ next();
//run("QPointArray", "{"PRE"value='("NS"QPointArray)',numchild='1',children=["
// "{name='data',type='"NS"QPointArray',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
// FIXME
// run("QPointF", "{"PRE"value='("NS"QPointF)',numchild='1',children=["
// "{name='data',type='"NS"QPointF',value='(41, 42)',numchild='2'}]}",
// "local.v");
- next();
+ next();
//run("QPolygon", "{"PRE"value='("NS"QPolygon)',numchild='1',children=["
// "{name='data',type='"NS"QPolygon',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QQuaternion", "{"PRE"value='("NS"QQuaternion)',numchild='1',children=["
// "{name='data',type='"NS"QQuaternion',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QRect", "{"PRE"value='("NS"QRect)',numchild='1',children=["
"{name='data',type='"NS"QRect',value='{...}',numchild='4'}]}", "local.v");
- next();
+ next();
// FIXME:
// run("QRectF", "{"PRE"value='("NS"QRectF)',numchild='1',children=["
// "{name='data',type='"NS"QRectF',value='{...}',numchild='4'}]}", "local.v");
- next();
+ next();
run("QRegExp", "{"PRE"value='("NS"QRegExp)',numchild='1',children=["
"{name='data',type='"NS"QRegExp',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QRegion", "{"PRE"value='("NS"QRegion)',numchild='1',children=["
// "{name='data',type='"NS"QRegion',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QSize", "{"PRE"value='("NS"QSize)',numchild='1',children=["
"{name='data',type='"NS"QSize',value='(0, 0)',numchild='2'}]}", "local.v");
- next();
+ next();
// FIXME:
// run("QSizeF", "{"PRE"value='("NS"QSizeF)',numchild='1',children=["
// "{name='data',type='"NS"QSizeF',value='(0, 0)',numchild='2'}]}", "local.v");
- next();
+ next();
//run("QSizePolicy", "{"PRE"value='("NS"QSizePolicy)',numchild='1',children=["
// "{name='data',type='"NS"QSizePolicy',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QString", "{"PRE"value='("NS"QString)',numchild='1',children=["
"{name='data',type='"NS"QString',valueencoded='7',value='610062006300',numchild='0'}]}",
"local.v");
- next();
+ next();
run("QStringList", "{"PRE"value='("NS"QStringList)',numchild='1',children=["
"{name='data',type='"NS"QStringList',value='<1 items>',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QTextFormat", "{"PRE"value='("NS"QTextFormat)',numchild='1',children=["
// "{name='data',type='"NS"QTextFormat',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QTextLength", "{"PRE"value='("NS"QTextLength)',numchild='1',children=["
// "{name='data',type='"NS"QTextLength',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("QTime", "{"PRE"value='("NS"QTime)',numchild='1',children=["
"{name='data',type='"NS"QTime',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
run("uint", "{"PRE"value='43',numchild='0'}", "local.v");
- next();
+ next();
run("qulonglong", "{"PRE"value='45',numchild='0'}", "local.v");
- next();
+ next();
run("QUrl", "{"PRE"value='("NS"QUrl)',numchild='1',children=["
"{name='data',type='"NS"QUrl',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QVector2D", "{"PRE"value='("NS"QVector2D)',numchild='1',children=["
// "{name='data',type='"NS"QVector2D',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QVector3D", "{"PRE"value='("NS"QVector3D)',numchild='1',children=["
// "{name='data',type='"NS"QVector3D',value='{...}',numchild='1'}]}", "local.v");
- next();
+ next();
//run("QVector4D", "{"PRE"value='("NS"QVector4D)',numchild='1',children=["
// "{name='data',type='"NS"QVector4D',value='{...}',numchild='1'}]}", "local.v");
}
diff --git a/tests/auto/debugger/tst_plugin.cpp b/tests/auto/debugger/tst_plugin.cpp
index 84ffc58a68..653d66374d 100644
--- a/tests/auto/debugger/tst_plugin.cpp
+++ b/tests/auto/debugger/tst_plugin.cpp
@@ -39,7 +39,7 @@
using namespace Debugger;
using namespace Debugger::Internal;
-
+
static QByteArray stripped(QByteArray ba)
{
for (int i = ba.size(); --i >= 0; ) {
diff --git a/tests/auto/fakevim/main.cpp b/tests/auto/fakevim/main.cpp
index 5c692fc5ea..e3cf3f71a1 100644
--- a/tests/auto/fakevim/main.cpp
+++ b/tests/auto/fakevim/main.cpp
@@ -53,7 +53,7 @@ public slots:
void changeStatusData(const QString &info) { m_statusData = info; }
void changeStatusMessage(const QString &info) { m_statusMessage = info; }
void changeExtraInformation(const QString &info) { m_infoMessage = info; }
-
+
private slots:
// command mode
void command_Cxx_down_dot();
@@ -82,7 +82,7 @@ private slots:
void test_i_cw_i();
private:
- void setup();
+ void setup();
void send(const QString &command) { sendEx("normal " + command); }
void sendEx(const QString &command); // send an ex command
@@ -109,7 +109,7 @@ private:
static const QString escape;
};
-const QString tst_FakeVim::lines =
+const QString tst_FakeVim::lines =
/* 0 1 2 3 4 */
/* 0123456789012345678901234567890123457890 */
"\n"
@@ -412,7 +412,7 @@ void tst_FakeVim::command_i()
check("ibx" + escape, "b@xa" + lines);
check("icyy" + escape, "bcy@yxa" + lines);
check("u", "b@xa" + lines);
- check("u", "@a" + lines);
+ check("u", "@a" + lines);
checkEx("redo", "b@xa" + lines);
check("u", "@a" + lines);
}
@@ -433,7 +433,7 @@ void tst_FakeVim::command_r()
setup();
move("4j", "@int main");
move("$", "int main(int argc, char *argv[])@");
- check("rx", lmid(0, 4) + "\nint main(int argc, char *argv[]x@\n" + lmid(5));
+ check("rx", lmid(0, 4) + "\nint main(int argc, char *argv[]x@\n" + lmid(5));
check("2h", lmid(0, 4) + "\nint main(int argc, char *argv[@]x\n" + lmid(5));
check("4ra", lmid(0, 4) + "\nint main(int argc, char *argv[@]x\n" + lmid(5));
qWarning("FIXME");
@@ -530,14 +530,14 @@ void tst_FakeVim::command_J()
{
setup();
move("4j4l", "int @main");
-
+
check("J", lmid(0, 5) + "@ " + lmid(5));
- check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
+ check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
return; // FIXME: not in sync with Gui behaviour?
check("3J", lmid(0, 5) + " " + lmid(5, 1) + "@" + lmid(6).mid(3));
- check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
+ check("u", lmid(0, 4) + "\nint @main(int argc, char *argv[])\n" + lmid(5));
checkEx("redo", lmid(0, 5) + "@ " + lmid(5));
}
diff --git a/tests/manual/binding/binding.pro b/tests/manual/binding/binding.pro
index 2ac26f337a..6c73e184d1 100644
--- a/tests/manual/binding/binding.pro
+++ b/tests/manual/binding/binding.pro
@@ -1,4 +1,4 @@
-QT =
+QT =
macx:CONFIG -= app_bundle
@@ -9,7 +9,7 @@ TARGET = cplusplus0
include(../../../src/shared/cplusplus/cplusplus.pri)
-unix {
+unix {
debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
release:OBJECTS_DIR = $${OUT_PWD}/.obj/release-shared
debug:MOC_DIR = $${OUT_PWD}/.moc/debug-shared
diff --git a/tests/manual/cdbdebugger/cdbdebugger.pro b/tests/manual/cdbdebugger/cdbdebugger.pro
index cc9b4c6318..855b775c2e 100644
--- a/tests/manual/cdbdebugger/cdbdebugger.pro
+++ b/tests/manual/cdbdebugger/cdbdebugger.pro
@@ -1,9 +1,9 @@
TEMPLATE = app
-TARGET =
+TARGET =
DEPENDPATH += .
INCLUDEPATH += .
-DEFINES +=
+DEFINES +=
LIBS += Dbghelp.lib dbgeng.lib
diff --git a/tests/manual/cdbdebugger/debugger.cpp b/tests/manual/cdbdebugger/debugger.cpp
index 14df5688b0..67e0c53934 100644
--- a/tests/manual/cdbdebugger/debugger.cpp
+++ b/tests/manual/cdbdebugger/debugger.cpp
@@ -272,7 +272,7 @@ void Debugger::handleExceptionEvent(DEBUG_EVENT* e)
// } else
// qDebug() << "SymGetLineFromAddr64 failed w/ error code" << GetLastError();
- // m_currentStackTrace.append(sf);
+ // m_currentStackTrace.append(sf);
// }
//} while (bSuccess);
diff --git a/tests/manual/cdbdebugger/mainwindow.cpp b/tests/manual/cdbdebugger/mainwindow.cpp
index 3cce211892..ec16cecfbe 100644
--- a/tests/manual/cdbdebugger/mainwindow.cpp
+++ b/tests/manual/cdbdebugger/mainwindow.cpp
@@ -9,7 +9,7 @@ MainWindow::MainWindow()
setupUi(this);
connect(&m_debugger, SIGNAL(debugOutput(const QString&)), SLOT(appendOutput(const QString&)));
- connect(&m_debugger, SIGNAL(debuggeePaused()), SLOT(onDebuggeePaused()));
+ connect(&m_debugger, SIGNAL(debuggeePaused()), SLOT(onDebuggeePaused()));
}
void MainWindow::setDebuggee(const QString& filename)
diff --git a/tests/manual/cdbdebugger/windbgthread.cpp b/tests/manual/cdbdebugger/windbgthread.cpp
index a21014216e..75c455832f 100644
--- a/tests/manual/cdbdebugger/windbgthread.cpp
+++ b/tests/manual/cdbdebugger/windbgthread.cpp
@@ -123,7 +123,7 @@ void WinDbgThread::internalStartProcess()
ZeroMemory(&m_pi, sizeof(m_pi));
DWORD dwCreationFlags = DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS;
- bSuccess = CreateProcess(m_processFileName.utf16(), NULL, NULL, NULL, FALSE,
+ bSuccess = CreateProcess(m_processFileName.utf16(), NULL, NULL, NULL, FALSE,
dwCreationFlags,
NULL, NULL, &si, &m_pi
);
diff --git a/tests/manual/fakevim/main.cpp b/tests/manual/fakevim/main.cpp
index 2b8717316b..ca8b63efb0 100644
--- a/tests/manual/fakevim/main.cpp
+++ b/tests/manual/fakevim/main.cpp
@@ -46,7 +46,7 @@ public slots:
{
QMessageBox::information(m_widget, "Information", info);
}
-
+
void updateStatusBar()
{
int slack = 80 - m_statusMessage.size() - m_statusData.size();
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
mw.resize(600, 650);
mw.move(0, 0);
mw.show();
-
+
QFont font = widget->font();
//: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
//font.setFamily("Misc");
diff --git a/tests/manual/gdbdebugger/simple/plugin.cpp b/tests/manual/gdbdebugger/simple/plugin.cpp
index 37be66339f..a2a26e8924 100644
--- a/tests/manual/gdbdebugger/simple/plugin.cpp
+++ b/tests/manual/gdbdebugger/simple/plugin.cpp
@@ -35,7 +35,7 @@ extern "C" Q_DECL_EXPORT int pluginTest()
{
int s = 0;
for (int i = 1; i != 2000; ++i)
- s += i;
+ s += i;
fprintf(stderr, "in plugin test\n");
return s;
}
diff --git a/tests/manual/gdbdebugger/spacy path/app with space.cpp b/tests/manual/gdbdebugger/spacy path/app with space.cpp
index 0ec979b6b8..43cc4fbdf8 100644
--- a/tests/manual/gdbdebugger/spacy path/app with space.cpp
+++ b/tests/manual/gdbdebugger/spacy path/app with space.cpp
@@ -87,7 +87,7 @@ public:
struct Bar {
Bar() : ob(0) {}
- QObject *ob;
+ QObject *ob;
};
public:
@@ -133,7 +133,7 @@ void testHash()
hgg0[11] = 11.0;
hgg0[22] = 22.0;
-
+
QHash<QString, float> hgg1;
hgg1["22.0"] = 22.0;
@@ -143,7 +143,7 @@ void testHash()
QHash<QString, Foo> hgg3;
hgg3["22.0"] = Foo(22);
hgg3["33.0"] = Foo(33);
-
+
QObject ob;
QHash<QString, QPointer<QObject> > hash;
hash.insert("Hallo", QPointer<QObject>(&ob));
@@ -168,7 +168,7 @@ void testIO()
qDebug() << "qDebug() 1";
qDebug() << "qDebug() 2";
qDebug() << "qDebug() 3";
-
+
std::cout << "std::cout @@ 1\n";
std::cout << "std::cout @@ 2\n";
std::cout << "std::cout @@ 3\n";
@@ -195,7 +195,7 @@ void testMap()
gg0[11] = 11.0;
gg0[22] = 22.0;
-
+
QMap<QString, float> gg1;
gg1["22.0"] = 22.0;
diff --git a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp b/tests/manual/gdbdebugger/spacy path/plugin with space.cpp
index 74ede7ad06..617e0986f9 100644
--- a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp
+++ b/tests/manual/gdbdebugger/spacy path/plugin with space.cpp
@@ -34,7 +34,7 @@ extern "C" Q_DECL_EXPORT int pluginTest()
{
int s = 0;
for (int i = 1; i != 2000; ++i)
- s += i;
+ s += i;
fprintf(stderr, "in plugin test");
return s;
}
diff --git a/tests/manual/gdbdebugger/spacy-file/app with space.cpp b/tests/manual/gdbdebugger/spacy-file/app with space.cpp
index 0ec979b6b8..43cc4fbdf8 100644
--- a/tests/manual/gdbdebugger/spacy-file/app with space.cpp
+++ b/tests/manual/gdbdebugger/spacy-file/app with space.cpp
@@ -87,7 +87,7 @@ public:
struct Bar {
Bar() : ob(0) {}
- QObject *ob;
+ QObject *ob;
};
public:
@@ -133,7 +133,7 @@ void testHash()
hgg0[11] = 11.0;
hgg0[22] = 22.0;
-
+
QHash<QString, float> hgg1;
hgg1["22.0"] = 22.0;
@@ -143,7 +143,7 @@ void testHash()
QHash<QString, Foo> hgg3;
hgg3["22.0"] = Foo(22);
hgg3["33.0"] = Foo(33);
-
+
QObject ob;
QHash<QString, QPointer<QObject> > hash;
hash.insert("Hallo", QPointer<QObject>(&ob));
@@ -168,7 +168,7 @@ void testIO()
qDebug() << "qDebug() 1";
qDebug() << "qDebug() 2";
qDebug() << "qDebug() 3";
-
+
std::cout << "std::cout @@ 1\n";
std::cout << "std::cout @@ 2\n";
std::cout << "std::cout @@ 3\n";
@@ -195,7 +195,7 @@ void testMap()
gg0[11] = 11.0;
gg0[22] = 22.0;
-
+
QMap<QString, float> gg1;
gg1["22.0"] = 22.0;
diff --git a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp b/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp
index 74ede7ad06..617e0986f9 100644
--- a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp
+++ b/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp
@@ -34,7 +34,7 @@ extern "C" Q_DECL_EXPORT int pluginTest()
{
int s = 0;
for (int i = 1; i != 2000; ++i)
- s += i;
+ s += i;
fprintf(stderr, "in plugin test");
return s;
}
diff --git a/tests/manual/proparser/proparser.pro b/tests/manual/proparser/proparser.pro
index c822929991..f414087cba 100644
--- a/tests/manual/proparser/proparser.pro
+++ b/tests/manual/proparser/proparser.pro
@@ -1,11 +1,11 @@
TEMPLATE = app
-TARGET =
+TARGET =
DEPENDPATH += .
INCLUDEPATH += .
CONFIG += console
QT += xml
-PROXMLPATH = ../../../src/plugins/qt4projectmanager/proparser
+PROXMLPATH = ../../../src/plugins/qt4projectmanager/proparser
PROPARSERPATH = $$(QTDIR)/tools/linguist/shared
INCLUDEPATH += $$PROPARSERPATH $$PROXMLPATH
diff --git a/tests/manual/proparser/test.pro b/tests/manual/proparser/test.pro
index 55921087c1..5084aa3610 100644
--- a/tests/manual/proparser/test.pro
+++ b/tests/manual/proparser/test.pro
@@ -1,7 +1,7 @@
#comment
TEMPLATE = app
-TARGET =
+TARGET =
DEPENDPATH += .
INCLUDEPATH += .
CONFIG += console
diff --git a/tests/manual/trk/runner.cpp b/tests/manual/trk/runner.cpp
index 25ff2d4684..de98213dbb 100755
--- a/tests/manual/trk/runner.cpp
+++ b/tests/manual/trk/runner.cpp
@@ -212,8 +212,8 @@ void RunnerGui::started()
executeCommand("symbol-file filebrowseapp.sym");
//executeCommand("info address CFileBrowseAppUi::HandleCommandL",
- // GdbCB(handleInfoMainAddress));
-
+ // GdbCB(handleInfoMainAddress));
+
executeCommand("-break-insert filebrowseappui.cpp:39");
executeCommand("target remote " + m_adapter->gdbServerName());
executeCommand("-exec-continue");
diff --git a/tests/manual/trk/swapendian.pro b/tests/manual/trk/swapendian.pro
index d12122e7aa..2290f2b533 100644
--- a/tests/manual/trk/swapendian.pro
+++ b/tests/manual/trk/swapendian.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
MAKEFILE = Makefile.swapendian
-QT = core
+QT = core
HEADERS += \
diff --git a/tests/manual/trklauncher/main.cpp b/tests/manual/trklauncher/main.cpp
index fc0c589009..8a9e91fd44 100644
--- a/tests/manual/trklauncher/main.cpp
+++ b/tests/manual/trklauncher/main.cpp
@@ -65,7 +65,7 @@ static TrkLauncherPtr parseArguments(const QStringList &arguments, bool *bluetoo
if (!option.startsWith(QLatin1Char('-')))
break;
if (option.size() != 2)
- return TrkLauncherPtr();
+ return TrkLauncherPtr();
switch (option.at(1).toAscii()) {
case 'v':
verbosity++;