Reduce code bloat by 'using'

1 files changed, 19 insertions, 16 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
index 9db7eef840d..5d5ddd62c25 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
@@ -12,18 +12,22 @@
 
 LOG_SETUP(".proton.matchengine.matchengine");
 
+using search::engine::SearchRequest;
+using search::engine::SearchReply;
+using search::engine::SearchClient;
+
+using namespace search::fef::indexproperties;
+
 namespace {
 
 class SearchTask : public vespalib::Executor::Task {
 private:
-    proton::MatchEngine                   &_engine;
-    search::engine::SearchRequest::Source  _request;
-    search::engine::SearchClient          &_client;
+    proton::MatchEngine   &_engine;
+    SearchRequest::Source  _request;
+    SearchClient          &_client;
 
 public:
-    SearchTask(proton::MatchEngine &engine,
-               search::engine::SearchRequest::Source request,
-               search::engine::SearchClient &client)
+    SearchTask(proton::MatchEngine &engine, SearchRequest::Source request, SearchClient &client)
         : _engine(engine),
           _request(std::move(request)),
           _client(client)
@@ -100,13 +104,12 @@ MatchEngine::removeSearchHandler(const DocTypeName &docTypeName)
     return _handlers.removeHandler(docTypeName);
 }
 
-search::engine::SearchReply::UP
-MatchEngine::search(search::engine::SearchRequest::Source request,
-                    search::engine::SearchClient &client)
+SearchReply::UP
+MatchEngine::search(SearchRequest::Source request, SearchClient &client)
 {
     // We continue to allow searches if the node is in Maintenance mode
     if (_closed || (!_nodeUp && !_nodeMaintenance.load(std::memory_order_relaxed))) {
-        auto ret = std::make_unique<search::engine::SearchReply>();
+        auto ret = std::make_unique<SearchReply>();
         ret->setDistributionKey(_distributionKey);
 
         // TODO: Notify closed.
@@ -120,19 +123,19 @@ MatchEngine::search(search::engine::SearchRequest::Source request,
     return performSearch(std::move(request));
 }
 
-std::unique_ptr<search::engine::SearchReply>
-MatchEngine::performSearch(search::engine::SearchRequest::Source req)
+std::unique_ptr<SearchReply>
+MatchEngine::performSearch(SearchRequest::Source req)
 {
     auto my_issues = std::make_unique<search::UniqueIssues>();
     auto capture_issues = vespalib::Issue::listen(*my_issues);
 
-    auto ret = std::make_unique<search::engine::SearchReply>();
+    auto ret = std::make_unique<SearchReply>();
 
-    const search::engine::SearchRequest * searchRequest = req.get();
+    const SearchRequest * searchRequest = req.get();
     if (searchRequest) {
         // 3 is the minimum level required for backend tracing.
-        searchRequest->setTraceLevel(search::fef::indexproperties::trace::Level::lookup(searchRequest->propertiesMap.modelOverrides(),
-                                                                                        searchRequest->trace().getLevel()), 3);
+        searchRequest->setTraceLevel(trace::Level::lookup(searchRequest->propertiesMap.modelOverrides(),
+                                                          searchRequest->trace().getLevel()), 3);
         ISearchHandler::SP searchHandler;
         vespalib::SimpleThreadBundle::UP threadBundle = _threadBundlePool.obtain();
         { // try to find the match handler corresponding to the specified search doc type