diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index d38bc9d3de467614528db7585dd7b3937a3835da..e175a999c4be1d19b25bb2a7f69ad3561d75c80e 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -287,7 +287,7 @@ public: } private: - BazaarClient* m_client; + BazaarClient *m_client; const BazaarCommandParameters m_params; }; diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h index 6523e464b6ae12d67d0c1468aac6a80635404a5e..ea136336615a498aeafb2b30bafc5a1d33872b7f 100644 --- a/src/plugins/bazaar/bazaarclient.h +++ b/src/plugins/bazaar/bazaarclient.h @@ -45,6 +45,7 @@ class BazaarSettings; class BazaarClient : public VCSBase::VCSBaseClient { Q_OBJECT + public: BazaarClient(BazaarSettings *settings); @@ -71,6 +72,7 @@ protected: const QStringList &files, const QStringList &extraOptions); StatusItem parseStatusLine(const QString &line) const; + private: friend class CloneWizard; }; diff --git a/src/plugins/bazaar/bazaarcontrol.h b/src/plugins/bazaar/bazaarcontrol.h index f07580067e4e3be7d0f785830108a9c3c3295b38..7105f47fb3b0a99b612b43a5422c9b9dccae4b96 100644 --- a/src/plugins/bazaar/bazaarcontrol.h +++ b/src/plugins/bazaar/bazaarcontrol.h @@ -49,6 +49,7 @@ class BazaarClient; class BazaarControl: public Core::IVersionControl { Q_OBJECT + public: explicit BazaarControl(BazaarClient *bazaarClient); @@ -75,7 +76,7 @@ public slots: // To be connected to the VCSTask's success signal to emit the repository/ // files changed signals according to the variant's type: // String -> repository, StringList -> files - void changed(const QVariant&); + void changed(const QVariant &); void emitConfigurationChanged(); private: diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h index f8c943d921f64564dfcdf8e48db7ca6abe475205..92a61407ab2479374104e1b97f21736822830b7c 100644 --- a/src/plugins/bazaar/bazaareditor.h +++ b/src/plugins/bazaar/bazaareditor.h @@ -43,6 +43,7 @@ namespace Internal { class BazaarEditor : public VCSBase::VCSBaseEditorWidget { Q_OBJECT + public: explicit BazaarEditor(const VCSBase::VCSBaseEditorParameters *type, QWidget *parent); @@ -59,4 +60,5 @@ private: } // namespace Internal } // namespace Bazaar + #endif // BAZAAREDITOR_H diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index d1354c3550a2a9f2cfcc9cf7c524a6abc7b9c77a..d61b0d2a55aae30d44f9517046ac01850ea667b8 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -449,7 +449,7 @@ void BazaarPlugin::createRepositoryActions(const Core::Context &context) m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - QAction* createRepositoryAction = new QAction(tr("Create Repository..."), this); + QAction *createRepositoryAction = new QAction(tr("Create Repository..."), this); command = m_actionManager->registerAction(createRepositoryAction, Core::Id(Constants::CREATE_REPOSITORY), context); connect(createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository())); m_bazaarContainer->addAction(command); @@ -654,7 +654,7 @@ bool BazaarPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submit *iFile = parts.last(); } - const BazaarCommitWidget* commitWidget = commitEditor->commitWidget(); + const BazaarCommitWidget *commitWidget = commitEditor->commitWidget(); QStringList extraOptions; // Author if (!commitWidget->committer().isEmpty()) diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp index 1b2ab233b55d5a8786a92c3d994d06f6a0a2a1b8..a7dffd5de64f071cd7a51d1a84db9f6b7d2abefc 100644 --- a/src/plugins/bazaar/bazaarsettings.cpp +++ b/src/plugins/bazaar/bazaarsettings.cpp @@ -58,7 +58,7 @@ BazaarSettings::BazaarSettings() declareKey(logFormatKey, QLatin1String("long")); } -bool BazaarSettings::sameUserId(const BazaarSettings& other) const +bool BazaarSettings::sameUserId(const BazaarSettings &other) const { return stringValue(userNameKey) == other.stringValue(userNameKey) && stringValue(userEmailKey) == other.stringValue(userEmailKey); diff --git a/src/plugins/bazaar/bazaarsettings.h b/src/plugins/bazaar/bazaarsettings.h index 8ac01d13b47cb86173b5d241a380a38778d21d3c..024f3419537c87c5ccbe74ef84d504f2615aeedd 100644 --- a/src/plugins/bazaar/bazaarsettings.h +++ b/src/plugins/bazaar/bazaarsettings.h @@ -49,7 +49,7 @@ public: static const QLatin1String logFormatKey; BazaarSettings(); - bool sameUserId(const BazaarSettings& other) const; + bool sameUserId(const BazaarSettings &other) const; }; } // namespace Internal diff --git a/src/plugins/bazaar/cloneoptionspanel.h b/src/plugins/bazaar/cloneoptionspanel.h index 843a59c78c704b7d64b8805e5c550abc193c5b15..1f03ed3e83dd47a10b7e482ae358f6cfc7450a00 100644 --- a/src/plugins/bazaar/cloneoptionspanel.h +++ b/src/plugins/bazaar/cloneoptionspanel.h @@ -39,7 +39,7 @@ namespace Bazaar { namespace Internal { namespace Ui { - class CloneOptionsPanel; +class CloneOptionsPanel; } class CloneOptionsPanel : public QWidget @@ -58,6 +58,7 @@ public: bool isHardLinkOptionEnabled() const; bool isNoTreeOptionEnabled() const; QString revision() const; + private: Ui::CloneOptionsPanel *m_ui; }; diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp index fc900f8d6adcd4e0c7d2f1c4b7d6395af3858752..a551d94f92d7f724b47a8e5eb1e7a6cc2252213b 100644 --- a/src/plugins/bazaar/clonewizard.cpp +++ b/src/plugins/bazaar/clonewizard.cpp @@ -68,9 +68,9 @@ QString CloneWizard::displayName() const return tr("Bazaar Clone (Or Branch)"); } -QList<QWizardPage*> CloneWizard::createParameterPages(const QString &path) +QList<QWizardPage *> CloneWizard::createParameterPages(const QString &path) { - QList<QWizardPage*> wizardPageList; + QList<QWizardPage *> wizardPageList; const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl(); if (!vc->isConfigured()) wizardPageList.append(new VCSBase::VcsConfigurationPage(vc)); diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h index d9f7a3d4970b40878a954afdd7ac73113d001e0c..342b71058d4942e0fd764bb11bbe471431dbcbd0 100644 --- a/src/plugins/bazaar/clonewizard.h +++ b/src/plugins/bazaar/clonewizard.h @@ -43,6 +43,7 @@ namespace Internal { class CloneWizard : public VCSBase::BaseCheckoutWizard { Q_OBJECT + public: CloneWizard(QObject *parent = 0); diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp index 0cfc688e58ee604bb093b93de02b6b1312355a6c..7acc3dfd8825467e2927507da4d9879d5c528342 100644 --- a/src/plugins/bazaar/commiteditor.cpp +++ b/src/plugins/bazaar/commiteditor.cpp @@ -51,7 +51,7 @@ CommitEditor::CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *paramet const BazaarCommitWidget *CommitEditor::commitWidget() const { - CommitEditor* nonConstThis = const_cast<CommitEditor*>(this); + CommitEditor *nonConstThis = const_cast<CommitEditor *>(this); return static_cast<const BazaarCommitWidget *>(nonConstThis->widget()); } diff --git a/src/plugins/bazaar/commiteditor.h b/src/plugins/bazaar/commiteditor.h index 2d40d5518a532dfd83c1858f45b52372fcdf4300..d7185b2e489bcfa113da0b081c8db05324a1e692 100644 --- a/src/plugins/bazaar/commiteditor.h +++ b/src/plugins/bazaar/commiteditor.h @@ -49,6 +49,7 @@ class BazaarCommitWidget; class CommitEditor : public VCSBase::VCSBaseSubmitEditor { Q_OBJECT + public: explicit CommitEditor(const VCSBase::VCSBaseSubmitEditorParameters *parameters, QWidget *parent); diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h index 5265e3c148a8affc5a75b88b4cb6744cbf679bf4..1d0b1855609f85734335b8851038e7d73a4f90bf 100644 --- a/src/plugins/bazaar/pullorpushdialog.h +++ b/src/plugins/bazaar/pullorpushdialog.h @@ -45,6 +45,7 @@ class PullOrPushDialog; class PullOrPushDialog : public QDialog { Q_OBJECT + public: enum Mode { PullMode,