Change schema::DataType and schema::CollectionType to enum class.

2 files changed, 23 insertions, 22 deletions

diff --git a/searchlib/src/apps/tests/memoryindexstress_test.cpp b/searchlib/src/apps/tests/memoryindexstress_test.cpp
index fec55d35975..60e70566c9e 100644
--- a/searchlib/src/apps/tests/memoryindexstress_test.cpp
+++ b/searchlib/src/apps/tests/memoryindexstress_test.cpp
@@ -28,7 +28,6 @@
 LOG_SETUP("memoryindexstress_test");
 
 using document::AnnotationType;
-using document::DataType;
 using document::Document;
 using document::DocumentId;
 using document::DocumentType;
@@ -37,11 +36,12 @@ using document::FieldValue;
 using document::Span;
 using document::SpanList;
 using document::StringFieldValue;
+using search::ScheduleTaskCallback;
+using search::index::schema::DataType;
+using search::makeLambdaTask;
 using search::query::Node;
 using search::query::SimplePhrase;
 using search::query::SimpleStringTerm;
-using search::makeLambdaTask;
-using search::ScheduleTaskCallback;
 using namespace search::fef;
 using namespace search::index;
 using namespace search::memoryindex;
@@ -64,8 +64,8 @@ Schema
 makeSchema()
 {
     Schema schema;
-    schema.addIndexField(Schema::IndexField(title, schema::STRING));
-    schema.addIndexField(Schema::IndexField(body, schema::STRING));
+    schema.addIndexField(Schema::IndexField(title, DataType::STRING));
+    schema.addIndexField(Schema::IndexField(body, DataType::STRING));
     return schema;
 }
 
@@ -78,8 +78,8 @@ makeDocTypeRepoConfig(void)
                      doc_type_name,
                      document::config_builder::Struct(header_name),
                      document::config_builder::Struct(body_name).
-                     addField(title, DataType::T_STRING).
-                     addField(body, DataType::T_STRING));
+                     addField(title, document::DataType::T_STRING).
+                     addField(body, document::DataType::T_STRING));
     return builder.config();
 }
 
diff --git a/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp b/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp
index fa54ac8ca66..e7b70dcf237 100644
--- a/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp
+++ b/searchlib/src/apps/vespa-index-inspect/vespa-index-inspect.cpp
@@ -19,25 +19,26 @@
 #include <vespa/log/log.h>
 LOG_SETUP("vespa-index-inspect");
 
-using search::index::Schema;
-using search::index::SchemaUtil;
-using search::index::DictionaryFileRandRead;
-using search::index::PostingListFileRandRead;
-using search::index::PostingListOffsetAndCounts;
-using search::index::PostingListCounts;
-using search::index::PostingListHandle;
+using search::TuneFileSeqRead;
+using search::diskindex::DocIdMapping;
+using search::diskindex::FieldReader;
+using search::diskindex::PageDict4FileSeqRead;
 using search::diskindex::PageDict4RandRead;
+using search::diskindex::WordNumMapping;
 using search::diskindex::Zc4PosOccRandRead;
+using search::fef::FieldPositionsIterator;
 using search::fef::TermFieldMatchData;
 using search::fef::TermFieldMatchDataArray;
-using search::fef::FieldPositionsIterator;
-using search::queryeval::SearchIterator;
+using search::index::DictionaryFileRandRead;
 using search::index::DocIdAndFeatures;
-using search::diskindex::DocIdMapping;
-using search::diskindex::WordNumMapping;
-using search::diskindex::FieldReader;
-using search::diskindex::PageDict4FileSeqRead;
-using search::TuneFileSeqRead;
+using search::index::PostingListCounts;
+using search::index::PostingListFileRandRead;
+using search::index::PostingListHandle;
+using search::index::PostingListOffsetAndCounts;
+using search::index::Schema;
+using search::index::SchemaUtil;
+using search::index::schema::DataType;
+using search::queryeval::SearchIterator;
 using namespace search::index;
 
 namespace
@@ -411,7 +412,7 @@ ShowPostingListSubApp::readDocIdLimit(const Schema &schema)
     uint32_t numIndexFields = schema.getNumIndexFields();
     for (uint32_t fieldId = 0; fieldId < numIndexFields; ++fieldId) {
         const Schema::IndexField &field = schema.getIndexField(fieldId);
-        if (field.getDataType() == schema::STRING) {
+        if (field.getDataType() == DataType::STRING) {
             FieldReader fr;
             if (!fr.open(_indexDir + "/" + field.getName() + "/",
                          tuneFileRead))