From 59e79b3c421983dd8e8ea4728a70b002f3e1d1b1 Mon Sep 17 00:00:00 2001
From: Jacob Dufault <jacobdufault@gmail.com>
Date: Fri, 29 Dec 2017 09:52:43 -0600
Subject: [PATCH] Move entry_points.h into import_pipeline.h

---
 src/entry_points.h          | 30 ------------------------------
 src/import_pipeline.h       | 12 ++++++++++++
 src/messages/cquery_wait.cc |  2 +-
 src/messages/initialize.cc  |  2 +-
 4 files changed, 14 insertions(+), 32 deletions(-)
 delete mode 100644 src/entry_points.h

diff --git a/src/entry_points.h b/src/entry_points.h
deleted file mode 100644
index 615dd680..00000000
--- a/src/entry_points.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "config.h"
-#include "file_consumer.h"
-#include "import_manager.h"
-#include "import_pipeline.h"
-#include "queue_manager.h"
-#include "project.h"
-#include "semantic_highlight_symbol_cache.h"
-#include "threaded_queue.h"
-#include "timestamp_manager.h"
-#include "work_thread.h"
-#include "working_files.h"
-
-// Contains declarations for some of the thread-main functions.
-
-bool QueryDb_ImportMain(Config* config,
-                        QueryDatabase* db,
-                        ImportManager* import_manager,
-                        SemanticHighlightSymbolCache* semantic_cache,
-                        WorkingFiles* working_files);
-
-void IndexMain(Config* config,
-               FileConsumer::SharedState* file_consumer_shared,
-               TimestampManager* timestamp_manager,
-               ImportManager* import_manager,
-               ImportPipelineStatus* status,
-               Project* project,
-               WorkingFiles* working_files,
-               MultiQueueWaiter* waiter);
\ No newline at end of file
diff --git a/src/import_pipeline.h b/src/import_pipeline.h
index d25181d9..9789e790 100644
--- a/src/import_pipeline.h
+++ b/src/import_pipeline.h
@@ -9,8 +9,11 @@
 struct ClangTranslationUnit;
 struct Config;
 struct ImportManager;
+struct MultiQueueWaiter;
+struct Project;
 struct QueryDatabase;
 struct SemanticHighlightSymbolCache;
+struct TimestampManager;
 struct WorkingFiles;
 
 struct ImportPipelineStatus {
@@ -26,6 +29,15 @@ void IndexWithTuFromCodeCompletion(
     const std::string& path,
     const std::vector<std::string>& args);
 
+void IndexMain(Config* config,
+               FileConsumer::SharedState* file_consumer_shared,
+               TimestampManager* timestamp_manager,
+               ImportManager* import_manager,
+               ImportPipelineStatus* status,
+               Project* project,
+               WorkingFiles* working_files,
+               MultiQueueWaiter* waiter);
+
 bool QueryDb_ImportMain(Config* config,
                         QueryDatabase* db,
                         ImportManager* import_manager,
diff --git a/src/messages/cquery_wait.cc b/src/messages/cquery_wait.cc
index b0c542af..86d10e23 100644
--- a/src/messages/cquery_wait.cc
+++ b/src/messages/cquery_wait.cc
@@ -1,4 +1,4 @@
-#include "entry_points.h"
+#include "import_pipeline.h"
 #include "message_handler.h"
 
 #include <loguru.hpp>
diff --git a/src/messages/initialize.cc b/src/messages/initialize.cc
index af5ec661..42df24a7 100644
--- a/src/messages/initialize.cc
+++ b/src/messages/initialize.cc
@@ -1,4 +1,4 @@
-#include "entry_points.h"
+#include "import_pipeline.h"
 #include "message_handler.h"
 #include "platform.h"
 #include "timer.h"