diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp b/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
index b725d031e87910a0f7b5c8eada8e4504a5157b35..d5f33ab4b5902fddd8da573e5e58679333613325 100644
--- a/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
+++ b/src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
@@ -283,6 +283,6 @@ void QDeclarativeDebugClient::messageReceived(const QByteArray &)
{
}
-}
+} // namespace QmlJsDebugClient
#include <qdeclarativedebugclient.moc>
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 99a2b4a35d013a82c5a00e666f39a6ea343ddb6e..45775f8f3b748c356e2bdb5a05335b6ce1fbeafd 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -126,7 +126,7 @@ public:
DebuggerLanguages m_supportedLanguages;
- QStackedWidget *m_toolbarStack;
+ QStackedWidget *m_toolBarStack;
QHash<DebuggerLanguage, Context> m_contextsForLanguage;
@@ -147,7 +147,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *mw)
: q(mw)
, m_resizeEventFilter(this)
, m_supportedLanguages(AnyLanguage)
- , m_toolbarStack(new QStackedWidget)
+ , m_toolBarStack(new QStackedWidget)
, m_inDebugMode(false)
, m_changingUI(false)
, m_previousDebugLanguages(AnyLanguage)
@@ -340,7 +340,7 @@ void DebuggerMainWindowPrivate::activateQmlCppLayout()
qmlCppContext.add(m_contextsForLanguage.value(CppLanguage));
// always use cpp toolbar
- m_toolbarStack->setCurrentWidget(m_toolBars.value(CppLanguage));
+ m_toolBarStack->setCurrentWidget(m_toolBars.value(CppLanguage));
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
@@ -360,7 +360,7 @@ void DebuggerMainWindowPrivate::activateCppLayout()
ICore *core = ICore::instance();
Context qmlCppContext = m_contextsForLanguage.value(QmlLanguage);
qmlCppContext.add(m_contextsForLanguage.value(CppLanguage));
- m_toolbarStack->setCurrentWidget(m_toolBars.value(CppLanguage));
+ m_toolBarStack->setCurrentWidget(m_toolBars.value(CppLanguage));
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
@@ -377,11 +377,11 @@ void DebuggerMainWindowPrivate::activateCppLayout()
core->updateAdditionalContexts(Context(), cppContext);
}
-void DebuggerMainWindow::setToolbar(const DebuggerLanguage &language, QWidget *widget)
+void DebuggerMainWindow::setToolBar(const DebuggerLanguage &language, QWidget *widget)
{
Q_ASSERT(d->m_toolBars.contains(language));
d->m_toolBars[language] = widget;
- d->m_toolbarStack->addWidget(widget);
+ d->m_toolBarStack->addWidget(widget);
}
QDockWidget *DebuggerMainWindow::dockWidget(const QString &objectName) const
@@ -468,7 +468,7 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
QHBoxLayout *debugToolBarLayout = new QHBoxLayout(debugToolBar);
debugToolBarLayout->setMargin(0);
debugToolBarLayout->setSpacing(0);
- debugToolBarLayout->addWidget(d->m_toolbarStack);
+ debugToolBarLayout->addWidget(d->m_toolBarStack);
debugToolBarLayout->addStretch();
debugToolBarLayout->addWidget(new Utils::StyledSeparator);
diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h
index 4f5e2298152d3e1414c95033d04b4ca3796a731d..a399d67481e7bf0e8a36b34af1db17f0296c2185 100644
--- a/src/plugins/debugger/debuggermainwindow.h
+++ b/src/plugins/debugger/debuggermainwindow.h
@@ -57,7 +57,7 @@ public:
~DebuggerMainWindow();
// Debugger toolbars are registered with this function.
- void setToolbar(const DebuggerLanguage &language, QWidget *widget);
+ void setToolBar(const DebuggerLanguage &language, QWidget *widget);
// Active languages to be debugged.
DebuggerLanguages activeDebugLanguages() const;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index b521d9f139914dbdd5428424e6665f133db1d099..d5d688db81d681a0e244149ba87d8c7bc0262963 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -3129,7 +3129,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
hbox->addSpacerItem(new QSpacerItem(4, 0));
hbox->addWidget(m_statusLabel, 10);
- m_mainWindow->setToolbar(CppLanguage, toolbarContainer);
+ m_mainWindow->setToolBar(CppLanguage, toolbarContainer);
connect(action(EnableReverseDebugging),
SIGNAL(valueChanged(QVariant)),
diff --git a/src/plugins/qmljsinspector/qmlinspectortoolbar.h b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
index e0aedb5992087241dab93615d3f3fd84a5f214ff..042a6b6af346d37a6f8f3b0bd08822dc2e27d443 100644
--- a/src/plugins/qmljsinspector/qmlinspectortoolbar.h
+++ b/src/plugins/qmljsinspector/qmlinspectortoolbar.h
@@ -60,6 +60,7 @@ namespace Internal {
class QmlInspectorToolBar : public QObject
{
Q_OBJECT
+
public:
enum DesignTool {
NoTool = 0,
diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp
index 0a1f92ea9f2ca8caf2233dd2251ed6803b915a81..b8c3b69f739ddd050a0cf2d3996af18c88c2797f 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.cpp
+++ b/src/plugins/qmljsinspector/qmljsinspector.cpp
@@ -666,8 +666,7 @@ void InspectorUi::gotoObjectReferenceDefinition(const QDeclarativeDebugObjectRef
if (textEditor) {
QDeclarativeDebugObjectReference ref = objectReferenceForLocation(fileName);
- if (ref.debugId() != obj.debugId())
- {
+ if (ref.debugId() != obj.debugId()) {
m_selectionCallbackExpected = true;
editorManager->addCurrentPositionToNavigationHistory();
textEditor->gotoLine(source.lineNumber());
@@ -723,7 +722,7 @@ void InspectorUi::setupDockWidgets()
void InspectorUi::crumblePathElementClicked(int debugId)
{
- QList <int> l;
+ QList<int> l;
l << debugId;
selectItems(l);
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
index ba664700374269015791d289ad3e3fc8b1d9a430..52abf6d2513a7dae01146933589efd6be54de559 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
@@ -154,12 +154,8 @@ bool QmlRunControlFactory::canRun(RunConfiguration *runConfiguration,
if (config && qmlDebugSupportInstalled) {
if (!config->observerPath().isEmpty())
return true;
-
- if (config->qtVersion() && Qt4ProjectManager::QmlObserverTool::canBuild(config->qtVersion())) {
+ if (config->qtVersion() && Qt4ProjectManager::QmlObserverTool::canBuild(config->qtVersion()))
return true;
- } else {
- return false;
- }
}
return false;
@@ -172,11 +168,10 @@ RunControl *QmlRunControlFactory::create(RunConfiguration *runConfiguration,
QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration *>(runConfiguration);
RunControl *runControl = 0;
- if (mode == ProjectExplorer::Constants::RUNMODE) {
- runControl = new QmlRunControl(config, mode);
- } else if (mode == Debugger::Constants::DEBUGMODE) {
+ if (mode == ProjectExplorer::Constants::RUNMODE)
+ runControl = new QmlRunControl(config, mode);
+ else if (mode == Debugger::Constants::DEBUGMODE)
runControl = createDebugRunControl(config);
- }
return runControl;
}
@@ -212,7 +207,8 @@ RunControl *QmlRunControlFactory::createDebugRunControl(QmlProjectRunConfigurati
return Debugger::DebuggerPlugin::createDebugger(params, runConfig);
}
-void QmlRunControlFactory::showQmlObserverToolWarning() {
+void QmlRunControlFactory::showQmlObserverToolWarning()
+{
QMessageBox dialog(QApplication::activeWindow());
QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
QMessageBox::ActionRole);
@@ -236,4 +232,3 @@ void QmlRunControlFactory::showQmlObserverToolWarning() {
} // namespace Internal
} // namespace QmlProjectManager
-
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index bc963d2680f6de2de3fc6e6fbff35e8dc7964cce..66e0a95ba43e50c9c6e9192b71e36b06d374f683 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -5748,10 +5748,10 @@ BaseTextEditorEditable::BaseTextEditorEditable(BaseTextEditor *editor)
using namespace Find;
Aggregation::Aggregate *aggregate = new Aggregation::Aggregate;
BaseTextFind *baseTextFind = new BaseTextFind(editor);
- connect(baseTextFind, SIGNAL(highlightAll(QString, Find::FindFlags)),
- editor, SLOT(highlightSearchResults(QString, Find::FindFlags)));
- connect(baseTextFind, SIGNAL(findScopeChanged(QTextCursor, QTextCursor, int, int)),
- editor, SLOT(setFindScope(QTextCursor, QTextCursor, int, int)));
+ connect(baseTextFind, SIGNAL(highlightAll(QString,Find::FindFlags)),
+ editor, SLOT(highlightSearchResults(QString,Find::FindFlags)));
+ connect(baseTextFind, SIGNAL(findScopeChanged(QTextCursor,QTextCursor,int,int)),
+ editor, SLOT(setFindScope(QTextCursor,QTextCursor,int,int)));
aggregate->add(baseTextFind);
aggregate->add(editor);