diff options
Diffstat (limited to 'src')
237 files changed, 821 insertions, 561 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 0247b1dde3..df4b368c7d 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -51,7 +51,7 @@ # include <sys/resource.h> #endif -enum { OptionIndent =4, DescriptionIndent = 24 }; +enum { OptionIndent = 4, DescriptionIndent = 24 }; static const char *appNameC = "Qt Creator"; static const char *corePluginNameC = "Core"; diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp index bfd9e0f4dc..5ca8cc5355 100644 --- a/src/libs/aggregation/aggregate.cpp +++ b/src/libs/aggregation/aggregate.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "aggregate.h" #include <QtCore/QWriteLocker> @@ -262,4 +263,3 @@ void Aggregate::remove(QObject *component) m_components.removeAll(component); disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(deleteSelf(QObject*))); } - diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 5040aec8b2..20c9bfbca6 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef QAGGREGATION_H #define QAGGREGATION_H @@ -131,4 +132,4 @@ template <typename T> QList<T *> query_all(QObject *obj) } // namespace Aggregation -#endif // header guard +#endif // QAGGREGATION_H diff --git a/src/libs/aggregation/aggregation_global.h b/src/libs/aggregation/aggregation_global.h index cae0917d65..0080813711 100644 --- a/src/libs/aggregation/aggregation_global.h +++ b/src/libs/aggregation/aggregation_global.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef AGGREGATION_GLOBAL_H #define AGGREGATION_GLOBAL_H @@ -41,4 +42,4 @@ # define AGGREGATION_EXPORT Q_DECL_IMPORT #endif -#endif // header +#endif // AGGREGATION_GLOBAL_H diff --git a/src/libs/aggregation/examples/text/main.cpp b/src/libs/aggregation/examples/text/main.cpp index 1a0ecac816..8de68c0ffb 100644 --- a/src/libs/aggregation/examples/text/main.cpp +++ b/src/libs/aggregation/examples/text/main.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "main.h" #include <QtGui/QApplication> @@ -107,4 +108,3 @@ int main(int argc, char *argv[]) w.show(); return app.exec(); } - diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h index 3a458923b4..dba7256946 100644 --- a/src/libs/aggregation/examples/text/main.h +++ b/src/libs/aggregation/examples/text/main.h @@ -30,15 +30,16 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MAIN_H #define MAIN_H #include "myinterfaces.h" +#include "ui_main.h" #include <aggregate.h> #include <QtGui/QWidget> -#include "ui_main.h" class MyMain : public QWidget { diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h index 62dad429e2..150f60603b 100644 --- a/src/libs/aggregation/examples/text/myinterfaces.h +++ b/src/libs/aggregation/examples/text/myinterfaces.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MYINTERFACES_H #define MYINTERFACES_H @@ -45,6 +46,7 @@ public: IComboEntry(QString title) : m_title(title) {} virtual ~IComboEntry() {} QString title() const { return m_title; } + private: QString m_title; }; @@ -57,6 +59,7 @@ public: IText1(QString text) : m_text(text) {} virtual ~IText1() {} QString text() const { return m_text; } + private: QString m_text; }; @@ -68,6 +71,7 @@ class IText2 : public QObject public: IText2(QString text) : m_text(text) {} QString text() const { return m_text; } + private: QString m_text; }; @@ -80,6 +84,7 @@ public: IText3(QString text) : m_text(text) {} virtual ~IText3() {} QString text() const { return m_text; } + private: QString m_text; }; diff --git a/src/libs/aggregation/test/tst_aggregate.cpp b/src/libs/aggregation/test/tst_aggregate.cpp index 098cc723af..38447eaaf1 100644 --- a/src/libs/aggregation/test/tst_aggregate.cpp +++ b/src/libs/aggregation/test/tst_aggregate.cpp @@ -30,10 +30,11 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -#include <QtTest/QtTest> #include <aggregate.h> +#include <QtTest/QtTest> + class tst_Aggregate : public QObject { Q_OBJECT @@ -195,4 +196,5 @@ void tst_Aggregate::parentAggregate() } QTEST_MAIN(tst_Aggregate) + #include "tst_aggregate.moc" diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp index b2e0ca4be1..f422cbefc4 100644 --- a/src/libs/cplusplus/CppDocument.cpp +++ b/src/libs/cplusplus/CppDocument.cpp @@ -40,6 +40,7 @@ #include <Symbols.h> #include <AST.h> #include <Scope.h> + #include <QByteArray> #include <QFile> #include <QtDebug> @@ -47,50 +48,52 @@ using namespace CPlusPlus; namespace { - class DocumentDiagnosticClient: public DiagnosticClient - { - enum { MAX_MESSAGE_COUNT = 10 }; - public: - DocumentDiagnosticClient(Document *doc, QList<Document::DiagnosticMessage> *messages) - : doc(doc), - messages(messages) - { } +class DocumentDiagnosticClient : public DiagnosticClient +{ + enum { MAX_MESSAGE_COUNT = 10 }; + +public: + DocumentDiagnosticClient(Document *doc, QList<Document::DiagnosticMessage> *messages) + : doc(doc), + messages(messages) + { } + + virtual void report(int level, + StringLiteral *fileId, + unsigned line, unsigned column, + const char *format, va_list ap) + { + if (messages->count() == MAX_MESSAGE_COUNT) + return; - virtual void report(int level, - StringLiteral *fileId, - unsigned line, unsigned column, - const char *format, va_list ap) - { - if (messages->count() == MAX_MESSAGE_COUNT) - return; + const QString fileName = QString::fromUtf8(fileId->chars(), fileId->size()); - const QString fileName = QString::fromUtf8(fileId->chars(), fileId->size()); + if (fileName != doc->fileName()) + return; - if (fileName != doc->fileName()) - return; + QString message; + message.vsprintf(format, ap); - QString message; - message.vsprintf(format, ap); + Document::DiagnosticMessage m(convertLevel(level), doc->fileName(), + line, column, message); + messages->append(m); + } - Document::DiagnosticMessage m(convertLevel(level), doc->fileName(), - line, column, message); - messages->append(m); + static int convertLevel(int level) { + switch (level) { + case Warning: return Document::DiagnosticMessage::Warning; + case Error: return Document::DiagnosticMessage::Error; + case Fatal: return Document::DiagnosticMessage::Fatal; + default: return Document::DiagnosticMessage::Error; } + } - static int convertLevel(int level) { - switch (level) { - case Warning: return Document::DiagnosticMessage::Warning; - case Error: return Document::DiagnosticMessage::Error; - case Fatal: return Document::DiagnosticMessage::Fatal; - default: return Document::DiagnosticMessage::Error; - } - } + Document *doc; + QList<Document::DiagnosticMessage> *messages; +}; - Document *doc; - QList<Document::DiagnosticMessage> *messages; - }; -} // end of anonymous namespace +} // anonymous namespace Document::Document(const QString &fileName) : _fileName(fileName), @@ -116,19 +119,29 @@ Document::~Document() } Control *Document::control() const -{ return _control; } +{ + return _control; +} QString Document::fileName() const -{ return _fileName; } +{ + return _fileName; +} QStringList Document::includedFiles() const -{ return _includedFiles; } +{ + return _includedFiles; +} void Document::addIncludeFile(const QString &fileName) -{ _includedFiles.append(fileName); } +{ + _includedFiles.append(fileName); +} QByteArray Document::definedMacros() const -{ return _definedMacros; } +{ + return _definedMacros; +} void Document::appendMacro(const QByteArray ¯oName, const QByteArray &text) { @@ -141,13 +154,19 @@ void Document::appendMacro(const QByteArray ¯oName, const QByteArray &text) } TranslationUnit *Document::translationUnit() const -{ return _translationUnit; } +{ + return _translationUnit; +} bool Document::skipFunctionBody() const -{ return _translationUnit->skipFunctionBody(); } +{ + return _translationUnit->skipFunctionBody(); +} void Document::setSkipFunctionBody(bool skipFunctionBody) -{ _translationUnit->setSkipFunctionBody(skipFunctionBody); } +{ + _translationUnit->setSkipFunctionBody(skipFunctionBody); +} unsigned Document::globalSymbolCount() const { @@ -158,7 +177,9 @@ unsigned Document::globalSymbolCount() const } Symbol *Document::globalSymbolAt(unsigned index) const -{ return _globalNamespace->memberAt(index); } +{ + return _globalNamespace->memberAt(index); +} Scope *Document::globalSymbols() const { @@ -169,10 +190,14 @@ Scope *Document::globalSymbols() const } Namespace *Document::globalNamespace() const -{ return _globalNamespace; } +{ + return _globalNamespace; +} Symbol *Document::findSymbolAt(unsigned line, unsigned column) const -{ return findSymbolAt(line, column, globalSymbols()); } +{ + return findSymbolAt(line, column, globalSymbols()); +} Symbol *Document::findSymbolAt(unsigned line, unsigned column, Scope *scope) const { @@ -203,10 +228,14 @@ Document::Ptr Document::create(const QString &fileName) } void Document::setSource(const QByteArray &source) -{ _translationUnit->setSource(source.constBegin(), source.size()); } +{ + _translationUnit->setSource(source.constBegin(), source.size()); +} void Document::startSkippingBlocks(unsigned start) -{ _skippedBlocks.append(Block(start, 0)); } +{ + _skippedBlocks.append(Block(start, 0)); +} void Document::stopSkippingBlocks(unsigned stop) { @@ -218,10 +247,14 @@ void Document::stopSkippingBlocks(unsigned stop) } QSet<QByteArray> Document::macroNames() const -{ return _macroNames; } +{ + return _macroNames; +} void Document::parse() -{ _translationUnit->parse(); } +{ + _translationUnit->parse(); +} void Document::check() { @@ -239,4 +272,6 @@ void Document::check() } void Document::releaseTranslationUnit() -{ _translationUnit->release(); } +{ + _translationUnit->release(); +} diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h index 47f2366ddd..274ec4ba6a 100644 --- a/src/libs/cplusplus/CppDocument.h +++ b/src/libs/cplusplus/CppDocument.h @@ -30,16 +30,18 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPPDOCUMENT_H #define CPPDOCUMENT_H #include <CPlusPlusForwardDeclarations.h> + #include <QByteArray> +#include <QList> +#include <QSet> #include <QSharedPointer> #include <QString> #include <QStringList> -#include <QList> -#include <QSet> namespace CPlusPlus { diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h index e3fa442326..d1e307e6fc 100644 --- a/src/libs/cplusplus/ExpressionUnderCursor.h +++ b/src/libs/cplusplus/ExpressionUnderCursor.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EXPRESSIONUNDERCURSOR_H #define EXPRESSIONUNDERCURSOR_H diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h index c549c1c429..2ecec8f228 100644 --- a/src/libs/cplusplus/Icons.h +++ b/src/libs/cplusplus/Icons.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPLUSPLUS_ICONS_H #define CPLUSPLUS_ICONS_H diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 027cfb577d..157e15ad44 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -39,6 +39,7 @@ #include <Scope.h> #include <Control.h> #include <cplusplus/Overview.h> + #include <QFile> #include <QtDebug> diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index d2fe8b7bef..d234dfaef6 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPLUSPLUS_LOOKUPCONTEXT_H #define CPLUSPLUS_LOOKUPCONTEXT_H @@ -45,8 +46,7 @@ namespace CPlusPlus { class CPLUSPLUS_EXPORT LookupUtils { public: - static bool isNameCompatibleWithIdentifier(Name *name, - Identifier *id); + static bool isNameCompatibleWithIdentifier(Name *name, Identifier *id); }; class CPLUSPLUS_EXPORT LookupContext: LookupUtils diff --git a/src/libs/cplusplus/NameOfExpression.cpp b/src/libs/cplusplus/NameOfExpression.cpp index d54e7f5521..1d527d88ae 100644 --- a/src/libs/cplusplus/NameOfExpression.cpp +++ b/src/libs/cplusplus/NameOfExpression.cpp @@ -44,6 +44,7 @@ #include <CoreTypes.h> #include <TypeVisitor.h> #include <NameVisitor.h> + #include <QList> #include <QtDebug> diff --git a/src/libs/cplusplus/NameOfExpression.h b/src/libs/cplusplus/NameOfExpression.h index f68795cea0..3f2b15e56e 100644 --- a/src/libs/cplusplus/NameOfExpression.h +++ b/src/libs/cplusplus/NameOfExpression.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPLUSPLUS_NAMEOFEXPRESSION_H #define CPLUSPLUS_NAMEOFEXPRESSION_H diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp index 5d6fddfb63..0795e6f0e6 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.cpp +++ b/src/libs/cplusplus/NamePrettyPrinter.cpp @@ -30,7 +30,9 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "NamePrettyPrinter.h" + #include <Names.h> #include <Overview.h> #include <NameVisitor.h> @@ -46,7 +48,9 @@ NamePrettyPrinter::~NamePrettyPrinter() { } const Overview *NamePrettyPrinter::overview() const -{ return _overview; } +{ + return _overview; +} QString NamePrettyPrinter::operator()(Name *name) { diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h index 3868432650..8e8210fd3d 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.h +++ b/src/libs/cplusplus/NamePrettyPrinter.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPLUSPLUS_NAMEPRETTYPRINTER_H #define CPLUSPLUS_NAMEPRETTYPRINTER_H diff --git a/src/libs/cplusplus/Overview.cpp b/src/libs/cplusplus/Overview.cpp index ec40f75b51..9d561eae75 100644 --- a/src/libs/cplusplus/Overview.cpp +++ b/src/libs/cplusplus/Overview.cpp @@ -49,25 +49,39 @@ Overview::~Overview() { } bool Overview::showArgumentNames() const -{ return _showArgumentNames; } +{ + return _showArgumentNames; +} void Overview::setShowArgumentNames(bool showArgumentNames) -{ _showArgumentNames = showArgumentNames; } +{ + _showArgumentNames = showArgumentNames; +} void Overview::setShowReturnTypes(bool showReturnTypes) -{ _showReturnTypes = showReturnTypes; } +{ + _showReturnTypes = showReturnTypes; +} bool Overview::showReturnTypes() const -{ return _showReturnTypes; } +{ + return _showReturnTypes; +} void Overview::setMarkArgument(unsigned position) -{ _markArgument = position; } +{ + _markArgument = position; +} bool Overview::showFunctionSignatures() const -{ return _showFunctionSignatures; } +{ + return _showFunctionSignatures; +} void Overview::setShowFunctionSignatures(bool showFunctionSignatures) -{ _showFunctionSignatures = showFunctionSignatures; } +{ + _showFunctionSignatures = showFunctionSignatures; +} QString Overview::prettyName(Name *name) const { @@ -75,9 +89,10 @@ QString Overview::prettyName(Name *name) const return pp(name); } -QString Overview::prettyType(const FullySpecifiedType &ty, - Name *name) const -{ return prettyType(ty, prettyName(name)); } +QString Overview::prettyType(const FullySpecifiedType &ty, Name *name) const +{ + return prettyType(ty, prettyName(name)); +} QString Overview::prettyType(const FullySpecifiedType &ty, const QString &name) const diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h index 6b84a4b53f..c9c0a6222a 100644 --- a/src/libs/cplusplus/Overview.h +++ b/src/libs/cplusplus/Overview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef OVERVIEW_H #define OVERVIEW_H diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp index 028811e6ae..d56ab91e2f 100644 --- a/src/libs/cplusplus/OverviewModel.cpp +++ b/src/libs/cplusplus/OverviewModel.cpp @@ -33,10 +33,12 @@ #include "OverviewModel.h" #include "Overview.h" + #include <Scope.h> #include <Semantic.h> #include <Literals.h> #include <Symbols.h> + #include <QFile> #include <QtDebug> @@ -50,10 +52,14 @@ OverviewModel::~OverviewModel() { } bool OverviewModel::hasDocument() const -{ return _cppDocument; } +{ + return _cppDocument; +} Document::Ptr OverviewModel::document() const -{ return _cppDocument; } +{ + return _cppDocument; +} unsigned OverviewModel::globalSymbolCount() const { @@ -124,7 +130,9 @@ int OverviewModel::rowCount(const QModelIndex &parent) const } int OverviewModel::columnCount(const QModelIndex &) const -{ return 1; } +{ + return 1; +} QVariant OverviewModel::data(const QModelIndex &index, int role) const { @@ -174,7 +182,9 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const } Symbol *OverviewModel::symbolFromIndex(const QModelIndex &index) const -{ return static_cast<Symbol *>(index.internalPointer()); } +{ + return static_cast<Symbol *>(index.internalPointer()); +} void OverviewModel::rebuild(Document::Ptr doc) { diff --git a/src/libs/cplusplus/OverviewModel.h b/src/libs/cplusplus/OverviewModel.h index 9ff920487b..8bb2bee8f5 100644 --- a/src/libs/cplusplus/OverviewModel.h +++ b/src/libs/cplusplus/OverviewModel.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPLUSPLUS_OVERVIEWMODEL_H #define CPLUSPLUS_OVERVIEWMODEL_H @@ -42,7 +43,7 @@ namespace CPlusPlus { -class CPLUSPLUS_EXPORT OverviewModel: public QAbstractItemModel +class CPLUSPLUS_EXPORT OverviewModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp index 6071f235c4..43320d4664 100644 --- a/src/libs/cplusplus/ResolveExpression.cpp +++ b/src/libs/cplusplus/ResolveExpression.cpp @@ -44,6 +44,7 @@ #include <CoreTypes.h> #include <TypeVisitor.h> #include <NameVisitor.h> + #include <QList> #include <QtDebug> diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h index 75963bb2fe..c68dba64d2 100644 --- a/src/libs/cplusplus/ResolveExpression.h +++ b/src/libs/cplusplus/ResolveExpression.h @@ -30,10 +30,12 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CPLUSPLUS_RESOLVEEXPRESSION_H #define CPLUSPLUS_RESOLVEEXPRESSION_H #include "LookupContext.h" + #include <ASTVisitor.h> #include <Semantic.h> #include <FullySpecifiedType.h> diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index f047d540c9..70a8e19efa 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -32,6 +32,7 @@ ***************************************************************************/ #include "SimpleLexer.h" + #include <Lexer.h> #include <Token.h> #include <QtDebug> @@ -39,13 +40,19 @@ using namespace CPlusPlus; bool SimpleToken::isLiteral() const -{ return _kind >= T_FIRST_LITERAL && _kind <= T_LAST_LITERAL; } +{ + return _kind >= T_FIRST_LITERAL && _kind <= T_LAST_LITERAL; +} bool SimpleToken::isOperator() const -{ return _kind >= T_FIRST_OPERATOR && _kind <= T_LAST_OPERATOR; } +{ + return _kind >= T_FIRST_OPERATOR && _kind <= T_LAST_OPERATOR; +} bool SimpleToken::isKeyword() const -{ return _kind >= T_FIRST_KEYWORD && _kind < T_FIRST_QT_KEYWORD; } +{ + return _kind >= T_FIRST_KEYWORD && _kind < T_FIRST_QT_KEYWORD; +} SimpleLexer::SimpleLexer() : _lastState(0), @@ -57,16 +64,24 @@ SimpleLexer::~SimpleLexer() { } bool SimpleLexer::qtMocRunEnabled() const -{ return _qtMocRunEnabled; } +{ + return _qtMocRunEnabled; +} void SimpleLexer::setQtMocRunEnabled(bool enabled) -{ _qtMocRunEnabled = enabled; } +{ + _qtMocRunEnabled = enabled; +} bool SimpleLexer::skipComments() const -{ return _skipComments; } +{ + return _skipComments; +} void SimpleLexer::setSkipComments(bool skipComments) -{ _skipComments = skipComments; } +{ + _skipComments = skipComments; +} QList<SimpleToken> SimpleLexer::operator()(const QString &text, int state) { diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index 9bbba41950..82236fc565 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -34,6 +34,7 @@ #define SIMPLELEXER_H #include <CPlusPlusForwardDeclarations.h> + #include <QString> #include <QList> diff --git a/src/libs/extensionsystem/extensionsystem_global.h b/src/libs/extensionsystem/extensionsystem_global.h index ebd1f34da2..fdadf50e63 100644 --- a/src/libs/extensionsystem/extensionsystem_global.h +++ b/src/libs/extensionsystem/extensionsystem_global.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EXTENSIONSYSTEM_GLOBAL_H #define EXTENSIONSYSTEM_GLOBAL_H @@ -41,4 +42,4 @@ # define EXTENSIONSYSTEM_EXPORT Q_DECL_IMPORT #endif -#endif // header +#endif // EXTENSIONSYSTEM_GLOBAL_H diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp index 47cb702e16..d35ba9d4a2 100644 --- a/src/libs/extensionsystem/iplugin.cpp +++ b/src/libs/extensionsystem/iplugin.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "iplugin.h" #include "iplugin_p.h" #include "pluginmanager.h" diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h index b263e7b0d2..e2b3113026 100644 --- a/src/libs/extensionsystem/iplugin.h +++ b/src/libs/extensionsystem/iplugin.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IPLUGIN_H #define IPLUGIN_H diff --git a/src/libs/extensionsystem/iplugin_p.h b/src/libs/extensionsystem/iplugin_p.h index 461a903a39..cb10c06b0b 100644 --- a/src/libs/extensionsystem/iplugin_p.h +++ b/src/libs/extensionsystem/iplugin_p.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IPLUGIN_P_H #define IPLUGIN_P_H @@ -55,4 +56,4 @@ public: } // namespace Internal } // namespace ExtensionSystem -#endif // header guard +#endif // IPLUGIN_P_H diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index 77b6ed869e..9b6bdcb658 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "optionsparser.h" #include <QtCore/QCoreApplication> diff --git a/src/libs/extensionsystem/optionsparser.h b/src/libs/extensionsystem/optionsparser.h index 65ea70c9ba..4702a953fa 100644 --- a/src/libs/extensionsystem/optionsparser.h +++ b/src/libs/extensionsystem/optionsparser.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef OPTIONSPARSER_H #define OPTIONSPARSER_H diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp index 349cc48a12..47de68db2f 100644 --- a/src/libs/extensionsystem/plugindetailsview.cpp +++ b/src/libs/extensionsystem/plugindetailsview.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugindetailsview.h" #include "ui_plugindetailsview.h" diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h index 99386f29d0..2e64111731 100644 --- a/src/libs/extensionsystem/plugindetailsview.h +++ b/src/libs/extensionsystem/plugindetailsview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINDETAILSVIEW_H_ #define PLUGINDETAILSVIEW_H_ @@ -38,8 +39,7 @@ #include <QtGui/QWidget> -namespace ExtensionSystem -{ +namespace ExtensionSystem { namespace Internal { namespace Ui { diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp index c1572d8829..820d4b7cfc 100644 --- a/src/libs/extensionsystem/pluginerrorview.cpp +++ b/src/libs/extensionsystem/pluginerrorview.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "pluginerrorview.h" #include "ui_pluginerrorview.h" diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h index 87b4097d03..f8e3beca9c 100644 --- a/src/libs/extensionsystem/pluginerrorview.h +++ b/src/libs/extensionsystem/pluginerrorview.h @@ -30,16 +30,16 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -#ifndef PLUGINERRORVIEW_H_ -#define PLUGINERRORVIEW_H_ + +#ifndef PLUGINERRORVIEW_H +#define PLUGINERRORVIEW_H #include "extensionsystem_global.h" #include "pluginspec.h" #include <QtGui/QWidget> -namespace ExtensionSystem -{ +namespace ExtensionSystem { namespace Internal { namespace Ui { @@ -63,4 +63,4 @@ private: } // namespace ExtensionSystem -#endif /*PLUGINERRORVIEW_H_*/ +#endif // PLUGINERRORVIEW_H diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index daf4169a80..802c56b693 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "pluginmanager.h" #include "pluginmanager_p.h" #include "pluginspec.h" diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index 7f003b4f89..85ac5e69dd 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EXTENSIONSYSTEM_PLUGINMANAGER_H #define EXTENSIONSYSTEM_PLUGINMANAGER_H @@ -133,6 +134,6 @@ private: friend class Internal::PluginManagerPrivate; }; -} //namespace +} // namespace ExtensionSystem -#endif // PLUGINMANAGER_H +#endif // EXTENSIONSYSTEM_PLUGINMANAGER_H diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h index 6b8df8d2be..28ba1ee858 100644 --- a/src/libs/extensionsystem/pluginmanager_p.h +++ b/src/libs/extensionsystem/pluginmanager_p.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINMANAGER_P_H #define PLUGINMANAGER_P_H diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index dfa7bdbe7c..91f10d6c1d 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "pluginspec.h" #include "pluginspec.h" #include "pluginspec_p.h" diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h index 06a219fe2d..53f08cef49 100644 --- a/src/libs/extensionsystem/pluginspec.h +++ b/src/libs/extensionsystem/pluginspec.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINSPEC_H #define PLUGINSPEC_H diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h index a11167e85e..1ecd70bb95 100644 --- a/src/libs/extensionsystem/pluginspec_p.h +++ b/src/libs/extensionsystem/pluginspec_p.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINSPEC_P_H #define PLUGINSPEC_P_H @@ -103,4 +104,4 @@ private: } // namespace Internal } // namespace ExtensionSystem -#endif // header guard +#endif // PLUGINSPEC_P_H diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index d75911ea37..f1b3a97a7f 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "pluginview.h" #include "pluginview_p.h" #include "pluginmanager.h" diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h index eacf38edaa..77245c2ad4 100644 --- a/src/libs/extensionsystem/pluginview.h +++ b/src/libs/extensionsystem/pluginview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINVIEW_H #define PLUGINVIEW_H @@ -79,4 +80,4 @@ private: } // namespae ExtensionSystem -#endif +#endif // PLUGIN_VIEW_H diff --git a/src/libs/extensionsystem/pluginview_p.h b/src/libs/extensionsystem/pluginview_p.h index 48d63ba359..adca251d3b 100644 --- a/src/libs/extensionsystem/pluginview_p.h +++ b/src/libs/extensionsystem/pluginview_p.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINVIEW_P_H #define PLUGINVIEW_P_H @@ -45,7 +46,7 @@ public: PluginManager *manager; }; -} // namespace -} // namespace +} // namespace Internal +} // namespace ExtensionSystem -#endif +#endif PLUGINVIEW_P_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp index 69b9821b3b..7c93c49b6f 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugin1.h" #include <QtCore/qplugin.h> @@ -40,8 +41,10 @@ MyPlugin1::MyPlugin1() { } -bool MyPlugin1::initialize(const QStringList & /*arguments*/, QString *errorString) +bool MyPlugin1::initialize(const QStringList &arguments, QString *errorString) { + Q_UNUSED(arguments); + Q_UNUSED(errorString); return true; } diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h index d3c493aeba..27f63a72b1 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN1_H #define PLUGIN1_H @@ -50,6 +51,6 @@ public: void extensionsInitialized(); }; -} // namespace +} // namespace Plugin1 -#endif // header guard +#endif // PLUGIN1_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp index c5af5f39a3..7c230d4ab0 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugin2.h" #include <QtCore/qplugin.h> diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h index b1cd95c762..e95cf049e0 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN2_H #define PLUGIN2_H @@ -50,6 +51,6 @@ public: void extensionsInitialized(); }; -} // namespace +} // Plugin2 -#endif // header guard +#endif // PLUGIN2_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h index 7514d63bd7..06d81410d6 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN3_H #define PLUGIN3_H @@ -50,6 +51,6 @@ public: void extensionsInitialized(); }; -} // namespace +} // namespace Plugin3 -#endif // header guard +#endif // PLUGIN3_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp index 8149d046d2..2747a051e0 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp @@ -28,8 +28,9 @@ ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception version ** 1.2, included in the file GPL_EXCEPTION.txt in this package. -** +** ***************************************************************************/ + #include "plugin1.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h index 4be9f9bbf7..72baefe0bb 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN1_H #define PLUGIN1_H @@ -53,6 +54,6 @@ private: bool initializeCalled; }; -} // namespace +} // namespace Plugin1 -#endif // header guard +#endif // PLUGIN1_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp index 99f192766a..2cbf925f99 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugin2.h" #include <extensionsystem/pluginmanager.h> diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h index 08d77a38c7..029e38fb35 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN2_H #define PLUGIN2_H @@ -53,6 +54,6 @@ private: bool initializeCalled; }; -} // namespace +} // namespace Plugin2 -#endif // header guard +#endif // PLUGIN2_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp index 4410c34511..c3c49fd62b 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugin3.h" #include <extensionsystem/pluginmanager.h> @@ -74,4 +75,3 @@ void MyPlugin3::extensionsInitialized() } Q_EXPORT_PLUGIN(MyPlugin3) - diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h index 0991b7a152..dbd43db261 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h @@ -53,6 +53,6 @@ private: bool initializeCalled; }; -} // namespace +} // namespace Plugin3 -#endif // header guard +#endif // PLUGIN3_H diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp b/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp index f54b978e9a..e693749430 100644 --- a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp +++ b/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp @@ -30,14 +30,15 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -#include <QtTest/QtTest> - -#include <QtCore/QObject> #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> #include <extensionsystem/iplugin.h> +#include <QtTest/QtTest> + +#include <QtCore/QObject> + using namespace ExtensionSystem; class SignalReceiver; @@ -263,5 +264,6 @@ void tst_PluginManager::correctPlugins1() } QTEST_MAIN(tst_PluginManager) + #include "tst_pluginmanager.moc" diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp index 8c3db6c189..639bd33b61 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp +++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "testplugin.h" #include <QtCore/qplugin.h> diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h index 10fc0acf50..1029e21109 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h +++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef TESTPLUGIN_H #define TESTPLUGIN_H @@ -59,4 +60,4 @@ private: } // namespace -#endif // header guard +#endif // TESTPLUGIN_H diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h index ae40ac8ea8..be5ae3bc45 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h +++ b/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef TESTPLUGIN_GLOBAL_H #define TESTPLUGIN_GLOBAL_H @@ -41,4 +42,4 @@ # define MYPLUGIN_EXPORT Q_DECL_IMPORT #endif -#endif // header +#endif // TESTPLUGIN_GLOBAL_H diff --git a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp b/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp index f3471edcaa..1e59535d57 100644 --- a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp +++ b/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp @@ -30,7 +30,6 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -#include <QtTest/QtTest> #include "testplugin/testplugin.h" @@ -40,6 +39,7 @@ #include <extensionsystem/pluginmanager.h> #include <QtCore/QObject> +#include <QtTest/QtTest> using namespace ExtensionSystem; @@ -275,4 +275,5 @@ void tst_PluginSpec::initializeExtensions() } QTEST_MAIN(tst_PluginSpec) + #include "tst_pluginspec.moc" diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp index 3282d9862e..bced61f40c 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.cpp @@ -30,7 +30,9 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugindialog.h" + #include <extensionsystem/plugindetailsview.h> #include <extensionsystem/pluginerrorview.h> #include <extensionsystem/pluginspec.h> @@ -139,4 +141,3 @@ int main(int argc, char *argv[]) dialog.show(); app.exec(); } - diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h index 8987230681..89ab9fcc7a 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h @@ -30,11 +30,13 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINDIALOG_H #define PLUGINDIALOG_H #include <extensionsystem/pluginview.h> #include <extensionsystem/pluginmanager.h> + #include <QtGui/QWidget> #include <QtGui/QPushButton> @@ -58,4 +60,4 @@ private: QPushButton *m_errorDetailsButton; }; -#endif +#endif // PLUGINDIALOG_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp index 32d3bdf070..88704e9bc0 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugin1.h" #include <extensionsystem/pluginmanager.h> @@ -83,4 +84,3 @@ void MyPlugin1::extensionsInitialized() } Q_EXPORT_PLUGIN(MyPlugin1) - diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h index f993b25c9f..28440c2733 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN1_H #define PLUGIN1_H @@ -54,6 +55,6 @@ private: bool initializeCalled; }; -} // namespace +} // namespace Plugin1 -#endif // header guard +#endif // PLUGIN1_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp index 3ce6f258fa..d48f717e1d 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugin2.h" #include <extensionsystem/pluginmanager.h> @@ -66,4 +67,3 @@ void MyPlugin2::extensionsInitialized() } Q_EXPORT_PLUGIN(MyPlugin2) - diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h index 5120038754..d65d7f6999 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN2_H #define PLUGIN2_H @@ -54,6 +55,6 @@ private: bool initializeCalled; }; -} // namespace +} // namespace Plugin2 -#endif // header guard +#endif // PLUGIN2_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp index ff37d06096..9f1da813b5 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.cpp @@ -28,8 +28,9 @@ ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception version ** 1.2, included in the file GPL_EXCEPTION.txt in this package. -** +** ***************************************************************************/ + #include "plugin3.h" #include <extensionsystem/pluginmanager.h> @@ -74,4 +75,3 @@ void MyPlugin3::extensionsInitialized() } Q_EXPORT_PLUGIN(MyPlugin3) - diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h index 00bd642912..19666f89a7 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGIN3_H #define PLUGIN3_H @@ -54,6 +55,6 @@ private: bool initializeCalled; }; -} // namespace +} // namespace Plugin3 -#endif // header guard +#endif // PLUGIN3_H diff --git a/src/libs/qtconcurrent/multitask.h b/src/libs/qtconcurrent/multitask.h index fc66de1715..889753533b 100644 --- a/src/libs/qtconcurrent/multitask.h +++ b/src/libs/qtconcurrent/multitask.h @@ -30,11 +30,13 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MULTITASK_H #define MULTITASK_H #include "qtconcurrent_global.h" #include "runextensions.h" + #include <QtCore/QObject> #include <QtCore/QList> #include <QtCore/QEventLoop> @@ -184,14 +186,15 @@ private: }; template <typename Class, typename T> -QFuture<T> run(void (Class::*fn)(QFutureInterface<T> &), const QList<Class *> &objects, int priority = 0) { +QFuture<T> run(void (Class::*fn)(QFutureInterface<T> &), const QList<Class *> &objects, int priority = 0) +{ MultiTask<Class, T> *task = new MultiTask<Class, T>(fn, objects); QFuture<T> future = task->future(); QThreadPool::globalInstance()->start(task, priority); return future; } -} //namespace +} // namespace QtConcurrent QT_END_NAMESPACE diff --git a/src/libs/qtconcurrent/qtconcurrent_global.h b/src/libs/qtconcurrent/qtconcurrent_global.h index 15d47af5f3..0a5a109d4e 100644 --- a/src/libs/qtconcurrent/qtconcurrent_global.h +++ b/src/libs/qtconcurrent/qtconcurrent_global.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef QTCONCURRENT_GLOBAL_H #define QTCONCURRENT_GLOBAL_H diff --git a/src/libs/qtconcurrent/runextensions.h b/src/libs/qtconcurrent/runextensions.h index 43707c14d5..c17153131b 100644 --- a/src/libs/qtconcurrent/runextensions.h +++ b/src/libs/qtconcurrent/runextensions.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef QTCONCURRENT_RUNEX_H #define QTCONCURRENT_RUNEX_H @@ -390,8 +391,8 @@ QFuture<T> run(void (Class::*fn)(QFutureInterface<T> &), Class *object) return (new StoredInterfaceMemberFunctionCall0<T, void (Class::*)(QFutureInterface<T> &), Class>(fn, object))->start(); } -} //namespace QtConcurrent +} // namespace QtConcurrent QT_END_NAMESPACE -#endif +#endif // QTCONCURRENT_RUNEX_H diff --git a/src/libs/utils/basevalidatinglineedit.cpp b/src/libs/utils/basevalidatinglineedit.cpp index cb936e3c2d..fb09d95745 100644 --- a/src/libs/utils/basevalidatinglineedit.cpp +++ b/src/libs/utils/basevalidatinglineedit.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "basevalidatinglineedit.h" #include <QtCore/QDebug> @@ -153,5 +154,5 @@ void BaseValidatingLineEdit::slotReturnPressed() emit validReturnPressed(); } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h index 3482687011..40b5503819 100644 --- a/src/libs/utils/basevalidatinglineedit.h +++ b/src/libs/utils/basevalidatinglineedit.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BASEVALIDATINGLINEEDIT_H #define BASEVALIDATINGLINEEDIT_H @@ -95,6 +96,6 @@ private: BaseValidatingLineEditPrivate *m_bd; }; -} -} +} // namespace Utils +} // namespace Core #endif // BASEVALIDATINGLINEEDIT_H diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp index b52758eda5..9e36203b0e 100644 --- a/src/libs/utils/classnamevalidatinglineedit.cpp +++ b/src/libs/utils/classnamevalidatinglineedit.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "classnamevalidatinglineedit.h" #include <QtCore/QDebug> @@ -133,5 +134,5 @@ QString ClassNameValidatingLineEdit::createClassName(const QString &name) return className; } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h index c0a209d0d7..2271a9cd31 100644 --- a/src/libs/utils/classnamevalidatinglineedit.h +++ b/src/libs/utils/classnamevalidatinglineedit.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CLASSNAMEVALIDATINGLINEEDIT_H #define CLASSNAMEVALIDATINGLINEEDIT_H @@ -44,8 +45,9 @@ struct ClassNameValidatingLineEditPrivate; /* A Line edit that validates a C++ class name and emits a signal * to derive suggested file names from it. */ -class QWORKBENCH_UTILS_EXPORT ClassNameValidatingLineEdit : - public Core::Utils::BaseValidatingLineEdit { +class QWORKBENCH_UTILS_EXPORT ClassNameValidatingLineEdit + : public Core::Utils::BaseValidatingLineEdit +{ Q_DISABLE_COPY(ClassNameValidatingLineEdit) Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true) Q_OBJECT @@ -73,7 +75,7 @@ private: ClassNameValidatingLineEditPrivate *m_d; }; -} -} +} // namespace Utils +} // namespace Core #endif // CLASSNAMEVALIDATINGLINEEDIT_H diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp index 3af484935a..8956396acc 100644 --- a/src/libs/utils/codegeneration.cpp +++ b/src/libs/utils/codegeneration.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "codegeneration.h" #include <QtCore/QTextStream> diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h index 1a20c76d08..c804365bce 100644 --- a/src/libs/utils/codegeneration.h +++ b/src/libs/utils/codegeneration.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CODEGENERATION_H #define CODEGENERATION_H diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index e7e930c544..8adb3a5bb4 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "fancylineedit.h" #include <QtCore/QEvent> diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index 24a109eada..634eefa8c0 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FANCYLINEEDIT_H #define FANCYLINEEDIT_H @@ -77,11 +78,11 @@ public: bool useLayoutDirection() const; void setUseLayoutDirection(bool v); - /* Set whether tabbing in will trigger the menu. */ + // Set whether tabbing in will trigger the menu. bool hasMenuTabFocusTrigger() const; void setMenuTabFocusTrigger(bool v); - /* Hint text that is displayed when no focus is set */ + // Hint text that is displayed when no focus is set. QString hintText() const; bool isShowingHintText() const; diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index 1beed717ef..388d271795 100644 --- a/src/libs/utils/filenamevalidatinglineedit.cpp +++ b/src/libs/utils/filenamevalidatinglineedit.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "filenamevalidatinglineedit.h" namespace Core { @@ -93,5 +94,5 @@ bool FileNameValidatingLineEdit::validate(const QString &value, QString *errorM return validateFileName(value, errorMessage); } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h index 7535fc196d..c263a94d6c 100644 --- a/src/libs/utils/filenamevalidatinglineedit.h +++ b/src/libs/utils/filenamevalidatinglineedit.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FILENAMEVALIDATINGLINEEDIT_H #define FILENAMEVALIDATINGLINEEDIT_H @@ -38,7 +39,8 @@ namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit { +class QWORKBENCH_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit +{ Q_OBJECT Q_DISABLE_COPY(FileNameValidatingLineEdit) @@ -51,6 +53,7 @@ protected: virtual bool validate(const QString &value, QString *errorMessage) const; }; -} -} +} // namespace Utils +} // namespace Core + #endif // FILENAMEVALIDATINGLINEEDIT_H diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 9756984b4b..6bcbf26671 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "filesearch.h" #include <QtCore/QFile> @@ -44,162 +45,164 @@ using namespace Core::Utils; namespace { - void runFileSearch(QFutureInterface<FileSearchResult> &future, - QString searchTerm, - QStringList files, - QTextDocument::FindFlags flags) - { - future.setProgressRange(0, files.size()); - int numFilesSearched = 0; - int numMatches = 0; - - bool caseInsensitive = !(flags & QTextDocument::FindCaseSensitively); - bool wholeWord = (flags & QTextDocument::FindWholeWords); - - QByteArray sa = searchTerm.toUtf8(); - int scMaxIndex = sa.length()-1; - const char *sc = sa.constData(); - - QByteArray sal = searchTerm.toLower().toUtf8(); - const char *scl = sal.constData(); - - QByteArray sau = searchTerm.toUpper().toUtf8(); - const char *scu = sau.constData(); - - int chunkSize = qMax(100000, sa.length()); - - foreach (QString s, files) { - if (future.isPaused()) - future.waitForResume(); - if (future.isCanceled()) { - future.setProgressValueAndText(numFilesSearched, - qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files."). - arg(searchTerm).arg(numMatches).arg(numFilesSearched)); - break; - } - QFile file(s); - if (!file.open(QIODevice::ReadOnly)) - continue; - int lineNr = 1; - const char *startOfLastLine = NULL; - - bool firstChunk = true; - while (!file.atEnd()) { - if (!firstChunk) - file.seek(file.pos()-sa.length()+1); - - const QByteArray chunk = file.read(chunkSize); - const char *chunkPtr = chunk.constData(); - startOfLastLine = chunkPtr; - for (const char *regionPtr = chunkPtr; regionPtr < chunkPtr + chunk.length()-scMaxIndex; ++regionPtr) { - const char *regionEnd = regionPtr + scMaxIndex; - - if (*regionPtr == '\n') { - startOfLastLine = regionPtr + 1; - ++lineNr; + +void runFileSearch(QFutureInterface<FileSearchResult> &future, + QString searchTerm, + QStringList files, + QTextDocument::FindFlags flags) +{ + future.setProgressRange(0, files.size()); + int numFilesSearched = 0; + int numMatches = 0; + + bool caseInsensitive = !(flags & QTextDocument::FindCaseSensitively); + bool wholeWord = (flags & QTextDocument::FindWholeWords); + + QByteArray sa = searchTerm.toUtf8(); + int scMaxIndex = sa.length()-1; + const char *sc = sa.constData(); + + QByteArray sal = searchTerm.toLower().toUtf8(); + const char *scl = sal.constData(); + + QByteArray sau = searchTerm.toUpper().toUtf8(); + const char *scu = sau.constData(); + + int chunkSize = qMax(100000, sa.length()); + + foreach (QString s, files) { + if (future.isPaused()) + future.waitForResume(); + if (future.isCanceled()) { + future.setProgressValueAndText(numFilesSearched, + qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files."). + arg(searchTerm).arg(numMatches).arg(numFilesSearched)); + break; + } + QFile file(s); + if (!file.open(QIODevice::ReadOnly)) + continue; + int lineNr = 1; + const char *startOfLastLine = NULL; + + bool firstChunk = true; + while (!file.atEnd()) { + if (!firstChunk) + file.seek(file.pos()-sa.length()+1); + + const QByteArray chunk = file.read(chunkSize); + const char *chunkPtr = chunk.constData(); + startOfLastLine = chunkPtr; + for (const char *regionPtr = chunkPtr; regionPtr < chunkPtr + chunk.length()-scMaxIndex; ++regionPtr) { + const char *regionEnd = regionPtr + scMaxIndex; + + if (*regionPtr == '\n') { + startOfLastLine = regionPtr + 1; + ++lineNr; + } + else if ( + // case sensitive + (!caseInsensitive && *regionPtr == sc[0] && *regionEnd == sc[scMaxIndex]) + || + // case insensitive + (caseInsensitive && (*regionPtr == scl[0] || *regionPtr == scu[0]) + && (*regionEnd == scl[scMaxIndex] || *regionEnd == scu[scMaxIndex])) + ) { + const char *afterRegion = regionEnd + 1; + const char *beforeRegion = regionPtr - 1; + bool equal = true; + if (wholeWord && + ( ((*beforeRegion >= '0' && *beforeRegion <= '9') || *beforeRegion >= 'A') + || ((*afterRegion >= '0' && *afterRegion <= '9') || *afterRegion >= 'A'))) + { + equal = false; } - else if ( - // case sensitive - (!caseInsensitive && *regionPtr == sc[0] && *regionEnd == sc[scMaxIndex]) - || - // case insensitive - (caseInsensitive && (*regionPtr == scl[0] || *regionPtr == scu[0]) - && (*regionEnd == scl[scMaxIndex] || *regionEnd == scu[scMaxIndex])) - ) { - const char *afterRegion = regionEnd + 1; - const char *beforeRegion = regionPtr - 1; - bool equal = true; - if (wholeWord && - ( ((*beforeRegion >= '0' && *beforeRegion <= '9') || *beforeRegion >= 'A') - || ((*afterRegion >= '0' && *afterRegion <= '9') || *afterRegion >= 'A'))) - { - equal = false; - } - int regionIndex = 1; - for (const char *regionCursor = regionPtr + 1; regionCursor < regionEnd; ++regionCursor, ++regionIndex) { - if ( // case sensitive - (!caseInsensitive && equal && *regionCursor != sc[regionIndex]) - || - // case insensitive - (caseInsensitive && equal && *regionCursor != sc[regionIndex] && *regionCursor != scl[regionIndex] && *regionCursor != scu[regionIndex]) - ) { - equal = false; - } + int regionIndex = 1; + for (const char *regionCursor = regionPtr + 1; regionCursor < regionEnd; ++regionCursor, ++regionIndex) { + if ( // case sensitive + (!caseInsensitive && equal && *regionCursor != sc[regionIndex]) + || + // case insensitive + (caseInsensitive && equal && *regionCursor != sc[regionIndex] && *regionCursor != scl[regionIndex] && *regionCursor != scu[regionIndex]) + ) { + equal = false; } - if (equal) { - int textLength = chunk.length() - (startOfLastLine - chunkPtr); - if (textLength > 0) { - QByteArray res; - res.reserve(256); - int i = 0; - int n = 0; - while (startOfLastLine[i] != '\n' && startOfLastLine[i] != '\r' && i < textLength && n++ < 256) - res.append(startOfLastLine[i++]); - future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, QString(res), - regionPtr - startOfLastLine, sa.length())); - ++numMatches; - } + } + if (equal) { + int textLength = chunk.length() - (startOfLastLine - chunkPtr); + if (textLength > 0) { + QByteArray res; + res.reserve(256); + int i = 0; + int n = 0; + while (startOfLastLine[i] != '\n' && startOfLastLine[i] != '\r' && i < textLength && n++ < 256) + res.append(startOfLastLine[i++]); + future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, QString(res), + regionPtr - startOfLastLine, sa.length())); + ++numMatches; } } } - firstChunk = false; } - ++numFilesSearched; - future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files."). - arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size())); + firstChunk = false; } - if (!future.isCanceled()) - future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files."). - arg(searchTerm).arg(numMatches).arg(numFilesSearched)); + ++numFilesSearched; + future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files."). + arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size())); } + if (!future.isCanceled()) + future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files."). + arg(searchTerm).arg(numMatches).arg(numFilesSearched)); +} - void runFileSearchRegExp(QFutureInterface<FileSearchResult> &future, - QString searchTerm, - QStringList files, - QTextDocument::FindFlags flags) - { - future.setProgressRange(0, files.size()); - int numFilesSearched = 0; - int numMatches = 0; - if (flags & QTextDocument::FindWholeWords) - searchTerm = QString("\b%1\b").arg(searchTerm); - Qt::CaseSensitivity caseSensitivity = (flags & QTextDocument::FindCaseSensitively) ? Qt::CaseSensitive : Qt::CaseInsensitive; - QRegExp expression(searchTerm, caseSensitivity); - - foreach (QString s, files) { - if (future.isPaused()) - future.waitForResume(); - if (future.isCanceled()) { - future.setProgressValueAndText(numFilesSearched, - qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files."). - arg(searchTerm).arg(numMatches).arg(numFilesSearched)); - break; - } - QFile file(s); - if (!file.open(QIODevice::ReadOnly)) - continue; - QTextStream stream(&file); - int lineNr = 1; - QString line; - while (!stream.atEnd()) { - line = stream.readLine(); - int pos = 0; - while ((pos = expression.indexIn(line, pos)) != -1) { - future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, line, - pos, expression.matchedLength())); - pos += expression.matchedLength(); - } - ++lineNr; +void runFileSearchRegExp(QFutureInterface<FileSearchResult> &future, + QString searchTerm, + QStringList files, + QTextDocument::FindFlags flags) +{ + future.setProgressRange(0, files.size()); + int numFilesSearched = 0; + int numMatches = 0; + if (flags & QTextDocument::FindWholeWords) + searchTerm = QString("\b%1\b").arg(searchTerm); + Qt::CaseSensitivity caseSensitivity = (flags & QTextDocument::FindCaseSensitively) ? Qt::CaseSensitive : Qt::CaseInsensitive; + QRegExp expression(searchTerm, caseSensitivity); + + foreach (QString s, files) { + if (future.isPaused()) + future.waitForResume(); + if (future.isCanceled()) { + future.setProgressValueAndText(numFilesSearched, + qApp->translate("FileSearch", "%1: canceled. %2 occurrences found in %3 files."). + arg(searchTerm).arg(numMatches).arg(numFilesSearched)); + break; + } + QFile file(s); + if (!file.open(QIODevice::ReadOnly)) + continue; + QTextStream stream(&file); + int lineNr = 1; + QString line; + while (!stream.atEnd()) { + line = stream.readLine(); + int pos = 0; + while ((pos = expression.indexIn(line, pos)) != -1) { + future.reportResult(FileSearchResult(QDir::toNativeSeparators(s), lineNr, line, + pos, expression.matchedLength())); + pos += expression.matchedLength(); } - ++numFilesSearched; - future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files."). - arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size())); + ++lineNr; } - if (!future.isCanceled()) - future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files."). - arg(searchTerm).arg(numMatches).arg(numFilesSearched)); + ++numFilesSearched; + future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 of %4 files."). + arg(searchTerm).arg(numMatches).arg(numFilesSearched).arg(files.size())); } + if (!future.isCanceled()) + future.setProgressValueAndText(numFilesSearched, qApp->translate("FileSearch", "%1: %2 occurrences found in %3 files."). + arg(searchTerm).arg(numMatches).arg(numFilesSearched)); +} + } // namespace diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index 3b747fb548..4f6d260286 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FILESEARCH_H #define FILESEARCH_H @@ -63,7 +64,7 @@ QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFiles(const QString &sea QWORKBENCH_UTILS_EXPORT QFuture<FileSearchResult> findInFilesRegExp(const QString &searchTerm, const QStringList &files, QTextDocument::FindFlags flags); -} //Utils -} //Core +} // namespace Utils +} // namespace Core -#endif +#endif // FILESEARCH_H diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp index 2843a304e5..d9454c52a1 100644 --- a/src/libs/utils/filewizarddialog.cpp +++ b/src/libs/utils/filewizarddialog.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "filewizarddialog.h" #include "filewizardpage.h" diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h index 6a4a7d9ba6..20dd98e350 100644 --- a/src/libs/utils/filewizarddialog.h +++ b/src/libs/utils/filewizarddialog.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FILEWIZARDDIALOG_H #define FILEWIZARDDIALOG_H @@ -64,6 +65,7 @@ private: FileWizardPage *m_filePage; }; -} -} +} // namespace Utils +} // namespace Core + #endif // FILEWIZARDDIALOG_H diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp index a448ebe739..a796f7bafd 100644 --- a/src/libs/utils/filewizardpage.cpp +++ b/src/libs/utils/filewizardpage.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "filewizardpage.h" #include "ui_filewizardpage.h" diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index b2ae28a9d0..984b10b5da 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FILEWIZARDPAGE_H #define FILEWIZARDPAGE_H @@ -81,6 +82,7 @@ private: FileWizardPagePrivate *m_d; }; -} -} +} // namespace Utils +} // namespace Core + #endif // FILEWIZARDPAGE_H diff --git a/src/libs/utils/linecolumnlabel.cpp b/src/libs/utils/linecolumnlabel.cpp index c6028ab13f..3a25c36f96 100644 --- a/src/libs/utils/linecolumnlabel.cpp +++ b/src/libs/utils/linecolumnlabel.cpp @@ -30,14 +30,14 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "linecolumnlabel.h" namespace Core { namespace Utils { -LineColumnLabel::LineColumnLabel(QWidget *parent) : - QLabel(parent), - m_unused(0) +LineColumnLabel::LineColumnLabel(QWidget *parent) + : QLabel(parent), m_unused(0) { } @@ -65,5 +65,5 @@ void LineColumnLabel::setMaxText(const QString &maxText) m_maxText = maxText; } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h index d5dea084cc..ba7f9e4078 100644 --- a/src/libs/utils/linecolumnlabel.h +++ b/src/libs/utils/linecolumnlabel.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef LINECOLUMNLABEL_H #define LINECOLUMNLABEL_H @@ -42,7 +43,8 @@ namespace Utils { /* A label suitable for displaying cursor positions, etc. with a fixed * with derived from a sample text. */ -class QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel { +class QWORKBENCH_UTILS_EXPORT LineColumnLabel : public QLabel +{ Q_DISABLE_COPY(LineColumnLabel) Q_OBJECT Q_PROPERTY(QString maxText READ maxText WRITE setMaxText DESIGNABLE true) @@ -62,7 +64,7 @@ private: void *m_unused; }; -} -} +} // namespace Utils +} // namespace Core #endif // LINECOLUMNLABEL_H diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h index 3b688f336d..cbd307937d 100644 --- a/src/libs/utils/listutils.h +++ b/src/libs/utils/listutils.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef LISTUTILS_H #define LISTUTILS_H @@ -48,7 +49,7 @@ QList<T1> qwConvertList(const QList<T2> &list) return convertedList; } -} // Utils -} // Core +} // namespace Utils +} // namespace Core #endif // LISTUTILS_H diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp index 67cd1f8691..1224ba3270 100644 --- a/src/libs/utils/newclasswidget.cpp +++ b/src/libs/utils/newclasswidget.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "newclasswidget.h" #include "ui_newclasswidget.h" @@ -457,6 +458,5 @@ QStringList NewClassWidget::files() const return rc; } - } // namespace Utils } // namespace Core diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index e534189d77..138f7bc9af 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef NEWCLASSWIDGET_H #define NEWCLASSWIDGET_H diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 188aa3b126..16d26b0f56 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "pathchooser.h" #include "basevalidatinglineedit.h" @@ -181,5 +182,5 @@ QString PathChooser::homePath() #endif } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index e09040c4c0..d8b33077ba 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -84,7 +84,7 @@ private: PathChooserPrivate *m_d; }; -} -} +} // namespace Utils +} // namespace Core #endif // PATHCHOOSER_H diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp index bc17333fb9..4e9dd365a8 100644 --- a/src/libs/utils/projectintropage.cpp +++ b/src/libs/utils/projectintropage.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "projectintropage.h" #include "filewizardpage.h" #include "ui_projectintropage.h" @@ -211,5 +212,5 @@ void ProjectIntroPage::hideStatusLabel() displayStatusMessage(Hint, QString()); } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h index 56dcc25327..a145590dfd 100644 --- a/src/libs/utils/projectintropage.h +++ b/src/libs/utils/projectintropage.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PROJECTINTROPAGE_H #define PROJECTINTROPAGE_H @@ -55,7 +56,8 @@ struct ProjectIntroPagePrivate; * layout, otherwise, QWizard will squeeze it due to its strange expanding * hacks. */ -class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage { +class QWORKBENCH_UTILS_EXPORT ProjectIntroPage : public QWizardPage +{ Q_OBJECT Q_DISABLE_COPY(ProjectIntroPage) Q_PROPERTY(QString description READ description WRITE setPath DESIGNABLE true) @@ -102,6 +104,7 @@ private: ProjectIntroPagePrivate *m_d; }; -} -} +} // namespace Utils +} // namespace Core + #endif // PROJECTINTROPAGE_H diff --git a/src/libs/utils/projectnamevalidatinglineedit.cpp b/src/libs/utils/projectnamevalidatinglineedit.cpp index fb979d3934..b6c1ccd505 100644 --- a/src/libs/utils/projectnamevalidatinglineedit.cpp +++ b/src/libs/utils/projectnamevalidatinglineedit.cpp @@ -30,14 +30,15 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "projectnamevalidatinglineedit.h" #include "filenamevalidatinglineedit.h" namespace Core { namespace Utils { -ProjectNameValidatingLineEdit::ProjectNameValidatingLineEdit(QWidget *parent) : - BaseValidatingLineEdit(parent) +ProjectNameValidatingLineEdit::ProjectNameValidatingLineEdit(QWidget *parent) + : BaseValidatingLineEdit(parent) { } @@ -62,5 +63,5 @@ bool ProjectNameValidatingLineEdit::validate(const QString &value, QString *erro return validateProjectName(value, errorMessage); } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h index c677cea141..c42b8e4a35 100644 --- a/src/libs/utils/projectnamevalidatinglineedit.h +++ b/src/libs/utils/projectnamevalidatinglineedit.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PROJECTNAMEVALIDATINGLINEEDIT_H #define PROJECTNAMEVALIDATINGLINEEDIT_H @@ -38,7 +39,8 @@ namespace Core { namespace Utils { -class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit { +class QWORKBENCH_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit +{ Q_OBJECT Q_DISABLE_COPY(ProjectNameValidatingLineEdit) @@ -51,6 +53,7 @@ protected: virtual bool validate(const QString &value, QString *errorMessage) const; }; -} -} +} // namespace Utils +} // namespace Core + #endif // PROJECTNAMEVALIDATINGLINEEDIT_H diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp index 8b54bdda1d..8f67fc0975 100644 --- a/src/libs/utils/qtcolorbutton.cpp +++ b/src/libs/utils/qtcolorbutton.cpp @@ -30,12 +30,14 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "qtcolorbutton.h" -#include <QtGui/QColorDialog> -#include <QtGui/QPainter> + #include <QtCore/QMimeData> -#include <QtGui/QDragEnterEvent> #include <QtGui/QApplication> +#include <QtGui/QColorDialog> +#include <QtGui/QDragEnterEvent> +#include <QtGui/QPainter> namespace Core { namespace Utils { diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h index 07355c883e..930aef1579 100644 --- a/src/libs/utils/qtcolorbutton.h +++ b/src/libs/utils/qtcolorbutton.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef QTCOLORBUTTON_H #define QTCOLORBUTTON_H diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index ca1d9e23de..9c4111a7db 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -30,7 +30,9 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "reloadpromptutils.h" + #include <QtGui/QMessageBox> using namespace Core; @@ -47,7 +49,8 @@ QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer QWORKBENCH_UTILS_EXPORT Core::Utils::ReloadPromptAnswer Core::Utils::reloadPrompt(const QString &title, const QString &prompt, QWidget *parent) { - switch (QMessageBox::question(parent, title, prompt, QMessageBox::Yes|QMessageBox::YesToAll|QMessageBox::No|QMessageBox::NoToAll, + switch (QMessageBox::question(parent, title, prompt, + QMessageBox::Yes|QMessageBox::YesToAll|QMessageBox::No|QMessageBox::NoToAll, QMessageBox::YesToAll)) { case QMessageBox::Yes: return ReloadCurrent; diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index deaf4b920a..5d6fc87002 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef RELOADPROMPTUTILS_H #define RELOADPROMPTUTILS_H diff --git a/src/libs/utils/settingsutils.cpp b/src/libs/utils/settingsutils.cpp index ca8de01828..0f77b397cc 100644 --- a/src/libs/utils/settingsutils.cpp +++ b/src/libs/utils/settingsutils.cpp @@ -30,7 +30,9 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "settingsutils.h" + #include <QtCore/QString> namespace Core { @@ -41,13 +43,13 @@ QWORKBENCH_UTILS_EXPORT QString settingsKey(const QString &category) QString rc(category); const QChar underscore = QLatin1Char('_'); const int size = rc.size(); - for (int i = 0; i < size;i++) { + for (int i = 0; i < size; i++) { const QChar c = rc.at(i); - if (!c.isLetterOrNumber() && c != underscore) + if (!c.isLetterOrNumber() && c != underscore) rc[i] = underscore; } return rc; } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h index 734a2f02f9..abce76ee2f 100644 --- a/src/libs/utils/settingsutils.h +++ b/src/libs/utils/settingsutils.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef SETTINGSTUTILS_H #define SETTINGSTUTILS_H diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp index aeafcd828d..b2c7995686 100644 --- a/src/libs/utils/submiteditorwidget.cpp +++ b/src/libs/utils/submiteditorwidget.cpp @@ -30,18 +30,20 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "submiteditorwidget.h" #include "ui_submiteditorwidget.h" #include <QtCore/QDebug> #include <QtCore/QPointer> -enum { debug= 0 }; +enum { debug = 0 }; namespace Core { namespace Utils { -struct SubmitEditorWidgetPrivate { +struct SubmitEditorWidgetPrivate +{ SubmitEditorWidgetPrivate(); Ui::SubmitEditorWidget m_ui; diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h index 3c40ccecba..b034b549e4 100644 --- a/src/libs/utils/submiteditorwidget.h +++ b/src/libs/utils/submiteditorwidget.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef SUBMITEDITORWIDGET_H #define SUBMITEDITORWIDGET_H @@ -65,7 +66,8 @@ struct SubmitEditorWidgetPrivate; * Care should be taken to ensure the widget is deleted properly when the * editor closes. */ -class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget { +class QWORKBENCH_UTILS_EXPORT SubmitEditorWidget : public QWidget +{ Q_OBJECT Q_DISABLE_COPY(SubmitEditorWidget) Q_PROPERTY(QString descriptionText READ descriptionText WRITE setDescriptionText DESIGNABLE true) @@ -117,6 +119,7 @@ private: SubmitEditorWidgetPrivate *m_d; }; -} -} +} // namespace Utils +} // namespace Core + #endif // SUBMITEDITORWIDGET_H diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 71bcdffb6c..049fd0f574 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -352,5 +352,5 @@ void SynchronousProcess::processStdErr(bool emitSignals) } } -} -} +} // namespace Utils +} // namespace Core diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index 9458655d6b..356dec2643 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -30,15 +30,16 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef SYNCHRONOUSPROCESS_H #define SYNCHRONOUSPROCESS_H +#include "utils_global.h" + #include <QtCore/QObject> #include <QtCore/QProcess> #include <QtCore/QStringList> -#include "utils_global.h" - QT_BEGIN_NAMESPACE class QTextCodec; class QDebug; @@ -51,7 +52,8 @@ namespace Utils { struct SynchronousProcessPrivate; /* Result of SynchronousProcess execution */ -struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse { +struct QWORKBENCH_UTILS_EXPORT SynchronousProcessResponse +{ enum Result { // Finished with return code 0 Finished, @@ -87,7 +89,8 @@ QWORKBENCH_UTILS_EXPORT QDebug operator<<(QDebug str, const SynchronousProcessRe * stdOutBufferedSignalsEnabled()/setStdErrBufferedSignalsEnabled(). * They would typically be used for log windows. */ -class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject { +class QWORKBENCH_UTILS_EXPORT SynchronousProcess : public QObject +{ Q_OBJECT public: SynchronousProcess(); @@ -134,6 +137,7 @@ private: SynchronousProcessPrivate *m_d; }; -} -} +} // namespace Utils +} // namespace Core + #endif diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h index 3a91f77a2b..fa967e6397 100644 --- a/src/libs/utils/utils_global.h +++ b/src/libs/utils/utils_global.h @@ -30,18 +30,6 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 1992-$THISYEAR$ Trolltech AS. All rights reserved. -** -** This file is part of the $MODULE$ of the Qt Toolkit. -** -** $LICENSE$ -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ #ifndef UTILS_GLOBAL_H #define UTILS_GLOBAL_H diff --git a/src/plugins/bineditor/bineditor.cpp b/src/plugins/bineditor/bineditor.cpp index 4ca6e18707..4f2f45fc44 100644 --- a/src/plugins/bineditor/bineditor.cpp +++ b/src/plugins/bineditor/bineditor.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "bineditor.h" #include <texteditor/fontsettings.h> diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h index 2eae59af1a..ad6b9064ac 100644 --- a/src/plugins/bineditor/bineditor.h +++ b/src/plugins/bineditor/bineditor.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BINEDITOR_H #define BINEDITOR_H diff --git a/src/plugins/bineditor/bineditorconstants.h b/src/plugins/bineditor/bineditorconstants.h index f67d6c522d..a0f18d36fd 100644 --- a/src/plugins/bineditor/bineditorconstants.h +++ b/src/plugins/bineditor/bineditorconstants.h @@ -30,14 +30,17 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BINEDITORCONSTANTS_H #define BINEDITORCONSTANTS_H namespace BINEditor { - namespace Constants { - const char * const C_BINEDITOR = "Binary Editor"; - const char * const C_BINEDITOR_MIMETYPE = "application/octet-stream"; - } -} +namespace Constants { + +const char * const C_BINEDITOR = "Binary Editor"; +const char * const C_BINEDITOR_MIMETYPE = "application/octet-stream"; + +} // namespace Constants +} // namespace BINEditor #endif // BINEDITORCONSTANTS_H diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index ee223f3dea..cf1d21429b 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "bineditorplugin.h" #include "bineditor.h" #include "bineditorconstants.h" diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h index 6bd0da64b3..53ea5d6232 100644 --- a/src/plugins/bineditor/bineditorplugin.h +++ b/src/plugins/bineditor/bineditorplugin.h @@ -30,17 +30,18 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BINEDITORPLUGIN_H #define BINEDITORPLUGIN_H +#include <extensionsystem/iplugin.h> +#include <coreplugin/editormanager/ieditorfactory.h> + #include <QtCore/qplugin.h> #include <QtCore/QPointer> #include <QtCore/QStringList> #include <QtGui/QAction> -#include <extensionsystem/iplugin.h> -#include <coreplugin/editormanager/ieditorfactory.h> - namespace Core { class ICore; class IWizard; diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp index 41f4659cb7..c41aa5323a 100644 --- a/src/plugins/bookmarks/bookmark.cpp +++ b/src/plugins/bookmarks/bookmark.cpp @@ -30,8 +30,10 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "bookmark.h" #include "bookmarkmanager.h" + #include <QtCore/QDebug> #include <QtGui/QTextBlock> diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index d54d6af3e5..97a83f9247 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BOOKMARK_H #define BOOKMARK_H diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index bb26bfbd4f..402054860d 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "bookmarkmanager.h" #include "bookmark.h" #include "bookmarksplugin.h" diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index 45e4bf3b7b..b6fba5934a 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BOOKMARKMANAGER_H #define BOOKMARKMANAGER_H @@ -131,7 +132,8 @@ private: QItemSelectionModel *m_selectionModel; }; -class BookmarkView : public QListView { +class BookmarkView : public QListView +{ Q_OBJECT public: BookmarkView(QWidget *parent = 0); diff --git a/src/plugins/bookmarks/bookmarks_global.h b/src/plugins/bookmarks/bookmarks_global.h index e29f4e5865..f91575032f 100644 --- a/src/plugins/bookmarks/bookmarks_global.h +++ b/src/plugins/bookmarks/bookmarks_global.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BOOKMARKS_GLOBAL_H #define BOOKMARKS_GLOBAL_H @@ -49,8 +50,8 @@ const char * const BOOKMARKS_NEXTDOC_ACTION = "Bookmarks.Next.Document"; const char * const BOOKMARKS_MENU = "Bookmarks.Menu"; const char * const BOOKMARKS_CONTEXT = "Bookmarks"; -} //namespace Constants -} //namespace Bookmarks +} // namespace Constants +} // namespace Bookmarks -#endif //BOOKMARKS_GLOBAL_H +#endif // BOOKMARKS_GLOBAL_H diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index 76df8e5777..2fdf3d528a 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -30,28 +30,28 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "bookmarksplugin.h" #include "bookmarkmanager.h" #include "bookmarks_global.h" -#include <QtCore/qplugin.h> -#include <QtGui/QMenu> -#include <QDebug> - #include <texteditor/texteditorconstants.h> #include <coreplugin/icore.h> #include <coreplugin/coreconstants.h> #include <coreplugin/uniqueidmanager.h> #include <coreplugin/actionmanager/actionmanagerinterface.h> +#include <QtCore/qplugin.h> +#include <QtGui/QMenu> +#include <QDebug> + using namespace Bookmarks::Constants; using namespace Bookmarks::Internal; BookmarksPlugin *BookmarksPlugin::m_instance = 0; -BookmarksPlugin::BookmarksPlugin(): - m_bookmarkManager(0), - m_core(0) +BookmarksPlugin::BookmarksPlugin() + : m_bookmarkManager(0), m_core(0) { m_instance = this; } diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h index 7da45ef5ee..255f209086 100644 --- a/src/plugins/bookmarks/bookmarksplugin.h +++ b/src/plugins/bookmarks/bookmarksplugin.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BOOKMARKS_H #define BOOKMARKS_H diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 2c98124bb9..dd4aa4290e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -30,11 +30,14 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "cmakeproject.h" #include "cmakeprojectconstants.h" #include "cmakeprojectnodes.h" + #include <extensionsystem/pluginmanager.h> #include <cpptools/cppmodelmanagerinterface.h> + #include <QtCore/QDebug> using namespace CMakeProjectManager; diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h index b5a8d0b6b4..a67b7b666b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.h +++ b/src/plugins/cmakeprojectmanager/cmakeproject.h @@ -1,4 +1,4 @@ -/*************************************************************************** + /*************************************************************************** ** ** This file is part of Qt Creator ** @@ -30,17 +30,19 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CMAKEPROJECT_H #define CMAKEPROJECT_H +#include "cmakeprojectmanager.h" +#include "cmakeprojectnodes.h" + #include <projectexplorer/project.h> #include <projectexplorer/projectnodes.h> #include <projectexplorer/buildstep.h> #include <coreplugin/ifile.h> -#include <QtCore/QXmlStreamReader> -#include "cmakeprojectmanager.h" -#include "cmakeprojectnodes.h" +#include <QtCore/QXmlStreamReader> namespace CMakeProjectManager { namespace Internal{ @@ -152,7 +154,7 @@ public: virtual void init(const QString &buildConfiguration); }; -} -} +} // namespace Internal +} // namespace CMakeProjectManager #endif // CMAKEPROJECT_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index 02c76f6682..2e9bad248a 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CMAKEPROJECTCONSTANTS_H #define CMAKEPROJECTCONSTANTS_H @@ -39,7 +40,7 @@ namespace Constants { const char * const PROJECTCONTEXT = "CMakeProject.ProjectContext"; const char * const CMAKEMIMETYPE = "text/x-cmake"; // TOOD check that this is correct -} -} +} // namespace Constants +} // namespace CMakeProjectManager #endif // CMAKEPROJECTCONSTANTS_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 4a179967cc..0f2fb804da 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "cmakeprojectmanager.h" #include "cmakeprojectconstants.h" #include "cmakeproject.h" @@ -40,7 +41,6 @@ #include <coreplugin/uniqueidmanager.h> #include <projectexplorer/projectexplorerconstants.h> - using namespace CMakeProjectManager::Internal; CMakeManager::CMakeManager() diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index 3808b72efb..fba00db869 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CMAKEPROJECTMANAGER_H #define CMAKEPROJECTMANAGER_H @@ -55,6 +56,8 @@ private: int m_projectContext; int m_projectLanguage; }; -} -} + +} // namespace Internal +} // namespace CMakeProjectManager + #endif // CMAKEPROJECTMANAGER_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 338750158f..c78e15830c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "cmakeprojectnodes.h" using namespace CMakeProjectManager; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h index a0a9453a47..b8f0284fa3 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CMAKEPROJECTNODE_H #define CMAKEPROJECTNODE_H @@ -60,7 +61,8 @@ public: using ProjectNode::addFileNodes; using ProjectNode::addFolderNodes; }; -} -} + +} // namespace Internal +} // namespace CMakeProjectManager #endif // CMAKEPROJECTNODE_H diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 9a9190568f..1eabecb3b6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -30,13 +30,16 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "cmakeprojectplugin.h" +#include "cmakeprojectmanager.h" + #include <coreplugin/icore.h> #include <coreplugin/mimedatabase.h> + #include <QtCore/qplugin.h> #include <QtCore/QDebug> -#include "cmakeprojectmanager.h" using namespace CMakeProjectManager::Internal; @@ -59,7 +62,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * void CMakeProjectPlugin::extensionsInitialized() { - } Q_EXPORT_PLUGIN(CMakeProjectPlugin) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h index 0620220667..6bc2748e4f 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CMAKEPROJECTPLUGIN_H #define CMAKEPROJECTPLUGIN_H @@ -52,9 +53,6 @@ public: bool initialize(const QStringList &arguments, QString *error_message); void extensionsInitialized(); - - -private: }; } // namespace Internal diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index ab30677a62..68709dcd13 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "actioncontainer.h" #include "command.h" #include "coreimpl.h" diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h index 8f629410a4..51b0437d4f 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef ACTIONCONTAINER_H #define ACTIONCONTAINER_H @@ -152,6 +153,4 @@ private: } // namespace Internal } // namespace Core -#endif //ACTIONCONTAINER_H - - +#endif // ACTIONCONTAINER_H diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index f218a84c73..488dcddfa4 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "actionmanager.h" #include "mainwindow.h" #include "actioncontainer.h" @@ -510,6 +511,7 @@ IActionContainer *ActionManager::actionContainer(int uid) const } return it.value(); } + static const char *settingsGroup = "KeyBindings"; static const char *idKey = "ID"; static const char *sequenceKey = "Keysequence"; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index c0279e3b69..43c5ecdc91 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef ACTIONMANAGER_H #define ACTIONMANAGER_H @@ -43,7 +44,8 @@ QT_BEGIN_NAMESPACE class QSettings; QT_END_NAMESPACE -struct CommandLocation { +struct CommandLocation +{ int m_container; int m_position; }; @@ -125,5 +127,4 @@ private: } // namespace Internal } // namespace Core - -#endif //ACTIONMANAGER_H +#endif // ACTIONMANAGER_H diff --git a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h b/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h index 9a3760ed76..2d7ead17a7 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h +++ b/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef ACTIONMANAGERINTERFACE_H #define ACTIONMANAGERINTERFACE_H diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp index d5e0b17b36..4c8a15ae74 100644 --- a/src/plugins/coreplugin/actionmanager/command.cpp +++ b/src/plugins/coreplugin/actionmanager/command.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include <QtCore/QDebug> #include <QtGui/QAction> #include <QtGui/QShortcut> diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h index 2d227d6542..32a85762a2 100644 --- a/src/plugins/coreplugin/actionmanager/command.h +++ b/src/plugins/coreplugin/actionmanager/command.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef COMMAND_H #define COMMAND_H @@ -175,4 +176,4 @@ private: } // namespace Internal } // namespace Core -#endif //COMMAND_H +#endif // COMMAND_H diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index 6849dd9771..897af6baeb 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "coreimpl.h" #include "commandsfile.h" #include "shortcutsettings.h" diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h index 890c2384f5..491cb0b200 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.h +++ b/src/plugins/coreplugin/actionmanager/commandsfile.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef COMMANDSFILE_H #define COMMANDSFILE_H @@ -44,7 +45,8 @@ namespace Internal { struct ShortcutItem; -class CommandsFile : public QObject { +class CommandsFile : public QObject +{ Q_OBJECT public: diff --git a/src/plugins/coreplugin/actionmanager/iactioncontainer.h b/src/plugins/coreplugin/actionmanager/iactioncontainer.h index a9adb471b1..0b2efdda88 100644 --- a/src/plugins/coreplugin/actionmanager/iactioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/iactioncontainer.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IACTIONCONTAINER_H #define IACTIONCONTAINER_H @@ -42,6 +43,7 @@ namespace Core { class ICommand; + class IActionContainer : public QObject { public: diff --git a/src/plugins/coreplugin/actionmanager/icommand.h b/src/plugins/coreplugin/actionmanager/icommand.h index c1a03a2f14..fb7a7ab4d4 100644 --- a/src/plugins/coreplugin/actionmanager/icommand.h +++ b/src/plugins/coreplugin/actionmanager/icommand.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef ICOMMAND_H #define ICOMMAND_H diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp index b54b43af8d..eb5dfff87f 100644 --- a/src/plugins/coreplugin/basefilewizard.cpp +++ b/src/plugins/coreplugin/basefilewizard.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "basefilewizard.h" #include "mimedatabase.h" @@ -56,7 +57,8 @@ enum { debugWizard = 0 }; namespace Core { -class GeneratedFilePrivate : public QSharedData { +class GeneratedFilePrivate : public QSharedData +{ public: GeneratedFilePrivate() {} explicit GeneratedFilePrivate(const QString &p); @@ -150,8 +152,11 @@ bool GeneratedFile::write(QString *errorMessage) const file.close(); return true; } + + // ------------ BaseFileWizardParameterData -class BaseFileWizardParameterData : public QSharedData { +class BaseFileWizardParameterData : public QSharedData +{ public: explicit BaseFileWizardParameterData(IWizard::Kind kind = IWizard::FileWizard); @@ -338,7 +343,8 @@ void WizardEventLoop::rejected() } // ---------------- BaseFileWizardPrivate -struct BaseFileWizardPrivate { +struct BaseFileWizardPrivate +{ explicit BaseFileWizardPrivate(const Core::BaseFileWizardParameters ¶meters, Core::ICore *core); @@ -666,6 +672,6 @@ GeneratedFiles StandardFileWizard::generateFiles(const QWizard *w, errorMessage); } - } // namespace Core + #include "basefilewizard.moc" diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index dcf965ecce..0c392430b7 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BASEFILEWIZARD_H #define BASEFILEWIZARD_H @@ -62,7 +63,8 @@ class GeneratedFilePrivate; * each file whether it already exists and will report any errors that may * occur during creation of the files. */ -class CORE_EXPORT GeneratedFile { +class CORE_EXPORT GeneratedFile +{ public: GeneratedFile(); explicit GeneratedFile(const QString &path); @@ -93,7 +95,8 @@ typedef QList<GeneratedFile> GeneratedFiles; /* Parameter class for passing parameters to instances of class Wizard * containing name, icon and such. */ -class CORE_EXPORT BaseFileWizardParameters { +class CORE_EXPORT BaseFileWizardParameters +{ public: explicit BaseFileWizardParameters(IWizard::Kind kind = IWizard::FileWizard); BaseFileWizardParameters(const BaseFileWizardParameters &); @@ -204,7 +207,8 @@ private: // Core::Utils::FileWizardDialog and introduces a new virtual to generate the // files from path and name. -class CORE_EXPORT StandardFileWizard : public BaseFileWizard { +class CORE_EXPORT StandardFileWizard : public BaseFileWizard +{ Q_DISABLE_COPY(StandardFileWizard) Q_OBJECT diff --git a/src/plugins/coreplugin/basemode.cpp b/src/plugins/coreplugin/basemode.cpp index 5573f733f8..40e6d911f9 100644 --- a/src/plugins/coreplugin/basemode.cpp +++ b/src/plugins/coreplugin/basemode.cpp @@ -30,12 +30,13 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -#include "basemode.h" -#include <QtGui/QWidget> +#include "basemode.h" #include <extensionsystem/pluginmanager.h> +#include <QtGui/QWidget> + using namespace Core; /*! diff --git a/src/plugins/coreplugin/basemode.h b/src/plugins/coreplugin/basemode.h index 65bd5bb378..952a7c4b6d 100644 --- a/src/plugins/coreplugin/basemode.h +++ b/src/plugins/coreplugin/basemode.h @@ -30,11 +30,11 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BASEMODE_H #define BASEMODE_H #include "core_global.h" - #include "imode.h" #include <QtCore/QObject> diff --git a/src/plugins/coreplugin/baseview.cpp b/src/plugins/coreplugin/baseview.cpp index ef0ab5754c..661bbe7bfb 100644 --- a/src/plugins/coreplugin/baseview.cpp +++ b/src/plugins/coreplugin/baseview.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "baseview.h" #include <extensionsystem/ExtensionSystemInterfaces> diff --git a/src/plugins/coreplugin/baseview.h b/src/plugins/coreplugin/baseview.h index dd3bb0503a..996a69ce62 100644 --- a/src/plugins/coreplugin/baseview.h +++ b/src/plugins/coreplugin/baseview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef BASEVIEW_H #define BASEVIEW_H diff --git a/src/plugins/coreplugin/core_global.h b/src/plugins/coreplugin/core_global.h index 71737b31b7..7fda209da9 100644 --- a/src/plugins/coreplugin/core_global.h +++ b/src/plugins/coreplugin/core_global.h @@ -30,18 +30,6 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 1992-$THISYEAR$ Trolltech AS. All rights reserved. -** -** This file is part of the $MODULE$ of the Qt Toolkit. -** -** $LICENSE$ -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ #ifndef CORE_GLOBAL_H #define CORE_GLOBAL_H diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 6f0292041e..f05e224919 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef CORECONSTANTS_H #define CORECONSTANTS_H diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index 258aa0331b..3b1452a35d 100644 --- a/src/plugins/coreplugin/coreimpl.cpp +++ b/src/plugins/coreplugin/coreimpl.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "coreimpl.h" #include <QtCore/QDir> diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h index b7eaf185a4..f6aca168b1 100644 --- a/src/plugins/coreplugin/coreimpl.h +++ b/src/plugins/coreplugin/coreimpl.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef COREIMPL_H #define COREIMPL_H diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 070edd9a6a..dbc96ce4cc 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "coreplugin.h" #include "welcomemode.h" #include "editmode.h" diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index 6afd9c7f24..43ae3bbb27 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef QWORKBENCHPLUGIN_H #define QWORKBENCHPLUGIN_H diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index 4aa3854385..e6f9298284 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IOPTIONSPAGE_H #define IOPTIONSPAGE_H diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h index 37457ba39b..68b3f2529d 100644 --- a/src/plugins/coreplugin/dialogs/iwizard.h +++ b/src/plugins/coreplugin/dialogs/iwizard.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IWIZARD_H #define IWIZARD_H @@ -65,6 +66,7 @@ public: virtual QStringList runWizard(const QString &path, QWidget *parent) = 0; }; + } // namespace Core #endif // IWIZARD_H diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index e344dc34a0..fcb43ddf12 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "newdialog.h" #include "ui_newdialog.h" #include "basefilewizard.h" @@ -37,7 +38,6 @@ #include <coreplugin/coreconstants.h> #include <coreplugin/dialogs/iwizard.h> - #include <QtGui/QHeaderView> #include <QtGui/QPushButton> @@ -143,7 +143,6 @@ void NewDialog::okButtonClicked() accept(); } - void NewDialog::updateOkButton() { m_okButton->setEnabled(currentWizard() != 0); diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index 84059b71a1..17275069f8 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef NEWDIALOG_H #define NEWDIALOG_H @@ -79,4 +80,4 @@ private: } // namespace Internal } // namespace Core -#endif //NEWDIALOG_H +#endif // NEWDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp index b388218474..25954c9cec 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp +++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp @@ -28,8 +28,9 @@ ** In addition, as a special exception, Nokia gives you certain additional ** rights. These rights are described in the Nokia Qt GPL Exception version ** 1.2, included in the file GPL_EXCEPTION.txt in this package. -** +** ***************************************************************************/ + #include "openwithdialog.h" #include <QtGui/QListWidget> @@ -39,8 +40,8 @@ using namespace Core; using namespace Core::Internal; -OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent) : - QDialog(parent) +OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent) + : QDialog(parent) { setupUi(this); label->setText(tr("Open file '%1' with:").arg(QFileInfo(fileName).fileName())); diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h index 569f5eac7d..63eb5880e7 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.h +++ b/src/plugins/coreplugin/dialogs/openwithdialog.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef OPENWITHDIALOG_H #define OPENWITHDIALOG_H @@ -66,4 +67,4 @@ private: } // namespace Internal } // namespace Core -#endif +#endif // OPENWITHDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp index 7c06c786fd..244f178b14 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "saveitemsdialog.h" #include "mainwindow.h" #include "vcsmanager.h" diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h index 52e43aab0a..3b02160c0a 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef SAVEITEMSDIALOG_H #define SAVEITEMSDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 78d839bf1a..b0bb2da648 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "settingsdialog.h" #include "coreimpl.h" @@ -111,7 +112,6 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &initialCategory, SettingsDialog::~SettingsDialog() { - } void SettingsDialog::pageSelected(QTreeWidgetItem *) @@ -123,16 +123,14 @@ void SettingsDialog::pageSelected(QTreeWidgetItem *) void SettingsDialog::accept() { - foreach(IOptionsPage *page, m_pages) { + foreach(IOptionsPage *page, m_pages) page->finished(true); - } done(QDialog::Accepted); } void SettingsDialog::reject() { - foreach(IOptionsPage *page, m_pages) { + foreach(IOptionsPage *page, m_pages) page->finished(false); - } done(QDialog::Rejected); } diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h index 2d80aa643c..c56093e138 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.h +++ b/src/plugins/coreplugin/dialogs/settingsdialog.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index aeefebdf24..87e504dd02 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "shortcutsettings.h" #include "ui_shortcutsettings.h" #include "actionmanager.h" diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 38dfb88894..e6d753664e 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef SHORTCUTSETTINGS_H #define SHORTCUTSETTINGS_H @@ -54,7 +55,8 @@ class ActionManager; class Command; class MainWindow; -struct ShortcutItem { +struct ShortcutItem +{ ICommand *m_cmd; QKeySequence m_key; QTreeWidgetItem *m_item; diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp index 088cd69f37..516f484caf 100644 --- a/src/plugins/coreplugin/editmode.cpp +++ b/src/plugins/coreplugin/editmode.cpp @@ -51,7 +51,7 @@ using namespace Core; using namespace Core::Internal; -EditMode::EditMode(EditorManager *editorManager): +EditMode::EditMode(EditorManager *editorManager) : m_editorManager(editorManager), m_splitter(new MiniSplitter), m_rightSplitWidgetLayout(new QVBoxLayout) diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h index 234c4aab9e..95275dd9b1 100644 --- a/src/plugins/coreplugin/editmode.h +++ b/src/plugins/coreplugin/editmode.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EDITMODE_H #define EDITMODE_H diff --git a/src/plugins/coreplugin/editormanager/editorgroup.cpp b/src/plugins/coreplugin/editormanager/editorgroup.cpp index 53b61c74fd..5a6fe6156b 100644 --- a/src/plugins/coreplugin/editormanager/editorgroup.cpp +++ b/src/plugins/coreplugin/editormanager/editorgroup.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "editorgroup.h" #include "editormanager.h" diff --git a/src/plugins/coreplugin/editormanager/editorgroup.h b/src/plugins/coreplugin/editormanager/editorgroup.h index eca333c4df..69be7ba6e0 100644 --- a/src/plugins/coreplugin/editormanager/editorgroup.h +++ b/src/plugins/coreplugin/editormanager/editorgroup.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EDITORGROUP_H #define EDITORGROUP_H @@ -135,19 +136,24 @@ public: QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const; void addEditor(IEditor *editor) { insertEditor(rowCount(), editor); } - void insertEditor(int index, IEditor *editor) { + + void insertEditor(int index, IEditor *editor) + { beginInsertRows(QModelIndex(), index, index); m_editors.insert(index, editor); endInsertRows(); } - void removeEditor(IEditor *editor) { + + void removeEditor(IEditor *editor) + { int index = m_editors.indexOf(editor); beginRemoveRows(QModelIndex(), index, index); m_editors.removeAt(index); endRemoveRows(); } - void emitDataChanged(IEditor *editor) { + void emitDataChanged(IEditor *editor) + { int idx = m_editors.indexOf(editor); QModelIndex mindex = index(idx, 0); emit dataChanged(mindex, mindex); diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 7b2e0b2362..3cb8e16cf5 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "editormanager.h" #include "editorsplitter.h" #include "openeditorswindow.h" diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index 750e35b0cb..8a9e88ac22 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EDITORMANAGER_H #define EDITORMANAGER_H diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp index 82710e7e93..fe86bf2b0b 100644 --- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp +++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "editorsplitter.h" #include "editormanager.h" #include "openeditorswindow.h" diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.h b/src/plugins/coreplugin/editormanager/editorsplitter.h index 12faab68da..d3b2696e00 100644 --- a/src/plugins/coreplugin/editormanager/editorsplitter.h +++ b/src/plugins/coreplugin/editormanager/editorsplitter.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef EDITORSPLITTER_H #define EDITORSPLITTER_H diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h index 66a9fdca14..4c057fd14e 100644 --- a/src/plugins/coreplugin/editormanager/ieditor.h +++ b/src/plugins/coreplugin/editormanager/ieditor.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IEDITOR_H #define IEDITOR_H diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index 2b70ef95b9..60e633db20 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IEDITORFACTORY_H #define IEDITORFACTORY_H diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index b2400853ec..c6a886ed30 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "openeditorsview.h" #include "editorgroup.h" #include "editormanager.h" @@ -301,10 +302,8 @@ QKeySequence OpenEditorsViewFactory::activationSequence() OpenEditorsViewFactory::OpenEditorsViewFactory() { - } OpenEditorsViewFactory::~OpenEditorsViewFactory() { - } diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h index d4c20a4a24..e9c8fcd56e 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.h +++ b/src/plugins/coreplugin/editormanager/openeditorsview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef OPENEDITORSVIEW_H #define OPENEDITORSVIEW_H @@ -88,4 +89,4 @@ public: } // namespace Internal } // namespace Core -#endif +#endif // OPENEDITORSVIEW_H diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index 2e97d444f7..30d6c6b8d4 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "openeditorswindow.h" #include "editorgroup.h" #include "editormanager.h" diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h index fcefe42eff..b9613c85ab 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.h +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef OPENEDITORSWINDOW_H #define OPENEDITORSWINDOW_H diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp index ffb0b14743..e5e4b3e89a 100644 --- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp +++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "stackededitorgroup.h" #include "editormanager.h" #include "coreimpl.h" diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.h b/src/plugins/coreplugin/editormanager/stackededitorgroup.h index 5b7cfd5298..56ecbc9a3a 100644 --- a/src/plugins/coreplugin/editormanager/stackededitorgroup.h +++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef STACKEDEDITORGROUP_H #define STACKEDEDITORGROUP_H diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp index 08ad842eed..8893c37dbc 100644 --- a/src/plugins/coreplugin/fancyactionbar.cpp +++ b/src/plugins/coreplugin/fancyactionbar.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "fancyactionbar.h" #include <QtGui/QHBoxLayout> diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h index 701e834ad6..ba71cfb428 100644 --- a/src/plugins/coreplugin/fancyactionbar.h +++ b/src/plugins/coreplugin/fancyactionbar.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FANCYACTIONBAR_H #define FANCYACTIONBAR_H diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index ed57c27b92..fb5ab80469 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "fancytabwidget.h" #include "stylehelper.h" diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h index 19fd173110..395482cad6 100644 --- a/src/plugins/coreplugin/fancytabwidget.h +++ b/src/plugins/coreplugin/fancytabwidget.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FANCYTABWIDGET_H #define FANCYTABWIDGET_H @@ -115,4 +116,4 @@ private: } // namespace Internal } // namespace Core -#endif +#endif // FANCYTABWIDGET_H diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index 8e01ecbb8d..022807e443 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "fileiconprovider.h" using namespace Core; @@ -46,8 +47,8 @@ using namespace Core; FileIconProvider *FileIconProvider::m_instance = 0; -FileIconProvider::FileIconProvider(): - m_unknownFileIcon(QLatin1String(":/qworkbench/images/unknownfile.png")) +FileIconProvider::FileIconProvider() + : m_unknownFileIcon(QLatin1String(":/qworkbench/images/unknownfile.png")) { } diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h index 4124eeb43d..6c7deea35a 100644 --- a/src/plugins/coreplugin/fileiconprovider.h +++ b/src/plugins/coreplugin/fileiconprovider.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FILEICONPROVIDER_H #define FILEICONPROVIDER_H diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp index 299bba4ff9..3f622bf973 100644 --- a/src/plugins/coreplugin/filemanager.cpp +++ b/src/plugins/coreplugin/filemanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "filemanager.h" #include "ifile.h" #include "mainwindow.h" diff --git a/src/plugins/coreplugin/filemanager.h b/src/plugins/coreplugin/filemanager.h index c6759d5b45..fbea2af6d1 100644 --- a/src/plugins/coreplugin/filemanager.h +++ b/src/plugins/coreplugin/filemanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FILEMANAGER_H #define FILEMANAGER_H @@ -60,7 +61,8 @@ class CORE_EXPORT FileManager : public QObject { Q_OBJECT - struct FileInfo { + struct FileInfo + { QString fileName; QDateTime modified; QFile::Permissions permissions; diff --git a/src/plugins/coreplugin/findplaceholder.cpp b/src/plugins/coreplugin/findplaceholder.cpp index ec80b530b5..72a305e63b 100644 --- a/src/plugins/coreplugin/findplaceholder.cpp +++ b/src/plugins/coreplugin/findplaceholder.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "findplaceholder.h" #include "modemanager.h" @@ -41,7 +42,7 @@ using namespace Core; FindToolBarPlaceHolder *FindToolBarPlaceHolder::m_current = 0; FindToolBarPlaceHolder::FindToolBarPlaceHolder(Core::IMode *mode, QWidget *parent) - :QWidget(parent), m_mode(mode) + : QWidget(parent), m_mode(mode) { setLayout(new QVBoxLayout); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); @@ -52,7 +53,6 @@ FindToolBarPlaceHolder::FindToolBarPlaceHolder(Core::IMode *mode, QWidget *paren FindToolBarPlaceHolder::~FindToolBarPlaceHolder() { - } void FindToolBarPlaceHolder::currentModeChanged(Core::IMode *mode) diff --git a/src/plugins/coreplugin/findplaceholder.h b/src/plugins/coreplugin/findplaceholder.h index 89850d812e..41cfaa6665 100644 --- a/src/plugins/coreplugin/findplaceholder.h +++ b/src/plugins/coreplugin/findplaceholder.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FINDPLACEHOLDER_H #define FINDPLACEHOLDER_H diff --git a/src/plugins/coreplugin/flowlayout.cpp b/src/plugins/coreplugin/flowlayout.cpp index 1c43dead53..da638ea198 100644 --- a/src/plugins/coreplugin/flowlayout.cpp +++ b/src/plugins/coreplugin/flowlayout.cpp @@ -30,27 +30,13 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2004-$THISYEAR$ Trolltech AS. All rights reserved. -** -** This file is part of the $MODULE$ of the Qt Toolkit. -** -** $LICENSE$ -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#include <QtGui> #include "flowlayout.h" using namespace Core::Internal; FlowLayout::FlowLayout(QWidget *parent, int margin, int spacing) - : QLayout(parent) + : QLayout(parent) { setMargin(margin); setSpacing(spacing); @@ -121,11 +107,10 @@ QSize FlowLayout::sizeHint() const QSize FlowLayout::minimumSize() const { QSize size; - QLayoutItem *item; - foreach (item, itemList) + foreach (QLayoutItem *item, itemList) size = size.expandedTo(item->minimumSize()); - size += QSize(2*margin(), 2*margin()); + size += QSize(2 * margin(), 2 * margin()); return size; } @@ -135,8 +120,7 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const int y = rect.y(); int lineHeight = 0; - QLayoutItem *item; - foreach (item, itemList) { + foreach (QLayoutItem *item, itemList) { int nextX = x + item->sizeHint().width() + spacing(); if (nextX - spacing() > rect.right() && lineHeight > 0) { x = rect.x(); diff --git a/src/plugins/coreplugin/flowlayout.h b/src/plugins/coreplugin/flowlayout.h index f0a7d4235b..b8fae2446b 100644 --- a/src/plugins/coreplugin/flowlayout.h +++ b/src/plugins/coreplugin/flowlayout.h @@ -30,18 +30,6 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2004-$THISYEAR$ Trolltech AS. All rights reserved. -** -** This file is part of the $MODULE$ of the Qt Toolkit. -** -** $LICENSE$ -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ #ifndef FLOWLAYOUT_H #define FLOWLAYOUT_H @@ -80,4 +68,4 @@ private: } // namespace Internal } // namespace Core -#endif +#endif // FLOWLAYOUT_H diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 8595eb03ee..eea09bfaf3 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "generalsettings.h" #include "stylehelper.h" diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index 0cffc9caaf..3a0c18fdd0 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef GENERALSETTINGS_H #define GENERALSETTINGS_H diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h index a873afb4c5..87cc549440 100644 --- a/src/plugins/coreplugin/icontext.h +++ b/src/plugins/coreplugin/icontext.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef ICONTEXT_H #define ICONTEXT_H diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index ad85e4be18..c06c7c6a4d 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -72,7 +72,6 @@ class CORE_EXPORT ICore : public QObject Q_OBJECT public: - ICore() {} virtual ~ICore() {} @@ -131,4 +130,4 @@ signals: } // namespace Core -#endif //ICORE_H +#endif // ICORE_H diff --git a/src/plugins/coreplugin/icorelistener.h b/src/plugins/coreplugin/icorelistener.h index 3ff0a859a1..a957a97b00 100644 --- a/src/plugins/coreplugin/icorelistener.h +++ b/src/plugins/coreplugin/icorelistener.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef ICORELISTENER_H #define ICORELISTENER_H diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h index 40a03b484e..764fe2c68a 100644 --- a/src/plugins/coreplugin/ifile.h +++ b/src/plugins/coreplugin/ifile.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IFILE_H #define IFILE_H @@ -67,6 +68,6 @@ signals: void changed(); }; -} //namespace +} // namespace Core -#endif //IFILE_H +#endif // IFILE_H diff --git a/src/plugins/coreplugin/ifilefactory.h b/src/plugins/coreplugin/ifilefactory.h index e8dcf155e1..af05517afc 100644 --- a/src/plugins/coreplugin/ifilefactory.h +++ b/src/plugins/coreplugin/ifilefactory.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IFILEFACTORY_H #define IFILEFACTORY_H diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h index 238d628a78..31aa8714d0 100644 --- a/src/plugins/coreplugin/ifilewizardextension.h +++ b/src/plugins/coreplugin/ifilewizardextension.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IFILEWIZARDEXTENSION_H #define IFILEWIZARDEXTENSION_H diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h index 080b5d9be0..fa93092f88 100644 --- a/src/plugins/coreplugin/imode.h +++ b/src/plugins/coreplugin/imode.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IMODE_H #define IMODE_H diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp index 74772c4cc9..0e559c62e3 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp +++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp @@ -30,18 +30,17 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "inavigationwidgetfactory.h" using namespace Core; INavigationWidgetFactory::INavigationWidgetFactory() { - } INavigationWidgetFactory::~INavigationWidgetFactory() { - } QKeySequence INavigationWidgetFactory::activationSequence() diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h index f182f3acca..064492532c 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.h +++ b/src/plugins/coreplugin/inavigationwidgetfactory.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef INAVIGATIONWIDGET_H #define INAVIGATIONWIDGET_H @@ -65,6 +66,7 @@ public: // Similar to how IView virtual NavigationView createWidget() = 0; }; -} + +} // namespace Core #endif // INAVIGATIONWIDGET_H diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index 9847c1a1b2..ecb0f39278 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IOUTPUTPANE_H #define IOUTPUTPANE_H diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index e2d3de1ec3..45b07faa8e 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IVERSIONCONTROL_H #define IVERSIONCONTROL_H diff --git a/src/plugins/coreplugin/iview.h b/src/plugins/coreplugin/iview.h index dd0a222b59..cd242ee8f6 100644 --- a/src/plugins/coreplugin/iview.h +++ b/src/plugins/coreplugin/iview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef IVIEW_H #define IVIEW_H diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index a90f1ff14e..6e11f42abe 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -53,6 +53,7 @@ #include "progressview.h" #include "shortcutsettings.h" #include "vcsmanager.h" + #include "scriptmanager.h" #include "settingsdialog.h" #include "stylehelper.h" diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 00721a1662..e465cc27fb 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MAINWINDOW_H #define MAINWINDOW_H @@ -56,34 +57,34 @@ namespace Core { class ActionManagerInterface; class BaseMode; +class BaseView; class EditorManager; class FileManager; class IContext; class MessageManager; -class ModeManager; class MimeDatabase; +class ModeManager; class ProgressManagerInterface; -class VCSManager; +class RightPaneWidget; class ScriptManagerInterface; class UniqueIDManager; class VariableManager; +class VCSManager; class ViewManagerInterface; -class BaseView; -class RightPaneWidget; namespace Internal { -class CoreImpl; class ActionManager; -class ProgressManager; -class OutputPane; -class ViewManager; -class GeneralSettings; -class ShortcutSettings; +class CoreImpl; class FancyTabWidget; +class GeneralSettings; class NavigationWidget; +class OutputPane; +class ProgressManager; +class ShortcutSettings; +class ViewManager; -class CORE_EXPORT MainWindow : public QMainWindow +class CORE_EXPORT MainWindow : public QMainWindow { Q_OBJECT @@ -129,7 +130,6 @@ public: QMenu *createPopupMenu(); - void setSuppressNavigationWidget(bool suppress); signals: diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index d82059f00d..1fe95c8f42 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -30,20 +30,9 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2007-$THISYEAR$ $TROLLTECH$. All rights reserved. -** -** This file is part of the Manhattan Style project -** -** $TROLLTECH_GPL_LICENSE$ -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ #include "manhattanstyle.h" + #include <QStyleOption> #include <QPainter> #include <QScrollArea> diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index 685a35da66..6210df6bf8 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -30,18 +30,6 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2007-$THISYEAR$ $TROLLTECH$. All rights reserved. -** -** This file is part of the ManhattanStyle project on Trolltech Labs. -** -** $TROLLTECH_GPL_LICENSE$ -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ #ifndef MANHATTANSTYLE_H #define MANHATTANSTYLE_H diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp index a6268fbd25..4b72673bce 100644 --- a/src/plugins/coreplugin/messagemanager.cpp +++ b/src/plugins/coreplugin/messagemanager.cpp @@ -30,21 +30,21 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "messagemanager.h" #include "messageoutputwindow.h" +#include <extensionsystem/pluginmanager.h> + #include <QtGui/QStatusBar> #include <QtGui/QApplication> -#include <extensionsystem/pluginmanager.h> - using namespace Core; MessageManager *MessageManager::m_instance = 0; -MessageManager::MessageManager(): - m_pm(0), - m_messageOutputWindow(0) +MessageManager::MessageManager() + : m_pm(0), m_messageOutputWindow(0) { m_instance = this; } diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h index f2854108d6..a92263a056 100644 --- a/src/plugins/coreplugin/messagemanager.h +++ b/src/plugins/coreplugin/messagemanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MESSAGEMANAGER_H #define MESSAGEMANAGER_H diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp index 2ffe82e9df..b7afcca988 100644 --- a/src/plugins/coreplugin/messageoutputwindow.cpp +++ b/src/plugins/coreplugin/messageoutputwindow.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "messageoutputwindow.h" #include <QtGui/QTextEdit> diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h index 1373ea363d..06d9d892cf 100644 --- a/src/plugins/coreplugin/messageoutputwindow.h +++ b/src/plugins/coreplugin/messageoutputwindow.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MESSAGEOUTPUTWINDOW_H #define MESSAGEOUTPUTWINDOW_H diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index d49d4728e6..7ee16e0776 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "mimedatabase.h" #include <QtCore/QStringList> @@ -93,7 +94,6 @@ enum { BinaryMatchPriority = 1, TextMatchPriority = 2}; */ namespace Core { - namespace Internal { // FileMatchContext: Passed on to the mimetypes from the database @@ -786,7 +786,8 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString enum { Dangling = 32767 }; -struct MimeMapEntry { +struct MimeMapEntry +{ explicit MimeMapEntry(const MimeType &t = MimeType(), int aLevel = Dangling); MimeType type; int level; // hierachy level @@ -821,7 +822,8 @@ MimeMapEntry::MimeMapEntry(const MimeType &t, int aLevel) : * to check the most specific types first). Starting a recursion from the * leaves is not suitable since it will hit parent nodes several times. */ -class MimeDatabasePrivate { +class MimeDatabasePrivate +{ Q_DISABLE_COPY(MimeDatabasePrivate) public: MimeDatabasePrivate(); diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h index d4f96cf8d9..3a58bff0cb 100644 --- a/src/plugins/coreplugin/mimedatabase.h +++ b/src/plugins/coreplugin/mimedatabase.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MIMEDATABASE_H #define MIMEDATABASE_H @@ -57,7 +58,8 @@ namespace Internal { } /* Magic (file contents) matcher interface. */ -class CORE_EXPORT IMagicMatcher { +class CORE_EXPORT IMagicMatcher +{ Q_DISABLE_COPY(IMagicMatcher) protected: IMagicMatcher() {} @@ -72,7 +74,8 @@ public: /* Utility class: A standard Magic match rule based on contents. Provides * static factory methods for creation (currently only for "string". This can * be extended to handle "little16"/"big16", etc.). */ -class CORE_EXPORT MagicRule { +class CORE_EXPORT MagicRule +{ Q_DISABLE_COPY(MagicRule) public: explicit MagicRule(const QByteArray &pattern, int startPos, int endPos); @@ -89,7 +92,8 @@ private: /* Utility class: A Magic matcher that checks a number of rules based on * operator "or". It is used for rules parsed from XML files. */ -class CORE_EXPORT MagicRuleMatcher : public IMagicMatcher { +class CORE_EXPORT MagicRuleMatcher : public IMagicMatcher +{ Q_DISABLE_COPY(MagicRuleMatcher) public: typedef QSharedPointer<MagicRule> MagicRuleSharedPointer; diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp index dfdad9fb53..7d0e6edff6 100644 --- a/src/plugins/coreplugin/minisplitter.cpp +++ b/src/plugins/coreplugin/minisplitter.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "minisplitter.h" #include "stylehelper.h" diff --git a/src/plugins/coreplugin/minisplitter.h b/src/plugins/coreplugin/minisplitter.h index aedb2b757c..d5ca2e7196 100644 --- a/src/plugins/coreplugin/minisplitter.h +++ b/src/plugins/coreplugin/minisplitter.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MINISPLITTER_H #define MINISPLITTER_H diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 74027ab391..58a02bd4c2 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "modemanager.h" #include "fancytabwidget.h" #include "fancyactionbar.h" @@ -55,7 +56,7 @@ using namespace Core::Internal; ModeManager *ModeManager::m_instance = 0; -ModeManager::ModeManager(Internal::MainWindow *mainWindow, FancyTabWidget *modeStack): +ModeManager::ModeManager(Internal::MainWindow *mainWindow, FancyTabWidget *modeStack) : m_mainWindow(mainWindow), m_modeStack(modeStack), m_signalMapper(new QSignalMapper(this)) diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 775c8d4a61..96e873f46c 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef MODEMANAGER_H #define MODEMANAGER_H diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 0a29c24d7c..eda1123c02 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "navigationwidget.h" #include <coreplugin/icore.h> @@ -134,10 +135,10 @@ void NavigationWidgetPlaceHolder::currentModeAboutToChange(Core::IMode *mode) NavigationWidget *NavigationWidget::m_instance = 0; NavigationWidget::NavigationWidget(QAction *toggleSideBarAction) - : m_shown(true) - , m_suppressed(false) - , m_width(0) - , m_toggleSideBarAction(toggleSideBarAction) + : m_shown(true), + m_suppressed(false), + m_width(0), + m_toggleSideBarAction(toggleSideBarAction) { connect(ExtensionSystem::PluginManager::instance(), SIGNAL(objectAdded(QObject*)), this, SLOT(objectAdded(QObject*))); diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index d8244f8868..01d9f2893e 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef NAVIGATIONWIDGET_H #define NAVIGATIONWIDGET_H diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 92378d72e9..b92d927022 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "outputpane.h" #include "coreconstants.h" #include "ioutputpane.h" diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h index fcc54745b0..489ff87bac 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef OUTPUTPANE_H #define OUTPUTPANE_H diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp index dcf8c9b826..a22df97f5f 100644 --- a/src/plugins/coreplugin/plugindialog.cpp +++ b/src/plugins/coreplugin/plugindialog.cpp @@ -30,7 +30,9 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "plugindialog.h" + #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginview.h> #include <extensionsystem/plugindetailsview.h> @@ -47,8 +49,8 @@ using namespace Core::Internal; PluginDialog::PluginDialog(ExtensionSystem::PluginManager *manager, QWidget *parent) - : QDialog(parent) - , m_view(new ExtensionSystem::PluginView(manager, this)) + : QDialog(parent), + m_view(new ExtensionSystem::PluginView(manager, this)) { QVBoxLayout *vl = new QVBoxLayout(this); vl->addWidget(m_view); diff --git a/src/plugins/coreplugin/plugindialog.h b/src/plugins/coreplugin/plugindialog.h index d3c0d312a6..08cfee7ae7 100644 --- a/src/plugins/coreplugin/plugindialog.h +++ b/src/plugins/coreplugin/plugindialog.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PLUGINDIALOG_H #define PLUGINDIALOG_H @@ -72,4 +73,4 @@ private: } // namespace Internal } // namespace Core -#endif +#endif // PLUGINDIALOG_H diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp index 2aeb817bc2..9e662585d2 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp +++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "futureprogress.h" #include "progresspie.h" diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index 4f46a4a1fb..bd1d7e7bdd 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/src/plugins/coreplugin/progressmanager/futureprogress.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef FUTUREPROGRESS_H #define FUTUREPROGRESS_H @@ -91,4 +92,5 @@ private: }; } // namespace Core + #endif // FUTUREPROGRESS_H diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index 6e4e15644e..ce84743460 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "progressmanager.h" #include "progressview.h" #include "coreimpl.h" @@ -56,7 +57,6 @@ ProgressManager::~ProgressManager() void ProgressManager::init() { - } void ProgressManager::cancelTasks(const QString &type) diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 0c40dcc0fa..8413a252eb 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PROGRESSMANAGER_H #define PROGRESSMANAGER_H @@ -40,7 +41,6 @@ #include <QtCore/QFutureWatcher> namespace Core { - namespace Internal { class ProgressView; @@ -71,4 +71,4 @@ private: } // namespace Internal } // namespace Core -#endif //PROGRESSMANAGER_H +#endif // PROGRESSMANAGER_H diff --git a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h b/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h index 6a89293467..e491eaaa29 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h +++ b/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PROGRESSMANAGERINTERFACE_H #define PROGRESSMANAGERINTERFACE_H @@ -57,6 +58,6 @@ public slots: virtual void cancelTasks(const QString &type) = 0; }; -} //namespace +} // namespace Core #endif //PROGRESSMANAGERINTERFACE_H diff --git a/src/plugins/coreplugin/progressmanager/progresspie.cpp b/src/plugins/coreplugin/progressmanager/progresspie.cpp index 7a237fe5d9..aaf090a0fd 100644 --- a/src/plugins/coreplugin/progressmanager/progresspie.cpp +++ b/src/plugins/coreplugin/progressmanager/progresspie.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "progresspie.h" #include "stylehelper.h" @@ -47,7 +48,6 @@ ProgressBar::ProgressBar(QWidget *parent) ProgressBar::~ProgressBar() { - } QString ProgressBar::title() const @@ -60,7 +60,6 @@ bool ProgressBar::hasError() const return m_error; } - void ProgressBar::setTitle(const QString &title) { m_title = title; diff --git a/src/plugins/coreplugin/progressmanager/progresspie.h b/src/plugins/coreplugin/progressmanager/progresspie.h index dfeb33e558..23992025ed 100644 --- a/src/plugins/coreplugin/progressmanager/progresspie.h +++ b/src/plugins/coreplugin/progressmanager/progresspie.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PROGRESSPIE_H #define PROGRESSPIE_H diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp index bb0008056b..96b3158266 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.cpp +++ b/src/plugins/coreplugin/progressmanager/progressview.cpp @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #include "progressview.h" #include "futureprogress.h" @@ -39,7 +40,7 @@ using namespace Core; using namespace Core::Internal; ProgressView::ProgressView(QWidget *parent) -: QWidget(parent) + : QWidget(parent) { m_layout = new QVBoxLayout; setLayout(m_layout); diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h index 7e832f92f2..3d164a7ccb 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.h +++ b/src/plugins/coreplugin/progressmanager/progressview.h @@ -30,6 +30,7 @@ ** 1.2, included in the file GPL_EXCEPTION.txt in this package. ** ***************************************************************************/ + #ifndef PROGRESSVIEW_H #define PROGRESSVIEW_H @@ -78,4 +79,4 @@ private: } // namespace Internal } // namespace Core -#endif //PROGRESSVIEW_H +#endif // PROGRESSVIEW_H |