AutoTest: Shuffle namespaces for clearer separation

Change-Id: I6ac440c6d72c3d0dbcd75907f8a6ae756f3cf5ee
Reviewed-by: hjk <[email protected]>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h
index 18aac51d6bf..5b3a06e9e80 100644
--- a/src/plugins/autotest/testtreemodel.h
+++ b/src/plugins/autotest/testtreemodel.h
@@ -37,10 +37,10 @@
 
 namespace Autotest {
 namespace Internal {
-
 class TestCodeParser;
-class TestParseResult;
+} // namespace Internal
 
+class TestParseResult;
 using TestParseResultPtr = QSharedPointer<TestParseResult>;
 
 class AUTOTESTSHARED_EXPORT TestTreeModel : public Utils::TreeModel<>
@@ -53,7 +53,7 @@ public:
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
 
-    TestCodeParser *parser() const { return m_parser; }
+    Internal::TestCodeParser *parser() const { return m_parser; }
     bool hasTests() const;
     QList<TestConfiguration *> getAllTestCases() const;
     QList<TestConfiguration *> getSelectedTests() const;
@@ -103,10 +103,12 @@ private:
     void syncFrameworks(const QList<Core::Id> &sortedIds);
     QList<TestTreeItem *> testItemsByName(TestTreeItem *root, const QString &testName);
 
-    TestCodeParser *m_parser;
+    Internal::TestCodeParser *m_parser = nullptr;
     QTimer m_syncFrameworksTimer;
 };
 
+namespace Internal {
+
 class TestTreeSortFilterModel : public QSortFilterProxyModel
 {
     Q_OBJECT
@@ -119,7 +121,7 @@ public:
     };
 
     explicit TestTreeSortFilterModel(TestTreeModel *sourceModel, QObject *parent = nullptr);
-    void setSortMode(TestTreeItem::SortMode sortMode);
+    void setSortMode(Autotest::TestTreeItem::SortMode sortMode);
     void setFilterMode(FilterMode filterMode);
     void toggleFilter(FilterMode filterMode);
     static FilterMode toFilterMode(int f);
@@ -129,7 +131,7 @@ protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
 private:
-    TestTreeItem::SortMode m_sortMode = TestTreeItem::Alphabetically;
+    Autotest::TestTreeItem::SortMode m_sortMode = Autotest::TestTreeItem::Alphabetically;
     FilterMode m_filterMode = Basic;
 
 };