Clang: Coding style

Change-Id: Ib7dc759e8db7cf37fbcd7f75d28b29bf95593d6c Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
author: hjk <hjk121@nokiamail.com> 2014-02-04 15:53:32 +0100
committer: hjk <hjk121@nokiamail.com> 2014-02-05 11:18:51 +0100
commit: b7ec5fb375b9a3605a80acb86349364f87cf43d5 (patch)
tree: 82b2bc1fd618aa8f09a03f3361378504fb5f8284
parent: 944d80dcdcfaf25fa5a00abf8d1b109e8ae026db (diff)
7 files changed, 39 insertions, 39 deletions
diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
index e652f5ffa66..637921a84e4 100644
--- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
+++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp
@@ -58,7 +58,7 @@ bool ClangCodeModelPlugin::initialize(const QStringList &arguments, QString *err
 
     ClangCodeModel::Internal::initializeClang();
 
-    PCHManager *pchManager = new PCHManager(this);
+    PchManager *pchManager = new PchManager(this);
     FastIndexer *fastIndexer = 0;
 
 #ifdef CLANG_INDEXING
diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index b00660915ce..179c5f03dd2 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -216,7 +216,7 @@ IAssistInterface *ClangCompletionAssistProvider::createAssistInterface(
         if (part.isNull())
             continue;
         options = ClangCodeModel::Utils::createClangOptions(part, fileName);
-        pchInfo = PCHManager::instance()->pchInfo(part);
+        pchInfo = PchManager::instance()->pchInfo(part);
         if (!pchInfo.isNull())
             options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName()));
         includePaths = part->includePaths;
diff --git a/src/plugins/clangcodemodel/clanghighlightingsupport.cpp b/src/plugins/clangcodemodel/clanghighlightingsupport.cpp
index ef127054aeb..032a5d6fca8 100644
--- a/src/plugins/clangcodemodel/clanghighlightingsupport.cpp
+++ b/src/plugins/clangcodemodel/clanghighlightingsupport.cpp
@@ -84,7 +84,7 @@ QFuture<TextEditor::HighlightingResult> ClangHighlightingSupport::highlightingFu
         if (part.isNull())
             continue;
         options = Utils::createClangOptions(part, fileName);
-        pchInfo = PCHManager::instance()->pchInfo(part);
+        pchInfo = PchManager::instance()->pchInfo(part);
         if (!pchInfo.isNull())
             options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName()));
         if (!options.isEmpty())
diff --git a/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp b/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
index d1def6e0def..612372f8115 100644
--- a/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
+++ b/src/plugins/clangcodemodel/clangprojectsettingspropertiespage.cpp
@@ -79,7 +79,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(Project *project)
 {
     m_ui.setupUi(this);
 
-    ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(project);
+    ClangProjectSettings *cps = PchManager::instance()->settingsForProject(project);
     Q_ASSERT(cps);
 
     QButtonGroup *pchGroup = new QButtonGroup(this);
@@ -109,7 +109,7 @@ ClangProjectSettingsWidget::ClangProjectSettingsWidget(Project *project)
 
 void ClangProjectSettingsWidget::pchUsageChanged(int id)
 {
-    ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(m_project);
+    ClangProjectSettings *cps = PchManager::instance()->settingsForProject(m_project);
     Q_ASSERT(cps);
     cps->setPchUsage(static_cast<ClangProjectSettings::PchUsage>(id));
 
@@ -133,7 +133,7 @@ void ClangProjectSettingsWidget::pchUsageChanged(int id)
 
 void ClangProjectSettingsWidget::customPchFileChanged()
 {
-    ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(m_project);
+    ClangProjectSettings *cps = PchManager::instance()->settingsForProject(m_project);
     Q_ASSERT(cps);
     if (cps->pchUsage() != ClangProjectSettings::PchUse_Custom)
         return;
@@ -146,7 +146,7 @@ void ClangProjectSettingsWidget::customPchFileChanged()
 
 void ClangProjectSettingsWidget::customPchButtonClicked()
 {
-    ClangProjectSettings *cps = PCHManager::instance()->settingsForProject(m_project);
+    ClangProjectSettings *cps = PchManager::instance()->settingsForProject(m_project);
     Q_ASSERT(cps);
 
     QFileDialog d(this);
diff --git a/src/plugins/clangcodemodel/indexer.cpp b/src/plugins/clangcodemodel/indexer.cpp
index 2666121bb19..efad786afc9 100644
--- a/src/plugins/clangcodemodel/indexer.cpp
+++ b/src/plugins/clangcodemodel/indexer.cpp
@@ -588,7 +588,7 @@ restart:
         CXIndexAction idxAction = clang_IndexAction_create(idx);
         const unsigned index_opts = CXIndexOpt_SuppressWarnings;
 
-        PCHManager *pchManager = PCHManager::instance();
+        PchManager *pchManager = PchManager::instance();
         PchInfo::Ptr pchInfo = pchManager->pchInfo(pPart);
 
         for (int i = 0, ei = m_todo.size(); i < ei; ++i) {
diff --git a/src/plugins/clangcodemodel/pchmanager.cpp b/src/plugins/clangcodemodel/pchmanager.cpp
index fd62dd076f4..dd81ebf94b6 100644
--- a/src/plugins/clangcodemodel/pchmanager.cpp
+++ b/src/plugins/clangcodemodel/pchmanager.cpp
@@ -42,9 +42,9 @@ using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
 using namespace CPlusPlus;
 
-PCHManager *PCHManager::m_instance = 0;
+PchManager *PchManager::m_instance = 0;
 
-PCHManager::PCHManager(QObject *parent)
+PchManager::PchManager(QObject *parent)
     : QObject(parent)
 {
     Q_ASSERT(!m_instance);
@@ -55,10 +55,10 @@ PCHManager::PCHManager(QObject *parent)
             msgMgr, SLOT(write(QString,Core::MessageManager::PrintToOutputPaneFlags)));
 
     connect(&m_pchGenerationWatcher, SIGNAL(finished()),
-            this, SLOT(updateActivePCHFiles()));
+            this, SLOT(updateActivePchFiles()));
 }
 
-PCHManager::~PCHManager()
+PchManager::~PchManager()
 {
     Q_ASSERT(m_instance);
     m_instance = 0;
@@ -66,19 +66,19 @@ PCHManager::~PCHManager()
     m_projectSettings.clear();
 }
 
-PCHManager *PCHManager::instance()
+PchManager *PchManager::instance()
 {
     return m_instance;
 }
 
-PchInfo::Ptr PCHManager::pchInfo(const ProjectPart::Ptr &projectPart) const
+PchInfo::Ptr PchManager::pchInfo(const ProjectPart::Ptr &projectPart) const
 {
     QMutexLocker locker(&m_mutex);
 
-    return m_activePCHFiles[projectPart];
+    return m_activePchFiles[projectPart];
 }
 
-ClangProjectSettings *PCHManager::settingsForProject(ProjectExplorer::Project *project)
+ClangProjectSettings *PchManager::settingsForProject(ProjectExplorer::Project *project)
 {
     QMutexLocker locker(&m_mutex);
 
@@ -93,14 +93,14 @@ ClangProjectSettings *PCHManager::settingsForProject(ProjectExplorer::Project *p
     return cps;
 }
 
-void PCHManager::setPCHInfo(const QList<ProjectPart::Ptr> &projectParts,
+void PchManager::setPCHInfo(const QList<ProjectPart::Ptr> &projectParts,
                             const PchInfo::Ptr &pchInfo,
                             const QPair<bool, QStringList> &msgs)
 {
     QMutexLocker locker(&m_mutex);
 
     foreach (ProjectPart::Ptr pPart, projectParts)
-        m_activePCHFiles[pPart] = pchInfo;
+        m_activePchFiles[pPart] = pchInfo;
 
     if (pchInfo) {
         if (msgs.first) {
@@ -116,7 +116,7 @@ void PCHManager::setPCHInfo(const QList<ProjectPart::Ptr> &projectParts,
     }
 }
 
-void PCHManager::clangProjectSettingsChanged()
+void PchManager::clangProjectSettingsChanged()
 {
     ClangProjectSettings *cps = qobject_cast<ClangProjectSettings *>(sender());
     if (!cps)
@@ -125,7 +125,7 @@ void PCHManager::clangProjectSettingsChanged()
     onProjectPartsUpdated(cps->project());
 }
 
-void PCHManager::onAboutToRemoveProject(ProjectExplorer::Project *project)
+void PchManager::onAboutToRemoveProject(ProjectExplorer::Project *project)
 {
     Q_UNUSED(project);
 
@@ -133,10 +133,10 @@ void PCHManager::onAboutToRemoveProject(ProjectExplorer::Project *project)
     // the order of signal delivery, it might already have wiped any information
     // about the project.
 
-    updateActivePCHFiles();
+    updateActivePchFiles();
 }
 
-void PCHManager::onProjectPartsUpdated(ProjectExplorer::Project *project)
+void PchManager::onProjectPartsUpdated(ProjectExplorer::Project *project)
 {
     ClangProjectSettings *cps = settingsForProject(project);
     Q_ASSERT(cps);
@@ -149,7 +149,7 @@ void PCHManager::onProjectPartsUpdated(ProjectExplorer::Project *project)
     emit pchInfoUpdated();
 }
 
-void PCHManager::updatePchInfo(ClangProjectSettings *cps,
+void PchManager::updatePchInfo(ClangProjectSettings *cps,
                                const QList<ProjectPart::Ptr> &projectParts)
 {
     if (m_pchGenerationWatcher.isRunning()) {
@@ -157,7 +157,7 @@ void PCHManager::updatePchInfo(ClangProjectSettings *cps,
         m_pchGenerationWatcher.waitForFinished();
     }
 
-    QFuture<void> future = QtConcurrent::run(&PCHManager::doPchInfoUpdate,
+    QFuture<void> future = QtConcurrent::run(&PchManager::doPchInfoUpdate,
                                              cps->pchUsage(),
                                              cps->customPchFile(),
                                              projectParts);
@@ -214,12 +214,12 @@ CppTools::ProjectFile::Kind getPrefixFileKind(bool hasObjectiveC, bool hasCPlusP
 
 }
 
-void PCHManager::doPchInfoUpdate(QFutureInterface<void> &future,
+void PchManager::doPchInfoUpdate(QFutureInterface<void> &future,
                                  ClangProjectSettings::PchUsage pchUsage,
                                  const QString customPchFile,
                                  const QList<ProjectPart::Ptr> projectParts)
 {
-    PCHManager *pchManager = PCHManager::instance();
+    PchManager *pchManager = PchManager::instance();
 
 //    qDebug() << "switching to" << pchUsage;
 
@@ -391,7 +391,7 @@ void PCHManager::doPchInfoUpdate(QFutureInterface<void> &future,
     future.setProgressValue(future.progressValue() + 1);
 }
 
-PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
+PchInfo::Ptr PchManager::findMatchingPCH(const QString &inputFileName,
                                          const QStringList &options,
                                          bool fuzzyMatching) const
 {
@@ -400,7 +400,7 @@ PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
     if (fuzzyMatching) {
         QStringList opts = options;
         opts.sort();
-        foreach (PchInfo::Ptr pchInfo, m_activePCHFiles.values()) {
+        foreach (PchInfo::Ptr pchInfo, m_activePchFiles.values()) {
             if (pchInfo->inputFileName() != inputFileName)
                 continue;
             QStringList pchOpts = pchInfo->options();
@@ -409,7 +409,7 @@ PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
                 return pchInfo;
         }
     } else {
-        foreach (PchInfo::Ptr pchInfo, m_activePCHFiles.values())
+        foreach (PchInfo::Ptr pchInfo, m_activePchFiles.values())
             if (pchInfo->inputFileName() == inputFileName
                     && pchInfo->options() == options)
                 return pchInfo;
@@ -418,7 +418,7 @@ PchInfo::Ptr PCHManager::findMatchingPCH(const QString &inputFileName,
     return PchInfo::Ptr();
 }
 
-void PCHManager::updateActivePCHFiles()
+void PchManager::updateActivePchFiles()
 {
     QMutexLocker locker(&m_mutex);
 
@@ -426,8 +426,8 @@ void PCHManager::updateActivePCHFiles()
     CppTools::CppModelManagerInterface *mmi = CppTools::CppModelManagerInterface::instance();
     foreach (const CppTools::CppModelManagerInterface::ProjectInfo &pi, mmi->projectInfos())
         activeParts.unite(QSet<ProjectPart::Ptr>::fromList(pi.projectParts()));
-    QList<ProjectPart::Ptr> partsWithPCHFiles = m_activePCHFiles.keys();
+    QList<ProjectPart::Ptr> partsWithPCHFiles = m_activePchFiles.keys();
     foreach (ProjectPart::Ptr pPart, partsWithPCHFiles)
         if (!activeParts.contains(pPart))
-            m_activePCHFiles.remove(pPart);
+            m_activePchFiles.remove(pPart);
 }
diff --git a/src/plugins/clangcodemodel/pchmanager.h b/src/plugins/clangcodemodel/pchmanager.h
index c638f7b8a98..2c79554dc0e 100644
--- a/src/plugins/clangcodemodel/pchmanager.h
+++ b/src/plugins/clangcodemodel/pchmanager.h
@@ -45,19 +45,19 @@
 namespace ClangCodeModel {
 namespace Internal {
 
-class PCHManager: public QObject
+class PchManager : public QObject
 {
     Q_OBJECT
 
     typedef CppTools::ProjectPart ProjectPart;
 
-    static PCHManager *m_instance;
+    static PchManager *m_instance;
 
 public:
-    PCHManager(QObject *parent = 0);
-    virtual ~PCHManager();
+    PchManager(QObject *parent = 0);
+    virtual ~PchManager();
 
-    static PCHManager *instance();
+    static PchManager *instance();
 
     PchInfo::Ptr pchInfo(const ProjectPart::Ptr &projectPart) const;
     ClangProjectSettings *settingsForProject(ProjectExplorer::Project *project);
@@ -72,7 +72,7 @@ public slots:
     void onProjectPartsUpdated(ProjectExplorer::Project *project);
 
 private slots:
-    void updateActivePCHFiles();
+    void updateActivePchFiles();
 
 private:
     void updatePchInfo(ClangProjectSettings *cps,
@@ -89,7 +89,7 @@ private:
 
 private:
     mutable QMutex m_mutex;
-    QHash<ProjectPart::Ptr, PchInfo::Ptr> m_activePCHFiles;
+    QHash<ProjectPart::Ptr, PchInfo::Ptr> m_activePchFiles;
     QHash<ProjectExplorer::Project *, ClangProjectSettings *> m_projectSettings;
     QFutureWatcher<void> m_pchGenerationWatcher;
 };
author	hjk <hjk121@nokiamail.com>	2014-02-04 15:53:32 +0100
committer	hjk <hjk121@nokiamail.com>	2014-02-05 11:18:51 +0100
commit	b7ec5fb375b9a3605a80acb86349364f87cf43d5 (patch)
tree	82b2bc1fd618aa8f09a03f3361378504fb5f8284
parent	944d80dcdcfaf25fa5a00abf8d1b109e8ae026db (diff)