From b4e421062fc9463cb42c5846dcb84b25f1a5f0ae Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Thu, 16 Dec 2010 12:05:48 +0100
Subject: [PATCH] Removed stray tokens and fixed warnings/errors when compiling
with pedantic C++ compilers.
---
share/qtcreator/gdbmacros/gdbmacros.cpp | 2 +-
src/libs/qmljs/qmljscheck.h | 4 +--
src/libs/qmljs/qmljscodeformatter.h | 4 +--
src/libs/utils/crumblepath.h | 2 +-
src/libs/utils/debuggerlanguagechooser.h | 6 ++---
src/libs/utils/historycompleter.cpp | 2 +-
src/libs/utils/historycompleter.h | 2 +-
src/libs/utils/unixutils.h | 2 +-
.../coreplugin/editormanager/editormanager.h | 2 +-
src/plugins/coreplugin/mimedatabase.cpp | 8 +++---
src/plugins/coreplugin/ssh/sshchannel_p.h | 2 +-
src/plugins/coreplugin/ssh/sshpacket_p.h | 2 +-
src/plugins/cpptools/cppcodeformatter.h | 4 +--
src/plugins/cpptools/insertionpointlocator.h | 2 +-
src/plugins/debugger/breakhandler.cpp | 2 +-
src/plugins/debugger/breakpoint.h | 4 +--
src/plugins/debugger/consolewindow.cpp | 4 +--
src/plugins/debugger/debuggerconstants.h | 4 +--
src/plugins/debugger/gdb/gdbengine.h | 8 +++---
src/plugins/debugger/gdb/gdbmi.cpp | 2 +-
src/plugins/debugger/gdb/gdbmi.h | 4 +--
src/plugins/debugger/gdb/remotegdbprocess.h | 2 +-
src/plugins/debugger/gdb/symbian.h | 2 +-
src/plugins/debugger/lldb/ipcengineguest.h | 2 +-
src/plugins/debugger/lldb/ipcenginehost.h | 2 +-
src/plugins/debugger/logwindow.cpp | 2 +-
src/plugins/debugger/moduleshandler.h | 4 +--
src/plugins/debugger/tcf/json.h | 2 +-
src/plugins/debugger/watchhandler.h | 2 +-
src/plugins/debugger/watchutils.cpp | 2 +-
src/plugins/designer/formeditorstack.h | 2 +-
src/plugins/fakevim/fakevimhandler.cpp | 12 ++++-----
src/plugins/fakevim/fakevimhandler.h | 2 +-
src/plugins/git/gitorious/gitorious.h | 2 +-
src/plugins/glsleditor/glsleditorplugin.cpp | 2 +-
src/plugins/helloworld/helloworldwindow.h | 2 +-
src/plugins/perforce/perforcesettings.cpp | 2 +-
src/plugins/perforce/perforcesettings.h | 2 +-
.../perforce/perforceversioncontrol.cpp | 2 +-
.../customwizard/customwizardparameters.cpp | 4 +--
.../customwizardscriptgenerator.h | 2 +-
src/plugins/projectexplorer/outputformatter.h | 8 +++---
.../projectexplorer/processparameters.h | 2 +-
.../publishingwizardselectiondialog.h | 2 +-
.../projectexplorer/runconfiguration.h | 4 +--
.../components/formeditor/dragtool.h | 2 +-
.../components/formeditor/scaleitem.h | 2 +-
.../components/integration/componentview.cpp | 2 +-
.../designdocumentcontrollerview.cpp | 26 +++++++++----------
.../components/itemlibrary/itemlibrarymodel.h | 2 +-
.../itemlibrary/itemlibrarywidget.h | 2 +-
.../navigator/navigatortreeview.cpp | 4 +--
.../components/propertyeditor/basicwidgets.h | 4 +--
.../propertyeditor/behaviordialog.cpp | 2 +-
.../propertyeditor/behaviordialog.h | 2 +-
.../propertyeditor/qmlanchorbindingproxy.h | 2 +-
.../designercore/include/abstractview.h | 6 ++---
src/plugins/qmljseditor/qmljseditor.cpp | 2 +-
src/plugins/qmljseditor/qmljsoutline.h | 2 +-
src/plugins/qmljsinspector/qmljsclientproxy.h | 2 +-
.../qmljsinspector/qmljstoolbarcolorbox.h | 4 +--
src/plugins/qmljstools/qmljslocatordata.h | 2 +-
.../fileformat/qmlprojectitem.h | 2 +-
.../qmlprojectrunconfiguration.h | 2 +-
.../qmlprojectrunconfigurationwidget.h | 4 +--
src/plugins/qt4projectmanager/qmldumptool.cpp | 2 +-
.../qt4projectmanager/qmlobservertool.h | 2 +-
.../qt-maemo/maemodeployables.h | 2 +-
.../qt-maemo/maemodeviceconfigurations.cpp | 2 +-
.../qt-maemo/maemoqemumanager.h | 4 +--
.../qt-maemo/maemoremotemounter.h | 2 +-
.../qt-maemo/maemotemplatesmanager.h | 2 +-
.../qt-s60/passphraseforkeydialog.h | 6 ++---
src/plugins/qt4projectmanager/qt4nodes.cpp | 2 +-
.../qt4projectmanager/qtmodulesinfo.cpp | 6 ++---
.../wizards/abstractmobileapp.h | 2 +-
.../qt4projectmanager/wizards/mobileapp.h | 4 +--
.../wizards/qmlstandaloneapp.h | 2 +-
src/plugins/texteditor/texteditorsettings.h | 4 +--
src/shared/symbianutils/json.h | 2 +-
src/shared/symbianutils/trkdevice.cpp | 2 +-
src/shared/symbianutils/trkutils.h | 4 +--
src/tools/qtpromaker/main.cpp | 2 +-
83 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index be086693fef..a11c2671f94 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -2461,7 +2461,7 @@ static const char *qConnectionType(uint type)
#endif
};
return output;
-};
+}
#if QT_VERSION >= 0x040400
static const ConnectionList &qConnectionList(const QObject *ob, int signalNumber)
diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h
index e6df22db142..9749974b588 100644
--- a/src/libs/qmljs/qmljscheck.h
+++ b/src/libs/qmljs/qmljscheck.h
@@ -70,9 +70,9 @@ public:
WarnUseBeforeDeclaration = 1 << 8,
WarnDuplicateDeclaration = 1 << 9,
WarnDeclarationsNotStartOfFunction = 1 << 10,
- WarnCaseWithoutFlowControlEnd = 1 << 11,
+ WarnCaseWithoutFlowControlEnd = 1 << 11
};
- Q_DECLARE_FLAGS(Options, Option);
+ Q_DECLARE_FLAGS(Options, Option)
protected:
virtual bool preVisit(AST::Node *ast);
diff --git a/src/libs/qmljs/qmljscodeformatter.h b/src/libs/qmljs/qmljscodeformatter.h
index da22601bcfa..cc63fc9caf0 100644
--- a/src/libs/qmljs/qmljscodeformatter.h
+++ b/src/libs/qmljs/qmljscodeformatter.h
@@ -169,7 +169,7 @@ public: // must be public to make Q_GADGET introspection work
switch_statement, // After 'switch' token
case_start, // after a 'case' or 'default' token
- case_cont, // after the colon in a case/default
+ case_cont // after the colon in a case/default
};
Q_ENUMS(StateType)
@@ -233,7 +233,7 @@ protected:
Question,
PlusPlus,
- MinusMinus,
+ MinusMinus
};
TokenKind extendedTokenKind(const QmlJS::Token &token) const;
diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h
index bcb0551582b..c96d1f58a5c 100644
--- a/src/libs/utils/crumblepath.h
+++ b/src/libs/utils/crumblepath.h
@@ -34,7 +34,7 @@
#include <QtGui/QWidget>
-QT_FORWARD_DECLARE_CLASS(QResizeEvent);
+QT_FORWARD_DECLARE_CLASS(QResizeEvent)
namespace Utils {
diff --git a/src/libs/utils/debuggerlanguagechooser.h b/src/libs/utils/debuggerlanguagechooser.h
index 9cbba1e519a..434c6484c39 100644
--- a/src/libs/utils/debuggerlanguagechooser.h
+++ b/src/libs/utils/debuggerlanguagechooser.h
@@ -5,9 +5,9 @@
#include <QtGui/QWidget>
-QT_FORWARD_DECLARE_CLASS(QCheckBox);
-QT_FORWARD_DECLARE_CLASS(QLabel);
-QT_FORWARD_DECLARE_CLASS(QSpinBox);
+QT_FORWARD_DECLARE_CLASS(QCheckBox)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSpinBox)
namespace Utils {
diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp
index ae508e0ebce..1cd5b45e328 100644
--- a/src/libs/utils/historycompleter.cpp
+++ b/src/libs/utils/historycompleter.cpp
@@ -65,7 +65,7 @@ public:
HistoryCompleterPrivate(HistoryCompleter *parent);
HistoryCompleter *q_ptr;
HistoryListModel *model;
- Q_DECLARE_PUBLIC(HistoryCompleter);
+ Q_DECLARE_PUBLIC(HistoryCompleter)
};
class HistoryLineDelegate : public QItemDelegate
diff --git a/src/libs/utils/historycompleter.h b/src/libs/utils/historycompleter.h
index 460c0197f32..466e461254f 100644
--- a/src/libs/utils/historycompleter.h
+++ b/src/libs/utils/historycompleter.h
@@ -59,7 +59,7 @@ protected:
HistoryCompleterPrivate *d_ptr;
private:
- Q_DECLARE_PRIVATE(HistoryCompleter);
+ Q_DECLARE_PRIVATE(HistoryCompleter)
};
} // namespace Utils
diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h
index fc4c19264cc..bb6bd19851d 100644
--- a/src/libs/utils/unixutils.h
+++ b/src/libs/utils/unixutils.h
@@ -51,6 +51,6 @@ public:
const QString &file);
};
-};
+}
#endif // UNIXUTILS_H
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 5340df00e42..a2ad9a6cd01 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -277,5 +277,5 @@ private:
} // namespace Core
-Q_DECLARE_OPERATORS_FOR_FLAGS(Core::EditorManager::OpenEditorFlags);
+Q_DECLARE_OPERATORS_FOR_FLAGS(Core::EditorManager::OpenEditorFlags)
#endif // EDITORMANAGER_H
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index 74cc1c3740a..09d1613cd6b 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -113,7 +113,7 @@ namespace Internal {
// and read while checking).
class FileMatchContext {
- Q_DISABLE_COPY(FileMatchContext);
+ Q_DISABLE_COPY(FileMatchContext)
public:
// Max data to be read from a file
enum { MaxData = 2048 };
@@ -164,7 +164,7 @@ QByteArray FileMatchContext::data()
// The binary fallback matcher for "application/octet-stream".
class BinaryMatcher : public IMagicMatcher {
- Q_DISABLE_COPY(BinaryMatcher);
+ Q_DISABLE_COPY(BinaryMatcher)
public:
BinaryMatcher() {}
virtual bool matches(const QByteArray & /*data*/) const { return true; }
@@ -174,7 +174,7 @@ public:
// A heuristic text file matcher: If the data do not contain any character
// below tab (9), detect as text.
class HeuristicTextMagicMatcher : public IMagicMatcher {
- Q_DISABLE_COPY(HeuristicTextMagicMatcher);
+ Q_DISABLE_COPY(HeuristicTextMagicMatcher)
public:
HeuristicTextMagicMatcher() {}
virtual bool matches(const QByteArray &data) const;
@@ -646,7 +646,7 @@ namespace Internal {
// MimeDatabase helpers: Generic parser for a sequence of <mime-type>.
// Calls abstract handler function process for MimeType it finds.
class BaseMimeTypeParser {
- Q_DISABLE_COPY(BaseMimeTypeParser);
+ Q_DISABLE_COPY(BaseMimeTypeParser)
public:
BaseMimeTypeParser();
virtual ~BaseMimeTypeParser() {}
diff --git a/src/plugins/coreplugin/ssh/sshchannel_p.h b/src/plugins/coreplugin/ssh/sshchannel_p.h
index c260dec1437..c518db78c7a 100644
--- a/src/plugins/coreplugin/ssh/sshchannel_p.h
+++ b/src/plugins/coreplugin/ssh/sshchannel_p.h
@@ -34,7 +34,7 @@
#include <QtCore/QObject>
#include <QtCore/QString>
-QT_FORWARD_DECLARE_CLASS(QTimer);
+QT_FORWARD_DECLARE_CLASS(QTimer)
namespace Core {
namespace Internal {
diff --git a/src/plugins/coreplugin/ssh/sshpacket_p.h b/src/plugins/coreplugin/ssh/sshpacket_p.h
index 7120f001fd5..9bc55b715c9 100644
--- a/src/plugins/coreplugin/ssh/sshpacket_p.h
+++ b/src/plugins/coreplugin/ssh/sshpacket_p.h
@@ -75,7 +75,7 @@ enum SshPacketType {
SSH_MSG_CHANNEL_CLOSE = 97,
SSH_MSG_CHANNEL_REQUEST = 98,
SSH_MSG_CHANNEL_SUCCESS = 99,
- SSH_MSG_CHANNEL_FAILURE = 100,
+ SSH_MSG_CHANNEL_FAILURE = 100
};
enum SshExtendedDataType { SSH_EXTENDED_DATA_STDERR = 1 };
diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h
index e828b7b7db6..7efbf7107f4 100644
--- a/src/plugins/cpptools/cppcodeformatter.h
+++ b/src/plugins/cpptools/cppcodeformatter.h
@@ -50,7 +50,7 @@ namespace TextEditor {
class TabSettings;
}
-namespace CppTools {
+namespace CppTools {
namespace Internal {
class CppCodeFormatterData;
}
@@ -170,7 +170,7 @@ public: // must be public to make Q_GADGET introspection work
assign_open, // after an assignment token
expression, // after a '=' in a declaration_start once we're sure it's not '= {'
- initializer, // after a '=' in a declaration start
+ initializer // after a '=' in a declaration start
};
Q_ENUMS(StateType)
diff --git a/src/plugins/cpptools/insertionpointlocator.h b/src/plugins/cpptools/insertionpointlocator.h
index 3124a528f92..4a730a102ab 100644
--- a/src/plugins/cpptools/insertionpointlocator.h
+++ b/src/plugins/cpptools/insertionpointlocator.h
@@ -94,7 +94,7 @@ public:
PublicSlot = Public | SlotBit,
ProtectedSlot = Protected | SlotBit,
- PrivateSlot = Private | SlotBit,
+ PrivateSlot = Private | SlotBit
};
public:
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 8cc0601c1f7..3356f537648 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -1036,7 +1036,7 @@ static QString stateToString(BreakpointState state)
case BreakpointDead: return "Dead";
default: return "<invalid state>";
}
-};
+}
bool BreakHandler::BreakpointItem::needsChange() const
{
diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index 7db0e01d294..e4d873cb02f 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -54,7 +54,7 @@ enum BreakpointType
BreakpointAtThrow,
BreakpointAtCatch,
BreakpointAtMain,
- Watchpoint,
+ Watchpoint
};
enum BreakpointState
@@ -67,7 +67,7 @@ enum BreakpointState
BreakpointInserted,
BreakpointRemoveRequested,
BreakpointRemoveProceeding,
- BreakpointDead,
+ BreakpointDead
};
class BreakpointParameters
diff --git a/src/plugins/debugger/consolewindow.cpp b/src/plugins/debugger/consolewindow.cpp
index eecb3aa7696..9c2b0f0cc78 100644
--- a/src/plugins/debugger/consolewindow.cpp
+++ b/src/plugins/debugger/consolewindow.cpp
@@ -151,7 +151,7 @@ public:
History() : m_index(0) {}
void append(const QString &item) {
m_items.removeAll(item);
- m_items.append(item); m_index = m_items.size() - 1;
+ m_items.append(item); m_index = m_items.size() - 1;
}
void down() { m_index = qMin(m_index + 1, m_items.size()); }
void up() { m_index = qMax(m_index - 1, 0); }
@@ -289,7 +289,7 @@ ConsoleWindow::ConsoleWindow(QWidget *parent)
//connect(m_console, SIGNAL(statusMessageRequested(QString,int)),
// this, SIGNAL(statusMessageRequested(QString,int)));
-};
+}
void ConsoleWindow::showOutput(int channel, const QString &output)
{
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 3f734bd1668..904c46ecfd0 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -162,7 +162,7 @@ enum DebuggerCapabilities
CreateFullBacktraceCapability = 0x800,
AddWatcherCapability = 0x1000,
WatchpointCapability = 0x2000,
- ShowModuleSymbolsCapability = 0x4000,
+ ShowModuleSymbolsCapability = 0x4000
};
enum LogChannel
@@ -209,7 +209,7 @@ enum ModelRoles
LocalsIsWatchpointAtPointerValueRole,
// Snapshots
- SnapshotCapabilityRole,
+ SnapshotCapabilityRole
};
enum DebuggerEngineType
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 1b095e998ea..97239fb4f9d 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -72,7 +72,7 @@ enum DebuggingHelperState
DebuggingHelperUninitialized,
DebuggingHelperLoadTried,
DebuggingHelperAvailable,
- DebuggingHelperUnavailable,
+ DebuggingHelperUnavailable
};
@@ -182,7 +182,7 @@ private: ////////// Gdb Command Management //////////
enum GdbCommandFlag {
NoFlags = 0,
// The command needs a stopped inferior.
- NeedsStop = 1,
+ NeedsStop = 1,
// No need to wait for the reply before continuing inferior.
Discardable = 2,
// Trigger watch model rebuild when no such commands are pending anymore.
@@ -201,7 +201,7 @@ private: ////////// Gdb Command Management //////////
// This command needs to be send immediately.
Immediate = 256,
// This is a command that needs to be wrapped into -interpreter-exec console
- ConsoleCommand = 512,
+ ConsoleCommand = 512
};
Q_DECLARE_FLAGS(GdbCommandFlags, GdbCommandFlag)
private:
@@ -524,7 +524,7 @@ private: ////////// View & Data Stuff //////////
QtDumperHelper m_dumperHelper;
QString m_gdb;
- //
+ //
// Convenience Functions
//
QString errorMessage(QProcess::ProcessError error);
diff --git a/src/plugins/debugger/gdb/gdbmi.cpp b/src/plugins/debugger/gdb/gdbmi.cpp
index 158a1fc2b99..cf1346b0d52 100644
--- a/src/plugins/debugger/gdb/gdbmi.cpp
+++ b/src/plugins/debugger/gdb/gdbmi.cpp
@@ -386,7 +386,7 @@ QByteArray GdbResponse::stringFromResultClass(GdbResultClass resultClass)
case GdbResultExit: return "exit";
default: return "unknown";
}
-};
+}
QByteArray GdbResponse::toString() const
{
diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h
index 87190827205..5a4436cd4ea 100644
--- a/src/plugins/debugger/gdb/gdbmi.h
+++ b/src/plugins/debugger/gdb/gdbmi.h
@@ -100,7 +100,7 @@ public:
Invalid,
Const,
Tuple,
- List,
+ List
};
Type m_type;
@@ -152,7 +152,7 @@ enum GdbResultClass
GdbResultRunning,
GdbResultConnected,
GdbResultError,
- GdbResultExit,
+ GdbResultExit
};
class GdbResponse
diff --git a/src/plugins/debugger/gdb/remotegdbprocess.h b/src/plugins/debugger/gdb/remotegdbprocess.h
index 8fafe9560b5..f2183609337 100644
--- a/src/plugins/debugger/gdb/remotegdbprocess.h
+++ b/src/plugins/debugger/gdb/remotegdbprocess.h
@@ -91,7 +91,7 @@ private slots:
private:
enum State {
Inactive, Connecting, CreatingFifo, StartingFifoReader,
- StartingGdb, RunningGdb,
+ StartingGdb, RunningGdb
};
static QByteArray readerCmdLine(const QByteArray &file);
diff --git a/src/plugins/debugger/gdb/symbian.h b/src/plugins/debugger/gdb/symbian.h
index 791653f40ae..9174c56bf79 100644
--- a/src/plugins/debugger/gdb/symbian.h
+++ b/src/plugins/debugger/gdb/symbian.h
@@ -84,7 +84,7 @@ namespace Symbian {
enum CodeMode
{
ArmMode = 0,
- ThumbMode,
+ ThumbMode
};
enum TargetConstants
diff --git a/src/plugins/debugger/lldb/ipcengineguest.h b/src/plugins/debugger/lldb/ipcengineguest.h
index be939e4929d..ce5189ef732 100644
--- a/src/plugins/debugger/lldb/ipcengineguest.h
+++ b/src/plugins/debugger/lldb/ipcengineguest.h
@@ -124,7 +124,7 @@ public:
UpdateWatchData = 47,
FrameSourceFetched = 48
};
- Q_ENUMS(Function);
+ Q_ENUMS(Function)
DebuggerState state() const;
void notifyEngineSetupOk();
diff --git a/src/plugins/debugger/lldb/ipcenginehost.h b/src/plugins/debugger/lldb/ipcenginehost.h
index b36840641cf..aa6eb534a44 100644
--- a/src/plugins/debugger/lldb/ipcenginehost.h
+++ b/src/plugins/debugger/lldb/ipcenginehost.h
@@ -85,7 +85,7 @@ public:
RequestUpdateWatchData = 25,
FetchFrameSource = 26
};
- Q_ENUMS(Function);
+ Q_ENUMS(Function)
void setupEngine();
void setupInferior();
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index bdd731541a7..2b76c9e254a 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -382,7 +382,7 @@ LogWindow::LogWindow(QWidget *parent)
this, SIGNAL(statusMessageRequested(QString,int)));
connect(m_inputText, SIGNAL(commandSelected(int)),
m_combinedText, SLOT(gotoResult(int)));
-};
+}
void LogWindow::showOutput(int channel, const QString &output)
{
diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h
index 0d7d04a41f5..8bd05edfc28 100644
--- a/src/plugins/debugger/moduleshandler.h
+++ b/src/plugins/debugger/moduleshandler.h
@@ -75,12 +75,12 @@ public:
enum SymbolReadState {
UnknownReadState, // Not tried.
ReadFailed, // Tried to read, but failed.
- ReadOk, // Dwarf index available.
+ ReadOk // Dwarf index available.
};
enum SymbolType {
UnknownType, // Unknown.
PlainSymbols, // Ordinary symbols available.
- FastSymbols, // Dwarf index available.
+ FastSymbols // Dwarf index available.
};
QString moduleName;
QString modulePath;
diff --git a/src/plugins/debugger/tcf/json.h b/src/plugins/debugger/tcf/json.h
index 711a087b1b8..611e146df3a 100644
--- a/src/plugins/debugger/tcf/json.h
+++ b/src/plugins/debugger/tcf/json.h
@@ -51,7 +51,7 @@ public:
String,
Number,
Object,
- Array,
+ Array
};
Type m_type;
diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h
index 38f34a41063..f75509599ac 100644
--- a/src/plugins/debugger/watchhandler.h
+++ b/src/plugins/debugger/watchhandler.h
@@ -59,7 +59,7 @@ enum IntegerFormat
DecimalFormat = 0, // Keep that at 0 as default.
HexadecimalFormat,
BinaryFormat,
- OctalFormat,
+ OctalFormat
};
class WatchModel : public QAbstractItemModel
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index a21af15c460..9eade3983d6 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -691,7 +691,7 @@ bool currentTextEditorPosition(QString *fileNameIn /* = 0 */,
int *lineNumberIn /* = 0 */)
{
QString fileName;
- int lineNumber;
+ int lineNumber = 0;
if (TextEditor::ITextEditor *textEditor = currentTextEditor()) {
if (const Core::IFile *file = textEditor->file()) {
fileName = file->fileName();
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index 130625aa724..a069d7baab6 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -57,7 +57,7 @@ namespace Internal {
class FormEditorStack : public QStackedWidget
{
Q_OBJECT
- Q_DISABLE_COPY(FormEditorStack);
+ Q_DISABLE_COPY(FormEditorStack)
public:
explicit FormEditorStack(QWidget *parent = 0);
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index afdcf758b5a..aa6f3f89016 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -139,7 +139,7 @@ enum Mode
InsertMode,
ReplaceMode,
CommandMode,
- ExMode,
+ ExMode
};
/*! A \e SubMode is used for things that require one more data item
@@ -162,7 +162,7 @@ enum SubMode
CapitalZSubMode, // Used for Z
ReplaceSubMode, // Used for r
OpenSquareSubMode, // Used for [
- CloseSquareSubMode, // Used for ]
+ CloseSquareSubMode // Used for ]
};
/*! A \e SubSubMode is used for things that require one more data item
@@ -179,7 +179,7 @@ enum SubSubMode
DownCaseSubSubMode, // Used for gu.
UpCaseSubSubMode, // Used for gU.
TextObjectSubSubMode, // Used for thing like iw, aW, as etc.
- SearchSubSubMode,
+ SearchSubSubMode
};
enum VisualMode
@@ -187,14 +187,14 @@ enum VisualMode
NoVisualMode,
VisualCharMode,
VisualLineMode,
- VisualBlockMode,
+ VisualBlockMode
};
enum MoveType
{
MoveExclusive,
MoveInclusive,
- MoveLineWise,
+ MoveLineWise
};
/*!
@@ -1948,7 +1948,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
m_findPending = true;
m_findStartPosition = position();
m_movetype = MoveExclusive;
- setAnchor(); // clear selection: otherwise, search is restricted to selection
+ setAnchor(); // clear selection: otherwise, search is restricted to selection
emit q->findRequested(!m_lastSearchForward);
} else {
// FIXME: make core find dialog sufficiently flexible to
diff --git a/src/plugins/fakevim/fakevimhandler.h b/src/plugins/fakevim/fakevimhandler.h
index 2797d8c49b3..f379ffea6ef 100644
--- a/src/plugins/fakevim/fakevimhandler.h
+++ b/src/plugins/fakevim/fakevimhandler.h
@@ -44,7 +44,7 @@ enum RangeMode
RangeLineMode, // V
RangeLineModeExclusive,
RangeBlockMode, // Ctrl-v
- RangeBlockAndTailMode, // Ctrl-v for D and X
+ RangeBlockAndTailMode // Ctrl-v for D and X
};
struct Range
diff --git a/src/plugins/git/gitorious/gitorious.h b/src/plugins/git/gitorious/gitorious.h
index d61ae27c3d7..6644b2f9a0b 100644
--- a/src/plugins/git/gitorious/gitorious.h
+++ b/src/plugins/git/gitorious/gitorious.h
@@ -53,7 +53,7 @@ struct GitoriousRepository
CloneRepository,
BaselineRepository, // Nokia extension
SharedRepository, // Nokia extension
- PersonalRepository, // Nokia extension
+ PersonalRepository // Nokia extension
};
GitoriousRepository();
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index 6c47328aa43..fe66604d464 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -281,7 +281,7 @@ QByteArray GLSLEditorPlugin::glslFile(const QString &fileName)
void GLSLEditorPlugin::parseGlslFile(const QString &fileName, InitFile *initFile)
{
// Parse the builtins for any langugage variant so we can use all keywords.
- const int variant = GLSL::Lexer::Variant_All;
+ const unsigned variant = GLSL::Lexer::Variant_All;
const QByteArray code = glslFile(fileName);
initFile->engine = new GLSL::Engine();
diff --git a/src/plugins/helloworld/helloworldwindow.h b/src/plugins/helloworld/helloworldwindow.h
index 1a8f4512609..0f5990810eb 100644
--- a/src/plugins/helloworld/helloworldwindow.h
+++ b/src/plugins/helloworld/helloworldwindow.h
@@ -32,7 +32,7 @@
#include <QtGui/QWidget>
-QT_FORWARD_DECLARE_CLASS(QLabel);
+QT_FORWARD_DECLARE_CLASS(QLabel)
namespace HelloWorld {
namespace Internal {
diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp
index 7cf1f8712d3..37e10735d9c 100644
--- a/src/plugins/perforce/perforcesettings.cpp
+++ b/src/plugins/perforce/perforcesettings.cpp
@@ -82,7 +82,7 @@ bool Settings::equals(const Settings &rhs) const
&& p4Client == rhs.p4Client && p4User == rhs.p4User
&& timeOutS == rhs.timeOutS && promptToSubmit == rhs.promptToSubmit
&& autoOpen == rhs.autoOpen;
-};
+}
QStringList Settings::commonP4Arguments() const
{
diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h
index cdb1ee0675b..1c5d77f2eb2 100644
--- a/src/plugins/perforce/perforcesettings.h
+++ b/src/plugins/perforce/perforcesettings.h
@@ -82,7 +82,7 @@ inline bool operator!=(const Settings &s1, const Settings &s2) { return !s1.equa
* "-d" option, so that running p4 in "/depot/dev/foo" results in "-d $HOME/dev/foo". */
class PerforceSettings {
- Q_DISABLE_COPY(PerforceSettings);
+ Q_DISABLE_COPY(PerforceSettings)
public:
PerforceSettings();
~PerforceSettings();
diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp
index 8e755a960af..3824f866980 100644
--- a/src/plugins/perforce/perforceversioncontrol.cpp
+++ b/src/plugins/perforce/perforceversioncontrol.cpp
@@ -78,7 +78,7 @@ Core::IVersionControl::SettingsFlags PerforceVersionControl::settingsFlags() con
if (m_plugin->settings().autoOpen())
rc|= AutoOpen;
return rc;
-};
+}
bool PerforceVersionControl::vcsAdd(const QString &fileName)
{
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index 8a908c36052..3c99abefe93 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -388,7 +388,7 @@ static ParseState nextOpeningState(ParseState in, const QStringRef &name)
break;
}
return ParseError;
-};
+}
// Switch parser state depending on closing element name.
static ParseState nextClosingState(ParseState in, const QStringRef &name)
@@ -454,7 +454,7 @@ static ParseState nextClosingState(ParseState in, const QStringRef &name)
break;
}
return ParseError;
-};
+}
// Parse kind attribute
static inline Core::IWizard::WizardKind kindAttribute(const QXmlStreamReader &r)
diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
index a3feb6b0b5d..7e38d395a59 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
+++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h
@@ -35,7 +35,7 @@
namespace Core {
class GeneratedFile;
-};
+}
namespace ProjectExplorer {
namespace Internal {
diff --git a/src/plugins/projectexplorer/outputformatter.h b/src/plugins/projectexplorer/outputformatter.h
index d1501c1b664..0d03157c9a2 100644
--- a/src/plugins/projectexplorer/outputformatter.h
+++ b/src/plugins/projectexplorer/outputformatter.h
@@ -34,10 +34,10 @@
#include <QtCore/QObject>
-QT_FORWARD_DECLARE_CLASS(QMouseEvent);
-QT_FORWARD_DECLARE_CLASS(QPlainTextEdit);
-QT_FORWARD_DECLARE_CLASS(QTextCharFormat);
-QT_FORWARD_DECLARE_CLASS(QColor);
+QT_FORWARD_DECLARE_CLASS(QMouseEvent)
+QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
+QT_FORWARD_DECLARE_CLASS(QTextCharFormat)
+QT_FORWARD_DECLARE_CLASS(QColor)
namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/processparameters.h b/src/plugins/projectexplorer/processparameters.h
index 62fed68e213..1b7e739d427 100644
--- a/src/plugins/projectexplorer/processparameters.h
+++ b/src/plugins/projectexplorer/processparameters.h
@@ -36,7 +36,7 @@
namespace Utils {
class AbstractMacroExpander;
-};
+}
namespace ProjectExplorer {
diff --git a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h
index 7f8a018bcf2..aaff3282fc8 100644
--- a/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h
+++ b/src/plugins/projectexplorer/publishing/publishingwizardselectiondialog.h
@@ -32,7 +32,7 @@
#include <QtCore/QList>
#include <QtGui/QDialog>
-QT_FORWARD_DECLARE_CLASS(QWizard);
+QT_FORWARD_DECLARE_CLASS(QWizard)
namespace ProjectExplorer {
class IPublishingWizardFactory;
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 5047e38c19a..d78b3f2a3ab 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -57,7 +57,7 @@ class OutputFormatter;
* That is the lifetime of the RunConfiguration might exceed the life of the target.
* The user might still have a RunControl running (or output tab of that RunControl open)
* and yet unloaded the target.
- * Also a RunConfiguration might be already removed from the list of RunConfigurations
+ * Also a RunConfiguration might be already removed from the list of RunConfigurations
* for a target, but stil be runnable via the output tab.
*/
class PROJECTEXPLORER_EXPORT RunConfiguration : public ProjectConfiguration
@@ -180,7 +180,7 @@ class PROJECTEXPLORER_EXPORT RunControl : public QObject
public:
enum StopResult {
StoppedSynchronously, // Stopped.
- AsynchronousStop, // Stop sequence has been started
+ AsynchronousStop // Stop sequence has been started
};
explicit RunControl(RunConfiguration *runConfiguration, QString mode);
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h
index 74d59c3d46e..2db3eea4d03 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h
@@ -58,7 +58,7 @@ public slots:
private:
DragTool *m_dragTool;
};
-};
+}
class DragTool : public AbstractFormEditorTool
{
diff --git a/src/plugins/qmldesigner/components/formeditor/scaleitem.h b/src/plugins/qmldesigner/components/formeditor/scaleitem.h
index c6eb3bc727e..0ead6c80b86 100644
--- a/src/plugins/qmldesigner/components/formeditor/scaleitem.h
+++ b/src/plugins/qmldesigner/components/formeditor/scaleitem.h
@@ -48,6 +48,6 @@ private:
ScaleIndicator* m_indicator;
};
-};
+}
#endif // SCALEITEM_H
diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index d24d6fb3643..b851ae9daf6 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -160,7 +160,7 @@ void ComponentView::variantPropertiesChanged(const QList<VariantProperty>& /*pro
void ComponentView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, PropertyChangeFlags /*propertyChange*/) {}
void ComponentView::rootNodeTypeChanged(const QString &/*type*/, int /*majorVersion*/, int /*minorVersion*/) {}
void ComponentView::scriptFunctionsChanged(const ModelNode &/*node*/, const QStringList &/*scriptFunctionList*/) {}
-void ComponentView::instancePropertyChange(const QList<QPair<ModelNode, QString> > &/*propertyList*/) {};
+void ComponentView::instancePropertyChange(const QList<QPair<ModelNode, QString> > &/*propertyList*/) {}
void ComponentView::instancesCompleted(const QVector<ModelNode> &/*completedNodeList*/) {}
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
index a1e967a0219..d6cead8fb50 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
@@ -40,22 +40,22 @@
namespace QmlDesigner {
-void DesignDocumentControllerView::nodeCreated(const ModelNode & /*createdNode*/) {};
-void DesignDocumentControllerView::nodeAboutToBeRemoved(const ModelNode & /*removedNode*/) {};
-void DesignDocumentControllerView::nodeRemoved(const ModelNode & /*removedNode*/, const NodeAbstractProperty & /*parentProperty*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {};
-void DesignDocumentControllerView::nodeAboutToBeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {};
-void DesignDocumentControllerView::nodeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {};
-void DesignDocumentControllerView::nodeIdChanged(const ModelNode& /*node*/, const QString& /*newId*/, const QString& /*oldId*/) {};
-void DesignDocumentControllerView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& /*propertyList*/) {};
-void DesignDocumentControllerView::propertiesRemoved(const QList<AbstractProperty>& /*propertyList*/) {};
-void DesignDocumentControllerView::variantPropertiesChanged(const QList<VariantProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {};
-void DesignDocumentControllerView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {};
-void DesignDocumentControllerView::rootNodeTypeChanged(const QString & /*type*/, int /*majorVersion*/, int /*minorVersion*/) {};
+void DesignDocumentControllerView::nodeCreated(const ModelNode & /*createdNode*/) {}
+void DesignDocumentControllerView::nodeAboutToBeRemoved(const ModelNode & /*removedNode*/) {}
+void DesignDocumentControllerView::nodeRemoved(const ModelNode & /*removedNode*/, const NodeAbstractProperty & /*parentProperty*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
+void DesignDocumentControllerView::nodeAboutToBeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
+void DesignDocumentControllerView::nodeReparented(const ModelNode & /*node*/, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
+void DesignDocumentControllerView::nodeIdChanged(const ModelNode& /*node*/, const QString& /*newId*/, const QString& /*oldId*/) {}
+void DesignDocumentControllerView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& /*propertyList*/) {}
+void DesignDocumentControllerView::propertiesRemoved(const QList<AbstractProperty>& /*propertyList*/) {}
+void DesignDocumentControllerView::variantPropertiesChanged(const QList<VariantProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
+void DesignDocumentControllerView::bindingPropertiesChanged(const QList<BindingProperty>& /*propertyList*/, AbstractView::PropertyChangeFlags /*propertyChange*/) {}
+void DesignDocumentControllerView::rootNodeTypeChanged(const QString & /*type*/, int /*majorVersion*/, int /*minorVersion*/) {}
void DesignDocumentControllerView::selectedNodesChanged(const QList<ModelNode> & /*selectedNodeList*/,
- const QList<ModelNode> & /*lastSelectedNodeList*/) {};
+ const QList<ModelNode> & /*lastSelectedNodeList*/) {}
-void DesignDocumentControllerView::nodeOrderChanged(const NodeListProperty & /*listProperty*/, const ModelNode & /*movedNode*/, int /*oldIndex*/) {};
+void DesignDocumentControllerView::nodeOrderChanged(const NodeListProperty & /*listProperty*/, const ModelNode & /*movedNode*/, int /*oldIndex*/) {}
void DesignDocumentControllerView::scriptFunctionsChanged(const ModelNode &/*node*/, const QStringList &/*scriptFunctionList*/)
{
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 5a5da139c7e..5a405d1fd35 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -36,7 +36,7 @@
#include <QScriptEngine>
#include <private/qdeclarativelistmodel_p.h>
-QT_FORWARD_DECLARE_CLASS(QMimeData);
+QT_FORWARD_DECLARE_CLASS(QMimeData)
namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index 75556abb19c..cd5ee4cd7b7 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -49,7 +49,7 @@ class ItemLibraryWidget : public QFrame
enum FilterChangeFlag {
QtBasic = 0x0,
Meego = 0x1,
- Symbian = 0x2,
+ Symbian = 0x2
};
public:
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
index 49468353ac2..fb740b51b46 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
@@ -174,7 +174,7 @@ NavigatorTreeView::NavigatorTreeView(QWidget *parent)
TreeViewStyle *style = new TreeViewStyle;
setStyle(style);
style->setParent(this);
-};
+}
QSize IconCheckboxItemDelegate::sizeHint(const QStyleOptionViewItem &option,
const QModelIndex &index) const
@@ -224,7 +224,7 @@ void NameItemDelegate::paint(QPainter *painter,
painter->save();
QFontMetrics fm(option.font);
- int width;
+ int width = 0;
if (index.data(Qt::UserRole).isValid()) {
int pixmapSide = 16;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
index 87986816fd8..679d9eedec2 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
@@ -101,8 +101,8 @@ public:
Action(QObject *parent = 0) : QAction(parent) {}
};
-QML_DECLARE_TYPE(QMenu);
-QML_DECLARE_TYPE(Action);
+QML_DECLARE_TYPE(QMenu)
+QML_DECLARE_TYPE(Action)
//QML_DECLARE_TYPE(QToolBox)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
index 7245e59fae9..21d13889aa0 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.cpp
@@ -173,4 +173,4 @@ void BehaviorDialog::reject()
QDialog::reject();
}
-};
+}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
index ccf93602b76..1947c943494 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
@@ -92,7 +92,7 @@ private:
};
-};
+}
QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
index cce822d5852..1c85225e7fe 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
@@ -50,7 +50,7 @@ class QmlAnchorBindingProxy : public QObject
Q_PROPERTY(bool bottomAnchored READ bottomAnchored WRITE setBottomAnchor NOTIFY bottomAnchorChanged)
Q_PROPERTY(bool leftAnchored READ leftAnchored WRITE setLeftAnchor NOTIFY leftAnchorChanged)
Q_PROPERTY(bool rightAnchored READ rightAnchored WRITE setRightAnchor NOTIFY rightAnchorChanged)
- Q_PROPERTY(bool hasParent READ hasParent NOTIFY parentChanged);
+ Q_PROPERTY(bool hasParent READ hasParent NOTIFY parentChanged)
Q_PROPERTY(QVariant topTarget READ topTarget WRITE setTopTarget NOTIFY topTargetChanged)
Q_PROPERTY(QVariant bottomTarget READ bottomTarget WRITE setBottomTarget NOTIFY bottomTargetChanged)
diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h
index 70b8383b4d5..eae232631eb 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractview.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractview.h
@@ -61,15 +61,15 @@ class CORESHARED_EXPORT AbstractView : public QObject
{
Q_OBJECT
public:
- Q_FLAGS(PropertyChangeFlag PropertyChangeFlags);
+ Q_FLAGS(PropertyChangeFlag PropertyChangeFlags)
typedef QWeakPointer<AbstractView> Pointer;
enum PropertyChangeFlag {
NoAdditionalChanges = 0x0,
PropertiesAdded = 0x1,
- EmptyPropertiesRemoved = 0x2,
+ EmptyPropertiesRemoved = 0x2
};
- Q_DECLARE_FLAGS(PropertyChangeFlags, PropertyChangeFlag);
+ Q_DECLARE_FLAGS(PropertyChangeFlags, PropertyChangeFlag)
AbstractView(QObject *parent = 0)
: QObject(parent) {}
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 33f754290fa..fbd15669cad 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -87,7 +87,7 @@
enum {
UPDATE_DOCUMENT_DEFAULT_INTERVAL = 100,
UPDATE_USES_DEFAULT_INTERVAL = 150,
- UPDATE_OUTLINE_INTERVAL = 500, // msecs after new semantic info has been arrived / cursor has moved
+ UPDATE_OUTLINE_INTERVAL = 500 // msecs after new semantic info has been arrived / cursor has moved
};
using namespace QmlJS;
diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h
index c54fc36b15b..87430cb4dce 100644
--- a/src/plugins/qmljseditor/qmljsoutline.h
+++ b/src/plugins/qmljseditor/qmljsoutline.h
@@ -13,7 +13,7 @@ class IEditor;
namespace QmlJS {
class Editor;
-};
+}
namespace QmlJSEditor {
namespace Internal {
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index 96d735d0d47..7612156952d 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -144,7 +144,7 @@ private:
QDeclarativeDebugObjectReference objectReferenceForId(int debugId, const QDeclarativeDebugObjectReference &ref) const;
private:
- Q_DISABLE_COPY(ClientProxy);
+ Q_DISABLE_COPY(ClientProxy)
void buildDebugIdHashRecursive(const QDeclarativeDebugObjectReference &ref);
Debugger::QmlAdapter *m_adapter;
diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h
index 1ab8762ab6d..749a67dd8a3 100644
--- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h
+++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h
@@ -33,8 +33,8 @@
#include <QColor>
#include <QPoint>
-QT_FORWARD_DECLARE_CLASS(QContextMenuEvent);
-QT_FORWARD_DECLARE_CLASS(QAction);
+QT_FORWARD_DECLARE_CLASS(QContextMenuEvent)
+QT_FORWARD_DECLARE_CLASS(QAction)
namespace QmlJSInspector {
diff --git a/src/plugins/qmljstools/qmljslocatordata.h b/src/plugins/qmljstools/qmljslocatordata.h
index 9357fca7e95..906e3920cc6 100644
--- a/src/plugins/qmljstools/qmljslocatordata.h
+++ b/src/plugins/qmljstools/qmljslocatordata.h
@@ -47,7 +47,7 @@ public:
enum EntryType
{
- Function,
+ Function
};
class Entry
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
index 63a6bc0d771..5b921697923 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
@@ -27,7 +27,7 @@ class QmlProjectItem : public QObject {
Q_PROPERTY(QStringList importPaths READ importPaths WRITE setImportPaths NOTIFY importPathsChanged)
Q_PROPERTY(QString mainFile READ mainFile WRITE setMainFile NOTIFY mainFileChanged)
- Q_CLASSINFO("DefaultProperty", "content");
+ Q_CLASSINFO("DefaultProperty", "content")
public:
QmlProjectItem(QObject *parent = 0);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index b0a24930740..f3ddae862a4 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -36,7 +36,7 @@
#include <QComboBox>
#include <QLabel>
-QT_FORWARD_DECLARE_CLASS(QStringListModel);
+QT_FORWARD_DECLARE_CLASS(QStringListModel)
namespace Core {
class IEditor;
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h
index 7f981b45452..1dacf7a7a1f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h
@@ -32,8 +32,8 @@
#include <QWidget>
-QT_FORWARD_DECLARE_CLASS(QComboBox);
-QT_FORWARD_DECLARE_CLASS(QStandardItemModel);
+QT_FORWARD_DECLARE_CLASS(QComboBox)
+QT_FORWARD_DECLARE_CLASS(QStandardItemModel)
namespace ProjectExplorer {
diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp
index 4f11e604216..37239bcf566 100644
--- a/src/plugins/qt4projectmanager/qmldumptool.cpp
+++ b/src/plugins/qt4projectmanager/qmldumptool.cpp
@@ -52,7 +52,7 @@ using namespace Qt4ProjectManager;
class QmlDumpBuildTask;
typedef QHash<int, QmlDumpBuildTask *> QmlDumpByVersion;
-Q_GLOBAL_STATIC(QmlDumpByVersion, qmlDumpBuilds);
+Q_GLOBAL_STATIC(QmlDumpByVersion, qmlDumpBuilds)
// A task suitable to be run by QtConcurrent to build qmldump.
class QmlDumpBuildTask : public QObject {
diff --git a/src/plugins/qt4projectmanager/qmlobservertool.h b/src/plugins/qt4projectmanager/qmlobservertool.h
index 65223919cab..a7d7cbaa3fa 100644
--- a/src/plugins/qt4projectmanager/qmlobservertool.h
+++ b/src/plugins/qt4projectmanager/qmlobservertool.h
@@ -33,7 +33,7 @@
#include <utils/buildablehelperlibrary.h>
#include "qt4projectmanager_global.h"
-QT_FORWARD_DECLARE_CLASS(QDir);
+QT_FORWARD_DECLARE_CLASS(QDir)
namespace Utils {
class Environment;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
index b7175116b72..9d3f797bef4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployables.h
@@ -49,7 +49,7 @@
#include <QtCore/QHash>
#include <QtCore/QList>
-QT_FORWARD_DECLARE_CLASS(QTimer);
+QT_FORWARD_DECLARE_CLASS(QTimer)
namespace ProjectExplorer { class BuildStep; }
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
index 8cf45b34da2..cdb03a51c45 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
@@ -79,7 +79,7 @@ namespace {
const AuthType DefaultAuthType(Core::SshConnectionParameters::AuthByKey);
const int DefaultTimeout(30);
const MaemoDeviceConfig::DeviceType DefaultDeviceType(MaemoDeviceConfig::Physical);
-};
+}
class DevConfIdMatcher
{
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
index c28081875c1..bc936308968 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
@@ -39,9 +39,9 @@
#include <QtGui/QIcon>
-QT_FORWARD_DECLARE_CLASS(QAction);
+QT_FORWARD_DECLARE_CLASS(QAction)
QT_FORWARD_DECLARE_CLASS(QFileSystemWatcher)
-QT_FORWARD_DECLARE_CLASS(QStringList);
+QT_FORWARD_DECLARE_CLASS(QStringList)
namespace ProjectExplorer {
class BuildConfiguration;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
index 48d9abcc55c..cff56c4edfc 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.h
@@ -41,7 +41,7 @@
#include <QtCore/QSharedPointer>
#include <QtCore/QString>
-QT_FORWARD_DECLARE_CLASS(QTimer);
+QT_FORWARD_DECLARE_CLASS(QTimer)
namespace Core {
class SftpChannel;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h
index 08c44e9a069..6fe3ae0cbf0 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.h
@@ -36,7 +36,7 @@
#include <QtCore/QSharedPointer>
#include <QtGui/QIcon>
-QT_FORWARD_DECLARE_CLASS(QFileSystemWatcher);
+QT_FORWARD_DECLARE_CLASS(QFileSystemWatcher)
namespace ProjectExplorer {
class Project;
diff --git a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
index 4fe4c000b15..9ef827de0e3 100644
--- a/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
+++ b/src/plugins/qt4projectmanager/qt-s60/passphraseforkeydialog.h
@@ -32,9 +32,9 @@
#include <QtGui/QDialog>
-QT_FORWARD_DECLARE_CLASS(QCheckBox);
-QT_FORWARD_DECLARE_CLASS(QDialogButtonBox);
-QT_FORWARD_DECLARE_CLASS(QLineEdit);
+QT_FORWARD_DECLARE_CLASS(QCheckBox)
+QT_FORWARD_DECLARE_CLASS(QDialogButtonBox)
+QT_FORWARD_DECLARE_CLASS(QLineEdit)
namespace Qt4ProjectManager {
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index ceb272bc4c8..b7d255854b5 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -146,7 +146,7 @@ Q_GLOBAL_STATIC_WITH_INITIALIZER(Qt4NodeStaticData, qt4NodeStaticData, {
x->projectIcon.addPixmap(projectPixmap);
qAddPostRoutine(clearQt4NodeStaticData);
-});
+})
static void clearQt4NodeStaticData()
{
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
index 84fc7e4f1e3..e62db51bb75 100644
--- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
@@ -125,19 +125,19 @@ const itemVectorType itemVector()
Q_GLOBAL_STATIC_WITH_INITIALIZER(itemVectorType, staticItemVector, {
*x = itemVector();
-});
+})
Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, staticModulesList, {
const itemVectorType * const itemVector = staticItemVector();
for (int i = 0; i < itemVector->count(); i++)
x->append(QString::fromLatin1(itemVector->at(i)->config));
-});
+})
Q_GLOBAL_STATIC_WITH_INITIALIZER(itemHashType, staticItemHash, {
const itemVectorType * const itemVector = staticItemVector();
for (int i = 0; i < itemVector->count(); i++)
x->insert(QString::fromLatin1(itemVector->at(i)->config), itemVector->at(i));
-});
+})
QStringList QtModulesInfo::modules()
{
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
index fdef7d681d2..d3517ca283c 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.h
@@ -36,7 +36,7 @@
#include <coreplugin/basefilewizard.h>
#endif // CREATORLESSTEST
-QT_FORWARD_DECLARE_CLASS(QTextStream);
+QT_FORWARD_DECLARE_CLASS(QTextStream)
namespace Qt4ProjectManager {
namespace Internal {
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.h b/src/plugins/qt4projectmanager/wizards/mobileapp.h
index 621219ce563..de5bbe92b74 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.h
@@ -40,7 +40,7 @@ struct MobileAppGeneratedFileInfo : AbstractGeneratedFileInfo
enum ExtendedFileType {
MainWindowCppFile = ExtendedFile,
MainWindowHFile,
- MainWindowUiFile,
+ MainWindowUiFile
};
MobileAppGeneratedFileInfo() : AbstractGeneratedFileInfo() {}
@@ -56,7 +56,7 @@ public:
MainWindowH,
MainWindowHOrigin,
MainWindowUi,
- MainWindowUiOrigin,
+ MainWindowUiOrigin
};
MobileApp();
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h
index 5cd48d5e1dc..b7f93260c18 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h
@@ -79,7 +79,7 @@ struct QmlAppGeneratedFileInfo : public AbstractGeneratedFileInfo
MainQmlFile = ExtendedFile,
AppViewerPriFile,
AppViewerCppFile,
- AppViewerHFile,
+ AppViewerHFile
};
QmlAppGeneratedFileInfo() : AbstractGeneratedFileInfo() {}
diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h
index 737b68dd56d..91195cd9581 100644
--- a/src/plugins/texteditor/texteditorsettings.h
+++ b/src/plugins/texteditor/texteditorsettings.h
@@ -86,8 +86,8 @@ signals:
private:
Internal::TextEditorSettingsPrivate *m_d;
- Q_PRIVATE_SLOT(m_d, void fontZoomRequested(int pointSize));
- Q_PRIVATE_SLOT(m_d, void zoomResetRequested());
+ Q_PRIVATE_SLOT(m_d, void fontZoomRequested(int pointSize))
+ Q_PRIVATE_SLOT(m_d, void zoomResetRequested())
static TextEditorSettings *m_instance;
};
diff --git a/src/shared/symbianutils/json.h b/src/shared/symbianutils/json.h
index ef574bdae24..6cff175d41a 100644
--- a/src/shared/symbianutils/json.h
+++ b/src/shared/symbianutils/json.h
@@ -55,7 +55,7 @@ public:
Boolean,
Object,
NullObject,
- Array,
+ Array
};
Type m_type;
diff --git a/src/shared/symbianutils/trkdevice.cpp b/src/shared/symbianutils/trkdevice.cpp
index f1d52ec2184..b3a1b3fffd3 100644
--- a/src/shared/symbianutils/trkdevice.cpp
+++ b/src/shared/symbianutils/trkdevice.cpp
@@ -179,7 +179,7 @@ public:
enum WriteResult {
WriteOk,
WriteFailedDiscard, // Discard failed message
- WriteFailedKeep, // Keep failed message
+ WriteFailedKeep // Keep failed message
};
void notifyWriteResult(WriteResult ok);
diff --git a/src/shared/symbianutils/trkutils.h b/src/shared/symbianutils/trkutils.h
index 98850534845..249a63e5ccf 100644
--- a/src/shared/symbianutils/trkutils.h
+++ b/src/shared/symbianutils/trkutils.h
@@ -133,7 +133,7 @@ enum DSOSItemTypes {
kDSOSProcAttachItem = 0x0005,
kDSOSThreadAttachItem = 0x0006,
kDSOSProcAttach2Item = 0x0007,
- kDSOSProcRunItem = 0x0008,
+ kDSOSProcRunItem = 0x0008
/* 0x0009 - 0x00ff reserved for general expansion */
/* 0x0100 - 0xffff available for target-specific use */
};
@@ -158,7 +158,7 @@ enum Endianness
{
LittleEndian,
BigEndian,
- TargetByteOrder = BigEndian,
+ TargetByteOrder = BigEndian
};
SYMBIANUTILS_EXPORT void appendShort(QByteArray *ba, ushort s, Endianness = TargetByteOrder);
diff --git a/src/tools/qtpromaker/main.cpp b/src/tools/qtpromaker/main.cpp
index c353b673d49..a4851218a70 100644
--- a/src/tools/qtpromaker/main.cpp
+++ b/src/tools/qtpromaker/main.cpp
@@ -299,7 +299,7 @@ void ProMaker::createContents()
{
for (int i = 0; i != m_projects.size(); ++i)
m_projects[i]->createFileLists();
-};
+}
void ProMaker::writeOutput()
{
--
GitLab