From dd235e2b4827ce76c7dff86a1c3e35400161a33b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 13 Jan 2009 14:06:42 +0100 Subject: [PATCH 1/7] Fixes: Random enabling of submit/diff buttons when switching contexts (viewing diffs) from the submit editor Details: Register actions directly --- src/plugins/git/gitplugin.cpp | 11 ++----- src/plugins/perforce/perforceplugin.cpp | 12 ++----- src/plugins/subversion/subversionplugin.cpp | 12 ++----- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 36 +++++++++------------ src/plugins/vcsbase/vcsbasesubmiteditor.h | 14 +++++--- 5 files changed, 31 insertions(+), 54 deletions(-) diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 50214c7c354..63e1f19d18d 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -210,11 +210,7 @@ GitPlugin *GitPlugin::instance() static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = { Git::Constants::SUBMIT_MIMETYPE, Git::Constants::GITSUBMITEDITOR_KIND, - Git::Constants::C_GITSUBMITEDITOR, - Core::Constants::UNDO, - Core::Constants::REDO, - Git::Constants::SUBMIT_CURRENT, - Git::Constants::DIFF_SELECTED + Git::Constants::C_GITSUBMITEDITOR }; static Core::ICommand *createSeparator(Core::ActionManagerInterface *am, @@ -640,10 +636,7 @@ Core::IEditor *GitPlugin::openSubmitEditor(const QString &fileName, const Commit QTC_ASSERT(submitEditor, return 0); // The actions are for some reason enabled by the context switching // mechanism. Disable them correctly. - m_submitCurrentAction->setEnabled(!cd.stagedFiles.empty()); - m_diffSelectedFilesAction->setEnabled(false); - m_undoAction->setEnabled(false); - m_redoAction->setEnabled(false); + submitEditor->registerActions(m_undoAction, m_redoAction, m_submitCurrentAction, m_diffSelectedFilesAction); submitEditor->setCommitData(cd); connect(submitEditor, SIGNAL(diffStaged(QStringList)), this, SLOT(submitEditorDiffStaged(QStringList))); connect(submitEditor, SIGNAL(diffUnstaged(QStringList)), this, SLOT(submitEditorDiffUnstaged(QStringList))); diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index aa4b0a4fa48..c616a019aa6 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -179,11 +179,7 @@ PerforcePlugin::PerforcePlugin() : static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = { Perforce::Constants::SUBMIT_MIMETYPE, Perforce::Constants::PERFORCESUBMITEDITOR_KIND, - Perforce::Constants::C_PERFORCESUBMITEDITOR, - Core::Constants::UNDO, - Core::Constants::REDO, - Perforce::Constants::SUBMIT_CURRENT, - Perforce::Constants::DIFF_SELECTED + Perforce::Constants::C_PERFORCESUBMITEDITOR }; bool PerforcePlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) @@ -558,12 +554,8 @@ Core::IEditor *PerforcePlugin::openPerforceSubmitEditor(const QString &fileName, PerforceSubmitEditor *submitEditor = dynamic_cast(editor); QTC_ASSERT(submitEditor, return 0); submitEditor->restrictToProjectFiles(depotFileNames); + submitEditor->registerActions(m_undoAction, m_redoAction, m_submitCurrentLogAction, m_diffSelectedFiles); connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(slotDiff(QStringList))); - // The actions are for some reason enabled by the context switching - // mechanism. Disable them correctly. - m_diffSelectedFiles->setEnabled(false); - m_undoAction->setEnabled(false); - m_redoAction->setEnabled(false); return editor; } diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 36182eb94a0..9a5067f4dc2 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -245,11 +245,7 @@ void SubversionPlugin::cleanChangeTmpFile() static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = { Subversion::Constants::SUBVERSION_SUBMIT_MIMETYPE, Subversion::Constants::SUBVERSIONCOMMITEDITOR_KIND, - Subversion::Constants::SUBVERSIONCOMMITEDITOR, - Core::Constants::UNDO, - Core::Constants::REDO, - Subversion::Constants::SUBMIT_CURRENT, - Subversion::Constants::DIFF_SELECTED + Subversion::Constants::SUBVERSIONCOMMITEDITOR }; bool SubversionPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage) @@ -529,11 +525,7 @@ SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QStri Core::IEditor *editor = m_coreInstance->editorManager()->openEditor(fileName, QLatin1String(Constants::SUBVERSIONCOMMITEDITOR_KIND)); SubversionSubmitEditor *submitEditor = qobject_cast(editor); QTC_ASSERT(submitEditor, /**/); - // The actions are for some reason enabled by the context switching - // mechanism. Disable them correctly. - m_submitDiffAction->setEnabled(false); - m_submitUndoAction->setEnabled(false); - m_submitRedoAction->setEnabled(false); + submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction); connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffFiles(QStringList))); return submitEditor; diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 25fbce7634c..a26f811e8dd 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -57,17 +57,6 @@ enum { debug = 0 }; enum { wantToolBar = 0 }; -static inline QAction *actionFromId(const Core::ICore *core, const char *id) -{ - QAction *rc = 0; - if (id) - if (const Core::ICommand *cmd = core->actionManager()->command(id)) - rc = cmd->action(); - if (debug) - qDebug() << Q_FUNC_INFO << id << rc; - return rc; -} - namespace VCSBase { struct VCSBaseSubmitEditorPrivate { @@ -83,10 +72,8 @@ struct VCSBaseSubmitEditorPrivate { VCSBase::Internal::SubmitEditorFile *m_file; QList m_contexts; - QPointer m_undoAction; - QPointer m_redoAction; - QPointer m_submitAction; QPointer m_diffAction; + QPointer m_submitAction; }; VCSBaseSubmitEditorPrivate::VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditorParameters *parameters, @@ -96,11 +83,7 @@ VCSBaseSubmitEditorPrivate::VCSBaseSubmitEditorPrivate(const VCSBaseSubmitEditor m_widget(editorWidget), m_toolWidget(0), m_parameters(parameters), - m_file(new VCSBase::Internal::SubmitEditorFile(QLatin1String(m_parameters->mimeType), q)), - m_undoAction(actionFromId(m_core, m_parameters->undoActionId)), - m_redoAction(actionFromId(m_core, m_parameters->redoActionId)), - m_submitAction(actionFromId(m_core, m_parameters->submitActionId)), - m_diffAction(actionFromId(m_core, m_parameters->diffActionId)) + m_file(new VCSBase::Internal::SubmitEditorFile(QLatin1String(m_parameters->mimeType), q)) { m_contexts << m_core->uniqueIDManager()->uniqueIdentifier(m_parameters->context); } @@ -113,7 +96,6 @@ VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *pa // We are always clean to prevent the editor manager from asking to save. connect(m_d->m_file, SIGNAL(saveMe(QString)), this, SLOT(save(QString))); - m_d->m_widget->registerActions(m_d->m_undoAction, m_d->m_redoAction, m_d->m_submitAction, m_d->m_diffAction); connect(m_d->m_widget, SIGNAL(diffSelected(QStringList)), this, SLOT(slotDiffSelectedVCSFiles(QStringList))); connect(m_d->m_widget->descriptionEdit(), SIGNAL(textChanged()), this, SLOT(slotDescriptionChanged())); @@ -129,6 +111,20 @@ VCSBaseSubmitEditor::~VCSBaseSubmitEditor() delete m_d; } +void VCSBaseSubmitEditor::registerActions(QAction *editorUndoAction, QAction *editorRedoAction, + QAction *submitAction, QAction *diffAction)\ +{ + m_d->m_widget->registerActions(editorUndoAction, editorRedoAction, submitAction, diffAction); + m_d->m_diffAction = diffAction; + m_d->m_submitAction = submitAction; +} + +void VCSBaseSubmitEditor::unregisterActions(QAction *editorUndoAction, QAction *editorRedoAction, + QAction *submitAction, QAction *diffAction) +{ + m_d->m_widget->unregisterActions(editorUndoAction, editorRedoAction, submitAction, diffAction); + m_d->m_diffAction = m_d->m_submitAction = 0; +} int VCSBaseSubmitEditor::fileNameColumn() const { return m_d->m_widget->fileNameColumn(); diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index d3e9166b35f..a11d117f00b 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -44,6 +44,7 @@ QT_BEGIN_NAMESPACE class QIcon; class QAbstractItemModel; +class QAction; QT_END_NAMESPACE namespace Core { @@ -61,10 +62,6 @@ struct VCSBASE_EXPORT VCSBaseSubmitEditorParameters { const char *mimeType; const char *kind; const char *context; - const char *undoActionId; - const char *redoActionId; - const char *submitActionId; - const char *diffActionId; }; /* Base class for a submit editor based on the Core::Utils::SubmitEditorWidget @@ -86,7 +83,8 @@ struct VCSBASE_EXPORT VCSBaseSubmitEditorParameters { * signal and then asking the IFile interface of the editor to save the file * within a IFileManager::blockFileChange() section * and to launch the submit process. In addition, the action registered - * for submit should be connected to a slot triggering the close of the + * for submit sho src/libs/utils/submiteditorwidget.h +uld be connected to a slot triggering the close of the * current editor in the editor manager. */ class VCSBASE_EXPORT VCSBaseSubmitEditor : public Core::IEditor @@ -102,6 +100,12 @@ protected: Core::Utils::SubmitEditorWidget *editorWidget); public: + // Register the actions with the submit editor widget. + void registerActions(QAction *editorUndoAction, QAction *editorRedoAction, + QAction *submitAction = 0, QAction *diffAction = 0); + void unregisterActions(QAction *editorUndoAction, QAction *editorRedoAction, + QAction *submitAction = 0, QAction *diffAction = 0); + virtual ~VCSBaseSubmitEditor(); int fileNameColumn() const; From 248480b7c952b2b981e3ec9c40bf0f0761c12ac5 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Tue, 13 Jan 2009 14:58:29 +0100 Subject: [PATCH 2/7] Added support for C99 compound literals. --- shared/cplusplus/AST.cpp | 39 ++++++++++++++++++++++++++++ shared/cplusplus/AST.h | 19 ++++++++++++++ shared/cplusplus/ASTVisitor.h | 1 + shared/cplusplus/ASTfwd.h | 1 + shared/cplusplus/CheckExpression.cpp | 7 +++++ shared/cplusplus/CheckExpression.h | 1 + shared/cplusplus/Parser.cpp | 27 ++++++++++++++++--- shared/cplusplus/PrettyPrinter.cpp | 10 +++++++ shared/cplusplus/PrettyPrinter.h | 1 + 9 files changed, 103 insertions(+), 3 deletions(-) diff --git a/shared/cplusplus/AST.cpp b/shared/cplusplus/AST.cpp index 11be99ea48a..6889ba6fa8c 100644 --- a/shared/cplusplus/AST.cpp +++ b/shared/cplusplus/AST.cpp @@ -117,6 +117,9 @@ CatchClauseAST *AST::asCatchClause() ClassSpecifierAST *AST::asClassSpecifier() { return dynamic_cast(this); } +CompoundLiteralAST *AST::asCompoundLiteral() +{ return dynamic_cast(this); } + CompoundStatementAST *AST::asCompoundStatement() { return dynamic_cast(this); } @@ -774,6 +777,42 @@ unsigned BoolLiteralAST::lastToken() const return token + 1; } +CompoundLiteralAST *CompoundLiteralAST::clone(MemoryPool *pool) const +{ + CompoundLiteralAST *ast = new (pool) CompoundLiteralAST; + ast->lparen_token = lparen_token; + if (type_id) + ast->type_id = type_id->clone(pool); + ast->rparen_token = rparen_token; + if (initializer) + ast->initializer = initializer->clone(pool); + return ast; +} + +void CompoundLiteralAST::accept0(ASTVisitor *visitor) +{ + if (visitor->visit(this)) { + accept(type_id, visitor); + accept(initializer, visitor); + } +} + +unsigned CompoundLiteralAST::firstToken() const +{ + return lparen_token; +} + +unsigned CompoundLiteralAST::lastToken() const +{ + if (initializer) + return initializer->lastToken(); + else if (rparen_token) + return rparen_token + 1; + else if (type_id) + return type_id->lastToken(); + return lparen_token + 1; +} + BreakStatementAST *BreakStatementAST::clone(MemoryPool *pool) const { BreakStatementAST *ast = new (pool) BreakStatementAST; diff --git a/shared/cplusplus/AST.h b/shared/cplusplus/AST.h index 6607e76805b..46322fdd6bc 100644 --- a/shared/cplusplus/AST.h +++ b/shared/cplusplus/AST.h @@ -94,6 +94,7 @@ public: CastExpressionAST *asCastExpression(); CatchClauseAST *asCatchClause(); ClassSpecifierAST *asClassSpecifier(); + CompoundLiteralAST *asCompoundLiteral(); CompoundStatementAST *asCompoundStatement(); ConditionAST *asCondition(); ConditionalExpressionAST *asConditionalExpression(); @@ -429,6 +430,24 @@ protected: virtual void accept0(ASTVisitor *visitor); }; +class CPLUSPLUS_EXPORT CompoundLiteralAST: public ExpressionAST +{ +public: + unsigned lparen_token; + ExpressionAST *type_id; + unsigned rparen_token; + ExpressionAST *initializer; + +public: + virtual unsigned firstToken() const; + virtual unsigned lastToken() const; + + virtual CompoundLiteralAST *clone(MemoryPool *pool) const; + +protected: + virtual void accept0(ASTVisitor *visitor); +}; + class CPLUSPLUS_EXPORT QtMethodAST: public ExpressionAST { public: diff --git a/shared/cplusplus/ASTVisitor.h b/shared/cplusplus/ASTVisitor.h index 28097c14f70..e7a9aed1584 100644 --- a/shared/cplusplus/ASTVisitor.h +++ b/shared/cplusplus/ASTVisitor.h @@ -104,6 +104,7 @@ public: virtual bool visit(CastExpressionAST *) { return true; } virtual bool visit(CatchClauseAST *) { return true; } virtual bool visit(ClassSpecifierAST *) { return true; } + virtual bool visit(CompoundLiteralAST *) { return true; } virtual bool visit(CompoundStatementAST *) { return true; } virtual bool visit(ConditionAST *) { return true; } virtual bool visit(ConditionalExpressionAST *) { return true; } diff --git a/shared/cplusplus/ASTfwd.h b/shared/cplusplus/ASTfwd.h index 79f794f629e..db68992e022 100644 --- a/shared/cplusplus/ASTfwd.h +++ b/shared/cplusplus/ASTfwd.h @@ -77,6 +77,7 @@ class CaseStatementAST; class CastExpressionAST; class CatchClauseAST; class ClassSpecifierAST; +class CompoundLiteralAST; class CompoundStatementAST; class ConditionAST; class ConditionalExpressionAST; diff --git a/shared/cplusplus/CheckExpression.cpp b/shared/cplusplus/CheckExpression.cpp index 9976cbf500e..d5d88c38572 100644 --- a/shared/cplusplus/CheckExpression.cpp +++ b/shared/cplusplus/CheckExpression.cpp @@ -333,6 +333,13 @@ bool CheckExpression::visit(QtMethodAST *ast) return false; } +bool CheckExpression::visit(CompoundLiteralAST *ast) +{ + /*FullySpecifiedType exprTy = */ semantic()->check(ast->type_id, _scope); + /*FullySpecifiedType initTy = */ semantic()->check(ast->initializer, _scope); + return false; +} + bool CheckExpression::visit(CallAST *ast) { for (ExpressionListAST *it = ast->expression_list; it; it = it->next) { diff --git a/shared/cplusplus/CheckExpression.h b/shared/cplusplus/CheckExpression.h index e018e7dc89b..f5c9e7c8e94 100644 --- a/shared/cplusplus/CheckExpression.h +++ b/shared/cplusplus/CheckExpression.h @@ -98,6 +98,7 @@ protected: virtual bool visit(TypeIdAST *ast); virtual bool visit(UnaryExpressionAST *ast); virtual bool visit(QtMethodAST *ast); + virtual bool visit(CompoundLiteralAST *ast); //names virtual bool visit(QualifiedNameAST *ast); diff --git a/shared/cplusplus/Parser.cpp b/shared/cplusplus/Parser.cpp index 407cbc36fd8..0e49e9fe88a 100644 --- a/shared/cplusplus/Parser.cpp +++ b/shared/cplusplus/Parser.cpp @@ -1621,8 +1621,7 @@ bool Parser::parseInitializerClause(ExpressionAST *&node) ArrayInitializerAST *ast = new (_pool) ArrayInitializerAST; ast->lbrace_token = consumeToken(); parseInitializerList(ast->expression_list); - if (LA() == T_RBRACE) - ast->rbrace_token = consumeToken(); + match(T_RBRACE, &ast->rbrace_token); node = ast; return true; } @@ -2702,8 +2701,30 @@ bool Parser::parseCorePostfixExpression(ExpressionAST *&node) return true; } } - blockErrors(blocked); rewind(start); + + // look for compound literals + if (LA() == T_LPAREN) { + unsigned lparen_token = consumeToken(); + ExpressionAST *type_id = 0; + if (parseTypeId(type_id) && LA() == T_RPAREN) { + unsigned rparen_token = consumeToken(); + if (LA() == T_LBRACE) { + blockErrors(blocked); + + CompoundLiteralAST *ast = new (_pool) CompoundLiteralAST; + ast->lparen_token = lparen_token; + ast->type_id = type_id; + ast->rparen_token = rparen_token; + parseInitializerClause(ast->initializer); + node = ast; + return true; + } + } + rewind(start); + } + + blockErrors(blocked); return parsePrimaryExpression(node); } } diff --git a/shared/cplusplus/PrettyPrinter.cpp b/shared/cplusplus/PrettyPrinter.cpp index 72338576b6b..af80cee197e 100644 --- a/shared/cplusplus/PrettyPrinter.cpp +++ b/shared/cplusplus/PrettyPrinter.cpp @@ -1281,3 +1281,13 @@ bool PrettyPrinter::visit(QtMethodAST *ast) out << ')'; return false; } + +bool PrettyPrinter::visit(CompoundLiteralAST *ast) +{ + out << '('; + accept(ast->type_id); + out << ')'; + out << ' '; + accept(ast->initializer); + return false; +} diff --git a/shared/cplusplus/PrettyPrinter.h b/shared/cplusplus/PrettyPrinter.h index 966ebacd0e6..fc59100a3c1 100644 --- a/shared/cplusplus/PrettyPrinter.h +++ b/shared/cplusplus/PrettyPrinter.h @@ -66,6 +66,7 @@ protected: virtual bool visit(CastExpressionAST *ast); virtual bool visit(CatchClauseAST *ast); virtual bool visit(ClassSpecifierAST *ast); + virtual bool visit(CompoundLiteralAST *ast); virtual bool visit(CompoundStatementAST *ast); virtual bool visit(ConditionAST *ast); virtual bool visit(ConditionalExpressionAST *ast); From e2b9db7bd8dce881bdd69baa775ab53f9ec6a2f1 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Tue, 13 Jan 2009 15:05:48 +0100 Subject: [PATCH 3/7] More ObjC++ --- shared/cplusplus/Parser.cpp | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/shared/cplusplus/Parser.cpp b/shared/cplusplus/Parser.cpp index 0e49e9fe88a..d5fe83703dc 100644 --- a/shared/cplusplus/Parser.cpp +++ b/shared/cplusplus/Parser.cpp @@ -3573,6 +3573,9 @@ bool Parser::parseObjClassInstanceVariables() bool Parser::parseObjCInterfaceMemberDeclaration() { switch (LA()) { + case T_AT_END: + return false; + case T_AT_REQUIRED: case T_AT_OPTIONAL: consumeToken(); @@ -3591,9 +3594,20 @@ bool Parser::parseObjCInterfaceMemberDeclaration() case T_MINUS: return parseObjCMethodPrototype(); - default: - return false; + case T_ENUM: + case T_CLASS: + case T_STRUCT: + case T_UNION: { + DeclarationAST *declaration = 0; + return parseSimpleDeclaration(declaration, /*accept struct declarators */ true); } + + default: { + DeclarationAST *declaration = 0; + return parseSimpleDeclaration(declaration, /*accept struct declarators */ true); + } // default + + } // switch } // objc-instance-variable-declaration ::= objc-visibility-specifier @@ -3610,7 +3624,7 @@ bool Parser::parseObjCInstanceVariableDeclaration(DeclarationAST *&node) return true; default: - return parseBlockDeclaration(node); + return parseSimpleDeclaration(node, true); } } @@ -3633,7 +3647,7 @@ bool Parser::parseObjCPropertyDeclaration(DeclarationAST *&, SpecifierAST *) } DeclarationAST *simple_declaration = 0; - parseSimpleDeclaration(simple_declaration, /*accept-struct-declarators = */ false); + parseSimpleDeclaration(simple_declaration, /*accept-struct-declarators = */ true); return true; } @@ -3757,6 +3771,19 @@ bool Parser::parseObjCKeywordDeclaration() bool Parser::parseObjCTypeQualifiers() { + if (LA() != T_IDENTIFIER) + return false; + + Identifier *id = tok().identifier; + if (! strcmp("in", id->chars()) || + ! strcmp("out", id->chars()) || + ! strcmp("inout", id->chars()) || + ! strcmp("bycopy", id->chars()) || + ! strcmp("byref", id->chars()) || + ! strcmp("oneway", id->chars())) { + consumeToken(); + return true; + } return false; } From 2562b09f5b7055caddc5a74b2e70af1a25d0c9d9 Mon Sep 17 00:00:00 2001 From: con Date: Tue, 13 Jan 2009 13:07:29 +0100 Subject: [PATCH 4/7] Fixes: - Rename ActionManager --> ActionManagerPrivate Details: - Step one, step two is ActionManagerInterface --> ActionManager because it conflicts with our naming conventions --- .../actionmanager/actioncontainer.cpp | 10 +-- .../actionmanager/actioncontainer.h | 2 +- .../actionmanager/actionmanager.cpp | 64 +++++++++---------- .../{actionmanager.h => actionmanager_p.h} | 16 ++--- .../coreplugin/actionmanager/command.h | 2 +- src/plugins/coreplugin/coreplugin.pro | 2 +- .../coreplugin/dialogs/shortcutsettings.cpp | 4 +- .../coreplugin/dialogs/shortcutsettings.h | 4 +- src/plugins/coreplugin/mainwindow.cpp | 12 ++-- src/plugins/coreplugin/mainwindow.h | 4 +- src/plugins/projectexplorer/taskwindow.cpp | 2 +- src/plugins/quickopen/quickopenplugin.cpp | 2 +- 12 files changed, 63 insertions(+), 61 deletions(-) rename src/plugins/coreplugin/actionmanager/{actionmanager.h => actionmanager_p.h} (90%) diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp index bec545cc262..3e5ec9c4f7e 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp @@ -32,6 +32,8 @@ ***************************************************************************/ #include "actioncontainer.h" +#include "actionmanager_p.h" + #include "command.h" #include "coreimpl.h" @@ -181,7 +183,7 @@ void ActionContainer::appendGroup(const QString &group, bool global) int gid = idmanager->uniqueIdentifier(group); m_groups << gid; if (global) - ActionManager::instance()->registerGlobalGroup(gid, m_id); + ActionManagerPrivate::instance()->registerGlobalGroup(gid, m_id); } /*! @@ -220,7 +222,7 @@ void ActionContainer::addAction(ICommand *action, const QString &group) if (!canAddAction(action)) return; - ActionManager *am = ActionManager::instance(); + ActionManagerPrivate *am = ActionManagerPrivate::instance(); Action *a = static_cast(action); if (a->stateFlags() & Command::CS_PreLocation) { QList locs = a->locations(); @@ -251,7 +253,7 @@ void ActionContainer::addMenu(IActionContainer *menu, const QString &group) if (!canAddMenu(menu)) return; - ActionManager *am = ActionManager::instance(); + ActionManagerPrivate *am = ActionManagerPrivate::instance(); MenuActionContainer *mc = static_cast(menu); if (mc->hasState(ActionContainer::CS_PreLocation)) { CommandLocation loc = mc->location(); @@ -396,7 +398,7 @@ void ActionContainer::addMenu(IActionContainer *menu, int pos, bool setpos) */ QAction *ActionContainer::beforeAction(int pos, int *prevKey) const { - ActionManager *am = ActionManager::instance(); + ActionManagerPrivate *am = ActionManagerPrivate::instance(); int baId = -1; diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h index 6d116426f20..de9217834e5 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h @@ -34,7 +34,7 @@ #ifndef ACTIONCONTAINER_H #define ACTIONCONTAINER_H -#include "actionmanager.h" +#include "actionmanager_p.h" #include #include diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index bc43374f0e4..f333152a6b7 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -31,7 +31,7 @@ ** ***************************************************************************/ -#include "actionmanager.h" +#include "actionmanager_p.h" #include "mainwindow.h" #include "actioncontainer.h" #include "command.h" @@ -146,7 +146,7 @@ namespace { using namespace Core; using namespace Core::Internal; -ActionManager* ActionManager::m_instance = 0; +ActionManagerPrivate* ActionManagerPrivate::m_instance = 0; /*! \class ActionManager @@ -159,7 +159,7 @@ ActionManager* ActionManager::m_instance = 0; /*! ... */ -ActionManager::ActionManager(MainWindow *mainWnd, UniqueIDManager *uidmgr) : +ActionManagerPrivate::ActionManagerPrivate(MainWindow *mainWnd, UniqueIDManager *uidmgr) : ActionManagerInterface(mainWnd), m_mainWnd(mainWnd) { @@ -173,7 +173,7 @@ ActionManager::ActionManager(MainWindow *mainWnd, UniqueIDManager *uidmgr) : /*! ... */ -ActionManager::~ActionManager() +ActionManagerPrivate::~ActionManagerPrivate() { qDeleteAll(m_idCmdMap.values()); qDeleteAll(m_idContainerMap.values()); @@ -182,7 +182,7 @@ ActionManager::~ActionManager() /*! ... */ -ActionManager* ActionManager::instance() +ActionManagerPrivate* ActionManagerPrivate::instance() { return m_instance; } @@ -190,7 +190,7 @@ ActionManager* ActionManager::instance() /*! ... */ -QList ActionManager::defaultGroups() const +QList ActionManagerPrivate::defaultGroups() const { return m_defaultGroups; } @@ -198,7 +198,7 @@ QList ActionManager::defaultGroups() const /*! ... */ -QList ActionManager::commands() const +QList ActionManagerPrivate::commands() const { return m_idCmdMap.values(); } @@ -206,7 +206,7 @@ QList ActionManager::commands() const /*! ... */ -QList ActionManager::containers() const +QList ActionManagerPrivate::containers() const { return m_idContainerMap.values(); } @@ -214,7 +214,7 @@ QList ActionManager::containers() const /*! ... */ -void ActionManager::registerGlobalGroup(int groupId, int containerId) +void ActionManagerPrivate::registerGlobalGroup(int groupId, int containerId) { if (m_globalgroups.contains(groupId)) { qWarning() << "registerGlobalGroup: Global group " @@ -228,7 +228,7 @@ void ActionManager::registerGlobalGroup(int groupId, int containerId) /*! ... */ -bool ActionManager::hasContext(int context) const +bool ActionManagerPrivate::hasContext(int context) const { return m_context.contains(context); } @@ -236,7 +236,7 @@ bool ActionManager::hasContext(int context) const /*! ... */ -void ActionManager::setContext(const QList &context) +void ActionManagerPrivate::setContext(const QList &context) { // here are possibilities for speed optimization if necessary: // let commands (de-)register themselves for contexts @@ -254,7 +254,7 @@ void ActionManager::setContext(const QList &context) /*! \internal */ -bool ActionManager::hasContext(QList context) const +bool ActionManagerPrivate::hasContext(QList context) const { for (int i=0; i context) const /*! ... */ -IActionContainer *ActionManager::createMenu(const QString &id) +IActionContainer *ActionManagerPrivate::createMenu(const QString &id) { const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); @@ -287,7 +287,7 @@ IActionContainer *ActionManager::createMenu(const QString &id) /*! ... */ -IActionContainer *ActionManager::createMenuBar(const QString &id) +IActionContainer *ActionManagerPrivate::createMenuBar(const QString &id) { const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); @@ -308,7 +308,7 @@ IActionContainer *ActionManager::createMenuBar(const QString &id) /*! ... */ -ICommand *ActionManager::registerAction(QAction *action, const QString &id, const QList &context) +ICommand *ActionManagerPrivate::registerAction(QAction *action, const QString &id, const QList &context) { OverrideableAction *a = 0; ICommand *c = registerOverridableAction(action, id, false); @@ -321,7 +321,7 @@ ICommand *ActionManager::registerAction(QAction *action, const QString &id, cons /*! ... */ -ICommand *ActionManager::registerAction(QAction *action, const QString &id) +ICommand *ActionManagerPrivate::registerAction(QAction *action, const QString &id) { return registerOverridableAction(action, id, true); } @@ -329,7 +329,7 @@ ICommand *ActionManager::registerAction(QAction *action, const QString &id) /*! \internal */ -ICommand *ActionManager::registerOverridableAction(QAction *action, const QString &id, bool checkUnique) +ICommand *ActionManagerPrivate::registerOverridableAction(QAction *action, const QString &id, bool checkUnique) { OverrideableAction *a = 0; const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); @@ -378,7 +378,7 @@ ICommand *ActionManager::registerOverridableAction(QAction *action, const QStrin /*! ... */ -ICommand *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const QList &context) +ICommand *ActionManagerPrivate::registerShortcut(QShortcut *shortcut, const QString &id, const QList &context) { Shortcut *sc = 0; int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); @@ -416,9 +416,9 @@ ICommand *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id } /*! - \fn void ActionManager::addAction(Core::ICommand *action, const QString &globalGroup) + \fn void ActionManagerPrivate::addAction(Core::ICommand *action, const QString &globalGroup) */ -void ActionManager::addAction(ICommand *action, const QString &globalGroup) +void ActionManagerPrivate::addAction(ICommand *action, const QString &globalGroup) { const int gid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(globalGroup); if (!m_globalgroups.contains(gid)) { @@ -435,10 +435,10 @@ void ActionManager::addAction(ICommand *action, const QString &globalGroup) } /*! - \fn void ActionManager::addMenu(Core::IActionContainer *menu, const QString &globalGroup) + \fn void ActionManagerPrivate::addMenu(Core::IActionContainer *menu, const QString &globalGroup) */ -void ActionManager::addMenu(IActionContainer *menu, const QString &globalGroup) +void ActionManagerPrivate::addMenu(IActionContainer *menu, const QString &globalGroup) { const int gid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(globalGroup); if (!m_globalgroups.contains(gid)) { @@ -457,13 +457,13 @@ void ActionManager::addMenu(IActionContainer *menu, const QString &globalGroup) /*! ... */ -ICommand *ActionManager::command(const QString &id) const +ICommand *ActionManagerPrivate::command(const QString &id) const { const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); const IdCmdMap::const_iterator it = m_idCmdMap.constFind(uid); if (it == m_idCmdMap.constEnd()) { if (warnAboutFindFailures) - qWarning() << "ActionManager::command(): failed to find :" << id << '/' << uid; + qWarning() << "ActionManagerPrivate::command(): failed to find :" << id << '/' << uid; return 0; } return it.value(); @@ -472,13 +472,13 @@ ICommand *ActionManager::command(const QString &id) const /*! ... */ -IActionContainer *ActionManager::actionContainer(const QString &id) const +IActionContainer *ActionManagerPrivate::actionContainer(const QString &id) const { const int uid = m_mainWnd->uniqueIDManager()->uniqueIdentifier(id); const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); if ( it == m_idContainerMap.constEnd()) { if (warnAboutFindFailures) - qWarning() << "ActionManager::actionContainer(): failed to find :" << id << '/' << uid; + qWarning() << "ActionManagerPrivate::actionContainer(): failed to find :" << id << '/' << uid; return 0; } return it.value(); @@ -487,12 +487,12 @@ IActionContainer *ActionManager::actionContainer(const QString &id) const /*! ... */ -ICommand *ActionManager::command(int uid) const +ICommand *ActionManagerPrivate::command(int uid) const { const IdCmdMap::const_iterator it = m_idCmdMap.constFind(uid); if (it == m_idCmdMap.constEnd()) { if (warnAboutFindFailures) - qWarning() << "ActionManager::command(): failed to find :" << m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(uid) << '/' << uid; + qWarning() << "ActionManagerPrivate::command(): failed to find :" << m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(uid) << '/' << uid; return 0; } return it.value(); @@ -501,12 +501,12 @@ ICommand *ActionManager::command(int uid) const /*! ... */ -IActionContainer *ActionManager::actionContainer(int uid) const +IActionContainer *ActionManagerPrivate::actionContainer(int uid) const { const IdContainerMap::const_iterator it = m_idContainerMap.constFind(uid); if (it == m_idContainerMap.constEnd()) { if (warnAboutFindFailures) - qWarning() << "ActionManager::actionContainer(): failed to find :" << m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(uid) << uid; + qWarning() << "ActionManagerPrivate::actionContainer(): failed to find :" << m_mainWnd->uniqueIDManager()->stringForUniqueIdentifier(uid) << uid; return 0; } return it.value(); @@ -519,7 +519,7 @@ static const char *sequenceKey = "Keysequence"; /*! \internal */ -void ActionManager::initialize() +void ActionManagerPrivate::initialize() { QSettings *settings = m_mainWnd->settings(); const int shortcuts = settings->beginReadArray(QLatin1String(settingsGroup)); @@ -539,7 +539,7 @@ void ActionManager::initialize() /*! ... */ -void ActionManager::saveSettings(QSettings *settings) +void ActionManagerPrivate::saveSettings(QSettings *settings) { settings->beginWriteArray(QLatin1String(settingsGroup)); int count = 0; diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h similarity index 90% rename from src/plugins/coreplugin/actionmanager/actionmanager.h rename to src/plugins/coreplugin/actionmanager/actionmanager_p.h index dd5e2f61e92..9d3e49de097 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -31,8 +31,8 @@ ** ***************************************************************************/ -#ifndef ACTIONMANAGER_H -#define ACTIONMANAGER_H +#ifndef ACTIONMANAGERPRIVATE_H +#define ACTIONMANAGERPRIVATE_H #include @@ -60,16 +60,16 @@ class ActionContainer; class MainWindow; class Command; -class ActionManager : public Core::ActionManagerInterface +class ActionManagerPrivate : public Core::ActionManagerInterface { Q_OBJECT public: - ActionManager(MainWindow *mainWnd, UniqueIDManager *uidmgr); - ~ActionManager(); + ActionManagerPrivate(MainWindow *mainWnd, UniqueIDManager *uidmgr); + ~ActionManagerPrivate(); void setContext(const QList &context); - static ActionManager* instance(); + static ActionManagerPrivate* instance(); void saveSettings(QSettings *settings); QList defaultGroups() const; @@ -107,7 +107,7 @@ private: ICommand *registerOverridableAction(QAction *action, const QString &id, bool checkUnique); - static ActionManager* m_instance; + static ActionManagerPrivate* m_instance; QList m_defaultGroups; typedef QHash IdCmdMap; @@ -127,4 +127,4 @@ private: } // namespace Internal } // namespace Core -#endif // ACTIONMANAGER_H +#endif // ACTIONMANAGERPRIVATE_H diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h index 848114c8b96..1c854a94fa6 100644 --- a/src/plugins/coreplugin/actionmanager/command.h +++ b/src/plugins/coreplugin/actionmanager/command.h @@ -35,7 +35,7 @@ #define COMMAND_H #include "icommand.h" -#include "actionmanager.h" +#include "actionmanager_p.h" #include #include diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 2dc558a5422..e78e049d01b 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -101,7 +101,7 @@ HEADERS += mainwindow.h \ actionmanager/iactioncontainer.h \ actionmanager/actionmanagerinterface.h \ actionmanager/icommand.h \ - actionmanager/actionmanager.h \ + actionmanager/actionmanager_p.h \ actionmanager/command.h \ actionmanager/actioncontainer.h \ actionmanager/commandsfile.h \ diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index ec1c3975c4d..5d6ae28147f 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -33,7 +33,7 @@ #include "shortcutsettings.h" #include "ui_shortcutsettings.h" -#include "actionmanager.h" +#include "actionmanager_p.h" #include "command.h" #include "coreconstants.h" #include "coreimpl.h" @@ -281,7 +281,7 @@ void ShortcutSettings::initialize() { QMap categories; - m_am = ActionManager::instance(); + m_am = ActionManagerPrivate::instance(); UniqueIDManager *uidm = CoreImpl::instance()->uniqueIDManager(); diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 99d4a8fbbc4..f79bf89386b 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -51,7 +51,7 @@ class ICommand; namespace Internal { -class ActionManager; +class ActionManagerPrivate; class Command; class MainWindow; @@ -101,7 +101,7 @@ private: int translateModifiers(Qt::KeyboardModifiers state, const QString &text); QList m_scitems; - ActionManager *m_am; + ActionManagerPrivate *m_am; int m_key[4], m_keyNum; Ui_ShortcutSettings *m_page; }; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index b368ad8cf4d..f5d5a24c1c4 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -33,7 +33,7 @@ #include "mainwindow.h" #include "actioncontainer.h" -#include "actionmanager.h" +#include "actionmanager_p.h" #include "basemode.h" #include "coreimpl.h" #include "coreconstants.h" @@ -115,7 +115,7 @@ MainWindow::MainWindow() : m_additionalContexts(m_globalContext), m_settings(new QSettings(QSettings::IniFormat, QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtCreator"), this)), m_printer(0), - m_actionManager(new ActionManager(this, m_uniqueIDManager)), + m_actionManager(new ActionManagerPrivate(this, m_uniqueIDManager)), m_editorManager(0), m_fileManager(new FileManager(m_coreImpl, this)), m_progressManager(new ProgressManager()), @@ -362,9 +362,9 @@ QStatusBar *MainWindow::statusBar() const void MainWindow::registerDefaultContainers() { - ActionManager *am = m_actionManager; + ActionManagerPrivate *am = m_actionManager; - IActionContainer *menubar = m_actionManager->createMenuBar(Constants::MENU_BAR); + IActionContainer *menubar = am->createMenuBar(Constants::MENU_BAR); #ifndef Q_WS_MAC // System menu bar on Mac setMenuBar(menubar->menuBar()); @@ -427,7 +427,7 @@ void MainWindow::registerDefaultContainers() ac->appendGroup(Constants::G_HELP_ABOUT, true); } -static ICommand *createSeparator(ActionManager *am, QObject *parent, +static ICommand *createSeparator(ActionManagerPrivate *am, QObject *parent, const QString &name, const QList &context) { @@ -439,7 +439,7 @@ static ICommand *createSeparator(ActionManager *am, QObject *parent, void MainWindow::registerDefaultActions() { - ActionManager *am = m_actionManager; + ActionManagerPrivate *am = m_actionManager; IActionContainer *mfile = am->actionContainer(Constants::M_FILE); IActionContainer *medit = am->actionContainer(Constants::M_EDIT); IActionContainer *mtools = am->actionContainer(Constants::M_TOOLS); diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 913e6728e71..c7462fd8094 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -74,7 +74,7 @@ class ViewManagerInterface; namespace Internal { -class ActionManager; +class ActionManagerPrivate; class CoreImpl; class FancyTabWidget; class GeneralSettings; @@ -176,7 +176,7 @@ private: QList m_additionalContexts; QSettings *m_settings; mutable QPrinter *m_printer; - ActionManager *m_actionManager; + ActionManagerPrivate *m_actionManager; EditorManager *m_editorManager; FileManager *m_fileManager; MessageManager *m_messageManager; diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index b702bb98bd3..91fa1d31ba0 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -34,7 +34,7 @@ #include "taskwindow.h" #include -#include +#include #include #include #include diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index d38502815de..734f1488fdb 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include using namespace QuickOpen; From c9889120c330f8ba6dd6963e31941eab113ff235 Mon Sep 17 00:00:00 2001 From: con Date: Tue, 13 Jan 2009 13:39:31 +0100 Subject: [PATCH 5/7] Fixes: - Rename ActionManagerInterface --> ActionManager Details: - To make it conform to naming convention. --- src/plugins/bineditor/bineditorplugin.cpp | 2 +- src/plugins/bookmarks/bookmarksplugin.cpp | 4 +-- .../actionmanager/actionmanager.cpp | 28 +++++++++---------- ...tionmanagerinterface.h => actionmanager.h} | 12 ++++---- .../actionmanager/actionmanager_p.h | 4 +-- src/plugins/coreplugin/coreimpl.cpp | 2 +- src/plugins/coreplugin/coreimpl.h | 2 +- src/plugins/coreplugin/coreplugin.pro | 2 +- .../editormanager/editormanager.cpp | 4 +-- .../editormanager/editorsplitter.cpp | 4 +-- src/plugins/coreplugin/icore.cpp | 2 +- src/plugins/coreplugin/icore.h | 4 +-- src/plugins/coreplugin/mainwindow.cpp | 2 +- src/plugins/coreplugin/mainwindow.h | 4 +-- src/plugins/coreplugin/modemanager.cpp | 4 +-- src/plugins/coreplugin/navigationwidget.cpp | 4 +-- src/plugins/coreplugin/outputpane.cpp | 4 +-- src/plugins/coreplugin/sidebar.cpp | 2 +- src/plugins/coreplugin/viewmanager.cpp | 2 +- src/plugins/cpaster/cpasterplugin.cpp | 4 +-- src/plugins/cppeditor/cppeditor.cpp | 2 +- src/plugins/cppeditor/cppplugin.cpp | 4 +-- src/plugins/cpptools/cpptoolsplugin.cpp | 4 +-- src/plugins/debugger/debuggerplugin.cpp | 4 +-- src/plugins/debugger/mode.cpp | 4 +-- src/plugins/designer/formeditorw.cpp | 14 +++++----- src/plugins/designer/formeditorw.h | 4 +-- src/plugins/fakevim/fakevimplugin.cpp | 4 +-- src/plugins/find/findplugin.cpp | 6 ++-- src/plugins/find/findtoolbar.cpp | 4 +-- src/plugins/git/gitclient.cpp | 2 +- src/plugins/git/gitplugin.cpp | 6 ++-- src/plugins/helloworld/helloworldplugin.cpp | 2 +- src/plugins/help/helpplugin.cpp | 6 ++-- src/plugins/perforce/perforceplugin.cpp | 4 +-- src/plugins/projectexplorer/outputwindow.cpp | 4 +-- .../projectexplorer/projectexplorer.cpp | 4 +-- src/plugins/projectexplorer/taskwindow.cpp | 2 +- .../qhelpproject/qhelpprojectmanager.cpp | 2 +- .../qt4projectmanagerplugin.cpp | 6 ++-- src/plugins/qtscripteditor/qtscripteditor.cpp | 2 +- .../qtscripteditoractionhandler.cpp | 2 +- .../qtscripteditor/qtscripteditorplugin.cpp | 4 +-- src/plugins/quickopen/quickopenplugin.cpp | 2 +- .../resourceeditor/resourceeditorplugin.cpp | 4 +-- src/plugins/snippets/snippetsplugin.cpp | 2 +- src/plugins/subversion/subversionplugin.cpp | 4 +-- .../texteditor/texteditoractionhandler.cpp | 4 +-- src/plugins/texteditor/texteditorplugin.cpp | 4 +-- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 +- 50 files changed, 107 insertions(+), 107 deletions(-) rename src/plugins/coreplugin/actionmanager/{actionmanagerinterface.h => actionmanager.h} (89%) diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index ff07d5e876e..b5d4c1d9043 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index 63fbb1c2eef..c926f868f88 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -68,7 +68,7 @@ void BookmarksPlugin::extensionsInitialized() bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *) { m_core = ExtensionSystem::PluginManager::instance()->getObject(); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); QList context = QList() << m_core->uniqueIDManager()-> uniqueIdentifier(Constants::BOOKMARKS_CONTEXT); diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index f333152a6b7..889bb9eafe6 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -52,15 +52,15 @@ namespace { } /*! - \class Core::ActionManagerInterface + \class Core::ActionManager \mainclass \ingroup qwb - \inheaderfile actionmanagerinterface.h + \inheaderfile actionmanager.h \brief All actions should be registered in the ActionManager, since this enables the user to e.g. change their shortcuts at a central place. - The ActionManagerInterface is the central bookkeeper of actions and their shortcuts and layout. + The ActionManager is the central bookkeeper of actions and their shortcuts and layout. You get the only implementation of this class from the core interface (ICore::actionManager()). The main reasons for the need of this class is to provide a central place where the user @@ -94,52 +94,52 @@ namespace { */ /*! - \fn virtual IActionContainer *ActionManagerInterface::createMenu(const QString &id) = 0 + \fn virtual IActionContainer *ActionManager::createMenu(const QString &id) = 0 ... */ /*! - \fn virtual IActionContainer *ActionManagerInterface::createMenuBar(const QString &id) = 0 + \fn virtual IActionContainer *ActionManager::createMenuBar(const QString &id) = 0 ... */ /*! - \fn virtual ICommand *ActionManagerInterface::registerAction(QAction *action, const QString &id, const QList &context) = 0 + \fn virtual ICommand *ActionManager::registerAction(QAction *action, const QString &id, const QList &context) = 0 ... */ /*! - \fn virtual ICommand *ActionManagerInterface::registerShortcut(QShortcut *shortcut, const QString &id, const QList &context) = 0 + \fn virtual ICommand *ActionManager::registerShortcut(QShortcut *shortcut, const QString &id, const QList &context) = 0 ... */ /*! - \fn virtual ICommand *ActionManagerInterface::registerAction(QAction *action, const QString &id) = 0 + \fn virtual ICommand *ActionManager::registerAction(QAction *action, const QString &id) = 0 ... */ /*! - \fn virtual void ActionManagerInterface::addAction(ICommand *action, const QString &globalGroup) = 0 + \fn virtual void ActionManager::addAction(ICommand *action, const QString &globalGroup) = 0 ... */ /*! - \fn virtual void ActionManagerInterface::addMenu(IActionContainer *menu, const QString &globalGroup) = 0 + \fn virtual void ActionManager::addMenu(IActionContainer *menu, const QString &globalGroup) = 0 ... */ /*! - \fn virtual ICommand *ActionManagerInterface::command(const QString &id) const = 0 + \fn virtual ICommand *ActionManager::command(const QString &id) const = 0 ... */ /*! - \fn virtual IActionContainer *ActionManagerInterface::actionContainer(const QString &id) const = 0 + \fn virtual IActionContainer *ActionManager::actionContainer(const QString &id) const = 0 ... */ /*! - \fn virtual ActionManagerInterface::~ActionManagerInterface() + \fn virtual ActionManager::~ActionManager() ... */ @@ -160,7 +160,7 @@ ActionManagerPrivate* ActionManagerPrivate::m_instance = 0; ... */ ActionManagerPrivate::ActionManagerPrivate(MainWindow *mainWnd, UniqueIDManager *uidmgr) : - ActionManagerInterface(mainWnd), + ActionManager(mainWnd), m_mainWnd(mainWnd) { m_defaultGroups << uidmgr->uniqueIdentifier(Constants::G_DEFAULT_ONE); diff --git a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h b/src/plugins/coreplugin/actionmanager/actionmanager.h similarity index 89% rename from src/plugins/coreplugin/actionmanager/actionmanagerinterface.h rename to src/plugins/coreplugin/actionmanager/actionmanager.h index f77e9ca484c..d1c570ae4a6 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -31,8 +31,8 @@ ** ***************************************************************************/ -#ifndef ACTIONMANAGERINTERFACE_H -#define ACTIONMANAGERINTERFACE_H +#ifndef ACTIONMANAGER_H +#define ACTIONMANAGER_H #include "coreplugin/core_global.h" @@ -50,12 +50,12 @@ QT_END_NAMESPACE namespace Core { -class CORE_EXPORT ActionManagerInterface : public QObject +class CORE_EXPORT ActionManager : public QObject { Q_OBJECT public: - ActionManagerInterface(QObject *parent = 0) : QObject(parent) {} - virtual ~ActionManagerInterface() {} + ActionManager(QObject *parent = 0) : QObject(parent) {} + virtual ~ActionManager() {} virtual IActionContainer *createMenu(const QString &id) = 0; virtual IActionContainer *createMenuBar(const QString &id) = 0; @@ -74,4 +74,4 @@ public: } // namespace Core -#endif // ACTIONMANAGERINTERFACE_H +#endif // ACTIONMANAGER_H diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index 9d3e49de097..5ca979ed6de 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -34,7 +34,7 @@ #ifndef ACTIONMANAGERPRIVATE_H #define ACTIONMANAGERPRIVATE_H -#include +#include #include #include @@ -60,7 +60,7 @@ class ActionContainer; class MainWindow; class Command; -class ActionManagerPrivate : public Core::ActionManagerInterface +class ActionManagerPrivate : public Core::ActionManager { Q_OBJECT diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index cd96a9c24fc..0a3af052c4f 100644 --- a/src/plugins/coreplugin/coreimpl.cpp +++ b/src/plugins/coreplugin/coreimpl.cpp @@ -64,7 +64,7 @@ void CoreImpl::showOptionsDialog(const QString &group, const QString &page) m_mainwindow->showOptionsDialog(group, page); } -ActionManagerInterface *CoreImpl::actionManager() const +ActionManager *CoreImpl::actionManager() const { return m_mainwindow->actionManager(); } diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h index fc5375d3701..19cc94564dc 100644 --- a/src/plugins/coreplugin/coreimpl.h +++ b/src/plugins/coreplugin/coreimpl.h @@ -56,7 +56,7 @@ public: void showOptionsDialog(const QString &group = QString(), const QString &page = QString()); - ActionManagerInterface *actionManager() const; + ActionManager *actionManager() const; FileManager *fileManager() const ; UniqueIDManager *uniqueIDManager() const; MessageManager *messageManager() const; diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index e78e049d01b..452e71cb230 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -99,7 +99,7 @@ HEADERS += mainwindow.h \ editormanager/ieditor.h \ editormanager/ieditorfactory.h \ actionmanager/iactioncontainer.h \ - actionmanager/actionmanagerinterface.h \ + actionmanager/actionmanager.h \ actionmanager/icommand.h \ actionmanager/actionmanager_p.h \ actionmanager/command.h \ diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index 1eb3abb133d..923f90ce0c4 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -207,7 +207,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) : const QList editManagerContext = QList() << m_d->m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER); - ActionManagerInterface *am = m_d->m_core->actionManager(); + ActionManager *am = m_d->m_core->actionManager(); IActionContainer *mfile = am->actionContainer(Constants::M_FILE); //Revert to saved diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp index 370cae409fd..dbb9e0c20b8 100644 --- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp +++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include @@ -72,7 +72,7 @@ void EditorSplitter::registerActions() const QList editorManagerContext = QList() << m_core->uniqueIDManager()->uniqueIdentifier(Constants::C_EDITORMANAGER); - ActionManagerInterface *am = m_core->actionManager(); + ActionManager *am = m_core->actionManager(); IActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW); ICommand *cmd; diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 317ebbbc45a..b2f4011ba7a 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -51,7 +51,7 @@ */ /*! - \fn ActionManagerInterface *ICore::actionManager() const + \fn ActionManager *ICore::actionManager() const \brief Returns the application's action manager. The action manager is responsible for registration of menus and diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 53ff1e96f90..01b5b36b029 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -50,7 +50,7 @@ QT_END_NAMESPACE namespace Core { // forward declarations -class ActionManagerInterface; +class ActionManager; class IFile; class FileManager; class MessageManager; @@ -81,7 +81,7 @@ public: virtual void showOptionsDialog(const QString &group = QString(), const QString &page = QString()) = 0; - virtual ActionManagerInterface *actionManager() const = 0; + virtual ActionManager *actionManager() const = 0; virtual FileManager *fileManager() const = 0; virtual UniqueIDManager *uniqueIDManager() const = 0; virtual MessageManager *messageManager() const = 0; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index f5d5a24c1c4..b49628e9143 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -815,7 +815,7 @@ void MainWindow::openFileWith() } } -ActionManagerInterface *MainWindow::actionManager() const +ActionManager *MainWindow::actionManager() const { return m_actionManager; } diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index c7462fd8094..1256baaf79a 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -55,7 +55,7 @@ class PluginManager; namespace Core { -class ActionManagerInterface; +class ActionManager; class BaseMode; class BaseView; class EditorManager; @@ -105,7 +105,7 @@ public: //ICore inline ExtensionSystem::PluginManager *pluginManager() { return m_pluginManager; } - Core::ActionManagerInterface *actionManager() const; + Core::ActionManager *actionManager() const; Core::FileManager *fileManager() const; Core::UniqueIDManager *uniqueIDManager() const; Core::MessageManager *messageManager() const; diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 2e1713d05f9..f26efaf9789 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -39,7 +39,7 @@ #include -#include +#include #include #include #include @@ -140,7 +140,7 @@ void ModeManager::objectAdded(QObject *obj) m_modeStack->insertTab(index, mode->widget(), mode->icon(), mode->name()); // Register mode shortcut - ActionManagerInterface *am = m_mainWindow->actionManager(); + ActionManager *am = m_mainWindow->actionManager(); const QString shortcutId = QLatin1String("QtCreator.Mode.") + mode->uniqueModeName(); QShortcut *shortcut = new QShortcut(m_mainWindow); shortcut->setWhatsThis(tr("Switch to %1 mode").arg(mode->name())); diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 491c3943438..80d71f5b41b 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -316,7 +316,7 @@ void NavigationWidget::objectAdded(QObject * obj) return; Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject(); - Core::ActionManagerInterface *am = core->actionManager(); + Core::ActionManager *am = core->actionManager(); QList navicontext = QList() << core->uniqueIDManager()-> uniqueIdentifier(Core::Constants::C_NAVIGATION_PANE); diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index 6b5c3b146d1..1f0f7d983c4 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -37,7 +37,7 @@ #include "mainwindow.h" #include "modemanager.h" -#include +#include #include #include #include @@ -210,7 +210,7 @@ void OutputPane::init(ICore *core, ExtensionSystem::PluginManager *pm) m_pluginManager = pm; m_core = core; - ActionManagerInterface *am = m_core->actionManager(); + ActionManager *am = m_core->actionManager(); IActionContainer *mwindow = am->actionContainer(Constants::M_WINDOW); // Window->Output Panes diff --git a/src/plugins/coreplugin/sidebar.cpp b/src/plugins/coreplugin/sidebar.cpp index 17887450d9b..8d4299a9f9e 100644 --- a/src/plugins/coreplugin/sidebar.cpp +++ b/src/plugins/coreplugin/sidebar.cpp @@ -35,7 +35,7 @@ #include "imode.h" #include "modemanager.h" -#include "actionmanager/actionmanagerinterface.h" +#include "actionmanager/actionmanager.h" #include #include diff --git a/src/plugins/coreplugin/viewmanager.cpp b/src/plugins/coreplugin/viewmanager.cpp index 5032d45b4d4..400f3d55183 100644 --- a/src/plugins/coreplugin/viewmanager.cpp +++ b/src/plugins/coreplugin/viewmanager.cpp @@ -38,7 +38,7 @@ #include "uniqueidmanager.h" #include "iview.h" -#include +#include #include #include #include diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 548c48be7d3..ba56ad542af 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -95,7 +95,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *error_m addObject(m_settingsPage); //register actions - Core::ActionManagerInterface *actionManager = gCoreInstance->actionManager(); + Core::ActionManager *actionManager = gCoreInstance->actionManager(); Core::IActionContainer *toolsContainer = actionManager->actionContainer(Core::Constants::M_TOOLS); diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 1eb298aa378..a5de130a7af 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/plugins/cppeditor/cppplugin.cpp b/src/plugins/cppeditor/cppplugin.cpp index c30bc97f29d..ccb1a87ec12 100644 --- a/src/plugins/cppeditor/cppplugin.cpp +++ b/src/plugins/cppeditor/cppplugin.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -194,7 +194,7 @@ bool CppPlugin::initialize(const QStringList & /*arguments*/, QString *errorMess QList context; context << m_core->uniqueIDManager()->uniqueIdentifier(CppEditor::Constants::C_CPPEDITOR); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); am->createMenu(CppEditor::Constants::M_CONTEXT); Core::ICommand *cmd; diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 866a3d05c94..a8b4366bab8 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include @@ -81,7 +81,7 @@ CppToolsPlugin::~CppToolsPlugin() bool CppToolsPlugin::initialize(const QStringList & /*arguments*/, QString *) { m_core = ExtensionSystem::PluginManager::instance()->getObject(); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); // Objects m_modelManager = new CppModelManager(this); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d65f9ac9acd..401bafad7f1 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -40,7 +40,7 @@ #include "gdbengine.h" #include "mode.h" -#include +#include #include #include #include @@ -227,7 +227,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes ICore *core = m_pm->getObject(); QTC_ASSERT(core, return false); - Core::ActionManagerInterface *actionManager = core->actionManager(); + Core::ActionManager *actionManager = core->actionManager(); QTC_ASSERT(actionManager, return false); Core::UniqueIDManager *uidm = core->uniqueIDManager(); diff --git a/src/plugins/debugger/mode.cpp b/src/plugins/debugger/mode.cpp index 44994148583..fdb94ea1875 100644 --- a/src/plugins/debugger/mode.cpp +++ b/src/plugins/debugger/mode.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -151,7 +151,7 @@ QToolBar *DebugMode::createToolBar() IDebuggerManagerAccessForDebugMode *managerAccess = m_manager->debugModeInterface(); - Core::ActionManagerInterface *am = + Core::ActionManager *am = ExtensionSystem::PluginManager::instance() ->getObject()->actionManager(); QToolBar *debugToolBar = new QToolBar; diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 59e64c4cf9a..d7f176d6e1c 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include @@ -99,7 +99,7 @@ static inline QIcon designerIcon(const QString &iconName) // Create an action to activate a designer tool static inline QAction *createEditModeAction(QActionGroup *ag, const QList &context, - Core::ActionManagerInterface *am, + Core::ActionManager *am, Core::IActionContainer *medit, const QString &actionName, const QString &name, @@ -124,7 +124,7 @@ static inline QAction *createEditModeAction(QActionGroup *ag, // Create a menu separato static inline QAction * createSeparator(QObject *parent, - Core::ActionManagerInterface *am, + Core::ActionManager *am, const QList &context, Core::IActionContainer *container, const QString &name = QString(), @@ -139,7 +139,7 @@ static inline QAction * createSeparator(QObject *parent, // Create a tool action static inline void addToolAction(QAction *a, - Core::ActionManagerInterface *am, + Core::ActionManager *am, const QList &context, const QString &name, Core::IActionContainer *c1, @@ -305,7 +305,7 @@ void FormEditorW::deleteInstance() void FormEditorW::setupActions() { - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); Core::ICommand *command; //menus @@ -443,7 +443,7 @@ QToolBar *FormEditorW::createEditorToolBar() const { QToolBar *rc = new QToolBar; rc->addSeparator(); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); const QStringList::const_iterator cend = m_toolActionIds.constEnd(); for (QStringList::const_iterator it = m_toolActionIds.constBegin(); it != cend; ++it) { Core::ICommand *cmd = am->command(*it); @@ -457,7 +457,7 @@ QToolBar *FormEditorW::createEditorToolBar() const return rc; } -Core::IActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManagerInterface *am, +Core::IActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManager *am, QActionGroup *actionGroup) { const QString menuId = QLatin1String(M_FORMEDITOR_PREVIEW); diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index 0e36ff3b9ff..164c985a3f1 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -65,7 +65,7 @@ namespace qdesigner_internal { QT_END_NAMESPACE namespace Core { -class ActionManagerInterface; +class ActionManager; class IActionContainer; class ICore; class IEditor; @@ -142,7 +142,7 @@ private: typedef QList EditorList; void setupActions(); - Core::IActionContainer *createPreviewStyleMenu(Core::ActionManagerInterface *am, + Core::IActionContainer *createPreviewStyleMenu(Core::ActionManager *am, QActionGroup *actionGroup); void critical(const QString &errorMessage); diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 3ee96e97c7b..a05c6a4ed3a 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -36,7 +36,7 @@ #include "fakevimconstants.h" #include "fakevimhandler.h" -#include +#include #include #include #include @@ -116,7 +116,7 @@ bool FakeVimPlugin::initialize(const QStringList &arguments, QString *error_mess m_core = ExtensionSystem::PluginManager::instance()->getObject(); QTC_ASSERT(m_core, return false); - Core::ActionManagerInterface *actionManager = m_core->actionManager(); + Core::ActionManager *actionManager = m_core->actionManager(); QTC_ASSERT(actionManager, return false); QList globalcontext; diff --git a/src/plugins/find/findplugin.cpp b/src/plugins/find/findplugin.cpp index 0bf2ec4fdb9..a61e22df489 100644 --- a/src/plugins/find/findplugin.cpp +++ b/src/plugins/find/findplugin.cpp @@ -38,7 +38,7 @@ #include "findtoolwindow.h" #include "searchresultwindow.h" -#include +#include #include #include #include @@ -126,7 +126,7 @@ void FindPlugin::openFindFilter() void FindPlugin::setupMenu() { - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); Core::IActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT); Core::IActionContainer *mfind = am->createMenu(Constants::M_FIND); medit->addMenu(mfind, Core::Constants::G_EDIT_FIND); @@ -149,7 +149,7 @@ void FindPlugin::setupMenu() void FindPlugin::setupFilterMenuItems() { - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); QList findInterfaces = ExtensionSystem::PluginManager::instance()->getObjects(); Core::ICommand *cmd; diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index edfb5015baa..359b4a4e9c7 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -138,7 +138,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen QList globalcontext; globalcontext << Core::Constants::C_GLOBAL_ID; - Core::ActionManagerInterface *am = ExtensionSystem::PluginManager::instance()->getObject()->actionManager(); + Core::ActionManager *am = ExtensionSystem::PluginManager::instance()->getObject()->actionManager(); Core::IActionContainer *mfind = am->actionContainer(Constants::M_FIND); Core::ICommand *cmd; diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 5ae6d0b7dac..456c61eb352 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -38,7 +38,7 @@ #include "gitplugin.h" #include "gitsubmiteditor.h" -#include +#include #include #include #include diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 63e1f19d18d..15924976012 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include @@ -213,7 +213,7 @@ static const VCSBase::VCSBaseSubmitEditorParameters submitParameters = { Git::Constants::C_GITSUBMITEDITOR }; -static Core::ICommand *createSeparator(Core::ActionManagerInterface *am, +static Core::ICommand *createSeparator(Core::ActionManager *am, const QList &context, const QString &id, QObject *parent) @@ -263,7 +263,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *error_message) addObject(m_versionControl); //register actions - Core::ActionManagerInterface *actionManager = m_core->actionManager(); + Core::ActionManager *actionManager = m_core->actionManager(); Core::IActionContainer *toolsContainer = actionManager->actionContainer(Core::Constants::M_TOOLS); diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index a8eb79c0519..e4e93bd82bc 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -91,7 +91,7 @@ bool HelloWorldPlugin::initialize(const QStringList &arguments, QString *error_m connect(helloWorldAction, SIGNAL(triggered()), SLOT(sayHelloWorld())); // Register the action with the action manager - Core::ActionManagerInterface *actionManager = core->actionManager(); + Core::ActionManager *actionManager = core->actionManager(); Core::ICommand *command = actionManager->registerAction( helloWorldAction, "HelloWorld.HelloWorldAction", context); diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 3ed3263478d..a5854d27e54 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -165,7 +165,7 @@ bool HelpPlugin::initialize(const QStringList & /*arguments*/, QString *) connect(m_bookmarkWidget, SIGNAL(addBookmark()), this, SLOT(addBookmark())); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); Core::ICommand *cmd; // Add Home, Previous and Next actions (used in the toolbar) @@ -607,7 +607,7 @@ void HelpPlugin::activateSearch() QToolBar *HelpPlugin::createToolBar() { QToolBar *toolWidget = new QToolBar; - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); toolWidget->addAction(am->command(QLatin1String("Help.Home"))->action()); toolWidget->addAction(am->command(QLatin1String("Help.Previous"))->action()); toolWidget->addAction(am->command(QLatin1String("Help.Next"))->action()); diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index c616a019aa6..ac916b4831a 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -43,7 +43,7 @@ #include "perforceversioncontrol.h" #include "settingspage.h" -#include +#include #include #include #include @@ -225,7 +225,7 @@ bool PerforcePlugin::initialize(const QStringList & /*arguments*/, QString *erro //register actions - Core::ActionManagerInterface *am = m_coreInstance->actionManager(); + Core::ActionManager *am = m_coreInstance->actionManager(); Core::IActionContainer *mtools = am->actionContainer(Core::Constants::M_TOOLS); diff --git a/src/plugins/projectexplorer/outputwindow.cpp b/src/plugins/projectexplorer/outputwindow.cpp index 597a6daba6e..af396124b50 100644 --- a/src/plugins/projectexplorer/outputwindow.cpp +++ b/src/plugins/projectexplorer/outputwindow.cpp @@ -35,7 +35,7 @@ #include "projectexplorerconstants.h" #include "runconfiguration.h" -#include +#include #include #include #include @@ -78,7 +78,7 @@ OutputPane::OutputPane(Core::ICore *core) this, SLOT(reRunRunControl())); // Stop - Core::ActionManagerInterface *am = core->actionManager(); + Core::ActionManager *am = core->actionManager(); QList globalcontext; globalcontext.append(Core::Constants::C_GLOBAL_ID); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 3548023d641..081b57b941a 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include @@ -155,7 +155,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList & /*arguments*/, QStrin { ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); m_core = pm->getObject(); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); addObject(this); diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 91fa1d31ba0..b702bb98bd3 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -34,7 +34,7 @@ #include "taskwindow.h" #include -#include +#include #include #include #include diff --git a/src/plugins/qhelpproject/qhelpprojectmanager.cpp b/src/plugins/qhelpproject/qhelpprojectmanager.cpp index 88870e675e0..34d7cf7674c 100644 --- a/src/plugins/qhelpproject/qhelpprojectmanager.cpp +++ b/src/plugins/qhelpproject/qhelpprojectmanager.cpp @@ -52,7 +52,7 @@ bool QHelpProjectManager::init(ExtensionSystem::PluginManager *pm, QString *erro { m_pm = pm; m_core = m_pm->interface(); - QWorkbench::ActionManagerInterface *am = m_core->actionManager(); + QWorkbench::ActionManager *am = m_core->actionManager(); m_projectContext = m_core->uniqueIDManager()-> uniqueIdentifier(QLatin1String("QHelpProject")); diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index debb89dae44..9e246cf1095 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include @@ -82,7 +82,7 @@ Qt4ProjectManagerPlugin::~Qt4ProjectManagerPlugin() delete m_qt4ProjectManager; } /* -static Core::ICommand *createSeparator(Core::ActionManagerInterface *am, +static Core::ICommand *createSeparator(Core::ActionManager *am, QObject *parent, const QString &name, const QList &context) @@ -100,7 +100,7 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList & /*arguments*/, QStr m_projectExplorer = m_core->pluginManager()->getObject(); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); //create and register objects m_qt4ProjectManager = new Qt4Manager(this, m_core); diff --git a/src/plugins/qtscripteditor/qtscripteditor.cpp b/src/plugins/qtscripteditor/qtscripteditor.cpp index 39ba4f0d942..d471583a801 100644 --- a/src/plugins/qtscripteditor/qtscripteditor.cpp +++ b/src/plugins/qtscripteditor/qtscripteditor.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp index f51d8a8329e..0ed9105c181 100644 --- a/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp +++ b/src/plugins/qtscripteditor/qtscripteditoractionhandler.cpp @@ -35,7 +35,7 @@ #include "qtscripteditorconstants.h" #include "qtscripteditor.h" -#include +#include #include #include diff --git a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp index d03692b9d6d..2c14ccd713c 100644 --- a/src/plugins/qtscripteditor/qtscripteditorplugin.cpp +++ b/src/plugins/qtscripteditor/qtscripteditorplugin.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -131,7 +131,7 @@ void QtScriptEditorPlugin::initializeEditor(QtScriptEditor::Internal::ScriptEdit void QtScriptEditorPlugin::registerActions(Core::ICore *core) { - Core::ActionManagerInterface *am = core->actionManager(); + Core::ActionManager *am = core->actionManager(); Core::IActionContainer *mcontext = am->createMenu(QtScriptEditor::Constants::M_CONTEXT); QAction *action = new QAction(this); diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index 734f1488fdb..d38502815de 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include using namespace QuickOpen; diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 2d8c3370bf0..382297d1a8e 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include @@ -88,7 +88,7 @@ bool ResourceEditorPlugin::initialize(const QStringList & /*arguments*/, QString error_message->clear(); // Register undo and redo - Core::ActionManagerInterface * const actionManager = m_core->actionManager(); + Core::ActionManager * const actionManager = m_core->actionManager(); int const pluginId = m_core->uniqueIDManager()->uniqueIdentifier( Constants::C_RESOURCEEDITOR); QList const idList = QList() << pluginId; diff --git a/src/plugins/snippets/snippetsplugin.cpp b/src/plugins/snippets/snippetsplugin.cpp index d46e773b732..f0ad500ce6e 100644 --- a/src/plugins/snippets/snippetsplugin.cpp +++ b/src/plugins/snippets/snippetsplugin.cpp @@ -72,7 +72,7 @@ void SnippetsPlugin::extensionsInitialized() bool SnippetsPlugin::initialize(const QStringList & /*arguments*/, QString *) { m_core = ExtensionSystem::PluginManager::instance()->getObject(); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); QList context; context << m_core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR); diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 9a5067f4dc2..3f1f1ec0c5f 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include @@ -289,7 +289,7 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments*/, QString *er addObject(m_subversionOutputWindow); //register actions - Core::ActionManagerInterface *ami = m_coreInstance->actionManager(); + Core::ActionManager *ami = m_coreInstance->actionManager(); Core::IActionContainer *toolsContainer = ami->actionContainer(M_TOOLS); Core::IActionContainer *subversionMenu = diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 12475d221b1..b9209d33abe 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -111,7 +111,7 @@ void TextEditorActionHandler::createActions() m_gotoAction = registerNewAction(QLatin1String(Core::Constants::GOTO), this, SLOT(gotoAction())); m_printAction = registerNewAction(QLatin1String(Core::Constants::PRINT), this, SLOT(printAction())); - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); Core::IActionContainer *medit = am->actionContainer(Core::Constants::M_EDIT); Core::IActionContainer *advancedMenu = am->actionContainer(Core::Constants::M_EDIT_ADVANCED); diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 01a6ccdf95f..948a6f6ca45 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -120,7 +120,7 @@ bool TextEditorPlugin::initialize(const QStringList & /*arguments*/, QString *er int contextId = m_core->uniqueIDManager()->uniqueIdentifier(TextEditor::Constants::C_TEXTEDITOR); QList context = QList() << contextId; - Core::ActionManagerInterface *am = m_core->actionManager(); + Core::ActionManager *am = m_core->actionManager(); // Add shortcut for invoking automatic completion QShortcut *completionShortcut = new QShortcut(m_core->mainWindow()); diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index a26f811e8dd..2bb179a531e 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include From 5f3faaff19bf49c7f0ecad41adca613a2ae0770f Mon Sep 17 00:00:00 2001 From: con Date: Tue, 13 Jan 2009 13:54:45 +0100 Subject: [PATCH 6/7] Fixes: - ProgressManager --> ProgressManagerPrivate --- src/plugins/coreplugin/coreplugin.pro | 2 +- src/plugins/coreplugin/mainwindow.cpp | 4 ++-- src/plugins/coreplugin/mainwindow.h | 4 ++-- .../progressmanager/progressmanager.cpp | 18 +++++++++--------- .../{progressmanager.h => progressmanager_p.h} | 12 ++++++------ src/plugins/cpptools/cppmodelmanager.cpp | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) rename src/plugins/coreplugin/progressmanager/{progressmanager.h => progressmanager_p.h} (89%) diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 452e71cb230..1b8cd43a037 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -112,7 +112,7 @@ HEADERS += mainwindow.h \ dialogs/openwithdialog.h \ dialogs/iwizard.h \ dialogs/ioptionspage.h \ - progressmanager/progressmanager.h \ + progressmanager/progressmanager_p.h \ progressmanager/progressview.h \ progressmanager/progresspie.h \ progressmanager/futureprogress.h \ diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index b49628e9143..9ca69278e7e 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -49,7 +49,7 @@ #include "newdialog.h" #include "outputpane.h" #include "plugindialog.h" -#include "progressmanager.h" +#include "progressmanager_p.h" #include "progressview.h" #include "shortcutsettings.h" #include "vcsmanager.h" @@ -118,7 +118,7 @@ MainWindow::MainWindow() : m_actionManager(new ActionManagerPrivate(this, m_uniqueIDManager)), m_editorManager(0), m_fileManager(new FileManager(m_coreImpl, this)), - m_progressManager(new ProgressManager()), + m_progressManager(new ProgressManagerPrivate()), m_scriptManager(new ScriptManager(this, m_coreImpl)), m_variableManager(new VariableManager(this)), m_vcsManager(new VCSManager()), diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 1256baaf79a..0c8db3d94b6 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -80,7 +80,7 @@ class FancyTabWidget; class GeneralSettings; class NavigationWidget; class OutputPane; -class ProgressManager; +class ProgressManagerPrivate; class ShortcutSettings; class ViewManager; class VersionDialog; @@ -180,7 +180,7 @@ private: EditorManager *m_editorManager; FileManager *m_fileManager; MessageManager *m_messageManager; - ProgressManager *m_progressManager; + ProgressManagerPrivate *m_progressManager; ScriptManagerInterface *m_scriptManager; VariableManager *m_variableManager; VCSManager *m_vcsManager; diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index ab1b0370323..ce7ac13999e 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -31,7 +31,7 @@ ** ***************************************************************************/ -#include "progressmanager.h" +#include "progressmanager_p.h" #include "progressview.h" #include "coreimpl.h" #include "baseview.h" @@ -44,7 +44,7 @@ using namespace Core; using namespace Core::Internal; -ProgressManager::ProgressManager(QObject *parent) +ProgressManagerPrivate::ProgressManagerPrivate(QObject *parent) : ProgressManagerInterface(parent) { m_progressView = new ProgressView; @@ -52,15 +52,15 @@ ProgressManager::ProgressManager(QObject *parent) connect(core, SIGNAL(coreAboutToClose()), this, SLOT(cancelAllRunningTasks())); } -ProgressManager::~ProgressManager() +ProgressManagerPrivate::~ProgressManagerPrivate() { } -void ProgressManager::init() +void ProgressManagerPrivate::init() { } -void ProgressManager::cancelTasks(const QString &type) +void ProgressManagerPrivate::cancelTasks(const QString &type) { QMap *, QString>::iterator task = m_runningTasks.begin(); while (task != m_runningTasks.end()) { @@ -75,7 +75,7 @@ void ProgressManager::cancelTasks(const QString &type) } } -void ProgressManager::cancelAllRunningTasks() +void ProgressManagerPrivate::cancelAllRunningTasks() { QMap *, QString>::const_iterator task = m_runningTasks.constBegin(); while (task != m_runningTasks.constEnd()) { @@ -87,7 +87,7 @@ void ProgressManager::cancelAllRunningTasks() m_runningTasks.clear(); } -FutureProgress *ProgressManager::addTask(const QFuture &future, const QString &title, const QString &type, PersistentType persistency) +FutureProgress *ProgressManagerPrivate::addTask(const QFuture &future, const QString &title, const QString &type, PersistentType persistency) { QFutureWatcher *watcher = new QFutureWatcher(); m_runningTasks.insert(watcher, type); @@ -96,12 +96,12 @@ FutureProgress *ProgressManager::addTask(const QFuture &future, const QStr return m_progressView->addTask(future, title, type, persistency); } -QWidget *ProgressManager::progressView() +QWidget *ProgressManagerPrivate::progressView() { return m_progressView; } -void ProgressManager::taskFinished() +void ProgressManagerPrivate::taskFinished() { QObject *taskObject = sender(); QTC_ASSERT(taskObject, return); diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h similarity index 89% rename from src/plugins/coreplugin/progressmanager/progressmanager.h rename to src/plugins/coreplugin/progressmanager/progressmanager_p.h index 7df78fe26b8..751e6c7553c 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h @@ -31,8 +31,8 @@ ** ***************************************************************************/ -#ifndef PROGRESSMANAGER_H -#define PROGRESSMANAGER_H +#ifndef PROGRESSMANAGER_P_H +#define PROGRESSMANAGER_P_H #include "progressmanagerinterface.h" @@ -45,12 +45,12 @@ namespace Internal { class ProgressView; -class ProgressManager : public Core::ProgressManagerInterface +class ProgressManagerPrivate : public Core::ProgressManagerInterface { Q_OBJECT public: - ProgressManager(QObject *parent = 0); - ~ProgressManager(); + ProgressManagerPrivate(QObject *parent = 0); + ~ProgressManagerPrivate(); void init(); FutureProgress *addTask(const QFuture &future, const QString &title, const QString &type, PersistentType persistency); @@ -71,4 +71,4 @@ private: } // namespace Internal } // namespace Core -#endif // PROGRESSMANAGER_H +#endif // PROGRESSMANAGER_P_H diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index df611294751..f129d507b67 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include From 281c462d244d967667365732ef95d15af2e4d710 Mon Sep 17 00:00:00 2001 From: con Date: Tue, 13 Jan 2009 14:16:36 +0100 Subject: [PATCH 7/7] Fixes: - ProgressManagerInterface --> ProgressManager Details: - Conform to conventions. --- src/plugins/coreplugin/coreimpl.cpp | 2 +- src/plugins/coreplugin/coreimpl.h | 2 +- src/plugins/coreplugin/coreplugin.pro | 2 +- src/plugins/coreplugin/icore.cpp | 2 +- src/plugins/coreplugin/icore.h | 4 ++-- src/plugins/coreplugin/mainwindow.cpp | 2 +- src/plugins/coreplugin/mainwindow.h | 4 ++-- .../coreplugin/progressmanager/progressmanager.cpp | 2 +- ...{progressmanagerinterface.h => progressmanager.h} | 12 ++++++------ .../coreplugin/progressmanager/progressmanager_p.h | 4 ++-- .../coreplugin/progressmanager/progressview.cpp | 4 ++-- .../coreplugin/progressmanager/progressview.h | 4 ++-- src/plugins/cpptools/cppmodelmanager.cpp | 4 ++-- src/plugins/git/gitclient.cpp | 4 ++-- src/plugins/projectexplorer/buildmanager.cpp | 4 ++-- src/plugins/projectexplorer/session.cpp | 4 ++-- src/plugins/quickopen/quickopenplugin.cpp | 4 ++-- src/plugins/texteditor/basefilefind.cpp | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) rename src/plugins/coreplugin/progressmanager/{progressmanagerinterface.h => progressmanager.h} (86%) diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp index 0a3af052c4f..8d500dcd8e7 100644 --- a/src/plugins/coreplugin/coreimpl.cpp +++ b/src/plugins/coreplugin/coreimpl.cpp @@ -94,7 +94,7 @@ EditorManager *CoreImpl::editorManager() const return m_mainwindow->editorManager(); } -ProgressManagerInterface *CoreImpl::progressManager() const +ProgressManager *CoreImpl::progressManager() const { return m_mainwindow->progressManager(); } diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h index 19cc94564dc..01c29e4656d 100644 --- a/src/plugins/coreplugin/coreimpl.h +++ b/src/plugins/coreplugin/coreimpl.h @@ -62,7 +62,7 @@ public: MessageManager *messageManager() const; ExtensionSystem::PluginManager *pluginManager() const; EditorManager *editorManager() const; - ProgressManagerInterface *progressManager() const; + ProgressManager *progressManager() const; ScriptManagerInterface *scriptManager() const; VariableManager *variableManager() const; VCSManager *vcsManager() const; diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 1b8cd43a037..d87ab4bb036 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -116,7 +116,7 @@ HEADERS += mainwindow.h \ progressmanager/progressview.h \ progressmanager/progresspie.h \ progressmanager/futureprogress.h \ - progressmanager/progressmanagerinterface.h \ + progressmanager/progressmanager.h \ icontext.h \ icore.h \ ifile.h \ diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index b2f4011ba7a..5cdc3733dd0 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -98,7 +98,7 @@ */ /*! - \fn ProgressManagerInterface *ICore::progressManager() const + \fn ProgressManager *ICore::progressManager() const \brief Returns the application's progress manager. Use the progress manager to register a concurrent task to diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 01b5b36b029..4a138b4baae 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -57,7 +57,7 @@ class MessageManager; class IEditor; class UniqueIDManager; class EditorManager; -class ProgressManagerInterface; +class ProgressManager; class ScriptManagerInterface; class VariableManager; class IContext; @@ -87,7 +87,7 @@ public: virtual MessageManager *messageManager() const = 0; virtual ExtensionSystem::PluginManager *pluginManager() const = 0; virtual EditorManager *editorManager() const = 0; - virtual ProgressManagerInterface *progressManager() const = 0; + virtual ProgressManager *progressManager() const = 0; virtual ScriptManagerInterface *scriptManager() const = 0; virtual VariableManager *variableManager() const = 0; virtual VCSManager *vcsManager() const = 0; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 9ca69278e7e..ce151719494 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -845,7 +845,7 @@ EditorManager *MainWindow::editorManager() const return m_editorManager; } -ProgressManagerInterface *MainWindow::progressManager() const +ProgressManager *MainWindow::progressManager() const { return m_progressManager; } diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 0c8db3d94b6..2fe06cd76f7 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -64,7 +64,7 @@ class IContext; class MessageManager; class MimeDatabase; class ModeManager; -class ProgressManagerInterface; +class ProgressManager; class RightPaneWidget; class ScriptManagerInterface; class UniqueIDManager; @@ -111,7 +111,7 @@ public: Core::MessageManager *messageManager() const; ExtensionSystem::PluginManager *pluginManager() const; Core::EditorManager *editorManager() const; - Core::ProgressManagerInterface *progressManager() const; + Core::ProgressManager *progressManager() const; Core::ScriptManagerInterface *scriptManager() const; Core::VariableManager *variableManager() const; Core::ModeManager *modeManager() const; diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp index ce7ac13999e..18a32ad8158 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp +++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp @@ -45,7 +45,7 @@ using namespace Core; using namespace Core::Internal; ProgressManagerPrivate::ProgressManagerPrivate(QObject *parent) - : ProgressManagerInterface(parent) + : ProgressManager(parent) { m_progressView = new ProgressView; ICore *core = CoreImpl::instance(); diff --git a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h b/src/plugins/coreplugin/progressmanager/progressmanager.h similarity index 86% rename from src/plugins/coreplugin/progressmanager/progressmanagerinterface.h rename to src/plugins/coreplugin/progressmanager/progressmanager.h index 8bb55cc96dd..c3f940186fc 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -31,8 +31,8 @@ ** ***************************************************************************/ -#ifndef PROGRESSMANAGERINTERFACE_H -#define PROGRESSMANAGERINTERFACE_H +#ifndef PROGRESSMANAGER_H +#define PROGRESSMANAGER_H #include #include @@ -43,14 +43,14 @@ namespace Core { -class CORE_EXPORT ProgressManagerInterface : public QObject +class CORE_EXPORT ProgressManager : public QObject { Q_OBJECT public: enum PersistentType { CloseOnSuccess, KeepOnFinish }; - ProgressManagerInterface(QObject *parent = 0) : QObject(parent) {} - virtual ~ProgressManagerInterface() {} + ProgressManager(QObject *parent = 0) : QObject(parent) {} + virtual ~ProgressManager() {} virtual FutureProgress *addTask(const QFuture &future, const QString &title, const QString &type, PersistentType persistency = KeepOnFinish) = 0; @@ -60,4 +60,4 @@ public slots: } // namespace Core -#endif //PROGRESSMANAGERINTERFACE_H +#endif //PROGRESSMANAGER_H diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_p.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h index 751e6c7553c..d173babda2a 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_p.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h @@ -34,7 +34,7 @@ #ifndef PROGRESSMANAGER_P_H #define PROGRESSMANAGER_P_H -#include "progressmanagerinterface.h" +#include "progressmanager.h" #include #include @@ -45,7 +45,7 @@ namespace Internal { class ProgressView; -class ProgressManagerPrivate : public Core::ProgressManagerInterface +class ProgressManagerPrivate : public Core::ProgressManager { Q_OBJECT public: diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp index a4e686d494b..db17eb81449 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.cpp +++ b/src/plugins/coreplugin/progressmanager/progressview.cpp @@ -62,7 +62,7 @@ ProgressView::~ProgressView() FutureProgress *ProgressView::addTask(const QFuture &future, const QString &title, const QString &type, - ProgressManagerInterface::PersistentType persistency) + ProgressManager::PersistentType persistency) { removeOldTasks(type); if (m_taskList.size() == 3) @@ -73,7 +73,7 @@ FutureProgress *ProgressView::addTask(const QFuture &future, m_layout->insertWidget(0, progress); m_taskList.append(progress); m_type.insert(progress, type); - m_keep.insert(progress, (persistency == ProgressManagerInterface::KeepOnFinish)); + m_keep.insert(progress, (persistency == ProgressManager::KeepOnFinish)); connect(progress, SIGNAL(finished()), this, SLOT(slotFinished())); return progress; } diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h index 455362009cf..4aa04d6da1c 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.h +++ b/src/plugins/coreplugin/progressmanager/progressview.h @@ -34,7 +34,7 @@ #ifndef PROGRESSVIEW_H #define PROGRESSVIEW_H -#include "progressmanagerinterface.h" +#include "progressmanager.h" #include #include @@ -59,7 +59,7 @@ public: FutureProgress *addTask(const QFuture &future, const QString &title, const QString &type, - ProgressManagerInterface::PersistentType persistency); + ProgressManager::PersistentType persistency); private slots: void slotFinished(); diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index f129d507b67..f190fcaa7c4 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include @@ -606,7 +606,7 @@ QFuture CppModelManager::refreshSourceFiles(const QStringList &sourceFiles if (sourceFiles.count() > 1) { m_core->progressManager()->addTask(result, tr("Indexing"), CppTools::Constants::TASK_INDEX, - Core::ProgressManagerInterface::CloseOnSuccess); + Core::ProgressManager::CloseOnSuccess); } return result; } diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 456c61eb352..0886d1336a6 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include @@ -999,7 +999,7 @@ void GitCommand::execute(const QStringList &arguments, Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject(); core->progressManager()->addTask(task, taskName , QLatin1String("Git.action") - , Core::ProgressManagerInterface::CloseOnSuccess); + , Core::ProgressManager::CloseOnSuccess); } void GitCommand::run(const QStringList &arguments, diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 72eb1766f11..5338865f504 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -40,7 +40,7 @@ #include "projectexplorer.h" #include "taskwindow.h" -#include +#include #include #include #include @@ -178,7 +178,7 @@ void BuildManager::startBuildQueue() { if (!m_running) { // Progress Reporting - Core::ProgressManagerInterface *progressManager = + Core::ProgressManager *progressManager = ExtensionSystem::PluginManager::instance()->getObject()->progressManager(); m_progressFutureInterface = new QFutureInterface; m_progressWatcher.setFuture(m_progressFutureInterface->future()); diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index c8fdaf50c98..42f967c762e 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include @@ -161,7 +161,7 @@ bool SessionFile::load(const QString &fileName) m_core->progressManager()->addTask(future.future(), tr("Session"), QLatin1String("ProjectExplorer.SessionFile.Load"), - Core::ProgressManagerInterface::CloseOnSuccess); + Core::ProgressManager::CloseOnSuccess); const QStringList &keys = reader.restoreValue(QLatin1String("valueKeys")).toStringList(); foreach (const QString &key, keys) { diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index d38502815de..6eedeee68f5 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include @@ -246,7 +246,7 @@ void QuickOpenPlugin::refresh(QList filters) filters = m_filter; QFuture task = QtConcurrent::run(&IQuickOpenFilter::refresh, filters); Core::FutureProgress *progress = ExtensionSystem::PluginManager::instance()->getObject() - ->progressManager()->addTask(task, tr("Indexing"), Constants::TASK_INDEX, Core::ProgressManagerInterface::CloseOnSuccess); + ->progressManager()->addTask(task, tr("Indexing"), Constants::TASK_INDEX, Core::ProgressManager::CloseOnSuccess); connect(progress, SIGNAL(finished()), this, SLOT(saveSettings())); } diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 60072084c7b..01effb036da 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -34,7 +34,7 @@ #include "basefilefind.h" #include -#include +#include #include #include #include