Clang: Clean up TranslationUnits

* Use shared pointer to simplify ownership, also for a follow-up change.
* Remove pointless else-if
* Rename some variables

Change-Id: I6a9c5760c3812e071e9199228502c87b6944926a
Reviewed-by: David Schulz <david.schulz@qt.io>

src/tools/clangbackend/ipcsource/clangtranslationunits.cpp

@@ -35,59 +35,59 @@
 #include <QLoggingCategory>
 #include <QUuid>
 
-#include <algorithm>
-
 Q_LOGGING_CATEGORY(tuLog, "qtc.clangbackend.translationunits");
 
 namespace ClangBackEnd {
 
+TranslationUnits::TranslationUnitData::TranslationUnitData(const Utf8String &id)
+    : id(id)
+{}
+
+TranslationUnits::TranslationUnitData::~TranslationUnitData()
+{
+    qCDebug(tuLog) << "Destroying TranslationUnit" << id;
+    clang_disposeTranslationUnit(cxTranslationUnit);
+    clang_disposeIndex(cxIndex);
+}
+
 TranslationUnits::TranslationUnits(const Utf8String &filePath)
     : m_filePath(filePath)
 {
 }
 
-TranslationUnits::~TranslationUnits()
-{
-    foreach (const TranslationUnitData &unit, m_tuDatas) {
-        clang_disposeTranslationUnit(unit.cxTranslationUnit);
-        clang_disposeIndex(unit.cxIndex);
-    }
-}
-
 TranslationUnit TranslationUnits::createAndAppend()
 {
     const Utf8String id = Utf8String::fromByteArray(QUuid::createUuid().toByteArray());
     qCDebug(tuLog) << "Creating TranslationUnit" << id << "for" << QFileInfo(m_filePath).fileName();
 
-    m_tuDatas.append(TranslationUnitData(id));
+    m_units.append(TranslationUnitDataPtr(new TranslationUnitData(id)));
-    TranslationUnitData &translationUnitData = m_tuDatas.last();
 
-    return toTranslationUnit(translationUnitData);
+    return toTranslationUnit(m_units.last());
 }
 
 TranslationUnit TranslationUnits::get(PreferredTranslationUnit type)
 {
-    if (m_tuDatas.isEmpty())
+    if (m_units.isEmpty())
         throw TranslationUnitDoesNotExist(m_filePath);
 
-    if (m_tuDatas.size() == 1)
+    if (m_units.size() == 1)
-        return toTranslationUnit(m_tuDatas.first());
+        return toTranslationUnit(m_units.first());
 
     if (areAllTranslationUnitsParsed())
         return getPreferredTranslationUnit(type);
-    else if (type == PreferredTranslationUnit::LastUninitialized)
-        return toTranslationUnit(m_tuDatas.last());
 
-    return toTranslationUnit(m_tuDatas.first());
+    if (type == PreferredTranslationUnit::LastUninitialized)
+        return toTranslationUnit(m_units.last());
+
+    return toTranslationUnit(m_units.first());
 }
 
 void TranslationUnits::updateParseTimePoint(const Utf8String &translationUnitId,
                                             TimePoint timePoint)
 {
-    TranslationUnitData &unit = findUnit(translationUnitId);
-
     QTC_CHECK(timePoint != TimePoint());
-    unit.parseTimePoint = timePoint;
+
+    findUnit(translationUnitId).parseTimePoint = timePoint;
 
     qCDebug(tuLog) << "Updated" << translationUnitId << "for" << QFileInfo(m_filePath).fileName()
         << "RecentlyParsed:" << get(PreferredTranslationUnit::RecentlyParsed).id()
@@ -101,50 +101,50 @@ TimePoint TranslationUnits::parseTimePoint(const Utf8String &translationUnitId)
 
 bool TranslationUnits::areAllTranslationUnitsParsed() const
 {
-    return Utils::allOf(m_tuDatas, [](const TranslationUnitData &unit) {
+    return Utils::allOf(m_units, [](const TranslationUnitDataPtr &unit) {
-        return unit.parseTimePoint != TimePoint();
+        return unit->parseTimePoint != TimePoint();
     });
 }
 
 int TranslationUnits::size() const
 {
-    return m_tuDatas.size();
+    return m_units.size();
 }
 
 TranslationUnit TranslationUnits::getPreferredTranslationUnit(PreferredTranslationUnit type)
 {
-    using TuData = TranslationUnitData;
+    using TuDataPtr = TranslationUnitDataPtr;
 
-    const auto lessThan = [](const TuData &a, const TuData &b) {
+    const auto lessThan = [](const TuDataPtr &a, const TuDataPtr &b) {
-        return a.parseTimePoint < b.parseTimePoint;
+        return a->parseTimePoint < b->parseTimePoint;
     };
-    auto translationUnitData = type == PreferredTranslationUnit::RecentlyParsed
+    auto it = type == PreferredTranslationUnit::RecentlyParsed
-            ? std::max_element(m_tuDatas.begin(), m_tuDatas.end(), lessThan)
+            ? std::max_element(m_units.begin(), m_units.end(), lessThan)
-            : std::min_element(m_tuDatas.begin(), m_tuDatas.end(), lessThan);
+            : std::min_element(m_units.begin(), m_units.end(), lessThan);
 
-    if (translationUnitData == m_tuDatas.end())
+    if (it == m_units.end())
         throw TranslationUnitDoesNotExist(m_filePath);
 
-    return toTranslationUnit(*translationUnitData);
+    return toTranslationUnit(*it);
 }
 
 TranslationUnits::TranslationUnitData &TranslationUnits::findUnit(
         const Utf8String &translationUnitId)
 {
-    for (TranslationUnitData &unit : m_tuDatas) {
+    for (TranslationUnitDataPtr &unit : m_units) {
-        if (translationUnitId == unit.id)
+        if (translationUnitId == unit->id)
-            return unit;
+            return *unit;
     }
 
     throw TranslationUnitDoesNotExist(m_filePath);
 }
 
-TranslationUnit TranslationUnits::toTranslationUnit(TranslationUnits::TranslationUnitData &unit)
+TranslationUnit TranslationUnits::toTranslationUnit(const TranslationUnitDataPtr &unit)
 {
-    return TranslationUnit(unit.id,
+    return TranslationUnit(unit->id,
                            m_filePath,
-                           unit.cxIndex,
+                           unit->cxIndex,
-                           unit.cxTranslationUnit);
+                           unit->cxTranslationUnit);
 }
 
 } // namespace ClangBackEnd

src/tools/clangbackend/ipcsource/clangtranslationunits.h

@@ -33,6 +33,7 @@
 #include <clang-c/Index.h>
 
 #include <QList>
+#include <QSharedPointer>
 
 namespace ClangBackEnd {
 
@@ -43,9 +44,8 @@ class TranslationUnits
 public:
     class TranslationUnitData {
     public:
-        TranslationUnitData(const Utf8String &id)
+        TranslationUnitData(const Utf8String &id);
-            : id(id)
+        ~TranslationUnitData();
-        {}
 
         Utf8String id;
 
@@ -54,10 +54,10 @@ public:
 
         TimePoint parseTimePoint;
     };
+    using TranslationUnitDataPtr = QSharedPointer<TranslationUnitData>;
 
 public:
     TranslationUnits(const Utf8String &filePath);
-    ~TranslationUnits();
 
     TranslationUnit createAndAppend();
     TranslationUnit get(PreferredTranslationUnit type = PreferredTranslationUnit::RecentlyParsed);
@@ -72,11 +72,11 @@ public: // for tests
 private:
     TranslationUnit getPreferredTranslationUnit(PreferredTranslationUnit type);
     TranslationUnitData &findUnit(const Utf8String &translationUnitId);
-    TranslationUnit toTranslationUnit(TranslationUnitData &unit);
+    TranslationUnit toTranslationUnit(const TranslationUnitDataPtr &unit);
 
 private:
     Utf8String m_filePath;
-    QList<TranslationUnitData> m_tuDatas;
+    QList<TranslationUnitDataPtr> m_units;
 };
 
 } // namespace ClangBackEnd