src: remove unused includes

2017-05-17 12:10:22 +02:00
parent ea3fd8b928
commit 6cb2119cce
150 changed files with 64 additions and 211 deletions
@@ -15,9 +15,7 @@
 #include "qt/QtCoreApplication.h"
 #include "qt/utility/utilityQt.h"
 #include "qt/view/QtViewFactory.h"
-#include "qt/window/QtMainWindow.h"
 #include "settings/ApplicationSettings.h"
-#include "utility/AppPath.h"
 #include "utility/commandline/CommandLineParser.h"
 #include "utility/logging/ConsoleLogger.h"
 #include "utility/logging/FileLogger.h"
@@ -29,7 +27,6 @@
 #include "utility/ResourcePaths.h"
 #include "utility/ScopedFunctor.h"
 #include "utility/UserPaths.h"
-#include "utility/utilityApp.h"
 #include "utility/utilityPathDetection.h"
 #include "utility/Version.h"
 #include "version.h"
@@ -1,18 +1,18 @@
 #include "includes.h"

-#include "utility/AppPath.h"
-#include "utility/logging/ConsoleLogger.h"
-#include "utility/logging/FileLogger.h"
-#include "utility/logging/logging.h"
-#include "utility/logging/LogManager.h"
+#include <QCoreApplication>

 #include "data/indexer/IndexerFactory.h"
 #include "data/indexer/IndexerFactoryModuleJava.h"
 #include "data/indexer/IndexerFactoryModuleCxxCdb.h"
 #include "data/indexer/IndexerFactoryModuleCxxManual.h"
 #include "data/indexer/interprocess/InterprocessIndexer.h"
-#include "qt/QtCoreApplication.h"
 #include "settings/ApplicationSettings.h"
+#include "utility/AppPath.h"
+#include "utility/logging/ConsoleLogger.h"
+#include "utility/logging/FileLogger.h"
+#include "utility/logging/logging.h"
+#include "utility/logging/LogManager.h"

 void setupLogging(const std::string logFilePath)
 {
@@ -1,8 +1,8 @@
 #include "LicenseChecker.h"

 #include "utility/AppPath.h"
+#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageForceEnterLicense.h"
-#include "utility/messaging/type/MessageStatus.h"

 #include "License.h"
 #include "PublicKey.h"
@@ -15,7 +15,6 @@
 #include "component/view/BookmarkView.h"
 #include "component/view/CodeView.h"
 #include "component/view/ErrorView.h"
-#include "component/view/GraphView.h"
 #include "component/view/LogView.h"
 #include "component/view/RefreshView.h"
 #include "component/view/SearchView.h"
@@ -3,15 +3,9 @@
 #include "component/controller/NetworkFactory.h"

 #include "component/controller/Controller.h"
-#include "component/view/CodeView.h"
 #include "component/view/CompositeView.h"
 #include "component/view/DialogView.h"
-#include "component/view/GraphView.h"
-#include "component/view/LogView.h"
-#include "component/view/RefreshView.h"
-#include "component/view/SearchView.h"
 #include "component/view/TabbedView.h"
-#include "component/view/UndoRedoView.h"
 #include "component/view/ViewFactory.h"

 std::shared_ptr<ComponentManager> ComponentManager::create(ViewFactory* viewFactory, StorageAccess* storageAccess)
@@ -7,7 +7,6 @@

 #include "utility/messaging/type/MessageActivateEdge.h"
 #include "utility/messaging/type/MessageActivateNodes.h"
-#include "utility/Cache.h"

 #include "utility/logging/logging.h"
 #include "utility/utilityString.h"
@@ -4,13 +4,10 @@
 #include "data/bookmark/Bookmark.h"
 #include "data/bookmark/NodeBookmark.h"
 #include "data/bookmark/EdgeBookmark.h"
-#include "data/name/NameHierarchy.h"
-#include "data/StorageTypes.h"

 #include "utility/messaging/MessageListener.h"
 #include "utility/messaging/type/MessageActivateAll.h"
 #include "utility/messaging/type/MessageActivateBookmark.h"
-#include "utility/messaging/type/MessageActivateEdge.h"
 #include "utility/messaging/type/MessageActivateTokens.h"
 #include "utility/messaging/type/MessageCreateBookmark.h"
 #include "utility/messaging/type/MessageCreateBookmarkCategory.h"
@@ -6,7 +6,7 @@
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/text/TextAccess.h"
 #include "utility/tracing.h"
-#include "utility/utility.h"
+#include "utility/logging/logging.h"
 #include "utility/utilityString.h"

 #include "data/access/StorageAccess.h"
@@ -14,9 +14,9 @@
 #include "component/view/GraphView.h"
 #include "component/view/GraphViewStyle.h"
 #include "data/access/StorageAccess.h"
-#include "data/parser/AccessKind.h"
+#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/graph/Graph.h"
-#include "Application.h"
+#include "data/parser/AccessKind.h"

 GraphController::GraphController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
@@ -26,8 +26,6 @@
 #include "component/controller/helper/DummyNode.h"
 #include "component/view/GraphView.h"
 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
-#include "data/graph/token_component/TokenComponentAggregation.h"

 class Graph;
 class StorageAccess;
@@ -1,6 +1,7 @@
 #include "IDECommunicationController.h"

 #include "utility/file/FileSystem.h"
+#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageActivateSourceLocations.h"
 #include "utility/messaging/type/MessageActivateWindow.h"
 #include "utility/messaging/type/MessageDispatchWhenLicenseValid.h"
@@ -11,7 +12,6 @@

 #include "data/access/StorageAccess.h"
 #include "data/location/SourceLocationFile.h"
-#include "settings/ApplicationSettings.h"

 IDECommunicationController::IDECommunicationController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
@@ -1,7 +1,5 @@
 #include "component/controller/LogController.h"

-#include "data/access/StorageAccess.h"
-#include "utility/logging/LogManager.h"
 #include "settings/ApplicationSettings.h"

 LogController::LogController()
@@ -2,6 +2,7 @@

 #include "component/view/SearchView.h"
 #include "data/access/StorageAccess.h"
+#include "utility/logging/logging.h"
 #include "utility/tracing.h"

 SearchController::SearchController(StorageAccess* storageAccess)
@@ -3,7 +3,6 @@
 #include "component/view/StatusBarView.h"
 #include "data/access/StorageAccess.h"
 #include "utility/logging/logging.h"
-#include "utility/utilityString.h"

 StatusBarController::StatusBarController(StorageAccess* storageAccess)
 	: m_storageAccess(storageAccess)
@@ -1,9 +1,7 @@
 #include "component/controller/UndoRedoController.h"

-#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageFlushUpdates.h"
 #include "utility/messaging/type/MessageSearch.h"
-#include "utility/utility.h"

 #include "Application.h"
 #include "component/view/UndoRedoView.h"
@@ -7,7 +7,6 @@
 #include "utility/types.h"

 #include "component/controller/helper/DummyNode.h"
-#include "data/graph/Edge.h"

 struct DummyEdge;

@@ -7,8 +7,8 @@
 #include "utility/utilityString.h"

 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/name/NameHierarchy.h"
+#include "data/parser/AccessKind.h"

 // temporary data structure for (visual) graph creation process
 struct DummyNode
@@ -1,7 +1,6 @@
 #include "component/view/CodeView.h"

 #include "component/controller/CodeController.h"
-#include "utility/file/FileSystem.h"

 CodeView::CodeView(ViewLayout* viewLayout)
 	: View(viewLayout)
@@ -7,7 +7,7 @@
 #include "utility/math/Vector2.h"

 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
+#include "data/parser/AccessKind.h"

 class GraphViewStyleImpl;

@@ -1,12 +1,10 @@
 #ifndef STATUS_VIEW_H
 #define STATUS_VIEW_H

+#include <vector>
+
 #include "component/view/View.h"
-
 #include "utility/Status.h"
-#include "utility/logging/LogMessage.h"
-#include "utility/logging/Logger.h"
-

 class StatusView
 	: public View
@@ -2,9 +2,6 @@

 #include <set>

-#include "data/graph/Edge.h"
-#include "utility/logging/logging.h"
-
 IntermediateStorage::IntermediateStorage()
 	: m_nextId(1)
 {
@@ -6,7 +6,6 @@
 #include "utility/Cache.h"
 #include "utility/file/FileInfo.h"
 #include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageNewErrors.h"
 #include "utility/messaging/type/MessageStatus.h"
@@ -14,16 +13,15 @@
 #include "utility/TimePoint.h"
 #include "utility/tracing.h"
 #include "utility/utility.h"
-#include "utility/utilityString.h"
-#include "utility/Version.h"
-#include "utility/utilityString.h"

+#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/graph/token_component/TokenComponentAggregation.h"
 #include "data/graph/token_component/TokenComponentFilePath.h"
 #include "data/graph/token_component/TokenComponentSignature.h"
 #include "data/graph/Graph.h"
 #include "data/location/SourceLocationCollection.h"
 #include "data/location/SourceLocationFile.h"
+#include "data/parser/AccessKind.h"
 #include "data/parser/ParseLocation.h"

 PersistentStorage::PersistentStorage(const FilePath& dbPath, const FilePath& bookmarkPath)
@@ -6,17 +6,12 @@

 #include "data/access/StorageAccess.h"
 #include "data/fulltextsearch/FullTextSearchIndex.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
-#include "data/parser/ParserClient.h"
-#include "data/parser/ParseLocation.h"
 #include "data/search/SearchIndex.h"
 #include "data/HierarchyCache.h"
 #include "data/SqliteIndexStorage.h"
 #include "data/SqliteBookmarkStorage.h"
 #include "data/Storage.h"

-#include "data/parser/ParserClientImpl.h"
-
 class PersistentStorage
 	: public Storage
 	, public StorageAccess
@@ -1,8 +1,6 @@
 #include "SqliteBookmarkStorage.h"

 #include "utility/logging/logging.h"
-#include "utility/utility.h"
-#include "utility/utilityString.h"
 #include "data/SqliteStorageMigrationLambda.h"
 #include "data/SqliteStorageMigrator.h"

@@ -1,11 +1,6 @@
 #ifndef SQLITE_BOOKMARK_STORAGE_H
 #define SQLITE_BOOKMARK_STORAGE_H

-#include "sqlite/CppSQLite3.h"
-
-#include "data/bookmark/BookmarkCategory.h"
-#include "data/bookmark/EdgeBookmark.h"
-#include "data/bookmark/NodeBookmark.h"
 #include "data/SqliteStorage.h"
 #include "data/StorageTypes.h"
 #include "utility/types.h"
@@ -2,11 +2,8 @@

 #include <unordered_map>

-#include "data/graph/Node.h"
-#include "data/parser/ParseLocation.h"
 #include "utility/logging/logging.h"
 #include "utility/text/TextAccess.h"
-#include "utility/Version.h"

 const size_t SqliteIndexStorage::s_storageVersion = 12;

@@ -6,7 +6,6 @@
 #include <vector>

 #include "data/location/SourceLocationFile.h"
-#include "data/name/NameHierarchy.h"
 #include "data/SqliteDatabaseIndex.h"
 #include "data/SqliteStorage.h"
 #include "data/StorageTypes.h"
@@ -5,7 +5,6 @@

 #include "data/SqliteDatabaseIndex.h"
 #include "utility/file/FilePath.h"
-#include "utility/Version.h"

 class SqliteStorageMigration;
 class TimePoint;
@@ -1,7 +1,5 @@
 #include "data/SqliteStorageMigration.h"

-#include "settings/Settings.h"
-
 SqliteStorageMigration::~SqliteStorageMigration()
 {
 }
@@ -2,9 +2,7 @@

 #include <unordered_map>

-#include "data/graph/Edge.h"
 #include "data/StorageTypes.h"
-#include "utility/logging/logging.h"
 #include "utility/tracing.h"

 Storage::Storage()
@@ -5,7 +5,6 @@
 #include <mutex>
 #include <string>

-#include "data/name/NameHierarchy.h"
 #include "data/StorageTypes.h"
 #include "utility/types.h"

@@ -2,7 +2,6 @@

 #include "component/view/DialogView.h"
 #include "data/PersistentStorage.h"
-#include "utility/file/FileRegister.h"
 #include "utility/messaging/type/MessageFinishedParsing.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/scheduling/Blackboard.h"
@@ -7,7 +7,6 @@

 #include "utility/types.h"

-#include "data/bookmark/Bookmark.h"
 #include "data/bookmark/BookmarkCategory.h"
 #include "data/bookmark/EdgeBookmark.h"
 #include "data/bookmark/NodeBookmark.h"
@@ -8,7 +8,6 @@
 #include "utility/file/FilePath.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageShowErrors.h"
-#include "utility/TimePoint.h"

 StorageAccessProxy::StorageAccessProxy()
 	: m_subject(nullptr)
@@ -2,7 +2,6 @@
 #define EDGE_BOOKMARK_H

 #include "Bookmark.h"
-#include "data/graph/Edge.h"

 class EdgeBookmark
 	: public Bookmark
@@ -3,7 +3,6 @@

 #include "utility/logging/logging.h"
 #include "utility/tracing.h"
-#include "utility/utility.h"

 void FullTextSearchIndex::addFile(Id fileId, const std::string& file)
 {
@@ -4,7 +4,6 @@

 #include "data/graph/Node.h"
 #include "data/graph/token_component/TokenComponentAggregation.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "utility/logging/logging.h"
 #include "utility/utilityString.h"

@@ -1,6 +1,5 @@
 #include "data/indexer/IndexerFactory.h"

-#include "data/indexer/IndexerBase.h"
 #include "data/indexer/IndexerComposite.h"
 #include "IndexerFactoryModule.h"

@@ -4,8 +4,6 @@
 #include <memory>
 #include <vector>

-#include "settings/LanguageType.h"
-
 class IndexerBase;
 class IndexerComposite;
 class IndexerFactoryModule;
@@ -3,8 +3,6 @@

 #include <memory>

-#include "settings/LanguageType.h"
-
 class IndexerBase;

 class IndexerFactoryModule
@@ -1,7 +1,6 @@
 #include "data/indexer/TaskBuildIndex.h"

 #include "utility/AppPath.h"
-#include "utility/file/FileRegister.h"
 #include "utility/file/FileRegisterStateData.h"
 #include "utility/logging/FileLogger.h"
 #include "utility/scheduling/Blackboard.h"
@@ -10,12 +9,9 @@

 #include "Application.h"
 #include "component/view/DialogView.h"
-#include "data/indexer/IndexerFactory.h"
 #include "data/indexer/IndexerCommandList.h"
-#include "data/indexer/IndexerComposite.h"
 #include "data/indexer/interprocess/InterprocessIndexer.h"
 #include "data/StorageProvider.h"
-#include "settings/ApplicationSettings.h"

 #if _WIN32
 const std::string TaskBuildIndex::s_processName("sourcetrail_indexer.exe");
@@ -9,7 +9,6 @@
 #include "data/indexer/interprocess/InterprocessIndexerCommandManager.h"
 #include "data/indexer/interprocess/InterprocessIndexingStatusManager.h"
 #include "data/indexer/interprocess/InterprocessIntermediateStorageManager.h"
-#include "data/parser/Parser.h"

 class DialogView;
 class FileRegisterStateData;
@@ -4,8 +4,8 @@
 #include "utility/file/FileRegisterStateData.h"
 #include "utility/logging/logging.h"

-#include "data/indexer/IndexerComposite.h"
 #include "data/indexer/IndexerCommand.h"
+#include "data/indexer/IndexerComposite.h"
 #include "data/indexer/IndexerFactory.h"

 InterprocessIndexer::InterprocessIndexer(const std::string& uuid, Id processId)
@@ -1,5 +1,6 @@
 #include "InterprocessIntermediateStorageManager.h"

+#include "data/indexer/interprocess/shared_types/SharedIntermediateStorage.h"
 #include "data/IntermediateStorage.h"
 #include "utility/logging/logging.h"

@@ -2,7 +2,6 @@
 #define INTERPROCESS_INTERMEDIATE_STORAGE_MANAGER_H

 #include "BaseInterprocessDataManager.h"
-#include "shared_types/SharedIntermediateStorage.h"

 class IntermediateStorage;

@@ -3,7 +3,6 @@
 #include <sstream>

 #include "data/parser/ParseLocation.h"
-#include "utility/utilityString.h"

 std::string ParserClient::addAccessPrefix(const std::string& str, AccessKind access)
 {
@@ -5,7 +5,6 @@
 #include "data/location/LocationType.h"
 #include "data/parser/ParseLocation.h"
 #include "utility/logging/logging.h"
-#include "utility/utility.h"

 ParserClientImpl::ParserClientImpl()
 {
@@ -5,7 +5,6 @@

 #include "data/DefinitionKind.h"
 #include "data/graph/Node.h"
-#include "data/graph/token_component/TokenComponentAccess.h"
 #include "data/IntermediateStorage.h"
 #include "data/parser/ParserClient.h"

@@ -3,8 +3,6 @@

 #include <memory>

-#include "data/parser/Parser.h"
-#include "data/parser/ParserClientImpl.h"
 #include "utility/scheduling/Task.h"
 #include "utility/scheduling/TaskRunner.h"
 #include "utility/scheduling/TaskDecorator.h"
@@ -38,7 +38,6 @@
 #include "utility/utility.h"
 #include "utility/utilityApp.h"
 #include "utility/utilityString.h"
-#include "utility/Version.h"

 Project::Project(std::shared_ptr<ProjectSettings> settings, StorageAccessProxy* storageAccessProxy)
 	: m_settings(settings)
@@ -4,8 +4,6 @@
 #include <memory>
 #include <vector>

-#include "settings/SourceGroupType.h"
-
 class SourceGroup;
 class SourceGroupSettings;
 class SourceGroupFactoryModule;
@@ -5,7 +5,6 @@
 #include "settings/migration/SettingsMigrationMoveKey.h"
 #include "settings/SourceGroupSettingsCxx.h"
 #include "settings/SourceGroupSettingsJava.h"
-#include "utility/utility.h"
 #include "utility/utilityString.h"
 #include "utility/utilityUuid.h"

@@ -1,9 +1,7 @@
 #include "settings/Settings.h"

-#include "utility/file/FileSystem.h"
 #include "utility/logging/logging.h"
 #include "utility/text/TextAccess.h"
-#include "utility/utilityString.h"
 #include "utility/utility.h"

 Settings::Settings(const Settings& other)
@@ -4,7 +4,6 @@
 #include <memory>
 #include <vector>

-#include "settings/LanguageType.h"
 #include "settings/ProjectSettings.h"
 #include "settings/SourceGroupType.h"

@@ -1,11 +1,11 @@
 #include "utility/commandline/CommandLineParser.h"

+#include <iostream>
+
 #include "boost/program_options.hpp"

 #include "utility/ConfigManager.h"
-#include "utility/file/FileSystem.h"
 #include "utility/messaging/type/MessageLoadProject.h"
-#include "utility/messaging/type/MessageStatus.h"
 #include "utility/text/TextAccess.h"
 #include "utility/utilityString.h"
 #include "License.h"
@@ -2,7 +2,6 @@
 #define COMMANDLINEPARSER_H

 #include <string>
-#include "Application.h"
 #include "License.h"
 #include "utility/file/FilePath.h"

@@ -3,7 +3,7 @@
 #include <set>

 #include "utility/file/FileSystem.h"
-#include "utility/utility.h"
+#include "utility/file/FilePath.h"

 FileManager::FileManager()
 {
@@ -3,9 +3,10 @@

 #include <map>
 #include <set>
+#include <string>
 #include <vector>

-#include "utility/file/FileInfo.h"
+class FilePath;

 class FileManager
 {
@@ -2,7 +2,6 @@

 #include <algorithm>

-#include "utility/logging/LogMessage.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/Version.h"
@@ -3,7 +3,6 @@

 #include <string>

-#include "utility/logging/logging.h"
 #include "utility/messaging/MessageBase.h"
 #include "utility/messaging/MessageListenerBase.h"
 #include "utility/messaging/MessageQueue.h"
@@ -3,7 +3,6 @@

 #include "utility/file/FilePath.h"
 #include "utility/messaging/Message.h"
-#include "utility/types.h"

 class MessageChangeFileView
 	: public Message<MessageChangeFileView>
@@ -2,7 +2,6 @@
 #define MESSAGE_FIND_H

 #include "utility/messaging/Message.h"
-#include "utility/types.h"

 class MessageFind
 	: public Message<MessageFind>
@@ -2,7 +2,6 @@
 #define MESSAGE_SEARCH_H

 #include "utility/messaging/Message.h"
-#include "utility/utilityString.h"

 #include "data/search/SearchMatch.h"

@@ -2,7 +2,6 @@
 #define MESSAGE_SEARCH_AUTOCOMPLETE_H

 #include "utility/messaging/Message.h"
-#include "utility/types.h"

 class MessageSearchAutocomplete: public Message<MessageSearchAutocomplete>
 {
@@ -2,7 +2,6 @@
 #define MESSAGE_SEARCH_FULLTEXT_H

 #include "utility/messaging/Message.h"
-#include "utility/types.h"

 class MessageSearchFullText: public Message<MessageSearchFullText>
 {
@@ -2,7 +2,6 @@
 #define MESSAGE_STATUS_FILTER_CHANGED_H

 #include "utility/messaging/Message.h"
-#include "utility/logging/Logger.h"
 #include "utility/Status.h"

 class MessageStatusFilterChanged
@@ -2,7 +2,6 @@
 #define MESSAGE_TO_UNDO_REDO_POSITION_H

 #include "utility/messaging/Message.h"
-#include "utility/types.h"

 class MessageToUndoRedoPosition
 	: public Message<MessageToUndoRedoPosition>
@@ -1,6 +1,5 @@
 #include "utility/scheduling/Task.h"

-#include "utility/logging/logging.h"
 #include "utility/scheduling/TaskScheduler.h"

 void Task::dispatch(std::shared_ptr<Task> task)
@@ -4,7 +4,6 @@
 #include <thread>

 #include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageStatus.h"
 #include "utility/scheduling/Blackboard.h"
 #include "utility/ScopedFunctor.h"

@@ -5,8 +5,6 @@
 #include <mutex>
 #include <deque>

-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageInterruptTasks.h"
 #include "utility/scheduling/Task.h"
 #include "utility/scheduling/TaskRunner.h"

@@ -1,6 +1,7 @@
 #include "data/parser/cxx/ASTActionFactory.h"

 #include "clang/Frontend/FrontendActions.h"
+#include "data/parser/cxx/ASTAction.h"

 ASTActionFactory::ASTActionFactory(
 	std::shared_ptr<ParserClient> client,
@@ -3,10 +3,11 @@

 #include "clang/Tooling/Tooling.h"

-#include "data/parser/cxx/ASTAction.h"
 #include "data/parser/cxx/cxxCacheTypes.h"
 #include "utility/file/FileRegister.h"

+class ParserClient;
+
 class ASTActionFactory
 	: public clang::tooling::FrontendActionFactory
 {
@@ -1,7 +1,5 @@
 #include "data/parser/cxx/CxxAstVisitorComponentContext.h"

-#include "utility/ScopedFunctor.h"
-
 CxxAstVisitorComponentContext::CxxAstVisitorComponentContext(CxxAstVisitor* astVisitor)
 	: CxxAstVisitorComponent(astVisitor)
 {
@@ -2,7 +2,6 @@
 #define CXX_AST_VISITOR_COMPONENT_IMPLICIT_CODE_H

 #include "data/parser/cxx/CxxAstVisitorComponent.h"
-#include "data/parser/cxx/CxxContext.h"

 // This CxxAstVisitorComponent is responsible for deciding if the AstVisitor should visit implicit code in the current context.
 class CxxAstVisitorComponentImplicitCode: public CxxAstVisitorComponent
@@ -6,14 +6,12 @@
 #include "utility/file/FileRegister.h"
 #include "utility/logging/logging.h"
 #include "utility/text/TextAccess.h"
-#include "utility/tracing.h"

 #include "data/indexer/IndexerCommandCxxCdb.h"
 #include "data/indexer/IndexerCommandCxxManual.h"
 #include "data/parser/cxx/ASTActionFactory.h"
 #include "data/parser/cxx/CxxCompilationDatabaseSingle.h"
 #include "data/parser/cxx/CxxDiagnosticConsumer.h"
-#include "settings/LanguageType.h"

 namespace
 {
@@ -2,7 +2,6 @@
 #define CXX_PARSER_H

 #include "data/parser/cxx/cxxCacheTypes.h"
-#include "data/parser/cxx/CxxCompilationDatabaseSingle.h"
 #include "data/parser/Parser.h"

 class CxxDiagnosticConsumer;
@@ -12,6 +11,8 @@ class IndexerCommandCxxCdb;
 class IndexerCommandCxxManual;
 class TaskParseCxx;

+namespace clang { namespace tooling { class FixedCompilationDatabase;  } }
+
 class CxxParser: public Parser
 {
 public:
@@ -7,7 +7,6 @@

 #include "data/name/NameHierarchy.h"
 #include "data/parser/cxx/name/CxxName.h"
-#include "data/parser/cxx/name/CxxDeclName.h"
 #include "data/parser/cxx/name/CxxQualifierFlags.h"

 class CxxTypeName: public CxxName
@@ -8,7 +8,6 @@
 #include "data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h"
 #include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h"
 #include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
 #include "utility/ScopedSwitcher.h"

 CxxDeclNameResolver::CxxDeclNameResolver()
@@ -1,7 +1,6 @@
 #ifndef CXX_DECL_NAME_RESOLVER_H
 #define CXX_DECL_NAME_RESOLVER_H

-#include "data/name/NameHierarchy.h"
 #include "data/parser/cxx/name/CxxDeclName.h"
 #include "data/parser/cxx/name_resolver/CxxNameResolver.h"

@@ -3,9 +3,10 @@

 #include <memory>

-#include "data/parser/cxx/name/CxxDeclName.h"
 #include "data/parser/cxx/name_resolver/CxxNameResolver.h"

+class CxxName;
+
 class CxxSpecifierNameResolver: public CxxNameResolver
 {
 public:
@@ -4,7 +4,6 @@
 #include <clang/AST/DeclTemplate.h>

 #include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h"
-#include "utility/logging/logging.h"

 CxxTemplateArgumentNameResolver::CxxTemplateArgumentNameResolver()
 	: CxxNameResolver(std::vector<const clang::Decl*>())
@@ -7,7 +7,7 @@
 #include "data/indexer/IndexerCommandCxxManual.h"
 #include "data/indexer/IndexerCommandCxxCdb.h"
 #include "settings/ApplicationSettings.h"
-#include "utility/file/FileRegister.h"
+#include "utility/file/FileManager.h"
 #include "utility/file/FileSystem.h"
 #include "utility/messaging/type/MessageStatus.h"
 #include "utility/utility.h"
@@ -6,7 +6,6 @@

 #include "project/SourceGroup.h"
 #include "settings/SourceGroupSettingsCxx.h"
-#include "utility/file/FileManager.h"

 class SourceGroupCxx: public SourceGroup
 {
@@ -6,7 +6,6 @@
 #include "utility/messaging/type/MessageLoadProject.h"
 #include "utility/logging/LogManager.h"
 #include "component/controller/LogController.h"
-#include "settings/ApplicationSettings.h"

 QtApplication::QtApplication(int& argc, char** argv)
 	: QApplication(argc, argv)
@@ -11,7 +11,6 @@
 #include "utility/messaging/type/MessageDisplayBookmarkEditor.h"
 #include "utility/ResourcePaths.h"

-#include "qt/window/QtBookmarkCreator.h"
 #include "qt/utility/utilityQt.h"

 QtBookmark::QtBookmark()
@@ -4,7 +4,6 @@
 #include <QVBoxLayout>

 #include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"

 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeFile.h"
@@ -9,14 +9,12 @@
 #include "utility/file/FilePath.h"
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageChangeFileView.h"
-#include "utility/ResourcePaths.h"

 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeArea.h"
 #include "qt/element/QtCodeFileTitleButton.h"
 #include "qt/element/QtCodeNavigator.h"
 #include "qt/utility/utilityQt.h"
-#include "settings/ColorScheme.h"

 QtCodeFileSingle::QtCodeFileSingle(QtCodeNavigator* navigator, QWidget* parent)
 	: m_navigator(navigator)
@@ -3,7 +3,6 @@

 #include <set>

-#include "utility/TimePoint.h"
 #include "utility/types.h"

 #include "component/view/helper/CodeSnippetParams.h"
@@ -17,7 +17,6 @@
 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeFile.h"
 #include "qt/element/QtCodeSnippet.h"
-#include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
 #include "settings/ApplicationSettings.h"

@@ -5,7 +5,6 @@
 #include <QPushButton>

 #include "utility/messaging/type/MessageShowScope.h"
-#include "utility/text/TextAccess.h"

 #include "data/location/SourceLocationFile.h"
 #include "qt/element/QtCodeNavigator.h"
@@ -4,9 +4,6 @@
 #include <QPainter>
 #include <QFontComboBox>

-#include "qt/element/QtLineEdit.h"
-
-
 QtFontPicker::QtFontPicker(QWidget *parent)
 	: QWidget(parent)
 {
@@ -6,11 +6,9 @@
 #include <QClipboard>
 #include <QKeyEvent>

-#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageSearch.h"
 #include "utility/messaging/type/MessageSearchFullText.h"
 #include "utility/messaging/type/MessageSearchAutocomplete.h"
-#include "utility/text/TextAccess.h"
 #include "utility/utility.h"
 #include "utility/utilityString.h"

@@ -2,6 +2,8 @@

 #include <functional>

+#include "settings/ApplicationSettings.h"
+
 QtIDECommunicationController::QtIDECommunicationController(QObject* parent, StorageAccess* storageAccess)
 	: IDECommunicationController(storageAccess)
 	, m_tcpWrapper(parent)
@@ -7,7 +7,6 @@

 #include "component/controller/IDECommunicationController.h"
 #include "qt/utility/QtThreadedFunctor.h"
-#include "settings/ApplicationSettings.h"

 class StorageAccess;

@@ -6,6 +6,7 @@
 #include <QDesktopServices>
 #include <QUrl>

+#include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageRedo.h"
 #include "utility/messaging/type/MessageUndo.h"

@@ -7,7 +7,6 @@
 #include <QObject>

 #include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"

 class QtContextMenu
 	: public QObject
@@ -5,8 +5,6 @@
 #include <QMessageBox>
 #include <QPushButton>

-#include "data/bookmark/EdgeBookmark.h"
-
 #include "qt/utility/utilityQt.h"
 #include "qt/view/QtViewWidgetWrapper.h"
 #include "qt/window/QtBookmarkCreator.h"
@@ -18,7 +16,6 @@
 #include "utility/ResourcePaths.h"

 #include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"

 QtBookmarkView::QtBookmarkView(ViewLayout* viewLayout)
 	: BookmarkView(viewLayout)
@@ -1,6 +1,5 @@
 #include "qt/view/QtCodeView.h"

-#include "utility/file/FileSystem.h"
 #include "utility/ResourcePaths.h"
 #include "qt/utility/utilityQt.h"

@@ -13,7 +13,6 @@

 #include "qt/utility/utilityQt.h"
 #include "qt/element/QtTable.h"
-#include "settings/ApplicationSettings.h"
 #include "settings/ColorScheme.h"
 #include "utility/messaging/type/MessageErrorFilterChanged.h"
 #include "utility/messaging/type/MessageShowErrors.h"
@@ -3,6 +3,8 @@
 #include <QFontMetrics>
 #include <QSysInfo>

+#include "qt/view/graphElements/QtGraphNode.h"
+
 QtGraphViewStyleImpl::~QtGraphViewStyleImpl()
 {
 }
--- a/Show More
+++ b/Show More