From dfc6d884321de0cd4c8237618aa73be9e757f634 Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Tue, 18 Sep 2018 19:00:18 +0200 Subject: [PATCH] build: search headers in all source directories * removed paths in include directives * changed cmake to provide necessary header search paths * changed name of version.h to productVersion.h due to name conflict --- CMakeLists.txt | 150 +++++++++--------- cmake/add_files.cmake | 26 ++- cmake/productVersion.h.in | 12 ++ cmake/version.cmake | 4 +- src/app/CMakeLists.txt | 2 +- src/app/main.cpp | 58 +++---- src/external/CMakeLists.txt | 4 +- src/indexer/CMakeLists.txt | 2 +- src/indexer/main.cpp | 14 +- src/lib/Application.cpp | 54 +++---- src/lib/Application.h | 20 +-- src/lib/CMakeLists.txt | 4 +- src/lib/LanguagePackageManager.cpp | 2 +- src/lib/LicenseChecker.cpp | 10 +- src/lib/LicenseChecker.h | 2 +- src/lib/component/Component.cpp | 6 +- src/lib/component/ComponentFactory.cpp | 50 +++--- src/lib/component/ComponentFactory.h | 2 +- src/lib/component/ComponentManager.cpp | 16 +- src/lib/component/ComponentManager.h | 6 +- src/lib/component/NetworkFactory.cpp | 2 +- .../controller/ActivationController.cpp | 26 +-- .../controller/ActivationController.h | 20 +-- .../controller/BookmarkController.cpp | 22 +-- .../component/controller/BookmarkController.h | 24 +-- .../component/controller/CodeController.cpp | 24 +-- src/lib/component/controller/CodeController.h | 48 +++--- src/lib/component/controller/Controller.h | 2 +- .../component/controller/ErrorController.cpp | 10 +- .../component/controller/ErrorController.h | 30 ++-- .../component/controller/GraphController.cpp | 36 ++--- .../component/controller/GraphController.h | 44 ++--- .../controller/IDECommunicationController.cpp | 20 +-- .../controller/IDECommunicationController.h | 14 +- .../controller/RefreshController.cpp | 4 +- .../component/controller/RefreshController.h | 2 +- .../controller/ScreenSearchController.cpp | 4 +- .../controller/ScreenSearchController.h | 6 +- .../component/controller/SearchController.cpp | 10 +- .../component/controller/SearchController.h | 18 +-- .../controller/StatusBarController.cpp | 8 +- .../controller/StatusBarController.h | 20 +-- .../component/controller/StatusController.cpp | 8 +- .../component/controller/StatusController.h | 14 +- .../controller/TooltipController.cpp | 14 +- .../component/controller/TooltipController.h | 24 +-- .../controller/UndoRedoController.cpp | 14 +- .../component/controller/UndoRedoController.h | 56 +++---- .../controller/helper/BucketLayouter.cpp | 6 +- .../controller/helper/BucketLayouter.h | 6 +- .../controller/helper/ControllerProxy.h | 4 +- .../component/controller/helper/DummyEdge.h | 8 +- .../component/controller/helper/DummyNode.h | 18 +-- .../controller/helper/ListLayouter.cpp | 6 +- .../controller/helper/ListLayouter.h | 4 +- .../helper/NetworkProtocolHelper.cpp | 4 +- .../controller/helper/NetworkProtocolHelper.h | 2 +- .../controller/helper/SnippetMerger.cpp | 4 +- .../controller/helper/TrailLayouter.cpp | 2 +- .../controller/helper/TrailLayouter.h | 4 +- src/lib/component/view/BookmarkView.cpp | 4 +- src/lib/component/view/BookmarkView.h | 4 +- src/lib/component/view/CodeView.cpp | 4 +- src/lib/component/view/CodeView.h | 8 +- src/lib/component/view/CompositeView.cpp | 2 +- src/lib/component/view/CompositeView.h | 4 +- src/lib/component/view/DialogView.cpp | 2 +- src/lib/component/view/DialogView.h | 4 +- src/lib/component/view/ErrorView.cpp | 2 +- src/lib/component/view/ErrorView.h | 8 +- src/lib/component/view/GraphView.cpp | 2 +- src/lib/component/view/GraphView.h | 10 +- src/lib/component/view/GraphViewStyle.cpp | 14 +- src/lib/component/view/GraphViewStyle.h | 8 +- src/lib/component/view/GraphViewStyleImpl.h | 2 +- src/lib/component/view/MainView.cpp | 2 +- src/lib/component/view/MainView.h | 2 +- src/lib/component/view/RefreshView.cpp | 4 +- src/lib/component/view/RefreshView.h | 2 +- src/lib/component/view/ScreenSearchView.cpp | 2 +- src/lib/component/view/ScreenSearchView.h | 2 +- src/lib/component/view/SearchView.cpp | 4 +- src/lib/component/view/SearchView.h | 4 +- src/lib/component/view/StatusBarView.cpp | 4 +- src/lib/component/view/StatusBarView.h | 4 +- src/lib/component/view/StatusView.cpp | 2 +- src/lib/component/view/StatusView.h | 4 +- src/lib/component/view/TabbedView.cpp | 2 +- src/lib/component/view/TabbedView.h | 4 +- src/lib/component/view/TooltipView.cpp | 3 +- src/lib/component/view/TooltipView.h | 8 +- src/lib/component/view/UndoRedoView.cpp | 4 +- src/lib/component/view/UndoRedoView.h | 2 +- src/lib/component/view/View.cpp | 4 +- src/lib/component/view/View.h | 4 +- src/lib/component/view/ViewFactory.cpp | 2 +- src/lib/component/view/ViewFactory.h | 4 +- src/lib/component/view/ViewLayout.cpp | 2 +- src/lib/component/view/ViewWidgetWrapper.cpp | 2 +- .../view/helper/CodeSnippetParams.cpp | 4 +- .../component/view/helper/CodeSnippetParams.h | 4 +- src/lib/data/DefinitionKind.cpp | 2 +- src/lib/data/ErrorCountInfo.h | 2 +- src/lib/data/ErrorFilter.h | 2 +- src/lib/data/ErrorInfo.h | 2 +- src/lib/data/GroupType.cpp | 2 +- src/lib/data/HierarchyCache.cpp | 2 +- src/lib/data/HierarchyCache.h | 2 +- src/lib/data/NodeType.cpp | 6 +- src/lib/data/NodeType.h | 6 +- src/lib/data/NodeTypeSet.cpp | 8 +- src/lib/data/NodeTypeSet.h | 2 +- src/lib/data/TaskCleanStorage.cpp | 12 +- src/lib/data/TaskCleanStorage.h | 4 +- src/lib/data/TaskFinishParsing.cpp | 20 +-- src/lib/data/TaskFinishParsing.h | 2 +- src/lib/data/TaskInjectStorage.cpp | 6 +- src/lib/data/TaskInjectStorage.h | 2 +- src/lib/data/TaskMergeStorages.cpp | 4 +- src/lib/data/TaskMergeStorages.h | 2 +- src/lib/data/access/StorageAccess.cpp | 2 +- src/lib/data/access/StorageAccess.h | 28 ++-- src/lib/data/access/StorageAccessProxy.cpp | 16 +- src/lib/data/access/StorageAccessProxy.h | 2 +- src/lib/data/bookmark/Bookmark.h | 4 +- src/lib/data/bookmark/BookmarkCategory.h | 2 +- .../fulltextsearch/FullTextSearchIndex.cpp | 6 +- .../data/fulltextsearch/FullTextSearchIndex.h | 4 +- src/lib/data/graph/Edge.cpp | 10 +- src/lib/data/graph/Edge.h | 2 +- src/lib/data/graph/Graph.cpp | 4 +- src/lib/data/graph/Graph.h | 4 +- src/lib/data/graph/Node.cpp | 12 +- src/lib/data/graph/Node.h | 10 +- src/lib/data/graph/Token.cpp | 4 +- src/lib/data/graph/Token.h | 4 +- .../graph/token_component/TokenComponent.cpp | 2 +- .../TokenComponentAbstraction.cpp | 2 +- .../TokenComponentAbstraction.h | 2 +- .../token_component/TokenComponentAccess.cpp | 2 +- .../token_component/TokenComponentAccess.h | 4 +- .../TokenComponentAggregation.cpp | 2 +- .../TokenComponentAggregation.h | 4 +- .../token_component/TokenComponentConst.cpp | 2 +- .../token_component/TokenComponentConst.h | 2 +- .../TokenComponentFilePath.cpp | 2 +- .../token_component/TokenComponentFilePath.h | 4 +- .../TokenComponentInheritanceChain.h | 2 +- .../token_component/TokenComponentStatic.cpp | 2 +- .../token_component/TokenComponentStatic.h | 2 +- .../CombinedIndexerCommandProvider.cpp | 4 +- .../indexer/CombinedIndexerCommandProvider.h | 2 +- src/lib/data/indexer/Indexer.h | 6 +- src/lib/data/indexer/IndexerBase.cpp | 2 +- src/lib/data/indexer/IndexerBase.h | 2 +- src/lib/data/indexer/IndexerCommand.cpp | 4 +- src/lib/data/indexer/IndexerCommand.h | 6 +- .../data/indexer/IndexerCommandProvider.cpp | 2 +- src/lib/data/indexer/IndexerCommandType.cpp | 2 +- src/lib/data/indexer/IndexerComposite.cpp | 8 +- src/lib/data/indexer/IndexerComposite.h | 2 +- .../indexer/MemoryIndexerCommandProvider.cpp | 4 +- .../indexer/MemoryIndexerCommandProvider.h | 2 +- src/lib/data/indexer/TaskBuildIndex.cpp | 24 +-- src/lib/data/indexer/TaskBuildIndex.h | 12 +- .../indexer/TaskFillIndexerCommandQueue.cpp | 10 +- .../indexer/TaskFillIndexerCommandQueue.h | 8 +- .../BaseInterprocessDataManager.h | 4 +- .../interprocess/InterprocessIndexer.cpp | 8 +- .../InterprocessIndexerCommandManager.cpp | 4 +- .../InterprocessIndexerCommandManager.h | 2 +- .../InterprocessIndexingStatusManager.cpp | 4 +- .../InterprocessIndexingStatusManager.h | 2 +- ...InterprocessIntermediateStorageManager.cpp | 6 +- .../shared_types/SharedIndexerCommand.cpp | 8 +- .../shared_types/SharedIndexerCommand.h | 6 +- .../shared_types/SharedIntermediateStorage.h | 4 +- .../shared_types/SharedStorageTypes.h | 26 +-- src/lib/data/location/LocationType.cpp | 2 +- src/lib/data/location/SourceLocation.cpp | 4 +- src/lib/data/location/SourceLocation.h | 4 +- .../location/SourceLocationCollection.cpp | 6 +- .../data/location/SourceLocationCollection.h | 4 +- src/lib/data/location/SourceLocationFile.cpp | 2 +- src/lib/data/location/SourceLocationFile.h | 8 +- src/lib/data/name/NameDelimiterType.cpp | 2 +- src/lib/data/name/NameElement.cpp | 6 +- src/lib/data/name/NameHierarchy.cpp | 6 +- src/lib/data/name/NameHierarchy.h | 4 +- src/lib/data/parser/AccessKind.cpp | 2 +- src/lib/data/parser/ParseLocation.cpp | 2 +- src/lib/data/parser/ParseLocation.h | 4 +- src/lib/data/parser/Parser.cpp | 2 +- src/lib/data/parser/ParserClient.cpp | 4 +- src/lib/data/parser/ParserClient.h | 14 +- src/lib/data/parser/ParserClientImpl.cpp | 12 +- src/lib/data/parser/ParserClientImpl.h | 8 +- src/lib/data/parser/ReferenceKind.cpp | 2 +- src/lib/data/parser/SymbolKind.cpp | 2 +- src/lib/data/parser/TaskParseWrapper.cpp | 10 +- src/lib/data/parser/TaskParseWrapper.h | 8 +- src/lib/data/search/SearchIndex.cpp | 6 +- src/lib/data/search/SearchIndex.h | 6 +- src/lib/data/search/SearchMatch.cpp | 6 +- src/lib/data/search/SearchMatch.h | 4 +- src/lib/data/storage/IntermediateStorage.cpp | 4 +- src/lib/data/storage/IntermediateStorage.h | 22 +-- src/lib/data/storage/PersistentStorage.cpp | 48 +++--- src/lib/data/storage/PersistentStorage.h | 14 +- src/lib/data/storage/Storage.cpp | 24 +-- src/lib/data/storage/Storage.h | 22 +-- src/lib/data/storage/StorageCache.cpp | 2 +- src/lib/data/storage/StorageCache.h | 2 +- src/lib/data/storage/StorageProvider.cpp | 4 +- src/lib/data/storage/StorageProvider.h | 2 +- src/lib/data/storage/StorageStats.h | 2 +- .../migration/SqliteStorageMigration.cpp | 2 +- .../migration/SqliteStorageMigration.h | 4 +- .../SqliteStorageMigrationLambda.cpp | 2 +- .../migration/SqliteStorageMigrationLambda.h | 2 +- .../storage/migration/SqliteStorageMigrator.h | 2 +- .../storage/sqlite/SqliteBookmarkStorage.cpp | 12 +- .../storage/sqlite/SqliteBookmarkStorage.h | 12 +- .../storage/sqlite/SqliteDatabaseIndex.cpp | 4 +- .../data/storage/sqlite/SqliteDatabaseIndex.h | 2 +- .../storage/sqlite/SqliteIndexStorage.cpp | 14 +- .../data/storage/sqlite/SqliteIndexStorage.h | 34 ++-- src/lib/data/storage/sqlite/SqliteStorage.cpp | 10 +- src/lib/data/storage/sqlite/SqliteStorage.h | 6 +- src/lib/data/storage/type/StorageBookmark.h | 2 +- .../storage/type/StorageBookmarkCategory.h | 2 +- .../data/storage/type/StorageBookmarkedEdge.h | 2 +- .../data/storage/type/StorageBookmarkedNode.h | 2 +- .../storage/type/StorageCommentLocation.h | 2 +- .../storage/type/StorageComponentAccess.h | 2 +- src/lib/data/storage/type/StorageEdge.h | 2 +- src/lib/data/storage/type/StorageError.h | 4 +- src/lib/data/storage/type/StorageFile.h | 2 +- .../data/storage/type/StorageLocalSymbol.h | 2 +- src/lib/data/storage/type/StorageNode.h | 2 +- src/lib/data/storage/type/StorageOccurrence.h | 2 +- .../data/storage/type/StorageSourceLocation.h | 2 +- src/lib/data/storage/type/StorageSymbol.h | 4 +- src/lib/data/tooltip/TooltipInfo.h | 4 +- src/lib/project/Project.cpp | 84 +++++----- src/lib/project/Project.h | 4 +- src/lib/project/RefreshInfo.h | 2 +- src/lib/project/RefreshInfoGenerator.cpp | 18 +-- src/lib/project/SourceGroup.cpp | 8 +- src/lib/project/SourceGroup.h | 6 +- src/lib/project/SourceGroupFactory.cpp | 8 +- src/lib/project/SourceGroupFactoryModule.cpp | 2 +- src/lib/project/SourceGroupFactoryModule.h | 2 +- src/lib/settings/ApplicationSettings.cpp | 24 +-- src/lib/settings/ApplicationSettings.h | 4 +- src/lib/settings/ColorScheme.cpp | 4 +- src/lib/settings/ColorScheme.h | 6 +- src/lib/settings/LanguageType.cpp | 2 +- src/lib/settings/LanguageType.h | 2 +- src/lib/settings/ProjectSettings.cpp | 34 ++-- src/lib/settings/ProjectSettings.h | 6 +- src/lib/settings/Settings.cpp | 8 +- src/lib/settings/Settings.h | 4 +- src/lib/settings/SourceGroupSettings.cpp | 6 +- src/lib/settings/SourceGroupSettings.h | 6 +- .../settings/SourceGroupSettingsCEmpty.cpp | 2 +- src/lib/settings/SourceGroupSettingsCEmpty.h | 12 +- .../settings/SourceGroupSettingsCppEmpty.cpp | 2 +- .../settings/SourceGroupSettingsCppEmpty.h | 12 +- src/lib/settings/SourceGroupSettingsCxx.cpp | 8 +- src/lib/settings/SourceGroupSettingsCxx.h | 4 +- .../settings/SourceGroupSettingsCxxCdb.cpp | 6 +- src/lib/settings/SourceGroupSettingsCxxCdb.h | 8 +- .../settings/SourceGroupSettingsCxxCdbVs.cpp | 2 +- .../settings/SourceGroupSettingsCxxCdbVs.h | 4 +- .../SourceGroupSettingsCxxCodeblocks.cpp | 6 +- .../SourceGroupSettingsCxxCodeblocks.h | 12 +- .../SourceGroupSettingsCxxSonargraph.cpp | 2 +- .../SourceGroupSettingsCxxSonargraph.h | 8 +- src/lib/settings/SourceGroupSettingsJava.cpp | 2 +- src/lib/settings/SourceGroupSettingsJava.h | 8 +- .../settings/SourceGroupSettingsJavaEmpty.cpp | 2 +- .../settings/SourceGroupSettingsJavaEmpty.h | 6 +- .../SourceGroupSettingsJavaGradle.cpp | 6 +- .../settings/SourceGroupSettingsJavaGradle.h | 4 +- .../settings/SourceGroupSettingsJavaMaven.cpp | 6 +- .../settings/SourceGroupSettingsJavaMaven.h | 4 +- .../SourceGroupSettingsJavaSonargraph.cpp | 2 +- .../SourceGroupSettingsJavaSonargraph.h | 8 +- .../SourceGroupSettingsWithCStandard.cpp | 4 +- .../SourceGroupSettingsWithClasspath.cpp | 6 +- .../SourceGroupSettingsWithClasspath.h | 2 +- .../SourceGroupSettingsWithCppStandard.cpp | 4 +- ...SettingsWithCxxCrossCompilationOptions.cpp | 4 +- .../SourceGroupSettingsWithExcludeFilters.cpp | 10 +- ...rceGroupSettingsWithIndexedHeaderPaths.cpp | 6 +- .../SourceGroupSettingsWithJavaStandard.cpp | 4 +- ...GroupSettingsWithSonargraphProjectPath.cpp | 4 +- ...ceGroupSettingsWithSonargraphProjectPath.h | 2 +- ...ourceGroupSettingsWithSourceExtensions.cpp | 6 +- .../SourceGroupSettingsWithSourcePaths.cpp | 6 +- src/lib/settings/SourceGroupStatusType.cpp | 4 +- src/lib/settings/SourceGroupType.cpp | 2 +- .../settings/migration/SettingsMigration.cpp | 4 +- .../settings/migration/SettingsMigration.h | 4 +- .../migration/SettingsMigrationDeleteKey.cpp | 2 +- .../migration/SettingsMigrationDeleteKey.h | 2 +- .../migration/SettingsMigrationLambda.cpp | 2 +- .../migration/SettingsMigrationLambda.h | 2 +- .../migration/SettingsMigrationMoveKey.cpp | 2 +- .../migration/SettingsMigrationMoveKey.h | 2 +- src/lib/settings/migration/SettingsMigrator.h | 2 +- src/lib/utility/AppPath.h | 2 +- src/lib/utility/ConfigManager.cpp | 14 +- src/lib/utility/ResourcePaths.h | 2 +- src/lib/utility/ScopedFunctor.cpp | 2 +- src/lib/utility/TimeStamp.h | 2 +- src/lib/utility/UserPaths.cpp | 2 +- src/lib/utility/UserPaths.h | 2 +- .../utility/commandline/CommandLineParser.cpp | 18 +-- .../utility/commandline/CommandLineParser.h | 6 +- .../utility/commandline/CommandlineHelper.cpp | 4 +- .../utility/commandline/CommandlineHelper.h | 4 +- .../commands/CommandlineCommand.cpp | 2 +- .../commandline/commands/CommandlineCommand.h | 2 +- .../commands/CommandlineCommandAcceptEULA.cpp | 6 +- .../commands/CommandlineCommandAcceptEULA.h | 2 +- .../commands/CommandlineCommandConfig.cpp | 10 +- .../commands/CommandlineCommandConfig.h | 2 +- .../commands/CommandlineCommandIndex.cpp | 6 +- .../commands/CommandlineCommandIndex.h | 2 +- src/lib/utility/file/FileInfo.h | 6 +- src/lib/utility/file/FileManager.cpp | 8 +- src/lib/utility/file/FilePath.cpp | 10 +- src/lib/utility/file/FilePathFilter.cpp | 2 +- src/lib/utility/file/FilePathFilter.h | 2 +- src/lib/utility/file/FileRegister.cpp | 6 +- src/lib/utility/file/FileRegister.h | 4 +- src/lib/utility/file/FileSystem.cpp | 8 +- src/lib/utility/file/FileSystem.h | 4 +- src/lib/utility/file/FileTree.cpp | 4 +- src/lib/utility/file/FileTree.h | 2 +- src/lib/utility/interprocess/SharedMemory.cpp | 6 +- .../SharedMemoryGarbageCollector.cpp | 8 +- .../SharedMemoryGarbageCollector.h | 2 +- src/lib/utility/logging/ConsoleLogger.cpp | 2 +- src/lib/utility/logging/ConsoleLogger.h | 4 +- src/lib/utility/logging/FileLogger.cpp | 4 +- src/lib/utility/logging/FileLogger.h | 6 +- src/lib/utility/logging/LogManager.cpp | 12 +- src/lib/utility/logging/LogManager.h | 4 +- .../logging/LogManagerImplementation.h | 2 +- src/lib/utility/logging/Logger.cpp | 2 +- src/lib/utility/logging/Logger.h | 2 +- src/lib/utility/logging/logging.h | 2 +- src/lib/utility/math/Vector2.h | 6 +- src/lib/utility/math/Vector4.h | 6 +- src/lib/utility/messaging/Message.h | 4 +- src/lib/utility/messaging/MessageBase.cpp | 2 +- src/lib/utility/messaging/MessageBase.h | 4 +- src/lib/utility/messaging/MessageFilter.h | 2 +- .../MessageInterruptTasksCounter.cpp | 6 +- src/lib/utility/messaging/MessageListener.h | 6 +- .../utility/messaging/MessageListenerBase.cpp | 2 +- .../utility/messaging/MessageListenerBase.h | 6 +- src/lib/utility/messaging/MessageQueue.cpp | 16 +- src/lib/utility/messaging/MessageQueue.h | 2 +- .../MessageFilterErrorCountUpdate.h | 4 +- .../filter_types/MessageFilterFocusInOut.h | 6 +- .../MessageFilterSearchAutocomplete.h | 4 +- .../messaging/type/MessageActivateAll.h | 6 +- .../messaging/type/MessageActivateBase.h | 2 +- .../messaging/type/MessageActivateBookmark.h | 4 +- .../messaging/type/MessageActivateEdge.h | 10 +- .../messaging/type/MessageActivateFile.h | 4 +- .../type/MessageActivateFullTextSearch.h | 4 +- .../type/MessageActivateLocalSymbols.h | 4 +- .../messaging/type/MessageActivateNodes.h | 4 +- .../type/MessageActivateSourceLocations.h | 4 +- .../messaging/type/MessageActivateTokenIds.h | 4 +- .../messaging/type/MessageActivateTokens.h | 8 +- .../messaging/type/MessageActivateTrail.h | 4 +- .../messaging/type/MessageActivateTrailEdge.h | 10 +- .../messaging/type/MessageActivateWindow.h | 2 +- .../messaging/type/MessageChangeFileView.h | 4 +- .../messaging/type/MessageClearLogView.h | 2 +- .../messaging/type/MessageClearStatusView.h | 2 +- .../messaging/type/MessageCodeReference.h | 2 +- .../messaging/type/MessageDeactivateEdge.h | 2 +- .../type/MessageDisplayBookmarkCreator.h | 2 +- .../messaging/type/MessageDisplayBookmarks.h | 4 +- .../messaging/type/MessageEnteredLicense.h | 2 +- src/lib/utility/messaging/type/MessageFind.h | 2 +- .../messaging/type/MessageFlushUpdates.h | 2 +- .../utility/messaging/type/MessageFocusIn.h | 6 +- .../utility/messaging/type/MessageFocusOut.h | 4 +- .../messaging/type/MessageForceEnterLicense.h | 2 +- .../type/MessageGraphNodeBundleSplit.h | 4 +- .../messaging/type/MessageGraphNodeExpand.h | 4 +- .../messaging/type/MessageGraphNodeHide.h | 4 +- .../messaging/type/MessageGraphNodeMove.h | 6 +- .../messaging/type/MessageIDECreateCDB.h | 2 +- .../messaging/type/MessageInterruptTasks.h | 2 +- .../messaging/type/MessageLoadProject.h | 6 +- .../messaging/type/MessageLogFilterChanged.h | 4 +- .../messaging/type/MessageMoveIDECursor.h | 4 +- .../messaging/type/MessagePingReceived.h | 2 +- .../messaging/type/MessagePluginPortChange.h | 2 +- .../messaging/type/MessageProjectEdit.h | 2 +- .../messaging/type/MessageProjectNew.h | 4 +- .../messaging/type/MessageQuitApplication.h | 2 +- .../utility/messaging/type/MessageRefresh.h | 2 +- .../utility/messaging/type/MessageResetZoom.h | 2 +- .../messaging/type/MessageScrollCode.h | 2 +- .../messaging/type/MessageScrollGraph.h | 2 +- .../messaging/type/MessageScrollSpeedChange.h | 2 +- .../messaging/type/MessageScrollToLine.h | 4 +- .../utility/messaging/type/MessageSearch.h | 6 +- .../type/MessageSearchAutocomplete.h | 6 +- .../messaging/type/MessageShowReference.h | 4 +- .../utility/messaging/type/MessageShowScope.h | 4 +- .../messaging/type/MessageShowStatus.h | 2 +- .../utility/messaging/type/MessageStatus.cpp | 4 +- .../utility/messaging/type/MessageStatus.h | 2 +- .../type/MessageStatusFilterChanged.h | 4 +- .../messaging/type/MessageSwitchColorScheme.h | 2 +- .../messaging/type/MessageTooltipHide.h | 2 +- .../messaging/type/MessageTooltipShow.h | 6 +- .../messaging/type/MessageWindowClosed.h | 2 +- .../messaging/type/MessageWindowFocus.h | 2 +- src/lib/utility/messaging/type/MessageZoom.h | 2 +- .../type/activation/MessageActivateLegend.h | 4 +- .../type/code/MessageCodeShowDefinition.h | 4 +- .../type/error/MessageActivateErrors.h | 6 +- .../type/error/MessageErrorCountClear.h | 2 +- .../type/error/MessageErrorCountUpdate.h | 4 +- .../messaging/type/error/MessageErrorsAll.h | 2 +- .../type/error/MessageErrorsForFile.h | 2 +- .../type/error/MessageErrorsHelpMessage.h | 2 +- .../messaging/type/error/MessageShowError.h | 2 +- .../type/history/MessageHistoryRedo.h | 2 +- .../type/history/MessageHistoryToPosition.h | 2 +- .../type/history/MessageHistoryUndo.h | 2 +- .../type/indexing/MessageIndexingFinished.h | 2 +- .../type/indexing/MessageIndexingShowDialog.h | 2 +- .../type/indexing/MessageIndexingStarted.h | 2 +- .../type/indexing/MessageIndexingStatus.h | 2 +- src/lib/utility/migration/Migrator.h | 2 +- src/lib/utility/scheduling/Blackboard.cpp | 2 +- src/lib/utility/scheduling/Blackboard.h | 2 +- src/lib/utility/scheduling/Task.cpp | 4 +- src/lib/utility/scheduling/TaskDecorator.cpp | 4 +- src/lib/utility/scheduling/TaskDecorator.h | 2 +- .../utility/scheduling/TaskDecoratorDelay.cpp | 2 +- .../utility/scheduling/TaskDecoratorDelay.h | 6 +- .../scheduling/TaskDecoratorRepeat.cpp | 2 +- .../utility/scheduling/TaskDecoratorRepeat.h | 4 +- .../scheduling/TaskFindKeyOnBlackboard.cpp | 4 +- .../scheduling/TaskFindKeyOnBlackboard.h | 2 +- src/lib/utility/scheduling/TaskGroup.cpp | 2 +- src/lib/utility/scheduling/TaskGroup.h | 2 +- .../utility/scheduling/TaskGroupParallel.cpp | 4 +- .../utility/scheduling/TaskGroupParallel.h | 4 +- .../utility/scheduling/TaskGroupSelector.cpp | 2 +- .../utility/scheduling/TaskGroupSelector.h | 4 +- .../utility/scheduling/TaskGroupSequence.cpp | 2 +- .../utility/scheduling/TaskGroupSequence.h | 4 +- src/lib/utility/scheduling/TaskLambda.cpp | 2 +- src/lib/utility/scheduling/TaskLambda.h | 2 +- .../utility/scheduling/TaskReturnSuccessIf.h | 4 +- src/lib/utility/scheduling/TaskRunner.cpp | 8 +- src/lib/utility/scheduling/TaskRunner.h | 2 +- src/lib/utility/scheduling/TaskScheduler.cpp | 6 +- src/lib/utility/scheduling/TaskScheduler.h | 4 +- src/lib/utility/scheduling/TaskSetValue.h | 4 +- .../utility/sonargraph/SonargraphProject.cpp | 14 +- .../utility/sonargraph/SonargraphProject.h | 2 +- .../sonargraph/SonargraphSoftwareSystem.cpp | 14 +- .../sonargraph/SonargraphSoftwareSystem.h | 6 +- .../sonargraph/SonargraphSourceRootPath.cpp | 18 +-- .../sonargraph/SonargraphSourceRootPath.h | 2 +- .../SonargraphXsdAbstractModule.cpp | 22 +-- .../sonargraph/SonargraphXsdAbstractModule.h | 4 +- .../SonargraphXsdAbstractSystemExtension.cpp | 8 +- .../SonargraphXsdCmakeJsonModule.cpp | 36 ++--- .../sonargraph/SonargraphXsdCmakeJsonModule.h | 4 +- .../SonargraphXsdCppManualModule.cpp | 22 +-- .../sonargraph/SonargraphXsdCppManualModule.h | 4 +- .../SonargraphXsdCppSystemSettings.cpp | 12 +- .../SonargraphXsdCppSystemSettings.h | 4 +- .../sonargraph/SonargraphXsdJavaModule.cpp | 26 +-- .../sonargraph/SonargraphXsdJavaModule.h | 2 +- .../sonargraph/SonargraphXsdRootPath.cpp | 20 +-- .../sonargraph/SonargraphXsdRootPath.h | 2 +- .../SonargraphXsdRootPathWithFiles.cpp | 12 +- .../SonargraphXsdRootPathWithFiles.h | 4 +- .../SonargraphXsdSourceRootPath.cpp | 12 +- .../sonargraph/SonargraphXsdSourceRootPath.h | 4 +- .../utility/sonargraph/utilitySonargraph.cpp | 4 +- .../synchronization/ReaderWriterLock.cpp | 2 +- .../synchronization/ScopedReaderLock.cpp | 2 +- .../synchronization/ScopedReaderLock.h | 2 +- .../synchronization/ScopedWriterLock.cpp | 2 +- .../synchronization/ScopedWriterLock.h | 2 +- src/lib/utility/synchronization/Semaphore.cpp | 2 +- src/lib/utility/text/TextAccess.cpp | 2 +- src/lib/utility/text/TextAccess.h | 2 +- src/lib/utility/tracing.cpp | 2 +- src/lib/utility/tracing.h | 6 +- src/lib/utility/utility.cpp | 4 +- src/lib/utility/utility.h | 12 +- src/lib/utility/utilityCxx.cpp | 6 +- src/lib/utility/utilityFile.cpp | 6 +- src/lib/utility/utilityLibrary.h | 4 +- src/lib/utility/utilityMath.cpp | 2 +- src/lib/utility/utilityUuid.cpp | 2 +- src/lib/utility/utilityWindows.cpp | 2 +- src/lib/utility/utilityXml.cpp | 6 +- src/lib/utility/utilityXml.h | 2 +- src/lib_cxx/CMakeLists.txt | 2 +- src/lib_cxx/LanguagePackageCxx.cpp | 2 +- .../indexer/CxxIndexerCommandProvider.cpp | 6 +- .../data/indexer/CxxIndexerCommandProvider.h | 4 +- .../data/indexer/IndexerCommandCxx.cpp | 18 +-- src/lib_cxx/data/indexer/IndexerCommandCxx.h | 2 +- src/lib_cxx/data/indexer/IndexerCxx.cpp | 8 +- src/lib_cxx/data/indexer/IndexerCxx.h | 4 +- src/lib_cxx/data/parser/cxx/ASTAction.h | 6 +- .../data/parser/cxx/ASTActionFactory.cpp | 4 +- src/lib_cxx/data/parser/cxx/ASTConsumer.cpp | 8 +- src/lib_cxx/data/parser/cxx/ASTConsumer.h | 4 +- .../parser/cxx/CanonicalFilePathCache.cpp | 6 +- .../data/parser/cxx/CanonicalFilePathCache.h | 4 +- .../data/parser/cxx/CommentHandler.cpp | 10 +- src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp | 30 ++-- src/lib_cxx/data/parser/cxx/CxxAstVisitor.h | 4 +- .../parser/cxx/CxxAstVisitorComponent.cpp | 2 +- .../data/parser/cxx/CxxAstVisitorComponent.h | 2 +- .../CxxAstVisitorComponentBraceRecorder.cpp | 10 +- .../cxx/CxxAstVisitorComponentBraceRecorder.h | 2 +- .../cxx/CxxAstVisitorComponentContext.cpp | 2 +- .../cxx/CxxAstVisitorComponentContext.h | 4 +- .../cxx/CxxAstVisitorComponentDeclRefKind.cpp | 2 +- .../cxx/CxxAstVisitorComponentDeclRefKind.h | 6 +- .../CxxAstVisitorComponentImplicitCode.cpp | 2 +- .../cxx/CxxAstVisitorComponentImplicitCode.h | 2 +- .../cxx/CxxAstVisitorComponentIndexer.cpp | 18 +-- .../cxx/CxxAstVisitorComponentIndexer.h | 6 +- .../cxx/CxxAstVisitorComponentTypeRefKind.cpp | 2 +- .../cxx/CxxAstVisitorComponentTypeRefKind.h | 6 +- .../cxx/CxxCompilationDatabaseSingle.cpp | 2 +- .../parser/cxx/CxxCompilationDatabaseSingle.h | 2 +- src/lib_cxx/data/parser/cxx/CxxContext.cpp | 2 +- src/lib_cxx/data/parser/cxx/CxxContext.h | 4 +- .../data/parser/cxx/CxxDiagnosticConsumer.cpp | 16 +- .../data/parser/cxx/CxxDiagnosticConsumer.h | 4 +- src/lib_cxx/data/parser/cxx/CxxParser.cpp | 26 +-- src/lib_cxx/data/parser/cxx/CxxParser.h | 2 +- .../data/parser/cxx/CxxVerboseAstVisitor.cpp | 10 +- .../data/parser/cxx/CxxVerboseAstVisitor.h | 6 +- .../data/parser/cxx/PreprocessorCallbacks.cpp | 12 +- .../data/parser/cxx/PreprocessorCallbacks.h | 10 +- .../data/parser/cxx/name/CxxDeclName.cpp | 2 +- .../data/parser/cxx/name/CxxDeclName.h | 4 +- .../parser/cxx/name/CxxFunctionDeclName.cpp | 2 +- .../parser/cxx/name/CxxFunctionDeclName.h | 4 +- src/lib_cxx/data/parser/cxx/name/CxxName.cpp | 2 +- src/lib_cxx/data/parser/cxx/name/CxxName.h | 2 +- .../parser/cxx/name/CxxQualifierFlags.cpp | 2 +- .../cxx/name/CxxStaticFunctionDeclName.cpp | 2 +- .../cxx/name/CxxStaticFunctionDeclName.h | 2 +- .../data/parser/cxx/name/CxxTypeName.cpp | 2 +- .../data/parser/cxx/name/CxxTypeName.h | 6 +- .../parser/cxx/name/CxxVariableDeclName.cpp | 2 +- .../parser/cxx/name/CxxVariableDeclName.h | 4 +- .../parser/cxx/name_resolver/CxxDeclName.h | 27 ---- .../cxx/name_resolver/CxxDeclNameResolver.cpp | 26 +-- .../cxx/name_resolver/CxxDeclNameResolver.h | 6 +- .../cxx/name_resolver/CxxNameResolver.cpp | 2 +- .../CxxSpecifierNameResolver.cpp | 8 +- .../name_resolver/CxxSpecifierNameResolver.h | 2 +- .../CxxTemplateArgumentNameResolver.cpp | 6 +- .../CxxTemplateArgumentNameResolver.h | 2 +- .../CxxTemplateParameterStringResolver.cpp | 6 +- .../CxxTemplateParameterStringResolver.h | 4 +- .../cxx/name_resolver/CxxTypeNameResolver.cpp | 12 +- .../cxx/name_resolver/CxxTypeNameResolver.h | 4 +- src/lib_cxx/data/parser/cxx/utilityClang.cpp | 10 +- src/lib_cxx/data/parser/cxx/utilityClang.h | 4 +- src/lib_cxx/project/SourceGroupCxxCdb.cpp | 20 +-- src/lib_cxx/project/SourceGroupCxxCdb.h | 2 +- .../project/SourceGroupCxxCodeblocks.cpp | 18 +-- .../project/SourceGroupCxxCodeblocks.h | 2 +- src/lib_cxx/project/SourceGroupCxxEmpty.cpp | 22 +-- src/lib_cxx/project/SourceGroupCxxEmpty.h | 2 +- .../project/SourceGroupCxxSonargraph.cpp | 18 +-- .../project/SourceGroupCxxSonargraph.h | 2 +- .../project/SourceGroupFactoryModuleCxx.cpp | 20 +-- .../project/SourceGroupFactoryModuleCxx.h | 2 +- src/lib_cxx/utility/CompilationDatabase.cpp | 12 +- src/lib_cxx/utility/CompilationDatabase.h | 2 +- src/lib_cxx/utility/IncludeDirective.cpp | 2 +- src/lib_cxx/utility/IncludeDirective.h | 2 +- src/lib_cxx/utility/IncludeProcessing.cpp | 18 +-- src/lib_cxx/utility/IncludeProcessing.h | 2 +- .../utility/codeblocks/CodeblocksCompiler.cpp | 6 +- .../codeblocks/CodeblocksCompilerVarType.cpp | 2 +- .../utility/codeblocks/CodeblocksProject.cpp | 26 +-- .../utility/codeblocks/CodeblocksTarget.cpp | 8 +- .../utility/codeblocks/CodeblocksTarget.h | 2 +- .../CodeblocksTargetRelationType.cpp | 2 +- .../utility/codeblocks/CodeblocksUnit.cpp | 6 +- .../utility/codeblocks/CodeblocksUnit.h | 2 +- src/lib_cxx/utility/utilitySourceGroupCxx.cpp | 2 +- src/lib_cxx/utility/utilitySourceGroupCxx.h | 4 +- src/lib_gui/CMakeLists.txt | 2 +- src/lib_gui/platform_includes/includes.h.in | 2 +- src/lib_gui/platform_includes/includesLinux.h | 14 +- src/lib_gui/platform_includes/includesMac.h | 10 +- .../platform_includes/includesWindows.h | 10 +- src/lib_gui/qt/QtApplication.cpp | 12 +- src/lib_gui/qt/QtCoreApplication.cpp | 2 +- src/lib_gui/qt/QtCoreApplication.h | 6 +- .../qt/element/QtAutocompletionList.cpp | 14 +- src/lib_gui/qt/element/QtAutocompletionList.h | 4 +- src/lib_gui/qt/element/QtBookmark.cpp | 4 +- src/lib_gui/qt/element/QtBookmark.h | 6 +- src/lib_gui/qt/element/QtBookmarkCategory.cpp | 4 +- src/lib_gui/qt/element/QtBookmarkCategory.h | 6 +- src/lib_gui/qt/element/QtCodeArea.cpp | 30 ++-- src/lib_gui/qt/element/QtCodeArea.h | 4 +- src/lib_gui/qt/element/QtCodeField.cpp | 24 +-- src/lib_gui/qt/element/QtCodeField.h | 4 +- src/lib_gui/qt/element/QtCodeFile.cpp | 12 +- src/lib_gui/qt/element/QtCodeFile.h | 4 +- src/lib_gui/qt/element/QtCodeFileList.cpp | 24 +-- src/lib_gui/qt/element/QtCodeFileList.h | 6 +- src/lib_gui/qt/element/QtCodeFileSingle.cpp | 20 +-- src/lib_gui/qt/element/QtCodeFileSingle.h | 6 +- src/lib_gui/qt/element/QtCodeFileTitleBar.cpp | 6 +- src/lib_gui/qt/element/QtCodeFileTitleBar.h | 4 +- .../qt/element/QtCodeFileTitleButton.cpp | 18 +-- .../qt/element/QtCodeFileTitleButton.h | 6 +- src/lib_gui/qt/element/QtCodeNavigateable.cpp | 4 +- src/lib_gui/qt/element/QtCodeNavigateable.h | 4 +- src/lib_gui/qt/element/QtCodeNavigator.cpp | 30 ++-- src/lib_gui/qt/element/QtCodeNavigator.h | 22 +-- src/lib_gui/qt/element/QtCodeSnippet.cpp | 10 +- src/lib_gui/qt/element/QtCodeSnippet.h | 6 +- src/lib_gui/qt/element/QtHelpButton.cpp | 4 +- src/lib_gui/qt/element/QtHelpButton.h | 2 +- src/lib_gui/qt/element/QtHistoryList.cpp | 16 +- src/lib_gui/qt/element/QtIconButton.cpp | 6 +- src/lib_gui/qt/element/QtIconButton.h | 8 +- src/lib_gui/qt/element/QtLineEdit.cpp | 2 +- src/lib_gui/qt/element/QtListBox.cpp | 14 +- src/lib_gui/qt/element/QtListBox.h | 2 +- src/lib_gui/qt/element/QtListBoxItem.cpp | 12 +- src/lib_gui/qt/element/QtLocationPicker.cpp | 10 +- src/lib_gui/qt/element/QtLocationPicker.h | 4 +- src/lib_gui/qt/element/QtPathListBox.cpp | 6 +- src/lib_gui/qt/element/QtPathListBox.h | 2 +- src/lib_gui/qt/element/QtPathListBoxItem.cpp | 12 +- src/lib_gui/qt/element/QtPathListBoxItem.h | 2 +- src/lib_gui/qt/element/QtProgressBar.cpp | 4 +- src/lib_gui/qt/element/QtProgressBar.h | 4 +- src/lib_gui/qt/element/QtScreenSearchBox.cpp | 8 +- src/lib_gui/qt/element/QtScreenSearchBox.h | 4 +- src/lib_gui/qt/element/QtSearchBar.cpp | 10 +- src/lib_gui/qt/element/QtSearchBar.h | 2 +- src/lib_gui/qt/element/QtSearchBarButton.cpp | 4 +- src/lib_gui/qt/element/QtSearchBarButton.h | 2 +- src/lib_gui/qt/element/QtSmartSearchBox.cpp | 18 +-- src/lib_gui/qt/element/QtSmartSearchBox.h | 4 +- src/lib_gui/qt/element/QtStatusBar.cpp | 12 +- src/lib_gui/qt/element/QtStatusBar.h | 2 +- src/lib_gui/qt/element/QtStringListBox.cpp | 4 +- src/lib_gui/qt/element/QtStringListBox.h | 4 +- .../qt/element/QtStringListBoxItem.cpp | 4 +- src/lib_gui/qt/element/QtStringListBoxItem.h | 2 +- src/lib_gui/qt/element/QtTable.cpp | 4 +- src/lib_gui/qt/element/QtTooltip.cpp | 12 +- src/lib_gui/qt/element/QtUndoRedo.cpp | 14 +- src/lib_gui/qt/element/QtUndoRedo.h | 4 +- .../qt/element/QtUpdateCheckerWidget.cpp | 8 +- src/lib_gui/qt/graphics/QtCountCircleItem.cpp | 4 +- src/lib_gui/qt/graphics/QtCountCircleItem.h | 4 +- src/lib_gui/qt/graphics/QtGraphicsView.cpp | 36 ++--- src/lib_gui/qt/graphics/QtGraphicsView.h | 2 +- src/lib_gui/qt/graphics/QtLineItemAngled.cpp | 2 +- src/lib_gui/qt/graphics/QtLineItemAngled.h | 2 +- src/lib_gui/qt/graphics/QtLineItemBase.cpp | 2 +- src/lib_gui/qt/graphics/QtLineItemBase.h | 4 +- src/lib_gui/qt/graphics/QtLineItemBezier.cpp | 2 +- src/lib_gui/qt/graphics/QtLineItemBezier.h | 2 +- .../qt/graphics/QtLineItemStraight.cpp | 2 +- src/lib_gui/qt/graphics/QtLineItemStraight.h | 2 +- src/lib_gui/qt/graphics/QtRoundedRectItem.cpp | 2 +- .../network/QtIDECommunicationController.cpp | 2 +- .../qt/network/QtIDECommunicationController.h | 4 +- src/lib_gui/qt/network/QtNetworkFactory.h | 2 +- src/lib_gui/qt/network/QtRequest.cpp | 4 +- src/lib_gui/qt/network/QtTcpWrapper.cpp | 2 +- src/lib_gui/qt/network/QtUpdateChecker.cpp | 14 +- src/lib_gui/qt/network/QtUpdateChecker.h | 4 +- src/lib_gui/qt/utility/QtContextMenu.cpp | 8 +- src/lib_gui/qt/utility/QtContextMenu.h | 2 +- .../qt/utility/QtDeviceScaledPixmap.cpp | 4 +- src/lib_gui/qt/utility/QtFileDialog.cpp | 8 +- .../utility/QtFilesAndDirectoriesDialog.cpp | 6 +- src/lib_gui/qt/utility/QtFlowLayout.cpp | 2 +- src/lib_gui/qt/utility/QtHighlighter.cpp | 8 +- src/lib_gui/qt/utility/QtHighlighter.h | 2 +- .../utility/QtScrollSpeedChangeListener.cpp | 4 +- .../qt/utility/QtScrollSpeedChangeListener.h | 6 +- src/lib_gui/qt/utility/QtThreadedFunctor.h | 4 +- .../qt/utility/QtWindowsTaskbarButton.cpp | 4 +- src/lib_gui/qt/utility/utilityQt.cpp | 20 +-- src/lib_gui/qt/view/QtBookmarkView.cpp | 18 +-- src/lib_gui/qt/view/QtBookmarkView.h | 8 +- src/lib_gui/qt/view/QtCodeView.cpp | 18 +-- src/lib_gui/qt/view/QtCodeView.h | 4 +- src/lib_gui/qt/view/QtCompositeView.cpp | 8 +- src/lib_gui/qt/view/QtCompositeView.h | 4 +- src/lib_gui/qt/view/QtDialogView.cpp | 20 +-- src/lib_gui/qt/view/QtDialogView.h | 16 +- src/lib_gui/qt/view/QtErrorView.cpp | 18 +-- src/lib_gui/qt/view/QtErrorView.h | 10 +- src/lib_gui/qt/view/QtGraphView.cpp | 50 +++--- src/lib_gui/qt/view/QtGraphView.h | 10 +- src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp | 6 +- src/lib_gui/qt/view/QtGraphViewStyleImpl.h | 2 +- src/lib_gui/qt/view/QtMainView.cpp | 6 +- src/lib_gui/qt/view/QtMainView.h | 12 +- src/lib_gui/qt/view/QtRefreshView.cpp | 12 +- src/lib_gui/qt/view/QtRefreshView.h | 4 +- src/lib_gui/qt/view/QtScreenSearchView.cpp | 14 +- src/lib_gui/qt/view/QtScreenSearchView.h | 8 +- src/lib_gui/qt/view/QtSearchView.cpp | 10 +- src/lib_gui/qt/view/QtSearchView.h | 4 +- src/lib_gui/qt/view/QtStatusBarView.cpp | 4 +- src/lib_gui/qt/view/QtStatusBarView.h | 8 +- src/lib_gui/qt/view/QtStatusView.cpp | 16 +- src/lib_gui/qt/view/QtStatusView.h | 4 +- src/lib_gui/qt/view/QtTabbedView.cpp | 12 +- src/lib_gui/qt/view/QtTabbedView.h | 4 +- src/lib_gui/qt/view/QtTooltipView.cpp | 14 +- src/lib_gui/qt/view/QtTooltipView.h | 4 +- src/lib_gui/qt/view/QtUndoRedoView.cpp | 8 +- src/lib_gui/qt/view/QtUndoRedoView.h | 6 +- src/lib_gui/qt/view/QtViewFactory.cpp | 36 ++--- src/lib_gui/qt/view/QtViewFactory.h | 2 +- src/lib_gui/qt/view/QtViewWidgetWrapper.cpp | 6 +- src/lib_gui/qt/view/QtViewWidgetWrapper.h | 2 +- .../qt/view/graphElements/QtGraphEdge.cpp | 36 ++--- .../qt/view/graphElements/QtGraphEdge.h | 6 +- .../qt/view/graphElements/QtGraphNode.cpp | 26 +-- .../qt/view/graphElements/QtGraphNode.h | 4 +- .../view/graphElements/QtGraphNodeAccess.cpp | 12 +- .../qt/view/graphElements/QtGraphNodeAccess.h | 4 +- .../view/graphElements/QtGraphNodeBundle.cpp | 8 +- .../qt/view/graphElements/QtGraphNodeBundle.h | 4 +- .../qt/view/graphElements/QtGraphNodeData.cpp | 18 +-- .../qt/view/graphElements/QtGraphNodeData.h | 2 +- .../graphElements/QtGraphNodeExpandToggle.cpp | 14 +- .../graphElements/QtGraphNodeExpandToggle.h | 2 +- .../view/graphElements/QtGraphNodeGroup.cpp | 12 +- .../qt/view/graphElements/QtGraphNodeGroup.h | 4 +- .../graphElements/QtGraphNodeQualifier.cpp | 6 +- .../view/graphElements/QtGraphNodeQualifier.h | 2 +- .../qt/view/graphElements/QtGraphNodeText.cpp | 2 +- .../qt/view/graphElements/QtGraphNodeText.h | 2 +- .../QtGraphNodeComponentClickable.cpp | 2 +- .../QtGraphNodeComponentClickable.h | 2 +- .../QtGraphNodeComponentMoveable.cpp | 2 +- .../QtGraphNodeComponentMoveable.h | 2 +- src/lib_gui/qt/window/QtAbout.cpp | 12 +- src/lib_gui/qt/window/QtAbout.h | 2 +- src/lib_gui/qt/window/QtAboutLicense.cpp | 2 +- src/lib_gui/qt/window/QtAboutLicense.h | 2 +- src/lib_gui/qt/window/QtBookmarkBrowser.cpp | 8 +- src/lib_gui/qt/window/QtBookmarkBrowser.h | 8 +- src/lib_gui/qt/window/QtBookmarkCreator.cpp | 8 +- src/lib_gui/qt/window/QtBookmarkCreator.h | 8 +- src/lib_gui/qt/window/QtEulaWindow.cpp | 6 +- src/lib_gui/qt/window/QtEulaWindow.h | 2 +- src/lib_gui/qt/window/QtIndexingDialog.cpp | 16 +- src/lib_gui/qt/window/QtIndexingDialog.h | 4 +- src/lib_gui/qt/window/QtKeyboardShortcuts.cpp | 4 +- src/lib_gui/qt/window/QtKeyboardShortcuts.h | 2 +- src/lib_gui/qt/window/QtLicenseWindow.cpp | 8 +- src/lib_gui/qt/window/QtLicenseWindow.h | 2 +- src/lib_gui/qt/window/QtMainWindow.cpp | 84 +++++----- src/lib_gui/qt/window/QtMainWindow.h | 6 +- src/lib_gui/qt/window/QtPathListDialog.cpp | 2 +- src/lib_gui/qt/window/QtPathListDialog.h | 4 +- src/lib_gui/qt/window/QtPreferencesWindow.cpp | 20 +-- src/lib_gui/qt/window/QtPreferencesWindow.h | 4 +- src/lib_gui/qt/window/QtSelectPathsDialog.cpp | 6 +- src/lib_gui/qt/window/QtSelectPathsDialog.h | 2 +- src/lib_gui/qt/window/QtStartScreen.cpp | 18 +-- src/lib_gui/qt/window/QtStartScreen.h | 4 +- src/lib_gui/qt/window/QtTextEditDialog.cpp | 2 +- src/lib_gui/qt/window/QtTextEditDialog.h | 2 +- src/lib_gui/qt/window/QtWindow.cpp | 10 +- src/lib_gui/qt/window/QtWindow.h | 2 +- src/lib_gui/qt/window/QtWindowStack.cpp | 4 +- .../project_wizzard/QtProjectWizzard.cpp | 70 ++++---- .../window/project_wizzard/QtProjectWizzard.h | 10 +- .../QtProjectWizzardContent.cpp | 8 +- .../project_wizzard/QtProjectWizzardContent.h | 8 +- .../QtProjectWizzardContentCStandard.cpp | 4 +- .../QtProjectWizzardContentCStandard.h | 2 +- .../QtProjectWizzardContentCppStandard.cpp | 4 +- .../QtProjectWizzardContentCppStandard.h | 2 +- ...tWizzardContentCrossCompilationOptions.cpp | 6 +- ...ectWizzardContentCrossCompilationOptions.h | 2 +- .../QtProjectWizzardContentExtensions.cpp | 6 +- .../QtProjectWizzardContentExtensions.h | 2 +- .../QtProjectWizzardContentFlags.cpp | 6 +- .../QtProjectWizzardContentFlags.h | 2 +- .../QtProjectWizzardContentGroup.cpp | 2 +- .../QtProjectWizzardContentGroup.h | 2 +- .../QtProjectWizzardContentJavaStandard.cpp | 4 +- .../QtProjectWizzardContentJavaStandard.h | 2 +- .../QtProjectWizzardContentPath.cpp | 52 +++--- .../QtProjectWizzardContentPath.h | 4 +- .../QtProjectWizzardContentPaths.cpp | 62 ++++---- .../QtProjectWizzardContentPaths.h | 6 +- .../QtProjectWizzardContentPreferences.cpp | 18 +-- .../QtProjectWizzardContentPreferences.h | 8 +- .../QtProjectWizzardContentProjectData.cpp | 6 +- .../QtProjectWizzardContentProjectData.h | 4 +- .../QtProjectWizzardContentSelect.cpp | 12 +- .../QtProjectWizzardContentSelect.h | 6 +- ...QtProjectWizzardContentSourceGroupData.cpp | 4 +- .../QtProjectWizzardContentSourceGroupData.h | 4 +- ...ojectWizzardContentSourceGroupInfoText.cpp | 2 +- ...ProjectWizzardContentSourceGroupInfoText.h | 2 +- .../QtProjectWizzardContentVS.cpp | 4 +- .../QtProjectWizzardContentVS.h | 2 +- .../QtProjectWizzardWindow.cpp | 6 +- .../project_wizzard/QtProjectWizzardWindow.h | 2 +- .../project_wizzard/QtSourceGroupWizzard.h | 8 +- .../path_detector/CombinedPathDetector.cpp | 4 +- .../path_detector/CombinedPathDetector.h | 2 +- .../utility/path_detector/PathDetector.cpp | 4 +- .../cxx_header/CxxFrameworkPathDetector.cpp | 8 +- .../cxx_header/CxxFrameworkPathDetector.h | 2 +- .../cxx_header/CxxHeaderPathDetector.cpp | 10 +- .../cxx_header/CxxHeaderPathDetector.h | 2 +- .../CxxVs10To14HeaderPathDetector.cpp | 10 +- .../CxxVs10To14HeaderPathDetector.h | 4 +- .../cxx_header/CxxVs15HeaderPathDetector.cpp | 14 +- .../cxx_header/CxxVs15HeaderPathDetector.h | 4 +- .../cxx_header/utilityCxxHeaderDetection.cpp | 8 +- .../cxx_header/utilityCxxHeaderDetection.h | 4 +- .../java_runtime/JavaPathDetector.cpp | 2 +- .../java_runtime/JavaPathDetector.h | 2 +- .../java_runtime/JavaPathDetectorLinux.cpp | 8 +- .../java_runtime/JavaPathDetectorLinux.h | 2 +- .../java_runtime/JavaPathDetectorMac.cpp | 8 +- .../java_runtime/JavaPathDetectorMac.h | 2 +- .../java_runtime/JavaPathDetectorWindows.cpp | 6 +- .../java_runtime/JavaPathDetectorWindows.h | 2 +- .../JreSystemLibraryPathDetector.cpp | 10 +- .../JreSystemLibraryPathDetector.h | 2 +- .../JreSystemLibraryPathDetectorLinux.cpp | 4 +- .../JreSystemLibraryPathDetectorLinux.h | 2 +- .../JreSystemLibraryPathDetectorMac.cpp | 4 +- .../JreSystemLibraryPathDetectorMac.h | 2 +- .../JreSystemLibraryPathDetectorWindows.cpp | 4 +- .../JreSystemLibraryPathDetectorWindows.h | 2 +- .../MavenPathDetectorUnix.cpp | 6 +- .../maven_executable/MavenPathDetectorUnix.h | 2 +- .../MavenPathDetectorWindows.cpp | 6 +- .../MavenPathDetectorWindows.h | 2 +- src/lib_gui/utility/utilityApp.cpp | 12 +- src/lib_gui/utility/utilityApp.h | 4 +- src/lib_gui/utility/utilityPathDetection.cpp | 30 ++-- src/lib_gui/utility/utilityPathDetection.h | 2 +- src/lib_java/CMakeLists.txt | 2 +- src/lib_java/LanguagePackageJava.cpp | 2 +- .../data/indexer/IndexerCommandJava.cpp | 4 +- .../data/indexer/IndexerCommandJava.h | 2 +- .../indexer/IndexerCommandJavaSonargraph.cpp | 4 +- .../indexer/IndexerCommandJavaSonargraph.h | 2 +- src/lib_java/data/indexer/IndexerJava.cpp | 8 +- src/lib_java/data/indexer/IndexerJava.h | 4 +- .../data/parser/java/JavaEnvironment.cpp | 6 +- .../parser/java/JavaEnvironmentFactory.cpp | 12 +- src/lib_java/data/parser/java/JavaParser.cpp | 22 +-- src/lib_java/data/parser/java/JavaParser.h | 12 +- .../project/SourceGroupFactoryModuleJava.cpp | 18 +-- .../project/SourceGroupFactoryModuleJava.h | 2 +- src/lib_java/project/SourceGroupJava.cpp | 10 +- src/lib_java/project/SourceGroupJava.h | 2 +- src/lib_java/project/SourceGroupJavaEmpty.cpp | 6 +- src/lib_java/project/SourceGroupJavaEmpty.h | 2 +- .../project/SourceGroupJavaGradle.cpp | 16 +- src/lib_java/project/SourceGroupJavaGradle.h | 2 +- src/lib_java/project/SourceGroupJavaMaven.cpp | 20 +-- src/lib_java/project/SourceGroupJavaMaven.h | 2 +- .../project/SourceGroupJavaSonargraph.cpp | 14 +- .../project/SourceGroupJavaSonargraph.h | 2 +- src/lib_java/utility/utilityGradle.cpp | 18 +-- src/lib_java/utility/utilityJava.cpp | 24 +-- src/lib_java/utility/utilityMaven.cpp | 18 +-- src/lib_license/CMakeLists.txt | 2 +- src/lib_license/License.cpp | 26 +-- src/lib_license/utility/Version.cpp | 2 +- src/lib_utility/CMakeLists.txt | 2 +- src/lib_utility/utility/TextCodec.cpp | 2 +- src/lib_utility/utility/utilityString.cpp | 2 +- src/license_generator/CMakeLists.txt | 2 +- src/license_generator/Generator.cpp | 22 +-- src/license_generator/Generator.h | 2 +- src/license_generator/main.cpp | 2 +- src/test/CMakeLists.txt | 2 +- src/test/CommandlineTestSuite.h | 6 +- src/test/ConfigManagerTestSuite.h | 6 +- src/test/CxxIncludeProcessingTestSuite.h | 10 +- src/test/CxxIndexSampleProjectsTestSuite.h | 18 +-- src/test/CxxParserTestSuite.h | 16 +- src/test/CxxTypeNameTestSuite.h | 4 +- src/test/FileManagerTestSuite.h | 10 +- src/test/FilePathFilterTestSuite.h | 4 +- src/test/FilePathTestSuite.h | 4 +- src/test/FileSystemTestSuite.h | 6 +- src/test/GeneratorTestSuite.h | 2 +- src/test/GraphTestSuite.h | 4 +- src/test/JavaIndexSampleProjectsTestSuite.h | 24 +-- src/test/JavaParserTestSuite.h | 18 +-- src/test/LogManagerTestSuite.h | 4 +- src/test/LowMemoryStringMapTestSuite.h | 10 +- src/test/MatrixBaseTestSuite.h | 6 +- src/test/MatrixDynamicBaseTestSuite.h | 6 +- src/test/MessageQueueTestSuite.h | 6 +- src/test/NetworkProtocolHelperTestSuite.h | 2 +- src/test/RefreshInfoGeneratorTestSuite.h | 18 +-- src/test/SearchIndexTestSuite.h | 8 +- src/test/SettingsMigratorTestSuite.h | 10 +- src/test/SettingsTestSuite.h | 8 +- src/test/SharedMemoryTestSuite.h | 2 +- src/test/SourceGroupTestSuite.h | 60 +++---- src/test/SourceLocationCollectionTestSuite.h | 8 +- src/test/SqliteBookmarkStorageTestSuite.h | 6 +- src/test/SqliteIndexStorageTestSuite.h | 6 +- src/test/StorageTestSuite.h | 10 +- src/test/TaskSchedulerTestSuite.h | 10 +- src/test/TestSuiteFixture.cpp | 2 +- src/test/TestSuiteFixture.h | 2 +- src/test/TextAccessTestSuite.h | 4 +- src/test/UtilityMavenTestSuite.h | 8 +- src/test/UtilityStringTestSuite.h | 4 +- src/test/UtilityTestSuite.h | 4 +- src/test/Vector2TestSuite.h | 4 +- src/test/helper/DumpParserClient.h | 4 +- src/test/helper/TestFileRegister.cpp | 2 +- src/test/helper/TestFileRegister.h | 2 +- src/test/helper/TestParserClient.h | 4 +- 961 files changed, 3441 insertions(+), 3441 deletions(-) create mode 100644 cmake/productVersion.h.in delete mode 100644 src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclName.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d3f5d3b1..38dff936 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,6 +234,19 @@ if(Qt5Widgets_FOUND) endif() +add_subdirectory(src/app) +add_subdirectory(src/external) +add_subdirectory(src/indexer) +add_subdirectory(src/lib) +add_subdirectory(src/lib_cxx) +add_subdirectory(src/lib_gui) +add_subdirectory(src/lib_java) +add_subdirectory(src/lib_license) +add_subdirectory(src/lib_utility) +add_subdirectory(src/license_generator) +add_subdirectory(src/test) + + # Lib License ------------------------------------------------------------------ if (UNIX) @@ -245,14 +258,12 @@ else () endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) endif () -add_subdirectory(src/lib_license) - add_library(${LIB_LICENSE_PROJECT_NAME} STATIC ${LIB_LICENSE_FILES}) create_source_groups(${LIB_LICENSE_FILES}) target_include_directories( ${LIB_LICENSE_PROJECT_NAME} PUBLIC - "${CMAKE_SOURCE_DIR}/src/lib_license" + "${LIB_LICENSE_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/lib_license" ) @@ -275,8 +286,6 @@ endif() # Lib Utility ------------------------------------------------------------------ -add_subdirectory(src/lib_utility) - add_library(${LIB_UTILITY_PROJECT_NAME} ${LIB_UTILITY_FILES}) create_source_groups(${LIB_UTILITY_FILES}) @@ -284,7 +293,7 @@ create_source_groups(${LIB_UTILITY_FILES}) set_property( TARGET ${LIB_UTILITY_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib_utility" + "${LIB_UTILITY_INCLUDE_PATHS}" ) target_include_directories(${LIB_UTILITY_PROJECT_NAME} SYSTEM @@ -300,9 +309,6 @@ endif() # Lib -------------------------------------------------------------------------- -add_subdirectory(src/lib) -add_subdirectory(src/external) - set_source_files_properties(${EXTERNAL_FILES} PROPERTIES COMPILE_FLAGS "-w") set_source_files_properties(${EXTERNAL_C_FILES} PROPERTIES COMPILE_FLAGS "-std=gnu89 -w") @@ -315,19 +321,19 @@ create_source_groups(${EXTERNAL_C_FILES}) set_property( TARGET ${LIB_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib" - "${CMAKE_SOURCE_DIR}/src/external" - "${CMAKE_SOURCE_DIR}/src/lib_license" - "${CMAKE_SOURCE_DIR}/src/lib_gui" - "${CMAKE_SOURCE_DIR}/src/lib_utility" + "${LIB_INCLUDE_PATHS}" + "${LIB_LICENSE_INCLUDE_PATHS}" + "${LIB_GUI_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_CXX_INCLUDE_PATHS}" + "${LIB_JAVA_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/lib_license" - "${CMAKE_SOURCE_DIR}/src/lib_cxx" - "${CMAKE_SOURCE_DIR}/src/lib_java" ) target_include_directories(${LIB_PROJECT_NAME} SYSTEM PUBLIC ${Boost_INCLUDE_DIR} - "${CMAKE_SOURCE_DIR}/src/external" + "${EXTERNAL_INCLUDE_PATHS}" + "${EXTERNAL_C_INCLUDE_PATHS}" ) target_link_libraries(${LIB_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES}) @@ -335,8 +341,6 @@ target_link_libraries(${LIB_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_LICE # Lib Cxx ---------------------------------------------------------------------- -add_subdirectory(src/lib_cxx) - add_library(${LIB_CXX_PROJECT_NAME} ${LIB_CXX_FILES}) create_source_groups(${LIB_CXX_FILES}) @@ -344,16 +348,17 @@ create_source_groups(${LIB_CXX_FILES}) set_property( TARGET ${LIB_CXX_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib_cxx" - "${CMAKE_SOURCE_DIR}/src/lib_utility" - "${CMAKE_SOURCE_DIR}/src/lib" + "${LIB_CXX_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_INCLUDE_PATHS}" ) target_include_directories(${LIB_CXX_PROJECT_NAME} SYSTEM PUBLIC ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - "${CMAKE_SOURCE_DIR}/src/external" + "${EXTERNAL_INCLUDE_PATHS}" + "${EXTERNAL_C_INCLUDE_PATHS}" ) link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) @@ -370,8 +375,6 @@ endif() find_package(JNI) -add_subdirectory(src/lib_java) - add_library(${LIB_JAVA_PROJECT_NAME} ${LIB_JAVA_FILES}) create_source_groups(${LIB_JAVA_FILES}) @@ -379,10 +382,10 @@ create_source_groups(${LIB_JAVA_FILES}) set_property( TARGET ${LIB_JAVA_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib_java" - "${CMAKE_SOURCE_DIR}/src/lib_utility" - "${CMAKE_SOURCE_DIR}/src/lib" - "${CMAKE_SOURCE_DIR}/src/lib_gui" + "${LIB_JAVA_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_INCLUDE_PATHS}" + "${LIB_GUI_INCLUDE_PATHS}" ) target_include_directories(${LIB_JAVA_PROJECT_NAME} SYSTEM @@ -404,8 +407,6 @@ add_custom_command( # Lib Gui ---------------------------------------------------------------------- -add_subdirectory(src/lib_gui) - # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. @@ -417,7 +418,7 @@ add_custom_target( versionnumber ALL ) -add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/version.h) +add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h) if(UNIX) target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg) @@ -430,7 +431,7 @@ add_custom_command( TARGET versionnumber PRE_BUILD COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake - BYPRODUCTS ${CMAKE_BINARY_DIR}/src/lib_gui/version.h + BYPRODUCTS ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h DEPENDS ${LIB_GUI_PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "check/update version number" @@ -442,20 +443,21 @@ create_source_groups(${LIB_GUI_FILES}) set_property( TARGET ${LIB_GUI_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib_gui" - "${CMAKE_SOURCE_DIR}/src/lib_utility" - "${CMAKE_SOURCE_DIR}/src/lib" - "${CMAKE_SOURCE_DIR}/src/lib_cxx" - "${CMAKE_SOURCE_DIR}/src/lib_java" - "${CMAKE_SOURCE_DIR}/src/lib_license" + "${LIB_GUI_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_INCLUDE_PATHS}" + "${LIB_CXX_INCLUDE_PATHS}" + "${LIB_JAVA_INCLUDE_PATHS}" + "${LIB_LICENSE_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/lib_gui" "${CMAKE_BINARY_DIR}/src/lib_license" ) # include external header without warnings target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM - PUBLIC "${CMAKE_SOURCE_DIR}/src/external" - PUBLIC ${Boost_INCLUDE_DIRS} + PUBLIC ${Boost_INCLUDE_DIRS} + "${EXTERNAL_INCLUDE_PATHS}" + "${EXTERNAL_C_INCLUDE_PATHS}" ) # configure platform specific include file @@ -487,8 +489,6 @@ else () endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) endif () -add_subdirectory(src/indexer) - # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -519,13 +519,13 @@ endif () set_property( TARGET ${APP_INDEXER_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/app" - "${CMAKE_SOURCE_DIR}/src/lib" - "${CMAKE_SOURCE_DIR}/src/lib_utility" - "${CMAKE_SOURCE_DIR}/src/lib_gui" - "${CMAKE_SOURCE_DIR}/src/lib_license" - "${CMAKE_SOURCE_DIR}/src/lib_cxx" - "${CMAKE_SOURCE_DIR}/src/lib_java" + "${APP_INCLUDE_PATHS}" + "${LIB_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_GUI_INCLUDE_PATHS}" + "${LIB_LICENSE_INCLUDE_PATHS}" + "${LIB_CXX_INCLUDE_PATHS}" + "${LIB_JAVA_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/lib_gui" "${CMAKE_BINARY_DIR}/src/lib_license" ) @@ -542,8 +542,6 @@ else () endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) endif () -add_subdirectory(src/app) - # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -577,20 +575,21 @@ target_link_libraries(${APP_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${LIB_CXX_PROJ set_property( TARGET ${APP_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/app" - "${CMAKE_SOURCE_DIR}/src/lib" - "${CMAKE_SOURCE_DIR}/src/lib_utility" - "${CMAKE_SOURCE_DIR}/src/lib_gui" - "${CMAKE_SOURCE_DIR}/src/lib_license" - "${CMAKE_SOURCE_DIR}/src/lib_cxx" - "${CMAKE_SOURCE_DIR}/src/lib_java" + "${APP_INCLUDE_PATHS}" + "${LIB_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_GUI_INCLUDE_PATHS}" + "${LIB_LICENSE_INCLUDE_PATHS}" + "${LIB_CXX_INCLUDE_PATHS}" + "${LIB_JAVA_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/lib_gui" "${CMAKE_BINARY_DIR}/src/lib_license" ) target_include_directories(${APP_PROJECT_NAME} SYSTEM - PUBLIC "${CMAKE_SOURCE_DIR}/src/external" - PUBLIC ${Boost_INCLUDE_DIRS} + PUBLIC ${Boost_INCLUDE_DIRS} + "${EXTERNAL_INCLUDE_PATHS}" + "${EXTERNAL_C_INCLUDE_PATHS}" ) # Use the Widgets module from Qt 5. @@ -657,8 +656,6 @@ endif () # License Generator ----------------------------------------------------------- -add_subdirectory(src/license_generator) - # configure private key for the sourcetrail version include(cmake/private_key.cmake) @@ -671,14 +668,15 @@ else () endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) endif () -add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN}) +add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN_FILES}) -create_source_groups(${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN}) +create_source_groups(${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN_FILES}) set_property( TARGET ${LICENSE_GENERATOR_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES - "${CMAKE_SOURCE_DIR}/src/lib_license" + "${LICENSE_GENERATOR_MAIN_INCLUDE_PATHS}" + "${LIB_LICENSE_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/license_generator" "${CMAKE_BINARY_DIR}/src/lib_license" ) @@ -710,8 +708,6 @@ if (WIN32) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp "") endif () -add_subdirectory(src/test) - set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR}) set(CXXTEST_PYTHON_TESTGEN_EXECUTABLE ${CXXTEST_INCLUDE_DIR}/bin/cxxtestgen) set(TESTGEN_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp) @@ -731,15 +727,17 @@ if (CXXTEST_FOUND) TARGET ${TEST_PROJECT_NAME} PROPERTY INCLUDE_DIRECTORIES "${CXXTEST_INCLUDE_DIR}" - "${CMAKE_SOURCE_DIR}/src/lib" - "${CMAKE_SOURCE_DIR}/src/lib_utility" - "${CMAKE_SOURCE_DIR}/src/lib_gui" - "${CMAKE_SOURCE_DIR}/src/lib_cxx" - "${CMAKE_SOURCE_DIR}/src/lib_java" - "${CMAKE_SOURCE_DIR}/src/external" - "${CMAKE_SOURCE_DIR}/src/lib_license" + "${TEST_INCLUDE_PATHS}" + "${LIB_INCLUDE_PATHS}" + "${LIB_UTILITY_INCLUDE_PATHS}" + "${LIB_GUI_INCLUDE_PATHS}" + "${LIB_LICENSE_INCLUDE_PATHS}" + "${LIB_CXX_INCLUDE_PATHS}" + "${LIB_JAVA_INCLUDE_PATHS}" + "${EXTERNAL_INCLUDE_PATHS}" + "${EXTERNAL_C_INCLUDE_PATHS}" + "${LICENSE_GENERATOR_INCLUDE_PATHS}" "${CMAKE_BINARY_DIR}/src/lib_license" - "${CMAKE_SOURCE_DIR}/src/license_generator" "${CMAKE_BINARY_DIR}/src/license_generator" "${Boost_INCLUDE_DIRS}" ) diff --git a/cmake/add_files.cmake b/cmake/add_files.cmake index 50d56e20..569a8115 100644 --- a/cmake/add_files.cmake +++ b/cmake/add_files.cmake @@ -12,18 +12,34 @@ # macro(add_files var_name) file (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") - + +# extract source file paths + set(files_var_name ${var_name}_FILES) + foreach (_src ${ARGN}) if (_relPath) - list (APPEND ${var_name} "${_relPath}/${_src}") + list (APPEND ${files_var_name} "${_relPath}/${_src}") else() - list (APPEND ${var_name} "${_src}") + list (APPEND ${files_var_name} "${_src}") endif() endforeach() + +# extract source file directories + set(include_paths_var_name ${var_name}_INCLUDE_PATHS) + + foreach (_src ${${files_var_name}}) + get_filename_component(PARENT_DIR "${_src}" DIRECTORY) + list (APPEND ${include_paths_var_name} "${CMAKE_SOURCE_DIR}/${PARENT_DIR}") + endforeach() + + list(REMOVE_DUPLICATES ${include_paths_var_name}) if (_relPath) - set(${var_name} ${${var_name}} PARENT_SCOPE) + set(${files_var_name} ${${files_var_name}} PARENT_SCOPE) + set(${include_paths_var_name} ${${include_paths_var_name}} PARENT_SCOPE) else() - set(${var_name} ${${var_name}}) + set(${files_var_name} ${${files_var_name}}) + set(${include_paths_var_name} ${${include_paths_var_name}}) endif() + endmacro() diff --git a/cmake/productVersion.h.in b/cmake/productVersion.h.in new file mode 100644 index 00000000..8705cb61 --- /dev/null +++ b/cmake/productVersion.h.in @@ -0,0 +1,12 @@ +#ifndef SOURCETRAIL_VERSION_H +#define SOURCETRAIL_VERSION_H + +#define GIT_BRANCH "@GIT_BRANCH@" +#define GIT_VERSION_NUMBER "@GIT_VERSION_NUMBER@" +#define GIT_COMMIT_HASH "@GIT_COMMIT_HASH@" +#define GIT_COMMIT_TIME "@GIT_COMMIT_TIME@" +#define VERSION_YEAR @VERSION_YEAR@ +#define VERSION_MINOR @VERSION_MINOR@ +#define VERSION_COMMIT @VERSION_COMMIT@ + +#endif // SOURCETRAIL_VERSION_H diff --git a/cmake/version.cmake b/cmake/version.cmake index 608f89ca..c66f82a2 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -50,6 +50,6 @@ message(STATUS "Version commit: ${VERSION_COMMIT}") message(STATUS "Git commit time: ${GIT_COMMIT_TIME}") configure_file( - ${CMAKE_SOURCE_DIR}/cmake/version.h.in - ${BINARY_DIR}/src/lib_gui/version.h + ${CMAKE_SOURCE_DIR}/cmake/productVersion.h.in + ${BINARY_DIR}/src/lib_gui/productVersion.h ) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 7565aa8a..f43d9ad6 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - APP_FILES + APP main.cpp ) diff --git a/src/app/main.cpp b/src/app/main.cpp index d91af2b7..f2ef1da2 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,4 +1,4 @@ -#include "includes.h" // defines 'void setup(int argc, char *argv[])' +#include "includes.h" #include @@ -6,34 +6,34 @@ #include "LanguagePackageCxx.h" #include "LanguagePackageJava.h" #include "LanguagePackageManager.h" -#include "project/SourceGroupFactory.h" -#include "project/SourceGroupFactoryModuleCxx.h" -#include "project/SourceGroupFactoryModuleJava.h" -#include "qt/network/QtNetworkFactory.h" -#include "qt/QtApplication.h" -#include "qt/QtCoreApplication.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewFactory.h" -#include "qt/window/QtEulaWindow.h" -#include "settings/ApplicationSettings.h" -#include "utility/commandline/CommandLineParser.h" -#include "utility/logging/ConsoleLogger.h" -#include "utility/logging/FileLogger.h" -#include "utility/logging/logging.h" -#include "utility/logging/LogManager.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/ResourcePaths.h" -#include "utility/ScopedFunctor.h" -#include "utility/text/TextAccess.h" -#include "utility/UserPaths.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" -#include "utility/utilityCxx.h" -#include "utility/utilityPathDetection.h" -#include "utility/Version.h" -#include "version.h" +#include "SourceGroupFactory.h" +#include "SourceGroupFactoryModuleCxx.h" +#include "SourceGroupFactoryModuleJava.h" +#include "QtNetworkFactory.h" +#include "QtApplication.h" +#include "QtCoreApplication.h" +#include "utilityQt.h" +#include "QtViewFactory.h" +#include "QtEulaWindow.h" +#include "ApplicationSettings.h" +#include "CommandLineParser.h" +#include "ConsoleLogger.h" +#include "FileLogger.h" +#include "logging.h" +#include "LogManager.h" +#include "MessageInterruptTasks.h" +#include "MessageLoadProject.h" +#include "MessageStatus.h" +#include "ResourcePaths.h" +#include "ScopedFunctor.h" +#include "TextAccess.h" +#include "UserPaths.h" +#include "utility.h" +#include "utilityApp.h" +#include "utilityCxx.h" +#include "utilityPathDetection.h" +#include "Version.h" +#include "productVersion.h" void signalHandler(int signum) { diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt index 780e04ab..07f7eb8e 100644 --- a/src/external/CMakeLists.txt +++ b/src/external/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - EXTERNAL_FILES + EXTERNAL sqlite/CppSQLite3.cpp sqlite/CppSQLite3.h @@ -13,7 +13,7 @@ add_files( ) add_files( - EXTERNAL_C_FILES + EXTERNAL_C sqlite/sqlite3.c sqlite/sqlite3.h diff --git a/src/indexer/CMakeLists.txt b/src/indexer/CMakeLists.txt index 4de95018..5cc28246 100644 --- a/src/indexer/CMakeLists.txt +++ b/src/indexer/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - INDEXER_FILES + INDEXER main.cpp ) diff --git a/src/indexer/main.cpp b/src/indexer/main.cpp index a36cec23..b4823ad0 100644 --- a/src/indexer/main.cpp +++ b/src/indexer/main.cpp @@ -3,13 +3,13 @@ #include "LanguagePackageCxx.h" #include "LanguagePackageJava.h" #include "LanguagePackageManager.h" -#include "data/indexer/interprocess/InterprocessIndexer.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" +#include "InterprocessIndexer.h" +#include "ApplicationSettings.h" +#include "AppPath.h" +#include "ConsoleLogger.h" +#include "FileLogger.h" +#include "logging.h" +#include "LogManager.h" void setupLogging(const FilePath& logFilePath) { diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp index 9be0f9d2..29979deb 100644 --- a/src/lib/Application.cpp +++ b/src/lib/Application.cpp @@ -1,33 +1,33 @@ #include "Application.h" -#include "component/controller/IDECommunicationController.h" -#include "component/NetworkFactory.h" -#include "component/view/DialogView.h" -#include "component/view/GraphViewStyle.h" -#include "component/view/MainView.h" -#include "component/view/ViewFactory.h" -#include "data/storage/StorageCache.h" +#include "IDECommunicationController.h" +#include "NetworkFactory.h" +#include "DialogView.h" +#include "GraphViewStyle.h" +#include "MainView.h" +#include "ViewFactory.h" +#include "StorageCache.h" #include "LicenseChecker.h" -#include "settings/ApplicationSettings.h" -#include "settings/ProjectSettings.h" -#include "settings/ColorScheme.h" -#include "utility/file/FileSystem.h" -#include "utility/interprocess/SharedMemoryGarbageCollector.h" -#include "utility/logging/logging.h" -#include "utility/logging/LogManager.h" -#include "utility/messaging/filter_types/MessageFilterErrorCountUpdate.h" -#include "utility/messaging/filter_types/MessageFilterFocusInOut.h" -#include "utility/messaging/filter_types/MessageFilterSearchAutocomplete.h" -#include "utility/messaging/MessageQueue.h" -#include "utility/messaging/type/MessageForceEnterLicense.h" -#include "utility/messaging/type/MessageQuitApplication.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/scheduling/TaskScheduler.h" -#include "utility/tracing.h" -#include "utility/UserPaths.h" -#include "utility/utilityString.h" -#include "utility/utilityUuid.h" -#include "utility/Version.h" +#include "ApplicationSettings.h" +#include "ProjectSettings.h" +#include "ColorScheme.h" +#include "FileSystem.h" +#include "SharedMemoryGarbageCollector.h" +#include "logging.h" +#include "LogManager.h" +#include "MessageFilterErrorCountUpdate.h" +#include "MessageFilterFocusInOut.h" +#include "MessageFilterSearchAutocomplete.h" +#include "MessageQueue.h" +#include "MessageForceEnterLicense.h" +#include "MessageQuitApplication.h" +#include "MessageStatus.h" +#include "TaskScheduler.h" +#include "tracing.h" +#include "UserPaths.h" +#include "utilityString.h" +#include "utilityUuid.h" +#include "Version.h" #include "UpdateChecker.h" std::shared_ptr Application::s_instance; diff --git a/src/lib/Application.h b/src/lib/Application.h index a6634a73..c85aae2c 100644 --- a/src/lib/Application.h +++ b/src/lib/Application.h @@ -3,16 +3,16 @@ #include -#include "component/ComponentManager.h" -#include "project/Project.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/MessageActivateWindow.h" -#include "utility/messaging/type/MessageEnteredLicense.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageSwitchColorScheme.h" -#include "utility/messaging/type/MessageWindowFocus.h" +#include "ComponentManager.h" +#include "Project.h" +#include "MessageListener.h" +#include "MessageIndexingFinished.h" +#include "MessageActivateWindow.h" +#include "MessageEnteredLicense.h" +#include "MessageLoadProject.h" +#include "MessageRefresh.h" +#include "MessageSwitchColorScheme.h" +#include "MessageWindowFocus.h" class Bookmark; class DialogView; diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index f74f3412..2ecd76c6 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,6 +1,6 @@ add_files( - LIB_FILES + LIB component/controller/helper/BucketLayouter.cpp component/controller/helper/BucketLayouter.h @@ -424,6 +424,8 @@ add_files( utility/messaging/filter_types/MessageFilterFocusInOut.h utility/messaging/filter_types/MessageFilterSearchAutocomplete.h + utility/messaging/type/activation/MessageActivateLegend.h + utility/messaging/type/code/MessageCodeShowDefinition.h utility/messaging/type/error/MessageActivateErrors.h diff --git a/src/lib/LanguagePackageManager.cpp b/src/lib/LanguagePackageManager.cpp index 92fcbf0b..69f607f7 100644 --- a/src/lib/LanguagePackageManager.cpp +++ b/src/lib/LanguagePackageManager.cpp @@ -1,6 +1,6 @@ #include "LanguagePackageManager.h" -#include "data/indexer/IndexerComposite.h" +#include "IndexerComposite.h" #include "LanguagePackage.h" std::shared_ptr LanguagePackageManager::getInstance() diff --git a/src/lib/LicenseChecker.cpp b/src/lib/LicenseChecker.cpp index c12856f1..976ce5d1 100644 --- a/src/lib/LicenseChecker.cpp +++ b/src/lib/LicenseChecker.cpp @@ -1,13 +1,13 @@ #include "LicenseChecker.h" -#include "utility/AppPath.h" -#include "utility/logging/logging.h" -#include "utility/utilityApp.h" -#include "utility/messaging/type/MessageForceEnterLicense.h" +#include "AppPath.h" +#include "logging.h" +#include "utilityApp.h" +#include "MessageForceEnterLicense.h" #include "License.h" #include "PublicKey.h" -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" void LicenseChecker::createInstance() { diff --git a/src/lib/LicenseChecker.h b/src/lib/LicenseChecker.h index 36b6c4a7..d16a2f88 100644 --- a/src/lib/LicenseChecker.h +++ b/src/lib/LicenseChecker.h @@ -1,7 +1,7 @@ #ifndef LICENSE_CHECKER_H #define LICENSE_CHECKER_H -#include "utility/messaging/type/MessageEnteredLicense.h" +#include "MessageEnteredLicense.h" class License; diff --git a/src/lib/component/Component.cpp b/src/lib/component/Component.cpp index 30ebe7b8..79faf5a0 100644 --- a/src/lib/component/Component.cpp +++ b/src/lib/component/Component.cpp @@ -1,7 +1,7 @@ -#include "component/Component.h" +#include "Component.h" -#include "component/view/View.h" -#include "component/controller/Controller.h" +#include "View.h" +#include "Controller.h" Component::Component(std::shared_ptr view, std::shared_ptr controller) : m_controller(controller) diff --git a/src/lib/component/ComponentFactory.cpp b/src/lib/component/ComponentFactory.cpp index 86eccb4f..3e329eae 100644 --- a/src/lib/component/ComponentFactory.cpp +++ b/src/lib/component/ComponentFactory.cpp @@ -1,29 +1,29 @@ -#include "component/ComponentFactory.h" +#include "ComponentFactory.h" -#include "component/Component.h" -#include "component/controller/ActivationController.h" -#include "component/controller/BookmarkController.h" -#include "component/controller/CodeController.h" -#include "component/controller/ErrorController.h" -#include "component/controller/GraphController.h" -#include "component/controller/RefreshController.h" -#include "component/controller/ScreenSearchController.h" -#include "component/controller/SearchController.h" -#include "component/controller/StatusBarController.h" -#include "component/controller/StatusController.h" -#include "component/controller/TooltipController.h" -#include "component/controller/UndoRedoController.h" -#include "component/view/BookmarkView.h" -#include "component/view/CodeView.h" -#include "component/view/ErrorView.h" -#include "component/view/RefreshView.h" -#include "component/view/ScreenSearchView.h" -#include "component/view/SearchView.h" -#include "component/view/StatusBarView.h" -#include "component/view/StatusView.h" -#include "component/view/TooltipView.h" -#include "component/view/UndoRedoView.h" -#include "component/view/ViewFactory.h" +#include "Component.h" +#include "ActivationController.h" +#include "BookmarkController.h" +#include "CodeController.h" +#include "ErrorController.h" +#include "GraphController.h" +#include "RefreshController.h" +#include "ScreenSearchController.h" +#include "SearchController.h" +#include "StatusBarController.h" +#include "StatusController.h" +#include "TooltipController.h" +#include "UndoRedoController.h" +#include "BookmarkView.h" +#include "CodeView.h" +#include "ErrorView.h" +#include "RefreshView.h" +#include "ScreenSearchView.h" +#include "SearchView.h" +#include "StatusBarView.h" +#include "StatusView.h" +#include "TooltipView.h" +#include "UndoRedoView.h" +#include "ViewFactory.h" std::shared_ptr ComponentFactory::create(ViewFactory* viewFactory, StorageAccess* storageAccess) { diff --git a/src/lib/component/ComponentFactory.h b/src/lib/component/ComponentFactory.h index 5e15be4a..db27cbe8 100644 --- a/src/lib/component/ComponentFactory.h +++ b/src/lib/component/ComponentFactory.h @@ -3,7 +3,7 @@ #include -#include "data/access/StorageAccess.h" +#include "StorageAccess.h" class Component; class ViewFactory; diff --git a/src/lib/component/ComponentManager.cpp b/src/lib/component/ComponentManager.cpp index f933e9a9..3ec98e4e 100644 --- a/src/lib/component/ComponentManager.cpp +++ b/src/lib/component/ComponentManager.cpp @@ -1,13 +1,13 @@ -#include "component/ComponentManager.h" +#include "ComponentManager.h" -#include "utility/logging/logging.h" +#include "logging.h" -#include "component/controller/Controller.h" -#include "component/controller/ScreenSearchController.h" -#include "component/view/CompositeView.h" -#include "component/view/DialogView.h" -#include "component/view/TabbedView.h" -#include "component/view/ViewFactory.h" +#include "Controller.h" +#include "ScreenSearchController.h" +#include "CompositeView.h" +#include "DialogView.h" +#include "TabbedView.h" +#include "ViewFactory.h" std::shared_ptr ComponentManager::create(ViewFactory* viewFactory, StorageAccess* storageAccess) { diff --git a/src/lib/component/ComponentManager.h b/src/lib/component/ComponentManager.h index 1ccd442e..e61a6c9d 100644 --- a/src/lib/component/ComponentManager.h +++ b/src/lib/component/ComponentManager.h @@ -4,9 +4,9 @@ #include #include -#include "component/Component.h" -#include "component/ComponentFactory.h" -#include "component/view/DialogView.h" +#include "Component.h" +#include "ComponentFactory.h" +#include "DialogView.h" class CompositeView; class DialogView; diff --git a/src/lib/component/NetworkFactory.cpp b/src/lib/component/NetworkFactory.cpp index 6583a058..492471e4 100644 --- a/src/lib/component/NetworkFactory.cpp +++ b/src/lib/component/NetworkFactory.cpp @@ -1,4 +1,4 @@ -#include "component/NetworkFactory.h" +#include "NetworkFactory.h" NetworkFactory::NetworkFactory() { diff --git a/src/lib/component/controller/ActivationController.cpp b/src/lib/component/controller/ActivationController.cpp index fa6cc9e8..fb15010c 100644 --- a/src/lib/component/controller/ActivationController.cpp +++ b/src/lib/component/controller/ActivationController.cpp @@ -1,18 +1,18 @@ -#include "component/controller/ActivationController.h" +#include "ActivationController.h" -#include "data/access/StorageAccess.h" -#include "settings/ApplicationSettings.h" +#include "StorageAccess.h" +#include "ApplicationSettings.h" -#include "utility/messaging/type/activation/MessageActivateLegend.h" -#include "utility/messaging/type/error/MessageErrorsAll.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageChangeFileView.h" -#include "utility/messaging/type/MessageFlushUpdates.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/messaging/type/MessageScrollToLine.h" -#include "utility/utility.h" +#include "MessageActivateLegend.h" +#include "MessageErrorsAll.h" +#include "MessageActivateAll.h" +#include "MessageActivateTokens.h" +#include "MessageChangeFileView.h" +#include "MessageFlushUpdates.h" +#include "MessageRefresh.h" +#include "MessageStatus.h" +#include "MessageScrollToLine.h" +#include "utility.h" ActivationController::ActivationController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/ActivationController.h b/src/lib/component/controller/ActivationController.h index 7d4af7a1..55ee325e 100644 --- a/src/lib/component/controller/ActivationController.h +++ b/src/lib/component/controller/ActivationController.h @@ -3,17 +3,17 @@ #include -#include "component/controller/Controller.h" +#include "Controller.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageActivateEdge.h" -#include "utility/messaging/type/MessageActivateFile.h" -#include "utility/messaging/type/MessageActivateNodes.h" -#include "utility/messaging/type/MessageActivateTokenIds.h" -#include "utility/messaging/type/MessageActivateSourceLocations.h" -#include "utility/messaging/type/MessageResetZoom.h" -#include "utility/messaging/type/MessageSearch.h" -#include "utility/messaging/type/MessageZoom.h" +#include "MessageListener.h" +#include "MessageActivateEdge.h" +#include "MessageActivateFile.h" +#include "MessageActivateNodes.h" +#include "MessageActivateTokenIds.h" +#include "MessageActivateSourceLocations.h" +#include "MessageResetZoom.h" +#include "MessageSearch.h" +#include "MessageZoom.h" class StorageAccess; diff --git a/src/lib/component/controller/BookmarkController.cpp b/src/lib/component/controller/BookmarkController.cpp index f565cb64..250dc0df 100644 --- a/src/lib/component/controller/BookmarkController.cpp +++ b/src/lib/component/controller/BookmarkController.cpp @@ -1,18 +1,18 @@ #include "BookmarkController.h" #include "Application.h" -#include "component/view/BookmarkView.h" -#include "data/access/StorageAccess.h" -#include "data/bookmark/Bookmark.h" -#include "data/bookmark/EdgeBookmark.h" -#include "data/bookmark/NodeBookmark.h" -#include "data/storage/type/StorageEdge.h" +#include "BookmarkView.h" +#include "StorageAccess.h" +#include "Bookmark.h" +#include "EdgeBookmark.h" +#include "NodeBookmark.h" +#include "StorageEdge.h" -#include "utility/messaging/type/MessageActivateEdge.h" -#include "utility/messaging/type/MessageActivateNodes.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" -#include "utility/utility.h" +#include "MessageActivateEdge.h" +#include "MessageActivateNodes.h" +#include "logging.h" +#include "utilityString.h" +#include "utility.h" const std::wstring BookmarkController::s_edgeSeperatorToken = L" => "; const std::wstring BookmarkController::s_defaultCategoryName = L"default"; diff --git a/src/lib/component/controller/BookmarkController.h b/src/lib/component/controller/BookmarkController.h index 71ae986d..4dc9f6c4 100644 --- a/src/lib/component/controller/BookmarkController.h +++ b/src/lib/component/controller/BookmarkController.h @@ -1,20 +1,20 @@ #ifndef BOOKMARK_CONTROLLER_H #define BOOKMARK_CONTROLLER_H -#include "data/bookmark/Bookmark.h" -#include "data/bookmark/NodeBookmark.h" -#include "data/bookmark/EdgeBookmark.h" +#include "Bookmark.h" +#include "NodeBookmark.h" +#include "EdgeBookmark.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/error/MessageActivateErrors.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateBookmark.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageDisplayBookmarkCreator.h" -#include "utility/messaging/type/MessageDisplayBookmarks.h" +#include "MessageListener.h" +#include "MessageActivateErrors.h" +#include "MessageIndexingFinished.h" +#include "MessageActivateAll.h" +#include "MessageActivateBookmark.h" +#include "MessageActivateTokens.h" +#include "MessageDisplayBookmarkCreator.h" +#include "MessageDisplayBookmarks.h" -#include "component/controller/Controller.h" +#include "Controller.h" class StorageAccess; diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp index 289220f8..ab1c5539 100644 --- a/src/lib/component/controller/CodeController.cpp +++ b/src/lib/component/controller/CodeController.cpp @@ -1,18 +1,18 @@ -#include "component/controller/CodeController.h" +#include "CodeController.h" #include -#include "data/access/StorageAccess.h" -#include "data/location/SourceLocation.h" -#include "data/location/SourceLocationCollection.h" -#include "data/location/SourceLocationFile.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FileInfo.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/text/TextAccess.h" -#include "utility/tracing.h" -#include "utility/utilityString.h" +#include "StorageAccess.h" +#include "SourceLocation.h" +#include "SourceLocationCollection.h" +#include "SourceLocationFile.h" +#include "ApplicationSettings.h" +#include "FileInfo.h" +#include "logging.h" +#include "MessageStatus.h" +#include "TextAccess.h" +#include "tracing.h" +#include "utilityString.h" #include "Application.h" CodeController::CodeController(StorageAccess* storageAccess) diff --git a/src/lib/component/controller/CodeController.h b/src/lib/component/controller/CodeController.h index d9057204..a3dda681 100644 --- a/src/lib/component/controller/CodeController.h +++ b/src/lib/component/controller/CodeController.h @@ -4,31 +4,31 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/activation/MessageActivateLegend.h" -#include "utility/messaging/type/code/MessageCodeShowDefinition.h" -#include "utility/messaging/type/error/MessageActivateErrors.h" -#include "utility/messaging/type/error/MessageErrorCountClear.h" -#include "utility/messaging/type/error/MessageShowError.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateFullTextSearch.h" -#include "utility/messaging/type/MessageActivateLocalSymbols.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageActivateTrailEdge.h" -#include "utility/messaging/type/MessageChangeFileView.h" -#include "utility/messaging/type/MessageDeactivateEdge.h" -#include "utility/messaging/type/MessageFlushUpdates.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageScrollCode.h" -#include "utility/messaging/type/MessageScrollToLine.h" -#include "utility/messaging/type/MessageShowScope.h" -#include "utility/types.h" +#include "FilePath.h" +#include "MessageListener.h" +#include "MessageActivateLegend.h" +#include "MessageCodeShowDefinition.h" +#include "MessageActivateErrors.h" +#include "MessageErrorCountClear.h" +#include "MessageShowError.h" +#include "MessageActivateAll.h" +#include "MessageActivateFullTextSearch.h" +#include "MessageActivateLocalSymbols.h" +#include "MessageActivateTokens.h" +#include "MessageActivateTrailEdge.h" +#include "MessageChangeFileView.h" +#include "MessageDeactivateEdge.h" +#include "MessageFlushUpdates.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageScrollCode.h" +#include "MessageScrollToLine.h" +#include "MessageShowScope.h" +#include "types.h" -#include "component/controller/helper/SnippetMerger.h" -#include "component/controller/Controller.h" -#include "component/view/CodeView.h" +#include "SnippetMerger.h" +#include "Controller.h" +#include "CodeView.h" class StorageAccess; class SourceLocation; diff --git a/src/lib/component/controller/Controller.h b/src/lib/component/controller/Controller.h index 4e546e52..9201578f 100644 --- a/src/lib/component/controller/Controller.h +++ b/src/lib/component/controller/Controller.h @@ -1,7 +1,7 @@ #ifndef CONTROLLER_H #define CONTROLLER_H -#include "component/Component.h" +#include "Component.h" class Controller { diff --git a/src/lib/component/controller/ErrorController.cpp b/src/lib/component/controller/ErrorController.cpp index 447d00fb..2c445dab 100644 --- a/src/lib/component/controller/ErrorController.cpp +++ b/src/lib/component/controller/ErrorController.cpp @@ -1,10 +1,10 @@ -#include "component/controller/ErrorController.h" +#include "ErrorController.h" #include "Application.h" -#include "component/view/DialogView.h" -#include "data/access/StorageAccess.h" -#include "project/Project.h" -#include "settings/ApplicationSettings.h" +#include "DialogView.h" +#include "StorageAccess.h" +#include "Project.h" +#include "ApplicationSettings.h" ErrorController::ErrorController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/ErrorController.h b/src/lib/component/controller/ErrorController.h index d0f19aca..30b3eb8e 100644 --- a/src/lib/component/controller/ErrorController.h +++ b/src/lib/component/controller/ErrorController.h @@ -1,22 +1,22 @@ #ifndef ERROR_CONTROLLER_H #define ERROR_CONTROLLER_H -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/error/MessageActivateErrors.h" -#include "utility/messaging/type/error/MessageErrorCountClear.h" -#include "utility/messaging/type/error/MessageErrorCountUpdate.h" -#include "utility/messaging/type/error/MessageErrorsAll.h" -#include "utility/messaging/type/error/MessageErrorsForFile.h" -#include "utility/messaging/type/error/MessageErrorsHelpMessage.h" -#include "utility/messaging/type/error/MessageShowError.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/indexing/MessageIndexingStarted.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateFullTextSearch.h" -#include "utility/messaging/type/MessageActivateTokens.h" +#include "MessageListener.h" +#include "MessageActivateErrors.h" +#include "MessageErrorCountClear.h" +#include "MessageErrorCountUpdate.h" +#include "MessageErrorsAll.h" +#include "MessageErrorsForFile.h" +#include "MessageErrorsHelpMessage.h" +#include "MessageShowError.h" +#include "MessageIndexingFinished.h" +#include "MessageIndexingStarted.h" +#include "MessageActivateAll.h" +#include "MessageActivateFullTextSearch.h" +#include "MessageActivateTokens.h" -#include "component/controller/Controller.h" -#include "component/view/ErrorView.h" +#include "Controller.h" +#include "ErrorView.h" class StorageAccess; diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index ad4a09f6..fc506974 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -1,26 +1,26 @@ -#include "component/controller/GraphController.h" +#include "GraphController.h" #include -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageActivateNodes.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/tracing.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "MessageActivateNodes.h" +#include "MessageStatus.h" +#include "tracing.h" +#include "utility.h" +#include "utilityString.h" #include "Application.h" -#include "component/controller/helper/BucketLayouter.h" -#include "component/controller/helper/ListLayouter.h" -#include "component/controller/helper/TrailLayouter.h" -#include "component/view/GraphView.h" -#include "component/view/GraphViewStyle.h" -#include "data/access/StorageAccess.h" -#include "data/graph/token_component/TokenComponentAccess.h" -#include "data/graph/token_component/TokenComponentFilePath.h" -#include "data/graph/Graph.h" -#include "data/parser/AccessKind.h" -#include "settings/ApplicationSettings.h" +#include "BucketLayouter.h" +#include "ListLayouter.h" +#include "TrailLayouter.h" +#include "GraphView.h" +#include "GraphViewStyle.h" +#include "StorageAccess.h" +#include "TokenComponentAccess.h" +#include "TokenComponentFilePath.h" +#include "Graph.h" +#include "AccessKind.h" +#include "ApplicationSettings.h" GraphController::GraphController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/GraphController.h b/src/lib/component/controller/GraphController.h index 11c5298d..5434282b 100644 --- a/src/lib/component/controller/GraphController.h +++ b/src/lib/component/controller/GraphController.h @@ -4,29 +4,29 @@ #include #include -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/activation/MessageActivateLegend.h" -#include "utility/messaging/type/error/MessageActivateErrors.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateFullTextSearch.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageActivateTrail.h" -#include "utility/messaging/type/MessageActivateTrailEdge.h" -#include "utility/messaging/type/MessageFlushUpdates.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageGraphNodeBundleSplit.h" -#include "utility/messaging/type/MessageGraphNodeExpand.h" -#include "utility/messaging/type/MessageGraphNodeHide.h" -#include "utility/messaging/type/MessageGraphNodeMove.h" -#include "utility/messaging/type/MessageScrollGraph.h" -#include "utility/messaging/type/MessageShowReference.h" +#include "MessageListener.h" +#include "MessageActivateLegend.h" +#include "MessageActivateErrors.h" +#include "MessageActivateAll.h" +#include "MessageActivateFullTextSearch.h" +#include "MessageActivateTokens.h" +#include "MessageActivateTrail.h" +#include "MessageActivateTrailEdge.h" +#include "MessageFlushUpdates.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageGraphNodeBundleSplit.h" +#include "MessageGraphNodeExpand.h" +#include "MessageGraphNodeHide.h" +#include "MessageGraphNodeMove.h" +#include "MessageScrollGraph.h" +#include "MessageShowReference.h" -#include "component/controller/Controller.h" -#include "component/controller/helper/DummyEdge.h" -#include "component/controller/helper/DummyNode.h" -#include "component/view/GraphView.h" -#include "data/graph/Node.h" +#include "Controller.h" +#include "DummyEdge.h" +#include "DummyNode.h" +#include "GraphView.h" +#include "Node.h" class Graph; class StorageAccess; diff --git a/src/lib/component/controller/IDECommunicationController.cpp b/src/lib/component/controller/IDECommunicationController.cpp index 84bb9a06..13764fec 100644 --- a/src/lib/component/controller/IDECommunicationController.cpp +++ b/src/lib/component/controller/IDECommunicationController.cpp @@ -1,16 +1,16 @@ #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/MessageProjectNew.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/messaging/type/MessageActivateFile.h" -#include "utility/messaging/type/MessagePingReceived.h" +#include "FileSystem.h" +#include "logging.h" +#include "MessageActivateSourceLocations.h" +#include "MessageActivateWindow.h" +#include "MessageProjectNew.h" +#include "MessageStatus.h" +#include "MessageActivateFile.h" +#include "MessagePingReceived.h" -#include "data/access/StorageAccess.h" -#include "data/location/SourceLocationFile.h" +#include "StorageAccess.h" +#include "SourceLocationFile.h" IDECommunicationController::IDECommunicationController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/IDECommunicationController.h b/src/lib/component/controller/IDECommunicationController.h index f5844aee..160b04e0 100644 --- a/src/lib/component/controller/IDECommunicationController.h +++ b/src/lib/component/controller/IDECommunicationController.h @@ -3,14 +3,14 @@ #include -#include "component/controller/Controller.h" -#include "component/controller/helper/NetworkProtocolHelper.h" +#include "Controller.h" +#include "NetworkProtocolHelper.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageWindowFocus.h" -#include "utility/messaging/type/MessageIDECreateCDB.h" -#include "utility/messaging/type/MessageMoveIDECursor.h" -#include "utility/messaging/type/MessagePluginPortChange.h" +#include "MessageListener.h" +#include "MessageWindowFocus.h" +#include "MessageIDECreateCDB.h" +#include "MessageMoveIDECursor.h" +#include "MessagePluginPortChange.h" class StorageAccess; diff --git a/src/lib/component/controller/RefreshController.cpp b/src/lib/component/controller/RefreshController.cpp index c276a3e2..58981325 100644 --- a/src/lib/component/controller/RefreshController.cpp +++ b/src/lib/component/controller/RefreshController.cpp @@ -1,6 +1,6 @@ -#include "component/controller/RefreshController.h" +#include "RefreshController.h" -#include "component/view/RefreshView.h" +#include "RefreshView.h" RefreshController::RefreshController() { diff --git a/src/lib/component/controller/RefreshController.h b/src/lib/component/controller/RefreshController.h index 1aa416ef..da6ba32f 100644 --- a/src/lib/component/controller/RefreshController.h +++ b/src/lib/component/controller/RefreshController.h @@ -1,7 +1,7 @@ #ifndef REFRESH_CONTROLLER_H #define REFRESH_CONTROLLER_H -#include "component/controller/Controller.h" +#include "Controller.h" class RefreshView; diff --git a/src/lib/component/controller/ScreenSearchController.cpp b/src/lib/component/controller/ScreenSearchController.cpp index 085dec33..c25c4d9f 100644 --- a/src/lib/component/controller/ScreenSearchController.cpp +++ b/src/lib/component/controller/ScreenSearchController.cpp @@ -1,6 +1,6 @@ -#include "component/controller/ScreenSearchController.h" +#include "ScreenSearchController.h" -#include "component/view/ScreenSearchView.h" +#include "ScreenSearchView.h" ScreenSearchController::ScreenSearchController() { diff --git a/src/lib/component/controller/ScreenSearchController.h b/src/lib/component/controller/ScreenSearchController.h index 1d1ab2f5..74d26954 100644 --- a/src/lib/component/controller/ScreenSearchController.h +++ b/src/lib/component/controller/ScreenSearchController.h @@ -4,9 +4,9 @@ #include #include -#include "component/controller/Controller.h" -#include "component/controller/helper/ScreenSearchInterfaces.h" -#include "utility/messaging/MessageListener.h" +#include "Controller.h" +#include "ScreenSearchInterfaces.h" +#include "MessageListener.h" class ScreenSearchController : public Controller diff --git a/src/lib/component/controller/SearchController.cpp b/src/lib/component/controller/SearchController.cpp index 3ccdabd0..5cbc0969 100644 --- a/src/lib/component/controller/SearchController.cpp +++ b/src/lib/component/controller/SearchController.cpp @@ -1,9 +1,9 @@ -#include "component/controller/SearchController.h" +#include "SearchController.h" -#include "component/view/SearchView.h" -#include "data/access/StorageAccess.h" -#include "utility/logging/logging.h" -#include "utility/tracing.h" +#include "SearchView.h" +#include "StorageAccess.h" +#include "logging.h" +#include "tracing.h" SearchController::SearchController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/SearchController.h b/src/lib/component/controller/SearchController.h index 7b9748ad..27da44ae 100644 --- a/src/lib/component/controller/SearchController.h +++ b/src/lib/component/controller/SearchController.h @@ -1,15 +1,15 @@ #ifndef SEARCH_CONTROLLER_H #define SEARCH_CONTROLLER_H -#include "component/controller/Controller.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/activation/MessageActivateLegend.h" -#include "utility/messaging/type/error/MessageActivateErrors.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateFullTextSearch.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageFind.h" -#include "utility/messaging/type/MessageSearchAutocomplete.h" +#include "Controller.h" +#include "MessageListener.h" +#include "MessageActivateLegend.h" +#include "MessageActivateErrors.h" +#include "MessageActivateAll.h" +#include "MessageActivateFullTextSearch.h" +#include "MessageActivateTokens.h" +#include "MessageFind.h" +#include "MessageSearchAutocomplete.h" class StorageAccess; class SearchView; diff --git a/src/lib/component/controller/StatusBarController.cpp b/src/lib/component/controller/StatusBarController.cpp index a784ef0f..8a00a715 100644 --- a/src/lib/component/controller/StatusBarController.cpp +++ b/src/lib/component/controller/StatusBarController.cpp @@ -1,8 +1,8 @@ -#include "component/controller/StatusBarController.h" +#include "StatusBarController.h" -#include "component/view/StatusBarView.h" -#include "data/access/StorageAccess.h" -#include "utility/logging/logging.h" +#include "StatusBarView.h" +#include "StorageAccess.h" +#include "logging.h" StatusBarController::StatusBarController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/StatusBarController.h b/src/lib/component/controller/StatusBarController.h index ccbe2eb4..3966e9bc 100644 --- a/src/lib/component/controller/StatusBarController.h +++ b/src/lib/component/controller/StatusBarController.h @@ -3,17 +3,17 @@ #include -#include "component/controller/Controller.h" +#include "Controller.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/error/MessageErrorCountClear.h" -#include "utility/messaging/type/error/MessageErrorCountUpdate.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/indexing/MessageIndexingStarted.h" -#include "utility/messaging/type/indexing/MessageIndexingStatus.h" -#include "utility/messaging/type/MessagePingReceived.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageStatus.h" +#include "MessageListener.h" +#include "MessageErrorCountClear.h" +#include "MessageErrorCountUpdate.h" +#include "MessageIndexingFinished.h" +#include "MessageIndexingStarted.h" +#include "MessageIndexingStatus.h" +#include "MessagePingReceived.h" +#include "MessageRefresh.h" +#include "MessageStatus.h" class StatusBarView; class StorageAccess; diff --git a/src/lib/component/controller/StatusController.cpp b/src/lib/component/controller/StatusController.cpp index b7d39788..e1cef9df 100644 --- a/src/lib/component/controller/StatusController.cpp +++ b/src/lib/component/controller/StatusController.cpp @@ -1,8 +1,8 @@ -#include "component/controller/StatusController.h" +#include "StatusController.h" -#include "settings/ApplicationSettings.h" -#include "component/view/StatusView.h" -#include "utility/utility.h" +#include "ApplicationSettings.h" +#include "StatusView.h" +#include "utility.h" StatusController::StatusController() { diff --git a/src/lib/component/controller/StatusController.h b/src/lib/component/controller/StatusController.h index 5a1fe3f7..9b985351 100644 --- a/src/lib/component/controller/StatusController.h +++ b/src/lib/component/controller/StatusController.h @@ -1,14 +1,14 @@ #ifndef STATUS_CONTROLLER_H #define STATUS_CONTROLLER_H -#include "component/controller/Controller.h" +#include "Controller.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageClearStatusView.h" -#include "utility/messaging/type/MessageShowStatus.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/messaging/type/MessageStatusFilterChanged.h" -#include "utility/Status.h" +#include "MessageListener.h" +#include "MessageClearStatusView.h" +#include "MessageShowStatus.h" +#include "MessageStatus.h" +#include "MessageStatusFilterChanged.h" +#include "Status.h" class StatusView; class StorageAccess; diff --git a/src/lib/component/controller/TooltipController.cpp b/src/lib/component/controller/TooltipController.cpp index e6948a3a..4231d87b 100644 --- a/src/lib/component/controller/TooltipController.cpp +++ b/src/lib/component/controller/TooltipController.cpp @@ -1,13 +1,13 @@ #include "TooltipController.h" -#include "component/view/CodeView.h" -#include "component/view/GraphView.h" -#include "component/view/TooltipView.h" -#include "data/access/StorageAccess.h" +#include "CodeView.h" +#include "GraphView.h" +#include "TooltipView.h" +#include "StorageAccess.h" -#include "utility/messaging/type/MessageActivateSourceLocations.h" -#include "utility/scheduling/TaskDecoratorDelay.h" -#include "utility/scheduling/TaskLambda.h" +#include "MessageActivateSourceLocations.h" +#include "TaskDecoratorDelay.h" +#include "TaskLambda.h" Id TooltipController::TooltipRequest::s_requestId = 1; diff --git a/src/lib/component/controller/TooltipController.h b/src/lib/component/controller/TooltipController.h index a13e5db7..235e0b87 100644 --- a/src/lib/component/controller/TooltipController.h +++ b/src/lib/component/controller/TooltipController.h @@ -1,18 +1,18 @@ #ifndef TOOLTIP_CONTROLLER_H #define TOOLTIP_CONTROLLER_H -#include "component/controller/Controller.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageActivateLocalSymbols.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageGraphNodeExpand.h" -#include "utility/messaging/type/MessageScrollCode.h" -#include "utility/messaging/type/MessageScrollGraph.h" -#include "utility/messaging/type/MessageTooltipHide.h" -#include "utility/messaging/type/MessageTooltipShow.h" -#include "utility/messaging/type/MessageWindowFocus.h" +#include "Controller.h" +#include "MessageListener.h" +#include "MessageActivateTokens.h" +#include "MessageActivateLocalSymbols.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageGraphNodeExpand.h" +#include "MessageScrollCode.h" +#include "MessageScrollGraph.h" +#include "MessageTooltipHide.h" +#include "MessageTooltipShow.h" +#include "MessageWindowFocus.h" class StorageAccess; class TooltipView; diff --git a/src/lib/component/controller/UndoRedoController.cpp b/src/lib/component/controller/UndoRedoController.cpp index daa735e1..18493f8a 100644 --- a/src/lib/component/controller/UndoRedoController.cpp +++ b/src/lib/component/controller/UndoRedoController.cpp @@ -1,13 +1,13 @@ -#include "component/controller/UndoRedoController.h" +#include "UndoRedoController.h" -#include "utility/messaging/type/MessageFlushUpdates.h" -#include "utility/messaging/type/MessageSearch.h" -#include "utility/utility.h" +#include "MessageFlushUpdates.h" +#include "MessageSearch.h" +#include "utility.h" #include "Application.h" -#include "component/view/UndoRedoView.h" -#include "data/access/StorageAccess.h" -#include "project/Project.h" +#include "UndoRedoView.h" +#include "StorageAccess.h" +#include "Project.h" UndoRedoController::UndoRedoController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) diff --git a/src/lib/component/controller/UndoRedoController.h b/src/lib/component/controller/UndoRedoController.h index d576b852..c13425b6 100644 --- a/src/lib/component/controller/UndoRedoController.h +++ b/src/lib/component/controller/UndoRedoController.h @@ -3,35 +3,35 @@ #include -#include "utility/messaging/MessageBase.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/activation/MessageActivateLegend.h" -#include "utility/messaging/type/code/MessageCodeShowDefinition.h" -#include "utility/messaging/type/error/MessageActivateErrors.h" -#include "utility/messaging/type/error/MessageShowError.h" -#include "utility/messaging/type/history/MessageHistoryRedo.h" -#include "utility/messaging/type/history/MessageHistoryToPosition.h" -#include "utility/messaging/type/history/MessageHistoryUndo.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateFullTextSearch.h" -#include "utility/messaging/type/MessageActivateLocalSymbols.h" -#include "utility/messaging/type/MessageActivateTokens.h" -#include "utility/messaging/type/MessageActivateTrail.h" -#include "utility/messaging/type/MessageActivateTrailEdge.h" -#include "utility/messaging/type/MessageChangeFileView.h" -#include "utility/messaging/type/MessageDeactivateEdge.h" -#include "utility/messaging/type/MessageGraphNodeBundleSplit.h" -#include "utility/messaging/type/MessageGraphNodeExpand.h" -#include "utility/messaging/type/MessageGraphNodeHide.h" -#include "utility/messaging/type/MessageGraphNodeMove.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageScrollCode.h" -#include "utility/messaging/type/MessageScrollGraph.h" -#include "utility/messaging/type/MessageShowReference.h" -#include "utility/messaging/type/MessageShowScope.h" +#include "MessageBase.h" +#include "MessageListener.h" +#include "MessageActivateLegend.h" +#include "MessageCodeShowDefinition.h" +#include "MessageActivateErrors.h" +#include "MessageShowError.h" +#include "MessageHistoryRedo.h" +#include "MessageHistoryToPosition.h" +#include "MessageHistoryUndo.h" +#include "MessageIndexingFinished.h" +#include "MessageActivateAll.h" +#include "MessageActivateFullTextSearch.h" +#include "MessageActivateLocalSymbols.h" +#include "MessageActivateTokens.h" +#include "MessageActivateTrail.h" +#include "MessageActivateTrailEdge.h" +#include "MessageChangeFileView.h" +#include "MessageDeactivateEdge.h" +#include "MessageGraphNodeBundleSplit.h" +#include "MessageGraphNodeExpand.h" +#include "MessageGraphNodeHide.h" +#include "MessageGraphNodeMove.h" +#include "MessageRefresh.h" +#include "MessageScrollCode.h" +#include "MessageScrollGraph.h" +#include "MessageShowReference.h" +#include "MessageShowScope.h" -#include "component/controller/Controller.h" +#include "Controller.h" class StorageAccess; class UndoRedoView; diff --git a/src/lib/component/controller/helper/BucketLayouter.cpp b/src/lib/component/controller/helper/BucketLayouter.cpp index 231011fc..2e18de35 100644 --- a/src/lib/component/controller/helper/BucketLayouter.cpp +++ b/src/lib/component/controller/helper/BucketLayouter.cpp @@ -1,7 +1,7 @@ -#include "component/controller/helper/BucketLayouter.h" +#include "BucketLayouter.h" -#include "component/controller/helper/DummyEdge.h" -#include "component/view/GraphViewStyle.h" +#include "DummyEdge.h" +#include "GraphViewStyle.h" Bucket::Bucket() : i(0) diff --git a/src/lib/component/controller/helper/BucketLayouter.h b/src/lib/component/controller/helper/BucketLayouter.h index 47b1351c..55f6e825 100644 --- a/src/lib/component/controller/helper/BucketLayouter.h +++ b/src/lib/component/controller/helper/BucketLayouter.h @@ -3,10 +3,10 @@ #include -#include "utility/math/Vector2.h" -#include "utility/types.h" +#include "Vector2.h" +#include "types.h" -#include "component/controller/helper/DummyNode.h" +#include "DummyNode.h" struct DummyEdge; diff --git a/src/lib/component/controller/helper/ControllerProxy.h b/src/lib/component/controller/helper/ControllerProxy.h index a423064a..4c324ba5 100644 --- a/src/lib/component/controller/helper/ControllerProxy.h +++ b/src/lib/component/controller/helper/ControllerProxy.h @@ -3,9 +3,9 @@ #include -#include "utility/scheduling/TaskLambda.h" +#include "TaskLambda.h" -#include "component/view/View.h" +#include "View.h" template class ControllerProxy diff --git a/src/lib/component/controller/helper/DummyEdge.h b/src/lib/component/controller/helper/DummyEdge.h index 75a6213f..e486a5fe 100644 --- a/src/lib/component/controller/helper/DummyEdge.h +++ b/src/lib/component/controller/helper/DummyEdge.h @@ -1,11 +1,11 @@ #ifndef DUMMY_EDGE_H #define DUMMY_EDGE_H -#include "utility/types.h" -#include "utility/math/Vector4.h" +#include "types.h" +#include "Vector4.h" -#include "data/graph/Edge.h" -#include "data/graph/token_component/TokenComponentAggregation.h" +#include "Edge.h" +#include "TokenComponentAggregation.h" class Edge; diff --git a/src/lib/component/controller/helper/DummyNode.h b/src/lib/component/controller/helper/DummyNode.h index 33f1976c..d2e08f98 100644 --- a/src/lib/component/controller/helper/DummyNode.h +++ b/src/lib/component/controller/helper/DummyNode.h @@ -1,16 +1,16 @@ #ifndef DUMMY_NODE_H #define DUMMY_NODE_H -#include "utility/math/Vector2.h" -#include "utility/math/Vector4.h" -#include "utility/types.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "Vector2.h" +#include "Vector4.h" +#include "types.h" +#include "utility.h" +#include "utilityString.h" -#include "data/graph/Node.h" -#include "data/GroupType.h" -#include "data/name/NameHierarchy.h" -#include "data/parser/AccessKind.h" +#include "Node.h" +#include "GroupType.h" +#include "NameHierarchy.h" +#include "AccessKind.h" // temporary data structure for (visual) graph creation process struct DummyNode diff --git a/src/lib/component/controller/helper/ListLayouter.cpp b/src/lib/component/controller/helper/ListLayouter.cpp index bc310fbd..1bdb77d0 100644 --- a/src/lib/component/controller/helper/ListLayouter.cpp +++ b/src/lib/component/controller/helper/ListLayouter.cpp @@ -1,9 +1,9 @@ -#include "component/controller/helper/ListLayouter.h" +#include "ListLayouter.h" #include -#include "component/controller/helper/DummyNode.h" -#include "component/view/GraphViewStyle.h" +#include "DummyNode.h" +#include "GraphViewStyle.h" void ListLayouter::layoutRow(std::vector>* nodes, int gap) { diff --git a/src/lib/component/controller/helper/ListLayouter.h b/src/lib/component/controller/helper/ListLayouter.h index e91d0ac0..5711fb08 100644 --- a/src/lib/component/controller/helper/ListLayouter.h +++ b/src/lib/component/controller/helper/ListLayouter.h @@ -4,8 +4,8 @@ #include #include -#include "utility/math/Vector2.h" -#include "utility/math/Vector4.h" +#include "Vector2.h" +#include "Vector4.h" struct DummyNode; diff --git a/src/lib/component/controller/helper/NetworkProtocolHelper.cpp b/src/lib/component/controller/helper/NetworkProtocolHelper.cpp index 8454019f..f0dca5b9 100644 --- a/src/lib/component/controller/helper/NetworkProtocolHelper.cpp +++ b/src/lib/component/controller/helper/NetworkProtocolHelper.cpp @@ -5,8 +5,8 @@ #include -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" std::wstring NetworkProtocolHelper::s_divider = L">>"; std::wstring NetworkProtocolHelper::s_setActiveTokenPrefix = L"setActiveToken"; diff --git a/src/lib/component/controller/helper/NetworkProtocolHelper.h b/src/lib/component/controller/helper/NetworkProtocolHelper.h index 72d51768..828a014f 100644 --- a/src/lib/component/controller/helper/NetworkProtocolHelper.h +++ b/src/lib/component/controller/helper/NetworkProtocolHelper.h @@ -4,7 +4,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class NetworkProtocolHelper { diff --git a/src/lib/component/controller/helper/SnippetMerger.cpp b/src/lib/component/controller/helper/SnippetMerger.cpp index 8b525e89..74006f07 100644 --- a/src/lib/component/controller/helper/SnippetMerger.cpp +++ b/src/lib/component/controller/helper/SnippetMerger.cpp @@ -1,7 +1,7 @@ -#include "component/controller/helper/SnippetMerger.h" +#include "SnippetMerger.h" #include -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" SnippetMerger::SnippetMerger(int startRow, int endRow) : m_start(startRow) diff --git a/src/lib/component/controller/helper/TrailLayouter.cpp b/src/lib/component/controller/helper/TrailLayouter.cpp index bc46bc3d..d35d3de2 100644 --- a/src/lib/component/controller/helper/TrailLayouter.cpp +++ b/src/lib/component/controller/helper/TrailLayouter.cpp @@ -1,4 +1,4 @@ -#include "component/controller/helper/TrailLayouter.h" +#include "TrailLayouter.h" #include diff --git a/src/lib/component/controller/helper/TrailLayouter.h b/src/lib/component/controller/helper/TrailLayouter.h index 24c26aed..6ea6f274 100644 --- a/src/lib/component/controller/helper/TrailLayouter.h +++ b/src/lib/component/controller/helper/TrailLayouter.h @@ -5,8 +5,8 @@ #include #include -#include "component/controller/helper/DummyEdge.h" -#include "component/controller/helper/DummyNode.h" +#include "DummyEdge.h" +#include "DummyNode.h" // based on Sugiyama dependency graph layouting diff --git a/src/lib/component/view/BookmarkView.cpp b/src/lib/component/view/BookmarkView.cpp index f6668e9d..e76a848e 100644 --- a/src/lib/component/view/BookmarkView.cpp +++ b/src/lib/component/view/BookmarkView.cpp @@ -1,6 +1,6 @@ -#include "component/view/BookmarkView.h" +#include "BookmarkView.h" -#include "component/controller/BookmarkController.h" +#include "BookmarkController.h" BookmarkView::BookmarkView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/BookmarkView.h b/src/lib/component/view/BookmarkView.h index 993e8604..ed79cc16 100644 --- a/src/lib/component/view/BookmarkView.h +++ b/src/lib/component/view/BookmarkView.h @@ -1,8 +1,8 @@ #ifndef BOOKMARK_VIEW_H #define BOOKMARK_VIEW_H -#include "component/view/View.h" -#include "data/bookmark/Bookmark.h" +#include "View.h" +#include "Bookmark.h" class BookmarkController; diff --git a/src/lib/component/view/CodeView.cpp b/src/lib/component/view/CodeView.cpp index f6159d84..edf3b79d 100644 --- a/src/lib/component/view/CodeView.cpp +++ b/src/lib/component/view/CodeView.cpp @@ -1,6 +1,6 @@ -#include "component/view/CodeView.h" +#include "CodeView.h" -#include "component/controller/CodeController.h" +#include "CodeController.h" const char* CodeView::VIEW_NAME = "Code"; diff --git a/src/lib/component/view/CodeView.h b/src/lib/component/view/CodeView.h index a6c4ae24..6084c4b8 100644 --- a/src/lib/component/view/CodeView.h +++ b/src/lib/component/view/CodeView.h @@ -3,11 +3,11 @@ #include -#include "data/ErrorInfo.h" +#include "ErrorInfo.h" -#include "component/controller/helper/ScreenSearchInterfaces.h" -#include "component/view/helper/CodeSnippetParams.h" -#include "component/view/View.h" +#include "ScreenSearchInterfaces.h" +#include "CodeSnippetParams.h" +#include "View.h" class CodeController; class FilePath; diff --git a/src/lib/component/view/CompositeView.cpp b/src/lib/component/view/CompositeView.cpp index fba80bf8..24bdc183 100644 --- a/src/lib/component/view/CompositeView.cpp +++ b/src/lib/component/view/CompositeView.cpp @@ -1,4 +1,4 @@ -#include "component/view/CompositeView.h" +#include "CompositeView.h" #include diff --git a/src/lib/component/view/CompositeView.h b/src/lib/component/view/CompositeView.h index c6c33b2b..0577cf80 100644 --- a/src/lib/component/view/CompositeView.h +++ b/src/lib/component/view/CompositeView.h @@ -3,8 +3,8 @@ #include -#include "component/view/View.h" -#include "component/view/ViewLayout.h" +#include "View.h" +#include "ViewLayout.h" class CompositeView : public View diff --git a/src/lib/component/view/DialogView.cpp b/src/lib/component/view/DialogView.cpp index 79b26615..5964ad73 100644 --- a/src/lib/component/view/DialogView.cpp +++ b/src/lib/component/view/DialogView.cpp @@ -1,4 +1,4 @@ -#include "component/view/DialogView.h" +#include "DialogView.h" DialogView::DialogView(UseCase useCase, StorageAccess* storageAccess) : m_useCase(useCase) diff --git a/src/lib/component/view/DialogView.h b/src/lib/component/view/DialogView.h index 0250f745..eafe89c3 100644 --- a/src/lib/component/view/DialogView.h +++ b/src/lib/component/view/DialogView.h @@ -5,8 +5,8 @@ #include #include -#include "data/ErrorCountInfo.h" -#include "project/RefreshInfo.h" +#include "ErrorCountInfo.h" +#include "RefreshInfo.h" class Project; class StorageAccess; diff --git a/src/lib/component/view/ErrorView.cpp b/src/lib/component/view/ErrorView.cpp index fffd0bb4..be24bc7b 100644 --- a/src/lib/component/view/ErrorView.cpp +++ b/src/lib/component/view/ErrorView.cpp @@ -1,4 +1,4 @@ -#include "component/view/ErrorView.h" +#include "ErrorView.h" ErrorView::ErrorView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/ErrorView.h b/src/lib/component/view/ErrorView.h index 818717ce..14569326 100644 --- a/src/lib/component/view/ErrorView.h +++ b/src/lib/component/view/ErrorView.h @@ -3,10 +3,10 @@ #include -#include "component/view/View.h" -#include "data/ErrorCountInfo.h" -#include "data/ErrorFilter.h" -#include "data/ErrorInfo.h" +#include "View.h" +#include "ErrorCountInfo.h" +#include "ErrorFilter.h" +#include "ErrorInfo.h" class ErrorView : public View diff --git a/src/lib/component/view/GraphView.cpp b/src/lib/component/view/GraphView.cpp index a498e653..d2b2de81 100644 --- a/src/lib/component/view/GraphView.cpp +++ b/src/lib/component/view/GraphView.cpp @@ -1,4 +1,4 @@ -#include "component/view/GraphView.h" +#include "GraphView.h" const char* GraphView::VIEW_NAME = "Graph"; diff --git a/src/lib/component/view/GraphView.h b/src/lib/component/view/GraphView.h index 28fec7d6..f237ee48 100644 --- a/src/lib/component/view/GraphView.h +++ b/src/lib/component/view/GraphView.h @@ -3,12 +3,12 @@ #include -#include "utility/math/Vector2.h" -#include "utility/types.h" +#include "Vector2.h" +#include "types.h" -#include "component/controller/helper/ScreenSearchInterfaces.h" -#include "component/view/View.h" -#include "data/GroupType.h" +#include "ScreenSearchInterfaces.h" +#include "View.h" +#include "GroupType.h" struct DummyEdge; struct DummyNode; diff --git a/src/lib/component/view/GraphViewStyle.cpp b/src/lib/component/view/GraphViewStyle.cpp index 529df328..41b67d36 100644 --- a/src/lib/component/view/GraphViewStyle.cpp +++ b/src/lib/component/view/GraphViewStyle.cpp @@ -1,11 +1,11 @@ -#include "component/view/GraphViewStyle.h" +#include "GraphViewStyle.h" -#include "component/view/GraphViewStyleImpl.h" -#include "settings/ApplicationSettings.h" -#include "settings/ColorScheme.h" -#include "utility/logging/logging.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "GraphViewStyleImpl.h" +#include "ApplicationSettings.h" +#include "ColorScheme.h" +#include "logging.h" +#include "ResourcePaths.h" +#include "utilityString.h" int GraphViewStyle::s_gridCellSize = 5; int GraphViewStyle::s_gridCellPadding = 10; diff --git a/src/lib/component/view/GraphViewStyle.h b/src/lib/component/view/GraphViewStyle.h index a0ca7699..734dac49 100644 --- a/src/lib/component/view/GraphViewStyle.h +++ b/src/lib/component/view/GraphViewStyle.h @@ -4,11 +4,11 @@ #include #include -#include "utility/math/Vector2.h" +#include "Vector2.h" -#include "data/graph/Node.h" -#include "data/GroupType.h" -#include "data/parser/AccessKind.h" +#include "Node.h" +#include "GroupType.h" +#include "AccessKind.h" class GraphViewStyleImpl; diff --git a/src/lib/component/view/GraphViewStyleImpl.h b/src/lib/component/view/GraphViewStyleImpl.h index 6bde9a5c..b3248e34 100644 --- a/src/lib/component/view/GraphViewStyleImpl.h +++ b/src/lib/component/view/GraphViewStyleImpl.h @@ -1,7 +1,7 @@ #ifndef GRAPH_VIEW_STYLE_IMPL_H #define GRAPH_VIEW_STYLE_IMPL_H -#include "data/graph/Node.h" +#include "Node.h" class GraphViewStyleImpl { diff --git a/src/lib/component/view/MainView.cpp b/src/lib/component/view/MainView.cpp index 046c0401..5833216e 100644 --- a/src/lib/component/view/MainView.cpp +++ b/src/lib/component/view/MainView.cpp @@ -1,4 +1,4 @@ -#include "component/view/MainView.h" +#include "MainView.h" MainView::MainView() { diff --git a/src/lib/component/view/MainView.h b/src/lib/component/view/MainView.h index af00a150..a6c0244f 100644 --- a/src/lib/component/view/MainView.h +++ b/src/lib/component/view/MainView.h @@ -5,7 +5,7 @@ #include #include -#include "component/view/ViewLayout.h" +#include "ViewLayout.h" struct SearchMatch; class Bookmark; diff --git a/src/lib/component/view/RefreshView.cpp b/src/lib/component/view/RefreshView.cpp index 67924815..17b5b306 100644 --- a/src/lib/component/view/RefreshView.cpp +++ b/src/lib/component/view/RefreshView.cpp @@ -1,6 +1,6 @@ -#include "component/view/RefreshView.h" +#include "RefreshView.h" -#include "component/controller/RefreshController.h" +#include "RefreshController.h" RefreshView::RefreshView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/RefreshView.h b/src/lib/component/view/RefreshView.h index 3c70d834..58e44198 100644 --- a/src/lib/component/view/RefreshView.h +++ b/src/lib/component/view/RefreshView.h @@ -1,7 +1,7 @@ #ifndef REFRESH_VIEW_H #define REFRESH_VIEW_H -#include "component/view/View.h" +#include "View.h" class RefreshController; diff --git a/src/lib/component/view/ScreenSearchView.cpp b/src/lib/component/view/ScreenSearchView.cpp index 2157b03d..aece83dc 100644 --- a/src/lib/component/view/ScreenSearchView.cpp +++ b/src/lib/component/view/ScreenSearchView.cpp @@ -1,4 +1,4 @@ -#include "component/view/ScreenSearchView.h" +#include "ScreenSearchView.h" ScreenSearchView::ScreenSearchView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/ScreenSearchView.h b/src/lib/component/view/ScreenSearchView.h index 7fd57f1c..a73cccab 100644 --- a/src/lib/component/view/ScreenSearchView.h +++ b/src/lib/component/view/ScreenSearchView.h @@ -1,7 +1,7 @@ #ifndef SCREEN_SEARCH_VIEW_H #define SCREEN_SEARCH_VIEW_H -#include "component/view/View.h" +#include "View.h" class ScreenSearchView : public View diff --git a/src/lib/component/view/SearchView.cpp b/src/lib/component/view/SearchView.cpp index 3b869c00..dae7b4fa 100644 --- a/src/lib/component/view/SearchView.cpp +++ b/src/lib/component/view/SearchView.cpp @@ -1,6 +1,6 @@ -#include "component/view/SearchView.h" +#include "SearchView.h" -#include "component/controller/SearchController.h" +#include "SearchController.h" SearchView::SearchView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/SearchView.h b/src/lib/component/view/SearchView.h index 6aecd3f4..1dcea921 100644 --- a/src/lib/component/view/SearchView.h +++ b/src/lib/component/view/SearchView.h @@ -1,8 +1,8 @@ #ifndef SEARCH_VIEW_H #define SEARCH_VIEW_H -#include "component/view/View.h" -#include "data/search/SearchMatch.h" +#include "View.h" +#include "SearchMatch.h" class SearchController; diff --git a/src/lib/component/view/StatusBarView.cpp b/src/lib/component/view/StatusBarView.cpp index 276eb7c3..2363821c 100644 --- a/src/lib/component/view/StatusBarView.cpp +++ b/src/lib/component/view/StatusBarView.cpp @@ -1,6 +1,6 @@ -#include "component/view/StatusBarView.h" +#include "StatusBarView.h" -#include "component/controller/StatusBarController.h" +#include "StatusBarController.h" StatusBarView::StatusBarView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/StatusBarView.h b/src/lib/component/view/StatusBarView.h index 367cdd64..b469ca53 100644 --- a/src/lib/component/view/StatusBarView.h +++ b/src/lib/component/view/StatusBarView.h @@ -1,8 +1,8 @@ #ifndef STATUS_BAR_VIEW_H #define STATUS_BAR_VIEW_H -#include "component/view/View.h" -#include "data/ErrorCountInfo.h" +#include "View.h" +#include "ErrorCountInfo.h" class StatusBarController; diff --git a/src/lib/component/view/StatusView.cpp b/src/lib/component/view/StatusView.cpp index a2402dba..b2ce5084 100644 --- a/src/lib/component/view/StatusView.cpp +++ b/src/lib/component/view/StatusView.cpp @@ -1,4 +1,4 @@ -#include "component/view/StatusView.h" +#include "StatusView.h" StatusView::StatusView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/StatusView.h b/src/lib/component/view/StatusView.h index 318980c2..2397902e 100644 --- a/src/lib/component/view/StatusView.h +++ b/src/lib/component/view/StatusView.h @@ -3,8 +3,8 @@ #include -#include "component/view/View.h" -#include "utility/Status.h" +#include "View.h" +#include "Status.h" class StatusView : public View diff --git a/src/lib/component/view/TabbedView.cpp b/src/lib/component/view/TabbedView.cpp index 72da6f52..93a928f4 100644 --- a/src/lib/component/view/TabbedView.cpp +++ b/src/lib/component/view/TabbedView.cpp @@ -1,4 +1,4 @@ -#include "component/view/TabbedView.h" +#include "TabbedView.h" #include diff --git a/src/lib/component/view/TabbedView.h b/src/lib/component/view/TabbedView.h index d0744e28..67ecf1d4 100644 --- a/src/lib/component/view/TabbedView.h +++ b/src/lib/component/view/TabbedView.h @@ -3,8 +3,8 @@ #include -#include "component/view/View.h" -#include "component/view/ViewLayout.h" +#include "View.h" +#include "ViewLayout.h" class TabbedView : public View diff --git a/src/lib/component/view/TooltipView.cpp b/src/lib/component/view/TooltipView.cpp index 02ed3cbf..a7301b43 100644 --- a/src/lib/component/view/TooltipView.cpp +++ b/src/lib/component/view/TooltipView.cpp @@ -1,4 +1,4 @@ -#include "component/view/TooltipView.h" +#include "TooltipView.h" TooltipView::TooltipView(ViewLayout* viewLayout) : View(viewLayout) @@ -13,4 +13,3 @@ std::string TooltipView::getName() const { return "TooltipView"; } - diff --git a/src/lib/component/view/TooltipView.h b/src/lib/component/view/TooltipView.h index 1873777f..5f624455 100644 --- a/src/lib/component/view/TooltipView.h +++ b/src/lib/component/view/TooltipView.h @@ -3,10 +3,10 @@ #include -#include "component/view/View.h" -#include "data/name/NameHierarchy.h" -#include "data/tooltip/TooltipInfo.h" -#include "utility/types.h" +#include "View.h" +#include "NameHierarchy.h" +#include "TooltipInfo.h" +#include "types.h" class TooltipView : public View diff --git a/src/lib/component/view/UndoRedoView.cpp b/src/lib/component/view/UndoRedoView.cpp index 50aae9bf..77f11ee6 100644 --- a/src/lib/component/view/UndoRedoView.cpp +++ b/src/lib/component/view/UndoRedoView.cpp @@ -1,6 +1,6 @@ -#include "component/view/UndoRedoView.h" +#include "UndoRedoView.h" -#include "component/controller/UndoRedoController.h" +#include "UndoRedoController.h" UndoRedoView::UndoRedoView(ViewLayout* viewLayout) : View(viewLayout) diff --git a/src/lib/component/view/UndoRedoView.h b/src/lib/component/view/UndoRedoView.h index 4ee5d6b0..3a6216c9 100644 --- a/src/lib/component/view/UndoRedoView.h +++ b/src/lib/component/view/UndoRedoView.h @@ -3,7 +3,7 @@ #include -#include "component/view/View.h" +#include "View.h" #include class UndoRedoController; diff --git a/src/lib/component/view/View.cpp b/src/lib/component/view/View.cpp index 9184d3cf..a988f50e 100644 --- a/src/lib/component/view/View.cpp +++ b/src/lib/component/view/View.cpp @@ -1,6 +1,6 @@ -#include "component/view/View.h" +#include "View.h" -#include "component/view/ViewWidgetWrapper.h" +#include "ViewWidgetWrapper.h" View::View(ViewLayout* viewLayout) : m_viewLayout(viewLayout) diff --git a/src/lib/component/view/View.h b/src/lib/component/view/View.h index 773c1324..de03db99 100644 --- a/src/lib/component/view/View.h +++ b/src/lib/component/view/View.h @@ -4,8 +4,8 @@ #include #include -#include "component/Component.h" -#include "component/view/ViewLayout.h" +#include "Component.h" +#include "ViewLayout.h" class ViewWidgetWrapper; diff --git a/src/lib/component/view/ViewFactory.cpp b/src/lib/component/view/ViewFactory.cpp index 20fb9730..7e2a7f42 100644 --- a/src/lib/component/view/ViewFactory.cpp +++ b/src/lib/component/view/ViewFactory.cpp @@ -1,4 +1,4 @@ -#include "component/view/ViewFactory.h" +#include "ViewFactory.h" ViewFactory::ViewFactory() { diff --git a/src/lib/component/view/ViewFactory.h b/src/lib/component/view/ViewFactory.h index a92fa0fa..b3e0f939 100644 --- a/src/lib/component/view/ViewFactory.h +++ b/src/lib/component/view/ViewFactory.h @@ -3,8 +3,8 @@ #include -#include "component/view/CompositeView.h" -#include "component/view/DialogView.h" +#include "CompositeView.h" +#include "DialogView.h" class BookmarkView; class CodeView; diff --git a/src/lib/component/view/ViewLayout.cpp b/src/lib/component/view/ViewLayout.cpp index c393fdbb..88a877bf 100644 --- a/src/lib/component/view/ViewLayout.cpp +++ b/src/lib/component/view/ViewLayout.cpp @@ -1,4 +1,4 @@ -#include "component/view/ViewLayout.h" +#include "ViewLayout.h" ViewLayout::ViewLayout() { diff --git a/src/lib/component/view/ViewWidgetWrapper.cpp b/src/lib/component/view/ViewWidgetWrapper.cpp index 260b3033..7eba5eab 100644 --- a/src/lib/component/view/ViewWidgetWrapper.cpp +++ b/src/lib/component/view/ViewWidgetWrapper.cpp @@ -1,4 +1,4 @@ -#include "component/view/ViewWidgetWrapper.h" +#include "ViewWidgetWrapper.h" ViewWidgetWrapper::ViewWidgetWrapper() { diff --git a/src/lib/component/view/helper/CodeSnippetParams.cpp b/src/lib/component/view/helper/CodeSnippetParams.cpp index 535beeb0..584717df 100644 --- a/src/lib/component/view/helper/CodeSnippetParams.cpp +++ b/src/lib/component/view/helper/CodeSnippetParams.cpp @@ -1,6 +1,6 @@ -#include "component/view/helper/CodeSnippetParams.h" +#include "CodeSnippetParams.h" -#include "data/location/SourceLocationFile.h" +#include "SourceLocationFile.h" CodeSnippetParams::CodeSnippetParams() : startLineNumber(0) diff --git a/src/lib/component/view/helper/CodeSnippetParams.h b/src/lib/component/view/helper/CodeSnippetParams.h index 12db8e33..69035e05 100644 --- a/src/lib/component/view/helper/CodeSnippetParams.h +++ b/src/lib/component/view/helper/CodeSnippetParams.h @@ -3,8 +3,8 @@ #include -#include "utility/TimeStamp.h" -#include "utility/types.h" +#include "TimeStamp.h" +#include "types.h" class SourceLocationFile; diff --git a/src/lib/data/DefinitionKind.cpp b/src/lib/data/DefinitionKind.cpp index 33ed8638..b8ba2d6c 100644 --- a/src/lib/data/DefinitionKind.cpp +++ b/src/lib/data/DefinitionKind.cpp @@ -1,4 +1,4 @@ -#include "data/DefinitionKind.h" +#include "DefinitionKind.h" int definitionKindToInt(DefinitionKind definitionKind) { diff --git a/src/lib/data/ErrorCountInfo.h b/src/lib/data/ErrorCountInfo.h index ab21317d..f7a29121 100644 --- a/src/lib/data/ErrorCountInfo.h +++ b/src/lib/data/ErrorCountInfo.h @@ -1,7 +1,7 @@ #ifndef ERROR_COUNT_INFO_H #define ERROR_COUNT_INFO_H -#include "data/ErrorInfo.h" +#include "ErrorInfo.h" struct ErrorCountInfo { diff --git a/src/lib/data/ErrorFilter.h b/src/lib/data/ErrorFilter.h index ccc674dc..8a61d0a1 100644 --- a/src/lib/data/ErrorFilter.h +++ b/src/lib/data/ErrorFilter.h @@ -1,7 +1,7 @@ #ifndef ERROR_FILTER_H #define ERROR_FILTER_H -#include "data/ErrorInfo.h" +#include "ErrorInfo.h" struct ErrorFilter { diff --git a/src/lib/data/ErrorInfo.h b/src/lib/data/ErrorInfo.h index 3101710f..26a09064 100644 --- a/src/lib/data/ErrorInfo.h +++ b/src/lib/data/ErrorInfo.h @@ -1,7 +1,7 @@ #ifndef ERROR_INFO_H #define ERROR_INFO_H -#include "data/storage/type/StorageError.h" +#include "StorageError.h" typedef StorageError ErrorInfo; diff --git a/src/lib/data/GroupType.cpp b/src/lib/data/GroupType.cpp index 1efbe65b..6a64c341 100644 --- a/src/lib/data/GroupType.cpp +++ b/src/lib/data/GroupType.cpp @@ -1,4 +1,4 @@ -#include "data/GroupType.h" +#include "GroupType.h" std::wstring groupTypeToString(GroupType type) { diff --git a/src/lib/data/HierarchyCache.cpp b/src/lib/data/HierarchyCache.cpp index dfb1ffbd..1c01e2b0 100644 --- a/src/lib/data/HierarchyCache.cpp +++ b/src/lib/data/HierarchyCache.cpp @@ -1,4 +1,4 @@ -#include "data/HierarchyCache.h" +#include "HierarchyCache.h" HierarchyCache::HierarchyNode::HierarchyNode(Id nodeId) : m_nodeId(nodeId) diff --git a/src/lib/data/HierarchyCache.h b/src/lib/data/HierarchyCache.h index dc358717..5059e027 100644 --- a/src/lib/data/HierarchyCache.h +++ b/src/lib/data/HierarchyCache.h @@ -6,7 +6,7 @@ #include #include -#include "utility/types.h" +#include "types.h" class HierarchyCache { diff --git a/src/lib/data/NodeType.cpp b/src/lib/data/NodeType.cpp index fc9f8c16..ae2d730b 100644 --- a/src/lib/data/NodeType.cpp +++ b/src/lib/data/NodeType.cpp @@ -1,7 +1,7 @@ -#include "data/NodeType.h" +#include "NodeType.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "ResourcePaths.h" +#include "utilityString.h" std::vector NodeType::getOverviewBundleNodeTypesOrdered() { diff --git a/src/lib/data/NodeType.h b/src/lib/data/NodeType.h index 78890ca1..61dbad3e 100644 --- a/src/lib/data/NodeType.h +++ b/src/lib/data/NodeType.h @@ -7,9 +7,9 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/Tree.h" -#include "utility/types.h" +#include "FilePath.h" +#include "Tree.h" +#include "types.h" class NodeType { diff --git a/src/lib/data/NodeTypeSet.cpp b/src/lib/data/NodeTypeSet.cpp index 28f0974f..4d2a4796 100644 --- a/src/lib/data/NodeTypeSet.cpp +++ b/src/lib/data/NodeTypeSet.cpp @@ -1,8 +1,8 @@ -#include "data/NodeTypeSet.h" +#include "NodeTypeSet.h" -#include "data/NodeType.h" -#include "utility/utility.h" -#include "utility/utilityMath.h" +#include "NodeType.h" +#include "utility.h" +#include "utilityMath.h" NodeTypeSet NodeTypeSet::all() { diff --git a/src/lib/data/NodeTypeSet.h b/src/lib/data/NodeTypeSet.h index 86286f28..6bf10900 100644 --- a/src/lib/data/NodeTypeSet.h +++ b/src/lib/data/NodeTypeSet.h @@ -4,7 +4,7 @@ #include #include -#include "utility/types.h" +#include "types.h" class NodeType; diff --git a/src/lib/data/TaskCleanStorage.cpp b/src/lib/data/TaskCleanStorage.cpp index 89608677..481f9962 100644 --- a/src/lib/data/TaskCleanStorage.cpp +++ b/src/lib/data/TaskCleanStorage.cpp @@ -1,10 +1,10 @@ -#include "data/TaskCleanStorage.h" +#include "TaskCleanStorage.h" -#include "component/view/DialogView.h" -#include "data/storage/PersistentStorage.h" -#include "utility/file/FilePath.h" -#include "utility/scheduling/Blackboard.h" -#include "utility/utility.h" +#include "DialogView.h" +#include "PersistentStorage.h" +#include "FilePath.h" +#include "Blackboard.h" +#include "utility.h" #include "Application.h" TaskCleanStorage::TaskCleanStorage( diff --git a/src/lib/data/TaskCleanStorage.h b/src/lib/data/TaskCleanStorage.h index 2e610423..b05770ee 100644 --- a/src/lib/data/TaskCleanStorage.h +++ b/src/lib/data/TaskCleanStorage.h @@ -3,8 +3,8 @@ #include -#include "utility/scheduling/Task.h" -#include "utility/TimeStamp.h" +#include "Task.h" +#include "TimeStamp.h" class DialogView; class FilePath; diff --git a/src/lib/data/TaskFinishParsing.cpp b/src/lib/data/TaskFinishParsing.cpp index 8974d0be..252ff091 100644 --- a/src/lib/data/TaskFinishParsing.cpp +++ b/src/lib/data/TaskFinishParsing.cpp @@ -1,14 +1,14 @@ -#include "data/TaskFinishParsing.h" +#include "TaskFinishParsing.h" -#include "component/view/DialogView.h" -#include "data/storage/PersistentStorage.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/indexing/MessageIndexingStatus.h" -#include "utility/messaging/type/MessageQuitApplication.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/scheduling/Blackboard.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "DialogView.h" +#include "PersistentStorage.h" +#include "MessageIndexingFinished.h" +#include "MessageIndexingStatus.h" +#include "MessageQuitApplication.h" +#include "MessageStatus.h" +#include "Blackboard.h" +#include "utility.h" +#include "utilityString.h" #include "Application.h" TaskFinishParsing::TaskFinishParsing(std::shared_ptr storage, std::shared_ptr dialogView) diff --git a/src/lib/data/TaskFinishParsing.h b/src/lib/data/TaskFinishParsing.h index 581b4de5..b55bdb44 100644 --- a/src/lib/data/TaskFinishParsing.h +++ b/src/lib/data/TaskFinishParsing.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class DialogView; class FileRegister; diff --git a/src/lib/data/TaskInjectStorage.cpp b/src/lib/data/TaskInjectStorage.cpp index f0cb6c3c..48d89e73 100644 --- a/src/lib/data/TaskInjectStorage.cpp +++ b/src/lib/data/TaskInjectStorage.cpp @@ -1,10 +1,10 @@ -#include "data/TaskInjectStorage.h" +#include "TaskInjectStorage.h" #include #include -#include "data/storage/Storage.h" -#include "data/storage/StorageProvider.h" +#include "Storage.h" +#include "StorageProvider.h" TaskInjectStorage::TaskInjectStorage( std::shared_ptr storageProvider, diff --git a/src/lib/data/TaskInjectStorage.h b/src/lib/data/TaskInjectStorage.h index f2602fb6..a2ccc349 100644 --- a/src/lib/data/TaskInjectStorage.h +++ b/src/lib/data/TaskInjectStorage.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class Storage; class StorageProvider; diff --git a/src/lib/data/TaskMergeStorages.cpp b/src/lib/data/TaskMergeStorages.cpp index cebc6403..31b3bcfe 100644 --- a/src/lib/data/TaskMergeStorages.cpp +++ b/src/lib/data/TaskMergeStorages.cpp @@ -1,9 +1,9 @@ -#include "data/TaskMergeStorages.h" +#include "TaskMergeStorages.h" #include #include -#include "data/storage/StorageProvider.h" +#include "StorageProvider.h" TaskMergeStorages::TaskMergeStorages( std::shared_ptr storageProvider diff --git a/src/lib/data/TaskMergeStorages.h b/src/lib/data/TaskMergeStorages.h index 04583017..8c3b6a7e 100644 --- a/src/lib/data/TaskMergeStorages.h +++ b/src/lib/data/TaskMergeStorages.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class StorageProvider; diff --git a/src/lib/data/access/StorageAccess.cpp b/src/lib/data/access/StorageAccess.cpp index b88fa852..2337fd7e 100644 --- a/src/lib/data/access/StorageAccess.cpp +++ b/src/lib/data/access/StorageAccess.cpp @@ -1,4 +1,4 @@ -#include "data/access/StorageAccess.h" +#include "StorageAccess.h" std::pair, std::vector> StorageAccess::getNodeIdsAndSearchMatchesForNameHierarchies( const std::vector nameHierarchies) const diff --git a/src/lib/data/access/StorageAccess.h b/src/lib/data/access/StorageAccess.h index 0189bdf5..8908301e 100644 --- a/src/lib/data/access/StorageAccess.h +++ b/src/lib/data/access/StorageAccess.h @@ -5,21 +5,21 @@ #include #include -#include "utility/types.h" +#include "types.h" -#include "data/bookmark/BookmarkCategory.h" -#include "data/bookmark/EdgeBookmark.h" -#include "data/bookmark/NodeBookmark.h" -#include "data/graph/Node.h" -#include "data/location/LocationType.h" -#include "data/search/SearchMatch.h" -#include "data/storage/type/StorageEdge.h" -#include "data/storage/StorageStats.h" -#include "data/tooltip/TooltipInfo.h" -#include "data/tooltip/TooltipOrigin.h" -#include "data/ErrorCountInfo.h" -#include "data/ErrorFilter.h" -#include "data/ErrorInfo.h" +#include "BookmarkCategory.h" +#include "EdgeBookmark.h" +#include "NodeBookmark.h" +#include "Node.h" +#include "LocationType.h" +#include "SearchMatch.h" +#include "StorageEdge.h" +#include "StorageStats.h" +#include "TooltipInfo.h" +#include "TooltipOrigin.h" +#include "ErrorCountInfo.h" +#include "ErrorFilter.h" +#include "ErrorInfo.h" class FilePath; class Graph; diff --git a/src/lib/data/access/StorageAccessProxy.cpp b/src/lib/data/access/StorageAccessProxy.cpp index a5149087..8521fd61 100644 --- a/src/lib/data/access/StorageAccessProxy.cpp +++ b/src/lib/data/access/StorageAccessProxy.cpp @@ -1,13 +1,13 @@ -#include "data/access/StorageAccessProxy.h" +#include "StorageAccessProxy.h" -#include "data/graph/Graph.h" -#include "data/location/SourceLocationCollection.h" -#include "data/location/SourceLocationFile.h" -#include "data/NodeTypeSet.h" +#include "Graph.h" +#include "SourceLocationCollection.h" +#include "SourceLocationFile.h" +#include "NodeTypeSet.h" -#include "utility/file/FileInfo.h" -#include "utility/file/FilePath.h" -#include "utility/logging/logging.h" +#include "FileInfo.h" +#include "FilePath.h" +#include "logging.h" void StorageAccessProxy::setSubject(std::weak_ptr subject) { diff --git a/src/lib/data/access/StorageAccessProxy.h b/src/lib/data/access/StorageAccessProxy.h index f030ae9a..3883948d 100644 --- a/src/lib/data/access/StorageAccessProxy.h +++ b/src/lib/data/access/StorageAccessProxy.h @@ -3,7 +3,7 @@ #include -#include "data/access/StorageAccess.h" +#include "StorageAccess.h" class StorageAccessProxy : public StorageAccess diff --git a/src/lib/data/bookmark/Bookmark.h b/src/lib/data/bookmark/Bookmark.h index ab72fc39..ec943ae8 100644 --- a/src/lib/data/bookmark/Bookmark.h +++ b/src/lib/data/bookmark/Bookmark.h @@ -4,8 +4,8 @@ #include #include -#include "utility/TimeStamp.h" -#include "utility/types.h" +#include "TimeStamp.h" +#include "types.h" #include "BookmarkCategory.h" diff --git a/src/lib/data/bookmark/BookmarkCategory.h b/src/lib/data/bookmark/BookmarkCategory.h index 35e2e095..4314393b 100644 --- a/src/lib/data/bookmark/BookmarkCategory.h +++ b/src/lib/data/bookmark/BookmarkCategory.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" class BookmarkCategory { diff --git a/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp b/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp index 78f4f535..f8b36cd7 100644 --- a/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp +++ b/src/lib/data/fulltextsearch/FullTextSearchIndex.cpp @@ -1,8 +1,8 @@ -#include "data/fulltextsearch/FullTextSearchIndex.h" +#include "FullTextSearchIndex.h" #include -#include "utility/logging/logging.h" -#include "utility/tracing.h" +#include "logging.h" +#include "tracing.h" void FullTextSearchIndex::addFile(Id fileId, const std::wstring& fileContent) { diff --git a/src/lib/data/fulltextsearch/FullTextSearchIndex.h b/src/lib/data/fulltextsearch/FullTextSearchIndex.h index 7f89a9e2..b04974f8 100644 --- a/src/lib/data/fulltextsearch/FullTextSearchIndex.h +++ b/src/lib/data/fulltextsearch/FullTextSearchIndex.h @@ -5,8 +5,8 @@ #include #include -#include "data/fulltextsearch/SuffixArray.h" -#include "utility/types.h" +#include "SuffixArray.h" +#include "types.h" class StorageAccess; diff --git a/src/lib/data/graph/Edge.cpp b/src/lib/data/graph/Edge.cpp index ea623cdd..4ffdf1be 100644 --- a/src/lib/data/graph/Edge.cpp +++ b/src/lib/data/graph/Edge.cpp @@ -1,11 +1,11 @@ -#include "data/graph/Edge.h" +#include "Edge.h" #include -#include "data/graph/Node.h" -#include "data/graph/token_component/TokenComponentAggregation.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "Node.h" +#include "TokenComponentAggregation.h" +#include "logging.h" +#include "utilityString.h" int Edge::typeToInt(EdgeType type) { diff --git a/src/lib/data/graph/Edge.h b/src/lib/data/graph/Edge.h index 8b8ded0c..ca9fd312 100644 --- a/src/lib/data/graph/Edge.h +++ b/src/lib/data/graph/Edge.h @@ -4,7 +4,7 @@ #include #include -#include "data/graph/Token.h" +#include "Token.h" class Node; diff --git a/src/lib/data/graph/Graph.cpp b/src/lib/data/graph/Graph.cpp index 478ac80f..22e613aa 100644 --- a/src/lib/data/graph/Graph.cpp +++ b/src/lib/data/graph/Graph.cpp @@ -1,6 +1,6 @@ -#include "data/graph/Graph.h" +#include "Graph.h" -#include "utility/logging/logging.h" +#include "logging.h" Graph::Graph() : m_trailMode(TRAIL_NONE) diff --git a/src/lib/data/graph/Graph.h b/src/lib/data/graph/Graph.h index 0f848d39..f7843426 100644 --- a/src/lib/data/graph/Graph.h +++ b/src/lib/data/graph/Graph.h @@ -5,8 +5,8 @@ #include #include -#include "data/graph/Edge.h" -#include "data/graph/Node.h" +#include "Edge.h" +#include "Node.h" class Graph { diff --git a/src/lib/data/graph/Node.cpp b/src/lib/data/graph/Node.cpp index 4b6dae7e..643bae45 100644 --- a/src/lib/data/graph/Node.cpp +++ b/src/lib/data/graph/Node.cpp @@ -1,13 +1,13 @@ -#include "data/graph/Node.h" +#include "Node.h" #include -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" -#include "data/graph/token_component/TokenComponentAccess.h" -#include "data/graph/token_component/TokenComponentConst.h" -#include "data/graph/token_component/TokenComponentStatic.h" +#include "TokenComponentAccess.h" +#include "TokenComponentConst.h" +#include "TokenComponentStatic.h" Node::Node(Id id, NodeType type, NameHierarchy nameHierarchy, DefinitionKind definitionKind) : Token(id) diff --git a/src/lib/data/graph/Node.h b/src/lib/data/graph/Node.h index 2d61fb0a..e3243574 100644 --- a/src/lib/data/graph/Node.h +++ b/src/lib/data/graph/Node.h @@ -6,11 +6,11 @@ #include #include -#include "data/DefinitionKind.h" -#include "data/graph/Edge.h" -#include "data/graph/Token.h" -#include "data/name/NameHierarchy.h" -#include "data/NodeType.h" +#include "DefinitionKind.h" +#include "Edge.h" +#include "Token.h" +#include "NameHierarchy.h" +#include "NodeType.h" class Node : public Token diff --git a/src/lib/data/graph/Token.cpp b/src/lib/data/graph/Token.cpp index e4ba7378..0935229f 100644 --- a/src/lib/data/graph/Token.cpp +++ b/src/lib/data/graph/Token.cpp @@ -1,6 +1,6 @@ -#include "data/graph/Token.h" +#include "Token.h" -#include "utility/logging/logging.h" +#include "logging.h" Token::Token(Id id) : m_id(id) diff --git a/src/lib/data/graph/Token.h b/src/lib/data/graph/Token.h index f5464a40..7f120b3d 100644 --- a/src/lib/data/graph/Token.h +++ b/src/lib/data/graph/Token.h @@ -4,8 +4,8 @@ #include #include -#include "data/graph/token_component/TokenComponent.h" -#include "utility/types.h" +#include "TokenComponent.h" +#include "types.h" class Token { diff --git a/src/lib/data/graph/token_component/TokenComponent.cpp b/src/lib/data/graph/token_component/TokenComponent.cpp index 37abdc8c..788c16a4 100644 --- a/src/lib/data/graph/token_component/TokenComponent.cpp +++ b/src/lib/data/graph/token_component/TokenComponent.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" TokenComponent::~TokenComponent() { diff --git a/src/lib/data/graph/token_component/TokenComponentAbstraction.cpp b/src/lib/data/graph/token_component/TokenComponentAbstraction.cpp index b87d3900..a139e2b6 100644 --- a/src/lib/data/graph/token_component/TokenComponentAbstraction.cpp +++ b/src/lib/data/graph/token_component/TokenComponentAbstraction.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponentAbstraction.h" +#include "TokenComponentAbstraction.h" TokenComponentAbstraction::TokenComponentAbstraction(AbstractionType abstraction) : m_abstraction(abstraction) diff --git a/src/lib/data/graph/token_component/TokenComponentAbstraction.h b/src/lib/data/graph/token_component/TokenComponentAbstraction.h index 3ad45c07..9c356288 100644 --- a/src/lib/data/graph/token_component/TokenComponentAbstraction.h +++ b/src/lib/data/graph/token_component/TokenComponentAbstraction.h @@ -3,7 +3,7 @@ #include -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" class TokenComponentAbstraction : public TokenComponent diff --git a/src/lib/data/graph/token_component/TokenComponentAccess.cpp b/src/lib/data/graph/token_component/TokenComponentAccess.cpp index 73460bb0..1df2e26c 100644 --- a/src/lib/data/graph/token_component/TokenComponentAccess.cpp +++ b/src/lib/data/graph/token_component/TokenComponentAccess.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponentAccess.h" +#include "TokenComponentAccess.h" std::wstring TokenComponentAccess::getAccessString(AccessKind access) { diff --git a/src/lib/data/graph/token_component/TokenComponentAccess.h b/src/lib/data/graph/token_component/TokenComponentAccess.h index 769de850..c2058fc2 100644 --- a/src/lib/data/graph/token_component/TokenComponentAccess.h +++ b/src/lib/data/graph/token_component/TokenComponentAccess.h @@ -3,8 +3,8 @@ #include -#include "data/graph/token_component/TokenComponent.h" -#include "data/parser/AccessKind.h" +#include "TokenComponent.h" +#include "AccessKind.h" class TokenComponentAccess : public TokenComponent diff --git a/src/lib/data/graph/token_component/TokenComponentAggregation.cpp b/src/lib/data/graph/token_component/TokenComponentAggregation.cpp index 69b7c2b5..72ea01fa 100644 --- a/src/lib/data/graph/token_component/TokenComponentAggregation.cpp +++ b/src/lib/data/graph/token_component/TokenComponentAggregation.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponentAggregation.h" +#include "TokenComponentAggregation.h" TokenComponentAggregation::Direction TokenComponentAggregation::opposite(Direction direction) { diff --git a/src/lib/data/graph/token_component/TokenComponentAggregation.h b/src/lib/data/graph/token_component/TokenComponentAggregation.h index 464cf269..4569ac59 100644 --- a/src/lib/data/graph/token_component/TokenComponentAggregation.h +++ b/src/lib/data/graph/token_component/TokenComponentAggregation.h @@ -4,9 +4,9 @@ #include #include -#include "utility/types.h" +#include "types.h" -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" class TokenComponentAggregation : public TokenComponent diff --git a/src/lib/data/graph/token_component/TokenComponentConst.cpp b/src/lib/data/graph/token_component/TokenComponentConst.cpp index 4de24da5..b88543f7 100644 --- a/src/lib/data/graph/token_component/TokenComponentConst.cpp +++ b/src/lib/data/graph/token_component/TokenComponentConst.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponentConst.h" +#include "TokenComponentConst.h" std::shared_ptr TokenComponentConst::copy() const { diff --git a/src/lib/data/graph/token_component/TokenComponentConst.h b/src/lib/data/graph/token_component/TokenComponentConst.h index 9a694ae2..2270c48f 100644 --- a/src/lib/data/graph/token_component/TokenComponentConst.h +++ b/src/lib/data/graph/token_component/TokenComponentConst.h @@ -1,7 +1,7 @@ #ifndef TOKEN_COMPONENT_CONST_H #define TOKEN_COMPONENT_CONST_H -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" class TokenComponentConst : public TokenComponent diff --git a/src/lib/data/graph/token_component/TokenComponentFilePath.cpp b/src/lib/data/graph/token_component/TokenComponentFilePath.cpp index 28e5347c..2351bf64 100644 --- a/src/lib/data/graph/token_component/TokenComponentFilePath.cpp +++ b/src/lib/data/graph/token_component/TokenComponentFilePath.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponentFilePath.h" +#include "TokenComponentFilePath.h" TokenComponentFilePath::TokenComponentFilePath(const FilePath& path, bool complete) : m_path(path) diff --git a/src/lib/data/graph/token_component/TokenComponentFilePath.h b/src/lib/data/graph/token_component/TokenComponentFilePath.h index f359a5ad..c3a6bcad 100644 --- a/src/lib/data/graph/token_component/TokenComponentFilePath.h +++ b/src/lib/data/graph/token_component/TokenComponentFilePath.h @@ -1,9 +1,9 @@ #ifndef TOKEN_COMPONENT_FILE_PATH_H #define TOKEN_COMPONENT_FILE_PATH_H -#include "utility/file/FilePath.h" +#include "FilePath.h" -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" class TokenComponentFilePath : public TokenComponent diff --git a/src/lib/data/graph/token_component/TokenComponentInheritanceChain.h b/src/lib/data/graph/token_component/TokenComponentInheritanceChain.h index 29183aaa..4fcdaf9b 100644 --- a/src/lib/data/graph/token_component/TokenComponentInheritanceChain.h +++ b/src/lib/data/graph/token_component/TokenComponentInheritanceChain.h @@ -1,7 +1,7 @@ #ifndef TOKEN_COMPONENT_INHERITANCE_CHAIN_H #define TOKEN_COMPONENT_INHERITANCE_CHAIN_H -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" class TokenComponentInheritanceChain : public TokenComponent diff --git a/src/lib/data/graph/token_component/TokenComponentStatic.cpp b/src/lib/data/graph/token_component/TokenComponentStatic.cpp index 19c3e862..c09acdac 100644 --- a/src/lib/data/graph/token_component/TokenComponentStatic.cpp +++ b/src/lib/data/graph/token_component/TokenComponentStatic.cpp @@ -1,4 +1,4 @@ -#include "data/graph/token_component/TokenComponentStatic.h" +#include "TokenComponentStatic.h" std::shared_ptr TokenComponentStatic::copy() const { diff --git a/src/lib/data/graph/token_component/TokenComponentStatic.h b/src/lib/data/graph/token_component/TokenComponentStatic.h index 72013126..92019899 100644 --- a/src/lib/data/graph/token_component/TokenComponentStatic.h +++ b/src/lib/data/graph/token_component/TokenComponentStatic.h @@ -1,7 +1,7 @@ #ifndef TOKEN_COMPONENT_STATIC_H #define TOKEN_COMPONENT_STATIC_H -#include "data/graph/token_component/TokenComponent.h" +#include "TokenComponent.h" class TokenComponentStatic : public TokenComponent diff --git a/src/lib/data/indexer/CombinedIndexerCommandProvider.cpp b/src/lib/data/indexer/CombinedIndexerCommandProvider.cpp index 74cf1cae..06f41680 100644 --- a/src/lib/data/indexer/CombinedIndexerCommandProvider.cpp +++ b/src/lib/data/indexer/CombinedIndexerCommandProvider.cpp @@ -1,6 +1,6 @@ -#include "data/indexer/CombinedIndexerCommandProvider.h" +#include "CombinedIndexerCommandProvider.h" -#include "utility/utility.h" +#include "utility.h" void CombinedIndexerCommandProvider::addProvider(std::shared_ptr provider) { diff --git a/src/lib/data/indexer/CombinedIndexerCommandProvider.h b/src/lib/data/indexer/CombinedIndexerCommandProvider.h index de95a896..00010723 100644 --- a/src/lib/data/indexer/CombinedIndexerCommandProvider.h +++ b/src/lib/data/indexer/CombinedIndexerCommandProvider.h @@ -3,7 +3,7 @@ #include -#include "data/indexer/IndexerCommandProvider.h" +#include "IndexerCommandProvider.h" class CombinedIndexerCommandProvider : public IndexerCommandProvider { diff --git a/src/lib/data/indexer/Indexer.h b/src/lib/data/indexer/Indexer.h index b2119b12..00665ec2 100644 --- a/src/lib/data/indexer/Indexer.h +++ b/src/lib/data/indexer/Indexer.h @@ -3,9 +3,9 @@ #include -#include "data/indexer/IndexerBase.h" -#include "data/indexer/IndexerCommand.h" -#include "utility/logging/logging.h" +#include "IndexerBase.h" +#include "IndexerCommand.h" +#include "logging.h" template class Indexer diff --git a/src/lib/data/indexer/IndexerBase.cpp b/src/lib/data/indexer/IndexerBase.cpp index e229dd13..7dc0de38 100644 --- a/src/lib/data/indexer/IndexerBase.cpp +++ b/src/lib/data/indexer/IndexerBase.cpp @@ -1,4 +1,4 @@ -#include "data/indexer/IndexerBase.h" +#include "IndexerBase.h" IndexerBase::IndexerBase() : m_interrupted(false) diff --git a/src/lib/data/indexer/IndexerBase.h b/src/lib/data/indexer/IndexerBase.h index 20e3f45d..5f5199d8 100644 --- a/src/lib/data/indexer/IndexerBase.h +++ b/src/lib/data/indexer/IndexerBase.h @@ -4,7 +4,7 @@ #include #include -#include "data/indexer/IndexerCommandType.h" +#include "IndexerCommandType.h" class FileRegister; class IndexerCommand; diff --git a/src/lib/data/indexer/IndexerCommand.cpp b/src/lib/data/indexer/IndexerCommand.cpp index 1b0f754d..4e6fa2e0 100644 --- a/src/lib/data/indexer/IndexerCommand.cpp +++ b/src/lib/data/indexer/IndexerCommand.cpp @@ -1,9 +1,9 @@ -#include "data/indexer/IndexerCommand.h" +#include "IndexerCommand.h" #include #include -#include "utility/utilityString.h" +#include "utilityString.h" std::wstring IndexerCommand::serialize(std::shared_ptr indexerCommand, bool compact) { diff --git a/src/lib/data/indexer/IndexerCommand.h b/src/lib/data/indexer/IndexerCommand.h index b12f957f..e179e2ba 100644 --- a/src/lib/data/indexer/IndexerCommand.h +++ b/src/lib/data/indexer/IndexerCommand.h @@ -4,9 +4,9 @@ #include #include -#include "data/indexer/IndexerCommandType.h" -#include "utility/file/FilePath.h" -#include "utility/file/FilePathFilter.h" +#include "IndexerCommandType.h" +#include "FilePath.h" +#include "FilePathFilter.h" class QJsonObject; diff --git a/src/lib/data/indexer/IndexerCommandProvider.cpp b/src/lib/data/indexer/IndexerCommandProvider.cpp index a017ac1f..f2b2d851 100644 --- a/src/lib/data/indexer/IndexerCommandProvider.cpp +++ b/src/lib/data/indexer/IndexerCommandProvider.cpp @@ -1,4 +1,4 @@ -#include "data/indexer/IndexerCommandProvider.h" +#include "IndexerCommandProvider.h" bool IndexerCommandProvider::empty() const { diff --git a/src/lib/data/indexer/IndexerCommandType.cpp b/src/lib/data/indexer/IndexerCommandType.cpp index 4da07d40..2851060d 100644 --- a/src/lib/data/indexer/IndexerCommandType.cpp +++ b/src/lib/data/indexer/IndexerCommandType.cpp @@ -1,4 +1,4 @@ -#include "data/indexer/IndexerCommandType.h" +#include "IndexerCommandType.h" std::string indexerCommandTypeToString(IndexerCommandType type) { diff --git a/src/lib/data/indexer/IndexerComposite.cpp b/src/lib/data/indexer/IndexerComposite.cpp index b8b19d24..30d3cdbe 100644 --- a/src/lib/data/indexer/IndexerComposite.cpp +++ b/src/lib/data/indexer/IndexerComposite.cpp @@ -1,8 +1,8 @@ -#include "data/indexer/IndexerComposite.h" +#include "IndexerComposite.h" -#include "data/indexer/IndexerCommand.h" -#include "utility/logging/logging.h" -#include "data/storage/IntermediateStorage.h" +#include "IndexerCommand.h" +#include "logging.h" +#include "IntermediateStorage.h" IndexerComposite::~IndexerComposite() { diff --git a/src/lib/data/indexer/IndexerComposite.h b/src/lib/data/indexer/IndexerComposite.h index 75d30476..a8c353a2 100644 --- a/src/lib/data/indexer/IndexerComposite.h +++ b/src/lib/data/indexer/IndexerComposite.h @@ -4,7 +4,7 @@ #include #include -#include "data/indexer/IndexerBase.h" +#include "IndexerBase.h" class IndexerComposite: public IndexerBase { diff --git a/src/lib/data/indexer/MemoryIndexerCommandProvider.cpp b/src/lib/data/indexer/MemoryIndexerCommandProvider.cpp index 95e20f56..84b8e9b4 100644 --- a/src/lib/data/indexer/MemoryIndexerCommandProvider.cpp +++ b/src/lib/data/indexer/MemoryIndexerCommandProvider.cpp @@ -1,6 +1,6 @@ -#include "data/indexer/MemoryIndexerCommandProvider.h" +#include "MemoryIndexerCommandProvider.h" -#include "data/indexer/IndexerCommand.h" +#include "IndexerCommand.h" MemoryIndexerCommandProvider::MemoryIndexerCommandProvider(const std::vector>& commands) { diff --git a/src/lib/data/indexer/MemoryIndexerCommandProvider.h b/src/lib/data/indexer/MemoryIndexerCommandProvider.h index eaf162a3..e3a7eeda 100644 --- a/src/lib/data/indexer/MemoryIndexerCommandProvider.h +++ b/src/lib/data/indexer/MemoryIndexerCommandProvider.h @@ -3,7 +3,7 @@ #include -#include "data/indexer/IndexerCommandProvider.h" +#include "IndexerCommandProvider.h" class MemoryIndexerCommandProvider : public IndexerCommandProvider { diff --git a/src/lib/data/indexer/TaskBuildIndex.cpp b/src/lib/data/indexer/TaskBuildIndex.cpp index 42da6f00..aa6b1907 100644 --- a/src/lib/data/indexer/TaskBuildIndex.cpp +++ b/src/lib/data/indexer/TaskBuildIndex.cpp @@ -1,17 +1,17 @@ -#include "data/indexer/TaskBuildIndex.h" +#include "TaskBuildIndex.h" -#include "utility/AppPath.h" -#include "utility/logging/FileLogger.h" -#include "utility/messaging/type/indexing/MessageIndexingStatus.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/scheduling/Blackboard.h" -#include "utility/TimeStamp.h" -#include "utility/UserPaths.h" -#include "utility/utilityApp.h" +#include "AppPath.h" +#include "FileLogger.h" +#include "MessageIndexingStatus.h" +#include "MessageStatus.h" +#include "Blackboard.h" +#include "TimeStamp.h" +#include "UserPaths.h" +#include "utilityApp.h" -#include "component/view/DialogView.h" -#include "data/indexer/interprocess/InterprocessIndexer.h" -#include "data/storage/StorageProvider.h" +#include "DialogView.h" +#include "InterprocessIndexer.h" +#include "StorageProvider.h" #if _WIN32 const std::wstring TaskBuildIndex::s_processName(L"sourcetrail_indexer.exe"); diff --git a/src/lib/data/indexer/TaskBuildIndex.h b/src/lib/data/indexer/TaskBuildIndex.h index c6436d39..aee1b6be 100644 --- a/src/lib/data/indexer/TaskBuildIndex.h +++ b/src/lib/data/indexer/TaskBuildIndex.h @@ -3,13 +3,13 @@ #include -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/scheduling/Task.h" +#include "MessageListener.h" +#include "MessageInterruptTasks.h" +#include "Task.h" -#include "data/indexer/interprocess/InterprocessIndexerCommandManager.h" -#include "data/indexer/interprocess/InterprocessIndexingStatusManager.h" -#include "data/indexer/interprocess/InterprocessIntermediateStorageManager.h" +#include "InterprocessIndexerCommandManager.h" +#include "InterprocessIndexingStatusManager.h" +#include "InterprocessIntermediateStorageManager.h" class DialogView; class StorageProvider; diff --git a/src/lib/data/indexer/TaskFillIndexerCommandQueue.cpp b/src/lib/data/indexer/TaskFillIndexerCommandQueue.cpp index 96e48e72..5a125821 100644 --- a/src/lib/data/indexer/TaskFillIndexerCommandQueue.cpp +++ b/src/lib/data/indexer/TaskFillIndexerCommandQueue.cpp @@ -1,9 +1,9 @@ -#include "data/indexer/TaskFillIndexerCommandQueue.h" +#include "TaskFillIndexerCommandQueue.h" -#include "data/indexer/IndexerCommandProvider.h" -#include "utility/file/FileSystem.h" -#include "utility/logging/logging.h" -#include "utility/scheduling/Blackboard.h" +#include "IndexerCommandProvider.h" +#include "FileSystem.h" +#include "logging.h" +#include "Blackboard.h" TaskFillIndexerCommandsQueue::TaskFillIndexerCommandsQueue( const std::string& appUUID, diff --git a/src/lib/data/indexer/TaskFillIndexerCommandQueue.h b/src/lib/data/indexer/TaskFillIndexerCommandQueue.h index e0eedf0c..e7e19e94 100644 --- a/src/lib/data/indexer/TaskFillIndexerCommandQueue.h +++ b/src/lib/data/indexer/TaskFillIndexerCommandQueue.h @@ -3,11 +3,11 @@ #include -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/scheduling/Task.h" +#include "MessageListener.h" +#include "MessageInterruptTasks.h" +#include "Task.h" -#include "data/indexer/interprocess/InterprocessIndexerCommandManager.h" +#include "InterprocessIndexerCommandManager.h" class IndexerCommandProvider; diff --git a/src/lib/data/indexer/interprocess/BaseInterprocessDataManager.h b/src/lib/data/indexer/interprocess/BaseInterprocessDataManager.h index c1d13f60..9dc8f063 100644 --- a/src/lib/data/indexer/interprocess/BaseInterprocessDataManager.h +++ b/src/lib/data/indexer/interprocess/BaseInterprocessDataManager.h @@ -3,8 +3,8 @@ #include -#include "utility/types.h" -#include "utility/interprocess/SharedMemory.h" +#include "types.h" +#include "SharedMemory.h" class BaseInterprocessDataManager { diff --git a/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp b/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp index 3fcf46e5..ee6340d7 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp +++ b/src/lib/data/indexer/interprocess/InterprocessIndexer.cpp @@ -1,9 +1,9 @@ #include "InterprocessIndexer.h" -#include "data/indexer/IndexerCommand.h" -#include "data/indexer/IndexerComposite.h" -#include "utility/file/FileRegister.h" -#include "utility/logging/logging.h" +#include "IndexerCommand.h" +#include "IndexerComposite.h" +#include "FileRegister.h" +#include "logging.h" #include "LanguagePackageManager.h" InterprocessIndexer::InterprocessIndexer(const std::string& uuid, Id processId) diff --git a/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.cpp b/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.cpp index 23898da1..53f6533a 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.cpp +++ b/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.cpp @@ -1,7 +1,7 @@ #include "InterprocessIndexerCommandManager.h" -#include "data/indexer/IndexerCommand.h" -#include "utility/logging/logging.h" +#include "IndexerCommand.h" +#include "logging.h" const char* InterprocessIndexerCommandManager::s_sharedMemoryNamePrefix = "icmd_"; diff --git a/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.h b/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.h index d27c5f12..e54bb923 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.h +++ b/src/lib/data/indexer/interprocess/InterprocessIndexerCommandManager.h @@ -2,7 +2,7 @@ #define INTERPROCESS_INDEXER_COMMAND_MANAGER_H #include "BaseInterprocessDataManager.h" -#include "shared_types/SharedIndexerCommand.h" +#include "SharedIndexerCommand.h" class IndexerCommand; diff --git a/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.cpp b/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.cpp index 36060364..c2564672 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.cpp +++ b/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.cpp @@ -1,7 +1,7 @@ #include "InterprocessIndexingStatusManager.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" const char* InterprocessIndexingStatusManager::s_sharedMemoryNamePrefix = "ists_"; diff --git a/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.h b/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.h index 1e236691..742329e1 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.h +++ b/src/lib/data/indexer/interprocess/InterprocessIndexingStatusManager.h @@ -3,7 +3,7 @@ #include -#include "utility/file/FilePath.h" +#include "FilePath.h" #include "BaseInterprocessDataManager.h" class InterprocessIndexingStatusManager diff --git a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp index c014c1b1..46d0f2e4 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp +++ b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.cpp @@ -1,8 +1,8 @@ #include "InterprocessIntermediateStorageManager.h" -#include "data/indexer/interprocess/shared_types/SharedIntermediateStorage.h" -#include "data/storage/IntermediateStorage.h" -#include "utility/logging/logging.h" +#include "SharedIntermediateStorage.h" +#include "IntermediateStorage.h" +#include "logging.h" const char* InterprocessIntermediateStorageManager::s_sharedMemoryNamePrefix = "iist_"; diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp index 903e38db..7a3fae73 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.cpp @@ -1,10 +1,10 @@ #include "SharedIndexerCommand.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "data/indexer/IndexerCommandJava.h" +#include "IndexerCommandCxx.h" +#include "IndexerCommandJava.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" void SharedIndexerCommand::fromLocal(IndexerCommand* indexerCommand) { diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h index b47b1dc5..6a9c3010 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIndexerCommand.h @@ -3,9 +3,9 @@ #include -#include "utility/file/FilePath.h" -#include "utility/file/FilePathFilter.h" -#include "utility/interprocess/SharedMemory.h" +#include "FilePath.h" +#include "FilePathFilter.h" +#include "SharedMemory.h" class IndexerCommand; diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h b/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h index b91b9a48..d473b7a6 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h @@ -4,8 +4,8 @@ #include #include -#include "data/indexer/interprocess/shared_types/SharedStorageTypes.h" -#include "utility/interprocess/SharedMemory.h" +#include "SharedStorageTypes.h" +#include "SharedMemory.h" class SharedIntermediateStorage { diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedStorageTypes.h b/src/lib/data/indexer/interprocess/shared_types/SharedStorageTypes.h index dce65bed..378449d5 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedStorageTypes.h +++ b/src/lib/data/indexer/interprocess/shared_types/SharedStorageTypes.h @@ -1,19 +1,19 @@ #ifndef SHARED_STORAGE_TYPES_H #define SHARED_STORAGE_TYPES_H -#include "data/storage/type/StorageCommentLocation.h" -#include "data/storage/type/StorageComponentAccess.h" -#include "data/storage/type/StorageEdge.h" -#include "data/storage/type/StorageError.h" -#include "data/storage/type/StorageFile.h" -#include "data/storage/type/StorageLocalSymbol.h" -#include "data/storage/type/StorageNode.h" -#include "data/storage/type/StorageOccurrence.h" -#include "data/storage/type/StorageSourceLocation.h" -#include "data/storage/type/StorageSymbol.h" -#include "utility/types.h" -#include "utility/interprocess/SharedMemory.h" -#include "utility/utilityString.h" +#include "StorageCommentLocation.h" +#include "StorageComponentAccess.h" +#include "StorageEdge.h" +#include "StorageError.h" +#include "StorageFile.h" +#include "StorageLocalSymbol.h" +#include "StorageNode.h" +#include "StorageOccurrence.h" +#include "StorageSourceLocation.h" +#include "StorageSymbol.h" +#include "types.h" +#include "SharedMemory.h" +#include "utilityString.h" // macro creating SharedStorageType from StorageType // - arguments: StorageType & SharedStorageType diff --git a/src/lib/data/location/LocationType.cpp b/src/lib/data/location/LocationType.cpp index 54cb2205..d2a907e0 100644 --- a/src/lib/data/location/LocationType.cpp +++ b/src/lib/data/location/LocationType.cpp @@ -1,4 +1,4 @@ -#include "data/location/LocationType.h" +#include "LocationType.h" int locationTypeToInt(LocationType type) { diff --git a/src/lib/data/location/SourceLocation.cpp b/src/lib/data/location/SourceLocation.cpp index f076f9a9..c442dbd9 100644 --- a/src/lib/data/location/SourceLocation.cpp +++ b/src/lib/data/location/SourceLocation.cpp @@ -1,6 +1,6 @@ -#include "data/location/SourceLocation.h" +#include "SourceLocation.h" -#include "data/location/SourceLocationFile.h" +#include "SourceLocationFile.h" SourceLocation::SourceLocation( SourceLocationFile* file, diff --git a/src/lib/data/location/SourceLocation.h b/src/lib/data/location/SourceLocation.h index 187fcdc0..1cd0d525 100644 --- a/src/lib/data/location/SourceLocation.h +++ b/src/lib/data/location/SourceLocation.h @@ -5,8 +5,8 @@ #include #include -#include "data/location/LocationType.h" -#include "utility/types.h" +#include "LocationType.h" +#include "types.h" class FilePath; class SourceLocationFile; diff --git a/src/lib/data/location/SourceLocationCollection.cpp b/src/lib/data/location/SourceLocationCollection.cpp index 9e99429c..ca2ca598 100644 --- a/src/lib/data/location/SourceLocationCollection.cpp +++ b/src/lib/data/location/SourceLocationCollection.cpp @@ -1,7 +1,7 @@ -#include "data/location/SourceLocationCollection.h" +#include "SourceLocationCollection.h" -#include "data/location/SourceLocationFile.h" -#include "utility/logging/logging.h" +#include "SourceLocationFile.h" +#include "logging.h" SourceLocationCollection::SourceLocationCollection() { diff --git a/src/lib/data/location/SourceLocationCollection.h b/src/lib/data/location/SourceLocationCollection.h index 8fcfce48..bcc84db4 100644 --- a/src/lib/data/location/SourceLocationCollection.h +++ b/src/lib/data/location/SourceLocationCollection.h @@ -7,8 +7,8 @@ #include #include -#include "data/location/LocationType.h" -#include "utility/types.h" +#include "LocationType.h" +#include "types.h" class FilePath; class SourceLocation; diff --git a/src/lib/data/location/SourceLocationFile.cpp b/src/lib/data/location/SourceLocationFile.cpp index 68a976e9..5beab84a 100644 --- a/src/lib/data/location/SourceLocationFile.cpp +++ b/src/lib/data/location/SourceLocationFile.cpp @@ -1,4 +1,4 @@ -#include "data/location/SourceLocationFile.h" +#include "SourceLocationFile.h" SourceLocationFile::SourceLocationFile(const FilePath& filePath, bool isWhole, bool isComplete, bool isIndexed) : m_filePath(filePath) diff --git a/src/lib/data/location/SourceLocationFile.h b/src/lib/data/location/SourceLocationFile.h index 5a9a3032..da042634 100644 --- a/src/lib/data/location/SourceLocationFile.h +++ b/src/lib/data/location/SourceLocationFile.h @@ -7,10 +7,10 @@ #include #include -#include "data/location/LocationType.h" -#include "data/location/SourceLocation.h" -#include "utility/file/FilePath.h" -#include "utility/types.h" +#include "LocationType.h" +#include "SourceLocation.h" +#include "FilePath.h" +#include "types.h" class SourceLocationFile { diff --git a/src/lib/data/name/NameDelimiterType.cpp b/src/lib/data/name/NameDelimiterType.cpp index eb88d567..9c8df1c8 100644 --- a/src/lib/data/name/NameDelimiterType.cpp +++ b/src/lib/data/name/NameDelimiterType.cpp @@ -1,4 +1,4 @@ -#include "data/name/NameDelimiterType.h" +#include "NameDelimiterType.h" #include diff --git a/src/lib/data/name/NameElement.cpp b/src/lib/data/name/NameElement.cpp index c99f9395..ace021b2 100644 --- a/src/lib/data/name/NameElement.cpp +++ b/src/lib/data/name/NameElement.cpp @@ -1,7 +1,7 @@ -#include "data/name/NameElement.h" +#include "NameElement.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" NameElement::Signature::Signature() : m_prefix(L"") diff --git a/src/lib/data/name/NameHierarchy.cpp b/src/lib/data/name/NameHierarchy.cpp index 84f1daa7..bd38f000 100644 --- a/src/lib/data/name/NameHierarchy.cpp +++ b/src/lib/data/name/NameHierarchy.cpp @@ -1,9 +1,9 @@ -#include "data/name/NameHierarchy.h" +#include "NameHierarchy.h" #include -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" namespace { diff --git a/src/lib/data/name/NameHierarchy.h b/src/lib/data/name/NameHierarchy.h index 02c62334..236b1d07 100644 --- a/src/lib/data/name/NameHierarchy.h +++ b/src/lib/data/name/NameHierarchy.h @@ -5,8 +5,8 @@ #include #include -#include "data/name/NameDelimiterType.h" -#include "data/name/NameElement.h" +#include "NameDelimiterType.h" +#include "NameElement.h" class NameHierarchy { diff --git a/src/lib/data/parser/AccessKind.cpp b/src/lib/data/parser/AccessKind.cpp index 6c3e08dc..f7d336a9 100644 --- a/src/lib/data/parser/AccessKind.cpp +++ b/src/lib/data/parser/AccessKind.cpp @@ -1,4 +1,4 @@ -#include "data/parser/AccessKind.h" +#include "AccessKind.h" AccessKind intToAccessKind(int v) { diff --git a/src/lib/data/parser/ParseLocation.cpp b/src/lib/data/parser/ParseLocation.cpp index 7bef1022..de610749 100644 --- a/src/lib/data/parser/ParseLocation.cpp +++ b/src/lib/data/parser/ParseLocation.cpp @@ -1,4 +1,4 @@ -#include "data/parser/ParseLocation.h" +#include "ParseLocation.h" ParseLocation::ParseLocation() : filePath(L"") diff --git a/src/lib/data/parser/ParseLocation.h b/src/lib/data/parser/ParseLocation.h index 4fd0ea88..98fa8666 100644 --- a/src/lib/data/parser/ParseLocation.h +++ b/src/lib/data/parser/ParseLocation.h @@ -3,8 +3,8 @@ #include -#include "utility/file/FilePath.h" -#include "utility/types.h" +#include "FilePath.h" +#include "types.h" struct ParseLocation { diff --git a/src/lib/data/parser/Parser.cpp b/src/lib/data/parser/Parser.cpp index 8b0616a4..7d598f65 100644 --- a/src/lib/data/parser/Parser.cpp +++ b/src/lib/data/parser/Parser.cpp @@ -1,4 +1,4 @@ -#include "data/parser/Parser.h" +#include "Parser.h" Parser::Parser(std::shared_ptr client) : m_client(client) diff --git a/src/lib/data/parser/ParserClient.cpp b/src/lib/data/parser/ParserClient.cpp index 61278544..be5dbb4d 100644 --- a/src/lib/data/parser/ParserClient.cpp +++ b/src/lib/data/parser/ParserClient.cpp @@ -1,8 +1,8 @@ -#include "data/parser/ParserClient.h" +#include "ParserClient.h" #include -#include "data/parser/ParseLocation.h" +#include "ParseLocation.h" std::wstring ParserClient::addAccessPrefix(const std::wstring& str, AccessKind access) { diff --git a/src/lib/data/parser/ParserClient.h b/src/lib/data/parser/ParserClient.h index 57824d8d..c8909750 100644 --- a/src/lib/data/parser/ParserClient.h +++ b/src/lib/data/parser/ParserClient.h @@ -4,13 +4,13 @@ #include #include -#include "data/name/NameHierarchy.h" -#include "data/parser/AccessKind.h" -#include "data/parser/ReferenceKind.h" -#include "data/parser/SymbolKind.h" -#include "data/DefinitionKind.h" -#include "utility/file/FileInfo.h" -#include "utility/types.h" +#include "NameHierarchy.h" +#include "AccessKind.h" +#include "ReferenceKind.h" +#include "SymbolKind.h" +#include "DefinitionKind.h" +#include "FileInfo.h" +#include "types.h" struct ParseLocation; class DataType; diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp index f2f2b8b0..bb1d5623 100644 --- a/src/lib/data/parser/ParserClientImpl.cpp +++ b/src/lib/data/parser/ParserClientImpl.cpp @@ -1,10 +1,10 @@ -#include "data/parser/ParserClientImpl.h" +#include "ParserClientImpl.h" -#include "data/graph/Edge.h" -#include "data/graph/Node.h" -#include "data/location/LocationType.h" -#include "data/parser/ParseLocation.h" -#include "utility/logging/logging.h" +#include "Edge.h" +#include "Node.h" +#include "LocationType.h" +#include "ParseLocation.h" +#include "logging.h" ParserClientImpl::ParserClientImpl() { diff --git a/src/lib/data/parser/ParserClientImpl.h b/src/lib/data/parser/ParserClientImpl.h index 42463069..07d2f165 100644 --- a/src/lib/data/parser/ParserClientImpl.h +++ b/src/lib/data/parser/ParserClientImpl.h @@ -3,10 +3,10 @@ #include -#include "data/DefinitionKind.h" -#include "data/graph/Node.h" -#include "data/storage/IntermediateStorage.h" -#include "data/parser/ParserClient.h" +#include "DefinitionKind.h" +#include "Node.h" +#include "IntermediateStorage.h" +#include "ParserClient.h" class ParserClientImpl : public ParserClient diff --git a/src/lib/data/parser/ReferenceKind.cpp b/src/lib/data/parser/ReferenceKind.cpp index f9a6187a..748dfc8d 100644 --- a/src/lib/data/parser/ReferenceKind.cpp +++ b/src/lib/data/parser/ReferenceKind.cpp @@ -1,4 +1,4 @@ -#include "data/parser/ReferenceKind.h" +#include "ReferenceKind.h" ReferenceKind intToReferenceKind(int v) { diff --git a/src/lib/data/parser/SymbolKind.cpp b/src/lib/data/parser/SymbolKind.cpp index acc66b9a..86b948fe 100644 --- a/src/lib/data/parser/SymbolKind.cpp +++ b/src/lib/data/parser/SymbolKind.cpp @@ -1,4 +1,4 @@ -#include "data/parser/SymbolKind.h" +#include "SymbolKind.h" SymbolKind intToSymbolKind(int v) { diff --git a/src/lib/data/parser/TaskParseWrapper.cpp b/src/lib/data/parser/TaskParseWrapper.cpp index 3bf04964..e8ec4dd7 100644 --- a/src/lib/data/parser/TaskParseWrapper.cpp +++ b/src/lib/data/parser/TaskParseWrapper.cpp @@ -1,9 +1,9 @@ -#include "data/parser/TaskParseWrapper.h" +#include "TaskParseWrapper.h" -#include "component/view/DialogView.h" -#include "data/storage/PersistentStorage.h" -#include "utility/scheduling/Blackboard.h" -#include "utility/utility.h" +#include "DialogView.h" +#include "PersistentStorage.h" +#include "Blackboard.h" +#include "utility.h" TaskParseWrapper::TaskParseWrapper(std::weak_ptr storage, std::shared_ptr dialogView) : m_storage(storage) diff --git a/src/lib/data/parser/TaskParseWrapper.h b/src/lib/data/parser/TaskParseWrapper.h index 9d6da888..4f5c9872 100644 --- a/src/lib/data/parser/TaskParseWrapper.h +++ b/src/lib/data/parser/TaskParseWrapper.h @@ -3,10 +3,10 @@ #include -#include "utility/scheduling/Task.h" -#include "utility/scheduling/TaskRunner.h" -#include "utility/scheduling/TaskDecorator.h" -#include "utility/TimeStamp.h" +#include "Task.h" +#include "TaskRunner.h" +#include "TaskDecorator.h" +#include "TimeStamp.h" class DialogView; class FileRegister; diff --git a/src/lib/data/search/SearchIndex.cpp b/src/lib/data/search/SearchIndex.cpp index cf610699..390238aa 100644 --- a/src/lib/data/search/SearchIndex.cpp +++ b/src/lib/data/search/SearchIndex.cpp @@ -1,11 +1,11 @@ -#include "data/search/SearchIndex.h" +#include "SearchIndex.h" #include #include #include -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "utility.h" +#include "utilityString.h" SearchIndex::SearchIndex() { diff --git a/src/lib/data/search/SearchIndex.h b/src/lib/data/search/SearchIndex.h index ae8cb3f7..5049387d 100644 --- a/src/lib/data/search/SearchIndex.h +++ b/src/lib/data/search/SearchIndex.h @@ -7,9 +7,9 @@ #include #include -#include "utility/types.h" -#include "data/graph/Node.h" -#include "data/NodeTypeSet.h" +#include "types.h" +#include "Node.h" +#include "NodeTypeSet.h" // SearchResult is only used as an internal type in the SearchIndex and the PersistentStorage struct SearchResult diff --git a/src/lib/data/search/SearchMatch.cpp b/src/lib/data/search/SearchMatch.cpp index 22652da9..8a043336 100644 --- a/src/lib/data/search/SearchMatch.cpp +++ b/src/lib/data/search/SearchMatch.cpp @@ -1,9 +1,9 @@ -#include "data/search/SearchMatch.h" +#include "SearchMatch.h" #include -#include "data/NodeTypeSet.h" -#include "utility/logging/logging.h" +#include "NodeTypeSet.h" +#include "logging.h" void SearchMatch::log(const std::vector& matches, const std::wstring& query) { diff --git a/src/lib/data/search/SearchMatch.h b/src/lib/data/search/SearchMatch.h index ed52eb87..d39ba079 100644 --- a/src/lib/data/search/SearchMatch.h +++ b/src/lib/data/search/SearchMatch.h @@ -6,8 +6,8 @@ #include #include -#include "data/graph/Node.h" -#include "utility/types.h" +#include "Node.h" +#include "types.h" class NodeTypeSet; diff --git a/src/lib/data/storage/IntermediateStorage.cpp b/src/lib/data/storage/IntermediateStorage.cpp index 8a30984c..2f377340 100644 --- a/src/lib/data/storage/IntermediateStorage.cpp +++ b/src/lib/data/storage/IntermediateStorage.cpp @@ -1,6 +1,6 @@ -#include "data/storage/IntermediateStorage.h" +#include "IntermediateStorage.h" -#include "utility/utility.h" +#include "utility.h" IntermediateStorage::IntermediateStorage() : m_nextId(1) diff --git a/src/lib/data/storage/IntermediateStorage.h b/src/lib/data/storage/IntermediateStorage.h index 1683b5b6..4ec83e56 100644 --- a/src/lib/data/storage/IntermediateStorage.h +++ b/src/lib/data/storage/IntermediateStorage.h @@ -5,17 +5,17 @@ #include #include -#include "data/storage/type/StorageCommentLocation.h" -#include "data/storage/type/StorageComponentAccess.h" -#include "data/storage/type/StorageEdge.h" -#include "data/storage/type/StorageError.h" -#include "data/storage/type/StorageFile.h" -#include "data/storage/type/StorageLocalSymbol.h" -#include "data/storage/type/StorageNode.h" -#include "data/storage/type/StorageOccurrence.h" -#include "data/storage/type/StorageSourceLocation.h" -#include "data/storage/type/StorageSymbol.h" -#include "data/storage/Storage.h" +#include "StorageCommentLocation.h" +#include "StorageComponentAccess.h" +#include "StorageEdge.h" +#include "StorageError.h" +#include "StorageFile.h" +#include "StorageLocalSymbol.h" +#include "StorageNode.h" +#include "StorageOccurrence.h" +#include "StorageSourceLocation.h" +#include "StorageSymbol.h" +#include "Storage.h" class IntermediateStorage: public Storage { diff --git a/src/lib/data/storage/PersistentStorage.cpp b/src/lib/data/storage/PersistentStorage.cpp index 073ff99b..67b4fcac 100644 --- a/src/lib/data/storage/PersistentStorage.cpp +++ b/src/lib/data/storage/PersistentStorage.cpp @@ -1,31 +1,31 @@ -#include "data/storage/PersistentStorage.h" +#include "PersistentStorage.h" #include #include -#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/TokenComponentInheritanceChain.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" -#include "data/NodeTypeSet.h" -#include "settings/ApplicationSettings.h" -#include "utility/UnorderedCache.h" -#include "utility/file/FileInfo.h" -#include "utility/file/FilePath.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/error/MessageErrorCountUpdate.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/text/TextAccess.h" -#include "utility/TextCodec.h" -#include "utility/TimeStamp.h" -#include "utility/tracing.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" +#include "TokenComponentAccess.h" +#include "TokenComponentAggregation.h" +#include "TokenComponentFilePath.h" +#include "TokenComponentInheritanceChain.h" +#include "Graph.h" +#include "SourceLocationCollection.h" +#include "SourceLocationFile.h" +#include "AccessKind.h" +#include "ParseLocation.h" +#include "NodeTypeSet.h" +#include "ApplicationSettings.h" +#include "UnorderedCache.h" +#include "FileInfo.h" +#include "FilePath.h" +#include "logging.h" +#include "MessageErrorCountUpdate.h" +#include "MessageStatus.h" +#include "TextAccess.h" +#include "TextCodec.h" +#include "TimeStamp.h" +#include "tracing.h" +#include "utility.h" +#include "utilityApp.h" PersistentStorage::PersistentStorage(const FilePath& dbPath, const FilePath& bookmarkPath) : m_sqliteIndexStorage(dbPath) diff --git a/src/lib/data/storage/PersistentStorage.h b/src/lib/data/storage/PersistentStorage.h index 960ead79..d027607c 100644 --- a/src/lib/data/storage/PersistentStorage.h +++ b/src/lib/data/storage/PersistentStorage.h @@ -4,13 +4,13 @@ #include #include -#include "data/access/StorageAccess.h" -#include "data/fulltextsearch/FullTextSearchIndex.h" -#include "data/search/SearchIndex.h" -#include "data/HierarchyCache.h" -#include "data/storage/sqlite/SqliteIndexStorage.h" -#include "data/storage/sqlite/SqliteBookmarkStorage.h" -#include "data/storage/Storage.h" +#include "StorageAccess.h" +#include "FullTextSearchIndex.h" +#include "SearchIndex.h" +#include "HierarchyCache.h" +#include "SqliteIndexStorage.h" +#include "SqliteBookmarkStorage.h" +#include "Storage.h" class PersistentStorage : public Storage diff --git a/src/lib/data/storage/Storage.cpp b/src/lib/data/storage/Storage.cpp index 5bc40f2a..b2a7b271 100644 --- a/src/lib/data/storage/Storage.cpp +++ b/src/lib/data/storage/Storage.cpp @@ -1,18 +1,18 @@ -#include "data/storage/Storage.h" +#include "Storage.h" #include -#include "data/storage/type/StorageCommentLocation.h" -#include "data/storage/type/StorageComponentAccess.h" -#include "data/storage/type/StorageEdge.h" -#include "data/storage/type/StorageError.h" -#include "data/storage/type/StorageFile.h" -#include "data/storage/type/StorageLocalSymbol.h" -#include "data/storage/type/StorageNode.h" -#include "data/storage/type/StorageOccurrence.h" -#include "data/storage/type/StorageSourceLocation.h" -#include "data/storage/type/StorageSymbol.h" -#include "utility/tracing.h" +#include "StorageCommentLocation.h" +#include "StorageComponentAccess.h" +#include "StorageEdge.h" +#include "StorageError.h" +#include "StorageFile.h" +#include "StorageLocalSymbol.h" +#include "StorageNode.h" +#include "StorageOccurrence.h" +#include "StorageSourceLocation.h" +#include "StorageSymbol.h" +#include "tracing.h" Storage::Storage() { diff --git a/src/lib/data/storage/Storage.h b/src/lib/data/storage/Storage.h index 877e435e..13236fb2 100644 --- a/src/lib/data/storage/Storage.h +++ b/src/lib/data/storage/Storage.h @@ -5,17 +5,17 @@ #include #include -#include "data/storage/type/StorageCommentLocation.h" -#include "data/storage/type/StorageComponentAccess.h" -#include "data/storage/type/StorageEdge.h" -#include "data/storage/type/StorageError.h" -#include "data/storage/type/StorageFile.h" -#include "data/storage/type/StorageLocalSymbol.h" -#include "data/storage/type/StorageNode.h" -#include "data/storage/type/StorageOccurrence.h" -#include "data/storage/type/StorageSourceLocation.h" -#include "data/storage/type/StorageSymbol.h" -#include "utility/types.h" +#include "StorageCommentLocation.h" +#include "StorageComponentAccess.h" +#include "StorageEdge.h" +#include "StorageError.h" +#include "StorageFile.h" +#include "StorageLocalSymbol.h" +#include "StorageNode.h" +#include "StorageOccurrence.h" +#include "StorageSourceLocation.h" +#include "StorageSymbol.h" +#include "types.h" class Storage { diff --git a/src/lib/data/storage/StorageCache.cpp b/src/lib/data/storage/StorageCache.cpp index 458b4825..59560527 100644 --- a/src/lib/data/storage/StorageCache.cpp +++ b/src/lib/data/storage/StorageCache.cpp @@ -1,4 +1,4 @@ -#include "data/storage/StorageCache.h" +#include "StorageCache.h" void StorageCache::clear() { diff --git a/src/lib/data/storage/StorageCache.h b/src/lib/data/storage/StorageCache.h index 95a38c80..a8896910 100644 --- a/src/lib/data/storage/StorageCache.h +++ b/src/lib/data/storage/StorageCache.h @@ -3,7 +3,7 @@ #include -#include "data/access/StorageAccessProxy.h" +#include "StorageAccessProxy.h" class StorageCache : public StorageAccessProxy diff --git a/src/lib/data/storage/StorageProvider.cpp b/src/lib/data/storage/StorageProvider.cpp index 8c6d6b24..0241c9b9 100644 --- a/src/lib/data/storage/StorageProvider.cpp +++ b/src/lib/data/storage/StorageProvider.cpp @@ -1,6 +1,6 @@ -#include "data/storage/StorageProvider.h" +#include "StorageProvider.h" -#include "utility/logging/logging.h" +#include "logging.h" int StorageProvider::getStorageCount() const { diff --git a/src/lib/data/storage/StorageProvider.h b/src/lib/data/storage/StorageProvider.h index 0c526ddf..b6ab4968 100644 --- a/src/lib/data/storage/StorageProvider.h +++ b/src/lib/data/storage/StorageProvider.h @@ -4,7 +4,7 @@ #include #include #include -#include "data/storage/IntermediateStorage.h" +#include "IntermediateStorage.h" class StorageProvider { diff --git a/src/lib/data/storage/StorageStats.h b/src/lib/data/storage/StorageStats.h index f97d75a1..826b750d 100644 --- a/src/lib/data/storage/StorageStats.h +++ b/src/lib/data/storage/StorageStats.h @@ -1,7 +1,7 @@ #ifndef STORAGE_STATS_H #define STORAGE_STATS_H -#include "utility/TimeStamp.h" +#include "TimeStamp.h" struct StorageStats { diff --git a/src/lib/data/storage/migration/SqliteStorageMigration.cpp b/src/lib/data/storage/migration/SqliteStorageMigration.cpp index 3e16f657..ce66bada 100644 --- a/src/lib/data/storage/migration/SqliteStorageMigration.cpp +++ b/src/lib/data/storage/migration/SqliteStorageMigration.cpp @@ -1,4 +1,4 @@ -#include "data/storage/migration/SqliteStorageMigration.h" +#include "SqliteStorageMigration.h" SqliteStorageMigration::~SqliteStorageMigration() { diff --git a/src/lib/data/storage/migration/SqliteStorageMigration.h b/src/lib/data/storage/migration/SqliteStorageMigration.h index f80d33e7..6b249296 100644 --- a/src/lib/data/storage/migration/SqliteStorageMigration.h +++ b/src/lib/data/storage/migration/SqliteStorageMigration.h @@ -4,8 +4,8 @@ #include #include -#include "data/storage/sqlite/SqliteStorage.h" -#include "utility/migration/Migration.h" +#include "SqliteStorage.h" +#include "Migration.h" class SqliteStorageMigration: public Migration { diff --git a/src/lib/data/storage/migration/SqliteStorageMigrationLambda.cpp b/src/lib/data/storage/migration/SqliteStorageMigrationLambda.cpp index f5358378..4f851f08 100644 --- a/src/lib/data/storage/migration/SqliteStorageMigrationLambda.cpp +++ b/src/lib/data/storage/migration/SqliteStorageMigrationLambda.cpp @@ -1,4 +1,4 @@ -#include "data/storage/migration/SqliteStorageMigrationLambda.h" +#include "SqliteStorageMigrationLambda.h" SqliteStorageMigrationLambda::SqliteStorageMigrationLambda(std::function m_lambda) diff --git a/src/lib/data/storage/migration/SqliteStorageMigrationLambda.h b/src/lib/data/storage/migration/SqliteStorageMigrationLambda.h index db377bb1..16cfbc09 100644 --- a/src/lib/data/storage/migration/SqliteStorageMigrationLambda.h +++ b/src/lib/data/storage/migration/SqliteStorageMigrationLambda.h @@ -3,7 +3,7 @@ #include -#include "data/storage/migration/SqliteStorageMigration.h" +#include "SqliteStorageMigration.h" class SqliteStorageMigrationLambda: public SqliteStorageMigration { diff --git a/src/lib/data/storage/migration/SqliteStorageMigrator.h b/src/lib/data/storage/migration/SqliteStorageMigrator.h index ff2fcf79..8a644e2b 100644 --- a/src/lib/data/storage/migration/SqliteStorageMigrator.h +++ b/src/lib/data/storage/migration/SqliteStorageMigrator.h @@ -1,7 +1,7 @@ #ifndef SQLITE_STORAGE_MIGRATOR_H #define SQLITE_STORAGE_MIGRATOR_H -#include "utility/migration/Migrator.h" +#include "Migrator.h" class SqliteStorage; diff --git a/src/lib/data/storage/sqlite/SqliteBookmarkStorage.cpp b/src/lib/data/storage/sqlite/SqliteBookmarkStorage.cpp index f6477482..d26226f0 100644 --- a/src/lib/data/storage/sqlite/SqliteBookmarkStorage.cpp +++ b/src/lib/data/storage/sqlite/SqliteBookmarkStorage.cpp @@ -1,10 +1,10 @@ -#include "data/storage/sqlite/SqliteBookmarkStorage.h" +#include "SqliteBookmarkStorage.h" -#include "data/storage/migration/SqliteStorageMigrationLambda.h" -#include "data/storage/migration/SqliteStorageMigrator.h" -#include "settings/ProjectSettings.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "SqliteStorageMigrationLambda.h" +#include "SqliteStorageMigrator.h" +#include "ProjectSettings.h" +#include "logging.h" +#include "utilityString.h" #include "Application.h" const size_t SqliteBookmarkStorage::s_storageVersion = 2; diff --git a/src/lib/data/storage/sqlite/SqliteBookmarkStorage.h b/src/lib/data/storage/sqlite/SqliteBookmarkStorage.h index e46b2c5e..f68e705b 100644 --- a/src/lib/data/storage/sqlite/SqliteBookmarkStorage.h +++ b/src/lib/data/storage/sqlite/SqliteBookmarkStorage.h @@ -1,12 +1,12 @@ #ifndef SQLITE_BOOKMARK_STORAGE_H #define SQLITE_BOOKMARK_STORAGE_H -#include "data/storage/sqlite/SqliteStorage.h" -#include "data/storage/type/StorageBookmark.h" -#include "data/storage/type/StorageBookmarkCategory.h" -#include "data/storage/type/StorageBookmarkedNode.h" -#include "data/storage/type/StorageBookmarkedEdge.h" -#include "utility/types.h" +#include "SqliteStorage.h" +#include "StorageBookmark.h" +#include "StorageBookmarkCategory.h" +#include "StorageBookmarkedNode.h" +#include "StorageBookmarkedEdge.h" +#include "types.h" class SqliteBookmarkStorage : public SqliteStorage diff --git a/src/lib/data/storage/sqlite/SqliteDatabaseIndex.cpp b/src/lib/data/storage/sqlite/SqliteDatabaseIndex.cpp index 6e4fc3fa..b5fef30f 100644 --- a/src/lib/data/storage/sqlite/SqliteDatabaseIndex.cpp +++ b/src/lib/data/storage/sqlite/SqliteDatabaseIndex.cpp @@ -1,6 +1,6 @@ -#include "data/storage/sqlite/SqliteDatabaseIndex.h" +#include "SqliteDatabaseIndex.h" -#include "utility/logging/logging.h" +#include "logging.h" SqliteDatabaseIndex::SqliteDatabaseIndex(const std::string& indexName, const std::string& indexTarget) : m_indexName(indexName) diff --git a/src/lib/data/storage/sqlite/SqliteDatabaseIndex.h b/src/lib/data/storage/sqlite/SqliteDatabaseIndex.h index d693aa1c..5e29b46c 100644 --- a/src/lib/data/storage/sqlite/SqliteDatabaseIndex.h +++ b/src/lib/data/storage/sqlite/SqliteDatabaseIndex.h @@ -2,7 +2,7 @@ #define SQLITE_DATABASE_INDEX_H #include -#include "sqlite/CppSQLite3.h" +#include "CppSQLite3.h" class SqliteDatabaseIndex { diff --git a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp index d60a9b77..0b8c44f1 100644 --- a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp +++ b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp @@ -1,14 +1,14 @@ -#include "data/storage/sqlite/SqliteIndexStorage.h" +#include "SqliteIndexStorage.h" #include -#include "utility/file/FileSystem.h" -#include "utility/logging/logging.h" -#include "utility/text/TextAccess.h" -#include "utility/utilityString.h" +#include "FileSystem.h" +#include "logging.h" +#include "TextAccess.h" +#include "utilityString.h" -#include "data/location/SourceLocationCollection.h" -#include "data/location/SourceLocationFile.h" +#include "SourceLocationCollection.h" +#include "SourceLocationFile.h" const size_t SqliteIndexStorage::s_storageVersion = 19; diff --git a/src/lib/data/storage/sqlite/SqliteIndexStorage.h b/src/lib/data/storage/sqlite/SqliteIndexStorage.h index 200b4da6..ddc966c3 100644 --- a/src/lib/data/storage/sqlite/SqliteIndexStorage.h +++ b/src/lib/data/storage/sqlite/SqliteIndexStorage.h @@ -5,23 +5,23 @@ #include #include -#include "data/location/LocationType.h" -#include "data/storage/sqlite/SqliteDatabaseIndex.h" -#include "data/storage/sqlite/SqliteStorage.h" -#include "data/storage/type/StorageCommentLocation.h" -#include "data/storage/type/StorageComponentAccess.h" -#include "data/storage/type/StorageEdge.h" -#include "data/storage/type/StorageError.h" -#include "data/storage/type/StorageFile.h" -#include "data/storage/type/StorageLocalSymbol.h" -#include "data/storage/type/StorageNode.h" -#include "data/storage/type/StorageOccurrence.h" -#include "data/storage/type/StorageSourceLocation.h" -#include "data/storage/type/StorageSymbol.h" -#include "utility/LowMemoryStringMap.h" -#include "utility/types.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "LocationType.h" +#include "SqliteDatabaseIndex.h" +#include "SqliteStorage.h" +#include "StorageCommentLocation.h" +#include "StorageComponentAccess.h" +#include "StorageEdge.h" +#include "StorageError.h" +#include "StorageFile.h" +#include "StorageLocalSymbol.h" +#include "StorageNode.h" +#include "StorageOccurrence.h" +#include "StorageSourceLocation.h" +#include "StorageSymbol.h" +#include "LowMemoryStringMap.h" +#include "types.h" +#include "utility.h" +#include "utilityString.h" class TextAccess; class Version; diff --git a/src/lib/data/storage/sqlite/SqliteStorage.cpp b/src/lib/data/storage/sqlite/SqliteStorage.cpp index 646e5b9e..229ae8e6 100644 --- a/src/lib/data/storage/sqlite/SqliteStorage.cpp +++ b/src/lib/data/storage/sqlite/SqliteStorage.cpp @@ -1,9 +1,9 @@ -#include "data/storage/sqlite/SqliteStorage.h" +#include "SqliteStorage.h" -#include "utility/file/FileSystem.h" -#include "utility/logging/logging.h" -#include "utility/TimeStamp.h" -#include "utility/utilityString.h" +#include "FileSystem.h" +#include "logging.h" +#include "TimeStamp.h" +#include "utilityString.h" SqliteStorage::SqliteStorage(const FilePath& dbFilePath) : m_dbFilePath(dbFilePath.getCanonical()) diff --git a/src/lib/data/storage/sqlite/SqliteStorage.h b/src/lib/data/storage/sqlite/SqliteStorage.h index 233fb79e..47d1750a 100644 --- a/src/lib/data/storage/sqlite/SqliteStorage.h +++ b/src/lib/data/storage/sqlite/SqliteStorage.h @@ -1,10 +1,10 @@ #ifndef SQLITE_STORAGE_H #define SQLITE_STORAGE_H -#include "sqlite/CppSQLite3.h" +#include "CppSQLite3.h" -#include "data/storage/sqlite/SqliteDatabaseIndex.h" -#include "utility/file/FilePath.h" +#include "SqliteDatabaseIndex.h" +#include "FilePath.h" class SqliteStorageMigration; class TimeStamp; diff --git a/src/lib/data/storage/type/StorageBookmark.h b/src/lib/data/storage/type/StorageBookmark.h index c37071ca..bb266b71 100644 --- a/src/lib/data/storage/type/StorageBookmark.h +++ b/src/lib/data/storage/type/StorageBookmark.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageBookmarkData { diff --git a/src/lib/data/storage/type/StorageBookmarkCategory.h b/src/lib/data/storage/type/StorageBookmarkCategory.h index 398116f4..51fbcde4 100644 --- a/src/lib/data/storage/type/StorageBookmarkCategory.h +++ b/src/lib/data/storage/type/StorageBookmarkCategory.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageBookmarkCategoryData { diff --git a/src/lib/data/storage/type/StorageBookmarkedEdge.h b/src/lib/data/storage/type/StorageBookmarkedEdge.h index 84202127..cb008163 100644 --- a/src/lib/data/storage/type/StorageBookmarkedEdge.h +++ b/src/lib/data/storage/type/StorageBookmarkedEdge.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageBookmarkedEdgeData { diff --git a/src/lib/data/storage/type/StorageBookmarkedNode.h b/src/lib/data/storage/type/StorageBookmarkedNode.h index 26a50a9e..8c72d2a3 100644 --- a/src/lib/data/storage/type/StorageBookmarkedNode.h +++ b/src/lib/data/storage/type/StorageBookmarkedNode.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageBookmarkedNodeData { diff --git a/src/lib/data/storage/type/StorageCommentLocation.h b/src/lib/data/storage/type/StorageCommentLocation.h index b7bb66a8..f2cd657a 100644 --- a/src/lib/data/storage/type/StorageCommentLocation.h +++ b/src/lib/data/storage/type/StorageCommentLocation.h @@ -1,7 +1,7 @@ #ifndef STORAGE_COMMENT_LOCATION_H #define STORAGE_COMMENT_LOCATION_H -#include "utility/types.h" +#include "types.h" struct StorageCommentLocationData { diff --git a/src/lib/data/storage/type/StorageComponentAccess.h b/src/lib/data/storage/type/StorageComponentAccess.h index 3d2eb03b..1c53d113 100644 --- a/src/lib/data/storage/type/StorageComponentAccess.h +++ b/src/lib/data/storage/type/StorageComponentAccess.h @@ -1,7 +1,7 @@ #ifndef STORAGE_COMPONENT_ACCESS_H #define STORAGE_COMPONENT_ACCESS_H -#include "utility/types.h" +#include "types.h" struct StorageComponentAccess { diff --git a/src/lib/data/storage/type/StorageEdge.h b/src/lib/data/storage/type/StorageEdge.h index 01b35cb1..51d4d777 100644 --- a/src/lib/data/storage/type/StorageEdge.h +++ b/src/lib/data/storage/type/StorageEdge.h @@ -1,7 +1,7 @@ #ifndef STORAGE_EDGE_H #define STORAGE_EDGE_H -#include "utility/types.h" +#include "types.h" struct StorageEdgeData { diff --git a/src/lib/data/storage/type/StorageError.h b/src/lib/data/storage/type/StorageError.h index 1c4cabc8..49ae6194 100644 --- a/src/lib/data/storage/type/StorageError.h +++ b/src/lib/data/storage/type/StorageError.h @@ -3,8 +3,8 @@ #include -#include "utility/file/FilePath.h" -#include "utility/types.h" +#include "FilePath.h" +#include "types.h" struct StorageErrorData { diff --git a/src/lib/data/storage/type/StorageFile.h b/src/lib/data/storage/type/StorageFile.h index 96686daa..cd825626 100644 --- a/src/lib/data/storage/type/StorageFile.h +++ b/src/lib/data/storage/type/StorageFile.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageFile { diff --git a/src/lib/data/storage/type/StorageLocalSymbol.h b/src/lib/data/storage/type/StorageLocalSymbol.h index 3c4f4c0d..3a1406fd 100644 --- a/src/lib/data/storage/type/StorageLocalSymbol.h +++ b/src/lib/data/storage/type/StorageLocalSymbol.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageLocalSymbolData { diff --git a/src/lib/data/storage/type/StorageNode.h b/src/lib/data/storage/type/StorageNode.h index e2f8b2af..b1b240c0 100644 --- a/src/lib/data/storage/type/StorageNode.h +++ b/src/lib/data/storage/type/StorageNode.h @@ -3,7 +3,7 @@ #include -#include "utility/types.h" +#include "types.h" struct StorageNodeData { diff --git a/src/lib/data/storage/type/StorageOccurrence.h b/src/lib/data/storage/type/StorageOccurrence.h index 61e35914..45f91a50 100644 --- a/src/lib/data/storage/type/StorageOccurrence.h +++ b/src/lib/data/storage/type/StorageOccurrence.h @@ -1,7 +1,7 @@ #ifndef STORAGE_OCCURRENCE_H #define STORAGE_OCCURRENCE_H -#include "utility/types.h" +#include "types.h" struct StorageOccurrence { diff --git a/src/lib/data/storage/type/StorageSourceLocation.h b/src/lib/data/storage/type/StorageSourceLocation.h index f70280d6..a791d3ca 100644 --- a/src/lib/data/storage/type/StorageSourceLocation.h +++ b/src/lib/data/storage/type/StorageSourceLocation.h @@ -1,7 +1,7 @@ #ifndef STORAGE_SOURCE_LOCATION_H #define STORAGE_SOURCE_LOCATION_H -#include "utility/types.h" +#include "types.h" struct StorageSourceLocationData { diff --git a/src/lib/data/storage/type/StorageSymbol.h b/src/lib/data/storage/type/StorageSymbol.h index 88fdd90e..9ba1d32d 100644 --- a/src/lib/data/storage/type/StorageSymbol.h +++ b/src/lib/data/storage/type/StorageSymbol.h @@ -1,8 +1,8 @@ #ifndef STORAGE_SYMBOL_H #define STORAGE_SYMBOL_H -#include "data/DefinitionKind.h" -#include "utility/types.h" +#include "DefinitionKind.h" +#include "types.h" struct StorageSymbol { diff --git a/src/lib/data/tooltip/TooltipInfo.h b/src/lib/data/tooltip/TooltipInfo.h index 5552e1dd..f6e87ce9 100644 --- a/src/lib/data/tooltip/TooltipInfo.h +++ b/src/lib/data/tooltip/TooltipInfo.h @@ -3,8 +3,8 @@ #include -#include "utility/math/Vector2.h" -#include "utility/types.h" +#include "Vector2.h" +#include "types.h" class SourceLocationFile; diff --git a/src/lib/project/Project.cpp b/src/lib/project/Project.cpp index e34d185d..7a2248c7 100644 --- a/src/lib/project/Project.cpp +++ b/src/lib/project/Project.cpp @@ -1,47 +1,47 @@ -#include "project/Project.h" +#include "Project.h" -#include "component/view/DialogView.h" -#include "data/indexer/CombinedIndexerCommandProvider.h" -#include "data/indexer/IndexerCommand.h" -#include "data/indexer/TaskBuildIndex.h" -#include "data/indexer/TaskFillIndexerCommandQueue.h" -#include "data/parser/TaskParseWrapper.h" -#include "data/storage/PersistentStorage.h" -#include "data/storage/StorageCache.h" -#include "data/storage/StorageProvider.h" -#include "data/TaskCleanStorage.h" -#include "data/TaskFinishParsing.h" -#include "data/TaskInjectStorage.h" -#include "data/TaskMergeStorages.h" -#include "project/RefreshInfoGenerator.h" -#include "project/SourceGroup.h" -#include "project/SourceGroupFactory.h" -#include "settings/ApplicationSettings.h" -#include "settings/ProjectSettings.h" -#include "settings/SourceGroupStatusType.h" +#include "DialogView.h" +#include "CombinedIndexerCommandProvider.h" +#include "IndexerCommand.h" +#include "TaskBuildIndex.h" +#include "TaskFillIndexerCommandQueue.h" +#include "TaskParseWrapper.h" +#include "PersistentStorage.h" +#include "StorageCache.h" +#include "StorageProvider.h" +#include "TaskCleanStorage.h" +#include "TaskFinishParsing.h" +#include "TaskInjectStorage.h" +#include "TaskMergeStorages.h" +#include "RefreshInfoGenerator.h" +#include "SourceGroup.h" +#include "SourceGroupFactory.h" +#include "ApplicationSettings.h" +#include "ProjectSettings.h" +#include "SourceGroupStatusType.h" -#include "utility/file/FilePath.h" -#include "utility/file/FileSystem.h" -#include "utility/messaging/type/error/MessageErrorCountClear.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/indexing/MessageIndexingStarted.h" -#include "utility/messaging/type/indexing/MessageIndexingStatus.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/scheduling/TaskDecoratorRepeat.h" -#include "utility/scheduling/TaskFindKeyOnBlackboard.h" -#include "utility/scheduling/TaskGroupSelector.h" -#include "utility/scheduling/TaskGroupSequence.h" -#include "utility/scheduling/TaskGroupParallel.h" -#include "utility/scheduling/TaskLambda.h" -#include "utility/scheduling/TaskReturnSuccessIf.h" -#include "utility/scheduling/TaskSetValue.h" -#include "utility/ScopedFunctor.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" -#include "utility/utilityFile.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "FileSystem.h" +#include "MessageErrorCountClear.h" +#include "MessageIndexingFinished.h" +#include "MessageIndexingStarted.h" +#include "MessageIndexingStatus.h" +#include "MessageRefresh.h" +#include "MessageStatus.h" +#include "TaskDecoratorRepeat.h" +#include "TaskFindKeyOnBlackboard.h" +#include "TaskGroupSelector.h" +#include "TaskGroupSequence.h" +#include "TaskGroupParallel.h" +#include "TaskLambda.h" +#include "TaskReturnSuccessIf.h" +#include "TaskSetValue.h" +#include "ScopedFunctor.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityApp.h" +#include "utilityFile.h" +#include "utilityString.h" const std::wstring Project::PROJECT_FILE_EXTENSION = L".srctrlprj"; const std::wstring Project::BOOKMARK_DB_FILE_EXTENSION = L".srctrlbm"; diff --git a/src/lib/project/Project.h b/src/lib/project/Project.h index 687be6bc..be98ff90 100644 --- a/src/lib/project/Project.h +++ b/src/lib/project/Project.h @@ -6,8 +6,8 @@ #include #include -#include "project/RefreshInfo.h" -#include "project/SourceGroup.h" +#include "RefreshInfo.h" +#include "SourceGroup.h" struct FileInfo; class DialogView; diff --git a/src/lib/project/RefreshInfo.h b/src/lib/project/RefreshInfo.h index 00e0b741..e8962bee 100644 --- a/src/lib/project/RefreshInfo.h +++ b/src/lib/project/RefreshInfo.h @@ -3,7 +3,7 @@ #include -#include "utility/file/FilePath.h" +#include "FilePath.h" enum RefreshMode { diff --git a/src/lib/project/RefreshInfoGenerator.cpp b/src/lib/project/RefreshInfoGenerator.cpp index 56b198ff..953deba4 100644 --- a/src/lib/project/RefreshInfoGenerator.cpp +++ b/src/lib/project/RefreshInfoGenerator.cpp @@ -1,13 +1,13 @@ -#include "project/RefreshInfoGenerator.h" +#include "RefreshInfoGenerator.h" -#include "data/storage/PersistentStorage.h" -#include "project/RefreshInfo.h" -#include "project/SourceGroup.h" -#include "settings/SourceGroupStatusType.h" -#include "utility/file/FileInfo.h" -#include "utility/file/FileSystem.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" +#include "PersistentStorage.h" +#include "RefreshInfo.h" +#include "SourceGroup.h" +#include "SourceGroupStatusType.h" +#include "FileInfo.h" +#include "FileSystem.h" +#include "TextAccess.h" +#include "utility.h" RefreshInfo RefreshInfoGenerator::getRefreshInfoForUpdatedFiles( const std::vector>& sourceGroups, std::shared_ptr storage) diff --git a/src/lib/project/SourceGroup.cpp b/src/lib/project/SourceGroup.cpp index d475fc56..60ac08f1 100644 --- a/src/lib/project/SourceGroup.cpp +++ b/src/lib/project/SourceGroup.cpp @@ -1,8 +1,8 @@ -#include "project/SourceGroup.h" +#include "SourceGroup.h" -#include "data/indexer/MemoryIndexerCommandProvider.h" -#include "settings/SourceGroupSettings.h" -#include "utility/file/FilePath.h" +#include "MemoryIndexerCommandProvider.h" +#include "SourceGroupSettings.h" +#include "FilePath.h" std::shared_ptr SourceGroup::getIndexerCommandProvider(const std::set& filesToIndex) const { diff --git a/src/lib/project/SourceGroup.h b/src/lib/project/SourceGroup.h index d72e8fd1..8480a31c 100644 --- a/src/lib/project/SourceGroup.h +++ b/src/lib/project/SourceGroup.h @@ -5,9 +5,9 @@ #include #include -#include "settings/LanguageType.h" -#include "settings/SourceGroupStatusType.h" -#include "settings/SourceGroupType.h" +#include "LanguageType.h" +#include "SourceGroupStatusType.h" +#include "SourceGroupType.h" class IndexerCommand; class IndexerCommandProvider; diff --git a/src/lib/project/SourceGroupFactory.cpp b/src/lib/project/SourceGroupFactory.cpp index 8fa7fc18..2df5bbb8 100644 --- a/src/lib/project/SourceGroupFactory.cpp +++ b/src/lib/project/SourceGroupFactory.cpp @@ -1,8 +1,8 @@ -#include "project/SourceGroupFactory.h" +#include "SourceGroupFactory.h" -#include "project/SourceGroup.h" -#include "project/SourceGroupFactoryModule.h" -#include "settings/SourceGroupSettings.h" +#include "SourceGroup.h" +#include "SourceGroupFactoryModule.h" +#include "SourceGroupSettings.h" std::shared_ptr SourceGroupFactory::getInstance() { diff --git a/src/lib/project/SourceGroupFactoryModule.cpp b/src/lib/project/SourceGroupFactoryModule.cpp index 889e4be4..64e3756d 100644 --- a/src/lib/project/SourceGroupFactoryModule.cpp +++ b/src/lib/project/SourceGroupFactoryModule.cpp @@ -1,4 +1,4 @@ -#include "project/SourceGroupFactoryModule.h" +#include "SourceGroupFactoryModule.h" SourceGroupFactoryModule::~SourceGroupFactoryModule() { diff --git a/src/lib/project/SourceGroupFactoryModule.h b/src/lib/project/SourceGroupFactoryModule.h index 2f6ef5bb..d8a8096d 100644 --- a/src/lib/project/SourceGroupFactoryModule.h +++ b/src/lib/project/SourceGroupFactoryModule.h @@ -3,7 +3,7 @@ #include -#include "settings/SourceGroupType.h" +#include "SourceGroupType.h" class SourceGroup; class SourceGroupSettings; diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp index e27bae89..e343eb7b 100644 --- a/src/lib/settings/ApplicationSettings.cpp +++ b/src/lib/settings/ApplicationSettings.cpp @@ -1,17 +1,17 @@ -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" #include "License.h" -#include "settings/migration/SettingsMigrator.h" -#include "settings/migration/SettingsMigrationLambda.h" -#include "settings/migration/SettingsMigrationMoveKey.h" -#include "utility/AppPath.h" -#include "utility/ResourcePaths.h" -#include "utility/Status.h" -#include "utility/TimeStamp.h" -#include "utility/utility.h" -#include "utility/utilityCxx.h" -#include "utility/UserPaths.h" -#include "utility/Version.h" +#include "SettingsMigrator.h" +#include "SettingsMigrationLambda.h" +#include "SettingsMigrationMoveKey.h" +#include "AppPath.h" +#include "ResourcePaths.h" +#include "Status.h" +#include "TimeStamp.h" +#include "utility.h" +#include "utilityCxx.h" +#include "UserPaths.h" +#include "Version.h" const size_t ApplicationSettings::VERSION = 5; diff --git a/src/lib/settings/ApplicationSettings.h b/src/lib/settings/ApplicationSettings.h index 2a840c07..7ae192a8 100644 --- a/src/lib/settings/ApplicationSettings.h +++ b/src/lib/settings/ApplicationSettings.h @@ -3,8 +3,8 @@ #include -#include "data/GroupType.h" -#include "settings/Settings.h" +#include "GroupType.h" +#include "Settings.h" class TimeStamp; class Version; diff --git a/src/lib/settings/ColorScheme.cpp b/src/lib/settings/ColorScheme.cpp index 8dca5763..5bf3e9f7 100644 --- a/src/lib/settings/ColorScheme.cpp +++ b/src/lib/settings/ColorScheme.cpp @@ -1,6 +1,6 @@ -#include "settings/ColorScheme.h" +#include "ColorScheme.h" -#include "utility/utilityString.h" +#include "utilityString.h" std::shared_ptr ColorScheme::s_instance; diff --git a/src/lib/settings/ColorScheme.h b/src/lib/settings/ColorScheme.h index a46ef64e..58a9a7e8 100644 --- a/src/lib/settings/ColorScheme.h +++ b/src/lib/settings/ColorScheme.h @@ -1,9 +1,9 @@ #ifndef COLOR_SCHEME_H #define COLOR_SCHEME_H -#include "data/graph/Edge.h" -#include "data/graph/Node.h" -#include "settings/Settings.h" +#include "Edge.h" +#include "Node.h" +#include "Settings.h" class ColorScheme : public Settings diff --git a/src/lib/settings/LanguageType.cpp b/src/lib/settings/LanguageType.cpp index 57aaa85a..2fd76adf 100644 --- a/src/lib/settings/LanguageType.cpp +++ b/src/lib/settings/LanguageType.cpp @@ -1,4 +1,4 @@ -#include "settings/LanguageType.h" +#include "LanguageType.h" std::string languageTypeToString(LanguageType t) { diff --git a/src/lib/settings/LanguageType.h b/src/lib/settings/LanguageType.h index fedfff2d..6f317872 100644 --- a/src/lib/settings/LanguageType.h +++ b/src/lib/settings/LanguageType.h @@ -3,7 +3,7 @@ #include -#include "settings/SourceGroupType.h" +#include "SourceGroupType.h" enum LanguageType { diff --git a/src/lib/settings/ProjectSettings.cpp b/src/lib/settings/ProjectSettings.cpp index d120663f..a1a1c813 100644 --- a/src/lib/settings/ProjectSettings.cpp +++ b/src/lib/settings/ProjectSettings.cpp @@ -1,21 +1,21 @@ -#include "settings/ProjectSettings.h" +#include "ProjectSettings.h" -#include "project/Project.h" -#include "settings/migration/SettingsMigrationDeleteKey.h" -#include "settings/migration/SettingsMigrationLambda.h" -#include "settings/migration/SettingsMigrationMoveKey.h" -#include "settings/SourceGroupSettingsCEmpty.h" -#include "settings/SourceGroupSettingsCppEmpty.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "settings/SourceGroupSettingsJavaEmpty.h" -#include "settings/SourceGroupSettingsJavaMaven.h" -#include "settings/SourceGroupSettingsJavaGradle.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" -#include "utility/utilityUuid.h" +#include "Project.h" +#include "SettingsMigrationDeleteKey.h" +#include "SettingsMigrationLambda.h" +#include "SettingsMigrationMoveKey.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaSonargraph.h" +#include "logging.h" +#include "utilityString.h" +#include "utilityUuid.h" const size_t ProjectSettings::VERSION = 7; diff --git a/src/lib/settings/ProjectSettings.h b/src/lib/settings/ProjectSettings.h index 59decb7e..cf456af1 100644 --- a/src/lib/settings/ProjectSettings.h +++ b/src/lib/settings/ProjectSettings.h @@ -4,9 +4,9 @@ #include #include -#include "settings/migration/SettingsMigrator.h" -#include "settings/LanguageType.h" -#include "settings/Settings.h" +#include "SettingsMigrator.h" +#include "LanguageType.h" +#include "Settings.h" class SourceGroupSettings; diff --git a/src/lib/settings/Settings.cpp b/src/lib/settings/Settings.cpp index bd22122a..9b673e16 100644 --- a/src/lib/settings/Settings.cpp +++ b/src/lib/settings/Settings.cpp @@ -1,8 +1,8 @@ -#include "settings/Settings.h" +#include "Settings.h" -#include "utility/logging/logging.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" +#include "logging.h" +#include "TextAccess.h" +#include "utility.h" Settings::Settings(const Settings& other) : m_config(other.m_config->createCopy()) diff --git a/src/lib/settings/Settings.h b/src/lib/settings/Settings.h index e6653ecd..5a2896ae 100644 --- a/src/lib/settings/Settings.h +++ b/src/lib/settings/Settings.h @@ -5,8 +5,8 @@ #include #include -#include "utility/ConfigManager.h" -#include "utility/file/FilePath.h" +#include "ConfigManager.h" +#include "FilePath.h" class SettingsMigration; diff --git a/src/lib/settings/SourceGroupSettings.cpp b/src/lib/settings/SourceGroupSettings.cpp index 3ad5591f..2b615d57 100644 --- a/src/lib/settings/SourceGroupSettings.cpp +++ b/src/lib/settings/SourceGroupSettings.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettings.h" +#include "SourceGroupSettings.h" -#include "settings/ProjectSettings.h" -#include "utility/ConfigManager.h" +#include "ProjectSettings.h" +#include "ConfigManager.h" const size_t SourceGroupSettings::s_version = 1; const std::string SourceGroupSettings::s_keyPrefix = "source_groups/source_group_"; diff --git a/src/lib/settings/SourceGroupSettings.h b/src/lib/settings/SourceGroupSettings.h index 35d9b8eb..b595f8ff 100644 --- a/src/lib/settings/SourceGroupSettings.h +++ b/src/lib/settings/SourceGroupSettings.h @@ -4,9 +4,9 @@ #include #include -#include "settings/LanguageType.h" -#include "settings/SourceGroupStatusType.h" -#include "settings/SourceGroupType.h" +#include "LanguageType.h" +#include "SourceGroupStatusType.h" +#include "SourceGroupType.h" class ConfigManager; class FilePath; diff --git a/src/lib/settings/SourceGroupSettingsCEmpty.cpp b/src/lib/settings/SourceGroupSettingsCEmpty.cpp index 24f1f2c3..245979b2 100644 --- a/src/lib/settings/SourceGroupSettingsCEmpty.cpp +++ b/src/lib/settings/SourceGroupSettingsCEmpty.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCEmpty.h" SourceGroupSettingsCEmpty::SourceGroupSettingsCEmpty(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsCxx(id, SOURCE_GROUP_C_EMPTY, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCEmpty.h b/src/lib/settings/SourceGroupSettingsCEmpty.h index c136181d..c4553714 100644 --- a/src/lib/settings/SourceGroupSettingsCEmpty.h +++ b/src/lib/settings/SourceGroupSettingsCEmpty.h @@ -1,12 +1,12 @@ #ifndef SOURCE_GROUP_SETTINGS_C_EMPTY_H #define SOURCE_GROUP_SETTINGS_C_EMPTY_H -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsWithCStandard.h" -#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h" -#include "settings/SourceGroupSettingsWithExcludeFilters.h" -#include "settings/SourceGroupSettingsWithSourceExtensions.h" -#include "settings/SourceGroupSettingsWithSourcePaths.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsWithCStandard.h" +#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h" +#include "SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithSourceExtensions.h" +#include "SourceGroupSettingsWithSourcePaths.h" class SourceGroupSettingsCEmpty : public SourceGroupSettingsCxx diff --git a/src/lib/settings/SourceGroupSettingsCppEmpty.cpp b/src/lib/settings/SourceGroupSettingsCppEmpty.cpp index 59aab664..11b6dc91 100644 --- a/src/lib/settings/SourceGroupSettingsCppEmpty.cpp +++ b/src/lib/settings/SourceGroupSettingsCppEmpty.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" SourceGroupSettingsCppEmpty::SourceGroupSettingsCppEmpty(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsCxx(id, SOURCE_GROUP_CPP_EMPTY, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCppEmpty.h b/src/lib/settings/SourceGroupSettingsCppEmpty.h index d2036ff5..814fcea8 100644 --- a/src/lib/settings/SourceGroupSettingsCppEmpty.h +++ b/src/lib/settings/SourceGroupSettingsCppEmpty.h @@ -1,12 +1,12 @@ #ifndef SOURCE_GROUP_SETTINGS_CPP_EMPTY_H #define SOURCE_GROUP_SETTINGS_CPP_EMPTY_H -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsWithCppStandard.h" -#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h" -#include "settings/SourceGroupSettingsWithExcludeFilters.h" -#include "settings/SourceGroupSettingsWithSourceExtensions.h" -#include "settings/SourceGroupSettingsWithSourcePaths.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h" +#include "SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithSourceExtensions.h" +#include "SourceGroupSettingsWithSourcePaths.h" class SourceGroupSettingsCppEmpty : public SourceGroupSettingsCxx diff --git a/src/lib/settings/SourceGroupSettingsCxx.cpp b/src/lib/settings/SourceGroupSettingsCxx.cpp index f1eccd87..49ce9444 100644 --- a/src/lib/settings/SourceGroupSettingsCxx.cpp +++ b/src/lib/settings/SourceGroupSettingsCxx.cpp @@ -1,8 +1,8 @@ -#include "settings/SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsCxx.h" -#include "settings/ProjectSettings.h" -#include "utility/ConfigManager.h" -#include "utility/utility.h" +#include "ProjectSettings.h" +#include "ConfigManager.h" +#include "utility.h" SourceGroupSettingsCxx::SourceGroupSettingsCxx(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings) : SourceGroupSettings(id, type, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCxx.h b/src/lib/settings/SourceGroupSettingsCxx.h index dc021d39..4220a8ed 100644 --- a/src/lib/settings/SourceGroupSettingsCxx.h +++ b/src/lib/settings/SourceGroupSettingsCxx.h @@ -1,9 +1,9 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_H #define SOURCE_GROUP_SETTINGS_CXX_H -#include "settings/SourceGroupSettings.h" +#include "SourceGroupSettings.h" -#include "utility/file/FilePath.h" +#include "FilePath.h" class SourceGroupSettingsCxx : public SourceGroupSettings diff --git a/src/lib/settings/SourceGroupSettingsCxxCdb.cpp b/src/lib/settings/SourceGroupSettingsCxxCdb.cpp index 77dc598e..2e6627b0 100644 --- a/src/lib/settings/SourceGroupSettingsCxxCdb.cpp +++ b/src/lib/settings/SourceGroupSettingsCxxCdb.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCdb.h" -#include "settings/ProjectSettings.h" -#include "utility/ConfigManager.h" +#include "ProjectSettings.h" +#include "ConfigManager.h" SourceGroupSettingsCxxCdb::SourceGroupSettingsCxxCdb(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsCxx(id, SOURCE_GROUP_CXX_CDB, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCxxCdb.h b/src/lib/settings/SourceGroupSettingsCxxCdb.h index 14721039..4121d67a 100644 --- a/src/lib/settings/SourceGroupSettingsCxxCdb.h +++ b/src/lib/settings/SourceGroupSettingsCxxCdb.h @@ -1,10 +1,10 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_H #define SOURCE_GROUP_SETTINGS_CXX_CDB_H -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsWithExcludeFilters.h" -#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h" -#include "utility/file/FilePath.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithIndexedHeaderPaths.h" +#include "FilePath.h" class SourceGroupSettingsCxxCdb : public SourceGroupSettingsCxx diff --git a/src/lib/settings/SourceGroupSettingsCxxCdbVs.cpp b/src/lib/settings/SourceGroupSettingsCxxCdbVs.cpp index fa464ba7..b6f69948 100644 --- a/src/lib/settings/SourceGroupSettingsCxxCdbVs.cpp +++ b/src/lib/settings/SourceGroupSettingsCxxCdbVs.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsCxxCdbVs.h" +#include "SourceGroupSettingsCxxCdbVs.h" SourceGroupSettingsCxxCdbVs::SourceGroupSettingsCxxCdbVs(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsCxxCdb(id, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCxxCdbVs.h b/src/lib/settings/SourceGroupSettingsCxxCdbVs.h index 91973ab1..b25af186 100644 --- a/src/lib/settings/SourceGroupSettingsCxxCdbVs.h +++ b/src/lib/settings/SourceGroupSettingsCxxCdbVs.h @@ -1,8 +1,8 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H #define SOURCE_GROUP_SETTINGS_CXX_CDB_VS_H -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "utility/file/FilePath.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "FilePath.h" class SourceGroupSettingsCxxCdbVs : public SourceGroupSettingsCxxCdb diff --git a/src/lib/settings/SourceGroupSettingsCxxCodeblocks.cpp b/src/lib/settings/SourceGroupSettingsCxxCodeblocks.cpp index 5f6ce46c..2d6da7d9 100644 --- a/src/lib/settings/SourceGroupSettingsCxxCodeblocks.cpp +++ b/src/lib/settings/SourceGroupSettingsCxxCodeblocks.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsCxxCodeblocks.h" +#include "SourceGroupSettingsCxxCodeblocks.h" -#include "settings/ProjectSettings.h" -#include "utility/ConfigManager.h" +#include "ProjectSettings.h" +#include "ConfigManager.h" SourceGroupSettingsCxxCodeblocks::SourceGroupSettingsCxxCodeblocks(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsCxx(id, SOURCE_GROUP_CXX_CODEBLOCKS, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCxxCodeblocks.h b/src/lib/settings/SourceGroupSettingsCxxCodeblocks.h index cbd8b3d4..642b1a78 100644 --- a/src/lib/settings/SourceGroupSettingsCxxCodeblocks.h +++ b/src/lib/settings/SourceGroupSettingsCxxCodeblocks.h @@ -1,12 +1,12 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H #define SOURCE_GROUP_SETTINGS_CXX_CODEBLOCKS_H -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsWithCppStandard.h" -#include "settings/SourceGroupSettingsWithCStandard.h" -#include "settings/SourceGroupSettingsWithExcludeFilters.h" -#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h" -#include "settings/SourceGroupSettingsWithSourceExtensions.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithCStandard.h" +#include "SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithIndexedHeaderPaths.h" +#include "SourceGroupSettingsWithSourceExtensions.h" class SourceGroupSettingsCxxCodeblocks : public SourceGroupSettingsCxx diff --git a/src/lib/settings/SourceGroupSettingsCxxSonargraph.cpp b/src/lib/settings/SourceGroupSettingsCxxSonargraph.cpp index c3e36b68..d9ad14db 100644 --- a/src/lib/settings/SourceGroupSettingsCxxSonargraph.cpp +++ b/src/lib/settings/SourceGroupSettingsCxxSonargraph.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsCxxSonargraph.h" SourceGroupSettingsCxxSonargraph::SourceGroupSettingsCxxSonargraph(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsCxx(id, SOURCE_GROUP_CXX_SONARGRAPH, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsCxxSonargraph.h b/src/lib/settings/SourceGroupSettingsCxxSonargraph.h index 5231af5f..27e8f8aa 100644 --- a/src/lib/settings/SourceGroupSettingsCxxSonargraph.h +++ b/src/lib/settings/SourceGroupSettingsCxxSonargraph.h @@ -1,10 +1,10 @@ #ifndef SOURCE_GROUP_SETTINGS_CXX_SONARGRAPH_H #define SOURCE_GROUP_SETTINGS_CXX_SONARGRAPH_H -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsWithCppStandard.h" -#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h" -#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithIndexedHeaderPaths.h" +#include "SourceGroupSettingsWithSonargraphProjectPath.h" class SourceGroupSettingsCxxSonargraph : public SourceGroupSettingsCxx diff --git a/src/lib/settings/SourceGroupSettingsJava.cpp b/src/lib/settings/SourceGroupSettingsJava.cpp index b8e6203f..72844658 100644 --- a/src/lib/settings/SourceGroupSettingsJava.cpp +++ b/src/lib/settings/SourceGroupSettingsJava.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsJava.h" +#include "SourceGroupSettingsJava.h" SourceGroupSettingsJava::SourceGroupSettingsJava(const std::string& id, SourceGroupType type, const ProjectSettings* projectSettings) : SourceGroupSettings(id, type, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsJava.h b/src/lib/settings/SourceGroupSettingsJava.h index ce9ad3d4..6a96e2d8 100644 --- a/src/lib/settings/SourceGroupSettingsJava.h +++ b/src/lib/settings/SourceGroupSettingsJava.h @@ -4,10 +4,10 @@ #include #include -#include "settings/SourceGroupSettings.h" -#include "settings/SourceGroupSettingsWithExcludeFilters.h" -#include "settings/SourceGroupSettingsWithJavaStandard.h" -#include "settings/SourceGroupSettingsWithSourceExtensions.h" +#include "SourceGroupSettings.h" +#include "SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithJavaStandard.h" +#include "SourceGroupSettingsWithSourceExtensions.h" class SourceGroupSettingsJava : public SourceGroupSettings diff --git a/src/lib/settings/SourceGroupSettingsJavaEmpty.cpp b/src/lib/settings/SourceGroupSettingsJavaEmpty.cpp index 34dfeee4..1728ca3e 100644 --- a/src/lib/settings/SourceGroupSettingsJavaEmpty.cpp +++ b/src/lib/settings/SourceGroupSettingsJavaEmpty.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaEmpty.h" SourceGroupSettingsJavaEmpty::SourceGroupSettingsJavaEmpty(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsJava(id, SOURCE_GROUP_JAVA_EMPTY, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsJavaEmpty.h b/src/lib/settings/SourceGroupSettingsJavaEmpty.h index 1cd003a5..b43f72a9 100644 --- a/src/lib/settings/SourceGroupSettingsJavaEmpty.h +++ b/src/lib/settings/SourceGroupSettingsJavaEmpty.h @@ -1,9 +1,9 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H #define SOURCE_GROUP_SETTINGS_JAVA_EMPTY_H -#include "settings/SourceGroupSettingsJava.h" -#include "settings/SourceGroupSettingsWithClasspath.h" -#include "settings/SourceGroupSettingsWithSourcePaths.h" +#include "SourceGroupSettingsJava.h" +#include "SourceGroupSettingsWithClasspath.h" +#include "SourceGroupSettingsWithSourcePaths.h" class SourceGroupSettingsJavaEmpty : public SourceGroupSettingsJava diff --git a/src/lib/settings/SourceGroupSettingsJavaGradle.cpp b/src/lib/settings/SourceGroupSettingsJavaGradle.cpp index c71db28e..95d327c1 100644 --- a/src/lib/settings/SourceGroupSettingsJavaGradle.cpp +++ b/src/lib/settings/SourceGroupSettingsJavaGradle.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaGradle.h" -#include "settings/ProjectSettings.h" -#include "utility/ConfigManager.h" +#include "ProjectSettings.h" +#include "ConfigManager.h" SourceGroupSettingsJavaGradle::SourceGroupSettingsJavaGradle(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsJava(id, SOURCE_GROUP_JAVA_GRADLE, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsJavaGradle.h b/src/lib/settings/SourceGroupSettingsJavaGradle.h index 33f8c0b7..f8de530f 100644 --- a/src/lib/settings/SourceGroupSettingsJavaGradle.h +++ b/src/lib/settings/SourceGroupSettingsJavaGradle.h @@ -1,8 +1,8 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H #define SOURCE_GROUP_SETTINGS_JAVA_GRADLE_H -#include "settings/SourceGroupSettingsJava.h" -#include "utility/file/FilePath.h" +#include "SourceGroupSettingsJava.h" +#include "FilePath.h" class SourceGroupSettingsJavaGradle : public SourceGroupSettingsJava diff --git a/src/lib/settings/SourceGroupSettingsJavaMaven.cpp b/src/lib/settings/SourceGroupSettingsJavaMaven.cpp index e9090548..86374786 100644 --- a/src/lib/settings/SourceGroupSettingsJavaMaven.cpp +++ b/src/lib/settings/SourceGroupSettingsJavaMaven.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaMaven.h" -#include "settings/ProjectSettings.h" -#include "utility/ConfigManager.h" +#include "ProjectSettings.h" +#include "ConfigManager.h" SourceGroupSettingsJavaMaven::SourceGroupSettingsJavaMaven(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettingsJava(id, SOURCE_GROUP_JAVA_MAVEN, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsJavaMaven.h b/src/lib/settings/SourceGroupSettingsJavaMaven.h index 0298ebce..43d2ab75 100644 --- a/src/lib/settings/SourceGroupSettingsJavaMaven.h +++ b/src/lib/settings/SourceGroupSettingsJavaMaven.h @@ -1,8 +1,8 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H #define SOURCE_GROUP_SETTINGS_JAVA_MAVEN_H -#include "settings/SourceGroupSettingsJava.h" -#include "utility/file/FilePath.h" +#include "SourceGroupSettingsJava.h" +#include "FilePath.h" class SourceGroupSettingsJavaMaven : public SourceGroupSettingsJava diff --git a/src/lib/settings/SourceGroupSettingsJavaSonargraph.cpp b/src/lib/settings/SourceGroupSettingsJavaSonargraph.cpp index 73c71e04..b5c70992 100644 --- a/src/lib/settings/SourceGroupSettingsJavaSonargraph.cpp +++ b/src/lib/settings/SourceGroupSettingsJavaSonargraph.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupSettingsJavaSonargraph.h" +#include "SourceGroupSettingsJavaSonargraph.h" SourceGroupSettingsJavaSonargraph::SourceGroupSettingsJavaSonargraph(const std::string& id, const ProjectSettings* projectSettings) : SourceGroupSettings(id, SOURCE_GROUP_JAVA_SONARGRAPH, projectSettings) diff --git a/src/lib/settings/SourceGroupSettingsJavaSonargraph.h b/src/lib/settings/SourceGroupSettingsJavaSonargraph.h index 5a0e6d32..bd5b8231 100644 --- a/src/lib/settings/SourceGroupSettingsJavaSonargraph.h +++ b/src/lib/settings/SourceGroupSettingsJavaSonargraph.h @@ -1,10 +1,10 @@ #ifndef SOURCE_GROUP_SETTINGS_JAVA_SONARGRAPH_H #define SOURCE_GROUP_SETTINGS_JAVA_SONARGRAPH_H -#include "settings/SourceGroupSettings.h" -#include "settings/SourceGroupSettingsWithClasspath.h" -#include "settings/SourceGroupSettingsWithJavaStandard.h" -#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h" +#include "SourceGroupSettings.h" +#include "SourceGroupSettingsWithClasspath.h" +#include "SourceGroupSettingsWithJavaStandard.h" +#include "SourceGroupSettingsWithSonargraphProjectPath.h" class SourceGroupSettingsJavaSonargraph : public SourceGroupSettings diff --git a/src/lib/settings/SourceGroupSettingsWithCStandard.cpp b/src/lib/settings/SourceGroupSettingsWithCStandard.cpp index 0795abda..5bcb6b9a 100644 --- a/src/lib/settings/SourceGroupSettingsWithCStandard.cpp +++ b/src/lib/settings/SourceGroupSettingsWithCStandard.cpp @@ -1,6 +1,6 @@ -#include "settings/SourceGroupSettingsWithCStandard.h" +#include "SourceGroupSettingsWithCStandard.h" -#include "settings/ProjectSettings.h" +#include "ProjectSettings.h" std::wstring SourceGroupSettingsWithCStandard::getDefaultCStandardStatic() { diff --git a/src/lib/settings/SourceGroupSettingsWithClasspath.cpp b/src/lib/settings/SourceGroupSettingsWithClasspath.cpp index e9329a9d..e054e4eb 100644 --- a/src/lib/settings/SourceGroupSettingsWithClasspath.cpp +++ b/src/lib/settings/SourceGroupSettingsWithClasspath.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsWithClasspath.h" +#include "SourceGroupSettingsWithClasspath.h" -#include "settings/ProjectSettings.h" -#include "utility/utility.h" +#include "ProjectSettings.h" +#include "utility.h" SourceGroupSettingsWithClasspath::SourceGroupSettingsWithClasspath() : m_classpath(std::vector()) diff --git a/src/lib/settings/SourceGroupSettingsWithClasspath.h b/src/lib/settings/SourceGroupSettingsWithClasspath.h index ff01d16d..bfd1681d 100644 --- a/src/lib/settings/SourceGroupSettingsWithClasspath.h +++ b/src/lib/settings/SourceGroupSettingsWithClasspath.h @@ -5,7 +5,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class ConfigManager; class ProjectSettings; diff --git a/src/lib/settings/SourceGroupSettingsWithCppStandard.cpp b/src/lib/settings/SourceGroupSettingsWithCppStandard.cpp index bf6d6e61..be1c0ae9 100644 --- a/src/lib/settings/SourceGroupSettingsWithCppStandard.cpp +++ b/src/lib/settings/SourceGroupSettingsWithCppStandard.cpp @@ -1,6 +1,6 @@ -#include "settings/SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithCppStandard.h" -#include "settings/ProjectSettings.h" +#include "ProjectSettings.h" std::wstring SourceGroupSettingsWithCppStandard::getDefaultCppStandardStatic() { diff --git a/src/lib/settings/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp b/src/lib/settings/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp index 42c704ba..3080c148 100644 --- a/src/lib/settings/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp +++ b/src/lib/settings/SourceGroupSettingsWithCxxCrossCompilationOptions.cpp @@ -1,6 +1,6 @@ -#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h" +#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h" -#include "settings/ProjectSettings.h" +#include "ProjectSettings.h" std::vector SourceGroupSettingsWithCxxCrossCompilationOptions::getAvailableArchTypes() diff --git a/src/lib/settings/SourceGroupSettingsWithExcludeFilters.cpp b/src/lib/settings/SourceGroupSettingsWithExcludeFilters.cpp index d058e368..a4015779 100644 --- a/src/lib/settings/SourceGroupSettingsWithExcludeFilters.cpp +++ b/src/lib/settings/SourceGroupSettingsWithExcludeFilters.cpp @@ -1,9 +1,9 @@ -#include "settings/SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithExcludeFilters.h" -#include "settings/ProjectSettings.h" -#include "utility/file/FilePathFilter.h" -#include "utility/file/FileSystem.h" -#include "utility/utility.h" +#include "ProjectSettings.h" +#include "FilePathFilter.h" +#include "FileSystem.h" +#include "utility.h" SourceGroupSettingsWithExcludeFilters::SourceGroupSettingsWithExcludeFilters() : m_excludeFilters(std::vector()) diff --git a/src/lib/settings/SourceGroupSettingsWithIndexedHeaderPaths.cpp b/src/lib/settings/SourceGroupSettingsWithIndexedHeaderPaths.cpp index ce8a5597..6c1470ca 100644 --- a/src/lib/settings/SourceGroupSettingsWithIndexedHeaderPaths.cpp +++ b/src/lib/settings/SourceGroupSettingsWithIndexedHeaderPaths.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h" +#include "SourceGroupSettingsWithIndexedHeaderPaths.h" -#include "settings/ProjectSettings.h" -#include "utility/utility.h" +#include "ProjectSettings.h" +#include "utility.h" SourceGroupSettingsWithIndexedHeaderPaths::SourceGroupSettingsWithIndexedHeaderPaths() : m_indexedHeaderPaths(std::vector()) diff --git a/src/lib/settings/SourceGroupSettingsWithJavaStandard.cpp b/src/lib/settings/SourceGroupSettingsWithJavaStandard.cpp index 1d5bb927..2da17408 100644 --- a/src/lib/settings/SourceGroupSettingsWithJavaStandard.cpp +++ b/src/lib/settings/SourceGroupSettingsWithJavaStandard.cpp @@ -1,6 +1,6 @@ -#include "settings/SourceGroupSettingsWithJavaStandard.h" +#include "SourceGroupSettingsWithJavaStandard.h" -#include "settings/ProjectSettings.h" +#include "ProjectSettings.h" std::wstring SourceGroupSettingsWithJavaStandard::getDefaultJavaStandardStatic() { diff --git a/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.cpp b/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.cpp index 60972d40..b72d06a2 100644 --- a/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.cpp +++ b/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.cpp @@ -1,6 +1,6 @@ -#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h" +#include "SourceGroupSettingsWithSonargraphProjectPath.h" -#include "settings/ProjectSettings.h" +#include "ProjectSettings.h" SourceGroupSettingsWithSonargraphProjectPath::SourceGroupSettingsWithSonargraphProjectPath() { diff --git a/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.h b/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.h index 53944502..c19fd7bd 100644 --- a/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.h +++ b/src/lib/settings/SourceGroupSettingsWithSonargraphProjectPath.h @@ -4,7 +4,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class ConfigManager; class ProjectSettings; diff --git a/src/lib/settings/SourceGroupSettingsWithSourceExtensions.cpp b/src/lib/settings/SourceGroupSettingsWithSourceExtensions.cpp index 6f292792..184f7ef1 100644 --- a/src/lib/settings/SourceGroupSettingsWithSourceExtensions.cpp +++ b/src/lib/settings/SourceGroupSettingsWithSourceExtensions.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsWithSourceExtensions.h" +#include "SourceGroupSettingsWithSourceExtensions.h" -#include "settings/ProjectSettings.h" -#include "utility/utility.h" +#include "ProjectSettings.h" +#include "utility.h" SourceGroupSettingsWithSourceExtensions::SourceGroupSettingsWithSourceExtensions() : m_sourceExtensions(std::vector()) diff --git a/src/lib/settings/SourceGroupSettingsWithSourcePaths.cpp b/src/lib/settings/SourceGroupSettingsWithSourcePaths.cpp index efbee814..ebf5705c 100644 --- a/src/lib/settings/SourceGroupSettingsWithSourcePaths.cpp +++ b/src/lib/settings/SourceGroupSettingsWithSourcePaths.cpp @@ -1,7 +1,7 @@ -#include "settings/SourceGroupSettingsWithSourcePaths.h" +#include "SourceGroupSettingsWithSourcePaths.h" -#include "settings/ProjectSettings.h" -#include "utility/utility.h" +#include "ProjectSettings.h" +#include "utility.h" SourceGroupSettingsWithSourcePaths::SourceGroupSettingsWithSourcePaths() : m_sourcePaths(std::vector()) diff --git a/src/lib/settings/SourceGroupStatusType.cpp b/src/lib/settings/SourceGroupStatusType.cpp index f371fa19..f9f0fe79 100644 --- a/src/lib/settings/SourceGroupStatusType.cpp +++ b/src/lib/settings/SourceGroupStatusType.cpp @@ -1,6 +1,6 @@ -#include "settings/SourceGroupStatusType.h" +#include "SourceGroupStatusType.h" -#include "utility/logging/logging.h" +#include "logging.h" std::string sourceGroupStatusTypeToString(SourceGroupStatusType v) { diff --git a/src/lib/settings/SourceGroupType.cpp b/src/lib/settings/SourceGroupType.cpp index 35630b8d..e10d1bdb 100644 --- a/src/lib/settings/SourceGroupType.cpp +++ b/src/lib/settings/SourceGroupType.cpp @@ -1,4 +1,4 @@ -#include "settings/SourceGroupType.h" +#include "SourceGroupType.h" std::string sourceGroupTypeToString(SourceGroupType v) { diff --git a/src/lib/settings/migration/SettingsMigration.cpp b/src/lib/settings/migration/SettingsMigration.cpp index 3ef4668c..df7ebb80 100644 --- a/src/lib/settings/migration/SettingsMigration.cpp +++ b/src/lib/settings/migration/SettingsMigration.cpp @@ -1,6 +1,6 @@ -#include "settings/migration/SettingsMigration.h" +#include "SettingsMigration.h" -#include "settings/Settings.h" +#include "Settings.h" SettingsMigration::~SettingsMigration() { diff --git a/src/lib/settings/migration/SettingsMigration.h b/src/lib/settings/migration/SettingsMigration.h index a887f7e7..e19de8ca 100644 --- a/src/lib/settings/migration/SettingsMigration.h +++ b/src/lib/settings/migration/SettingsMigration.h @@ -4,8 +4,8 @@ #include #include -#include "settings/Settings.h" -#include "utility/migration/Migration.h" +#include "Settings.h" +#include "Migration.h" class SettingsMigration: public Migration { diff --git a/src/lib/settings/migration/SettingsMigrationDeleteKey.cpp b/src/lib/settings/migration/SettingsMigrationDeleteKey.cpp index 0fdf7dfa..a131c7c1 100644 --- a/src/lib/settings/migration/SettingsMigrationDeleteKey.cpp +++ b/src/lib/settings/migration/SettingsMigrationDeleteKey.cpp @@ -1,4 +1,4 @@ -#include "settings/migration/SettingsMigrationDeleteKey.h" +#include "SettingsMigrationDeleteKey.h" SettingsMigrationDeleteKey::SettingsMigrationDeleteKey(const std::string& key) : m_key(key) diff --git a/src/lib/settings/migration/SettingsMigrationDeleteKey.h b/src/lib/settings/migration/SettingsMigrationDeleteKey.h index 84d20b72..eeb29e0d 100644 --- a/src/lib/settings/migration/SettingsMigrationDeleteKey.h +++ b/src/lib/settings/migration/SettingsMigrationDeleteKey.h @@ -3,7 +3,7 @@ #include -#include "settings/migration/SettingsMigration.h" +#include "SettingsMigration.h" class SettingsMigrationDeleteKey: public SettingsMigration { diff --git a/src/lib/settings/migration/SettingsMigrationLambda.cpp b/src/lib/settings/migration/SettingsMigrationLambda.cpp index 08bfaa8a..6aa3d5fb 100644 --- a/src/lib/settings/migration/SettingsMigrationLambda.cpp +++ b/src/lib/settings/migration/SettingsMigrationLambda.cpp @@ -1,4 +1,4 @@ -#include "settings/migration/SettingsMigrationLambda.h" +#include "SettingsMigrationLambda.h" SettingsMigrationLambda::SettingsMigrationLambda(std::function m_lambda) : m_lambda(m_lambda) diff --git a/src/lib/settings/migration/SettingsMigrationLambda.h b/src/lib/settings/migration/SettingsMigrationLambda.h index 9912383a..d9ae899d 100644 --- a/src/lib/settings/migration/SettingsMigrationLambda.h +++ b/src/lib/settings/migration/SettingsMigrationLambda.h @@ -3,7 +3,7 @@ #include -#include "settings/migration/SettingsMigration.h" +#include "SettingsMigration.h" class SettingsMigrationLambda: public SettingsMigration { diff --git a/src/lib/settings/migration/SettingsMigrationMoveKey.cpp b/src/lib/settings/migration/SettingsMigrationMoveKey.cpp index e87cf9b9..eac688ed 100644 --- a/src/lib/settings/migration/SettingsMigrationMoveKey.cpp +++ b/src/lib/settings/migration/SettingsMigrationMoveKey.cpp @@ -1,4 +1,4 @@ -#include "settings/migration/SettingsMigrationMoveKey.h" +#include "SettingsMigrationMoveKey.h" SettingsMigrationMoveKey::SettingsMigrationMoveKey(const std::string& oldKey, const std::string& newKey) : m_oldKey(oldKey) diff --git a/src/lib/settings/migration/SettingsMigrationMoveKey.h b/src/lib/settings/migration/SettingsMigrationMoveKey.h index 1df1941a..b3ebb882 100644 --- a/src/lib/settings/migration/SettingsMigrationMoveKey.h +++ b/src/lib/settings/migration/SettingsMigrationMoveKey.h @@ -1,7 +1,7 @@ #ifndef SETTINGS_MIGRATION_MOVE_KEY_H #define SETTINGS_MIGRATION_MOVE_KEY_H -#include "settings/migration/SettingsMigration.h" +#include "SettingsMigration.h" class SettingsMigrationMoveKey: public SettingsMigration { diff --git a/src/lib/settings/migration/SettingsMigrator.h b/src/lib/settings/migration/SettingsMigrator.h index b403993f..4bd47d69 100644 --- a/src/lib/settings/migration/SettingsMigrator.h +++ b/src/lib/settings/migration/SettingsMigrator.h @@ -1,7 +1,7 @@ #ifndef SETTNGS_MIGRATOR_H #define SETTNGS_MIGRATOR_H -#include "utility/migration/Migrator.h" +#include "Migrator.h" class Settings; diff --git a/src/lib/utility/AppPath.h b/src/lib/utility/AppPath.h index 21f1a4a4..7c4669fb 100644 --- a/src/lib/utility/AppPath.h +++ b/src/lib/utility/AppPath.h @@ -1,7 +1,7 @@ #ifndef APP_PATH_H #define APP_PATH_H -#include "utility/file/FilePath.h" +#include "FilePath.h" class AppPath { diff --git a/src/lib/utility/ConfigManager.cpp b/src/lib/utility/ConfigManager.cpp index 99c3a210..6ec205b6 100644 --- a/src/lib/utility/ConfigManager.cpp +++ b/src/lib/utility/ConfigManager.cpp @@ -1,14 +1,14 @@ -#include "utility/ConfigManager.h" +#include "ConfigManager.h" #include -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/file/FilePath.h" -#include "utility/logging/logging.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "logging.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityString.h" std::shared_ptr ConfigManager::createEmpty() { diff --git a/src/lib/utility/ResourcePaths.h b/src/lib/utility/ResourcePaths.h index 006194db..b36eeb46 100644 --- a/src/lib/utility/ResourcePaths.h +++ b/src/lib/utility/ResourcePaths.h @@ -3,7 +3,7 @@ #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class ResourcePaths { diff --git a/src/lib/utility/ScopedFunctor.cpp b/src/lib/utility/ScopedFunctor.cpp index 23d7496b..6d20f6e0 100644 --- a/src/lib/utility/ScopedFunctor.cpp +++ b/src/lib/utility/ScopedFunctor.cpp @@ -1,4 +1,4 @@ -#include "utility/ScopedFunctor.h" +#include "ScopedFunctor.h" ScopedFunctor::ScopedFunctor() : m_onDestroy([](){}) diff --git a/src/lib/utility/TimeStamp.h b/src/lib/utility/TimeStamp.h index abc50ded..acdc17d0 100644 --- a/src/lib/utility/TimeStamp.h +++ b/src/lib/utility/TimeStamp.h @@ -1,7 +1,7 @@ #ifndef TIME_STAMP_H #define TIME_STAMP_H -#include "boost/date_time/posix_time/posix_time.hpp" +#include class TimeStamp { diff --git a/src/lib/utility/UserPaths.cpp b/src/lib/utility/UserPaths.cpp index 52c75818..a3b61aa8 100644 --- a/src/lib/utility/UserPaths.cpp +++ b/src/lib/utility/UserPaths.cpp @@ -1,4 +1,4 @@ -#include "utility/UserPaths.h" +#include "UserPaths.h" FilePath UserPaths::s_userDataPath; diff --git a/src/lib/utility/UserPaths.h b/src/lib/utility/UserPaths.h index 5f1d1b8d..0c66d354 100644 --- a/src/lib/utility/UserPaths.h +++ b/src/lib/utility/UserPaths.h @@ -3,7 +3,7 @@ #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class UserPaths { diff --git a/src/lib/utility/commandline/CommandLineParser.cpp b/src/lib/utility/commandline/CommandLineParser.cpp index fe906b50..f1eed574 100644 --- a/src/lib/utility/commandline/CommandLineParser.cpp +++ b/src/lib/utility/commandline/CommandLineParser.cpp @@ -1,17 +1,17 @@ -#include "utility/commandline/CommandLineParser.h" +#include "CommandLineParser.h" #include #include -#include "boost/program_options.hpp" +#include -#include "utility/commandline/CommandlineHelper.h" -#include "utility/commandline/commands/CommandlineCommandAcceptEULA.h" -#include "utility/commandline/commands/CommandlineCommandConfig.h" -#include "utility/commandline/commands/CommandlineCommandIndex.h" -#include "utility/ConfigManager.h" -#include "utility/text/TextAccess.h" -#include "utility/utilityString.h" +#include "CommandlineHelper.h" +#include "CommandlineCommandAcceptEULA.h" +#include "CommandlineCommandConfig.h" +#include "CommandlineCommandIndex.h" +#include "ConfigManager.h" +#include "TextAccess.h" +#include "utilityString.h" namespace po = boost::program_options; diff --git a/src/lib/utility/commandline/CommandLineParser.h b/src/lib/utility/commandline/CommandLineParser.h index dbd44cc5..1340481f 100644 --- a/src/lib/utility/commandline/CommandLineParser.h +++ b/src/lib/utility/commandline/CommandLineParser.h @@ -5,10 +5,10 @@ #include #include -#include "boost/program_options.hpp" +#include -#include "project/RefreshInfo.h" -#include "utility/file/FilePath.h" +#include "RefreshInfo.h" +#include "FilePath.h" namespace po = boost::program_options; diff --git a/src/lib/utility/commandline/CommandlineHelper.cpp b/src/lib/utility/commandline/CommandlineHelper.cpp index 2459a5f3..3ff81509 100644 --- a/src/lib/utility/commandline/CommandlineHelper.cpp +++ b/src/lib/utility/commandline/CommandlineHelper.cpp @@ -1,10 +1,10 @@ -#include "utility/commandline/CommandlineHelper.h" +#include "CommandlineHelper.h" #include #include #include -#include "boost/program_options.hpp" +#include namespace commandline { diff --git a/src/lib/utility/commandline/CommandlineHelper.h b/src/lib/utility/commandline/CommandlineHelper.h index ca3123d5..77d0cf56 100644 --- a/src/lib/utility/commandline/CommandlineHelper.h +++ b/src/lib/utility/commandline/CommandlineHelper.h @@ -4,8 +4,8 @@ #include #include -#include "utility/utilityString.h" -#include "utility/utility.h" +#include "utilityString.h" +#include "utility.h" namespace boost { namespace program_options { diff --git a/src/lib/utility/commandline/commands/CommandlineCommand.cpp b/src/lib/utility/commandline/commands/CommandlineCommand.cpp index 4e1cc1d2..ae5dcacd 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommand.cpp +++ b/src/lib/utility/commandline/commands/CommandlineCommand.cpp @@ -1,4 +1,4 @@ -#include "utility/commandline/commands/CommandlineCommand.h" +#include "CommandlineCommand.h" #include diff --git a/src/lib/utility/commandline/commands/CommandlineCommand.h b/src/lib/utility/commandline/commands/CommandlineCommand.h index 849e983c..52d46a4a 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommand.h +++ b/src/lib/utility/commandline/commands/CommandlineCommand.h @@ -3,7 +3,7 @@ #include -#include "boost/program_options.hpp" +#include namespace po = boost::program_options; diff --git a/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.cpp b/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.cpp index bc4a042e..3a8b785e 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.cpp +++ b/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.cpp @@ -1,7 +1,7 @@ -#include "utility/commandline/commands/CommandlineCommandAcceptEULA.h" +#include "CommandlineCommandAcceptEULA.h" -#include "utility/commandline/CommandlineHelper.h" -#include "utility/commandline/CommandLineParser.h" +#include "CommandlineHelper.h" +#include "CommandLineParser.h" namespace commandline { diff --git a/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.h b/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.h index 2ec08c15..202f907d 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.h +++ b/src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.h @@ -1,7 +1,7 @@ #ifndef COMMANDLINE_COMMAND_ACCEPT_EULA_H #define COMMANDLINE_COMMAND_ACCEPT_EULA_H -#include "utility/commandline/commands/CommandlineCommand.h" +#include "CommandlineCommand.h" class CommandLineParser; diff --git a/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp b/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp index 559f3013..a6bbb5a4 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp +++ b/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp @@ -1,13 +1,13 @@ -#include "utility/commandline/commands/CommandlineCommandConfig.h" +#include "CommandlineCommandConfig.h" #include #include -#include "utility/commandline/CommandlineHelper.h" -#include "utility/commandline/CommandLineParser.h" -#include "utility/file/FilePath.h" +#include "CommandlineHelper.h" +#include "CommandLineParser.h" +#include "FilePath.h" -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" namespace commandline { diff --git a/src/lib/utility/commandline/commands/CommandlineCommandConfig.h b/src/lib/utility/commandline/commands/CommandlineCommandConfig.h index 85be0492..ce9f48d5 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandConfig.h +++ b/src/lib/utility/commandline/commands/CommandlineCommandConfig.h @@ -1,7 +1,7 @@ #ifndef COMMANDLINE_COMMAND_CONFIG_H #define COMMANDLINE_COMMAND_CONFIG_H -#include "utility/commandline/commands/CommandlineCommand.h" +#include "CommandlineCommand.h" namespace commandline { diff --git a/src/lib/utility/commandline/commands/CommandlineCommandIndex.cpp b/src/lib/utility/commandline/commands/CommandlineCommandIndex.cpp index ab6fe138..426a6429 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandIndex.cpp +++ b/src/lib/utility/commandline/commands/CommandlineCommandIndex.cpp @@ -1,7 +1,7 @@ -#include "utility/commandline/commands/CommandlineCommandIndex.h" +#include "CommandlineCommandIndex.h" -#include "utility/commandline/CommandlineHelper.h" -#include "utility/commandline/CommandLineParser.h" +#include "CommandlineHelper.h" +#include "CommandLineParser.h" namespace po = boost::program_options; diff --git a/src/lib/utility/commandline/commands/CommandlineCommandIndex.h b/src/lib/utility/commandline/commands/CommandlineCommandIndex.h index 987a1854..d9180758 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandIndex.h +++ b/src/lib/utility/commandline/commands/CommandlineCommandIndex.h @@ -1,7 +1,7 @@ #ifndef COMMANDLINE_COMMAND_INDEX_H #define COMMANDLINE_COMMAND_INDEX_H -#include "utility/commandline/commands/CommandlineCommand.h" +#include "CommandlineCommand.h" namespace commandline { diff --git a/src/lib/utility/file/FileInfo.h b/src/lib/utility/file/FileInfo.h index e059b2ed..5119a567 100644 --- a/src/lib/utility/file/FileInfo.h +++ b/src/lib/utility/file/FileInfo.h @@ -3,10 +3,10 @@ #include -#include "boost/date_time.hpp" +#include -#include "utility/file/FilePath.h" -#include "utility/TimeStamp.h" +#include "FilePath.h" +#include "TimeStamp.h" struct FileInfo { diff --git a/src/lib/utility/file/FileManager.cpp b/src/lib/utility/file/FileManager.cpp index 7cb67049..570323a6 100644 --- a/src/lib/utility/file/FileManager.cpp +++ b/src/lib/utility/file/FileManager.cpp @@ -1,10 +1,10 @@ -#include "utility/file/FileManager.h" +#include "FileManager.h" #include -#include "utility/file/FileSystem.h" -#include "utility/file/FilePath.h" -#include "utility/file/FilePathFilter.h" +#include "FileSystem.h" +#include "FilePath.h" +#include "FilePathFilter.h" FileManager::FileManager() { diff --git a/src/lib/utility/file/FilePath.cpp b/src/lib/utility/file/FilePath.cpp index f23fe80d..b1398a13 100644 --- a/src/lib/utility/file/FilePath.cpp +++ b/src/lib/utility/file/FilePath.cpp @@ -1,12 +1,12 @@ -#include "utility/file/FilePath.h" +#include "FilePath.h" #include -#include "boost/filesystem/path.hpp" -#include "boost/filesystem.hpp" +#include +#include -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "utilityString.h" FilePath::FilePath() : m_path(std::make_unique("")) diff --git a/src/lib/utility/file/FilePathFilter.cpp b/src/lib/utility/file/FilePathFilter.cpp index 402eb372..e0e14b66 100644 --- a/src/lib/utility/file/FilePathFilter.cpp +++ b/src/lib/utility/file/FilePathFilter.cpp @@ -1,4 +1,4 @@ -#include "utility/file/FilePathFilter.h" +#include "FilePathFilter.h" FilePathFilter::FilePathFilter(const std::wstring& filterString) : m_filterString(filterString) diff --git a/src/lib/utility/file/FilePathFilter.h b/src/lib/utility/file/FilePathFilter.h index be606756..030b6caa 100644 --- a/src/lib/utility/file/FilePathFilter.h +++ b/src/lib/utility/file/FilePathFilter.h @@ -4,7 +4,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class FilePathFilter { diff --git a/src/lib/utility/file/FileRegister.cpp b/src/lib/utility/file/FileRegister.cpp index b697c280..36972f24 100644 --- a/src/lib/utility/file/FileRegister.cpp +++ b/src/lib/utility/file/FileRegister.cpp @@ -1,7 +1,7 @@ -#include "utility/file/FileRegister.h" +#include "FileRegister.h" -#include "utility/file/FilePath.h" -#include "utility/file/FilePathFilter.h" +#include "FilePath.h" +#include "FilePathFilter.h" FileRegister::FileRegister( const FilePath& currentPath, diff --git a/src/lib/utility/file/FileRegister.h b/src/lib/utility/file/FileRegister.h index 21bd0521..6a699408 100644 --- a/src/lib/utility/file/FileRegister.h +++ b/src/lib/utility/file/FileRegister.h @@ -3,8 +3,8 @@ #include -#include "utility/file/FilePath.h" -#include "utility/UnorderedCache.h" +#include "FilePath.h" +#include "UnorderedCache.h" class FilePathFilter; diff --git a/src/lib/utility/file/FileSystem.cpp b/src/lib/utility/file/FileSystem.cpp index d2a72e64..4745a250 100644 --- a/src/lib/utility/file/FileSystem.cpp +++ b/src/lib/utility/file/FileSystem.cpp @@ -1,11 +1,11 @@ -#include "utility/file/FileSystem.h" +#include "FileSystem.h" #include -#include "boost/date_time.hpp" -#include "boost/filesystem.hpp" +#include +#include -#include "utility/utilityString.h" +#include "utilityString.h" std::vector FileSystem::getFilePathsFromDirectory( const FilePath& path, const std::vector& extensions diff --git a/src/lib/utility/file/FileSystem.h b/src/lib/utility/file/FileSystem.h index bcfca6d1..2c87541a 100644 --- a/src/lib/utility/file/FileSystem.h +++ b/src/lib/utility/file/FileSystem.h @@ -5,8 +5,8 @@ #include #include -#include "utility/file/FileInfo.h" -#include "utility/TimeStamp.h" +#include "FileInfo.h" +#include "TimeStamp.h" class FileSystem { diff --git a/src/lib/utility/file/FileTree.cpp b/src/lib/utility/file/FileTree.cpp index f8d0e192..0694af40 100644 --- a/src/lib/utility/file/FileTree.cpp +++ b/src/lib/utility/file/FileTree.cpp @@ -1,6 +1,6 @@ -#include "utility/file/FileTree.h" +#include "FileTree.h" -#include "utility/file/FileSystem.h" +#include "FileSystem.h" FileTree::FileTree(const FilePath& rootPath) : m_rootPath(rootPath.getAbsolute().makeCanonical()) diff --git a/src/lib/utility/file/FileTree.h b/src/lib/utility/file/FileTree.h index dc288d19..f0a902bf 100644 --- a/src/lib/utility/file/FileTree.h +++ b/src/lib/utility/file/FileTree.h @@ -5,7 +5,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class FileTree { diff --git a/src/lib/utility/interprocess/SharedMemory.cpp b/src/lib/utility/interprocess/SharedMemory.cpp index fbb84ef6..b9974e12 100644 --- a/src/lib/utility/interprocess/SharedMemory.cpp +++ b/src/lib/utility/interprocess/SharedMemory.cpp @@ -1,7 +1,7 @@ -#include "utility/interprocess/SharedMemory.h" +#include "SharedMemory.h" -#include "utility/interprocess/SharedMemoryGarbageCollector.h" -#include "utility/logging/logging.h" +#include "SharedMemoryGarbageCollector.h" +#include "logging.h" const char* SharedMemory::s_memoryNamePrefix = "srctrlmem_"; const char* SharedMemory::s_mutexNamePrefix = "srctrlmtx_"; diff --git a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp index 588a8eb7..e6593bda 100644 --- a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp +++ b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp @@ -1,10 +1,10 @@ -#include "utility/interprocess/SharedMemoryGarbageCollector.h" +#include "SharedMemoryGarbageCollector.h" #include -#include "utility/logging/logging.h" -#include "utility/TimeStamp.h" -#include "utility/utility.h" +#include "logging.h" +#include "TimeStamp.h" +#include "utility.h" std::string SharedMemoryGarbageCollector::s_memoryNamePrefix = "grbg_cllctr_"; std::string SharedMemoryGarbageCollector::s_instancesKeyName = "running_instances"; diff --git a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.h b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.h index 5970f3d4..b2c020a2 100644 --- a/src/lib/utility/interprocess/SharedMemoryGarbageCollector.h +++ b/src/lib/utility/interprocess/SharedMemoryGarbageCollector.h @@ -6,7 +6,7 @@ #include #include -#include "utility/interprocess/SharedMemory.h" +#include "SharedMemory.h" #include #include diff --git a/src/lib/utility/logging/ConsoleLogger.cpp b/src/lib/utility/logging/ConsoleLogger.cpp index 289f856b..3efee2da 100644 --- a/src/lib/utility/logging/ConsoleLogger.cpp +++ b/src/lib/utility/logging/ConsoleLogger.cpp @@ -1,4 +1,4 @@ -#include "utility/logging/ConsoleLogger.h" +#include "ConsoleLogger.h" #include diff --git a/src/lib/utility/logging/ConsoleLogger.h b/src/lib/utility/logging/ConsoleLogger.h index 301b969d..26c6cb36 100644 --- a/src/lib/utility/logging/ConsoleLogger.h +++ b/src/lib/utility/logging/ConsoleLogger.h @@ -3,8 +3,8 @@ #include -#include "utility/logging/Logger.h" -#include "utility/logging/LogMessage.h" +#include "Logger.h" +#include "LogMessage.h" class ConsoleLogger : public Logger diff --git a/src/lib/utility/logging/FileLogger.cpp b/src/lib/utility/logging/FileLogger.cpp index 086ea1b4..9548740d 100644 --- a/src/lib/utility/logging/FileLogger.cpp +++ b/src/lib/utility/logging/FileLogger.cpp @@ -5,8 +5,8 @@ #include #include -#include "utility/file/FileSystem.h" -#include "utility/utilityString.h" +#include "FileSystem.h" +#include "utilityString.h" std::wstring FileLogger::generateDatedFileName(const std::wstring& prefix, const std::wstring& suffix) { diff --git a/src/lib/utility/logging/FileLogger.h b/src/lib/utility/logging/FileLogger.h index 7d793ba6..a2f2e09b 100644 --- a/src/lib/utility/logging/FileLogger.h +++ b/src/lib/utility/logging/FileLogger.h @@ -3,9 +3,9 @@ #include -#include "utility/file/FilePath.h" -#include "utility/logging/Logger.h" -#include "utility/logging/LogMessage.h" +#include "FilePath.h" +#include "Logger.h" +#include "LogMessage.h" class FileLogger: public Logger { diff --git a/src/lib/utility/logging/LogManager.cpp b/src/lib/utility/logging/LogManager.cpp index 6d9e81f6..f9a5513d 100644 --- a/src/lib/utility/logging/LogManager.cpp +++ b/src/lib/utility/logging/LogManager.cpp @@ -1,12 +1,12 @@ -#include "utility/logging/LogManager.h" +#include "LogManager.h" #include -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/utility.h" -#include "utility/Version.h" -#include "utility/utilityString.h" +#include "logging.h" +#include "MessageStatus.h" +#include "utility.h" +#include "Version.h" +#include "utilityString.h" std::shared_ptr LogManager::getInstance() { diff --git a/src/lib/utility/logging/LogManager.h b/src/lib/utility/logging/LogManager.h index e19cd581..d6888e17 100644 --- a/src/lib/utility/logging/LogManager.h +++ b/src/lib/utility/logging/LogManager.h @@ -3,8 +3,8 @@ #include -#include "utility/logging/Logger.h" -#include "utility/logging/LogManagerImplementation.h" +#include "Logger.h" +#include "LogManagerImplementation.h" class LogManager { diff --git a/src/lib/utility/logging/LogManagerImplementation.h b/src/lib/utility/logging/LogManagerImplementation.h index f001e9ed..afef3793 100644 --- a/src/lib/utility/logging/LogManagerImplementation.h +++ b/src/lib/utility/logging/LogManagerImplementation.h @@ -6,7 +6,7 @@ #include #include -#include "utility/logging/Logger.h" +#include "Logger.h" class LogManagerImplementation { diff --git a/src/lib/utility/logging/Logger.cpp b/src/lib/utility/logging/Logger.cpp index c70eaa6b..d921625c 100644 --- a/src/lib/utility/logging/Logger.cpp +++ b/src/lib/utility/logging/Logger.cpp @@ -1,4 +1,4 @@ -#include "utility/logging/Logger.h" +#include "Logger.h" Logger::Logger(const std::string& type) : m_type(type) diff --git a/src/lib/utility/logging/Logger.h b/src/lib/utility/logging/Logger.h index 523e63b2..5d8b8b58 100644 --- a/src/lib/utility/logging/Logger.h +++ b/src/lib/utility/logging/Logger.h @@ -4,7 +4,7 @@ #include #include -#include "utility/logging/LogMessage.h" +#include "LogMessage.h" class Logger { diff --git a/src/lib/utility/logging/logging.h b/src/lib/utility/logging/logging.h index e7e0958a..93507d45 100644 --- a/src/lib/utility/logging/logging.h +++ b/src/lib/utility/logging/logging.h @@ -3,7 +3,7 @@ #include -#include "utility/logging/LogManager.h" +#include "LogManager.h" /** * @brief Makros to simplify usage of the log manager diff --git a/src/lib/utility/math/Vector2.h b/src/lib/utility/math/Vector2.h index 52cfe1ef..05b0af0e 100644 --- a/src/lib/utility/math/Vector2.h +++ b/src/lib/utility/math/Vector2.h @@ -1,10 +1,10 @@ #ifndef VECTOR_2_H #define VECTOR_2_H -#include "utility/logging/logging.h" -#include "utility/Property.h" +#include "logging.h" +#include "Property.h" -#include "utility/math/VectorBase.h" +#include "VectorBase.h" template class Vector2 : public VectorBase diff --git a/src/lib/utility/math/Vector4.h b/src/lib/utility/math/Vector4.h index f3156915..f36e6e6b 100644 --- a/src/lib/utility/math/Vector4.h +++ b/src/lib/utility/math/Vector4.h @@ -1,10 +1,10 @@ #ifndef VECTOR_4_H #define VECTOR_4_H -#include "utility/logging/logging.h" -#include "utility/Property.h" +#include "logging.h" +#include "Property.h" -#include "utility/math/VectorBase.h" +#include "VectorBase.h" template class Vector4 : public VectorBase diff --git a/src/lib/utility/messaging/Message.h b/src/lib/utility/messaging/Message.h index 61663f8e..793e8a05 100644 --- a/src/lib/utility/messaging/Message.h +++ b/src/lib/utility/messaging/Message.h @@ -4,8 +4,8 @@ #include #include -#include "utility/messaging/MessageBase.h" -#include "utility/messaging/MessageQueue.h" +#include "MessageBase.h" +#include "MessageQueue.h" template class Message diff --git a/src/lib/utility/messaging/MessageBase.cpp b/src/lib/utility/messaging/MessageBase.cpp index 0150ae82..4d02c769 100644 --- a/src/lib/utility/messaging/MessageBase.cpp +++ b/src/lib/utility/messaging/MessageBase.cpp @@ -1,3 +1,3 @@ -#include "utility/messaging/MessageBase.h" +#include "MessageBase.h" Id MessageBase::s_nextId = 1; diff --git a/src/lib/utility/messaging/MessageBase.h b/src/lib/utility/messaging/MessageBase.h index 2256338f..33c12b7f 100644 --- a/src/lib/utility/messaging/MessageBase.h +++ b/src/lib/utility/messaging/MessageBase.h @@ -4,8 +4,8 @@ #include #include -#include "utility/types.h" -#include "utility/utilityString.h" +#include "types.h" +#include "utilityString.h" class MessageBase { diff --git a/src/lib/utility/messaging/MessageFilter.h b/src/lib/utility/messaging/MessageFilter.h index 4709a42d..6a6d537d 100644 --- a/src/lib/utility/messaging/MessageFilter.h +++ b/src/lib/utility/messaging/MessageFilter.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_FILTER_H #define MESSAGE_FILTER_H -#include "utility/messaging/MessageQueue.h" +#include "MessageQueue.h" class MessageFilter { diff --git a/src/lib/utility/messaging/MessageInterruptTasksCounter.cpp b/src/lib/utility/messaging/MessageInterruptTasksCounter.cpp index 91ae294d..bf3dbb47 100644 --- a/src/lib/utility/messaging/MessageInterruptTasksCounter.cpp +++ b/src/lib/utility/messaging/MessageInterruptTasksCounter.cpp @@ -1,7 +1,7 @@ -#include "utility/messaging/MessageInterruptTasksCounter.h" +#include "MessageInterruptTasksCounter.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/messaging/MessageListener.h" +#include "MessageInterruptTasks.h" +#include "MessageListener.h" MessageInterruptTasksCounter::MessageInterruptTasksCounter() : m_count(0) diff --git a/src/lib/utility/messaging/MessageListener.h b/src/lib/utility/messaging/MessageListener.h index 0c2aa6b6..8da82379 100644 --- a/src/lib/utility/messaging/MessageListener.h +++ b/src/lib/utility/messaging/MessageListener.h @@ -3,9 +3,9 @@ #include -#include "utility/messaging/MessageBase.h" -#include "utility/messaging/MessageListenerBase.h" -#include "utility/messaging/MessageQueue.h" +#include "MessageBase.h" +#include "MessageListenerBase.h" +#include "MessageQueue.h" template class MessageListener diff --git a/src/lib/utility/messaging/MessageListenerBase.cpp b/src/lib/utility/messaging/MessageListenerBase.cpp index 8fcf6d69..bad34f2e 100644 --- a/src/lib/utility/messaging/MessageListenerBase.cpp +++ b/src/lib/utility/messaging/MessageListenerBase.cpp @@ -1,3 +1,3 @@ -#include "utility/messaging/MessageListenerBase.h" +#include "MessageListenerBase.h" Id MessageListenerBase::s_nextId = 1; diff --git a/src/lib/utility/messaging/MessageListenerBase.h b/src/lib/utility/messaging/MessageListenerBase.h index cfd1eb93..fb6c6ada 100644 --- a/src/lib/utility/messaging/MessageListenerBase.h +++ b/src/lib/utility/messaging/MessageListenerBase.h @@ -3,9 +3,9 @@ #include -#include "utility/messaging/MessageBase.h" -#include "utility/messaging/MessageQueue.h" -#include "utility/types.h" +#include "MessageBase.h" +#include "MessageQueue.h" +#include "types.h" class MessageListenerBase { diff --git a/src/lib/utility/messaging/MessageQueue.cpp b/src/lib/utility/messaging/MessageQueue.cpp index deffae14..4f63ab29 100644 --- a/src/lib/utility/messaging/MessageQueue.cpp +++ b/src/lib/utility/messaging/MessageQueue.cpp @@ -1,15 +1,15 @@ -#include "utility/messaging/MessageQueue.h" +#include "MessageQueue.h" #include #include -#include "utility/logging/logging.h" -#include "utility/messaging/MessageBase.h" -#include "utility/messaging/MessageFilter.h" -#include "utility/messaging/MessageListenerBase.h" -#include "utility/scheduling/TaskGroupParallel.h" -#include "utility/scheduling/TaskGroupSequence.h" -#include "utility/scheduling/TaskLambda.h" +#include "logging.h" +#include "MessageBase.h" +#include "MessageFilter.h" +#include "MessageListenerBase.h" +#include "TaskGroupParallel.h" +#include "TaskGroupSequence.h" +#include "TaskLambda.h" std::shared_ptr MessageQueue::getInstance() { diff --git a/src/lib/utility/messaging/MessageQueue.h b/src/lib/utility/messaging/MessageQueue.h index f60247f8..0fb64953 100644 --- a/src/lib/utility/messaging/MessageQueue.h +++ b/src/lib/utility/messaging/MessageQueue.h @@ -6,7 +6,7 @@ #include #include -#include "utility/types.h" +#include "types.h" class MessageBase; class MessageFilter; diff --git a/src/lib/utility/messaging/filter_types/MessageFilterErrorCountUpdate.h b/src/lib/utility/messaging/filter_types/MessageFilterErrorCountUpdate.h index 81cbc57f..2dfa4ac0 100644 --- a/src/lib/utility/messaging/filter_types/MessageFilterErrorCountUpdate.h +++ b/src/lib/utility/messaging/filter_types/MessageFilterErrorCountUpdate.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_FILTER_ERROR_COUNT_UPDATE_H #define MESSAGE_FILTER_ERROR_COUNT_UPDATE_H -#include "utility/messaging/MessageFilter.h" -#include "utility/messaging/type/error/MessageErrorCountUpdate.h" +#include "MessageFilter.h" +#include "MessageErrorCountUpdate.h" class MessageFilterErrorCountUpdate : public MessageFilter diff --git a/src/lib/utility/messaging/filter_types/MessageFilterFocusInOut.h b/src/lib/utility/messaging/filter_types/MessageFilterFocusInOut.h index 9d609a22..f2197591 100644 --- a/src/lib/utility/messaging/filter_types/MessageFilterFocusInOut.h +++ b/src/lib/utility/messaging/filter_types/MessageFilterFocusInOut.h @@ -1,9 +1,9 @@ #ifndef MESSAGE_FILTER_FOCUS_IN_OUT_H #define MESSAGE_FILTER_FOCUS_IN_OUT_H -#include "utility/messaging/MessageFilter.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" +#include "MessageFilter.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" class MessageFilterFocusInOut : public MessageFilter diff --git a/src/lib/utility/messaging/filter_types/MessageFilterSearchAutocomplete.h b/src/lib/utility/messaging/filter_types/MessageFilterSearchAutocomplete.h index 47d7d7f0..57b88526 100644 --- a/src/lib/utility/messaging/filter_types/MessageFilterSearchAutocomplete.h +++ b/src/lib/utility/messaging/filter_types/MessageFilterSearchAutocomplete.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_FILTER_SEARCH_AUTOCOMPLETE_H #define MESSAGE_FILTER_SEARCH_AUTOCOMPLETE_H -#include "utility/messaging/MessageFilter.h" -#include "utility/messaging/type/MessageSearchAutocomplete.h" +#include "MessageFilter.h" +#include "MessageSearchAutocomplete.h" class MessageFilterSearchAutocomplete : public MessageFilter diff --git a/src/lib/utility/messaging/type/MessageActivateAll.h b/src/lib/utility/messaging/type/MessageActivateAll.h index 3b1b1cdd..89c1cd36 100644 --- a/src/lib/utility/messaging/type/MessageActivateAll.h +++ b/src/lib/utility/messaging/type/MessageActivateAll.h @@ -1,10 +1,10 @@ #ifndef MESSAGE_ACTIVATE_ALL_H #define MESSAGE_ACTIVATE_ALL_H -#include "utility/messaging/Message.h" -#include "utility/messaging/type/MessageActivateBase.h" +#include "Message.h" +#include "MessageActivateBase.h" -#include "data/NodeTypeSet.h" +#include "NodeTypeSet.h" class MessageActivateAll : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateBase.h b/src/lib/utility/messaging/type/MessageActivateBase.h index dcd0eba9..9352c549 100644 --- a/src/lib/utility/messaging/type/MessageActivateBase.h +++ b/src/lib/utility/messaging/type/MessageActivateBase.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ACTIVATE_BASE_H #define MESSAGE_ACTIVATE_BASE_H -#include "data/search/SearchMatch.h" +#include "SearchMatch.h" class MessageActivateBase { diff --git a/src/lib/utility/messaging/type/MessageActivateBookmark.h b/src/lib/utility/messaging/type/MessageActivateBookmark.h index acc775f8..a7108ebc 100644 --- a/src/lib/utility/messaging/type/MessageActivateBookmark.h +++ b/src/lib/utility/messaging/type/MessageActivateBookmark.h @@ -1,9 +1,9 @@ #ifndef MESSAGE_ACTIVATE_BOOKMARK_H #define MESSAGE_ACTIVATE_BOOKMARK_H -#include "utility/messaging/Message.h" +#include "Message.h" -#include "data/bookmark/Bookmark.h" +#include "Bookmark.h" class MessageActivateBookmark : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateEdge.h b/src/lib/utility/messaging/type/MessageActivateEdge.h index b91c13f5..482f1025 100644 --- a/src/lib/utility/messaging/type/MessageActivateEdge.h +++ b/src/lib/utility/messaging/type/MessageActivateEdge.h @@ -1,12 +1,12 @@ #ifndef MESSAGE_ACTIVATE_EDGE_H #define MESSAGE_ACTIVATE_EDGE_H -#include "data/graph/Edge.h" -#include "data/name/NameHierarchy.h" +#include "Edge.h" +#include "NameHierarchy.h" -#include "utility/messaging/Message.h" -#include "utility/types.h" -#include "utility/utilityString.h" +#include "Message.h" +#include "types.h" +#include "utilityString.h" class MessageActivateEdge : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateFile.h b/src/lib/utility/messaging/type/MessageActivateFile.h index 3231dd06..3325d043 100644 --- a/src/lib/utility/messaging/type/MessageActivateFile.h +++ b/src/lib/utility/messaging/type/MessageActivateFile.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_FILE_H #define MESSAGE_ACTIVATE_FILE_H -#include "utility/messaging/Message.h" -#include "utility/file/FilePath.h" +#include "Message.h" +#include "FilePath.h" class MessageActivateFile: public Message { diff --git a/src/lib/utility/messaging/type/MessageActivateFullTextSearch.h b/src/lib/utility/messaging/type/MessageActivateFullTextSearch.h index 348558a7..f52ba0e4 100644 --- a/src/lib/utility/messaging/type/MessageActivateFullTextSearch.h +++ b/src/lib/utility/messaging/type/MessageActivateFullTextSearch.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_FULLTEXT_SEARCH_H #define MESSAGE_ACTIVATE_FULLTEXT_SEARCH_H -#include "utility/messaging/Message.h" -#include "utility/messaging/type/MessageActivateBase.h" +#include "Message.h" +#include "MessageActivateBase.h" class MessageActivateFullTextSearch : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h b/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h index a7d20abb..49f71084 100644 --- a/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h +++ b/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H #define MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageActivateLocalSymbols : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateNodes.h b/src/lib/utility/messaging/type/MessageActivateNodes.h index 3db732e3..92f97268 100644 --- a/src/lib/utility/messaging/type/MessageActivateNodes.h +++ b/src/lib/utility/messaging/type/MessageActivateNodes.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_NODES_H #define MESSAGE_ACTIVATE_NODES_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageActivateNodes : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateSourceLocations.h b/src/lib/utility/messaging/type/MessageActivateSourceLocations.h index 0dd2a053..0ef8cfdc 100644 --- a/src/lib/utility/messaging/type/MessageActivateSourceLocations.h +++ b/src/lib/utility/messaging/type/MessageActivateSourceLocations.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_SOURCE_LOCATIONS_H #define MESSAGE_ACTIVATE_SOURCE_LOCATIONS_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageActivateSourceLocations : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateTokenIds.h b/src/lib/utility/messaging/type/MessageActivateTokenIds.h index 2474ee98..95a276f3 100644 --- a/src/lib/utility/messaging/type/MessageActivateTokenIds.h +++ b/src/lib/utility/messaging/type/MessageActivateTokenIds.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_TOKEN_IDS_H #define MESSAGE_ACTIVATE_TOKEN_IDS_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageActivateTokenIds : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateTokens.h b/src/lib/utility/messaging/type/MessageActivateTokens.h index 4ff1d08c..ff5e2168 100644 --- a/src/lib/utility/messaging/type/MessageActivateTokens.h +++ b/src/lib/utility/messaging/type/MessageActivateTokens.h @@ -1,11 +1,11 @@ #ifndef MESSAGE_ACTIVATE_TOKENS_H #define MESSAGE_ACTIVATE_TOKENS_H -#include "utility/messaging/Message.h" -#include "utility/messaging/type/MessageActivateBase.h" -#include "utility/types.h" +#include "Message.h" +#include "MessageActivateBase.h" +#include "types.h" -#include "data/search/SearchMatch.h" +#include "SearchMatch.h" class MessageActivateTokens : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateTrail.h b/src/lib/utility/messaging/type/MessageActivateTrail.h index d3c6d08f..126eeefd 100644 --- a/src/lib/utility/messaging/type/MessageActivateTrail.h +++ b/src/lib/utility/messaging/type/MessageActivateTrail.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_TRAIL_H #define MESSAGE_ACTIVATE_TRAIL_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageActivateTrail : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateTrailEdge.h b/src/lib/utility/messaging/type/MessageActivateTrailEdge.h index e0f53fbb..f83dceb6 100644 --- a/src/lib/utility/messaging/type/MessageActivateTrailEdge.h +++ b/src/lib/utility/messaging/type/MessageActivateTrailEdge.h @@ -1,12 +1,12 @@ #ifndef MESSAGE_ACTIVATE_TRAIL_EDGE_H #define MESSAGE_ACTIVATE_TRAIL_EDGE_H -#include "data/graph/Edge.h" -#include "data/name/NameHierarchy.h" +#include "Edge.h" +#include "NameHierarchy.h" -#include "utility/messaging/Message.h" -#include "utility/types.h" -#include "utility/utilityString.h" +#include "Message.h" +#include "types.h" +#include "utilityString.h" class MessageActivateTrailEdge : public Message diff --git a/src/lib/utility/messaging/type/MessageActivateWindow.h b/src/lib/utility/messaging/type/MessageActivateWindow.h index de5f7136..72628624 100644 --- a/src/lib/utility/messaging/type/MessageActivateWindow.h +++ b/src/lib/utility/messaging/type/MessageActivateWindow.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ACTIVATE_WINDOW_H #define MESSAGE_ACTIVATE_WINDOW_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageActivateWindow : public Message diff --git a/src/lib/utility/messaging/type/MessageChangeFileView.h b/src/lib/utility/messaging/type/MessageChangeFileView.h index fe033854..e9c28bf5 100644 --- a/src/lib/utility/messaging/type/MessageChangeFileView.h +++ b/src/lib/utility/messaging/type/MessageChangeFileView.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_CHANGE_FILE_VIEW_H #define MESSAGE_CHANGE_FILE_VIEW_H -#include "utility/file/FilePath.h" -#include "utility/messaging/Message.h" +#include "FilePath.h" +#include "Message.h" class MessageChangeFileView : public Message diff --git a/src/lib/utility/messaging/type/MessageClearLogView.h b/src/lib/utility/messaging/type/MessageClearLogView.h index 0d1f3ab4..d5aa4398 100644 --- a/src/lib/utility/messaging/type/MessageClearLogView.h +++ b/src/lib/utility/messaging/type/MessageClearLogView.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_CLEAR_LOG_VIEW_H #define MESSAGE_CLEAR_LOG_VIEW_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageClearLogView: public Message diff --git a/src/lib/utility/messaging/type/MessageClearStatusView.h b/src/lib/utility/messaging/type/MessageClearStatusView.h index b6462004..72369e4a 100644 --- a/src/lib/utility/messaging/type/MessageClearStatusView.h +++ b/src/lib/utility/messaging/type/MessageClearStatusView.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_CLEAR_STATUS_VIEW_H #define MESSAGE_CLEAR_STATUS_VIEW_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageClearStatusView: public Message diff --git a/src/lib/utility/messaging/type/MessageCodeReference.h b/src/lib/utility/messaging/type/MessageCodeReference.h index 32eaa0e6..dc089c2c 100644 --- a/src/lib/utility/messaging/type/MessageCodeReference.h +++ b/src/lib/utility/messaging/type/MessageCodeReference.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_CODE_REFERENCE_H #define MESSAGE_CODE_REFERENCE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageCodeReference : public Message diff --git a/src/lib/utility/messaging/type/MessageDeactivateEdge.h b/src/lib/utility/messaging/type/MessageDeactivateEdge.h index 9dfafb3a..5f158c6e 100644 --- a/src/lib/utility/messaging/type/MessageDeactivateEdge.h +++ b/src/lib/utility/messaging/type/MessageDeactivateEdge.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_DEACTIVATE_EDGE_H #define MESSAGE_DEACTIVATE_EDGE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageDeactivateEdge : public Message diff --git a/src/lib/utility/messaging/type/MessageDisplayBookmarkCreator.h b/src/lib/utility/messaging/type/MessageDisplayBookmarkCreator.h index 3a43884b..dd2c4596 100644 --- a/src/lib/utility/messaging/type/MessageDisplayBookmarkCreator.h +++ b/src/lib/utility/messaging/type/MessageDisplayBookmarkCreator.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_DISPLAY_BOOKMARK_CREATOR_H #define MESSAGE_DISPLAY_BOOKMARK_CREATOR_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageDisplayBookmarkCreator : public Message diff --git a/src/lib/utility/messaging/type/MessageDisplayBookmarks.h b/src/lib/utility/messaging/type/MessageDisplayBookmarks.h index 9e9d7496..1864b087 100644 --- a/src/lib/utility/messaging/type/MessageDisplayBookmarks.h +++ b/src/lib/utility/messaging/type/MessageDisplayBookmarks.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_DISPLAY_BOOKMARKS_H #define MESSAGE_DISPLAY_BOOKMARKS_H -#include "data/bookmark/Bookmark.h" -#include "utility/messaging/Message.h" +#include "Bookmark.h" +#include "Message.h" class MessageDisplayBookmarks : public Message diff --git a/src/lib/utility/messaging/type/MessageEnteredLicense.h b/src/lib/utility/messaging/type/MessageEnteredLicense.h index 9c270b9b..e2cd408f 100644 --- a/src/lib/utility/messaging/type/MessageEnteredLicense.h +++ b/src/lib/utility/messaging/type/MessageEnteredLicense.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ENTERED_LICENSE_H #define MESSAGE_ENTERED_LICENSE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageEnteredLicense : public Message diff --git a/src/lib/utility/messaging/type/MessageFind.h b/src/lib/utility/messaging/type/MessageFind.h index 4be972d0..24345019 100644 --- a/src/lib/utility/messaging/type/MessageFind.h +++ b/src/lib/utility/messaging/type/MessageFind.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_FIND_H #define MESSAGE_FIND_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageFind : public Message diff --git a/src/lib/utility/messaging/type/MessageFlushUpdates.h b/src/lib/utility/messaging/type/MessageFlushUpdates.h index fcba110f..ad0b9e15 100644 --- a/src/lib/utility/messaging/type/MessageFlushUpdates.h +++ b/src/lib/utility/messaging/type/MessageFlushUpdates.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_FLUSH_UPDATES_H #define MESSAGE_FLUSH_UPDATES_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageFlushUpdates: public Message diff --git a/src/lib/utility/messaging/type/MessageFocusIn.h b/src/lib/utility/messaging/type/MessageFocusIn.h index 20df5dd4..872d992a 100644 --- a/src/lib/utility/messaging/type/MessageFocusIn.h +++ b/src/lib/utility/messaging/type/MessageFocusIn.h @@ -3,10 +3,10 @@ #include -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" -#include "data/tooltip/TooltipOrigin.h" +#include "TooltipOrigin.h" class MessageFocusIn : public Message diff --git a/src/lib/utility/messaging/type/MessageFocusOut.h b/src/lib/utility/messaging/type/MessageFocusOut.h index 069b8338..8712bb87 100644 --- a/src/lib/utility/messaging/type/MessageFocusOut.h +++ b/src/lib/utility/messaging/type/MessageFocusOut.h @@ -3,8 +3,8 @@ #include -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageFocusOut : public Message diff --git a/src/lib/utility/messaging/type/MessageForceEnterLicense.h b/src/lib/utility/messaging/type/MessageForceEnterLicense.h index 4a6493f2..e21375b8 100644 --- a/src/lib/utility/messaging/type/MessageForceEnterLicense.h +++ b/src/lib/utility/messaging/type/MessageForceEnterLicense.h @@ -2,7 +2,7 @@ #define MESSAGE_FORCE_ENTER_LICENSE_H #include "LicenseChecker.h" -#include "utility/messaging/Message.h" +#include "Message.h" class MessageForceEnterLicense : public Message diff --git a/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h b/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h index c14729fa..c55c07ec 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_GRAPH_NODE_BUNDLE_SPLIT_H #define MESSAGE_GRAPH_NODE_BUNDLE_SPLIT_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageGraphNodeBundleSplit : public Message diff --git a/src/lib/utility/messaging/type/MessageGraphNodeExpand.h b/src/lib/utility/messaging/type/MessageGraphNodeExpand.h index 2103eadd..cab34790 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeExpand.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeExpand.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_GRAPH_NODE_EXPAND_H #define MESSAGE_GRAPH_NODE_EXPAND_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageGraphNodeExpand : public Message diff --git a/src/lib/utility/messaging/type/MessageGraphNodeHide.h b/src/lib/utility/messaging/type/MessageGraphNodeHide.h index 4088683d..5814257f 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeHide.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeHide.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_GRAPH_NODE_HIDE_H #define MESSAGE_GRAPH_NODE_HIDE_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageGraphNodeHide : public Message diff --git a/src/lib/utility/messaging/type/MessageGraphNodeMove.h b/src/lib/utility/messaging/type/MessageGraphNodeMove.h index 6690731a..087f67e0 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeMove.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeMove.h @@ -1,9 +1,9 @@ #ifndef MESSAGE_GRAPH_NODE_MOVE_H #define MESSAGE_GRAPH_NODE_MOVE_H -#include "utility/math/Vector2.h" -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Vector2.h" +#include "Message.h" +#include "types.h" class MessageGraphNodeMove : public Message diff --git a/src/lib/utility/messaging/type/MessageIDECreateCDB.h b/src/lib/utility/messaging/type/MessageIDECreateCDB.h index 0559b228..378bfbef 100644 --- a/src/lib/utility/messaging/type/MessageIDECreateCDB.h +++ b/src/lib/utility/messaging/type/MessageIDECreateCDB.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_IDE_CREATE_CDB_H #define MESSAGE_IDE_CREATE_CDB_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageIDECreateCDB : public Message { diff --git a/src/lib/utility/messaging/type/MessageInterruptTasks.h b/src/lib/utility/messaging/type/MessageInterruptTasks.h index fdd4fadf..c08cc4cf 100644 --- a/src/lib/utility/messaging/type/MessageInterruptTasks.h +++ b/src/lib/utility/messaging/type/MessageInterruptTasks.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_INTERRUPT_TASKS_H #define MESSAGE_INTERRUPT_TASKS_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageInterruptTasks: public Message diff --git a/src/lib/utility/messaging/type/MessageLoadProject.h b/src/lib/utility/messaging/type/MessageLoadProject.h index 653c901f..d2a8f25e 100644 --- a/src/lib/utility/messaging/type/MessageLoadProject.h +++ b/src/lib/utility/messaging/type/MessageLoadProject.h @@ -1,10 +1,10 @@ #ifndef MESSAGE_LOAD_PROJECT_H #define MESSAGE_LOAD_PROJECT_H -#include "project/RefreshInfo.h" +#include "RefreshInfo.h" -#include "utility/file/FilePath.h" -#include "utility/messaging/Message.h" +#include "FilePath.h" +#include "Message.h" class MessageLoadProject : public Message diff --git a/src/lib/utility/messaging/type/MessageLogFilterChanged.h b/src/lib/utility/messaging/type/MessageLogFilterChanged.h index 2db092b2..721dc065 100644 --- a/src/lib/utility/messaging/type/MessageLogFilterChanged.h +++ b/src/lib/utility/messaging/type/MessageLogFilterChanged.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_LOG_FILTER_CHANGED_H #define MESSAGE_LOG_FILTER_CHANGED_H -#include "utility/messaging/Message.h" -#include "utility/logging/Logger.h" +#include "Message.h" +#include "Logger.h" class MessageLogFilterChanged : public Message diff --git a/src/lib/utility/messaging/type/MessageMoveIDECursor.h b/src/lib/utility/messaging/type/MessageMoveIDECursor.h index 7071d529..24070107 100644 --- a/src/lib/utility/messaging/type/MessageMoveIDECursor.h +++ b/src/lib/utility/messaging/type/MessageMoveIDECursor.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_MOVE_IDE_CURSOR_H #define MESSAGE_MOVE_IDE_CURSOR_H -#include "utility/file/FilePath.h" -#include "utility/messaging/Message.h" +#include "FilePath.h" +#include "Message.h" class MessageMoveIDECursor : public Message { diff --git a/src/lib/utility/messaging/type/MessagePingReceived.h b/src/lib/utility/messaging/type/MessagePingReceived.h index 931c0448..1e3ac4b2 100644 --- a/src/lib/utility/messaging/type/MessagePingReceived.h +++ b/src/lib/utility/messaging/type/MessagePingReceived.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_PING_RECEIVED_H #define MESSAGE_PING_RECEIVED_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessagePingReceived : public Message diff --git a/src/lib/utility/messaging/type/MessagePluginPortChange.h b/src/lib/utility/messaging/type/MessagePluginPortChange.h index d6997b60..9ef78108 100644 --- a/src/lib/utility/messaging/type/MessagePluginPortChange.h +++ b/src/lib/utility/messaging/type/MessagePluginPortChange.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_PLUGIN_PORT_CHANGE_H #define MESSAGE_PLUGIN_PORT_CHANGE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessagePluginPortChange : public Message diff --git a/src/lib/utility/messaging/type/MessageProjectEdit.h b/src/lib/utility/messaging/type/MessageProjectEdit.h index 580da57c..4dfc576e 100644 --- a/src/lib/utility/messaging/type/MessageProjectEdit.h +++ b/src/lib/utility/messaging/type/MessageProjectEdit.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_PROJECT_EDIT_H #define MESSAGE_PROJECT_EDIT_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageProjectEdit : public Message diff --git a/src/lib/utility/messaging/type/MessageProjectNew.h b/src/lib/utility/messaging/type/MessageProjectNew.h index 90790672..4ff9b666 100644 --- a/src/lib/utility/messaging/type/MessageProjectNew.h +++ b/src/lib/utility/messaging/type/MessageProjectNew.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_PROJECT_NEW_H #define MESSAGE_PROJECT_NEW_H -#include "utility/file/FilePath.h" -#include "utility/messaging/Message.h" +#include "FilePath.h" +#include "Message.h" class MessageProjectNew : public Message diff --git a/src/lib/utility/messaging/type/MessageQuitApplication.h b/src/lib/utility/messaging/type/MessageQuitApplication.h index 368c5094..53c23f48 100644 --- a/src/lib/utility/messaging/type/MessageQuitApplication.h +++ b/src/lib/utility/messaging/type/MessageQuitApplication.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_QUIT_APPLICATION_H #define MESSAGE_QUIT_APPLICATION_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageQuitApplication : public Message diff --git a/src/lib/utility/messaging/type/MessageRefresh.h b/src/lib/utility/messaging/type/MessageRefresh.h index f7cb3c16..0add3731 100644 --- a/src/lib/utility/messaging/type/MessageRefresh.h +++ b/src/lib/utility/messaging/type/MessageRefresh.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_REFRESH_H #define MESSAGE_REFRESH_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageRefresh : public Message diff --git a/src/lib/utility/messaging/type/MessageResetZoom.h b/src/lib/utility/messaging/type/MessageResetZoom.h index 82ca829e..b2f9d301 100644 --- a/src/lib/utility/messaging/type/MessageResetZoom.h +++ b/src/lib/utility/messaging/type/MessageResetZoom.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_RESET_ZOOM_H #define MESSAGE_RESET_ZOOM_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageResetZoom : public Message diff --git a/src/lib/utility/messaging/type/MessageScrollCode.h b/src/lib/utility/messaging/type/MessageScrollCode.h index f29783db..2adc0808 100644 --- a/src/lib/utility/messaging/type/MessageScrollCode.h +++ b/src/lib/utility/messaging/type/MessageScrollCode.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_SCROLL_CODE_H #define MESSAGE_SCROLL_CODE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageScrollCode : public Message diff --git a/src/lib/utility/messaging/type/MessageScrollGraph.h b/src/lib/utility/messaging/type/MessageScrollGraph.h index 3f3e065a..355e1a87 100644 --- a/src/lib/utility/messaging/type/MessageScrollGraph.h +++ b/src/lib/utility/messaging/type/MessageScrollGraph.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_SCROLL_GRAPH_H #define MESSAGE_SCROLL_GRAPH_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageScrollGraph : public Message diff --git a/src/lib/utility/messaging/type/MessageScrollSpeedChange.h b/src/lib/utility/messaging/type/MessageScrollSpeedChange.h index fd76aa11..e2b34033 100644 --- a/src/lib/utility/messaging/type/MessageScrollSpeedChange.h +++ b/src/lib/utility/messaging/type/MessageScrollSpeedChange.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_SCROLL_SPEED_CHANGE_H #define MESSAGE_SCROLL_SPEED_CHANGE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageScrollSpeedChange : public Message diff --git a/src/lib/utility/messaging/type/MessageScrollToLine.h b/src/lib/utility/messaging/type/MessageScrollToLine.h index 9161c595..8015a26d 100644 --- a/src/lib/utility/messaging/type/MessageScrollToLine.h +++ b/src/lib/utility/messaging/type/MessageScrollToLine.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_SCROLL_TO_LINE_H #define MESSAGE_SCROLL_TO_LINE_H -#include "utility/file/FilePath.h" -#include "utility/messaging/Message.h" +#include "FilePath.h" +#include "Message.h" class MessageScrollToLine : public Message diff --git a/src/lib/utility/messaging/type/MessageSearch.h b/src/lib/utility/messaging/type/MessageSearch.h index e34c3565..cffff4ac 100644 --- a/src/lib/utility/messaging/type/MessageSearch.h +++ b/src/lib/utility/messaging/type/MessageSearch.h @@ -1,10 +1,10 @@ #ifndef MESSAGE_SEARCH_H #define MESSAGE_SEARCH_H -#include "utility/messaging/Message.h" +#include "Message.h" -#include "data/NodeTypeSet.h" -#include "data/search/SearchMatch.h" +#include "NodeTypeSet.h" +#include "SearchMatch.h" class MessageSearch : public Message diff --git a/src/lib/utility/messaging/type/MessageSearchAutocomplete.h b/src/lib/utility/messaging/type/MessageSearchAutocomplete.h index 15475337..6e7e77b9 100644 --- a/src/lib/utility/messaging/type/MessageSearchAutocomplete.h +++ b/src/lib/utility/messaging/type/MessageSearchAutocomplete.h @@ -1,9 +1,9 @@ #ifndef MESSAGE_SEARCH_AUTOCOMPLETE_H #define MESSAGE_SEARCH_AUTOCOMPLETE_H -#include "data/graph/Node.h" -#include "data/NodeTypeSet.h" -#include "utility/messaging/Message.h" +#include "Node.h" +#include "NodeTypeSet.h" +#include "Message.h" class MessageSearchAutocomplete : public Message diff --git a/src/lib/utility/messaging/type/MessageShowReference.h b/src/lib/utility/messaging/type/MessageShowReference.h index e4f90251..e350b0a4 100644 --- a/src/lib/utility/messaging/type/MessageShowReference.h +++ b/src/lib/utility/messaging/type/MessageShowReference.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_SHOW_REFERENCE_H #define MESSAGE_SHOW_REFERENCE_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageShowReference : public Message diff --git a/src/lib/utility/messaging/type/MessageShowScope.h b/src/lib/utility/messaging/type/MessageShowScope.h index 9e0cc496..8d0969ba 100644 --- a/src/lib/utility/messaging/type/MessageShowScope.h +++ b/src/lib/utility/messaging/type/MessageShowScope.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_SHOW_SCOPE_H #define MESSAGE_SHOW_SCOPE_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageShowScope : public Message diff --git a/src/lib/utility/messaging/type/MessageShowStatus.h b/src/lib/utility/messaging/type/MessageShowStatus.h index 223dc53b..92362867 100644 --- a/src/lib/utility/messaging/type/MessageShowStatus.h +++ b/src/lib/utility/messaging/type/MessageShowStatus.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_SHOW_STATUS_H #define MESSAGE_SHOW_STATUS_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageShowStatus : public Message diff --git a/src/lib/utility/messaging/type/MessageStatus.cpp b/src/lib/utility/messaging/type/MessageStatus.cpp index 902556a7..70b3be52 100644 --- a/src/lib/utility/messaging/type/MessageStatus.cpp +++ b/src/lib/utility/messaging/type/MessageStatus.cpp @@ -1,6 +1,6 @@ -#include "utility/messaging/type/MessageStatus.h" +#include "MessageStatus.h" -#include "utility/utilityString.h" +#include "utilityString.h" MessageStatus::MessageStatus(const std::wstring& status, bool isError, bool showLoader, bool showInStatusBar) : isError(isError) diff --git a/src/lib/utility/messaging/type/MessageStatus.h b/src/lib/utility/messaging/type/MessageStatus.h index b8a7eb10..4df330ab 100644 --- a/src/lib/utility/messaging/type/MessageStatus.h +++ b/src/lib/utility/messaging/type/MessageStatus.h @@ -4,7 +4,7 @@ #include #include -#include "utility/messaging/Message.h" +#include "Message.h" class MessageStatus : public Message diff --git a/src/lib/utility/messaging/type/MessageStatusFilterChanged.h b/src/lib/utility/messaging/type/MessageStatusFilterChanged.h index 47038f62..6982a54c 100644 --- a/src/lib/utility/messaging/type/MessageStatusFilterChanged.h +++ b/src/lib/utility/messaging/type/MessageStatusFilterChanged.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_STATUS_FILTER_CHANGED_H #define MESSAGE_STATUS_FILTER_CHANGED_H -#include "utility/messaging/Message.h" -#include "utility/Status.h" +#include "Message.h" +#include "Status.h" class MessageStatusFilterChanged : public Message diff --git a/src/lib/utility/messaging/type/MessageSwitchColorScheme.h b/src/lib/utility/messaging/type/MessageSwitchColorScheme.h index c4769726..6a8992c6 100644 --- a/src/lib/utility/messaging/type/MessageSwitchColorScheme.h +++ b/src/lib/utility/messaging/type/MessageSwitchColorScheme.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_SWITCH_COLOR_SCHEME_H #define MESSAGE_SWITCH_COLOR_SCHEME_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageSwitchColorScheme : public Message diff --git a/src/lib/utility/messaging/type/MessageTooltipHide.h b/src/lib/utility/messaging/type/MessageTooltipHide.h index ae14002b..704312d9 100644 --- a/src/lib/utility/messaging/type/MessageTooltipHide.h +++ b/src/lib/utility/messaging/type/MessageTooltipHide.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_TOOLTIP_HIDE_H #define MESSAGE_TOOLTIP_HIDE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageTooltipHide : public Message diff --git a/src/lib/utility/messaging/type/MessageTooltipShow.h b/src/lib/utility/messaging/type/MessageTooltipShow.h index dc044c04..44a39d88 100644 --- a/src/lib/utility/messaging/type/MessageTooltipShow.h +++ b/src/lib/utility/messaging/type/MessageTooltipShow.h @@ -1,10 +1,10 @@ #ifndef MESSAGE_TOOLTIP_SHOW_H #define MESSAGE_TOOLTIP_SHOW_H -#include "utility/messaging/Message.h" +#include "Message.h" -#include "data/tooltip/TooltipOrigin.h" -#include "data/tooltip/TooltipInfo.h" +#include "TooltipOrigin.h" +#include "TooltipInfo.h" class MessageTooltipShow : public Message diff --git a/src/lib/utility/messaging/type/MessageWindowClosed.h b/src/lib/utility/messaging/type/MessageWindowClosed.h index f5c283f2..cfc72a07 100644 --- a/src/lib/utility/messaging/type/MessageWindowClosed.h +++ b/src/lib/utility/messaging/type/MessageWindowClosed.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_WINDOW_CLOSED_H #define MESSAGE_WINDOW_CLOSED_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageWindowClosed : public Message diff --git a/src/lib/utility/messaging/type/MessageWindowFocus.h b/src/lib/utility/messaging/type/MessageWindowFocus.h index f4f913ca..97a2afda 100644 --- a/src/lib/utility/messaging/type/MessageWindowFocus.h +++ b/src/lib/utility/messaging/type/MessageWindowFocus.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_WINDOW_FOCUS_H #define MESSAGE_WINDOW_FOCUS_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageWindowFocus : public Message diff --git a/src/lib/utility/messaging/type/MessageZoom.h b/src/lib/utility/messaging/type/MessageZoom.h index dd8f3e41..0700ef92 100644 --- a/src/lib/utility/messaging/type/MessageZoom.h +++ b/src/lib/utility/messaging/type/MessageZoom.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ZOOM_H #define MESSAGE_ZOOM_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageZoom : public Message diff --git a/src/lib/utility/messaging/type/activation/MessageActivateLegend.h b/src/lib/utility/messaging/type/activation/MessageActivateLegend.h index 55f07ca7..d759ac8f 100644 --- a/src/lib/utility/messaging/type/activation/MessageActivateLegend.h +++ b/src/lib/utility/messaging/type/activation/MessageActivateLegend.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_ACTIVATE_LEGEND_H #define MESSAGE_ACTIVATE_LEGEND_H -#include "utility/messaging/Message.h" -#include "utility/messaging/type/MessageActivateBase.h" +#include "Message.h" +#include "MessageActivateBase.h" class MessageActivateLegend : public Message diff --git a/src/lib/utility/messaging/type/code/MessageCodeShowDefinition.h b/src/lib/utility/messaging/type/code/MessageCodeShowDefinition.h index 71fd9f64..192ca465 100644 --- a/src/lib/utility/messaging/type/code/MessageCodeShowDefinition.h +++ b/src/lib/utility/messaging/type/code/MessageCodeShowDefinition.h @@ -1,8 +1,8 @@ #ifndef MESSAGE_CODE_SHOW_DEFINITION_H #define MESSAGE_CODE_SHOW_DEFINITION_H -#include "utility/messaging/Message.h" -#include "utility/types.h" +#include "Message.h" +#include "types.h" class MessageCodeShowDefinition : public Message diff --git a/src/lib/utility/messaging/type/error/MessageActivateErrors.h b/src/lib/utility/messaging/type/error/MessageActivateErrors.h index 9a1434c4..d3ec2428 100644 --- a/src/lib/utility/messaging/type/error/MessageActivateErrors.h +++ b/src/lib/utility/messaging/type/error/MessageActivateErrors.h @@ -1,10 +1,10 @@ #ifndef MESSAGE_ACTIVATE_ERRORS_H #define MESSAGE_ACTIVATE_ERRORS_H -#include "utility/messaging/Message.h" -#include "utility/messaging/type/MessageActivateBase.h" +#include "Message.h" +#include "MessageActivateBase.h" -#include "data/ErrorFilter.h" +#include "ErrorFilter.h" class MessageActivateErrors : public Message diff --git a/src/lib/utility/messaging/type/error/MessageErrorCountClear.h b/src/lib/utility/messaging/type/error/MessageErrorCountClear.h index 209c9a02..a2cc564a 100644 --- a/src/lib/utility/messaging/type/error/MessageErrorCountClear.h +++ b/src/lib/utility/messaging/type/error/MessageErrorCountClear.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ERROR_COUNT_CLEAR_H #define MESSAGE_ERROR_COUNT_CLEAR_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageErrorCountClear : public Message diff --git a/src/lib/utility/messaging/type/error/MessageErrorCountUpdate.h b/src/lib/utility/messaging/type/error/MessageErrorCountUpdate.h index bcd53637..dec75707 100644 --- a/src/lib/utility/messaging/type/error/MessageErrorCountUpdate.h +++ b/src/lib/utility/messaging/type/error/MessageErrorCountUpdate.h @@ -1,9 +1,9 @@ #ifndef MESSAGE_ERROR_COUNT_UPDATE_H #define MESSAGE_ERROR_COUNT_UPDATE_H -#include "utility/messaging/Message.h" +#include "Message.h" -#include "data/ErrorCountInfo.h" +#include "ErrorCountInfo.h" class MessageErrorCountUpdate : public Message diff --git a/src/lib/utility/messaging/type/error/MessageErrorsAll.h b/src/lib/utility/messaging/type/error/MessageErrorsAll.h index b94f52d8..58f01b4c 100644 --- a/src/lib/utility/messaging/type/error/MessageErrorsAll.h +++ b/src/lib/utility/messaging/type/error/MessageErrorsAll.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ERRORS_ALL_H #define MESSAGE_ERRORS_ALL_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageErrorsAll: public Message diff --git a/src/lib/utility/messaging/type/error/MessageErrorsForFile.h b/src/lib/utility/messaging/type/error/MessageErrorsForFile.h index 35294bee..b922945a 100644 --- a/src/lib/utility/messaging/type/error/MessageErrorsForFile.h +++ b/src/lib/utility/messaging/type/error/MessageErrorsForFile.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ERRORS_FOR_FILE_H #define MESSAGE_ERRORS_FOR_FILE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageErrorsForFile: public Message diff --git a/src/lib/utility/messaging/type/error/MessageErrorsHelpMessage.h b/src/lib/utility/messaging/type/error/MessageErrorsHelpMessage.h index 1ea7ee55..0876270d 100644 --- a/src/lib/utility/messaging/type/error/MessageErrorsHelpMessage.h +++ b/src/lib/utility/messaging/type/error/MessageErrorsHelpMessage.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_ERRORS_HELP_MESSAGE_H #define MESSAGE_ERRORS_HELP_MESSAGE_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageErrorsHelpMessage: public Message diff --git a/src/lib/utility/messaging/type/error/MessageShowError.h b/src/lib/utility/messaging/type/error/MessageShowError.h index a7356904..779fb1ab 100644 --- a/src/lib/utility/messaging/type/error/MessageShowError.h +++ b/src/lib/utility/messaging/type/error/MessageShowError.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_SHOW_ERROR_H #define MESSAGE_SHOW_ERROR_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageShowError : public Message diff --git a/src/lib/utility/messaging/type/history/MessageHistoryRedo.h b/src/lib/utility/messaging/type/history/MessageHistoryRedo.h index 01e35481..8c996e4d 100644 --- a/src/lib/utility/messaging/type/history/MessageHistoryRedo.h +++ b/src/lib/utility/messaging/type/history/MessageHistoryRedo.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_HISTORY_REDO_H #define MESSAGE_HISTORY_REDO_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageHistoryRedo : public Message diff --git a/src/lib/utility/messaging/type/history/MessageHistoryToPosition.h b/src/lib/utility/messaging/type/history/MessageHistoryToPosition.h index e94d14b5..8614e6e0 100644 --- a/src/lib/utility/messaging/type/history/MessageHistoryToPosition.h +++ b/src/lib/utility/messaging/type/history/MessageHistoryToPosition.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_HISTORY_TO_POSITION_H #define MESSAGE_HISTORY_TO_POSITION_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageHistoryToPosition : public Message diff --git a/src/lib/utility/messaging/type/history/MessageHistoryUndo.h b/src/lib/utility/messaging/type/history/MessageHistoryUndo.h index 8158eb97..a6da0713 100644 --- a/src/lib/utility/messaging/type/history/MessageHistoryUndo.h +++ b/src/lib/utility/messaging/type/history/MessageHistoryUndo.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_HISTORY_UNDO_H #define MESSAGE_HISTORY_UNDO_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageHistoryUndo : public Message diff --git a/src/lib/utility/messaging/type/indexing/MessageIndexingFinished.h b/src/lib/utility/messaging/type/indexing/MessageIndexingFinished.h index d7d20ea6..bb1a6210 100644 --- a/src/lib/utility/messaging/type/indexing/MessageIndexingFinished.h +++ b/src/lib/utility/messaging/type/indexing/MessageIndexingFinished.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_INDEXING_FINISHED_H #define MESSAGE_INDEXING_FINISHED_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageIndexingFinished : public Message diff --git a/src/lib/utility/messaging/type/indexing/MessageIndexingShowDialog.h b/src/lib/utility/messaging/type/indexing/MessageIndexingShowDialog.h index fad70f63..7cd2b8ee 100644 --- a/src/lib/utility/messaging/type/indexing/MessageIndexingShowDialog.h +++ b/src/lib/utility/messaging/type/indexing/MessageIndexingShowDialog.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_INDEXING_SHOW_DIALOG_H #define MESSAGE_INDEXING_SHOW_DIALOG_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageIndexingShowDialog : public Message diff --git a/src/lib/utility/messaging/type/indexing/MessageIndexingStarted.h b/src/lib/utility/messaging/type/indexing/MessageIndexingStarted.h index 40462207..383e17d5 100644 --- a/src/lib/utility/messaging/type/indexing/MessageIndexingStarted.h +++ b/src/lib/utility/messaging/type/indexing/MessageIndexingStarted.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_INDEXING_STARTED_H #define MESSAGE_INDEXING_STARTED_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageIndexingStarted : public Message diff --git a/src/lib/utility/messaging/type/indexing/MessageIndexingStatus.h b/src/lib/utility/messaging/type/indexing/MessageIndexingStatus.h index f444f199..5d1eba22 100644 --- a/src/lib/utility/messaging/type/indexing/MessageIndexingStatus.h +++ b/src/lib/utility/messaging/type/indexing/MessageIndexingStatus.h @@ -1,7 +1,7 @@ #ifndef MESSAGE_INDEXING_STATUS_H #define MESSAGE_INDEXING_STATUS_H -#include "utility/messaging/Message.h" +#include "Message.h" class MessageIndexingStatus : public Message diff --git a/src/lib/utility/migration/Migrator.h b/src/lib/utility/migration/Migrator.h index 26c7a447..2b8ccc00 100644 --- a/src/lib/utility/migration/Migrator.h +++ b/src/lib/utility/migration/Migrator.h @@ -4,7 +4,7 @@ #include #include -#include "utility/migration/Migration.h" +#include "Migration.h" template class Migrator diff --git a/src/lib/utility/scheduling/Blackboard.cpp b/src/lib/utility/scheduling/Blackboard.cpp index 225b7f0e..f920e625 100644 --- a/src/lib/utility/scheduling/Blackboard.cpp +++ b/src/lib/utility/scheduling/Blackboard.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/Blackboard.h" +#include "Blackboard.h" Blackboard::Blackboard() { diff --git a/src/lib/utility/scheduling/Blackboard.h b/src/lib/utility/scheduling/Blackboard.h index 51d676e2..ee64d12b 100644 --- a/src/lib/utility/scheduling/Blackboard.h +++ b/src/lib/utility/scheduling/Blackboard.h @@ -7,7 +7,7 @@ #include #include -#include "utility/logging/logging.h" +#include "logging.h" struct BlackboardItemBase { diff --git a/src/lib/utility/scheduling/Task.cpp b/src/lib/utility/scheduling/Task.cpp index 7dc5060a..dbf57af5 100644 --- a/src/lib/utility/scheduling/Task.cpp +++ b/src/lib/utility/scheduling/Task.cpp @@ -1,6 +1,6 @@ -#include "utility/scheduling/Task.h" +#include "Task.h" -#include "utility/scheduling/TaskScheduler.h" +#include "TaskScheduler.h" void Task::dispatch(std::shared_ptr task) { diff --git a/src/lib/utility/scheduling/TaskDecorator.cpp b/src/lib/utility/scheduling/TaskDecorator.cpp index 731b338e..f430bbfb 100644 --- a/src/lib/utility/scheduling/TaskDecorator.cpp +++ b/src/lib/utility/scheduling/TaskDecorator.cpp @@ -1,6 +1,6 @@ -#include "utility/scheduling/TaskDecorator.h" +#include "TaskDecorator.h" -#include "utility/scheduling/TaskRunner.h" +#include "TaskRunner.h" TaskDecorator::TaskDecorator() { diff --git a/src/lib/utility/scheduling/TaskDecorator.h b/src/lib/utility/scheduling/TaskDecorator.h index 4d930a32..dfbbcc72 100644 --- a/src/lib/utility/scheduling/TaskDecorator.h +++ b/src/lib/utility/scheduling/TaskDecorator.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class TaskRunner; diff --git a/src/lib/utility/scheduling/TaskDecoratorDelay.cpp b/src/lib/utility/scheduling/TaskDecoratorDelay.cpp index b99f77de..97ae7a96 100644 --- a/src/lib/utility/scheduling/TaskDecoratorDelay.cpp +++ b/src/lib/utility/scheduling/TaskDecoratorDelay.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/TaskDecoratorDelay.h" +#include "TaskDecoratorDelay.h" #include diff --git a/src/lib/utility/scheduling/TaskDecoratorDelay.h b/src/lib/utility/scheduling/TaskDecoratorDelay.h index 10a4b35e..cefb75ea 100644 --- a/src/lib/utility/scheduling/TaskDecoratorDelay.h +++ b/src/lib/utility/scheduling/TaskDecoratorDelay.h @@ -3,9 +3,9 @@ #include -#include "utility/scheduling/TaskDecorator.h" -#include "utility/scheduling/TaskRunner.h" -#include "utility/TimeStamp.h" +#include "TaskDecorator.h" +#include "TaskRunner.h" +#include "TimeStamp.h" class TaskDecoratorDelay : public TaskDecorator diff --git a/src/lib/utility/scheduling/TaskDecoratorRepeat.cpp b/src/lib/utility/scheduling/TaskDecoratorRepeat.cpp index 80fb3866..000d17fa 100644 --- a/src/lib/utility/scheduling/TaskDecoratorRepeat.cpp +++ b/src/lib/utility/scheduling/TaskDecoratorRepeat.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/TaskDecoratorRepeat.h" +#include "TaskDecoratorRepeat.h" TaskDecoratorRepeat::TaskDecoratorRepeat(ConditionType condition, TaskState exitState) : m_condition(condition) diff --git a/src/lib/utility/scheduling/TaskDecoratorRepeat.h b/src/lib/utility/scheduling/TaskDecoratorRepeat.h index 0753077f..3c7256f0 100644 --- a/src/lib/utility/scheduling/TaskDecoratorRepeat.h +++ b/src/lib/utility/scheduling/TaskDecoratorRepeat.h @@ -3,8 +3,8 @@ #include -#include "utility/scheduling/TaskDecorator.h" -#include "utility/scheduling/TaskRunner.h" +#include "TaskDecorator.h" +#include "TaskRunner.h" class TaskDecoratorRepeat : public TaskDecorator diff --git a/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp index 91c43733..2122c074 100644 --- a/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp +++ b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp @@ -1,6 +1,6 @@ -#include "utility/scheduling/TaskFindKeyOnBlackboard.h" +#include "TaskFindKeyOnBlackboard.h" -#include "utility/scheduling/Blackboard.h" +#include "Blackboard.h" TaskFindKeyOnBlackboard::TaskFindKeyOnBlackboard(const std::string& key) : m_key(key) diff --git a/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h index 18c56eab..d9735fdd 100644 --- a/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h +++ b/src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class Blackboard; diff --git a/src/lib/utility/scheduling/TaskGroup.cpp b/src/lib/utility/scheduling/TaskGroup.cpp index a9fb86ff..8e8a44bb 100644 --- a/src/lib/utility/scheduling/TaskGroup.cpp +++ b/src/lib/utility/scheduling/TaskGroup.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/TaskGroup.h" +#include "TaskGroup.h" TaskGroup::TaskGroup() { diff --git a/src/lib/utility/scheduling/TaskGroup.h b/src/lib/utility/scheduling/TaskGroup.h index 5172ee6c..59576a63 100644 --- a/src/lib/utility/scheduling/TaskGroup.h +++ b/src/lib/utility/scheduling/TaskGroup.h @@ -4,7 +4,7 @@ #include #include -#include "utility/scheduling/Task.h" +#include "Task.h" class TaskGroup : public Task diff --git a/src/lib/utility/scheduling/TaskGroupParallel.cpp b/src/lib/utility/scheduling/TaskGroupParallel.cpp index f7c6e638..d9483c1b 100644 --- a/src/lib/utility/scheduling/TaskGroupParallel.cpp +++ b/src/lib/utility/scheduling/TaskGroupParallel.cpp @@ -1,9 +1,9 @@ -#include "utility/scheduling/TaskGroupParallel.h" +#include "TaskGroupParallel.h" #include #include -#include "utility/ScopedFunctor.h" +#include "ScopedFunctor.h" TaskGroupParallel::TaskGroupParallel() : m_needsToStartThreads(true) diff --git a/src/lib/utility/scheduling/TaskGroupParallel.h b/src/lib/utility/scheduling/TaskGroupParallel.h index 9394777a..4ddff0a1 100644 --- a/src/lib/utility/scheduling/TaskGroupParallel.h +++ b/src/lib/utility/scheduling/TaskGroupParallel.h @@ -5,8 +5,8 @@ #include #include -#include "utility/scheduling/TaskGroup.h" -#include "utility/scheduling/TaskRunner.h" +#include "TaskGroup.h" +#include "TaskRunner.h" class TaskGroupParallel : public TaskGroup diff --git a/src/lib/utility/scheduling/TaskGroupSelector.cpp b/src/lib/utility/scheduling/TaskGroupSelector.cpp index 03f88b39..eac3665d 100644 --- a/src/lib/utility/scheduling/TaskGroupSelector.cpp +++ b/src/lib/utility/scheduling/TaskGroupSelector.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/TaskGroupSelector.h" +#include "TaskGroupSelector.h" TaskGroupSelector::TaskGroupSelector() { diff --git a/src/lib/utility/scheduling/TaskGroupSelector.h b/src/lib/utility/scheduling/TaskGroupSelector.h index f4972b50..4624ef0b 100644 --- a/src/lib/utility/scheduling/TaskGroupSelector.h +++ b/src/lib/utility/scheduling/TaskGroupSelector.h @@ -1,8 +1,8 @@ #ifndef TASK_GROUP_SELECTOR_H #define TASK_GROUP_SELECTOR_H -#include "utility/scheduling/TaskGroup.h" -#include "utility/scheduling/TaskRunner.h" +#include "TaskGroup.h" +#include "TaskRunner.h" class TaskGroupSelector : public TaskGroup diff --git a/src/lib/utility/scheduling/TaskGroupSequence.cpp b/src/lib/utility/scheduling/TaskGroupSequence.cpp index e4722b0d..e40154f1 100644 --- a/src/lib/utility/scheduling/TaskGroupSequence.cpp +++ b/src/lib/utility/scheduling/TaskGroupSequence.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/TaskGroupSequence.h" +#include "TaskGroupSequence.h" TaskGroupSequence::TaskGroupSequence() { diff --git a/src/lib/utility/scheduling/TaskGroupSequence.h b/src/lib/utility/scheduling/TaskGroupSequence.h index e1ad0883..d4962789 100644 --- a/src/lib/utility/scheduling/TaskGroupSequence.h +++ b/src/lib/utility/scheduling/TaskGroupSequence.h @@ -1,8 +1,8 @@ #ifndef TASK_GROUP_SEQUENCE_H #define TASK_GROUP_SEQUENCE_H -#include "utility/scheduling/TaskGroup.h" -#include "utility/scheduling/TaskRunner.h" +#include "TaskGroup.h" +#include "TaskRunner.h" class TaskGroupSequence : public TaskGroup diff --git a/src/lib/utility/scheduling/TaskLambda.cpp b/src/lib/utility/scheduling/TaskLambda.cpp index 5939ea2e..26f7b156 100644 --- a/src/lib/utility/scheduling/TaskLambda.cpp +++ b/src/lib/utility/scheduling/TaskLambda.cpp @@ -1,4 +1,4 @@ -#include "utility/scheduling/TaskLambda.h" +#include "TaskLambda.h" TaskLambda::TaskLambda(std::function func) : m_func(func) diff --git a/src/lib/utility/scheduling/TaskLambda.h b/src/lib/utility/scheduling/TaskLambda.h index 4cfc03fb..468baac0 100644 --- a/src/lib/utility/scheduling/TaskLambda.h +++ b/src/lib/utility/scheduling/TaskLambda.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class TaskLambda : public Task diff --git a/src/lib/utility/scheduling/TaskReturnSuccessIf.h b/src/lib/utility/scheduling/TaskReturnSuccessIf.h index 5a0bf878..876f3c14 100644 --- a/src/lib/utility/scheduling/TaskReturnSuccessIf.h +++ b/src/lib/utility/scheduling/TaskReturnSuccessIf.h @@ -1,8 +1,8 @@ #ifndef TASK_RETURN_SUCCESS_IF_H #define TASK_RETURN_SUCCESS_IF_H -#include "utility/scheduling/Task.h" -#include "utility/scheduling/Blackboard.h" +#include "Task.h" +#include "Blackboard.h" template class TaskReturnSuccessIf: diff --git a/src/lib/utility/scheduling/TaskRunner.cpp b/src/lib/utility/scheduling/TaskRunner.cpp index 07673334..4e0ec3c9 100644 --- a/src/lib/utility/scheduling/TaskRunner.cpp +++ b/src/lib/utility/scheduling/TaskRunner.cpp @@ -1,8 +1,8 @@ -#include "utility/scheduling/TaskRunner.h" +#include "TaskRunner.h" -#include "utility/logging/logging.h" -#include "utility/scheduling/Blackboard.h" -#include "utility/scheduling/TaskScheduler.h" +#include "logging.h" +#include "Blackboard.h" +#include "TaskScheduler.h" TaskRunner::TaskRunner(std::shared_ptr task) : m_task(task) diff --git a/src/lib/utility/scheduling/TaskRunner.h b/src/lib/utility/scheduling/TaskRunner.h index 0f98d30f..12a31aa2 100644 --- a/src/lib/utility/scheduling/TaskRunner.h +++ b/src/lib/utility/scheduling/TaskRunner.h @@ -3,7 +3,7 @@ #include -#include "utility/scheduling/Task.h" +#include "Task.h" class TaskRunner { diff --git a/src/lib/utility/scheduling/TaskScheduler.cpp b/src/lib/utility/scheduling/TaskScheduler.cpp index 1d81eae5..dd64eb1e 100644 --- a/src/lib/utility/scheduling/TaskScheduler.cpp +++ b/src/lib/utility/scheduling/TaskScheduler.cpp @@ -1,10 +1,10 @@ -#include "utility/scheduling/TaskScheduler.h" +#include "TaskScheduler.h" #include #include -#include "utility/logging/logging.h" -#include "utility/ScopedFunctor.h" +#include "logging.h" +#include "ScopedFunctor.h" std::shared_ptr TaskScheduler::getInstance() { diff --git a/src/lib/utility/scheduling/TaskScheduler.h b/src/lib/utility/scheduling/TaskScheduler.h index 6976d6c7..08afc81b 100644 --- a/src/lib/utility/scheduling/TaskScheduler.h +++ b/src/lib/utility/scheduling/TaskScheduler.h @@ -5,8 +5,8 @@ #include #include -#include "utility/scheduling/Task.h" -#include "utility/scheduling/TaskRunner.h" +#include "Task.h" +#include "TaskRunner.h" class TaskScheduler { diff --git a/src/lib/utility/scheduling/TaskSetValue.h b/src/lib/utility/scheduling/TaskSetValue.h index 6740b5ca..22e3918a 100644 --- a/src/lib/utility/scheduling/TaskSetValue.h +++ b/src/lib/utility/scheduling/TaskSetValue.h @@ -1,8 +1,8 @@ #ifndef TASK_SET_VALUE_H #define TASK_SET_VALUE_H -#include "utility/scheduling/Task.h" -#include "utility/scheduling/Blackboard.h" +#include "Task.h" +#include "Blackboard.h" template class TaskSetValue: diff --git a/src/lib/utility/sonargraph/SonargraphProject.cpp b/src/lib/utility/sonargraph/SonargraphProject.cpp index c3f2b8e5..631252fb 100644 --- a/src/lib/utility/sonargraph/SonargraphProject.cpp +++ b/src/lib/utility/sonargraph/SonargraphProject.cpp @@ -1,12 +1,12 @@ -#include "utility/sonargraph/SonargraphProject.h" +#include "SonargraphProject.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/sonargraph/SonargraphSoftwareSystem.h" -#include "utility/logging/logging.h" -#include "utility/text/TextAccess.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" +#include "SonargraphSoftwareSystem.h" +#include "logging.h" +#include "TextAccess.h" +#include "utilityString.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphProject.h b/src/lib/utility/sonargraph/SonargraphProject.h index 8dfa9424..f17fe8c0 100644 --- a/src/lib/utility/sonargraph/SonargraphProject.h +++ b/src/lib/utility/sonargraph/SonargraphProject.h @@ -5,7 +5,7 @@ #include #include -#include "settings/LanguageType.h" +#include "LanguageType.h" // xsdCppModule // xsdCppManualModule -> basePathForIncludes(0, n), sourceFileExtensions(0, n), moduleCompilerOptions(0, n) diff --git a/src/lib/utility/sonargraph/SonargraphSoftwareSystem.cpp b/src/lib/utility/sonargraph/SonargraphSoftwareSystem.cpp index efa85acb..8285b312 100644 --- a/src/lib/utility/sonargraph/SonargraphSoftwareSystem.cpp +++ b/src/lib/utility/sonargraph/SonargraphSoftwareSystem.cpp @@ -1,12 +1,12 @@ -#include "utility/sonargraph/SonargraphSoftwareSystem.h" +#include "SonargraphSoftwareSystem.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommand.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" -#include "utility/utility.h" +#include "IndexerCommand.h" +#include "logging.h" +#include "utilityString.h" +#include "utilityXml.h" +#include "utility.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphSoftwareSystem.h b/src/lib/utility/sonargraph/SonargraphSoftwareSystem.h index 9015ad7c..62ec826b 100644 --- a/src/lib/utility/sonargraph/SonargraphSoftwareSystem.h +++ b/src/lib/utility/sonargraph/SonargraphSoftwareSystem.h @@ -4,9 +4,9 @@ #include #include -#include "utility/file/FilePathFilter.h" -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" -#include "utility/sonargraph/SonargraphXsdAbstractSystemExtension.h" +#include "FilePathFilter.h" +#include "SonargraphXsdAbstractModule.h" +#include "SonargraphXsdAbstractSystemExtension.h" class ApplicationSettings; class IndexerCommand; diff --git a/src/lib/utility/sonargraph/SonargraphSourceRootPath.cpp b/src/lib/utility/sonargraph/SonargraphSourceRootPath.cpp index cc2e7115..4ca02915 100644 --- a/src/lib/utility/sonargraph/SonargraphSourceRootPath.cpp +++ b/src/lib/utility/sonargraph/SonargraphSourceRootPath.cpp @@ -1,14 +1,14 @@ -#include "utility/sonargraph/SonargraphSourceRootPath.h" +#include "SonargraphSourceRootPath.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommandJava.h" -#include "utility/logging/logging.h" -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" -#include "utility/sonargraph/SonargraphXsdRootPathWithFiles.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" +#include "IndexerCommandJava.h" +#include "logging.h" +#include "SonargraphXsdAbstractModule.h" +#include "SonargraphXsdRootPathWithFiles.h" +#include "utilitySonargraph.h" +#include "utilityString.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphSourceRootPath.h b/src/lib/utility/sonargraph/SonargraphSourceRootPath.h index 44c90ae9..a0b06a63 100644 --- a/src/lib/utility/sonargraph/SonargraphSourceRootPath.h +++ b/src/lib/utility/sonargraph/SonargraphSourceRootPath.h @@ -5,7 +5,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class TiXmlElement; diff --git a/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.cpp b/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.cpp index 91f9935d..98040d1b 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.cpp @@ -1,16 +1,16 @@ -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" +#include "SonargraphXsdAbstractModule.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/logging/logging.h" -#include "utility/sonargraph/SonargraphXsdCmakeJsonModule.h" -#include "utility/sonargraph/SonargraphXsdCppManualModule.h" -#include "utility/sonargraph/SonargraphXsdJavaModule.h" -#include "utility/sonargraph/SonargraphXsdRootPath.h" -#include "utility/sonargraph/SonargraphSoftwareSystem.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" -#include "utility/utility.h" +#include "logging.h" +#include "SonargraphXsdCmakeJsonModule.h" +#include "SonargraphXsdCppManualModule.h" +#include "SonargraphXsdJavaModule.h" +#include "SonargraphXsdRootPath.h" +#include "SonargraphSoftwareSystem.h" +#include "utilityString.h" +#include "utilityXml.h" +#include "utility.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.h b/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.h index 21929bdb..0823489d 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.h +++ b/src/lib/utility/sonargraph/SonargraphXsdAbstractModule.h @@ -5,8 +5,8 @@ #include #include -#include "settings/LanguageType.h" -#include "utility/file/FilePathFilter.h" +#include "LanguageType.h" +#include "FilePathFilter.h" class ApplicationSettings; class IndexerCommand; diff --git a/src/lib/utility/sonargraph/SonargraphXsdAbstractSystemExtension.cpp b/src/lib/utility/sonargraph/SonargraphXsdAbstractSystemExtension.cpp index 3f75b8b6..ce170389 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdAbstractSystemExtension.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdAbstractSystemExtension.cpp @@ -1,9 +1,9 @@ -#include "utility/sonargraph/SonargraphXsdAbstractSystemExtension.h" +#include "SonargraphXsdAbstractSystemExtension.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/logging/logging.h" -#include "utility/sonargraph/SonargraphXsdCppSystemSettings.h" +#include "logging.h" +#include "SonargraphXsdCppSystemSettings.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.cpp b/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.cpp index 81daee41..29ac44d9 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.cpp @@ -1,23 +1,23 @@ -#include "utility/sonargraph/SonargraphXsdCmakeJsonModule.h" +#include "SonargraphXsdCmakeJsonModule.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/ApplicationSettings.h" -#include "settings/LanguageType.h" -#include "settings/SourceGroupSettings.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "settings/SourceGroupSettingsWithCppStandard.h" -#include "settings/SourceGroupSettingsWithCStandard.h" -#include "utility/file/FileSystem.h" -#include "utility/logging/logging.h" -#include "utility/sonargraph/SonargraphSoftwareSystem.h" -#include "utility/sonargraph/SonargraphXsdCppSystemSettings.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/utility.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" -#include "utility/OrderedCache.h" +#include "IndexerCommandCxx.h" +#include "ApplicationSettings.h" +#include "LanguageType.h" +#include "SourceGroupSettings.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithCStandard.h" +#include "FileSystem.h" +#include "logging.h" +#include "SonargraphSoftwareSystem.h" +#include "SonargraphXsdCppSystemSettings.h" +#include "utilitySonargraph.h" +#include "utility.h" +#include "utilityString.h" +#include "utilityXml.h" +#include "OrderedCache.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.h b/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.h index 54849913..b8ab2614 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.h +++ b/src/lib/utility/sonargraph/SonargraphXsdCmakeJsonModule.h @@ -1,8 +1,8 @@ #ifndef SONARGRAPH_XSD_CMAKE_JSON_MODULE_H #define SONARGRAPH_XSD_CMAKE_JSON_MODULE_H -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" -#include "utility/sonargraph/SonargraphXsdRootPathWithFiles.h" +#include "SonargraphXsdAbstractModule.h" +#include "SonargraphXsdRootPathWithFiles.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.cpp b/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.cpp index 47ce9bac..5d349186 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.cpp @@ -1,16 +1,16 @@ -#include "utility/sonargraph/SonargraphXsdCppManualModule.h" +#include "SonargraphXsdCppManualModule.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "utility/file/FileSystem.h" -#include "utility/sonargraph/SonargraphSoftwareSystem.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/utility.h" -#include "utility/utilityFile.h" -#include "utility/utilityXml.h" +#include "IndexerCommandCxx.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "FileSystem.h" +#include "SonargraphSoftwareSystem.h" +#include "utilitySonargraph.h" +#include "utility.h" +#include "utilityFile.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.h b/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.h index 67b4ca1c..fcfef7e8 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.h +++ b/src/lib/utility/sonargraph/SonargraphXsdCppManualModule.h @@ -1,8 +1,8 @@ #ifndef SONARGRAPH_XSD_CPP_MANUAL_MODULE_H #define SONARGRAPH_XSD_CPP_MANUAL_MODULE_H -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" -#include "utility/sonargraph/SonargraphXsdRootPathWithFiles.h" +#include "SonargraphXsdAbstractModule.h" +#include "SonargraphXsdRootPathWithFiles.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.cpp b/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.cpp index 5937d6be..773a8f05 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.cpp @@ -1,11 +1,11 @@ -#include "utility/sonargraph/SonargraphXsdCppSystemSettings.h" +#include "SonargraphXsdCppSystemSettings.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" +#include "utilitySonargraph.h" +#include "logging.h" +#include "utilityString.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.h b/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.h index f51bb09c..eb4af83d 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.h +++ b/src/lib/utility/sonargraph/SonargraphXsdCppSystemSettings.h @@ -4,8 +4,8 @@ #include #include -#include "utility/sonargraph/SonargraphXsdAbstractSystemExtension.h" -#include "utility/types.h" +#include "SonargraphXsdAbstractSystemExtension.h" +#include "types.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdJavaModule.cpp b/src/lib/utility/sonargraph/SonargraphXsdJavaModule.cpp index ccafa25d..65ad3540 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdJavaModule.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdJavaModule.cpp @@ -1,18 +1,18 @@ -#include "utility/sonargraph/SonargraphXsdJavaModule.h" +#include "SonargraphXsdJavaModule.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommandJava.h" -#include "settings/LanguageType.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" -#include "utility/file/FileSystem.h" -#include "utility/sonargraph/SonargraphSoftwareSystem.h" -#include "utility/sonargraph/SonargraphSourceRootPath.h" -#include "utility/sonargraph/SonargraphXsdRootPath.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/utility.h" -#include "utility/utilityFile.h" -#include "utility/utilityXml.h" +#include "IndexerCommandJava.h" +#include "LanguageType.h" +#include "SourceGroupSettingsJavaSonargraph.h" +#include "FileSystem.h" +#include "SonargraphSoftwareSystem.h" +#include "SonargraphSourceRootPath.h" +#include "SonargraphXsdRootPath.h" +#include "utilitySonargraph.h" +#include "utility.h" +#include "utilityFile.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdJavaModule.h b/src/lib/utility/sonargraph/SonargraphXsdJavaModule.h index 22a19e37..d4c49604 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdJavaModule.h +++ b/src/lib/utility/sonargraph/SonargraphXsdJavaModule.h @@ -1,7 +1,7 @@ #ifndef SONARGRAPH_XSD_JAVA_MODULE_H #define SONARGRAPH_XSD_JAVA_MODULE_H -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" +#include "SonargraphXsdAbstractModule.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdRootPath.cpp b/src/lib/utility/sonargraph/SonargraphXsdRootPath.cpp index 1a88f966..852fb812 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdRootPath.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdRootPath.cpp @@ -1,15 +1,15 @@ -#include "utility/sonargraph/SonargraphXsdRootPath.h" +#include "SonargraphXsdRootPath.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommandJava.h" -#include "utility/logging/logging.h" -#include "utility/sonargraph/SonargraphXsdAbstractModule.h" -#include "utility/sonargraph/SonargraphXsdRootPathWithFiles.h" -#include "utility/sonargraph/SonargraphXsdSourceRootPath.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" +#include "IndexerCommandJava.h" +#include "logging.h" +#include "SonargraphXsdAbstractModule.h" +#include "SonargraphXsdRootPathWithFiles.h" +#include "SonargraphXsdSourceRootPath.h" +#include "utilitySonargraph.h" +#include "utilityString.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdRootPath.h b/src/lib/utility/sonargraph/SonargraphXsdRootPath.h index 20dac080..bc258d77 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdRootPath.h +++ b/src/lib/utility/sonargraph/SonargraphXsdRootPath.h @@ -5,7 +5,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class IndexerCommand; class SonargraphAbstractModule; diff --git a/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.cpp b/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.cpp index 8ea8b9fc..81f1fdc1 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.cpp @@ -1,11 +1,11 @@ -#include "utility/sonargraph/SonargraphXsdRootPathWithFiles.h" +#include "SonargraphXsdRootPathWithFiles.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" +#include "utilitySonargraph.h" +#include "logging.h" +#include "utilityString.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.h b/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.h index d9f14490..51a767c6 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.h +++ b/src/lib/utility/sonargraph/SonargraphXsdRootPathWithFiles.h @@ -3,8 +3,8 @@ #include -#include "utility/sonargraph/SonargraphXsdRootPath.h" -#include "utility/types.h" +#include "SonargraphXsdRootPath.h" +#include "types.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.cpp b/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.cpp index 520edf31..4ccc2bd9 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.cpp +++ b/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.cpp @@ -1,11 +1,11 @@ -#include "utility/sonargraph/SonargraphXsdSourceRootPath.h" +#include "SonargraphXsdSourceRootPath.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/sonargraph/utilitySonargraph.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" +#include "utilitySonargraph.h" +#include "logging.h" +#include "utilityString.h" +#include "utilityXml.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.h b/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.h index 9db4157d..35cb488e 100644 --- a/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.h +++ b/src/lib/utility/sonargraph/SonargraphXsdSourceRootPath.h @@ -3,8 +3,8 @@ #include -#include "utility/sonargraph/SonargraphXsdRootPath.h" -#include "utility/types.h" +#include "SonargraphXsdRootPath.h" +#include "types.h" namespace Sonargraph { diff --git a/src/lib/utility/sonargraph/utilitySonargraph.cpp b/src/lib/utility/sonargraph/utilitySonargraph.cpp index dcfae1a9..53bf105a 100644 --- a/src/lib/utility/sonargraph/utilitySonargraph.cpp +++ b/src/lib/utility/sonargraph/utilitySonargraph.cpp @@ -1,6 +1,6 @@ -#include "utility/sonargraph/utilitySonargraph.h" +#include "utilitySonargraph.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" namespace utility { diff --git a/src/lib/utility/synchronization/ReaderWriterLock.cpp b/src/lib/utility/synchronization/ReaderWriterLock.cpp index c9f7220f..517b0b82 100644 --- a/src/lib/utility/synchronization/ReaderWriterLock.cpp +++ b/src/lib/utility/synchronization/ReaderWriterLock.cpp @@ -1,4 +1,4 @@ -#include "utility/synchronization/ReaderWriterLock.h" +#include "ReaderWriterLock.h" ReaderWriterLock::ReaderWriterLock() : m_readerCount(0) diff --git a/src/lib/utility/synchronization/ScopedReaderLock.cpp b/src/lib/utility/synchronization/ScopedReaderLock.cpp index ec91c8cf..93faab55 100644 --- a/src/lib/utility/synchronization/ScopedReaderLock.cpp +++ b/src/lib/utility/synchronization/ScopedReaderLock.cpp @@ -1,4 +1,4 @@ -#include "utility/synchronization/ScopedReaderLock.h" +#include "ScopedReaderLock.h" ScopedReaderLock::ScopedReaderLock(ReaderWriterLock& lock) : m_lock(lock) diff --git a/src/lib/utility/synchronization/ScopedReaderLock.h b/src/lib/utility/synchronization/ScopedReaderLock.h index 278e02aa..ea94f610 100644 --- a/src/lib/utility/synchronization/ScopedReaderLock.h +++ b/src/lib/utility/synchronization/ScopedReaderLock.h @@ -1,7 +1,7 @@ #ifndef SCOPED_READER_LOCK_H #define SCOPED_READER_LOCK_H -#include "utility/synchronization/ReaderWriterLock.h" +#include "ReaderWriterLock.h" class ScopedReaderLock { diff --git a/src/lib/utility/synchronization/ScopedWriterLock.cpp b/src/lib/utility/synchronization/ScopedWriterLock.cpp index 953e30f6..c0e6fde6 100644 --- a/src/lib/utility/synchronization/ScopedWriterLock.cpp +++ b/src/lib/utility/synchronization/ScopedWriterLock.cpp @@ -1,4 +1,4 @@ -#include "utility/synchronization/ScopedWriterLock.h" +#include "ScopedWriterLock.h" ScopedWriterLock::ScopedWriterLock(ReaderWriterLock& lock) : m_lock(lock) diff --git a/src/lib/utility/synchronization/ScopedWriterLock.h b/src/lib/utility/synchronization/ScopedWriterLock.h index fb27f59d..e1c3f15d 100644 --- a/src/lib/utility/synchronization/ScopedWriterLock.h +++ b/src/lib/utility/synchronization/ScopedWriterLock.h @@ -1,7 +1,7 @@ #ifndef SCOPED_WRITER_LOCK_H #define SCOPED_WRITER_LOCK_H -#include "utility/synchronization/ReaderWriterLock.h" +#include "ReaderWriterLock.h" class ScopedWriterLock { diff --git a/src/lib/utility/synchronization/Semaphore.cpp b/src/lib/utility/synchronization/Semaphore.cpp index b9918123..05d2a1eb 100644 --- a/src/lib/utility/synchronization/Semaphore.cpp +++ b/src/lib/utility/synchronization/Semaphore.cpp @@ -1,4 +1,4 @@ -#include "utility/synchronization/Semaphore.h" +#include "Semaphore.h" Semaphore::Semaphore(unsigned int counter) : m_counter(counter) diff --git a/src/lib/utility/text/TextAccess.cpp b/src/lib/utility/text/TextAccess.cpp index 330bf376..04a85b66 100644 --- a/src/lib/utility/text/TextAccess.cpp +++ b/src/lib/utility/text/TextAccess.cpp @@ -2,7 +2,7 @@ #include -#include "utility/logging/logging.h" +#include "logging.h" std::shared_ptr TextAccess::createFromFile(const FilePath& filePath) { diff --git a/src/lib/utility/text/TextAccess.h b/src/lib/utility/text/TextAccess.h index 0e45d885..eb8c2c07 100644 --- a/src/lib/utility/text/TextAccess.h +++ b/src/lib/utility/text/TextAccess.h @@ -5,7 +5,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class TextAccess { diff --git a/src/lib/utility/tracing.cpp b/src/lib/utility/tracing.cpp index 89a5d87d..51b07b19 100644 --- a/src/lib/utility/tracing.cpp +++ b/src/lib/utility/tracing.cpp @@ -1,4 +1,4 @@ -#include "utility/tracing.h" +#include "tracing.h" #include diff --git a/src/lib/utility/tracing.h b/src/lib/utility/tracing.h index d7d70b31..5801d424 100644 --- a/src/lib/utility/tracing.h +++ b/src/lib/utility/tracing.h @@ -10,9 +10,9 @@ #include #include -#include "utility/TimeStamp.h" -#include "utility/types.h" -#include "utility/utility.h" +#include "TimeStamp.h" +#include "types.h" +#include "utility.h" struct TraceEvent { diff --git a/src/lib/utility/utility.cpp b/src/lib/utility/utility.cpp index de51a98f..ea03fb7b 100644 --- a/src/lib/utility/utility.cpp +++ b/src/lib/utility/utility.cpp @@ -1,9 +1,9 @@ -#include "utility/utility.h" +#include "utility.h" #include #include -#include "boost/date_time/time_clock.hpp" +#include ApplicationArchitectureType utility::getApplicationArchitectureType() diff --git a/src/lib/utility/utility.h b/src/lib/utility/utility.h index 39b29aad..dec87f99 100644 --- a/src/lib/utility/utility.h +++ b/src/lib/utility/utility.h @@ -10,13 +10,13 @@ #include #include -#include "boost/date_time/posix_time/posix_time.hpp" +#include -#include "utility/ApplicationArchitectureType.h" -#include "utility/file/FilePath.h" -#include "utility/math/Vector2.h" -#include "utility/TimeStamp.h" -#include "utility/utilityString.h" +#include "ApplicationArchitectureType.h" +#include "FilePath.h" +#include "Vector2.h" +#include "TimeStamp.h" +#include "utilityString.h" namespace utility { diff --git a/src/lib/utility/utilityCxx.cpp b/src/lib/utility/utilityCxx.cpp index a95956de..ac9b0ea5 100644 --- a/src/lib/utility/utilityCxx.cpp +++ b/src/lib/utility/utilityCxx.cpp @@ -1,7 +1,7 @@ -#include "utility/utilityCxx.h" +#include "utilityCxx.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityApp.h" +#include "ResourcePaths.h" +#include "utilityApp.h" namespace utility { diff --git a/src/lib/utility/utilityFile.cpp b/src/lib/utility/utilityFile.cpp index 11be404b..40192b82 100644 --- a/src/lib/utility/utilityFile.cpp +++ b/src/lib/utility/utilityFile.cpp @@ -1,8 +1,8 @@ -#include "utility/utilityFile.h" +#include "utilityFile.h" -#include "utility/file/FilePath.h" +#include "FilePath.h" -#include "utility/utility.h" +#include "utility.h" std::vector utility::getTopLevelPaths(const std::vector& paths) { diff --git a/src/lib/utility/utilityLibrary.h b/src/lib/utility/utilityLibrary.h index ed1e1614..4bf4562a 100644 --- a/src/lib/utility/utilityLibrary.h +++ b/src/lib/utility/utilityLibrary.h @@ -13,8 +13,8 @@ #define __stdcall #endif -#include "utility/file/FilePath.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "utilityString.h" namespace utility { diff --git a/src/lib/utility/utilityMath.cpp b/src/lib/utility/utilityMath.cpp index a9e59637..0823289c 100644 --- a/src/lib/utility/utilityMath.cpp +++ b/src/lib/utility/utilityMath.cpp @@ -1,4 +1,4 @@ -#include "utility/utilityMath.h" +#include "utilityMath.h" unsigned long int utility::getPowerOfTwo(unsigned int exponent) { diff --git a/src/lib/utility/utilityUuid.cpp b/src/lib/utility/utilityUuid.cpp index 4e11f6d0..b83d49e5 100644 --- a/src/lib/utility/utilityUuid.cpp +++ b/src/lib/utility/utilityUuid.cpp @@ -1,4 +1,4 @@ -#include "utility/utilityUuid.h" +#include "utilityUuid.h" #include #include diff --git a/src/lib/utility/utilityWindows.cpp b/src/lib/utility/utilityWindows.cpp index be63770b..27854e45 100644 --- a/src/lib/utility/utilityWindows.cpp +++ b/src/lib/utility/utilityWindows.cpp @@ -1,4 +1,4 @@ -#include "utility/utilityWindows.h" +#include "utilityWindows.h" #ifdef WIN32 diff --git a/src/lib/utility/utilityXml.cpp b/src/lib/utility/utilityXml.cpp index 49ef55c3..d47f8901 100644 --- a/src/lib/utility/utilityXml.cpp +++ b/src/lib/utility/utilityXml.cpp @@ -1,8 +1,8 @@ -#include "utility/utilityXml.h" +#include "utilityXml.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/logging/logging.h" +#include "logging.h" namespace utility { diff --git a/src/lib/utility/utilityXml.h b/src/lib/utility/utilityXml.h index 853f5e6a..0e8d9ca7 100644 --- a/src/lib/utility/utilityXml.h +++ b/src/lib/utility/utilityXml.h @@ -5,7 +5,7 @@ #include #include -#include "utility/text/TextAccess.h" +#include "TextAccess.h" class TiXmlElement; diff --git a/src/lib_cxx/CMakeLists.txt b/src/lib_cxx/CMakeLists.txt index 768f2dc5..98f7f293 100644 --- a/src/lib_cxx/CMakeLists.txt +++ b/src/lib_cxx/CMakeLists.txt @@ -1,6 +1,6 @@ add_files( - LIB_CXX_FILES + LIB_CXX data/indexer/CxxIndexerCommandProvider.cpp data/indexer/CxxIndexerCommandProvider.h diff --git a/src/lib_cxx/LanguagePackageCxx.cpp b/src/lib_cxx/LanguagePackageCxx.cpp index bdf9f2f1..b3b8622d 100644 --- a/src/lib_cxx/LanguagePackageCxx.cpp +++ b/src/lib_cxx/LanguagePackageCxx.cpp @@ -1,6 +1,6 @@ #include "LanguagePackageCxx.h" -#include "data/indexer/IndexerCxx.h" +#include "IndexerCxx.h" std::vector> LanguagePackageCxx::instantiateSupportedIndexers() const { diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp index 097cb26d..e117a141 100644 --- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp +++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp @@ -1,7 +1,7 @@ -#include "data/indexer/CxxIndexerCommandProvider.h" +#include "CxxIndexerCommandProvider.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "utility/logging/logging.h" +#include "IndexerCommandCxx.h" +#include "logging.h" CxxIndexerCommandProvider::CxxIndexerCommandProvider() : m_nextId(1) diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h index 3628588c..28b10bf3 100644 --- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h +++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h @@ -6,8 +6,8 @@ #include #include -#include "data/indexer/IndexerCommandProvider.h" -#include "utility/types.h" +#include "IndexerCommandProvider.h" +#include "types.h" class IndexerCommandCxx; diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp b/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp index a837a267..a944c3bc 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp +++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.cpp @@ -1,16 +1,16 @@ -#include "data/indexer/IndexerCommandCxx.h" +#include "IndexerCommandCxx.h" #include #include -#include "clang/Tooling/CompilationDatabase.h" -#include "clang/Tooling/JSONCompilationDatabase.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/OrderedCache.h" -#include "utility/ResourcePaths.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include +#include +#include "logging.h" +#include "MessageStatus.h" +#include "OrderedCache.h" +#include "ResourcePaths.h" +#include "utility.h" +#include "utilityString.h" std::vector IndexerCommandCxx::getSourceFilesFromCDB(const FilePath& compilationDatabasePath) { diff --git a/src/lib_cxx/data/indexer/IndexerCommandCxx.h b/src/lib_cxx/data/indexer/IndexerCommandCxx.h index 37160841..3ea11b3f 100644 --- a/src/lib_cxx/data/indexer/IndexerCommandCxx.h +++ b/src/lib_cxx/data/indexer/IndexerCommandCxx.h @@ -4,7 +4,7 @@ #include #include -#include "data/indexer/IndexerCommand.h" +#include "IndexerCommand.h" class FilePath; diff --git a/src/lib_cxx/data/indexer/IndexerCxx.cpp b/src/lib_cxx/data/indexer/IndexerCxx.cpp index 2e90272d..85801bcc 100644 --- a/src/lib_cxx/data/indexer/IndexerCxx.cpp +++ b/src/lib_cxx/data/indexer/IndexerCxx.cpp @@ -1,8 +1,8 @@ -#include "data/indexer/IndexerCxx.h" +#include "IndexerCxx.h" -#include "data/parser/cxx/CxxParser.h" -#include "data/parser/ParserClientImpl.h" -#include "utility/file/FileRegister.h" +#include "CxxParser.h" +#include "ParserClientImpl.h" +#include "FileRegister.h" std::shared_ptr IndexerCxx::doIndex(std::shared_ptr indexerCommand) { diff --git a/src/lib_cxx/data/indexer/IndexerCxx.h b/src/lib_cxx/data/indexer/IndexerCxx.h index e8ef0bf4..1368586f 100644 --- a/src/lib_cxx/data/indexer/IndexerCxx.h +++ b/src/lib_cxx/data/indexer/IndexerCxx.h @@ -3,8 +3,8 @@ #include -#include "data/indexer/IndexerCommandCxx.h" -#include "data/indexer/Indexer.h" +#include "IndexerCommandCxx.h" +#include "Indexer.h" class IndexerCxx: public Indexer { diff --git a/src/lib_cxx/data/parser/cxx/ASTAction.h b/src/lib_cxx/data/parser/cxx/ASTAction.h index 1cb91504..794cffa1 100644 --- a/src/lib_cxx/data/parser/cxx/ASTAction.h +++ b/src/lib_cxx/data/parser/cxx/ASTAction.h @@ -7,9 +7,9 @@ #include #include -#include "data/parser/cxx/ASTConsumer.h" -#include "data/parser/cxx/CommentHandler.h" -#include "data/parser/cxx/PreprocessorCallbacks.h" +#include "ASTConsumer.h" +#include "CommentHandler.h" +#include "PreprocessorCallbacks.h" template class ASTAction diff --git a/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp b/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp index d6b291e5..f9605a5f 100644 --- a/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp +++ b/src/lib_cxx/data/parser/cxx/ASTActionFactory.cpp @@ -1,8 +1,8 @@ -#include "data/parser/cxx/ASTActionFactory.h" +#include "ASTActionFactory.h" #include -#include "data/parser/cxx/ASTAction.h" +#include "ASTAction.h" ASTActionFactory::ASTActionFactory( std::shared_ptr client, diff --git a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp index 46127cd3..bad40ded 100644 --- a/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp +++ b/src/lib_cxx/data/parser/cxx/ASTConsumer.cpp @@ -1,8 +1,8 @@ -#include "data/parser/cxx/ASTConsumer.h" +#include "ASTConsumer.h" -#include "data/parser/cxx/CxxAstVisitor.h" -#include "data/parser/cxx/CxxVerboseAstVisitor.h" -#include "settings/ApplicationSettings.h" +#include "CxxAstVisitor.h" +#include "CxxVerboseAstVisitor.h" +#include "ApplicationSettings.h" ASTConsumer::ASTConsumer( clang::ASTContext* context, diff --git a/src/lib_cxx/data/parser/cxx/ASTConsumer.h b/src/lib_cxx/data/parser/cxx/ASTConsumer.h index 7fadaeeb..cce90f06 100644 --- a/src/lib_cxx/data/parser/cxx/ASTConsumer.h +++ b/src/lib_cxx/data/parser/cxx/ASTConsumer.h @@ -1,8 +1,8 @@ #ifndef AST_CONSUMER_H #define AST_CONSUMER_H -#include "clang/AST/ASTConsumer.h" -#include "clang/AST/ASTContext.h" +#include +#include class CanonicalFilePathCache; class CxxAstVisitor; diff --git a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp index f03742ea..64581bea 100644 --- a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp +++ b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.cpp @@ -1,7 +1,7 @@ -#include "data/parser/cxx/CanonicalFilePathCache.h" +#include "CanonicalFilePathCache.h" -#include "utility/utilityString.h" -#include "data/parser/cxx/utilityClang.h" +#include "utilityString.h" +#include "utilityClang.h" CanonicalFilePathCache::CanonicalFilePathCache(std::shared_ptr fileRegister) : m_fileRegister(fileRegister) diff --git a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h index 54836297..e9aeb14b 100644 --- a/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h +++ b/src/lib_cxx/data/parser/cxx/CanonicalFilePathCache.h @@ -6,8 +6,8 @@ #include -#include "utility/file/FilePath.h" -#include "utility/file/FileRegister.h" +#include "FilePath.h" +#include "FileRegister.h" class CanonicalFilePathCache { diff --git a/src/lib_cxx/data/parser/cxx/CommentHandler.cpp b/src/lib_cxx/data/parser/cxx/CommentHandler.cpp index 6dd97e3e..c853b729 100644 --- a/src/lib_cxx/data/parser/cxx/CommentHandler.cpp +++ b/src/lib_cxx/data/parser/cxx/CommentHandler.cpp @@ -1,9 +1,9 @@ -#include "data/parser/cxx/CommentHandler.h" +#include "CommentHandler.h" -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/utilityClang.h" -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" +#include "CanonicalFilePathCache.h" +#include "utilityClang.h" +#include "ParseLocation.h" +#include "ParserClient.h" CommentHandler::CommentHandler( std::shared_ptr client, diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp index 914074c4..50cb6217 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.cpp @@ -1,24 +1,24 @@ -#include "data/parser/cxx/CxxAstVisitor.h" +#include "CxxAstVisitor.h" #include #include -#include "data/parser/cxx/name_resolver/CxxDeclNameResolver.h" -#include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h" +#include "CxxDeclNameResolver.h" +#include "CxxTypeNameResolver.h" -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/CxxAstVisitorComponent.h" -#include "data/parser/cxx/CxxAstVisitorComponentBraceRecorder.h" -#include "data/parser/cxx/CxxAstVisitorComponentContext.h" -#include "data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h" -#include "data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h" -#include "data/parser/cxx/CxxAstVisitorComponentImplicitCode.h" -#include "data/parser/cxx/CxxAstVisitorComponentIndexer.h" -#include "data/parser/cxx/utilityClang.h" -#include "data/parser/ParserClient.h" -#include "data/parser/ParseLocation.h" +#include "CanonicalFilePathCache.h" +#include "CxxAstVisitorComponent.h" +#include "CxxAstVisitorComponentBraceRecorder.h" +#include "CxxAstVisitorComponentContext.h" +#include "CxxAstVisitorComponentDeclRefKind.h" +#include "CxxAstVisitorComponentTypeRefKind.h" +#include "CxxAstVisitorComponentImplicitCode.h" +#include "CxxAstVisitorComponentIndexer.h" +#include "utilityClang.h" +#include "ParserClient.h" +#include "ParseLocation.h" -#include "utility/utilityString.h" +#include "utilityString.h" CxxAstVisitor::CxxAstVisitor( clang::ASTContext* astContext, diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h index 5d747dcc..6493053f 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitor.h @@ -5,8 +5,8 @@ #include -#include "data/parser/cxx/CxxContext.h" -#include "utility/messaging/MessageInterruptTasksCounter.h" +#include "CxxContext.h" +#include "MessageInterruptTasksCounter.h" class CanonicalFilePathCache; class ParserClient; diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.cpp index bb6b6fce..b47a1887 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxAstVisitorComponent.h" +#include "CxxAstVisitorComponent.h" CxxAstVisitorComponent::CxxAstVisitorComponent(CxxAstVisitor* astVisitor) : m_astVisitor(astVisitor) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.h index cc65f6b6..fe57ce01 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponent.h @@ -1,7 +1,7 @@ #ifndef CXX_AST_VISITOR_COMPONENT_H #define CXX_AST_VISITOR_COMPONENT_H -#include "data/parser/cxx/CxxAstVisitor.h" +#include "CxxAstVisitor.h" // CxxAstVisitorComponent: This is the base class for all ast visitor components. // Each component can override it's begin-/endTraverse and visit methods in order to provide some functionality. The CxxAstVisitor diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp index 08f71b7a..b7c542e7 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.cpp @@ -1,11 +1,11 @@ -#include "data/parser/cxx/CxxAstVisitorComponentBraceRecorder.h" +#include "CxxAstVisitorComponentBraceRecorder.h" #include -#include "data/parser/cxx/CxxAstVisitorComponentContext.h" -#include "data/parser/cxx/utilityClang.h" -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" +#include "CxxAstVisitorComponentContext.h" +#include "utilityClang.h" +#include "ParseLocation.h" +#include "ParserClient.h" CxxAstVisitorComponentBraceRecorder::CxxAstVisitorComponentBraceRecorder( CxxAstVisitor* astVisitor, clang::ASTContext* astContext, std::shared_ptr client diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.h index df9e12b4..6b4f5bac 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentBraceRecorder.h @@ -1,7 +1,7 @@ #ifndef CXX_AST_VISITOR_COMPONENT_BRACE_RECORDER_H #define CXX_AST_VISITOR_COMPONENT_BRACE_RECORDER_H -#include "data/parser/cxx/CxxAstVisitorComponent.h" +#include "CxxAstVisitorComponent.h" // This CxxAstVisitorComponent is responsible for recording all matching braces ["{", "}"] throughout the visited AST. class CxxAstVisitorComponentBraceRecorder: public CxxAstVisitorComponent diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp index 03ad0eaa..114838e8 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxAstVisitorComponentContext.h" +#include "CxxAstVisitorComponentContext.h" CxxAstVisitorComponentContext::CxxAstVisitorComponentContext(CxxAstVisitor* astVisitor) : CxxAstVisitorComponent(astVisitor) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.h index b87b3df9..e01587ba 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentContext.h @@ -1,8 +1,8 @@ #ifndef CXX_AST_VISITOR_COMPONENT_CONTEXT_H #define CXX_AST_VISITOR_COMPONENT_CONTEXT_H -#include "data/parser/cxx/CxxAstVisitorComponent.h" -#include "data/parser/cxx/CxxContext.h" +#include "CxxAstVisitorComponent.h" +#include "CxxContext.h" // This CxxAstVisitorComponent is responsible for recording and providing the decl/type that acts as the context of the currently traversed/visited node. // Example: void foo() { bar(); } diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp index 2103bb41..27a85462 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h" +#include "CxxAstVisitorComponentDeclRefKind.h" CxxAstVisitorComponentDeclRefKind::CxxAstVisitorComponentDeclRefKind(CxxAstVisitor* astVisitor) : CxxAstVisitorComponent(astVisitor) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h index 44f726f3..354546b2 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h @@ -3,10 +3,10 @@ #include -#include "data/parser/cxx/CxxAstVisitor.h" -#include "data/parser/cxx/CxxAstVisitorComponent.h" +#include "CxxAstVisitor.h" +#include "CxxAstVisitorComponent.h" -#include "data/parser/ReferenceKind.h" +#include "ReferenceKind.h" // This CxxAstVisitorComponent is responsible for recording and providing the context based ReferenceKind for each reference to a declaration encountered while traversing the AST. // Example: void foo() { bar(); } diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.cpp index c00a8a12..f8eeac96 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxAstVisitorComponentImplicitCode.h" +#include "CxxAstVisitorComponentImplicitCode.h" CxxAstVisitorComponentImplicitCode::CxxAstVisitorComponentImplicitCode(CxxAstVisitor* astVisitor) : CxxAstVisitorComponent(astVisitor) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h index a3c33eb3..db2509dd 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentImplicitCode.h @@ -1,7 +1,7 @@ #ifndef CXX_AST_VISITOR_COMPONENT_IMPLICIT_CODE_H #define CXX_AST_VISITOR_COMPONENT_IMPLICIT_CODE_H -#include "data/parser/cxx/CxxAstVisitorComponent.h" +#include "CxxAstVisitorComponent.h" // This CxxAstVisitorComponent is responsible for deciding if the AstVisitor should visit implicit code in the current context. class CxxAstVisitorComponentImplicitCode: public CxxAstVisitorComponent diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp index 2ba0cf67..ff767ac0 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp @@ -1,18 +1,18 @@ -#include "data/parser/cxx/CxxAstVisitorComponentIndexer.h" +#include "CxxAstVisitorComponentIndexer.h" #include #include #include #include -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/CxxAstVisitorComponentContext.h" -#include "data/parser/cxx/CxxAstVisitorComponentDeclRefKind.h" -#include "data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h" -#include "data/parser/cxx/utilityClang.h" -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" -#include "utility/file/FileRegister.h" +#include "CanonicalFilePathCache.h" +#include "CxxAstVisitorComponentContext.h" +#include "CxxAstVisitorComponentDeclRefKind.h" +#include "CxxAstVisitorComponentTypeRefKind.h" +#include "utilityClang.h" +#include "ParseLocation.h" +#include "ParserClient.h" +#include "FileRegister.h" CxxAstVisitorComponentIndexer::CxxAstVisitorComponentIndexer( CxxAstVisitor* astVisitor, clang::ASTContext* astContext, std::shared_ptr client diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.h index ca7fe337..110088c5 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.h @@ -3,9 +3,9 @@ #include -#include "data/parser/cxx/CxxAstVisitorComponent.h" -#include "data/parser/ReferenceKind.h" -#include "data/parser/SymbolKind.h" +#include "CxxAstVisitorComponent.h" +#include "ReferenceKind.h" +#include "SymbolKind.h" // This CxxAstVisitorComponent is responsible for recording all symbols and relations throughout the visited AST. class CxxAstVisitorComponentIndexer: public CxxAstVisitorComponent diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.cpp index 52bd4dca..0bc287d7 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h" +#include "CxxAstVisitorComponentTypeRefKind.h" CxxAstVisitorComponentTypeRefKind::CxxAstVisitorComponentTypeRefKind(CxxAstVisitor* astVisitor) : CxxAstVisitorComponent(astVisitor) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h index f906d472..a0462f01 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h @@ -3,10 +3,10 @@ #include -#include "data/parser/cxx/CxxAstVisitor.h" -#include "data/parser/cxx/CxxAstVisitorComponent.h" +#include "CxxAstVisitor.h" +#include "CxxAstVisitorComponent.h" -#include "data/parser/ReferenceKind.h" +#include "ReferenceKind.h" // This CxxAstVisitorComponent is responsible for recording and providing the context based ReferenceKind for each reference to a type encountered while traversing the AST. // Example: class Foo: public Bar {}; diff --git a/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.cpp b/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.cpp index 6ac05393..2b011fd8 100644 --- a/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxCompilationDatabaseSingle.h" +#include "CxxCompilationDatabaseSingle.h" CxxCompilationDatabaseSingle::CxxCompilationDatabaseSingle(const clang::tooling::CompileCommand& command) : m_command(command) diff --git a/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.h b/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.h index ff994c53..ce018db8 100644 --- a/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.h +++ b/src/lib_cxx/data/parser/cxx/CxxCompilationDatabaseSingle.h @@ -1,7 +1,7 @@ #ifndef CXX_COMPILATION_DATABASE_SINGLE_H #define CXX_COMPILATION_DATABASE_SINGLE_H -#include "clang/Tooling/CompilationDatabase.h" +#include class CxxCompilationDatabaseSingle : public clang::tooling::CompilationDatabase diff --git a/src/lib_cxx/data/parser/cxx/CxxContext.cpp b/src/lib_cxx/data/parser/cxx/CxxContext.cpp index 0fb34a68..470ac2ac 100644 --- a/src/lib_cxx/data/parser/cxx/CxxContext.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxContext.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxContext.h" +#include "CxxContext.h" CxxContextDecl::CxxContextDecl(const clang::NamedDecl* decl, std::shared_ptr nameCache) : m_decl(decl) diff --git a/src/lib_cxx/data/parser/cxx/CxxContext.h b/src/lib_cxx/data/parser/cxx/CxxContext.h index af9be27f..dc6bbbd2 100644 --- a/src/lib_cxx/data/parser/cxx/CxxContext.h +++ b/src/lib_cxx/data/parser/cxx/CxxContext.h @@ -3,8 +3,8 @@ #include -#include "data/name/NameHierarchy.h" -#include "utility/UnorderedCache.h" +#include "NameHierarchy.h" +#include "UnorderedCache.h" typedef UnorderedCache DeclNameCache; typedef UnorderedCache TypeNameCache; diff --git a/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.cpp b/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.cpp index 7f5a08bc..6ea8f205 100644 --- a/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.cpp @@ -1,13 +1,13 @@ -#include "data/parser/cxx/CxxDiagnosticConsumer.h" +#include "CxxDiagnosticConsumer.h" -#include "clang/Basic/SourceManager.h" -#include "clang/Tooling/Tooling.h" +#include +#include -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/utilityClang.h" -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" -#include "utility/utilityString.h" +#include "CanonicalFilePathCache.h" +#include "utilityClang.h" +#include "ParseLocation.h" +#include "ParserClient.h" +#include "utilityString.h" CxxDiagnosticConsumer::CxxDiagnosticConsumer( clang::raw_ostream &os, diff --git a/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.h b/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.h index e4ce29f8..bd77a86c 100644 --- a/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.h +++ b/src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.h @@ -1,8 +1,8 @@ #ifndef CXX_DIAGNOSTIC_CONSUMER #define CXX_DIAGNOSTIC_CONSUMER -#include "clang/Frontend/TextDiagnosticPrinter.h" -#include "utility/file/FilePath.h" +#include +#include "FilePath.h" class CanonicalFilePathCache; class ParserClient; diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.cpp b/src/lib_cxx/data/parser/cxx/CxxParser.cpp index a5596741..3d5219c6 100644 --- a/src/lib_cxx/data/parser/cxx/CxxParser.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxParser.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/CxxParser.h" +#include "CxxParser.h" #include #include @@ -8,18 +8,18 @@ #include #include -#include "data/indexer/IndexerCommandCxx.h" -#include "data/parser/cxx/ASTActionFactory.h" -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/CxxCompilationDatabaseSingle.h" -#include "data/parser/cxx/CxxDiagnosticConsumer.h" -#include "utility/file/FilePath.h" -#include "utility/file/FileRegister.h" -#include "utility/logging/logging.h" -#include "utility/text/TextAccess.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" -#include "utility/utility.h" +#include "IndexerCommandCxx.h" +#include "ASTActionFactory.h" +#include "CanonicalFilePathCache.h" +#include "CxxCompilationDatabaseSingle.h" +#include "CxxDiagnosticConsumer.h" +#include "FilePath.h" +#include "FileRegister.h" +#include "logging.h" +#include "TextAccess.h" +#include "ResourcePaths.h" +#include "utilityString.h" +#include "utility.h" namespace { diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.h b/src/lib_cxx/data/parser/cxx/CxxParser.h index ead206a3..d03626c7 100644 --- a/src/lib_cxx/data/parser/cxx/CxxParser.h +++ b/src/lib_cxx/data/parser/cxx/CxxParser.h @@ -4,7 +4,7 @@ #include #include -#include "data/parser/Parser.h" +#include "Parser.h" class CanonicalFilePathCache; class CxxDiagnosticConsumer; diff --git a/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.cpp b/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.cpp index b905efbf..9c57dd23 100644 --- a/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.cpp @@ -1,15 +1,15 @@ -#include "data/parser/cxx/CxxVerboseAstVisitor.h" +#include "CxxVerboseAstVisitor.h" #include #include #include -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" +#include "ParseLocation.h" +#include "ParserClient.h" -#include "utility/logging/logging.h" -#include "utility/ScopedSwitcher.h" +#include "logging.h" +#include "ScopedSwitcher.h" CxxVerboseAstVisitor::CxxVerboseAstVisitor( clang::ASTContext* context, diff --git a/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.h b/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.h index ad987869..961665ef 100644 --- a/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.h +++ b/src/lib_cxx/data/parser/cxx/CxxVerboseAstVisitor.h @@ -2,9 +2,9 @@ #ifndef CXX_VERBOSE_AST_VISITOR_H #define CXX_VERBOSE_AST_VISITOR_H -#include "clang/AST/TypeLoc.h" +#include -#include "data/parser/cxx/CxxAstVisitor.h" +#include "CxxAstVisitor.h" class CanonicalFilePathCache; class ParserClient; @@ -40,7 +40,7 @@ private: #define TYPE(Class, Base) \ case clang::TypeLoc::Class: \ return STRINGIFY(Class); -#include "clang/AST/TypeNodes.def" +#include case clang::TypeLoc::TypeLocClass::Qualified: return "Qualified"; } diff --git a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp index b6779a53..595b3933 100644 --- a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp +++ b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.cpp @@ -1,15 +1,15 @@ -#include "data/parser/cxx/PreprocessorCallbacks.h" +#include "PreprocessorCallbacks.h" #include #include #include -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/utilityClang.h" -#include "data/parser/ParserClient.h" -#include "data/parser/ParseLocation.h" +#include "CanonicalFilePathCache.h" +#include "utilityClang.h" +#include "ParserClient.h" +#include "ParseLocation.h" -#include "utility/utilityString.h" +#include "utilityString.h" PreprocessorCallbacks::PreprocessorCallbacks( clang::SourceManager& sourceManager, diff --git a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.h b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.h index 9de0fb08..f76612d7 100644 --- a/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.h +++ b/src/lib_cxx/data/parser/cxx/PreprocessorCallbacks.h @@ -4,12 +4,12 @@ #include #include -#include "clang/Basic/SourceManager.h" -#include "clang/Lex/MacroInfo.h" -#include "clang/Lex/PPCallbacks.h" -#include "clang/Lex/Token.h" +#include +#include +#include +#include -#include "utility/file/FilePath.h" +#include "FilePath.h" class CanonicalFilePathCache; class ParserClient; diff --git a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp index fc553a7c..6a5430de 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxDeclName.h" +#include "CxxDeclName.h" //CxxDeclName::CxxDeclName(const std::wstring& name, const std::vector& templateParameterNames) // : m_name(name) diff --git a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h index 008e6768..50b18768 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h @@ -5,8 +5,8 @@ #include #include -#include "data/name/NameHierarchy.h" -#include "data/parser/cxx/name/CxxName.h" +#include "NameHierarchy.h" +#include "CxxName.h" class CxxDeclName: public CxxName { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp index e6e7825a..af986f70 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxFunctionDeclName.h" +#include "CxxFunctionDeclName.h" //CxxFunctionDeclName::CxxFunctionDeclName( // const std::wstring& name, diff --git a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h index fbc2511f..b34b1db8 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxFunctionDeclName.h @@ -4,8 +4,8 @@ #include #include -#include "data/parser/cxx/name/CxxDeclName.h" -#include "data/parser/cxx/name/CxxTypeName.h" +#include "CxxDeclName.h" +#include "CxxTypeName.h" class CxxFunctionDeclName: public CxxDeclName { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxName.cpp index 06207c1a..1469cb83 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxName.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxName.h" +#include "CxxName.h" CxxName::CxxName() { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxName.h b/src/lib_cxx/data/parser/cxx/name/CxxName.h index dbea5460..e9d9ea87 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxName.h @@ -5,7 +5,7 @@ #include #include -#include "data/name/NameHierarchy.h" +#include "NameHierarchy.h" class CxxName { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxQualifierFlags.cpp b/src/lib_cxx/data/parser/cxx/name/CxxQualifierFlags.cpp index c192e121..6c938632 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxQualifierFlags.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxQualifierFlags.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxQualifierFlags.h" +#include "CxxQualifierFlags.h" CxxQualifierFlags::CxxQualifierFlags() : m_flags(QUALIFIER_NONE) diff --git a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp index 232cb750..f1aa10be 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxStaticFunctionDeclName.h" +#include "CxxStaticFunctionDeclName.h" //CxxStaticFunctionDeclName::CxxStaticFunctionDeclName( // const std::wstring& name, diff --git a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h index cf7548a5..f996623e 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxStaticFunctionDeclName.h @@ -1,7 +1,7 @@ #ifndef CXX_STATIC_FUNCTION_DECL_NAME_H #define CXX_STATIC_FUNCTION_DECL_NAME_H -#include "data/parser/cxx/name/CxxFunctionDeclName.h" +#include "CxxFunctionDeclName.h" class CxxStaticFunctionDeclName: public CxxFunctionDeclName { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp index b5ac460f..09d5392b 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxTypeName.h" +#include "CxxTypeName.h" std::shared_ptr CxxTypeName::makeUnsolvedIfNull(std::shared_ptr name) { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h index 9de16442..53a5f765 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxTypeName.h @@ -5,9 +5,9 @@ #include #include -#include "data/name/NameHierarchy.h" -#include "data/parser/cxx/name/CxxName.h" -#include "data/parser/cxx/name/CxxQualifierFlags.h" +#include "NameHierarchy.h" +#include "CxxName.h" +#include "CxxQualifierFlags.h" class CxxTypeName: public CxxName { diff --git a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp index a428e1e1..2a4a9e77 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp +++ b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name/CxxVariableDeclName.h" +#include "CxxVariableDeclName.h" //CxxVariableDeclName::CxxVariableDeclName( // const std::wstring& name, diff --git a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h index b94689a6..6793bad7 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxVariableDeclName.h @@ -4,8 +4,8 @@ #include #include -#include "data/parser/cxx/name/CxxDeclName.h" -#include "data/parser/cxx/name/CxxTypeName.h" +#include "CxxDeclName.h" +#include "CxxTypeName.h" class CxxVariableDeclName: public CxxDeclName { diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclName.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclName.h deleted file mode 100644 index 88613810..00000000 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclName.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef CXX_DECL_NAME_H -#define CXX_DECL_NAME_H - -#include -#include -#include - -struct CxxDeclName -{ - std::string m_name; - std::shared_ptr m_parent; - std::vector m_templateParameterNames; - - - - private JavaDeclName m_parent = null; - private String m_name = ""; - private List m_typeParameterNames = null; - private JavaTypeName m_returnTypeName = null; - private List m_parameterNames = null; -}; - -struct CxxFunctionDeclName: public CxxDeclName -{ -}; - -#endif // CXX_DECL_NAME_H diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp index db541ded..01096bc8 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.cpp @@ -1,19 +1,19 @@ -#include "data/parser/cxx/name_resolver/CxxDeclNameResolver.h" +#include "CxxDeclNameResolver.h" #include -#include "data/parser/cxx/name/CxxFunctionDeclName.h" -#include "data/parser/cxx/name/CxxVariableDeclName.h" -#include "data/parser/cxx/name/CxxStaticFunctionDeclName.h" -#include "data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h" -#include "data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h" -#include "data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.h" -#include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h" -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/cxx/utilityClang.h" -#include "utility/file/FilePath.h" -#include "utility/ScopedSwitcher.h" -#include "utility/utilityString.h" +#include "CxxFunctionDeclName.h" +#include "CxxVariableDeclName.h" +#include "CxxStaticFunctionDeclName.h" +#include "CxxSpecifierNameResolver.h" +#include "CxxTemplateArgumentNameResolver.h" +#include "CxxTemplateParameterStringResolver.h" +#include "CxxTypeNameResolver.h" +#include "CanonicalFilePathCache.h" +#include "utilityClang.h" +#include "FilePath.h" +#include "ScopedSwitcher.h" +#include "utilityString.h" CxxDeclNameResolver::CxxDeclNameResolver(std::shared_ptr canonicalFilePathCache) : CxxNameResolver(canonicalFilePathCache, std::vector()) diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h index 682f8686..cf6ff5e6 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxDeclNameResolver.h @@ -1,10 +1,10 @@ #ifndef CXX_DECL_NAME_RESOLVER_H #define CXX_DECL_NAME_RESOLVER_H -#include "clang/AST/DeclTemplate.h" +#include -#include "data/parser/cxx/name/CxxDeclName.h" -#include "data/parser/cxx/name_resolver/CxxNameResolver.h" +#include "CxxDeclName.h" +#include "CxxNameResolver.h" class CanonicalFilePathCache; diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxNameResolver.cpp index c8ed8eb0..97ba95f4 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxNameResolver.cpp @@ -1,4 +1,4 @@ -#include "data/parser/cxx/name_resolver/CxxNameResolver.h" +#include "CxxNameResolver.h" CxxNameResolver::CxxNameResolver( std::shared_ptr canonicalFilePathCache, diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.cpp index f29f3dfb..4131aeaa 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.cpp @@ -1,12 +1,12 @@ -#include "data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h" +#include "CxxSpecifierNameResolver.h" #include #include #include -#include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h" -#include "data/parser/cxx/name_resolver/CxxDeclNameResolver.h" -#include "utility/utilityString.h" +#include "CxxTypeNameResolver.h" +#include "CxxDeclNameResolver.h" +#include "utilityString.h" CxxSpecifierNameResolver::CxxSpecifierNameResolver(std::shared_ptr canonicalFilePathCache) : CxxNameResolver(canonicalFilePathCache, std::vector()) diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h index 720ab306..a107bba0 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h @@ -3,7 +3,7 @@ #include -#include "data/parser/cxx/name_resolver/CxxNameResolver.h" +#include "CxxNameResolver.h" class CxxName; diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp index 499600a1..c95be30f 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.cpp @@ -1,10 +1,10 @@ -#include "data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h" +#include "CxxTemplateArgumentNameResolver.h" #include #include -#include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h" -#include "utility/utilityString.h" +#include "CxxTypeNameResolver.h" +#include "utilityString.h" CxxTemplateArgumentNameResolver::CxxTemplateArgumentNameResolver(std::shared_ptr canonicalFilePathCache) : CxxNameResolver(canonicalFilePathCache, std::vector()) diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h index 503e0d70..1fc36011 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h @@ -3,7 +3,7 @@ #include -#include "data/parser/cxx/name_resolver/CxxNameResolver.h" +#include "CxxNameResolver.h" class DataType; diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.cpp index 17830db2..b3d74e29 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.cpp @@ -1,10 +1,10 @@ -#include "data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.h" +#include "CxxTemplateParameterStringResolver.h" #include #include -#include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h" -#include "utility/utilityString.h" +#include "CxxTypeNameResolver.h" +#include "utilityString.h" CxxTemplateParameterStringResolver::CxxTemplateParameterStringResolver(std::shared_ptr canonicalFilePathCache) : CxxNameResolver(canonicalFilePathCache, std::vector()) diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.h index 88cf4014..f3a62f60 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.h +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTemplateParameterStringResolver.h @@ -3,9 +3,9 @@ #include -#include "clang/AST/DeclTemplate.h" +#include -#include "data/parser/cxx/name_resolver/CxxNameResolver.h" +#include "CxxNameResolver.h" class DataType; diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp index f037eca4..9a3d598a 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.cpp @@ -1,14 +1,14 @@ -#include "data/parser/cxx/name_resolver/CxxTypeNameResolver.h" +#include "CxxTypeNameResolver.h" #include #include #include -#include "data/parser/cxx/name_resolver/CxxDeclNameResolver.h" -#include "data/parser/cxx/name_resolver/CxxSpecifierNameResolver.h" -#include "data/parser/cxx/name_resolver/CxxTemplateArgumentNameResolver.h" -#include "utility/logging/logging.h" -#include "utility/utilityString.h" +#include "CxxDeclNameResolver.h" +#include "CxxSpecifierNameResolver.h" +#include "CxxTemplateArgumentNameResolver.h" +#include "logging.h" +#include "utilityString.h" CxxTypeNameResolver::CxxTypeNameResolver(std::shared_ptr canonicalFilePathCache) : CxxNameResolver(canonicalFilePathCache, std::vector()) diff --git a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.h b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.h index 7fd10b37..b40b395e 100644 --- a/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.h +++ b/src/lib_cxx/data/parser/cxx/name_resolver/CxxTypeNameResolver.h @@ -1,8 +1,8 @@ #ifndef CXX_TYPE_NAME_RESOLVER_H #define CXX_TYPE_NAME_RESOLVER_H -#include "data/parser/cxx/name/CxxTypeName.h" -#include "data/parser/cxx/name_resolver/CxxNameResolver.h" +#include "CxxTypeName.h" +#include "CxxNameResolver.h" class CxxTypeNameResolver: public CxxNameResolver { diff --git a/src/lib_cxx/data/parser/cxx/utilityClang.cpp b/src/lib_cxx/data/parser/cxx/utilityClang.cpp index 0df39653..aadbb541 100644 --- a/src/lib_cxx/data/parser/cxx/utilityClang.cpp +++ b/src/lib_cxx/data/parser/cxx/utilityClang.cpp @@ -1,13 +1,13 @@ -#include "data/parser/cxx/utilityClang.h" +#include "utilityClang.h" #include #include #include -#include "data/parser/cxx/CanonicalFilePathCache.h" -#include "data/parser/ParseLocation.h" -#include "utility/file/FilePath.h" -#include "utility/utilityString.h" +#include "CanonicalFilePathCache.h" +#include "ParseLocation.h" +#include "FilePath.h" +#include "utilityString.h" bool utility::isImplicit(const clang::Decl* d) { diff --git a/src/lib_cxx/data/parser/cxx/utilityClang.h b/src/lib_cxx/data/parser/cxx/utilityClang.h index 1f3eb2e1..47315c57 100644 --- a/src/lib_cxx/data/parser/cxx/utilityClang.h +++ b/src/lib_cxx/data/parser/cxx/utilityClang.h @@ -3,8 +3,8 @@ #include -#include "data/parser/AccessKind.h" -#include "data/parser/SymbolKind.h" +#include "AccessKind.h" +#include "SymbolKind.h" struct ParseLocation; class CanonicalFilePathCache; diff --git a/src/lib_cxx/project/SourceGroupCxxCdb.cpp b/src/lib_cxx/project/SourceGroupCxxCdb.cpp index a6b966cb..748ec3e6 100644 --- a/src/lib_cxx/project/SourceGroupCxxCdb.cpp +++ b/src/lib_cxx/project/SourceGroupCxxCdb.cpp @@ -1,14 +1,14 @@ -#include "project/SourceGroupCxxCdb.h" +#include "SourceGroupCxxCdb.h" -#include "clang/Tooling/Tooling.h" -#include "clang/Tooling/JSONCompilationDatabase.h" -#include "data/indexer/CxxIndexerCommandProvider.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/ApplicationSettings.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/utility.h" -#include "utility/utilitySourceGroupCxx.h" +#include +#include +#include "CxxIndexerCommandProvider.h" +#include "IndexerCommandCxx.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "ApplicationSettings.h" +#include "MessageStatus.h" +#include "utility.h" +#include "utilitySourceGroupCxx.h" #include "Application.h" SourceGroupCxxCdb::SourceGroupCxxCdb(std::shared_ptr settings) diff --git a/src/lib_cxx/project/SourceGroupCxxCdb.h b/src/lib_cxx/project/SourceGroupCxxCdb.h index 644ee449..0f71854e 100644 --- a/src/lib_cxx/project/SourceGroupCxxCdb.h +++ b/src/lib_cxx/project/SourceGroupCxxCdb.h @@ -5,7 +5,7 @@ #include #include -#include "project/SourceGroup.h" +#include "SourceGroup.h" class SourceGroupSettingsCxxCdb; diff --git a/src/lib_cxx/project/SourceGroupCxxCodeblocks.cpp b/src/lib_cxx/project/SourceGroupCxxCodeblocks.cpp index 51305e28..e1dd5c67 100644 --- a/src/lib_cxx/project/SourceGroupCxxCodeblocks.cpp +++ b/src/lib_cxx/project/SourceGroupCxxCodeblocks.cpp @@ -1,13 +1,13 @@ -#include "project/SourceGroupCxxCodeblocks.h" +#include "SourceGroupCxxCodeblocks.h" -#include "data/indexer/CxxIndexerCommandProvider.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/codeblocks/CodeblocksProject.h" -#include "utility/utility.h" -#include "utility/utilitySourceGroupCxx.h" +#include "CxxIndexerCommandProvider.h" +#include "IndexerCommandCxx.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "MessageStatus.h" +#include "CodeblocksProject.h" +#include "utility.h" +#include "utilitySourceGroupCxx.h" #include "Application.h" SourceGroupCxxCodeblocks::SourceGroupCxxCodeblocks(std::shared_ptr settings) diff --git a/src/lib_cxx/project/SourceGroupCxxCodeblocks.h b/src/lib_cxx/project/SourceGroupCxxCodeblocks.h index 9293b404..3acafeed 100644 --- a/src/lib_cxx/project/SourceGroupCxxCodeblocks.h +++ b/src/lib_cxx/project/SourceGroupCxxCodeblocks.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroup.h" +#include "SourceGroup.h" class SourceGroupSettingsCxxCodeblocks; diff --git a/src/lib_cxx/project/SourceGroupCxxEmpty.cpp b/src/lib_cxx/project/SourceGroupCxxEmpty.cpp index 0870f994..0fd1c6c3 100644 --- a/src/lib_cxx/project/SourceGroupCxxEmpty.cpp +++ b/src/lib_cxx/project/SourceGroupCxxEmpty.cpp @@ -1,15 +1,15 @@ -#include "project/SourceGroupCxxEmpty.h" +#include "SourceGroupCxxEmpty.h" -#include "data/indexer/CxxIndexerCommandProvider.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCEmpty.h" -#include "settings/SourceGroupSettingsCppEmpty.h" -#include "settings/SourceGroupSettingsWithCppStandard.h" -#include "settings/SourceGroupSettingsWithCStandard.h" -#include "utility/file/FileManager.h" -#include "utility/utility.h" -#include "utility/utilitySourceGroupCxx.h" +#include "CxxIndexerCommandProvider.h" +#include "IndexerCommandCxx.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithCStandard.h" +#include "FileManager.h" +#include "utility.h" +#include "utilitySourceGroupCxx.h" SourceGroupCxxEmpty::SourceGroupCxxEmpty(std::shared_ptr settings) : m_settings(settings) diff --git a/src/lib_cxx/project/SourceGroupCxxEmpty.h b/src/lib_cxx/project/SourceGroupCxxEmpty.h index c5cf8236..af3a0bc0 100644 --- a/src/lib_cxx/project/SourceGroupCxxEmpty.h +++ b/src/lib_cxx/project/SourceGroupCxxEmpty.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroup.h" +#include "SourceGroup.h" class SourceGroupSettingsCxx; diff --git a/src/lib_cxx/project/SourceGroupCxxSonargraph.cpp b/src/lib_cxx/project/SourceGroupCxxSonargraph.cpp index 8d023ce7..d18a8047 100644 --- a/src/lib_cxx/project/SourceGroupCxxSonargraph.cpp +++ b/src/lib_cxx/project/SourceGroupCxxSonargraph.cpp @@ -1,13 +1,13 @@ -#include "project/SourceGroupCxxSonargraph.h" +#include "SourceGroupCxxSonargraph.h" -#include "data/indexer/CxxIndexerCommandProvider.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/sonargraph/SonargraphProject.h" -#include "utility/utility.h" -#include "utility/utilitySourceGroupCxx.h" +#include "CxxIndexerCommandProvider.h" +#include "IndexerCommandCxx.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "MessageStatus.h" +#include "SonargraphProject.h" +#include "utility.h" +#include "utilitySourceGroupCxx.h" #include "Application.h" SourceGroupCxxSonargraph::SourceGroupCxxSonargraph(std::shared_ptr settings) diff --git a/src/lib_cxx/project/SourceGroupCxxSonargraph.h b/src/lib_cxx/project/SourceGroupCxxSonargraph.h index e00804cd..99a12f47 100644 --- a/src/lib_cxx/project/SourceGroupCxxSonargraph.h +++ b/src/lib_cxx/project/SourceGroupCxxSonargraph.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroup.h" +#include "SourceGroup.h" class SourceGroupSettingsCxxSonargraph; diff --git a/src/lib_cxx/project/SourceGroupFactoryModuleCxx.cpp b/src/lib_cxx/project/SourceGroupFactoryModuleCxx.cpp index 7ca98cd4..d262d7ca 100644 --- a/src/lib_cxx/project/SourceGroupFactoryModuleCxx.cpp +++ b/src/lib_cxx/project/SourceGroupFactoryModuleCxx.cpp @@ -1,14 +1,14 @@ -#include "project/SourceGroupFactoryModuleCxx.h" +#include "SourceGroupFactoryModuleCxx.h" -#include "project/SourceGroupCxxCdb.h" -#include "project/SourceGroupCxxCodeblocks.h" -#include "project/SourceGroupCxxEmpty.h" -#include "project/SourceGroupCxxSonargraph.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "settings/SourceGroupSettingsCEmpty.h" -#include "settings/SourceGroupSettingsCppEmpty.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupCxxCdb.h" +#include "SourceGroupCxxCodeblocks.h" +#include "SourceGroupCxxEmpty.h" +#include "SourceGroupCxxSonargraph.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxSonargraph.h" bool SourceGroupFactoryModuleCxx::supports(SourceGroupType type) const { diff --git a/src/lib_cxx/project/SourceGroupFactoryModuleCxx.h b/src/lib_cxx/project/SourceGroupFactoryModuleCxx.h index 3e3671ae..89770cef 100644 --- a/src/lib_cxx/project/SourceGroupFactoryModuleCxx.h +++ b/src/lib_cxx/project/SourceGroupFactoryModuleCxx.h @@ -1,7 +1,7 @@ #ifndef SOURCE_GROUP_FACTORY_MODULE_CXX_H #define SOURCE_GROUP_FACTORY_MODULE_CXX_H -#include "project/SourceGroupFactoryModule.h" +#include "SourceGroupFactoryModule.h" class SourceGroupFactoryModuleCxx: public SourceGroupFactoryModule { diff --git a/src/lib_cxx/utility/CompilationDatabase.cpp b/src/lib_cxx/utility/CompilationDatabase.cpp index 432ac046..12741cd2 100644 --- a/src/lib_cxx/utility/CompilationDatabase.cpp +++ b/src/lib_cxx/utility/CompilationDatabase.cpp @@ -1,12 +1,12 @@ -#include "utility/CompilationDatabase.h" +#include "CompilationDatabase.h" #include -#include "clang/Tooling/JSONCompilationDatabase.h" -#include "clang/Tooling/CompilationDatabase.h" -#include "utility/file/FilePath.h" -#include "utility/utilityString.h" -#include "utility/utility.h" +#include +#include +#include "FilePath.h" +#include "utilityString.h" +#include "utility.h" utility::CompilationDatabase::CompilationDatabase(const FilePath& filePath) : m_filePath(filePath) diff --git a/src/lib_cxx/utility/CompilationDatabase.h b/src/lib_cxx/utility/CompilationDatabase.h index d47df461..50a9d0e0 100644 --- a/src/lib_cxx/utility/CompilationDatabase.h +++ b/src/lib_cxx/utility/CompilationDatabase.h @@ -4,7 +4,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" namespace utility { diff --git a/src/lib_cxx/utility/IncludeDirective.cpp b/src/lib_cxx/utility/IncludeDirective.cpp index 442d4f4e..751671ed 100644 --- a/src/lib_cxx/utility/IncludeDirective.cpp +++ b/src/lib_cxx/utility/IncludeDirective.cpp @@ -1,4 +1,4 @@ -#include "utility/IncludeDirective.h" +#include "IncludeDirective.h" IncludeDirective::IncludeDirective( const FilePath& includedFilePath, diff --git a/src/lib_cxx/utility/IncludeDirective.h b/src/lib_cxx/utility/IncludeDirective.h index 1435bf1e..f956c39f 100644 --- a/src/lib_cxx/utility/IncludeDirective.h +++ b/src/lib_cxx/utility/IncludeDirective.h @@ -1,7 +1,7 @@ #ifndef INCLUDE_DIRECTIVE_H #define INCLUDE_DIRECTIVE_H -#include "utility/file/FilePath.h" +#include "FilePath.h" class IncludeDirective { diff --git a/src/lib_cxx/utility/IncludeProcessing.cpp b/src/lib_cxx/utility/IncludeProcessing.cpp index 4f39a54e..f3486a18 100644 --- a/src/lib_cxx/utility/IncludeProcessing.cpp +++ b/src/lib_cxx/utility/IncludeProcessing.cpp @@ -1,16 +1,16 @@ -#include "utility/IncludeProcessing.h" +#include "IncludeProcessing.h" #include #include -#include "settings/ApplicationSettings.h" -#include "utility/IncludeDirective.h" -#include "utility/file/FilePath.h" -#include "utility/file/FileTree.h" -#include "utility/text/TextAccess.h" -#include "utility/TextCodec.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "ApplicationSettings.h" +#include "IncludeDirective.h" +#include "FilePath.h" +#include "FileTree.h" +#include "TextAccess.h" +#include "TextCodec.h" +#include "utility.h" +#include "utilityString.h" namespace { diff --git a/src/lib_cxx/utility/IncludeProcessing.h b/src/lib_cxx/utility/IncludeProcessing.h index 52906658..6f166a96 100644 --- a/src/lib_cxx/utility/IncludeProcessing.h +++ b/src/lib_cxx/utility/IncludeProcessing.h @@ -6,7 +6,7 @@ #include #include -#include "utility/OrderedCache.h" +#include "OrderedCache.h" class FilePath; class IncludeDirective; diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.cpp b/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.cpp index d80b8ded..49bea6e6 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.cpp +++ b/src/lib_cxx/utility/codeblocks/CodeblocksCompiler.cpp @@ -1,8 +1,8 @@ -#include "utility/codeblocks/CodeblocksCompiler.h" +#include "CodeblocksCompiler.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/utilityString.h" +#include "utilityString.h" namespace Codeblocks { diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksCompilerVarType.cpp b/src/lib_cxx/utility/codeblocks/CodeblocksCompilerVarType.cpp index 9ec30a08..4bb54410 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksCompilerVarType.cpp +++ b/src/lib_cxx/utility/codeblocks/CodeblocksCompilerVarType.cpp @@ -1,4 +1,4 @@ -#include "utility/codeblocks/CodeblocksCompilerVarType.h" +#include "CodeblocksCompilerVarType.h" namespace Codeblocks { diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksProject.cpp b/src/lib_cxx/utility/codeblocks/CodeblocksProject.cpp index f42b7797..7f9594ae 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksProject.cpp +++ b/src/lib_cxx/utility/codeblocks/CodeblocksProject.cpp @@ -1,18 +1,18 @@ -#include "utility/codeblocks/CodeblocksProject.h" +#include "CodeblocksProject.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "utility/codeblocks/CodeblocksCompiler.h" -#include "utility/codeblocks/CodeblocksTarget.h" -#include "utility/codeblocks/CodeblocksUnit.h" -#include "utility/logging/logging.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityString.h" -#include "utility/OrderedCache.h" +#include "IndexerCommandCxx.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "CodeblocksCompiler.h" +#include "CodeblocksTarget.h" +#include "CodeblocksUnit.h" +#include "logging.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityString.h" +#include "OrderedCache.h" namespace Codeblocks { diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksTarget.cpp b/src/lib_cxx/utility/codeblocks/CodeblocksTarget.cpp index 00b0406a..0074d1a2 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksTarget.cpp +++ b/src/lib_cxx/utility/codeblocks/CodeblocksTarget.cpp @@ -1,9 +1,9 @@ -#include "utility/codeblocks/CodeblocksTarget.h" +#include "CodeblocksTarget.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/codeblocks/CodeblocksCompiler.h" -#include "utility/utilityString.h" +#include "CodeblocksCompiler.h" +#include "utilityString.h" namespace Codeblocks { diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksTarget.h b/src/lib_cxx/utility/codeblocks/CodeblocksTarget.h index 26ff859f..a1b7a94e 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksTarget.h +++ b/src/lib_cxx/utility/codeblocks/CodeblocksTarget.h @@ -5,7 +5,7 @@ #include #include -#include "utility/codeblocks/CodeblocksTargetRelationType.h" +#include "CodeblocksTargetRelationType.h" class TiXmlElement; diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksTargetRelationType.cpp b/src/lib_cxx/utility/codeblocks/CodeblocksTargetRelationType.cpp index 6fc100f3..d298d46f 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksTargetRelationType.cpp +++ b/src/lib_cxx/utility/codeblocks/CodeblocksTargetRelationType.cpp @@ -1,4 +1,4 @@ -#include "utility/codeblocks/CodeblocksTargetRelationType.h" +#include "CodeblocksTargetRelationType.h" namespace Codeblocks { diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksUnit.cpp b/src/lib_cxx/utility/codeblocks/CodeblocksUnit.cpp index 2bfc537c..7629be22 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksUnit.cpp +++ b/src/lib_cxx/utility/codeblocks/CodeblocksUnit.cpp @@ -1,8 +1,8 @@ -#include "utility/codeblocks/CodeblocksUnit.h" +#include "CodeblocksUnit.h" -#include "tinyxml/tinyxml.h" +#include "tinyxml.h" -#include "utility/utilityString.h" +#include "utilityString.h" namespace Codeblocks { diff --git a/src/lib_cxx/utility/codeblocks/CodeblocksUnit.h b/src/lib_cxx/utility/codeblocks/CodeblocksUnit.h index 2d7d08ee..69ac2892 100644 --- a/src/lib_cxx/utility/codeblocks/CodeblocksUnit.h +++ b/src/lib_cxx/utility/codeblocks/CodeblocksUnit.h @@ -4,7 +4,7 @@ #include #include -#include "utility/codeblocks/CodeblocksCompilerVarType.h" +#include "CodeblocksCompilerVarType.h" class TiXmlElement; diff --git a/src/lib_cxx/utility/utilitySourceGroupCxx.cpp b/src/lib_cxx/utility/utilitySourceGroupCxx.cpp index f2a35631..a34cb6b0 100644 --- a/src/lib_cxx/utility/utilitySourceGroupCxx.cpp +++ b/src/lib_cxx/utility/utilitySourceGroupCxx.cpp @@ -1,4 +1,4 @@ -#include "utility/utilitySourceGroupCxx.h" +#include "utilitySourceGroupCxx.h" std::set utility::filterToContainedFilePaths( const std::set& filePaths, diff --git a/src/lib_cxx/utility/utilitySourceGroupCxx.h b/src/lib_cxx/utility/utilitySourceGroupCxx.h index 103b57cd..be48d24d 100644 --- a/src/lib_cxx/utility/utilitySourceGroupCxx.h +++ b/src/lib_cxx/utility/utilitySourceGroupCxx.h @@ -4,8 +4,8 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/file/FilePathFilter.h" +#include "FilePath.h" +#include "FilePathFilter.h" namespace utility { diff --git a/src/lib_gui/CMakeLists.txt b/src/lib_gui/CMakeLists.txt index f8307fda..d5ee7d39 100644 --- a/src/lib_gui/CMakeLists.txt +++ b/src/lib_gui/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - LIB_GUI_FILES + LIB_GUI platform_includes/includesLinux.h platform_includes/includesMac.h diff --git a/src/lib_gui/platform_includes/includes.h.in b/src/lib_gui/platform_includes/includes.h.in index 288e6a6a..ae802b4a 100644 --- a/src/lib_gui/platform_includes/includes.h.in +++ b/src/lib_gui/platform_includes/includes.h.in @@ -5,6 +5,6 @@ void setupPlatform(int argc, char *argv[]); void setupApp(int argc, char *argv[]); // platform specific include -#include "platform_includes/@PLATFORM_INCLUDE@" +#include "@PLATFORM_INCLUDE@" #endif // INCLUDES_H diff --git a/src/lib_gui/platform_includes/includesLinux.h b/src/lib_gui/platform_includes/includesLinux.h index faf3fc4c..0e66b6b0 100644 --- a/src/lib_gui/platform_includes/includesLinux.h +++ b/src/lib_gui/platform_includes/includesLinux.h @@ -4,14 +4,14 @@ #include #include -#include "qt/utility/utilityQt.h" -#include "utility/AppPath.h" -#include "utility/file/FilePath.h" -#include "utility/file/FileSystem.h" -#include "utility/ResourcePaths.h" -#include "utility/UserPaths.h" +#include "utilityQt.h" +#include "AppPath.h" +#include "FilePath.h" +#include "FileSystem.h" +#include "ResourcePaths.h" +#include "UserPaths.h" -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" void setupPlatform(int argc, char *argv[]) { diff --git a/src/lib_gui/platform_includes/includesMac.h b/src/lib_gui/platform_includes/includesMac.h index 52e232c2..43ed425d 100644 --- a/src/lib_gui/platform_includes/includesMac.h +++ b/src/lib_gui/platform_includes/includesMac.h @@ -6,11 +6,11 @@ #include #include -#include "qt/utility/utilityQt.h" -#include "utility/AppPath.h" -#include "utility/file/FilePath.h" -#include "utility/ResourcePaths.h" -#include "utility/UserPaths.h" +#include "utilityQt.h" +#include "AppPath.h" +#include "FilePath.h" +#include "ResourcePaths.h" +#include "UserPaths.h" void setupPlatform(int argc, char *argv[]) diff --git a/src/lib_gui/platform_includes/includesWindows.h b/src/lib_gui/platform_includes/includesWindows.h index be23f0e4..849be7e5 100644 --- a/src/lib_gui/platform_includes/includesWindows.h +++ b/src/lib_gui/platform_includes/includesWindows.h @@ -7,11 +7,11 @@ #include "vld.h" -#include "utility/file/FileSystem.h" -#include "utility/AppPath.h" -#include "utility/ResourcePaths.h" -#include "utility/UserPaths.h" -#include "utility/utility.h" +#include "FileSystem.h" +#include "AppPath.h" +#include "ResourcePaths.h" +#include "UserPaths.h" +#include "utility.h" void setupPlatform(int argc, char *argv[]) { diff --git a/src/lib_gui/qt/QtApplication.cpp b/src/lib_gui/qt/QtApplication.cpp index eb7397e2..1e1c7318 100644 --- a/src/lib_gui/qt/QtApplication.cpp +++ b/src/lib_gui/qt/QtApplication.cpp @@ -1,12 +1,12 @@ -#include "qt/QtApplication.h" +#include "QtApplication.h" #include -#include "utility/file/FilePath.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/messaging/type/MessageWindowFocus.h" -#include "utility/logging/LogManager.h" -#include "utility/utilityApp.h" +#include "FilePath.h" +#include "MessageLoadProject.h" +#include "MessageWindowFocus.h" +#include "LogManager.h" +#include "utilityApp.h" QtApplication::QtApplication(int& argc, char** argv) : QApplication(argc, argv) diff --git a/src/lib_gui/qt/QtCoreApplication.cpp b/src/lib_gui/qt/QtCoreApplication.cpp index c390a82e..978312c8 100644 --- a/src/lib_gui/qt/QtCoreApplication.cpp +++ b/src/lib_gui/qt/QtCoreApplication.cpp @@ -1,4 +1,4 @@ -#include "qt/QtCoreApplication.h" +#include "QtCoreApplication.h" #include diff --git a/src/lib_gui/qt/QtCoreApplication.h b/src/lib_gui/qt/QtCoreApplication.h index 05860b5a..44c632e1 100644 --- a/src/lib_gui/qt/QtCoreApplication.h +++ b/src/lib_gui/qt/QtCoreApplication.h @@ -3,9 +3,9 @@ #include -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageQuitApplication.h" -#include "utility/messaging/type/MessageStatus.h" +#include "MessageListener.h" +#include "MessageQuitApplication.h" +#include "MessageStatus.h" class QtCoreApplication : public QCoreApplication diff --git a/src/lib_gui/qt/element/QtAutocompletionList.cpp b/src/lib_gui/qt/element/QtAutocompletionList.cpp index 63fca356..746019ae 100644 --- a/src/lib_gui/qt/element/QtAutocompletionList.cpp +++ b/src/lib_gui/qt/element/QtAutocompletionList.cpp @@ -1,14 +1,14 @@ -#include "qt/element/QtAutocompletionList.h" +#include "QtAutocompletionList.h" #include #include -#include "component/view/GraphViewStyle.h" -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "settings/ApplicationSettings.h" -#include "settings/ColorScheme.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "GraphViewStyle.h" +#include "QtDeviceScaledPixmap.h" +#include "ApplicationSettings.h" +#include "ColorScheme.h" +#include "ResourcePaths.h" +#include "utilityString.h" QtAutocompletionModel::QtAutocompletionModel(QObject* parent) : QAbstractTableModel(parent) diff --git a/src/lib_gui/qt/element/QtAutocompletionList.h b/src/lib_gui/qt/element/QtAutocompletionList.h index e8bd34ea..087afe59 100644 --- a/src/lib_gui/qt/element/QtAutocompletionList.h +++ b/src/lib_gui/qt/element/QtAutocompletionList.h @@ -9,8 +9,8 @@ #include #include -#include "data/search/SearchMatch.h" -#include "qt/utility/QtDeviceScaledPixmap.h" +#include "SearchMatch.h" +#include "QtDeviceScaledPixmap.h" class QtAutocompletionModel : public QAbstractTableModel diff --git a/src/lib_gui/qt/element/QtBookmark.cpp b/src/lib_gui/qt/element/QtBookmark.cpp index 0d699bae..76a2625b 100644 --- a/src/lib_gui/qt/element/QtBookmark.cpp +++ b/src/lib_gui/qt/element/QtBookmark.cpp @@ -6,8 +6,8 @@ #include #include -#include "qt/utility/utilityQt.h" -#include "utility/ResourcePaths.h" +#include "utilityQt.h" +#include "ResourcePaths.h" QtBookmark::QtBookmark(ControllerProxy* controllerProxy) : m_controllerProxy(controllerProxy) diff --git a/src/lib_gui/qt/element/QtBookmark.h b/src/lib_gui/qt/element/QtBookmark.h index d6bb5124..76969dd6 100644 --- a/src/lib_gui/qt/element/QtBookmark.h +++ b/src/lib_gui/qt/element/QtBookmark.h @@ -6,9 +6,9 @@ #include #include -#include "component/controller/BookmarkController.h" -#include "component/controller/helper/ControllerProxy.h" -#include "data/bookmark/Bookmark.h" +#include "BookmarkController.h" +#include "ControllerProxy.h" +#include "Bookmark.h" class Bookmark; diff --git a/src/lib_gui/qt/element/QtBookmarkCategory.cpp b/src/lib_gui/qt/element/QtBookmarkCategory.cpp index d98d05a8..3a2ab99e 100644 --- a/src/lib_gui/qt/element/QtBookmarkCategory.cpp +++ b/src/lib_gui/qt/element/QtBookmarkCategory.cpp @@ -6,8 +6,8 @@ #include #include -#include "qt/utility/utilityQt.h" -#include "utility/ResourcePaths.h" +#include "utilityQt.h" +#include "ResourcePaths.h" QtBookmarkCategory::QtBookmarkCategory(ControllerProxy* controllerProxy) : m_controllerProxy(controllerProxy) diff --git a/src/lib_gui/qt/element/QtBookmarkCategory.h b/src/lib_gui/qt/element/QtBookmarkCategory.h index 6d04f774..dc6cd0d5 100644 --- a/src/lib_gui/qt/element/QtBookmarkCategory.h +++ b/src/lib_gui/qt/element/QtBookmarkCategory.h @@ -3,9 +3,9 @@ #include -#include "component/controller/BookmarkController.h" -#include "component/controller/helper/ControllerProxy.h" -#include "utility/types.h" +#include "BookmarkController.h" +#include "ControllerProxy.h" +#include "types.h" class QLabel; class QPushButton; diff --git a/src/lib_gui/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp index a818d4f7..a238fa17 100644 --- a/src/lib_gui/qt/element/QtCodeArea.cpp +++ b/src/lib_gui/qt/element/QtCodeArea.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtCodeArea.h" +#include "QtCodeArea.h" #include @@ -13,20 +13,20 @@ #include #include -#include "data/location/SourceLocationFile.h" -#include "qt/element/QtCodeNavigator.h" -#include "qt/utility/QtContextMenu.h" -#include "settings/ApplicationSettings.h" -#include "settings/ColorScheme.h" -#include "utility/messaging/type/error/MessageShowError.h" -#include "utility/messaging/type/MessageActivateLocalSymbols.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageMoveIDECursor.h" -#include "utility/TextCodec.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" +#include "SourceLocationFile.h" +#include "QtCodeNavigator.h" +#include "QtContextMenu.h" +#include "ApplicationSettings.h" +#include "ColorScheme.h" +#include "MessageShowError.h" +#include "MessageActivateLocalSymbols.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageMoveIDECursor.h" +#include "TextCodec.h" +#include "utility.h" +#include "utilityApp.h" +#include "utilityString.h" MouseWheelOverScrollbarFilter::MouseWheelOverScrollbarFilter() { diff --git a/src/lib_gui/qt/element/QtCodeArea.h b/src/lib_gui/qt/element/QtCodeArea.h index bdab092e..2eef6ffa 100644 --- a/src/lib_gui/qt/element/QtCodeArea.h +++ b/src/lib_gui/qt/element/QtCodeArea.h @@ -4,8 +4,8 @@ #include #include -#include "qt/element/QtCodeField.h" -#include "qt/utility/QtScrollSpeedChangeListener.h" +#include "QtCodeField.h" +#include "QtScrollSpeedChangeListener.h" class QDragMoveEvent; class QPaintEvent; diff --git a/src/lib_gui/qt/element/QtCodeField.cpp b/src/lib_gui/qt/element/QtCodeField.cpp index 55224124..e5ad77ed 100644 --- a/src/lib_gui/qt/element/QtCodeField.cpp +++ b/src/lib_gui/qt/element/QtCodeField.cpp @@ -4,18 +4,18 @@ #include #include -#include "data/location/SourceLocation.h" -#include "data/location/SourceLocationFile.h" -#include "qt/utility/QtHighlighter.h" -#include "settings/ApplicationSettings.h" -#include "settings/ColorScheme.h" -#include "utility/messaging/type/MessageActivateLocalSymbols.h" -#include "utility/messaging/type/MessageActivateSourceLocations.h" -#include "utility/messaging/type/MessageActivateTokenIds.h" -#include "utility/messaging/type/MessageTooltipShow.h" -#include "utility/TextCodec.h" -#include "utility/tracing.h" -#include "utility/utility.h" +#include "SourceLocation.h" +#include "SourceLocationFile.h" +#include "QtHighlighter.h" +#include "ApplicationSettings.h" +#include "ColorScheme.h" +#include "MessageActivateLocalSymbols.h" +#include "MessageActivateSourceLocations.h" +#include "MessageActivateTokenIds.h" +#include "MessageTooltipShow.h" +#include "TextCodec.h" +#include "tracing.h" +#include "utility.h" std::vector QtCodeField::s_annotationColors; diff --git a/src/lib_gui/qt/element/QtCodeField.h b/src/lib_gui/qt/element/QtCodeField.h index c2663fb0..4e8ae553 100644 --- a/src/lib_gui/qt/element/QtCodeField.h +++ b/src/lib_gui/qt/element/QtCodeField.h @@ -6,8 +6,8 @@ #include -#include "data/location/LocationType.h" -#include "utility/types.h" +#include "LocationType.h" +#include "types.h" class QtHighlighter; class SourceLocation; diff --git a/src/lib_gui/qt/element/QtCodeFile.cpp b/src/lib_gui/qt/element/QtCodeFile.cpp index f7e75b5f..eb0cdc7b 100644 --- a/src/lib_gui/qt/element/QtCodeFile.cpp +++ b/src/lib_gui/qt/element/QtCodeFile.cpp @@ -1,13 +1,13 @@ -#include "qt/element/QtCodeFile.h" +#include "QtCodeFile.h" #include -#include "utility/messaging/type/MessageChangeFileView.h" +#include "MessageChangeFileView.h" -#include "data/location/SourceLocationFile.h" -#include "qt/element/QtCodeFileTitleBar.h" -#include "qt/element/QtCodeNavigator.h" -#include "qt/element/QtCodeSnippet.h" +#include "SourceLocationFile.h" +#include "QtCodeFileTitleBar.h" +#include "QtCodeNavigator.h" +#include "QtCodeSnippet.h" QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeNavigator* navigator) : QFrame() diff --git a/src/lib_gui/qt/element/QtCodeFile.h b/src/lib_gui/qt/element/QtCodeFile.h index 7bff554d..8211d4d3 100644 --- a/src/lib_gui/qt/element/QtCodeFile.h +++ b/src/lib_gui/qt/element/QtCodeFile.h @@ -8,9 +8,9 @@ #include -#include "utility/file/FilePath.h" +#include "FilePath.h" -#include "component/view/helper/CodeSnippetParams.h" +#include "CodeSnippetParams.h" class QtCodeArea; class QtCodeFileTitleBar; diff --git a/src/lib_gui/qt/element/QtCodeFileList.cpp b/src/lib_gui/qt/element/QtCodeFileList.cpp index fab3191f..2d0e2de1 100644 --- a/src/lib_gui/qt/element/QtCodeFileList.cpp +++ b/src/lib_gui/qt/element/QtCodeFileList.cpp @@ -1,21 +1,21 @@ -#include "qt/element/QtCodeFileList.h" +#include "QtCodeFileList.h" #include #include #include -#include "utility/file/FilePath.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityApp.h" -#include "utility/utility.h" +#include "FilePath.h" +#include "ResourcePaths.h" +#include "utilityApp.h" +#include "utility.h" -#include "data/location/SourceLocationFile.h" -#include "qt/element/QtCodeFile.h" -#include "qt/element/QtCodeFileTitleBar.h" -#include "qt/element/QtCodeNavigator.h" -#include "qt/element/QtCodeSnippet.h" -#include "qt/utility/utilityQt.h" -#include "settings/ColorScheme.h" +#include "SourceLocationFile.h" +#include "QtCodeFile.h" +#include "QtCodeFileTitleBar.h" +#include "QtCodeNavigator.h" +#include "QtCodeSnippet.h" +#include "utilityQt.h" +#include "ColorScheme.h" QtCodeFileList::QtCodeFileList(QtCodeNavigator* navigator) : QFrame() diff --git a/src/lib_gui/qt/element/QtCodeFileList.h b/src/lib_gui/qt/element/QtCodeFileList.h index 432d8b92..8922659e 100644 --- a/src/lib_gui/qt/element/QtCodeFileList.h +++ b/src/lib_gui/qt/element/QtCodeFileList.h @@ -6,9 +6,9 @@ #include #include -#include "component/view/helper/CodeSnippetParams.h" -#include "qt/element/QtCodeNavigateable.h" -#include "qt/utility/QtScrollSpeedChangeListener.h" +#include "CodeSnippetParams.h" +#include "QtCodeNavigateable.h" +#include "QtScrollSpeedChangeListener.h" class QtCodeFile; class QtCodeFileTitleBar; diff --git a/src/lib_gui/qt/element/QtCodeFileSingle.cpp b/src/lib_gui/qt/element/QtCodeFileSingle.cpp index 1ecd17fd..6ac4f6e1 100644 --- a/src/lib_gui/qt/element/QtCodeFileSingle.cpp +++ b/src/lib_gui/qt/element/QtCodeFileSingle.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtCodeFileSingle.h" +#include "QtCodeFileSingle.h" #include #include @@ -6,16 +6,16 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageChangeFileView.h" +#include "FilePath.h" +#include "logging.h" +#include "MessageChangeFileView.h" -#include "data/location/SourceLocationFile.h" -#include "qt/element/QtCodeArea.h" -#include "qt/element/QtCodeFileTitleBar.h" -#include "qt/element/QtCodeFileTitleButton.h" -#include "qt/element/QtCodeNavigator.h" -#include "qt/utility/utilityQt.h" +#include "SourceLocationFile.h" +#include "QtCodeArea.h" +#include "QtCodeFileTitleBar.h" +#include "QtCodeFileTitleButton.h" +#include "QtCodeNavigator.h" +#include "utilityQt.h" QtCodeFileSingle::QtCodeFileSingle(QtCodeNavigator* navigator, QWidget* parent) : m_navigator(navigator) diff --git a/src/lib_gui/qt/element/QtCodeFileSingle.h b/src/lib_gui/qt/element/QtCodeFileSingle.h index 80986ee4..9a8018f5 100644 --- a/src/lib_gui/qt/element/QtCodeFileSingle.h +++ b/src/lib_gui/qt/element/QtCodeFileSingle.h @@ -6,10 +6,10 @@ #include -#include "utility/file/FilePath.h" -#include "utility/TimeStamp.h" +#include "FilePath.h" +#include "TimeStamp.h" -#include "qt/element/QtCodeNavigateable.h" +#include "QtCodeNavigateable.h" class QLabel; class QPushButton; diff --git a/src/lib_gui/qt/element/QtCodeFileTitleBar.cpp b/src/lib_gui/qt/element/QtCodeFileTitleBar.cpp index de698f23..5a95e01e 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleBar.cpp +++ b/src/lib_gui/qt/element/QtCodeFileTitleBar.cpp @@ -1,11 +1,11 @@ -#include "qt/element/QtCodeFileTitleBar.h" +#include "QtCodeFileTitleBar.h" #include #include #include -#include "utility/ResourcePaths.h" -#include "utility/messaging/type/error/MessageErrorsForFile.h" +#include "ResourcePaths.h" +#include "MessageErrorsForFile.h" QtCodeFileTitleBar::QtCodeFileTitleBar(QWidget* parent, bool isHovering, bool isSingle) : QtHoverButton(parent) diff --git a/src/lib_gui/qt/element/QtCodeFileTitleBar.h b/src/lib_gui/qt/element/QtCodeFileTitleBar.h index ecdb8ed1..b1a7d31a 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleBar.h +++ b/src/lib_gui/qt/element/QtCodeFileTitleBar.h @@ -1,8 +1,8 @@ #ifndef QT_CODE_FILE_TITLE_BAR_H #define QT_CODE_FILE_TITLE_BAR_H -#include "qt/element/QtCodeFileTitleButton.h" -#include "qt/element/QtIconButton.h" +#include "QtCodeFileTitleButton.h" +#include "QtIconButton.h" class QLabel; class QtCodeFileTitleButton; diff --git a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp index baa3f5de..526f51e5 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp +++ b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp @@ -1,15 +1,15 @@ -#include "qt/element/QtCodeFileTitleButton.h" +#include "QtCodeFileTitleButton.h" -#include "utility/file/FileSystem.h" -#include "utility/messaging/type/MessageActivateFile.h" -#include "utility/messaging/type/MessageProjectEdit.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "FileSystem.h" +#include "MessageActivateFile.h" +#include "MessageProjectEdit.h" +#include "ResourcePaths.h" +#include "utilityString.h" #include "Application.h" -#include "project/Project.h" -#include "qt/utility/QtContextMenu.h" -#include "settings/ColorScheme.h" +#include "Project.h" +#include "QtContextMenu.h" +#include "ColorScheme.h" QtCodeFileTitleButton::QtCodeFileTitleButton(QWidget* parent) : QtSelfRefreshIconButton("", FilePath(), "code/file/title", parent) diff --git a/src/lib_gui/qt/element/QtCodeFileTitleButton.h b/src/lib_gui/qt/element/QtCodeFileTitleButton.h index cbe63c3b..a4c60a73 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleButton.h +++ b/src/lib_gui/qt/element/QtCodeFileTitleButton.h @@ -1,10 +1,10 @@ #ifndef QT_CODE_FILE_TITLE_BUTTON_H #define QT_CODE_FILE_TITLE_BUTTON_H -#include "utility/file/FilePath.h" -#include "utility/TimeStamp.h" +#include "FilePath.h" +#include "TimeStamp.h" -#include "qt/element/QtIconButton.h" +#include "QtIconButton.h" class QtCodeFileTitleButton : public QtSelfRefreshIconButton diff --git a/src/lib_gui/qt/element/QtCodeNavigateable.cpp b/src/lib_gui/qt/element/QtCodeNavigateable.cpp index e43abd4a..a244b962 100644 --- a/src/lib_gui/qt/element/QtCodeNavigateable.cpp +++ b/src/lib_gui/qt/element/QtCodeNavigateable.cpp @@ -1,10 +1,10 @@ -#include "qt/element/QtCodeNavigateable.h" +#include "QtCodeNavigateable.h" #include #include #include -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" QtCodeNavigateable::~QtCodeNavigateable() { diff --git a/src/lib_gui/qt/element/QtCodeNavigateable.h b/src/lib_gui/qt/element/QtCodeNavigateable.h index 229d367c..d3b8beef 100644 --- a/src/lib_gui/qt/element/QtCodeNavigateable.h +++ b/src/lib_gui/qt/element/QtCodeNavigateable.h @@ -3,9 +3,9 @@ #include -#include "utility/types.h" +#include "types.h" -#include "component/view/helper/CodeSnippetParams.h" +#include "CodeSnippetParams.h" class FilePath; class QRectF; diff --git a/src/lib_gui/qt/element/QtCodeNavigator.cpp b/src/lib_gui/qt/element/QtCodeNavigator.cpp index 5601d887..7a037662 100644 --- a/src/lib_gui/qt/element/QtCodeNavigator.cpp +++ b/src/lib_gui/qt/element/QtCodeNavigator.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtCodeNavigator.h" +#include "QtCodeNavigator.h" #include #include @@ -6,21 +6,21 @@ #include #include -#include "utility/logging/logging.h" -#include "utility/messaging/type/error/MessageShowError.h" -#include "utility/messaging/type/MessageScrollCode.h" -#include "utility/ResourcePaths.h" -#include "utility/utility.h" +#include "logging.h" +#include "MessageShowError.h" +#include "MessageScrollCode.h" +#include "ResourcePaths.h" +#include "utility.h" -#include "data/location/SourceLocation.h" -#include "data/location/SourceLocationCollection.h" -#include "data/location/SourceLocationFile.h" -#include "qt/element/QtCodeArea.h" -#include "qt/element/QtCodeFile.h" -#include "qt/element/QtCodeSnippet.h" -#include "qt/element/QtSearchBarButton.h" -#include "qt/utility/utilityQt.h" -#include "settings/ApplicationSettings.h" +#include "SourceLocation.h" +#include "SourceLocationCollection.h" +#include "SourceLocationFile.h" +#include "QtCodeArea.h" +#include "QtCodeFile.h" +#include "QtCodeSnippet.h" +#include "QtSearchBarButton.h" +#include "utilityQt.h" +#include "ApplicationSettings.h" QtCodeNavigator::QtCodeNavigator(QWidget* parent) : QWidget(parent) diff --git a/src/lib_gui/qt/element/QtCodeNavigator.h b/src/lib_gui/qt/element/QtCodeNavigator.h index e6686e9e..a2338834 100644 --- a/src/lib_gui/qt/element/QtCodeNavigator.h +++ b/src/lib_gui/qt/element/QtCodeNavigator.h @@ -3,17 +3,17 @@ #include -#include "data/ErrorInfo.h" -#include "data/location/LocationType.h" -#include "qt/element/QtCodeFileList.h" -#include "qt/element/QtCodeFileSingle.h" -#include "qt/utility/QtThreadedFunctor.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/indexing/MessageIndexingFinished.h" -#include "utility/messaging/type/MessageCodeReference.h" -#include "utility/messaging/type/MessageShowReference.h" -#include "utility/messaging/type/MessageSwitchColorScheme.h" -#include "utility/messaging/type/MessageWindowFocus.h" +#include "ErrorInfo.h" +#include "LocationType.h" +#include "QtCodeFileList.h" +#include "QtCodeFileSingle.h" +#include "QtThreadedFunctor.h" +#include "MessageListener.h" +#include "MessageIndexingFinished.h" +#include "MessageCodeReference.h" +#include "MessageShowReference.h" +#include "MessageSwitchColorScheme.h" +#include "MessageWindowFocus.h" class QLabel; class QPushButton; diff --git a/src/lib_gui/qt/element/QtCodeSnippet.cpp b/src/lib_gui/qt/element/QtCodeSnippet.cpp index 5c9cd2b4..4f5c7b1d 100644 --- a/src/lib_gui/qt/element/QtCodeSnippet.cpp +++ b/src/lib_gui/qt/element/QtCodeSnippet.cpp @@ -1,14 +1,14 @@ -#include "qt/element/QtCodeSnippet.h" +#include "QtCodeSnippet.h" #include #include #include -#include "utility/messaging/type/MessageShowScope.h" +#include "MessageShowScope.h" -#include "data/location/SourceLocationFile.h" -#include "qt/element/QtCodeNavigator.h" -#include "qt/element/QtCodeFile.h" +#include "SourceLocationFile.h" +#include "QtCodeNavigator.h" +#include "QtCodeFile.h" QtCodeSnippet* QtCodeSnippet::merged( QtCodeSnippet* a, QtCodeSnippet* b, QtCodeNavigator* navigator, QtCodeFile* file) diff --git a/src/lib_gui/qt/element/QtCodeSnippet.h b/src/lib_gui/qt/element/QtCodeSnippet.h index d16c5e6f..13233fd2 100644 --- a/src/lib_gui/qt/element/QtCodeSnippet.h +++ b/src/lib_gui/qt/element/QtCodeSnippet.h @@ -5,11 +5,11 @@ #include -#include "utility/types.h" +#include "types.h" -#include "qt/element/QtCodeArea.h" +#include "QtCodeArea.h" -#include "component/view/helper/CodeSnippetParams.h" +#include "CodeSnippetParams.h" class QBoxLayout; class QPushButton; diff --git a/src/lib_gui/qt/element/QtHelpButton.cpp b/src/lib_gui/qt/element/QtHelpButton.cpp index 0e4b6395..874bcab0 100644 --- a/src/lib_gui/qt/element/QtHelpButton.cpp +++ b/src/lib_gui/qt/element/QtHelpButton.cpp @@ -1,8 +1,8 @@ -#include "qt/element/QtHelpButton.h" +#include "QtHelpButton.h" #include -#include "utility/ResourcePaths.h" +#include "ResourcePaths.h" QtHelpButton::QtHelpButton(const QString& helpTitle, const QString& helpText, QWidget* parent) : QtIconButton( diff --git a/src/lib_gui/qt/element/QtHelpButton.h b/src/lib_gui/qt/element/QtHelpButton.h index 2620d162..e971dc9f 100644 --- a/src/lib_gui/qt/element/QtHelpButton.h +++ b/src/lib_gui/qt/element/QtHelpButton.h @@ -1,7 +1,7 @@ #ifndef QT_HELP_BUTTON_H #define QT_HELP_BUTTON_H -#include "qt/element/QtIconButton.h" +#include "QtIconButton.h" class QtHelpButton : public QtIconButton diff --git a/src/lib_gui/qt/element/QtHistoryList.cpp b/src/lib_gui/qt/element/QtHistoryList.cpp index c647a0c5..18d75ead 100644 --- a/src/lib_gui/qt/element/QtHistoryList.cpp +++ b/src/lib_gui/qt/element/QtHistoryList.cpp @@ -4,16 +4,16 @@ #include #include -#include "utility/messaging/type/history/MessageHistoryToPosition.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "MessageHistoryToPosition.h" +#include "ResourcePaths.h" +#include "utilityString.h" -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "qt/utility/utilityQt.h" +#include "QtDeviceScaledPixmap.h" +#include "utilityQt.h" -#include "component/view/GraphViewStyle.h" -#include "data/search/SearchMatch.h" -#include "settings/ColorScheme.h" +#include "GraphViewStyle.h" +#include "SearchMatch.h" +#include "ColorScheme.h" QtHistoryItem::QtHistoryItem(const SearchMatch& match, size_t index, bool isCurrent) : index(index) diff --git a/src/lib_gui/qt/element/QtIconButton.cpp b/src/lib_gui/qt/element/QtIconButton.cpp index afd82bf7..aacb382c 100644 --- a/src/lib_gui/qt/element/QtIconButton.cpp +++ b/src/lib_gui/qt/element/QtIconButton.cpp @@ -1,9 +1,9 @@ -#include "qt/element/QtIconButton.h" +#include "QtIconButton.h" #include -#include "qt/utility/utilityQt.h" -#include "settings/ColorScheme.h" +#include "utilityQt.h" +#include "ColorScheme.h" QtHoverButton::QtHoverButton(QWidget* parent) diff --git a/src/lib_gui/qt/element/QtIconButton.h b/src/lib_gui/qt/element/QtIconButton.h index d8dd7629..bc5874ad 100644 --- a/src/lib_gui/qt/element/QtIconButton.h +++ b/src/lib_gui/qt/element/QtIconButton.h @@ -3,11 +3,11 @@ #include -#include "utility/file/FilePath.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageRefresh.h" +#include "FilePath.h" +#include "MessageListener.h" +#include "MessageRefresh.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "QtThreadedFunctor.h" class QtHoverButton : public QPushButton diff --git a/src/lib_gui/qt/element/QtLineEdit.cpp b/src/lib_gui/qt/element/QtLineEdit.cpp index 9fe002f1..d57bcb5e 100644 --- a/src/lib_gui/qt/element/QtLineEdit.cpp +++ b/src/lib_gui/qt/element/QtLineEdit.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtLineEdit.h" +#include "QtLineEdit.h" QtLineEdit::QtLineEdit(QWidget* parent) : QLineEdit(parent) diff --git a/src/lib_gui/qt/element/QtListBox.cpp b/src/lib_gui/qt/element/QtListBox.cpp index c4bbfe30..7ec3d093 100644 --- a/src/lib_gui/qt/element/QtListBox.cpp +++ b/src/lib_gui/qt/element/QtListBox.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtListBox.h" +#include "QtListBox.h" #include #include @@ -6,12 +6,12 @@ #include #include -#include "qt/element/QtIconButton.h" -#include "qt/element/QtStringListBoxItem.h" -#include "qt/utility/utilityQt.h" -#include "qt/window/QtTextEditDialog.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "QtIconButton.h" +#include "QtStringListBoxItem.h" +#include "utilityQt.h" +#include "QtTextEditDialog.h" +#include "ResourcePaths.h" +#include "utilityString.h" QtListBox::QtListBox(QWidget *parent, const QString& listName) : QFrame(parent) diff --git a/src/lib_gui/qt/element/QtListBox.h b/src/lib_gui/qt/element/QtListBox.h index 8130803c..98b1cdc7 100644 --- a/src/lib_gui/qt/element/QtListBox.h +++ b/src/lib_gui/qt/element/QtListBox.h @@ -3,7 +3,7 @@ #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class QEvent; class QHBoxLayout; diff --git a/src/lib_gui/qt/element/QtListBoxItem.cpp b/src/lib_gui/qt/element/QtListBoxItem.cpp index 31a7ce53..c2f2f73d 100644 --- a/src/lib_gui/qt/element/QtListBoxItem.cpp +++ b/src/lib_gui/qt/element/QtListBoxItem.cpp @@ -1,14 +1,14 @@ -#include "qt/element/QtListBoxItem.h" +#include "QtListBoxItem.h" #include #include #include -#include "qt/element/QtLineEdit.h" -#include "qt/element/QtListBox.h" -#include "qt/element/QtIconButton.h" -#include "qt/utility/QtFileDialog.h" -#include "utility/ResourcePaths.h" +#include "QtLineEdit.h" +#include "QtListBox.h" +#include "QtIconButton.h" +#include "QtFileDialog.h" +#include "ResourcePaths.h" QtListBoxItem::QtListBoxItem(QListWidgetItem* item, QWidget *parent) : QWidget(parent) diff --git a/src/lib_gui/qt/element/QtLocationPicker.cpp b/src/lib_gui/qt/element/QtLocationPicker.cpp index 9db0b0b9..2f67767b 100644 --- a/src/lib_gui/qt/element/QtLocationPicker.cpp +++ b/src/lib_gui/qt/element/QtLocationPicker.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtLocationPicker.h" +#include "QtLocationPicker.h" #include #include @@ -6,10 +6,10 @@ #include #include -#include "qt/element/QtIconButton.h" -#include "qt/utility/QtFileDialog.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityFile.h" +#include "QtIconButton.h" +#include "QtFileDialog.h" +#include "ResourcePaths.h" +#include "utilityFile.h" QtLocationPicker::QtLocationPicker(QWidget *parent) : QWidget(parent) diff --git a/src/lib_gui/qt/element/QtLocationPicker.h b/src/lib_gui/qt/element/QtLocationPicker.h index defe7344..772e9346 100644 --- a/src/lib_gui/qt/element/QtLocationPicker.h +++ b/src/lib_gui/qt/element/QtLocationPicker.h @@ -3,8 +3,8 @@ #include -#include "qt/element/QtLineEdit.h" -#include "utility/file/FilePath.h" +#include "QtLineEdit.h" +#include "FilePath.h" class QtLocationPicker : public QWidget diff --git a/src/lib_gui/qt/element/QtPathListBox.cpp b/src/lib_gui/qt/element/QtPathListBox.cpp index 8351aac6..43ae1177 100644 --- a/src/lib_gui/qt/element/QtPathListBox.cpp +++ b/src/lib_gui/qt/element/QtPathListBox.cpp @@ -1,12 +1,12 @@ -#include "qt/element/QtPathListBox.h" +#include "QtPathListBox.h" #include #include #include #include -#include "qt/element/QtPathListBoxItem.h" -#include "utility/utilityFile.h" +#include "QtPathListBoxItem.h" +#include "utilityFile.h" QtPathListBox::QtPathListBox(QWidget *parent, const QString& listName, SelectionPolicyType selectionPolicy) : QtListBox(parent, listName) diff --git a/src/lib_gui/qt/element/QtPathListBox.h b/src/lib_gui/qt/element/QtPathListBox.h index 17f2b968..400d3b3d 100644 --- a/src/lib_gui/qt/element/QtPathListBox.h +++ b/src/lib_gui/qt/element/QtPathListBox.h @@ -1,7 +1,7 @@ #ifndef QT_PATH_LIST_BOX_H #define QT_PATH_LIST_BOX_H -#include "qt/element/QtListBox.h" +#include "QtListBox.h" class QtPathListBox : public QtListBox diff --git a/src/lib_gui/qt/element/QtPathListBoxItem.cpp b/src/lib_gui/qt/element/QtPathListBoxItem.cpp index 124ed40e..7a2c6543 100644 --- a/src/lib_gui/qt/element/QtPathListBoxItem.cpp +++ b/src/lib_gui/qt/element/QtPathListBoxItem.cpp @@ -1,14 +1,14 @@ -#include "qt/element/QtPathListBoxItem.h" +#include "QtPathListBoxItem.h" #include #include #include -#include "qt/element/QtLineEdit.h" -#include "qt/element/QtPathListBox.h" -#include "qt/element/QtIconButton.h" -#include "qt/utility/QtFileDialog.h" -#include "utility/ResourcePaths.h" +#include "QtLineEdit.h" +#include "QtPathListBox.h" +#include "QtIconButton.h" +#include "QtFileDialog.h" +#include "ResourcePaths.h" QtPathListBoxItem::QtPathListBoxItem(QtPathListBox* listBox, QListWidgetItem* item, QWidget *parent) : QtListBoxItem(item, parent) diff --git a/src/lib_gui/qt/element/QtPathListBoxItem.h b/src/lib_gui/qt/element/QtPathListBoxItem.h index 35725177..a818ed0d 100644 --- a/src/lib_gui/qt/element/QtPathListBoxItem.h +++ b/src/lib_gui/qt/element/QtPathListBoxItem.h @@ -1,7 +1,7 @@ #ifndef QT_PATH_LIST_BOX_ITEM_H #define QT_PATH_LIST_BOX_ITEM_H -#include "qt/element/QtListBoxItem.h" +#include "QtListBoxItem.h" class QPushButton; class QListWidgetItem; diff --git a/src/lib_gui/qt/element/QtProgressBar.cpp b/src/lib_gui/qt/element/QtProgressBar.cpp index ebd21175..2d1d1306 100644 --- a/src/lib_gui/qt/element/QtProgressBar.cpp +++ b/src/lib_gui/qt/element/QtProgressBar.cpp @@ -1,11 +1,11 @@ -#include "qt/element/QtProgressBar.h" +#include "QtProgressBar.h" #include #include #include #include -#include "utility/ResourcePaths.h" +#include "ResourcePaths.h" QtProgressBar::QtProgressBar(QWidget* parent) : QWidget(parent) diff --git a/src/lib_gui/qt/element/QtProgressBar.h b/src/lib_gui/qt/element/QtProgressBar.h index 25ee3853..a8df4cce 100644 --- a/src/lib_gui/qt/element/QtProgressBar.h +++ b/src/lib_gui/qt/element/QtProgressBar.h @@ -3,8 +3,8 @@ #include -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "utility/TimeStamp.h" +#include "QtDeviceScaledPixmap.h" +#include "TimeStamp.h" class QTimer; diff --git a/src/lib_gui/qt/element/QtScreenSearchBox.cpp b/src/lib_gui/qt/element/QtScreenSearchBox.cpp index ed7c00a7..cd6ee3d0 100644 --- a/src/lib_gui/qt/element/QtScreenSearchBox.cpp +++ b/src/lib_gui/qt/element/QtScreenSearchBox.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtScreenSearchBox.h" +#include "QtScreenSearchBox.h" #include #include @@ -8,9 +8,9 @@ #include #include -#include "qt/element/QtIconButton.h" -#include "qt/utility/utilityQt.h" -#include "utility/ResourcePaths.h" +#include "QtIconButton.h" +#include "utilityQt.h" +#include "ResourcePaths.h" QtFocusInFilter::QtFocusInFilter(QObject* parent) diff --git a/src/lib_gui/qt/element/QtScreenSearchBox.h b/src/lib_gui/qt/element/QtScreenSearchBox.h index 3424e400..713cd88f 100644 --- a/src/lib_gui/qt/element/QtScreenSearchBox.h +++ b/src/lib_gui/qt/element/QtScreenSearchBox.h @@ -3,8 +3,8 @@ #include -#include "component/controller/helper/ControllerProxy.h" -#include "component/controller/ScreenSearchController.h" +#include "ControllerProxy.h" +#include "ScreenSearchController.h" class QCheckBox; class QHBoxLayout; diff --git a/src/lib_gui/qt/element/QtSearchBar.cpp b/src/lib_gui/qt/element/QtSearchBar.cpp index e6ca8bbd..b186f49a 100644 --- a/src/lib_gui/qt/element/QtSearchBar.cpp +++ b/src/lib_gui/qt/element/QtSearchBar.cpp @@ -1,12 +1,12 @@ -#include "qt/element/QtSearchBar.h" +#include "QtSearchBar.h" #include -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/ResourcePaths.h" +#include "MessageActivateAll.h" +#include "ResourcePaths.h" -#include "qt/element/QtSearchBarButton.h" -#include "qt/element/QtSmartSearchBox.h" +#include "QtSearchBarButton.h" +#include "QtSmartSearchBox.h" QtSearchBar::QtSearchBar() { diff --git a/src/lib_gui/qt/element/QtSearchBar.h b/src/lib_gui/qt/element/QtSearchBar.h index 48ededaa..9d278a02 100644 --- a/src/lib_gui/qt/element/QtSearchBar.h +++ b/src/lib_gui/qt/element/QtSearchBar.h @@ -6,7 +6,7 @@ #include #include -#include "data/search/SearchMatch.h" +#include "SearchMatch.h" class QtSearchBarButton; class QtSmartSearchBox; diff --git a/src/lib_gui/qt/element/QtSearchBarButton.cpp b/src/lib_gui/qt/element/QtSearchBarButton.cpp index 2c9324a9..6e57faef 100644 --- a/src/lib_gui/qt/element/QtSearchBarButton.cpp +++ b/src/lib_gui/qt/element/QtSearchBarButton.cpp @@ -1,6 +1,6 @@ -#include "qt/element/QtSearchBarButton.h" +#include "QtSearchBarButton.h" -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" QtSearchBarButton::QtSearchBarButton(const FilePath& iconPath, bool small, QWidget* parent) : QtSelfRefreshIconButton("", iconPath, "search/button", parent) diff --git a/src/lib_gui/qt/element/QtSearchBarButton.h b/src/lib_gui/qt/element/QtSearchBarButton.h index f82470af..51ca2182 100644 --- a/src/lib_gui/qt/element/QtSearchBarButton.h +++ b/src/lib_gui/qt/element/QtSearchBarButton.h @@ -1,7 +1,7 @@ #ifndef QT_SEARCH_BAR_BUTTON_H #define QT_SEARCH_BAR_BUTTON_H -#include "qt/element/QtIconButton.h" +#include "QtIconButton.h" class QtSearchBarButton : public QtSelfRefreshIconButton diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.cpp b/src/lib_gui/qt/element/QtSmartSearchBox.cpp index c6b0611c..2ec9c5db 100644 --- a/src/lib_gui/qt/element/QtSmartSearchBox.cpp +++ b/src/lib_gui/qt/element/QtSmartSearchBox.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtSmartSearchBox.h" +#include "QtSmartSearchBox.h" #include @@ -6,14 +6,14 @@ #include #include -#include "component/view/GraphViewStyle.h" -#include "data/NodeTypeSet.h" -#include "settings/ColorScheme.h" -#include "utility/messaging/type/MessageActivateFullTextSearch.h" -#include "utility/messaging/type/MessageSearch.h" -#include "utility/messaging/type/MessageSearchAutocomplete.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "GraphViewStyle.h" +#include "NodeTypeSet.h" +#include "ColorScheme.h" +#include "MessageActivateFullTextSearch.h" +#include "MessageSearch.h" +#include "MessageSearchAutocomplete.h" +#include "utility.h" +#include "utilityString.h" QtSearchElement::QtSearchElement(const QString& text, QWidget* parent) : QPushButton(text, parent) diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.h b/src/lib_gui/qt/element/QtSmartSearchBox.h index 4ccca5ee..91484d72 100644 --- a/src/lib_gui/qt/element/QtSmartSearchBox.h +++ b/src/lib_gui/qt/element/QtSmartSearchBox.h @@ -7,8 +7,8 @@ #include #include -#include "data/search/SearchMatch.h" -#include "qt/element/QtAutocompletionList.h" +#include "SearchMatch.h" +#include "QtAutocompletionList.h" class NodeTypeSet; diff --git a/src/lib_gui/qt/element/QtStatusBar.cpp b/src/lib_gui/qt/element/QtStatusBar.cpp index 99ef50c2..a22dfa7b 100644 --- a/src/lib_gui/qt/element/QtStatusBar.cpp +++ b/src/lib_gui/qt/element/QtStatusBar.cpp @@ -1,14 +1,14 @@ -#include "qt/element/QtStatusBar.h" +#include "QtStatusBar.h" #include #include #include -#include "qt/utility/utilityQt.h" -#include "utility/messaging/type/error/MessageErrorsAll.h" -#include "utility/messaging/type/indexing/MessageIndexingShowDialog.h" -#include "utility/messaging/type/MessageShowStatus.h" -#include "utility/ResourcePaths.h" +#include "utilityQt.h" +#include "MessageErrorsAll.h" +#include "MessageIndexingShowDialog.h" +#include "MessageShowStatus.h" +#include "ResourcePaths.h" QtStatusBar::QtStatusBar() : m_text(this) diff --git a/src/lib_gui/qt/element/QtStatusBar.h b/src/lib_gui/qt/element/QtStatusBar.h index 5328511f..9f9cf653 100644 --- a/src/lib_gui/qt/element/QtStatusBar.h +++ b/src/lib_gui/qt/element/QtStatusBar.h @@ -8,7 +8,7 @@ #include #include -#include "data/ErrorCountInfo.h" +#include "ErrorCountInfo.h" class QProgressBar; diff --git a/src/lib_gui/qt/element/QtStringListBox.cpp b/src/lib_gui/qt/element/QtStringListBox.cpp index ba99c77b..4ae000f1 100644 --- a/src/lib_gui/qt/element/QtStringListBox.cpp +++ b/src/lib_gui/qt/element/QtStringListBox.cpp @@ -1,8 +1,8 @@ -#include "qt/element/QtStringListBox.h" +#include "QtStringListBox.h" #include -#include "qt/element/QtStringListBoxItem.h" +#include "QtStringListBoxItem.h" QtStringListBox::QtStringListBox(QWidget *parent, const QString& listName) : QtListBox(parent, listName) diff --git a/src/lib_gui/qt/element/QtStringListBox.h b/src/lib_gui/qt/element/QtStringListBox.h index dfc73049..c85cf1a5 100644 --- a/src/lib_gui/qt/element/QtStringListBox.h +++ b/src/lib_gui/qt/element/QtStringListBox.h @@ -1,8 +1,8 @@ #ifndef QT_STRING_LIST_BOX_H #define QT_STRING_LIST_BOX_H -#include "qt/element/QtListBox.h" -#include "qt/element/QtStringListBoxItem.h" +#include "QtListBox.h" +#include "QtStringListBoxItem.h" class QtStringListBox : public QtListBox diff --git a/src/lib_gui/qt/element/QtStringListBoxItem.cpp b/src/lib_gui/qt/element/QtStringListBoxItem.cpp index df4c1080..dcb7f627 100644 --- a/src/lib_gui/qt/element/QtStringListBoxItem.cpp +++ b/src/lib_gui/qt/element/QtStringListBoxItem.cpp @@ -1,6 +1,6 @@ -#include "qt/element/QtStringListBoxItem.h" +#include "QtStringListBoxItem.h" -#include "qt/element/QtStringListBox.h" +#include "QtStringListBox.h" QtStringListBoxItem::QtStringListBoxItem(QtStringListBox* listBox, QListWidgetItem* item, QWidget *parent) : QtListBoxItem(item, parent) diff --git a/src/lib_gui/qt/element/QtStringListBoxItem.h b/src/lib_gui/qt/element/QtStringListBoxItem.h index 78ef856d..4aa79d31 100644 --- a/src/lib_gui/qt/element/QtStringListBoxItem.h +++ b/src/lib_gui/qt/element/QtStringListBoxItem.h @@ -1,7 +1,7 @@ #ifndef QT_STRING_LIST_BOX_ITEM_H #define QT_STRING_LIST_BOX_ITEM_H -#include "qt/element/QtListBoxItem.h" +#include "QtListBoxItem.h" class QListWidgetItem; diff --git a/src/lib_gui/qt/element/QtTable.cpp b/src/lib_gui/qt/element/QtTable.cpp index 1f5888bb..0ef890b2 100644 --- a/src/lib_gui/qt/element/QtTable.cpp +++ b/src/lib_gui/qt/element/QtTable.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtTable.h" +#include "QtTable.h" #include @@ -8,7 +8,7 @@ #include #include -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" class SelectableCellDelegate : public QStyledItemDelegate diff --git a/src/lib_gui/qt/element/QtTooltip.cpp b/src/lib_gui/qt/element/QtTooltip.cpp index 7a6bcfea..3599dd6e 100644 --- a/src/lib_gui/qt/element/QtTooltip.cpp +++ b/src/lib_gui/qt/element/QtTooltip.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtTooltip.h" +#include "QtTooltip.h" #include #include @@ -8,11 +8,11 @@ #include #include -#include "data/location/SourceLocationFile.h" -#include "data/tooltip/TooltipInfo.h" -#include "qt/element/QtCodeField.h" -#include "settings/ApplicationSettings.h" -#include "utility/TextCodec.h" +#include "SourceLocationFile.h" +#include "TooltipInfo.h" +#include "QtCodeField.h" +#include "ApplicationSettings.h" +#include "TextCodec.h" QtTooltip::QtTooltip(QWidget* parent) : QFrame(parent) diff --git a/src/lib_gui/qt/element/QtUndoRedo.cpp b/src/lib_gui/qt/element/QtUndoRedo.cpp index 0ec09dfe..87f09a36 100644 --- a/src/lib_gui/qt/element/QtUndoRedo.cpp +++ b/src/lib_gui/qt/element/QtUndoRedo.cpp @@ -1,15 +1,15 @@ -#include "qt/element/QtUndoRedo.h" +#include "QtUndoRedo.h" #include #include -#include "utility/messaging/type/history/MessageHistoryUndo.h" -#include "utility/messaging/type/history/MessageHistoryRedo.h" -#include "utility/ResourcePaths.h" +#include "MessageHistoryUndo.h" +#include "MessageHistoryRedo.h" +#include "ResourcePaths.h" -#include "qt/element/QtHistoryList.h" -#include "qt/element/QtSearchBarButton.h" -#include "qt/utility/QtContextMenu.h" +#include "QtHistoryList.h" +#include "QtSearchBarButton.h" +#include "QtContextMenu.h" QtUndoRedo::QtUndoRedo() : m_pressed(false) diff --git a/src/lib_gui/qt/element/QtUndoRedo.h b/src/lib_gui/qt/element/QtUndoRedo.h index 94df2c90..d9a3227d 100644 --- a/src/lib_gui/qt/element/QtUndoRedo.h +++ b/src/lib_gui/qt/element/QtUndoRedo.h @@ -3,8 +3,8 @@ #include -#include "data/search/SearchMatch.h" -#include "utility/TimeStamp.h" +#include "SearchMatch.h" +#include "TimeStamp.h" class QtSearchBarButton; class QtHistoryList; diff --git a/src/lib_gui/qt/element/QtUpdateCheckerWidget.cpp b/src/lib_gui/qt/element/QtUpdateCheckerWidget.cpp index c7b016e8..306b6220 100644 --- a/src/lib_gui/qt/element/QtUpdateCheckerWidget.cpp +++ b/src/lib_gui/qt/element/QtUpdateCheckerWidget.cpp @@ -1,4 +1,4 @@ -#include "qt/element/QtUpdateCheckerWidget.h" +#include "QtUpdateCheckerWidget.h" #include #include @@ -6,9 +6,9 @@ #include #include -#include "qt/network/QtUpdateChecker.h" -#include "settings/ApplicationSettings.h" -#include "utility/TimeStamp.h" +#include "QtUpdateChecker.h" +#include "ApplicationSettings.h" +#include "TimeStamp.h" QtUpdateCheckerWidget::QtUpdateCheckerWidget(QWidget* parent) : QWidget(parent) diff --git a/src/lib_gui/qt/graphics/QtCountCircleItem.cpp b/src/lib_gui/qt/graphics/QtCountCircleItem.cpp index 8bdc994e..cf9bc91b 100644 --- a/src/lib_gui/qt/graphics/QtCountCircleItem.cpp +++ b/src/lib_gui/qt/graphics/QtCountCircleItem.cpp @@ -1,10 +1,10 @@ -#include "qt/graphics/QtCountCircleItem.h" +#include "QtCountCircleItem.h" #include #include #include -#include "component/view/GraphViewStyle.h" +#include "GraphViewStyle.h" QtCountCircleItem::QtCountCircleItem(QGraphicsItem* parent) : QtRoundedRectItem(parent) diff --git a/src/lib_gui/qt/graphics/QtCountCircleItem.h b/src/lib_gui/qt/graphics/QtCountCircleItem.h index ee812ebe..41c55ce6 100644 --- a/src/lib_gui/qt/graphics/QtCountCircleItem.h +++ b/src/lib_gui/qt/graphics/QtCountCircleItem.h @@ -1,9 +1,9 @@ #ifndef QT_COUNT_CIRCLE_ITEM_H #define QT_COUNT_CIRCLE_ITEM_H -#include "utility/math/Vector2.h" +#include "Vector2.h" -#include "qt/graphics/QtRoundedRectItem.h" +#include "QtRoundedRectItem.h" class QtCountCircleItem : public QtRoundedRectItem diff --git a/src/lib_gui/qt/graphics/QtGraphicsView.cpp b/src/lib_gui/qt/graphics/QtGraphicsView.cpp index fdabf8d7..80523c5d 100644 --- a/src/lib_gui/qt/graphics/QtGraphicsView.cpp +++ b/src/lib_gui/qt/graphics/QtGraphicsView.cpp @@ -1,4 +1,4 @@ -#include "qt/graphics/QtGraphicsView.h" +#include "QtGraphicsView.h" #include #include @@ -11,23 +11,23 @@ #include #include -#include "qt/element/QtIconButton.h" -#include "qt/view/graphElements/QtGraphEdge.h" -#include "qt/view/graphElements/QtGraphNode.h" -#include "qt/view/graphElements/QtGraphNodeBundle.h" -#include "qt/view/graphElements/QtGraphNodeData.h" -#include "qt/view/graphElements/QtGraphNodeExpandToggle.h" -#include "qt/utility/QtContextMenu.h" -#include "qt/utility/QtFileDialog.h" -#include "qt/utility/utilityQt.h" -#include "settings/ApplicationSettings.h" -#include "utility/messaging/type/activation/MessageActivateLegend.h" -#include "utility/messaging/type/code/MessageCodeShowDefinition.h" -#include "utility/messaging/type/MessageDisplayBookmarkCreator.h" -#include "utility/messaging/type/MessageGraphNodeExpand.h" -#include "utility/messaging/type/MessageGraphNodeHide.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityApp.h" +#include "QtIconButton.h" +#include "QtGraphEdge.h" +#include "QtGraphNode.h" +#include "QtGraphNodeBundle.h" +#include "QtGraphNodeData.h" +#include "QtGraphNodeExpandToggle.h" +#include "QtContextMenu.h" +#include "QtFileDialog.h" +#include "utilityQt.h" +#include "ApplicationSettings.h" +#include "MessageActivateLegend.h" +#include "MessageCodeShowDefinition.h" +#include "MessageDisplayBookmarkCreator.h" +#include "MessageGraphNodeExpand.h" +#include "MessageGraphNodeHide.h" +#include "ResourcePaths.h" +#include "utilityApp.h" QtGraphicsView::QtGraphicsView(QWidget* parent) : QGraphicsView(parent) diff --git a/src/lib_gui/qt/graphics/QtGraphicsView.h b/src/lib_gui/qt/graphics/QtGraphicsView.h index 58f262f3..e7fdd8b2 100644 --- a/src/lib_gui/qt/graphics/QtGraphicsView.h +++ b/src/lib_gui/qt/graphics/QtGraphicsView.h @@ -5,7 +5,7 @@ #include -#include "utility/types.h" +#include "types.h" class QPushButton; class QTimer; diff --git a/src/lib_gui/qt/graphics/QtLineItemAngled.cpp b/src/lib_gui/qt/graphics/QtLineItemAngled.cpp index cf0c29ed..ba92be36 100644 --- a/src/lib_gui/qt/graphics/QtLineItemAngled.cpp +++ b/src/lib_gui/qt/graphics/QtLineItemAngled.cpp @@ -1,4 +1,4 @@ -#include "qt/graphics/QtLineItemAngled.h" +#include "QtLineItemAngled.h" #include diff --git a/src/lib_gui/qt/graphics/QtLineItemAngled.h b/src/lib_gui/qt/graphics/QtLineItemAngled.h index 55e59317..f4881acf 100644 --- a/src/lib_gui/qt/graphics/QtLineItemAngled.h +++ b/src/lib_gui/qt/graphics/QtLineItemAngled.h @@ -1,7 +1,7 @@ #ifndef QT_LINE_ITEM_ANGLED_H #define QT_LINE_ITEM_ANGLED_H -#include "qt/graphics/QtLineItemBase.h" +#include "QtLineItemBase.h" class QtLineItemAngled : public QtLineItemBase diff --git a/src/lib_gui/qt/graphics/QtLineItemBase.cpp b/src/lib_gui/qt/graphics/QtLineItemBase.cpp index 05fedfac..27f291fd 100644 --- a/src/lib_gui/qt/graphics/QtLineItemBase.cpp +++ b/src/lib_gui/qt/graphics/QtLineItemBase.cpp @@ -1,4 +1,4 @@ -#include "qt/graphics/QtLineItemBase.h" +#include "QtLineItemBase.h" #include #include diff --git a/src/lib_gui/qt/graphics/QtLineItemBase.h b/src/lib_gui/qt/graphics/QtLineItemBase.h index 4da511b6..3699ee89 100644 --- a/src/lib_gui/qt/graphics/QtLineItemBase.h +++ b/src/lib_gui/qt/graphics/QtLineItemBase.h @@ -3,9 +3,9 @@ #include -#include "utility/math/Vector4.h" +#include "Vector4.h" -#include "component/view/GraphViewStyle.h" +#include "GraphViewStyle.h" class QtLineItemBase : public QGraphicsLineItem diff --git a/src/lib_gui/qt/graphics/QtLineItemBezier.cpp b/src/lib_gui/qt/graphics/QtLineItemBezier.cpp index d7f6b05f..bdac9293 100644 --- a/src/lib_gui/qt/graphics/QtLineItemBezier.cpp +++ b/src/lib_gui/qt/graphics/QtLineItemBezier.cpp @@ -1,4 +1,4 @@ -#include "qt/graphics/QtLineItemBezier.h" +#include "QtLineItemBezier.h" #include diff --git a/src/lib_gui/qt/graphics/QtLineItemBezier.h b/src/lib_gui/qt/graphics/QtLineItemBezier.h index 6962878b..ddc13beb 100644 --- a/src/lib_gui/qt/graphics/QtLineItemBezier.h +++ b/src/lib_gui/qt/graphics/QtLineItemBezier.h @@ -1,7 +1,7 @@ #ifndef QT_LINE_ITEM_BEZIER_H #define QT_LINE_ITEM_BEZIER_H -#include "qt/graphics/QtLineItemBase.h" +#include "QtLineItemBase.h" class QtLineItemBezier : public QtLineItemBase diff --git a/src/lib_gui/qt/graphics/QtLineItemStraight.cpp b/src/lib_gui/qt/graphics/QtLineItemStraight.cpp index 3a03dc91..1ee31629 100644 --- a/src/lib_gui/qt/graphics/QtLineItemStraight.cpp +++ b/src/lib_gui/qt/graphics/QtLineItemStraight.cpp @@ -1,4 +1,4 @@ -#include "qt/graphics/QtLineItemStraight.h" +#include "QtLineItemStraight.h" #include #include diff --git a/src/lib_gui/qt/graphics/QtLineItemStraight.h b/src/lib_gui/qt/graphics/QtLineItemStraight.h index bee6a6f5..f6612392 100644 --- a/src/lib_gui/qt/graphics/QtLineItemStraight.h +++ b/src/lib_gui/qt/graphics/QtLineItemStraight.h @@ -3,7 +3,7 @@ #include -#include "component/view/GraphViewStyle.h" +#include "GraphViewStyle.h" class QtLineItemStraight : public QGraphicsLineItem diff --git a/src/lib_gui/qt/graphics/QtRoundedRectItem.cpp b/src/lib_gui/qt/graphics/QtRoundedRectItem.cpp index 795e55db..68131801 100644 --- a/src/lib_gui/qt/graphics/QtRoundedRectItem.cpp +++ b/src/lib_gui/qt/graphics/QtRoundedRectItem.cpp @@ -1,4 +1,4 @@ -#include "qt/graphics/QtRoundedRectItem.h" +#include "QtRoundedRectItem.h" #include #include diff --git a/src/lib_gui/qt/network/QtIDECommunicationController.cpp b/src/lib_gui/qt/network/QtIDECommunicationController.cpp index 1f6a33f4..e98d3a4f 100644 --- a/src/lib_gui/qt/network/QtIDECommunicationController.cpp +++ b/src/lib_gui/qt/network/QtIDECommunicationController.cpp @@ -2,7 +2,7 @@ #include -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" QtIDECommunicationController::QtIDECommunicationController(QObject* parent, StorageAccess* storageAccess) : IDECommunicationController(storageAccess) diff --git a/src/lib_gui/qt/network/QtIDECommunicationController.h b/src/lib_gui/qt/network/QtIDECommunicationController.h index 72f17db9..02a95ca4 100644 --- a/src/lib_gui/qt/network/QtIDECommunicationController.h +++ b/src/lib_gui/qt/network/QtIDECommunicationController.h @@ -5,8 +5,8 @@ #include "QtTcpWrapper.h" -#include "component/controller/IDECommunicationController.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "IDECommunicationController.h" +#include "QtThreadedFunctor.h" class StorageAccess; diff --git a/src/lib_gui/qt/network/QtNetworkFactory.h b/src/lib_gui/qt/network/QtNetworkFactory.h index 0a44e8fc..4f68f55d 100644 --- a/src/lib_gui/qt/network/QtNetworkFactory.h +++ b/src/lib_gui/qt/network/QtNetworkFactory.h @@ -1,7 +1,7 @@ #ifndef QT_NETWORK_FACTORY_H #define QT_NETWORK_FACTORY_H -#include "component/NetworkFactory.h" +#include "NetworkFactory.h" class QtNetworkFactory : public NetworkFactory diff --git a/src/lib_gui/qt/network/QtRequest.cpp b/src/lib_gui/qt/network/QtRequest.cpp index 53411d8e..1f378f55 100644 --- a/src/lib_gui/qt/network/QtRequest.cpp +++ b/src/lib_gui/qt/network/QtRequest.cpp @@ -1,9 +1,9 @@ -#include "qt/network/QtRequest.h" +#include "QtRequest.h" #include #include -#include "utility/logging/logging.h" +#include "logging.h" QtRequest::QtRequest() { diff --git a/src/lib_gui/qt/network/QtTcpWrapper.cpp b/src/lib_gui/qt/network/QtTcpWrapper.cpp index 060b5ad0..6c1a4412 100644 --- a/src/lib_gui/qt/network/QtTcpWrapper.cpp +++ b/src/lib_gui/qt/network/QtTcpWrapper.cpp @@ -1,7 +1,7 @@ #include "QtTcpWrapper.h" #include "qdatastream.h" -#include "utility/logging/logging.h" +#include "logging.h" QtTcpWrapper::QtTcpWrapper(QObject* parent, const std::string& ip, const quint16 serverPort, const quint16 clientPort) : QObject(parent) diff --git a/src/lib_gui/qt/network/QtUpdateChecker.cpp b/src/lib_gui/qt/network/QtUpdateChecker.cpp index 467346cb..ed3d8a74 100644 --- a/src/lib_gui/qt/network/QtUpdateChecker.cpp +++ b/src/lib_gui/qt/network/QtUpdateChecker.cpp @@ -1,4 +1,4 @@ -#include "qt/network/QtUpdateChecker.h" +#include "QtUpdateChecker.h" #include #include @@ -7,12 +7,12 @@ #include #include "LicenseChecker.h" -#include "qt/network/QtRequest.h" -#include "settings/ApplicationSettings.h" -#include "utility/Version.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" -#include "utility/utilityUuid.h" +#include "QtRequest.h" +#include "ApplicationSettings.h" +#include "Version.h" +#include "utility.h" +#include "utilityApp.h" +#include "utilityUuid.h" bool QtUpdateChecker::needsAutomaticCheck() { diff --git a/src/lib_gui/qt/network/QtUpdateChecker.h b/src/lib_gui/qt/network/QtUpdateChecker.h index 88185d25..bd644e08 100644 --- a/src/lib_gui/qt/network/QtUpdateChecker.h +++ b/src/lib_gui/qt/network/QtUpdateChecker.h @@ -1,9 +1,9 @@ #ifndef QT_UPDATE_CHECKER_H #define QT_UPDATE_CHECKER_H -#include "qt/utility/QtThreadedFunctor.h" +#include "QtThreadedFunctor.h" #include "UpdateChecker.h" -#include "utility/Version.h" +#include "Version.h" class QtUpdateChecker : public UpdateChecker diff --git a/src/lib_gui/qt/utility/QtContextMenu.cpp b/src/lib_gui/qt/utility/QtContextMenu.cpp index a0dd7096..17c57d2b 100644 --- a/src/lib_gui/qt/utility/QtContextMenu.cpp +++ b/src/lib_gui/qt/utility/QtContextMenu.cpp @@ -1,4 +1,4 @@ -#include "qt/utility/QtContextMenu.h" +#include "QtContextMenu.h" #include #include @@ -6,9 +6,9 @@ #include #include -#include "utility/logging/logging.h" -#include "utility/messaging/type/history/MessageHistoryRedo.h" -#include "utility/messaging/type/history/MessageHistoryUndo.h" +#include "logging.h" +#include "MessageHistoryRedo.h" +#include "MessageHistoryUndo.h" QtContextMenu* QtContextMenu::s_instance; diff --git a/src/lib_gui/qt/utility/QtContextMenu.h b/src/lib_gui/qt/utility/QtContextMenu.h index f5170a7a..9e164fbe 100644 --- a/src/lib_gui/qt/utility/QtContextMenu.h +++ b/src/lib_gui/qt/utility/QtContextMenu.h @@ -6,7 +6,7 @@ #include #include -#include "utility/file/FilePath.h" +#include "FilePath.h" class QtContextMenu : public QObject diff --git a/src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp b/src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp index bb83d3ad..f16c5c8b 100644 --- a/src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp +++ b/src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp @@ -1,8 +1,8 @@ -#include "qt/utility/QtDeviceScaledPixmap.h" +#include "QtDeviceScaledPixmap.h" #include -#include "qt/utility/utilityQt.h" +#include "utilityQt.h" qreal QtDeviceScaledPixmap::devicePixelRatio() { diff --git a/src/lib_gui/qt/utility/QtFileDialog.cpp b/src/lib_gui/qt/utility/QtFileDialog.cpp index fcb751ff..96a49da9 100644 --- a/src/lib_gui/qt/utility/QtFileDialog.cpp +++ b/src/lib_gui/qt/utility/QtFileDialog.cpp @@ -1,12 +1,12 @@ -#include "qt/utility/QtFileDialog.h" +#include "QtFileDialog.h" #include #include #include -#include "qt/utility/QtFilesAndDirectoriesDialog.h" -#include "utility/file/FilePath.h" -#include "utility/utilityApp.h" +#include "QtFilesAndDirectoriesDialog.h" +#include "FilePath.h" +#include "utilityApp.h" QStringList QtFileDialog::getFileNamesAndDirectories(QWidget* parent, const FilePath& path) { diff --git a/src/lib_gui/qt/utility/QtFilesAndDirectoriesDialog.cpp b/src/lib_gui/qt/utility/QtFilesAndDirectoriesDialog.cpp index 644fbf23..15855db9 100644 --- a/src/lib_gui/qt/utility/QtFilesAndDirectoriesDialog.cpp +++ b/src/lib_gui/qt/utility/QtFilesAndDirectoriesDialog.cpp @@ -1,11 +1,11 @@ -#include "qt/utility/QtFilesAndDirectoriesDialog.h" +#include "QtFilesAndDirectoriesDialog.h" #include #include #include -#include "utility/file/FilePath.h" -#include "utility/utilityApp.h" +#include "FilePath.h" +#include "utilityApp.h" QtFilesAndDirectoriesDialog::QtFilesAndDirectoriesDialog(QWidget* parent) : QFileDialog(parent) diff --git a/src/lib_gui/qt/utility/QtFlowLayout.cpp b/src/lib_gui/qt/utility/QtFlowLayout.cpp index fa525b4b..d31eb581 100644 --- a/src/lib_gui/qt/utility/QtFlowLayout.cpp +++ b/src/lib_gui/qt/utility/QtFlowLayout.cpp @@ -1,6 +1,6 @@ // from: http://doc.qt.io/qt-5/qtwidgets-layouts-flowlayout-flowlayout-cpp.html -#include "qt/utility/QtFlowLayout.h" +#include "QtFlowLayout.h" #include diff --git a/src/lib_gui/qt/utility/QtHighlighter.cpp b/src/lib_gui/qt/utility/QtHighlighter.cpp index a7782763..31a0f127 100644 --- a/src/lib_gui/qt/utility/QtHighlighter.cpp +++ b/src/lib_gui/qt/utility/QtHighlighter.cpp @@ -1,12 +1,12 @@ -#include "qt/utility/QtHighlighter.h" +#include "QtHighlighter.h" #include #include #include -#include "settings/ColorScheme.h" -#include "utility/tracing.h" -#include "utility/utility.h" +#include "ColorScheme.h" +#include "tracing.h" +#include "utility.h" QVector QtHighlighter::s_highlightingRules; QVector QtHighlighter::s_highlightingRulesCpp; diff --git a/src/lib_gui/qt/utility/QtHighlighter.h b/src/lib_gui/qt/utility/QtHighlighter.h index f7e62fb6..785f874b 100644 --- a/src/lib_gui/qt/utility/QtHighlighter.h +++ b/src/lib_gui/qt/utility/QtHighlighter.h @@ -3,7 +3,7 @@ #include -#include "settings/LanguageType.h" +#include "LanguageType.h" class QTextBlock; class QTextDocument; diff --git a/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.cpp b/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.cpp index 5e227454..2fe0880e 100644 --- a/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.cpp +++ b/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.cpp @@ -1,10 +1,10 @@ -#include "qt/utility/QtScrollSpeedChangeListener.h" +#include "QtScrollSpeedChangeListener.h" #include #include -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" QtScrollSpeedChangeListener::QtScrollSpeedChangeListener() : m_changeScrollSpeedFunctor(std::bind(&QtScrollSpeedChangeListener::doChangeScrollSpeed, this, std::placeholders::_1)) diff --git a/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.h b/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.h index fa3def6f..f8bb518f 100644 --- a/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.h +++ b/src/lib_gui/qt/utility/QtScrollSpeedChangeListener.h @@ -1,10 +1,10 @@ #ifndef QT_SCROLL_SPEED_CHANGE_LISTENER #define QT_SCROLL_SPEED_CHANGE_LISTENER -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageScrollSpeedChange.h" +#include "MessageListener.h" +#include "MessageScrollSpeedChange.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "QtThreadedFunctor.h" class QScrollBar; diff --git a/src/lib_gui/qt/utility/QtThreadedFunctor.h b/src/lib_gui/qt/utility/QtThreadedFunctor.h index 2613ee9c..c81c6434 100644 --- a/src/lib_gui/qt/utility/QtThreadedFunctor.h +++ b/src/lib_gui/qt/utility/QtThreadedFunctor.h @@ -8,8 +8,8 @@ #include #include -#include "utility/messaging/type/MessageWindowClosed.h" -#include "utility/messaging/MessageListener.h" +#include "MessageWindowClosed.h" +#include "MessageListener.h" class QtThreadedFunctorHelper: public QObject, public MessageListener { diff --git a/src/lib_gui/qt/utility/QtWindowsTaskbarButton.cpp b/src/lib_gui/qt/utility/QtWindowsTaskbarButton.cpp index 23e430c5..934e145f 100644 --- a/src/lib_gui/qt/utility/QtWindowsTaskbarButton.cpp +++ b/src/lib_gui/qt/utility/QtWindowsTaskbarButton.cpp @@ -1,11 +1,11 @@ -#include "qt/utility/QtWindowsTaskbarButton.h" +#include "QtWindowsTaskbarButton.h" #ifdef _WIN32 #include #include #endif -#include "qt/window/QtMainWindow.h" +#include "QtMainWindow.h" QtWindowsTaskbarButton::QtWindowsTaskbarButton() #ifdef _WIN32 diff --git a/src/lib_gui/qt/utility/utilityQt.cpp b/src/lib_gui/qt/utility/utilityQt.cpp index 8ef47a6c..50eb76ee 100644 --- a/src/lib_gui/qt/utility/utilityQt.cpp +++ b/src/lib_gui/qt/utility/utilityQt.cpp @@ -1,4 +1,4 @@ -#include "qt/utility/utilityQt.h" +#include "utilityQt.h" #include @@ -9,16 +9,16 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/file/FileSystem.h" -#include "utility/logging/logging.h" -#include "utility/ResourcePaths.h" -#include "utility/text/TextAccess.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "FileSystem.h" +#include "logging.h" +#include "ResourcePaths.h" +#include "TextAccess.h" +#include "utilityApp.h" +#include "utilityString.h" -#include "settings/ApplicationSettings.h" -#include "settings/ColorScheme.h" +#include "ApplicationSettings.h" +#include "ColorScheme.h" namespace utility { diff --git a/src/lib_gui/qt/view/QtBookmarkView.cpp b/src/lib_gui/qt/view/QtBookmarkView.cpp index 6250a29f..74380c82 100644 --- a/src/lib_gui/qt/view/QtBookmarkView.cpp +++ b/src/lib_gui/qt/view/QtBookmarkView.cpp @@ -1,18 +1,18 @@ -#include "qt/view/QtBookmarkView.h" +#include "QtBookmarkView.h" #include #include #include #include -#include "qt/element/QtSearchBarButton.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtMainView.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "qt/window/QtBookmarkBrowser.h" -#include "qt/window/QtBookmarkCreator.h" -#include "qt/window/QtMainWindow.h" -#include "utility/ResourcePaths.h" +#include "QtSearchBarButton.h" +#include "utilityQt.h" +#include "QtMainView.h" +#include "QtViewWidgetWrapper.h" +#include "QtBookmarkBrowser.h" +#include "QtBookmarkCreator.h" +#include "QtMainWindow.h" +#include "ResourcePaths.h" QtBookmarkView::QtBookmarkView(ViewLayout* viewLayout) : BookmarkView(viewLayout) diff --git a/src/lib_gui/qt/view/QtBookmarkView.h b/src/lib_gui/qt/view/QtBookmarkView.h index d458dc05..da201ba9 100644 --- a/src/lib_gui/qt/view/QtBookmarkView.h +++ b/src/lib_gui/qt/view/QtBookmarkView.h @@ -1,11 +1,11 @@ #ifndef QT_BOOKMARK_VIEW_H #define QT_BOOKMARK_VIEW_H -#include "component/controller/BookmarkController.h" -#include "component/controller/helper/ControllerProxy.h" -#include "component/view/BookmarkView.h" +#include "BookmarkController.h" +#include "ControllerProxy.h" +#include "BookmarkView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "QtThreadedFunctor.h" class QFrame; class QtBookmarkBrowser; diff --git a/src/lib_gui/qt/view/QtCodeView.cpp b/src/lib_gui/qt/view/QtCodeView.cpp index 840a03b9..788b7253 100644 --- a/src/lib_gui/qt/view/QtCodeView.cpp +++ b/src/lib_gui/qt/view/QtCodeView.cpp @@ -1,14 +1,14 @@ -#include "qt/view/QtCodeView.h" +#include "QtCodeView.h" -#include "utility/ResourcePaths.h" -#include "utility/tracing.h" +#include "ResourcePaths.h" +#include "tracing.h" -#include "qt/element/QtCodeArea.h" -#include "qt/element/QtCodeNavigator.h" -#include "qt/utility/QtHighlighter.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "settings/ColorScheme.h" +#include "QtCodeArea.h" +#include "QtCodeNavigator.h" +#include "QtHighlighter.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "ColorScheme.h" QtCodeView::QtCodeView(ViewLayout* viewLayout) : CodeView(viewLayout) diff --git a/src/lib_gui/qt/view/QtCodeView.h b/src/lib_gui/qt/view/QtCodeView.h index e6117632..63b2f885 100644 --- a/src/lib_gui/qt/view/QtCodeView.h +++ b/src/lib_gui/qt/view/QtCodeView.h @@ -1,8 +1,8 @@ #ifndef QT_CODE_VIEW_H #define QT_CODE_VIEW_H -#include "component/view/CodeView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "CodeView.h" +#include "QtThreadedFunctor.h" class QtCodeNavigator; diff --git a/src/lib_gui/qt/view/QtCompositeView.cpp b/src/lib_gui/qt/view/QtCompositeView.cpp index 8f693ecd..183d6515 100644 --- a/src/lib_gui/qt/view/QtCompositeView.cpp +++ b/src/lib_gui/qt/view/QtCompositeView.cpp @@ -1,10 +1,10 @@ -#include "qt/view/QtCompositeView.h" +#include "QtCompositeView.h" #include -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "settings/ColorScheme.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "ColorScheme.h" QtCompositeView::QtCompositeView(ViewLayout* viewLayout, CompositeDirection direction, const std::string& name) : CompositeView(viewLayout, direction, name) diff --git a/src/lib_gui/qt/view/QtCompositeView.h b/src/lib_gui/qt/view/QtCompositeView.h index f67c78dc..f06ec70b 100644 --- a/src/lib_gui/qt/view/QtCompositeView.h +++ b/src/lib_gui/qt/view/QtCompositeView.h @@ -3,8 +3,8 @@ #include -#include "component/view/CompositeView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "CompositeView.h" +#include "QtThreadedFunctor.h" class QtCompositeView : public CompositeView diff --git a/src/lib_gui/qt/view/QtDialogView.cpp b/src/lib_gui/qt/view/QtDialogView.cpp index a715f53a..116a0c4e 100644 --- a/src/lib_gui/qt/view/QtDialogView.cpp +++ b/src/lib_gui/qt/view/QtDialogView.cpp @@ -1,4 +1,4 @@ -#include "qt/view/QtDialogView.h" +#include "QtDialogView.h" #include #include @@ -7,15 +7,15 @@ #include #include -#include "data/access/StorageAccess.h" -#include "qt/window/QtIndexingDialog.h" -#include "qt/window/QtMainWindow.h" -#include "qt/window/QtWindow.h" -#include "utility/messaging/type/indexing/MessageIndexingStatus.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/scheduling/TaskLambda.h" -#include "utility/utility.h" -#include "project/Project.h" +#include "StorageAccess.h" +#include "QtIndexingDialog.h" +#include "QtMainWindow.h" +#include "QtWindow.h" +#include "MessageIndexingStatus.h" +#include "MessageStatus.h" +#include "TaskLambda.h" +#include "utility.h" +#include "Project.h" QtDialogView::QtDialogView(QtMainWindow* mainWindow, UseCase useCase, StorageAccess* storageAccess) : DialogView(useCase, storageAccess) diff --git a/src/lib_gui/qt/view/QtDialogView.h b/src/lib_gui/qt/view/QtDialogView.h index a7b64989..132fcea1 100644 --- a/src/lib_gui/qt/view/QtDialogView.h +++ b/src/lib_gui/qt/view/QtDialogView.h @@ -1,16 +1,16 @@ #ifndef QT_DIALOG_VIEW_H #define QT_DIALOG_VIEW_H -#include "component/view/DialogView.h" +#include "DialogView.h" -#include "qt/utility/QtThreadedFunctor.h" -#include "qt/window/QtWindowStack.h" +#include "QtThreadedFunctor.h" +#include "QtWindowStack.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/error/MessageErrorCountUpdate.h" -#include "utility/messaging/type/indexing/MessageIndexingShowDialog.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/messaging/type/MessageWindowClosed.h" +#include "MessageListener.h" +#include "MessageErrorCountUpdate.h" +#include "MessageIndexingShowDialog.h" +#include "MessageInterruptTasks.h" +#include "MessageWindowClosed.h" class QtIndexingDialog; class QtMainWindow; diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp index 04e97aaf..4749e6b2 100644 --- a/src/lib_gui/qt/view/QtErrorView.cpp +++ b/src/lib_gui/qt/view/QtErrorView.cpp @@ -1,4 +1,4 @@ -#include "qt/view/QtErrorView.h" +#include "QtErrorView.h" #include #include @@ -13,14 +13,14 @@ #include #include -#include "qt/element/QtHelpButton.h" -#include "qt/element/QtIconButton.h" -#include "qt/element/QtTable.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "settings/ColorScheme.h" -#include "utility/messaging/type/MessageProjectEdit.h" -#include "utility/ResourcePaths.h" +#include "QtHelpButton.h" +#include "QtIconButton.h" +#include "QtTable.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "ColorScheme.h" +#include "MessageProjectEdit.h" +#include "ResourcePaths.h" QIcon QtErrorView::s_errorIcon; diff --git a/src/lib_gui/qt/view/QtErrorView.h b/src/lib_gui/qt/view/QtErrorView.h index 57b007b6..1b33e617 100644 --- a/src/lib_gui/qt/view/QtErrorView.h +++ b/src/lib_gui/qt/view/QtErrorView.h @@ -3,11 +3,11 @@ #include -#include "component/controller/ErrorController.h" -#include "component/controller/helper/ControllerProxy.h" -#include "component/view/ErrorView.h" -#include "data/ErrorFilter.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "ErrorController.h" +#include "ControllerProxy.h" +#include "ErrorView.h" +#include "ErrorFilter.h" +#include "QtThreadedFunctor.h" class QBoxLayout; class QCheckBox; diff --git a/src/lib_gui/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp index 038a2f6e..751a79f7 100644 --- a/src/lib_gui/qt/view/QtGraphView.cpp +++ b/src/lib_gui/qt/view/QtGraphView.cpp @@ -1,4 +1,4 @@ -#include "qt/view/QtGraphView.h" +#include "QtGraphView.h" #include #include @@ -13,31 +13,31 @@ #include #include -#include "utility/messaging/type/MessageActivateTrail.h" -#include "utility/messaging/type/MessageDeactivateEdge.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageScrollGraph.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/ResourcePaths.h" +#include "MessageActivateTrail.h" +#include "MessageDeactivateEdge.h" +#include "MessageRefresh.h" +#include "MessageScrollGraph.h" +#include "MessageStatus.h" +#include "ResourcePaths.h" -#include "component/controller/helper/DummyEdge.h" -#include "component/controller/helper/DummyNode.h" -#include "component/view/GraphViewStyle.h" -#include "qt/element/QtIconButton.h" -#include "qt/graphics/QtGraphicsView.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h" -#include "qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h" -#include "qt/view/graphElements/QtGraphEdge.h" -#include "qt/view/graphElements/QtGraphNodeAccess.h" -#include "qt/view/graphElements/QtGraphNodeBundle.h" -#include "qt/view/graphElements/QtGraphNodeData.h" -#include "qt/view/graphElements/QtGraphNodeExpandToggle.h" -#include "qt/view/graphElements/QtGraphNodeGroup.h" -#include "qt/view/graphElements/QtGraphNodeQualifier.h" -#include "qt/view/graphElements/QtGraphNodeText.h" -#include "settings/ApplicationSettings.h" +#include "DummyEdge.h" +#include "DummyNode.h" +#include "GraphViewStyle.h" +#include "QtIconButton.h" +#include "QtGraphicsView.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "QtGraphNodeComponentClickable.h" +#include "QtGraphNodeComponentMoveable.h" +#include "QtGraphEdge.h" +#include "QtGraphNodeAccess.h" +#include "QtGraphNodeBundle.h" +#include "QtGraphNodeData.h" +#include "QtGraphNodeExpandToggle.h" +#include "QtGraphNodeGroup.h" +#include "QtGraphNodeQualifier.h" +#include "QtGraphNodeText.h" +#include "ApplicationSettings.h" QtGraphView::QtGraphView(ViewLayout* viewLayout) : GraphView(viewLayout) diff --git a/src/lib_gui/qt/view/QtGraphView.h b/src/lib_gui/qt/view/QtGraphView.h index a5e6d40e..5c7a3738 100644 --- a/src/lib_gui/qt/view/QtGraphView.h +++ b/src/lib_gui/qt/view/QtGraphView.h @@ -6,11 +6,11 @@ #include #include -#include "component/view/GraphView.h" -#include "data/graph/Graph.h" -#include "qt/utility/QtScrollSpeedChangeListener.h" -#include "qt/utility/QtThreadedFunctor.h" -#include "utility/types.h" +#include "GraphView.h" +#include "Graph.h" +#include "QtScrollSpeedChangeListener.h" +#include "QtThreadedFunctor.h" +#include "types.h" struct DummyEdge; struct DummyNode; diff --git a/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp b/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp index c44804f3..3c658231 100644 --- a/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp +++ b/src/lib_gui/qt/view/QtGraphViewStyleImpl.cpp @@ -1,10 +1,10 @@ -#include "qt/view/QtGraphViewStyleImpl.h" +#include "QtGraphViewStyleImpl.h" #include #include -#include "component/view/GraphViewStyle.h" -#include "utility/utilityApp.h" +#include "GraphViewStyle.h" +#include "utilityApp.h" float QtGraphViewStyleImpl::getCharWidth(const std::string& fontName, size_t fontSize) { diff --git a/src/lib_gui/qt/view/QtGraphViewStyleImpl.h b/src/lib_gui/qt/view/QtGraphViewStyleImpl.h index 874ccf9c..42048a0f 100644 --- a/src/lib_gui/qt/view/QtGraphViewStyleImpl.h +++ b/src/lib_gui/qt/view/QtGraphViewStyleImpl.h @@ -1,7 +1,7 @@ #ifndef QT_GRAPH_VIEW_STYLE_IMPL_H #define QT_GRAPH_VIEW_STYLE_IMPL_H -#include "component/view/GraphViewStyleImpl.h" +#include "GraphViewStyleImpl.h" class QFont; diff --git a/src/lib_gui/qt/view/QtMainView.cpp b/src/lib_gui/qt/view/QtMainView.cpp index 5689cf5a..8abb9696 100644 --- a/src/lib_gui/qt/view/QtMainView.cpp +++ b/src/lib_gui/qt/view/QtMainView.cpp @@ -1,7 +1,7 @@ -#include "qt/view/QtMainView.h" +#include "QtMainView.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "qt/window/QtMainWindow.h" +#include "QtViewWidgetWrapper.h" +#include "QtMainWindow.h" QtMainView::QtMainView() { diff --git a/src/lib_gui/qt/view/QtMainView.h b/src/lib_gui/qt/view/QtMainView.h index 34b07820..337931a9 100644 --- a/src/lib_gui/qt/view/QtMainView.h +++ b/src/lib_gui/qt/view/QtMainView.h @@ -6,13 +6,13 @@ #include -#include "component/view/MainView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "MainView.h" +#include "QtThreadedFunctor.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/type/MessageForceEnterLicense.h" -#include "utility/messaging/type/MessageProjectEdit.h" -#include "utility/messaging/type/MessageProjectNew.h" +#include "MessageListener.h" +#include "MessageForceEnterLicense.h" +#include "MessageProjectEdit.h" +#include "MessageProjectNew.h" class QtMainWindow; class View; diff --git a/src/lib_gui/qt/view/QtRefreshView.cpp b/src/lib_gui/qt/view/QtRefreshView.cpp index 80ee66e6..78ea5875 100644 --- a/src/lib_gui/qt/view/QtRefreshView.cpp +++ b/src/lib_gui/qt/view/QtRefreshView.cpp @@ -1,14 +1,14 @@ -#include "qt/view/QtRefreshView.h" +#include "QtRefreshView.h" #include #include -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/ResourcePaths.h" +#include "MessageRefresh.h" +#include "ResourcePaths.h" -#include "qt/element/QtSearchBarButton.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" +#include "QtSearchBarButton.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" QtRefreshView::QtRefreshView(ViewLayout* viewLayout) : RefreshView(viewLayout) diff --git a/src/lib_gui/qt/view/QtRefreshView.h b/src/lib_gui/qt/view/QtRefreshView.h index 9b0e9dcf..390d2038 100644 --- a/src/lib_gui/qt/view/QtRefreshView.h +++ b/src/lib_gui/qt/view/QtRefreshView.h @@ -1,8 +1,8 @@ #ifndef QT_REFRESH_VIEW_H #define QT_REFRESH_VIEW_H -#include "component/view/RefreshView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "RefreshView.h" +#include "QtThreadedFunctor.h" class QFrame; diff --git a/src/lib_gui/qt/view/QtScreenSearchView.cpp b/src/lib_gui/qt/view/QtScreenSearchView.cpp index e155d00f..05ceab4c 100644 --- a/src/lib_gui/qt/view/QtScreenSearchView.cpp +++ b/src/lib_gui/qt/view/QtScreenSearchView.cpp @@ -1,13 +1,13 @@ -#include "qt/view/QtScreenSearchView.h" +#include "QtScreenSearchView.h" #include -#include "qt/element/QtScreenSearchBox.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtMainView.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "qt/window/QtMainWindow.h" -#include "utility/ResourcePaths.h" +#include "QtScreenSearchBox.h" +#include "utilityQt.h" +#include "QtMainView.h" +#include "QtViewWidgetWrapper.h" +#include "QtMainWindow.h" +#include "ResourcePaths.h" QtScreenSearchView::QtScreenSearchView(ViewLayout* viewLayout) : ScreenSearchView(viewLayout) diff --git a/src/lib_gui/qt/view/QtScreenSearchView.h b/src/lib_gui/qt/view/QtScreenSearchView.h index fae32033..3c7ec9e8 100644 --- a/src/lib_gui/qt/view/QtScreenSearchView.h +++ b/src/lib_gui/qt/view/QtScreenSearchView.h @@ -1,10 +1,10 @@ #ifndef QT_SCREEN_SEARCH_VIEW_H #define QT_SCREEN_SEARCH_VIEW_H -#include "component/controller/helper/ControllerProxy.h" -#include "component/controller/ScreenSearchController.h" -#include "component/view/ScreenSearchView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "ControllerProxy.h" +#include "ScreenSearchController.h" +#include "ScreenSearchView.h" +#include "QtThreadedFunctor.h" class QtScreenSearchBox; class QToolBar; diff --git a/src/lib_gui/qt/view/QtSearchView.cpp b/src/lib_gui/qt/view/QtSearchView.cpp index 4dd92434..80cdd6da 100644 --- a/src/lib_gui/qt/view/QtSearchView.cpp +++ b/src/lib_gui/qt/view/QtSearchView.cpp @@ -1,10 +1,10 @@ -#include "qt/view/QtSearchView.h" +#include "QtSearchView.h" -#include "utility/ResourcePaths.h" +#include "ResourcePaths.h" -#include "qt/element/QtSearchBar.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" +#include "QtSearchBar.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" QtSearchView::QtSearchView(ViewLayout* viewLayout) : SearchView(viewLayout) diff --git a/src/lib_gui/qt/view/QtSearchView.h b/src/lib_gui/qt/view/QtSearchView.h index 2075b0a0..d3bc63b2 100644 --- a/src/lib_gui/qt/view/QtSearchView.h +++ b/src/lib_gui/qt/view/QtSearchView.h @@ -3,8 +3,8 @@ #include -#include "component/view/SearchView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "SearchView.h" +#include "QtThreadedFunctor.h" class QtSearchBar; diff --git a/src/lib_gui/qt/view/QtStatusBarView.cpp b/src/lib_gui/qt/view/QtStatusBarView.cpp index db4893e1..a366001f 100644 --- a/src/lib_gui/qt/view/QtStatusBarView.cpp +++ b/src/lib_gui/qt/view/QtStatusBarView.cpp @@ -1,8 +1,8 @@ -#include "qt/view/QtStatusBarView.h" +#include "QtStatusBarView.h" #include -#include "qt/view/QtMainView.h" +#include "QtMainView.h" QtStatusBarView::QtStatusBarView(ViewLayout* viewLayout) : StatusBarView(viewLayout) diff --git a/src/lib_gui/qt/view/QtStatusBarView.h b/src/lib_gui/qt/view/QtStatusBarView.h index b51b0dbe..7b4b4165 100644 --- a/src/lib_gui/qt/view/QtStatusBarView.h +++ b/src/lib_gui/qt/view/QtStatusBarView.h @@ -4,10 +4,10 @@ #include #include -#include "component/view/StatusBarView.h" -#include "data/ErrorCountInfo.h" -#include "qt/element/QtStatusBar.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "StatusBarView.h" +#include "ErrorCountInfo.h" +#include "QtStatusBar.h" +#include "QtThreadedFunctor.h" class QtStatusBarView : public StatusBarView diff --git a/src/lib_gui/qt/view/QtStatusView.cpp b/src/lib_gui/qt/view/QtStatusView.cpp index 4e35a287..b45b18fb 100644 --- a/src/lib_gui/qt/view/QtStatusView.cpp +++ b/src/lib_gui/qt/view/QtStatusView.cpp @@ -1,4 +1,4 @@ -#include "qt/view/QtStatusView.h" +#include "QtStatusView.h" #include #include @@ -6,13 +6,13 @@ #include #include -#include "qt/element/QtTable.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "settings/ApplicationSettings.h" -#include "settings/ColorScheme.h" -#include "utility/messaging/type/MessageClearStatusView.h" -#include "utility/messaging/type/MessageStatusFilterChanged.h" +#include "QtTable.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "ApplicationSettings.h" +#include "ColorScheme.h" +#include "MessageClearStatusView.h" +#include "MessageStatusFilterChanged.h" QtStatusView::QtStatusView(ViewLayout* viewLayout) : StatusView(viewLayout) diff --git a/src/lib_gui/qt/view/QtStatusView.h b/src/lib_gui/qt/view/QtStatusView.h index a46051de..c74da6c8 100644 --- a/src/lib_gui/qt/view/QtStatusView.h +++ b/src/lib_gui/qt/view/QtStatusView.h @@ -3,8 +3,8 @@ #include -#include "component/view/StatusView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "StatusView.h" +#include "QtThreadedFunctor.h" class QBoxLayout; class QCheckBox; diff --git a/src/lib_gui/qt/view/QtTabbedView.cpp b/src/lib_gui/qt/view/QtTabbedView.cpp index c78fb5ff..d6934be0 100644 --- a/src/lib_gui/qt/view/QtTabbedView.cpp +++ b/src/lib_gui/qt/view/QtTabbedView.cpp @@ -1,4 +1,4 @@ -#include "qt/view/QtTabbedView.h" +#include "QtTabbedView.h" #include #include @@ -6,11 +6,11 @@ #include #include -#include "qt/element/QtIconButton.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "settings/ColorScheme.h" -#include "utility/ResourcePaths.h" +#include "QtIconButton.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "ColorScheme.h" +#include "ResourcePaths.h" QtTabbedView::QtTabbedView(ViewLayout* viewLayout, const std::string& name) : TabbedView(viewLayout, name) diff --git a/src/lib_gui/qt/view/QtTabbedView.h b/src/lib_gui/qt/view/QtTabbedView.h index db6fe84c..b38e9bfd 100644 --- a/src/lib_gui/qt/view/QtTabbedView.h +++ b/src/lib_gui/qt/view/QtTabbedView.h @@ -3,8 +3,8 @@ #include -#include "component/view/TabbedView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "TabbedView.h" +#include "QtThreadedFunctor.h" class QTabWidget; class QtSelfRefreshIconButton; diff --git a/src/lib_gui/qt/view/QtTooltipView.cpp b/src/lib_gui/qt/view/QtTooltipView.cpp index 0753e708..cb92987e 100644 --- a/src/lib_gui/qt/view/QtTooltipView.cpp +++ b/src/lib_gui/qt/view/QtTooltipView.cpp @@ -1,11 +1,11 @@ -#include "qt/view/QtTooltipView.h" +#include "QtTooltipView.h" -#include "qt/element/QtTooltip.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtMainView.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "qt/window/QtMainWindow.h" -#include "utility/ResourcePaths.h" +#include "QtTooltip.h" +#include "utilityQt.h" +#include "QtMainView.h" +#include "QtViewWidgetWrapper.h" +#include "QtMainWindow.h" +#include "ResourcePaths.h" QtTooltipView::QtTooltipView(ViewLayout* viewLayout) : TooltipView(viewLayout) diff --git a/src/lib_gui/qt/view/QtTooltipView.h b/src/lib_gui/qt/view/QtTooltipView.h index 6d5ea566..accd3299 100644 --- a/src/lib_gui/qt/view/QtTooltipView.h +++ b/src/lib_gui/qt/view/QtTooltipView.h @@ -1,8 +1,8 @@ #ifndef QT_TOOLTIP_VIEW #define QT_TOOLTIP_VIEW -#include "component/view/TooltipView.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "TooltipView.h" +#include "QtThreadedFunctor.h" class QTimer; class QtTooltip; diff --git a/src/lib_gui/qt/view/QtUndoRedoView.cpp b/src/lib_gui/qt/view/QtUndoRedoView.cpp index 3925a097..70db7cd2 100644 --- a/src/lib_gui/qt/view/QtUndoRedoView.cpp +++ b/src/lib_gui/qt/view/QtUndoRedoView.cpp @@ -1,9 +1,9 @@ -#include "qt/view/QtUndoRedoView.h" +#include "QtUndoRedoView.h" -#include "utility/ResourcePaths.h" -#include "qt/utility/utilityQt.h" +#include "ResourcePaths.h" +#include "utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" +#include "QtViewWidgetWrapper.h" QtUndoRedoView::QtUndoRedoView(ViewLayout* viewLayout) : UndoRedoView(viewLayout) diff --git a/src/lib_gui/qt/view/QtUndoRedoView.h b/src/lib_gui/qt/view/QtUndoRedoView.h index 01682581..75fe717b 100644 --- a/src/lib_gui/qt/view/QtUndoRedoView.h +++ b/src/lib_gui/qt/view/QtUndoRedoView.h @@ -4,9 +4,9 @@ #include #include -#include "component/view/UndoRedoView.h" -#include "qt/element/QtUndoRedo.h" -#include "qt/utility/QtThreadedFunctor.h" +#include "UndoRedoView.h" +#include "QtUndoRedo.h" +#include "QtThreadedFunctor.h" class QtUndoRedoView : public UndoRedoView { diff --git a/src/lib_gui/qt/view/QtViewFactory.cpp b/src/lib_gui/qt/view/QtViewFactory.cpp index e26a0485..5a088e93 100644 --- a/src/lib_gui/qt/view/QtViewFactory.cpp +++ b/src/lib_gui/qt/view/QtViewFactory.cpp @@ -1,22 +1,22 @@ -#include "qt/view/QtViewFactory.h" +#include "QtViewFactory.h" -#include "component/view/GraphViewStyle.h" -#include "qt/view/QtBookmarkView.h" -#include "qt/view/QtCodeView.h" -#include "qt/view/QtCompositeView.h" -#include "qt/view/QtDialogView.h" -#include "qt/view/QtErrorView.h" -#include "qt/view/QtGraphView.h" -#include "qt/view/QtGraphViewStyleImpl.h" -#include "qt/view/QtMainView.h" -#include "qt/view/QtRefreshView.h" -#include "qt/view/QtScreenSearchView.h" -#include "qt/view/QtSearchView.h" -#include "qt/view/QtStatusBarView.h" -#include "qt/view/QtStatusView.h" -#include "qt/view/QtTabbedView.h" -#include "qt/view/QtTooltipView.h" -#include "qt/view/QtUndoRedoView.h" +#include "GraphViewStyle.h" +#include "QtBookmarkView.h" +#include "QtCodeView.h" +#include "QtCompositeView.h" +#include "QtDialogView.h" +#include "QtErrorView.h" +#include "QtGraphView.h" +#include "QtGraphViewStyleImpl.h" +#include "QtMainView.h" +#include "QtRefreshView.h" +#include "QtScreenSearchView.h" +#include "QtSearchView.h" +#include "QtStatusBarView.h" +#include "QtStatusView.h" +#include "QtTabbedView.h" +#include "QtTooltipView.h" +#include "QtUndoRedoView.h" QtViewFactory::QtViewFactory() { diff --git a/src/lib_gui/qt/view/QtViewFactory.h b/src/lib_gui/qt/view/QtViewFactory.h index 02b5825c..698c00f3 100644 --- a/src/lib_gui/qt/view/QtViewFactory.h +++ b/src/lib_gui/qt/view/QtViewFactory.h @@ -1,7 +1,7 @@ #ifndef QT_VIEW_FACTORY_H #define QT_VIEW_FACTORY_H -#include "component/view/ViewFactory.h" +#include "ViewFactory.h" class QtViewFactory : public ViewFactory diff --git a/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp b/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp index baf6c4ff..9d014361 100644 --- a/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp +++ b/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp @@ -1,7 +1,7 @@ -#include "qt/view/QtViewWidgetWrapper.h" +#include "QtViewWidgetWrapper.h" -#include "component/view/View.h" -#include "utility/logging/logging.h" +#include "View.h" +#include "logging.h" QWidget* QtViewWidgetWrapper::getWidgetOfView(const View* view) { diff --git a/src/lib_gui/qt/view/QtViewWidgetWrapper.h b/src/lib_gui/qt/view/QtViewWidgetWrapper.h index 1935c0e1..5907bf04 100644 --- a/src/lib_gui/qt/view/QtViewWidgetWrapper.h +++ b/src/lib_gui/qt/view/QtViewWidgetWrapper.h @@ -3,7 +3,7 @@ #include -#include "component/view/ViewWidgetWrapper.h" +#include "ViewWidgetWrapper.h" class View; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp index cbe005fa..ff180212 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp @@ -1,25 +1,25 @@ -#include "qt/view/graphElements/QtGraphEdge.h" +#include "QtGraphEdge.h" #include #include -#include "component/view/GraphViewStyle.h" -#include "data/graph/Edge.h" -#include "data/graph/token_component/TokenComponentAggregation.h" -#include "data/graph/token_component/TokenComponentInheritanceChain.h" -#include "qt/graphics/QtLineItemAngled.h" -#include "qt/graphics/QtLineItemBezier.h" -#include "qt/graphics/QtLineItemStraight.h" -#include "qt/view/graphElements/QtGraphNode.h" -#include "utility/messaging/type/MessageActivateEdge.h" -#include "utility/messaging/type/MessageActivateTrailEdge.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageGraphNodeBundleSplit.h" -#include "utility/messaging/type/MessageGraphNodeHide.h" -#include "utility/messaging/type/MessageTooltipShow.h" -#include "utility/messaging/type/MessageTooltipHide.h" -#include "utility/utility.h" +#include "GraphViewStyle.h" +#include "Edge.h" +#include "TokenComponentAggregation.h" +#include "TokenComponentInheritanceChain.h" +#include "QtLineItemAngled.h" +#include "QtLineItemBezier.h" +#include "QtLineItemStraight.h" +#include "QtGraphNode.h" +#include "MessageActivateEdge.h" +#include "MessageActivateTrailEdge.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageGraphNodeBundleSplit.h" +#include "MessageGraphNodeHide.h" +#include "MessageTooltipShow.h" +#include "MessageTooltipHide.h" +#include "utility.h" QtGraphEdge* QtGraphEdge::s_focusedEdge = nullptr; QtGraphEdge* QtGraphEdge::s_focusedBezierEdge = nullptr; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphEdge.h b/src/lib_gui/qt/view/graphElements/QtGraphEdge.h index e5d66080..2a654c50 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphEdge.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphEdge.h @@ -5,10 +5,10 @@ #include -#include "utility/math/Vector2.h" -#include "utility/math/Vector4.h" +#include "Vector2.h" +#include "Vector4.h" -#include "data/graph/token_component/TokenComponentAggregation.h" +#include "TokenComponentAggregation.h" class Edge; class QtGraphNode; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp index cd1d9007..feed8831 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNode.cpp @@ -1,4 +1,4 @@ -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" #include #include @@ -6,18 +6,18 @@ #include #include -#include "qt/graphics/QtRoundedRectItem.h" -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h" -#include "qt/view/graphElements/QtGraphEdge.h" -#include "qt/view/graphElements/QtGraphNodeExpandToggle.h" -#include "utility/messaging/type/code/MessageCodeShowDefinition.h" -#include "utility/messaging/type/MessageGraphNodeExpand.h" -#include "utility/messaging/type/MessageGraphNodeHide.h" -#include "utility/messaging/type/MessageGraphNodeMove.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "QtRoundedRectItem.h" +#include "QtDeviceScaledPixmap.h" +#include "utilityQt.h" +#include "QtGraphNodeComponent.h" +#include "QtGraphEdge.h" +#include "QtGraphNodeExpandToggle.h" +#include "MessageCodeShowDefinition.h" +#include "MessageGraphNodeExpand.h" +#include "MessageGraphNodeHide.h" +#include "MessageGraphNodeMove.h" +#include "ResourcePaths.h" +#include "utilityString.h" void QtGraphNode::blendIn() { diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNode.h b/src/lib_gui/qt/view/graphElements/QtGraphNode.h index 8386449b..38887fb0 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNode.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNode.h @@ -5,9 +5,9 @@ #include -#include "utility/math/Vector4.h" +#include "Vector4.h" -#include "component/view/GraphViewStyle.h" +#include "GraphViewStyle.h" class QFont; class QtGraphEdge; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp index f014b404..bc9f3862 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp @@ -1,15 +1,15 @@ -#include "qt/view/graphElements/QtGraphNodeAccess.h" +#include "QtGraphNodeAccess.h" #include #include #include -#include "utility/ResourcePaths.h" +#include "ResourcePaths.h" -#include "component/view/GraphViewStyle.h" -#include "data/graph/token_component/TokenComponentAccess.h" -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "qt/utility/utilityQt.h" +#include "GraphViewStyle.h" +#include "TokenComponentAccess.h" +#include "QtDeviceScaledPixmap.h" +#include "utilityQt.h" QtGraphNodeAccess::QtGraphNodeAccess(AccessKind accessKind) : QtGraphNode() diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h index fa3c8152..e7e6d5d2 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.h @@ -1,9 +1,9 @@ #ifndef QT_GRAPH_NODE_ACCESS_H #define QT_GRAPH_NODE_ACCESS_H -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" -#include "data/parser/AccessKind.h" +#include "AccessKind.h" class QtGraphNodeAccess : public QtGraphNode diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp index 50fdf2c2..15404b9b 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.cpp @@ -1,12 +1,12 @@ -#include "qt/view/graphElements/QtGraphNodeBundle.h" +#include "QtGraphNodeBundle.h" #include #include -#include "utility/messaging/type/MessageGraphNodeBundleSplit.h" +#include "MessageGraphNodeBundleSplit.h" -#include "component/view/GraphViewStyle.h" -#include "qt/graphics/QtCountCircleItem.h" +#include "GraphViewStyle.h" +#include "QtCountCircleItem.h" QtGraphNodeBundle::QtGraphNodeBundle(Id tokenId, size_t nodeCount, NodeType type, std::wstring name) : QtGraphNode() diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h index c88097aa..e383f592 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeBundle.h @@ -1,8 +1,8 @@ #ifndef QT_GRAPH_NODE_BUNDLE_H #define QT_GRAPH_NODE_BUNDLE_H -#include "data/graph/Node.h" -#include "qt/view/graphElements/QtGraphNode.h" +#include "Node.h" +#include "QtGraphNode.h" class QtCountCircleItem; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp index ba5f1832..ee5cabbc 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeData.cpp @@ -1,14 +1,14 @@ -#include "qt/view/graphElements/QtGraphNodeData.h" +#include "QtGraphNodeData.h" -#include "utility/file/FilePath.h" -#include "utility/messaging/type/MessageActivateNodes.h" -#include "utility/messaging/type/MessageDeactivateEdge.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageTooltipShow.h" -#include "utility/ResourcePaths.h" +#include "FilePath.h" +#include "MessageActivateNodes.h" +#include "MessageDeactivateEdge.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageTooltipShow.h" +#include "ResourcePaths.h" -#include "data/graph/token_component/TokenComponentFilePath.h" +#include "TokenComponentFilePath.h" QtGraphNodeData::QtGraphNodeData(const Node* data, const std::wstring& name, bool childVisible, bool hasQualifier, bool isInteractive) : m_data(data) diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeData.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeData.h index 60ac3c66..124d1a6f 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeData.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeData.h @@ -1,7 +1,7 @@ #ifndef QT_GRAPH_NODE_DATA_H #define QT_GRAPH_NODE_DATA_H -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" class FilePath; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp index 6105c782..0a4179e1 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp @@ -1,14 +1,14 @@ -#include "qt/view/graphElements/QtGraphNodeExpandToggle.h" +#include "QtGraphNodeExpandToggle.h" #include -#include "qt/graphics/QtRoundedRectItem.h" -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "qt/utility/utilityQt.h" +#include "QtRoundedRectItem.h" +#include "QtDeviceScaledPixmap.h" +#include "utilityQt.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageGraphNodeExpand.h" -#include "utility/ResourcePaths.h" +#include "logging.h" +#include "MessageGraphNodeExpand.h" +#include "ResourcePaths.h" QtGraphNodeExpandToggle::QtGraphNodeExpandToggle(bool expanded, int invisibleSubNodeCount) : m_invisibleSubNodeCount(invisibleSubNodeCount) diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h index 63acc57b..5ee3cde3 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.h @@ -3,7 +3,7 @@ #include -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" class QtGraphNodeExpandToggle : public QtGraphNode diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.cpp index 8a72ec46..581143a5 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.cpp @@ -1,4 +1,4 @@ -#include "qt/view/graphElements/QtGraphNodeGroup.h" +#include "QtGraphNodeGroup.h" #include #include @@ -6,12 +6,12 @@ #include #include -#include "utility/messaging/type/MessageActivateNodes.h" -#include "utility/messaging/type/MessageFocusIn.h" -#include "utility/messaging/type/MessageFocusOut.h" -#include "utility/messaging/type/MessageGraphNodeBundleSplit.h" +#include "MessageActivateNodes.h" +#include "MessageFocusIn.h" +#include "MessageFocusOut.h" +#include "MessageGraphNodeBundleSplit.h" -#include "qt/graphics/QtRoundedRectItem.h" +#include "QtRoundedRectItem.h" QtGraphNodeGroup::QtGraphNodeGroup( Id tokenId, const std::wstring& name, GroupType type, bool interactive diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.h index a7570ce1..b0dfe627 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeGroup.h @@ -1,8 +1,8 @@ #ifndef QT_GRAPH_NODE_GROUP_H #define QT_GRAPH_NODE_GROUP_H -#include "data/GroupType.h" -#include "qt/view/graphElements/QtGraphNode.h" +#include "GroupType.h" +#include "QtGraphNode.h" class QGraphicsPolygonItem; class QPainterPath; diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp index 3b963e35..075ddec3 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.cpp @@ -1,4 +1,4 @@ -#include "qt/view/graphElements/QtGraphNodeQualifier.h" +#include "QtGraphNodeQualifier.h" #include #include @@ -6,9 +6,9 @@ #include #include -#include "utility/messaging/type/MessageActivateNodes.h" +#include "MessageActivateNodes.h" -#include "data/name/NameHierarchy.h" +#include "NameHierarchy.h" QtGraphNodeQualifier::QtGraphNodeQualifier(const NameHierarchy& name) : m_qualifierName(name) diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.h index 378584cd..2e0e0b8f 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeQualifier.h @@ -4,7 +4,7 @@ #include #include -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" class QtGraphNodeQualifier : public QtGraphNode diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeText.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeText.cpp index d825f48c..47e1ae5a 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeText.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeText.cpp @@ -1,4 +1,4 @@ -#include "qt/view/graphElements/QtGraphNodeText.h" +#include "QtGraphNodeText.h" QtGraphNodeText::QtGraphNodeText(const std::wstring& name, int fontSizeDiff) : m_fontSizeDiff(fontSizeDiff) diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeText.h b/src/lib_gui/qt/view/graphElements/QtGraphNodeText.h index 34691e82..9b66a719 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeText.h +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeText.h @@ -1,7 +1,7 @@ #ifndef QT_GRAPH_NODE_TEXT_H #define QT_GRAPH_NODE_TEXT_H -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" class QtGraphNodeText : public QtGraphNode diff --git a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp index 11d18040..a2d36367 100644 --- a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp +++ b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp @@ -2,7 +2,7 @@ #include -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" QtGraphNodeComponentClickable::QtGraphNodeComponentClickable(QtGraphNode* graphNode) : QtGraphNodeComponent(graphNode) diff --git a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h index 8cc2a5f6..416571fd 100644 --- a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h +++ b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.h @@ -3,7 +3,7 @@ #include "QtGraphNodeComponent.h" -#include "utility/math/Vector2.h" +#include "Vector2.h" class QtGraphNodeComponentClickable : public QtGraphNodeComponent diff --git a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp index 268f50b1..d93f8eb0 100644 --- a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp +++ b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.cpp @@ -2,7 +2,7 @@ #include -#include "qt/view/graphElements/QtGraphNode.h" +#include "QtGraphNode.h" QtGraphNodeComponentMoveable::QtGraphNodeComponentMoveable(QtGraphNode* graphNode) : QtGraphNodeComponent(graphNode) diff --git a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h index d5868bbd..52aacd0e 100644 --- a/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h +++ b/src/lib_gui/qt/view/graphElements/nodeComponents/QtGraphNodeComponentMoveable.h @@ -3,7 +3,7 @@ #include "QtGraphNodeComponent.h" -#include "utility/math/Vector2.h" +#include "Vector2.h" class QtGraphNodeComponentMoveable : public QtGraphNodeComponent diff --git a/src/lib_gui/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp index fcd60d99..b1686a7e 100644 --- a/src/lib_gui/qt/window/QtAbout.cpp +++ b/src/lib_gui/qt/window/QtAbout.cpp @@ -1,15 +1,15 @@ -#include "qt/window/QtAbout.h" +#include "QtAbout.h" #include #include #include #include -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "qt/utility/utilityQt.h" -#include "utility/ResourcePaths.h" -#include "utility/utility.h" -#include "utility/Version.h" +#include "QtDeviceScaledPixmap.h" +#include "utilityQt.h" +#include "ResourcePaths.h" +#include "utility.h" +#include "Version.h" QtAbout::QtAbout(QWidget *parent) : QtWindow(false, parent) diff --git a/src/lib_gui/qt/window/QtAbout.h b/src/lib_gui/qt/window/QtAbout.h index 26d9c3fe..9e339cea 100644 --- a/src/lib_gui/qt/window/QtAbout.h +++ b/src/lib_gui/qt/window/QtAbout.h @@ -1,7 +1,7 @@ #ifndef QT_ABOUT_H #define QT_ABOUT_H -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QtAbout : public QtWindow diff --git a/src/lib_gui/qt/window/QtAboutLicense.cpp b/src/lib_gui/qt/window/QtAboutLicense.cpp index a29f881a..e90824dd 100644 --- a/src/lib_gui/qt/window/QtAboutLicense.cpp +++ b/src/lib_gui/qt/window/QtAboutLicense.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtAboutLicense.h" +#include "QtAboutLicense.h" #include #include diff --git a/src/lib_gui/qt/window/QtAboutLicense.h b/src/lib_gui/qt/window/QtAboutLicense.h index 4d37c949..2381a908 100644 --- a/src/lib_gui/qt/window/QtAboutLicense.h +++ b/src/lib_gui/qt/window/QtAboutLicense.h @@ -1,7 +1,7 @@ #ifndef QT_ABOUT_LICENSE_H #define QT_ABOUT_LICENSE_H -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QtAboutLicense : public QtWindow diff --git a/src/lib_gui/qt/window/QtBookmarkBrowser.cpp b/src/lib_gui/qt/window/QtBookmarkBrowser.cpp index 944e0ae3..091a41b0 100644 --- a/src/lib_gui/qt/window/QtBookmarkBrowser.cpp +++ b/src/lib_gui/qt/window/QtBookmarkBrowser.cpp @@ -6,10 +6,10 @@ #include #include -#include "qt/element/QtBookmark.h" -#include "qt/element/QtBookmarkCategory.h" -#include "qt/utility/utilityQt.h" -#include "utility/ResourcePaths.h" +#include "QtBookmark.h" +#include "QtBookmarkCategory.h" +#include "utilityQt.h" +#include "ResourcePaths.h" QtBookmarkBrowser::QtBookmarkBrowser(ControllerProxy* controllerProxy, QWidget* parent) : QtWindow(false, parent) diff --git a/src/lib_gui/qt/window/QtBookmarkBrowser.h b/src/lib_gui/qt/window/QtBookmarkBrowser.h index 825ab50c..5f248792 100644 --- a/src/lib_gui/qt/window/QtBookmarkBrowser.h +++ b/src/lib_gui/qt/window/QtBookmarkBrowser.h @@ -5,10 +5,10 @@ #include #include -#include "component/controller/BookmarkController.h" -#include "component/controller/helper/ControllerProxy.h" -#include "data/bookmark/Bookmark.h" -#include "qt/window/QtWindow.h" +#include "BookmarkController.h" +#include "ControllerProxy.h" +#include "Bookmark.h" +#include "QtWindow.h" class QtBookmark; diff --git a/src/lib_gui/qt/window/QtBookmarkCreator.cpp b/src/lib_gui/qt/window/QtBookmarkCreator.cpp index 41f03ca4..6967e774 100644 --- a/src/lib_gui/qt/window/QtBookmarkCreator.cpp +++ b/src/lib_gui/qt/window/QtBookmarkCreator.cpp @@ -6,10 +6,10 @@ #include #include -#include "data/bookmark/BookmarkCategory.h" -#include "qt/utility/utilityQt.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/ResourcePaths.h" +#include "BookmarkCategory.h" +#include "utilityQt.h" +#include "MessageStatus.h" +#include "ResourcePaths.h" QtBookmarkCreator::QtBookmarkCreator(ControllerProxy* controllerProxy, QWidget* parent, Id bookmarkId) : QtWindow(false, parent) diff --git a/src/lib_gui/qt/window/QtBookmarkCreator.h b/src/lib_gui/qt/window/QtBookmarkCreator.h index f6cdad70..3e311e6e 100644 --- a/src/lib_gui/qt/window/QtBookmarkCreator.h +++ b/src/lib_gui/qt/window/QtBookmarkCreator.h @@ -3,10 +3,10 @@ #include -#include "component/controller/BookmarkController.h" -#include "component/controller/helper/ControllerProxy.h" -#include "qt/window/QtWindow.h" -#include "utility/types.h" +#include "BookmarkController.h" +#include "ControllerProxy.h" +#include "QtWindow.h" +#include "types.h" class BookmarkCategory; class QComboBox; diff --git a/src/lib_gui/qt/window/QtEulaWindow.cpp b/src/lib_gui/qt/window/QtEulaWindow.cpp index ac9dc3cc..3a6127e8 100644 --- a/src/lib_gui/qt/window/QtEulaWindow.cpp +++ b/src/lib_gui/qt/window/QtEulaWindow.cpp @@ -1,11 +1,11 @@ -#include "qt/window/QtEulaWindow.h" +#include "QtEulaWindow.h" #include #include #include -#include "utility/ResourcePaths.h" -#include "utility/text/TextAccess.h" +#include "ResourcePaths.h" +#include "TextAccess.h" QtEulaWindow::QtEulaWindow(QWidget *parent, bool forceAccept) : QtWindow(false, parent) diff --git a/src/lib_gui/qt/window/QtEulaWindow.h b/src/lib_gui/qt/window/QtEulaWindow.h index 9b2c5699..84acdab5 100644 --- a/src/lib_gui/qt/window/QtEulaWindow.h +++ b/src/lib_gui/qt/window/QtEulaWindow.h @@ -1,7 +1,7 @@ #ifndef QT_EULA_LICENSE_H #define QT_EULA_LICENSE_H -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QtEulaWindow : public QtWindow diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp index f3c0da86..51dfd199 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.cpp +++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp @@ -1,17 +1,17 @@ -#include "qt/window/QtIndexingDialog.h" +#include "QtIndexingDialog.h" #include #include #include #include -#include "qt/utility/utilityQt.h" -#include "qt/element/QtHelpButton.h" -#include "qt/element/QtProgressBar.h" -#include "utility/messaging/type/error/MessageErrorsHelpMessage.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/ResourcePaths.h" -#include "utility/utility.h" +#include "utilityQt.h" +#include "QtHelpButton.h" +#include "QtProgressBar.h" +#include "MessageErrorsHelpMessage.h" +#include "MessageInterruptTasks.h" +#include "ResourcePaths.h" +#include "utility.h" QtIndexingDialog::QtIndexingDialog(QWidget* parent) : QtWindow(true, parent) diff --git a/src/lib_gui/qt/window/QtIndexingDialog.h b/src/lib_gui/qt/window/QtIndexingDialog.h index 6c24211b..1447c544 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.h +++ b/src/lib_gui/qt/window/QtIndexingDialog.h @@ -3,8 +3,8 @@ #include -#include "project/RefreshInfo.h" -#include "qt/window/QtWindow.h" +#include "RefreshInfo.h" +#include "QtWindow.h" class QCheckBox; class QLabel; diff --git a/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp b/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp index 0f3644f1..6510a1a0 100644 --- a/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp +++ b/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp @@ -3,8 +3,8 @@ #include #include -#include "qt/utility/utilityQt.h" -#include "utility/ResourcePaths.h" +#include "utilityQt.h" +#include "ResourcePaths.h" QtShortcutTable::QtShortcutTable(QWidget* parent) : QTableWidget(parent) diff --git a/src/lib_gui/qt/window/QtKeyboardShortcuts.h b/src/lib_gui/qt/window/QtKeyboardShortcuts.h index 778c309c..e5eb4bed 100644 --- a/src/lib_gui/qt/window/QtKeyboardShortcuts.h +++ b/src/lib_gui/qt/window/QtKeyboardShortcuts.h @@ -4,7 +4,7 @@ #include #include -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QtShortcutTable : public QTableWidget diff --git a/src/lib_gui/qt/window/QtLicenseWindow.cpp b/src/lib_gui/qt/window/QtLicenseWindow.cpp index 8836b504..07a0c9df 100644 --- a/src/lib_gui/qt/window/QtLicenseWindow.cpp +++ b/src/lib_gui/qt/window/QtLicenseWindow.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtLicenseWindow.h" +#include "QtLicenseWindow.h" #include #include @@ -8,9 +8,9 @@ #include #include "LicenseChecker.h" -#include "qt/utility/utilityQt.h" -#include "settings/ApplicationSettings.h" -#include "utility/ResourcePaths.h" +#include "utilityQt.h" +#include "ApplicationSettings.h" +#include "ResourcePaths.h" QtLicenseWindow::QtLicenseWindow(QWidget *parent) : QtWindow(false, parent) diff --git a/src/lib_gui/qt/window/QtLicenseWindow.h b/src/lib_gui/qt/window/QtLicenseWindow.h index e7ea9d31..f2613beb 100644 --- a/src/lib_gui/qt/window/QtLicenseWindow.h +++ b/src/lib_gui/qt/window/QtLicenseWindow.h @@ -1,7 +1,7 @@ #ifndef QT_LICENSE_WINDOW_H #define QT_LICENSE_WINDOW_H -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QLabel; class QRadioButton; diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp index c47e7349..aa9941d9 100644 --- a/src/lib_gui/qt/window/QtMainWindow.cpp +++ b/src/lib_gui/qt/window/QtMainWindow.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtMainWindow.h" +#include "QtMainWindow.h" #include #include @@ -9,47 +9,47 @@ #include #include "Application.h" -#include "component/view/CompositeView.h" -#include "component/view/TabbedView.h" -#include "component/view/View.h" -#include "data/bookmark/Bookmark.h" -#include "qt/utility/QtContextMenu.h" -#include "qt/utility/QtFileDialog.h" -#include "qt/utility/utilityQt.h" -#include "qt/view/QtViewWidgetWrapper.h" -#include "qt/window/project_wizzard/QtProjectWizzard.h" -#include "qt/window/QtAbout.h" -#include "qt/window/QtAboutLicense.h" -#include "qt/window/QtEulaWindow.h" -#include "qt/window/QtKeyboardShortcuts.h" -#include "qt/window/QtLicenseWindow.h" -#include "qt/window/QtPreferencesWindow.h" -#include "qt/window/QtStartScreen.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FileSystem.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/error/MessageErrorsHelpMessage.h" -#include "utility/messaging/type/history/MessageHistoryRedo.h" -#include "utility/messaging/type/history/MessageHistoryUndo.h" -#include "utility/messaging/type/MessageActivateAll.h" -#include "utility/messaging/type/MessageActivateBase.h" -#include "utility/messaging/type/MessageActivateBookmark.h" -#include "utility/messaging/type/MessageCodeReference.h" -#include "utility/messaging/type/MessageDisplayBookmarkCreator.h" -#include "utility/messaging/type/MessageDisplayBookmarks.h" -#include "utility/messaging/type/MessageEnteredLicense.h" -#include "utility/messaging/type/MessageFind.h" -#include "utility/messaging/type/MessageInterruptTasks.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageResetZoom.h" -#include "utility/messaging/type/MessageWindowClosed.h" -#include "utility/messaging/type/MessageZoom.h" -#include "utility/ResourcePaths.h" -#include "utility/tracing.h" -#include "utility/UserPaths.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" +#include "CompositeView.h" +#include "TabbedView.h" +#include "View.h" +#include "Bookmark.h" +#include "QtContextMenu.h" +#include "QtFileDialog.h" +#include "utilityQt.h" +#include "QtViewWidgetWrapper.h" +#include "QtProjectWizzard.h" +#include "QtAbout.h" +#include "QtAboutLicense.h" +#include "QtEulaWindow.h" +#include "QtKeyboardShortcuts.h" +#include "QtLicenseWindow.h" +#include "QtPreferencesWindow.h" +#include "QtStartScreen.h" +#include "ApplicationSettings.h" +#include "FileSystem.h" +#include "logging.h" +#include "MessageErrorsHelpMessage.h" +#include "MessageHistoryRedo.h" +#include "MessageHistoryUndo.h" +#include "MessageActivateAll.h" +#include "MessageActivateBase.h" +#include "MessageActivateBookmark.h" +#include "MessageCodeReference.h" +#include "MessageDisplayBookmarkCreator.h" +#include "MessageDisplayBookmarks.h" +#include "MessageEnteredLicense.h" +#include "MessageFind.h" +#include "MessageInterruptTasks.h" +#include "MessageLoadProject.h" +#include "MessageRefresh.h" +#include "MessageResetZoom.h" +#include "MessageWindowClosed.h" +#include "MessageZoom.h" +#include "ResourcePaths.h" +#include "tracing.h" +#include "UserPaths.h" +#include "utilityApp.h" +#include "utilityString.h" QtViewToggle::QtViewToggle(View* view, QWidget *parent) diff --git a/src/lib_gui/qt/window/QtMainWindow.h b/src/lib_gui/qt/window/QtMainWindow.h index 99acf29b..4a5b85b5 100644 --- a/src/lib_gui/qt/window/QtMainWindow.h +++ b/src/lib_gui/qt/window/QtMainWindow.h @@ -7,10 +7,10 @@ #include -#include "data/search/SearchMatch.h" +#include "SearchMatch.h" #include "LicenseChecker.h" -#include "qt/utility/QtWindowsTaskbarButton.h" -#include "qt/window/QtWindowStack.h" +#include "QtWindowsTaskbarButton.h" +#include "QtWindowStack.h" class Bookmark; class QDockWidget; diff --git a/src/lib_gui/qt/window/QtPathListDialog.cpp b/src/lib_gui/qt/window/QtPathListDialog.cpp index df0bb39b..4447e1f7 100644 --- a/src/lib_gui/qt/window/QtPathListDialog.cpp +++ b/src/lib_gui/qt/window/QtPathListDialog.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtPathListDialog.h" +#include "QtPathListDialog.h" #include diff --git a/src/lib_gui/qt/window/QtPathListDialog.h b/src/lib_gui/qt/window/QtPathListDialog.h index b6294e4b..e2cdc52e 100644 --- a/src/lib_gui/qt/window/QtPathListDialog.h +++ b/src/lib_gui/qt/window/QtPathListDialog.h @@ -1,8 +1,8 @@ #ifndef QT_PATH_LIST_DIALOG_H #define QT_PATH_LIST_DIALOG_H -#include "qt/element/QtPathListBox.h" -#include "qt/window/QtWindow.h" +#include "QtPathListBox.h" +#include "QtWindow.h" class FilePath; diff --git a/src/lib_gui/qt/window/QtPreferencesWindow.cpp b/src/lib_gui/qt/window/QtPreferencesWindow.cpp index fad6e6f9..2e5ea05d 100644 --- a/src/lib_gui/qt/window/QtPreferencesWindow.cpp +++ b/src/lib_gui/qt/window/QtPreferencesWindow.cpp @@ -1,16 +1,16 @@ -#include "qt/window/QtPreferencesWindow.h" +#include "QtPreferencesWindow.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/messaging/type/MessagePluginPortChange.h" -#include "utility/messaging/type/MessageRefresh.h" -#include "utility/messaging/type/MessageScrollSpeedChange.h" +#include "MessageLoadProject.h" +#include "MessagePluginPortChange.h" +#include "MessageRefresh.h" +#include "MessageScrollSpeedChange.h" #include "Application.h" -#include "component/view/DialogView.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentPaths.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentPreferences.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentGroup.h" -#include "utility/utilityApp.h" +#include "DialogView.h" +#include "QtProjectWizzardContentPaths.h" +#include "QtProjectWizzardContentPreferences.h" +#include "QtProjectWizzardContentGroup.h" +#include "utilityApp.h" QtPreferencesWindow::QtPreferencesWindow(QWidget* parent) : QtProjectWizzardWindow(parent) diff --git a/src/lib_gui/qt/window/QtPreferencesWindow.h b/src/lib_gui/qt/window/QtPreferencesWindow.h index 387ced0e..28e1e5cc 100644 --- a/src/lib_gui/qt/window/QtPreferencesWindow.h +++ b/src/lib_gui/qt/window/QtPreferencesWindow.h @@ -1,9 +1,9 @@ #ifndef QT_PREFERENCES_WINDOW_H #define QT_PREFERENCES_WINDOW_H -#include "qt/window/project_wizzard/QtProjectWizzardWindow.h" +#include "QtProjectWizzardWindow.h" -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" class QtPreferencesWindow : public QtProjectWizzardWindow diff --git a/src/lib_gui/qt/window/QtSelectPathsDialog.cpp b/src/lib_gui/qt/window/QtSelectPathsDialog.cpp index b456509f..72050ea6 100644 --- a/src/lib_gui/qt/window/QtSelectPathsDialog.cpp +++ b/src/lib_gui/qt/window/QtSelectPathsDialog.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtSelectPathsDialog.h" +#include "QtSelectPathsDialog.h" #include @@ -6,8 +6,8 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/utility.h" +#include "FilePath.h" +#include "utility.h" QtSelectPathsDialog::QtSelectPathsDialog(const QString& title, const QString& description, QWidget* parent) : QtTextEditDialog(title, description, parent) diff --git a/src/lib_gui/qt/window/QtSelectPathsDialog.h b/src/lib_gui/qt/window/QtSelectPathsDialog.h index 49b155c1..7a7209ba 100644 --- a/src/lib_gui/qt/window/QtSelectPathsDialog.h +++ b/src/lib_gui/qt/window/QtSelectPathsDialog.h @@ -1,7 +1,7 @@ #ifndef QT_SELECT_PATHS_DIALOG_H #define QT_SELECT_PATHS_DIALOG_H -#include "qt/window/QtTextEditDialog.h" +#include "QtTextEditDialog.h" class FilePath; class QListWidget; diff --git a/src/lib_gui/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp index 3bbe0e09..1bcb56a2 100644 --- a/src/lib_gui/qt/window/QtStartScreen.cpp +++ b/src/lib_gui/qt/window/QtStartScreen.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtStartScreen.h" +#include "QtStartScreen.h" #include #include @@ -7,17 +7,17 @@ #include #include -#include "utility/AppPath.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/ResourcePaths.h" -#include "utility/Version.h" +#include "AppPath.h" +#include "MessageLoadProject.h" +#include "ResourcePaths.h" +#include "Version.h" #include "License.h" #include "PublicKey.h" -#include "qt/element/QtUpdateCheckerWidget.h" -#include "qt/utility/utilityQt.h" -#include "settings/ApplicationSettings.h" -#include "settings/ProjectSettings.h" +#include "QtUpdateCheckerWidget.h" +#include "utilityQt.h" +#include "ApplicationSettings.h" +#include "ProjectSettings.h" QtRecentProjectButton::QtRecentProjectButton(QWidget* parent) : QPushButton(parent) diff --git a/src/lib_gui/qt/window/QtStartScreen.h b/src/lib_gui/qt/window/QtStartScreen.h index ebf1b81e..79becc58 100644 --- a/src/lib_gui/qt/window/QtStartScreen.h +++ b/src/lib_gui/qt/window/QtStartScreen.h @@ -3,8 +3,8 @@ #include -#include "qt/window/QtWindow.h" -#include "utility/file/FilePath.h" +#include "QtWindow.h" +#include "FilePath.h" class QtRecentProjectButton : public QPushButton diff --git a/src/lib_gui/qt/window/QtTextEditDialog.cpp b/src/lib_gui/qt/window/QtTextEditDialog.cpp index d81af548..73f8d041 100644 --- a/src/lib_gui/qt/window/QtTextEditDialog.cpp +++ b/src/lib_gui/qt/window/QtTextEditDialog.cpp @@ -1,4 +1,4 @@ -#include "qt/window/QtTextEditDialog.h" +#include "QtTextEditDialog.h" #include #include diff --git a/src/lib_gui/qt/window/QtTextEditDialog.h b/src/lib_gui/qt/window/QtTextEditDialog.h index 0048a449..094d51c2 100644 --- a/src/lib_gui/qt/window/QtTextEditDialog.h +++ b/src/lib_gui/qt/window/QtTextEditDialog.h @@ -1,7 +1,7 @@ #ifndef QT_TEXT_EDIT_DIALOG_H #define QT_TEXT_EDIT_DIALOG_H -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QPlainTextEdit; diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp index ebe08473..2eba3387 100644 --- a/src/lib_gui/qt/window/QtWindow.cpp +++ b/src/lib_gui/qt/window/QtWindow.cpp @@ -1,14 +1,14 @@ -#include "qt/window/QtWindow.h" +#include "QtWindow.h" #include #include #include #include -#include "qt/utility/QtDeviceScaledPixmap.h" -#include "qt/utility/utilityQt.h" -#include "settings/ApplicationSettings.h" -#include "utility/ResourcePaths.h" +#include "QtDeviceScaledPixmap.h" +#include "utilityQt.h" +#include "ApplicationSettings.h" +#include "ResourcePaths.h" QtWindow::QtWindow(bool isSubWindow, QWidget* parent) : QtWindowStackElement(parent) diff --git a/src/lib_gui/qt/window/QtWindow.h b/src/lib_gui/qt/window/QtWindow.h index b0c8cdc1..b2cd5d11 100644 --- a/src/lib_gui/qt/window/QtWindow.h +++ b/src/lib_gui/qt/window/QtWindow.h @@ -6,7 +6,7 @@ #include #include -#include "qt/window/QtWindowStack.h" +#include "QtWindowStack.h" class QLabel; class QPushButton; diff --git a/src/lib_gui/qt/window/QtWindowStack.cpp b/src/lib_gui/qt/window/QtWindowStack.cpp index ec1ba837..81cb0cd8 100644 --- a/src/lib_gui/qt/window/QtWindowStack.cpp +++ b/src/lib_gui/qt/window/QtWindowStack.cpp @@ -1,6 +1,6 @@ -#include "qt/window/QtWindowStack.h" +#include "QtWindowStack.h" -#include "qt/window/QtWindow.h" +#include "QtWindow.h" QtWindowStackElement::QtWindowStackElement(QWidget* parent) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp index 15263342..8e660240 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp @@ -1,4 +1,4 @@ -#include "qt/window/project_wizzard/QtProjectWizzard.h" +#include "QtProjectWizzard.h" #include #include @@ -7,40 +7,40 @@ #include #include -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentCppStandard.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentCStandard.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentExtensions.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentFlags.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentPath.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentPaths.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentProjectData.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentSelect.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentGroup.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentVS.h" -#include "qt/window/project_wizzard/QtSourceGroupWizzardPage.h" -#include "settings/SourceGroupSettingsCEmpty.h" -#include "settings/SourceGroupSettingsCppEmpty.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/SourceGroupSettingsCxxCdbVs.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "settings/SourceGroupSettingsJavaEmpty.h" -#include "settings/SourceGroupSettingsJavaGradle.h" -#include "settings/SourceGroupSettingsJavaMaven.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" -#include "utility/messaging/type/MessageLoadProject.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/ResourcePaths.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" -#include "utility/utilityPathDetection.h" -#include "utility/utilityString.h" -#include "utility/utilityUuid.h" +#include "QtProjectWizzardContent.h" +#include "QtProjectWizzardContentCppStandard.h" +#include "QtProjectWizzardContentCrossCompilationOptions.h" +#include "QtProjectWizzardContentCStandard.h" +#include "QtProjectWizzardContentExtensions.h" +#include "QtProjectWizzardContentFlags.h" +#include "QtProjectWizzardContentJavaStandard.h" +#include "QtProjectWizzardContentPath.h" +#include "QtProjectWizzardContentPaths.h" +#include "QtProjectWizzardContentProjectData.h" +#include "QtProjectWizzardContentSelect.h" +#include "QtProjectWizzardContentSourceGroupData.h" +#include "QtProjectWizzardContentSourceGroupInfoText.h" +#include "QtProjectWizzardContentGroup.h" +#include "QtProjectWizzardContentVS.h" +#include "QtSourceGroupWizzardPage.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCdbVs.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaSonargraph.h" +#include "MessageLoadProject.h" +#include "MessageStatus.h" +#include "ResourcePaths.h" +#include "utility.h" +#include "utilityApp.h" +#include "utilityPathDetection.h" +#include "utilityString.h" +#include "utilityUuid.h" #include "Application.h" diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h index 5d8a2ee8..e5674f08 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.h @@ -5,11 +5,11 @@ #include -#include "qt/window/project_wizzard/QtProjectWizzardWindow.h" -#include "qt/window/project_wizzard/QtSourceGroupWizzard.h" -#include "qt/window/QtWindow.h" -#include "settings/ApplicationSettings.h" -#include "settings/ProjectSettings.h" +#include "QtProjectWizzardWindow.h" +#include "QtSourceGroupWizzard.h" +#include "QtWindow.h" +#include "ApplicationSettings.h" +#include "ProjectSettings.h" class QListWidget; class QPushButton; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp index d7f6ab23..9262620f 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp @@ -1,10 +1,10 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" #include -#include "qt/window/QtTextEditDialog.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "QtTextEditDialog.h" +#include "utility.h" +#include "utilityString.h" QtProjectWizzardContent::QtProjectWizzardContent(QtProjectWizzardWindow* window) : QWidget(window) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h index fa8b23df..89e70072 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.h @@ -6,10 +6,10 @@ #include #include -#include "qt/element/QtHelpButton.h" -#include "qt/utility/QtThreadedFunctor.h" -#include "qt/window/project_wizzard/QtProjectWizzardWindow.h" -#include "utility/file/FilePath.h" +#include "QtHelpButton.h" +#include "QtThreadedFunctor.h" +#include "QtProjectWizzardWindow.h" +#include "FilePath.h" class QtTextEditDialog; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.cpp index d5a5a8e8..bcbb57c4 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.cpp @@ -1,9 +1,9 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentCStandard.h" +#include "QtProjectWizzardContentCStandard.h" #include #include -#include "settings/SourceGroupSettingsWithCStandard.h" +#include "SourceGroupSettingsWithCStandard.h" QtProjectWizzardContentCStandard::QtProjectWizzardContentCStandard( std::shared_ptr sourceGroupSettings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.h index 9f9d149c..e5155b36 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCStandard.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_C_STANDARD #define QT_PROJECT_WIZZARD_CONTENT_C_STANDARD -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QComboBox; class SourceGroupSettingsWithCStandard; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.cpp index 2892d936..e7e9a2be 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.cpp @@ -1,9 +1,9 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentCppStandard.h" +#include "QtProjectWizzardContentCppStandard.h" #include #include -#include "settings/SourceGroupSettingsWithCppStandard.h" +#include "SourceGroupSettingsWithCppStandard.h" QtProjectWizzardContentCppStandard::QtProjectWizzardContentCppStandard( std::shared_ptr sourceGroupSettings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.h index fda58dd1..d27f0c7f 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCppStandard.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_CPP_STANDARD #define QT_PROJECT_WIZZARD_CONTENT_CPP_STANDARD -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QComboBox; class SourceGroupSettingsWithCppStandard; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.cpp index b37f1e70..39f9d2ac 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.cpp @@ -1,11 +1,11 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.h" +#include "QtProjectWizzardContentCrossCompilationOptions.h" #include #include #include -#include "settings/SourceGroupSettingsWithCxxCrossCompilationOptions.h" -#include "utility/logging/logging.h" +#include "SourceGroupSettingsWithCxxCrossCompilationOptions.h" +#include "logging.h" QtProjectWizzardContentCrossCompilationOptions::QtProjectWizzardContentCrossCompilationOptions( std::shared_ptr sourceGroupSettings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.h index 5ea00ecf..6db94963 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCrossCompilationOptions.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_CROSS_COMPILATION_OPTIONS #define QT_PROJECT_WIZZARD_CONTENT_CROSS_COMPILATION_OPTIONS -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QCheckBox; class QComboBox; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.cpp index f2ae0b5e..3080a367 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.cpp @@ -1,9 +1,9 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentExtensions.h" +#include "QtProjectWizzardContentExtensions.h" #include -#include "settings/SourceGroupSettingsWithSourceExtensions.h" -#include "qt/element/QtStringListBox.h" +#include "SourceGroupSettingsWithSourceExtensions.h" +#include "QtStringListBox.h" QtProjectWizzardContentExtensions::QtProjectWizzardContentExtensions( std::shared_ptr settings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h index 2011be69..9b44f022 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentExtensions.h @@ -3,7 +3,7 @@ #include -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QtStringListBox; class SourceGroupSettingsWithSourceExtensions; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp index 65f73750..4a2e518d 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp @@ -1,10 +1,10 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentFlags.h" +#include "QtProjectWizzardContentFlags.h" #include #include -#include "qt/element/QtStringListBox.h" -#include "settings/SourceGroupSettingsCxx.h" +#include "QtStringListBox.h" +#include "SourceGroupSettingsCxx.h" QtProjectWizzardContentFlags::QtProjectWizzardContentFlags(std::shared_ptr settings, QtProjectWizzardWindow* window, bool indicateAsAdditional) : QtProjectWizzardContent(window) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h index 7e1c95df..1d9e0cbd 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_FLAGS_H #define QT_PROJECT_WIZZARD_CONTENT_FLAGS_H -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QtStringListBox; class SourceGroupSettingsCxx; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.cpp index e4040fe2..6b64aeb5 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.cpp @@ -1,4 +1,4 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentGroup.h" +#include "QtProjectWizzardContentGroup.h" QtProjectWizzardContentGroup::QtProjectWizzardContentGroup( QtProjectWizzardWindow* window diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.h index fa459427..b044d705 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentGroup.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_GROUP_H #define QT_PROJECT_WIZZARD_CONTENT_GROUP_H -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QCheckBox; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.cpp index b924c2e5..f2c6c3ed 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.cpp @@ -1,9 +1,9 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.h" +#include "QtProjectWizzardContentJavaStandard.h" #include #include -#include "settings/SourceGroupSettingsWithJavaStandard.h" +#include "SourceGroupSettingsWithJavaStandard.h" QtProjectWizzardContentJavaStandard::QtProjectWizzardContentJavaStandard( std::shared_ptr sourceGroupSettings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.h index b62d57cd..d83c3ff9 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentJavaStandard.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_JAVA_STANDARD #define QT_PROJECT_WIZZARD_CONTENT_JAVA_STANDARD -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QComboBox; class SourceGroupSettingsWithJavaStandard; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp index a39746c7..6efceba1 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp @@ -1,4 +1,4 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentPath.h" +#include "QtProjectWizzardContentPath.h" #include #include @@ -6,31 +6,31 @@ #include #include -#include "project/SourceGroupCxxCdb.h" -#include "project/SourceGroupCxxCodeblocks.h" -#include "project/SourceGroupCxxSonargraph.h" -#include "project/SourceGroupJavaSonargraph.h" -#include "project/SourceGroupJavaGradle.h" -#include "project/SourceGroupJavaMaven.h" -#include "qt/element/QtLocationPicker.h" -#include "qt/view/QtDialogView.h" -#include "qt/window/project_wizzard/QtProjectWizzardContentPaths.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "settings/SourceGroupSettingsJavaMaven.h" -#include "settings/SourceGroupSettingsJavaGradle.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" -#include "settings/SourceGroupSettingsWithSonargraphProjectPath.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "utility/file/FileManager.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/sonargraph/SonargraphProject.h" -#include "utility/ScopedFunctor.h" -#include "utility/utility.h" -#include "utility/utilityFile.h" -#include "utility/utilityGradle.h" -#include "utility/utilityMaven.h" +#include "SourceGroupCxxCdb.h" +#include "SourceGroupCxxCodeblocks.h" +#include "SourceGroupCxxSonargraph.h" +#include "SourceGroupJavaSonargraph.h" +#include "SourceGroupJavaGradle.h" +#include "SourceGroupJavaMaven.h" +#include "QtLocationPicker.h" +#include "QtDialogView.h" +#include "QtProjectWizzardContentPaths.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaSonargraph.h" +#include "SourceGroupSettingsWithSonargraphProjectPath.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "FileManager.h" +#include "MessageStatus.h" +#include "SonargraphProject.h" +#include "ScopedFunctor.h" +#include "utility.h" +#include "utilityFile.h" +#include "utilityGradle.h" +#include "utilityMaven.h" #include "Application.h" QtProjectWizzardContentPath::QtProjectWizzardContentPath(QtProjectWizzardWindow* window) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h index 97dc0d17..4ca6c394 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.h @@ -3,8 +3,8 @@ #include -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" -#include "utility/SingleValueCache.h" +#include "QtProjectWizzardContent.h" +#include "SingleValueCache.h" class QCheckBox; class QComboBox; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp index eba9cfaf..08743c07 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp @@ -1,4 +1,4 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentPaths.h" +#include "QtProjectWizzardContentPaths.h" #include #include @@ -6,36 +6,36 @@ #include #include -#include "component/view/DialogView.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "project/SourceGroupCxxEmpty.h" -#include "project/SourceGroupJavaEmpty.h" -#include "qt/view/QtDialogView.h" -#include "qt/window/QtPathListDialog.h" -#include "qt/window/QtSelectPathsDialog.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "settings/SourceGroupSettingsJavaEmpty.h" -#include "settings/SourceGroupSettingsWithClasspath.h" -#include "settings/SourceGroupSettingsWithIndexedHeaderPaths.h" -#include "settings/SourceGroupSettingsWithExcludeFilters.h" -#include "settings/SourceGroupSettingsWithSourceExtensions.h" -#include "settings/SourceGroupSettingsWithSourcePaths.h" -#include "utility/codeblocks/CodeblocksProject.h" -#include "utility/file/FileManager.h" -#include "utility/sonargraph/SonargraphProject.h" -#include "utility/CompilationDatabase.h" -#include "utility/IncludeDirective.h" -#include "utility/IncludeProcessing.h" -#include "utility/ScopedFunctor.h" -#include "utility/utility.h" -#include "utility/utilityCxx.h" -#include "utility/utilityFile.h" -#include "utility/utilityPathDetection.h" -#include "utility/utilityString.h" +#include "DialogView.h" +#include "IndexerCommandCxx.h" +#include "SourceGroupCxxEmpty.h" +#include "SourceGroupJavaEmpty.h" +#include "QtDialogView.h" +#include "QtPathListDialog.h" +#include "QtSelectPathsDialog.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsWithClasspath.h" +#include "SourceGroupSettingsWithIndexedHeaderPaths.h" +#include "SourceGroupSettingsWithExcludeFilters.h" +#include "SourceGroupSettingsWithSourceExtensions.h" +#include "SourceGroupSettingsWithSourcePaths.h" +#include "CodeblocksProject.h" +#include "FileManager.h" +#include "SonargraphProject.h" +#include "CompilationDatabase.h" +#include "IncludeDirective.h" +#include "IncludeProcessing.h" +#include "ScopedFunctor.h" +#include "utility.h" +#include "utilityCxx.h" +#include "utilityFile.h" +#include "utilityPathDetection.h" +#include "utilityString.h" #include "Application.h" QtProjectWizzardContentPaths::QtProjectWizzardContentPaths( diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h index 5c3ff942..31c124b0 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.h @@ -3,9 +3,9 @@ #include -#include "qt/element/QtPathListBox.h" -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" -#include "utility/path_detector/CombinedPathDetector.h" +#include "QtPathListBox.h" +#include "QtProjectWizzardContent.h" +#include "CombinedPathDetector.h" class IncludeDirective; class QCheckBox; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp index 7e008e44..27e1de65 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp @@ -1,4 +1,4 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentPreferences.h" +#include "QtProjectWizzardContentPreferences.h" #include #include @@ -8,14 +8,14 @@ #include #include -#include "qt/utility/utilityQt.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FileSystem.h" -#include "utility/messaging/type/MessageSwitchColorScheme.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityPathDetection.h" -#include "utility/utilityApp.h" -#include "utility/utility.h" +#include "utilityQt.h" +#include "ApplicationSettings.h" +#include "FileSystem.h" +#include "MessageSwitchColorScheme.h" +#include "ResourcePaths.h" +#include "utilityPathDetection.h" +#include "utilityApp.h" +#include "utility.h" QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences( QtProjectWizzardWindow* window diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h index f61c74b1..9810e0fc 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h @@ -3,10 +3,10 @@ #include -#include "qt/element/QtLocationPicker.h" -#include "qt/element/QtPathListBox.h" -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" -#include "utility/path_detector/CombinedPathDetector.h" +#include "QtLocationPicker.h" +#include "QtPathListBox.h" +#include "QtProjectWizzardContent.h" +#include "CombinedPathDetector.h" class QCheckBox; class QFontComboBox; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.cpp index 96f75ae4..29ae5f31 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.cpp @@ -1,10 +1,10 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentProjectData.h" +#include "QtProjectWizzardContentProjectData.h" #include #include -#include "settings/ProjectSettings.h" -#include "utility/file/FileSystem.h" +#include "ProjectSettings.h" +#include "FileSystem.h" QtProjectWizzardContentProjectData::QtProjectWizzardContentProjectData( std::shared_ptr projectSettings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.h index 28f0e77e..93fbad5c 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentProjectData.h @@ -1,8 +1,8 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_PROJECT_DATA_H #define QT_PROJECT_WIZZARD_CONTENT_PROJECT_DATA_H -#include "qt/element/QtLocationPicker.h" -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtLocationPicker.h" +#include "QtProjectWizzardContent.h" class ProjectSettings; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp index f5956912..ffaa13ef 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp @@ -1,15 +1,15 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentSelect.h" +#include "QtProjectWizzardContentSelect.h" #include #include #include #include -#include "qt/window/project_wizzard/QtProjectWizzardWindow.h" -#include "qt/utility/QtFlowLayout.h" -#include "settings/LanguageType.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityString.h" +#include "QtProjectWizzardWindow.h" +#include "QtFlowLayout.h" +#include "LanguageType.h" +#include "ResourcePaths.h" +#include "utilityString.h" QtProjectWizzardContentSelect::QtProjectWizzardContentSelect( QtProjectWizzardWindow* window diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h index fa3dc8f9..b6925809 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.h @@ -1,9 +1,9 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_SELECT_H #define QT_PROJECT_WIZZARD_CONTENT_SELECT_H -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" -#include "settings/LanguageType.h" -#include "settings/SourceGroupType.h" +#include "QtProjectWizzardContent.h" +#include "LanguageType.h" +#include "SourceGroupType.h" class QButtonGroup; class SolutionParserManager; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.cpp index 0214a66f..77661f95 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.cpp @@ -1,10 +1,10 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.h" +#include "QtProjectWizzardContentSourceGroupData.h" #include #include #include -#include "settings/SourceGroupSettings.h" +#include "SourceGroupSettings.h" QtProjectWizzardContentSourceGroupData::QtProjectWizzardContentSourceGroupData( std::shared_ptr settings, diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.h index 9dd620f8..bbef2528 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupData.h @@ -1,8 +1,8 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_SOURCE_GROUP_DATA_H #define QT_PROJECT_WIZZARD_CONTENT_SOURCE_GROUP_DATA_H -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" -#include "settings/SourceGroupStatusType.h" +#include "QtProjectWizzardContent.h" +#include "SourceGroupStatusType.h" class QCheckBox; class QLineEdit; diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.cpp index 8faba99f..53f5d26c 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.cpp @@ -1,4 +1,4 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.h" +#include "QtProjectWizzardContentSourceGroupInfoText.h" QtProjectWizzardContentSourceGroupInfoText::QtProjectWizzardContentSourceGroupInfoText(QtProjectWizzardWindow* window) : QtProjectWizzardContent(window) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.h index 64463671..ef24a930 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceGroupInfoText.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_SOURCE_GROUP_INFO_TEXT_H #define QT_PROJECT_WIZZARD_CONTENT_SOURCE_GROUP_INFO_TEXT_H -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QtProjectWizzardContentSourceGroupInfoText : public QtProjectWizzardContent diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.cpp index c54f1405..4f28c4ce 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.cpp @@ -1,6 +1,6 @@ -#include "qt/window/project_wizzard/QtProjectWizzardContentVS.h" +#include "QtProjectWizzardContentVS.h" -#include "utility/messaging/type/MessageIDECreateCDB.h" +#include "MessageIDECreateCDB.h" QtProjectWizzardContentVS::QtProjectWizzardContentVS(QtProjectWizzardWindow* window) : QtProjectWizzardContent(window) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.h index 8cf378aa..dec5f836 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentVS.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_CONTENT_VS_H #define QT_PROJECT_WIZZARD_CONTENT_VS_H -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "QtProjectWizzardContent.h" class QtProjectWizzardContentVS : public QtProjectWizzardContent diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp index 389c0502..4c49974e 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.cpp @@ -1,12 +1,12 @@ -#include "qt/window/project_wizzard/QtProjectWizzardWindow.h" +#include "QtProjectWizzardWindow.h" #include #include #include #include -#include "qt/utility/utilityQt.h" -#include "qt/window/project_wizzard/QtProjectWizzardContent.h" +#include "utilityQt.h" +#include "QtProjectWizzardContent.h" QtProjectWizzardWindow::QtProjectWizzardWindow(QWidget *parent, bool showSeparator) : QtWindow(false, parent) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h index 9565891a..563cc748 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardWindow.h @@ -1,7 +1,7 @@ #ifndef QT_PROJECT_WIZZARD_WINDOW_H #define QT_PROJECT_WIZZARD_WINDOW_H -#include "qt/window/QtWindow.h" +#include "QtWindow.h" class QtProjectWizzardContent; diff --git a/src/lib_gui/qt/window/project_wizzard/QtSourceGroupWizzard.h b/src/lib_gui/qt/window/project_wizzard/QtSourceGroupWizzard.h index 8d11bb0b..09d84687 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtSourceGroupWizzard.h +++ b/src/lib_gui/qt/window/project_wizzard/QtSourceGroupWizzard.h @@ -5,10 +5,10 @@ #include #include -#include "qt/window/project_wizzard/QtProjectWizzardContentGroup.h" -#include "qt/window/project_wizzard/QtProjectWizzardWindow.h" -#include "qt/window/project_wizzard/QtSourceGroupWizzardPage.h" -#include "utility/logging/logging.h" +#include "QtProjectWizzardContentGroup.h" +#include "QtProjectWizzardWindow.h" +#include "QtSourceGroupWizzardPage.h" +#include "logging.h" class SourceGroupSettings; diff --git a/src/lib_gui/utility/path_detector/CombinedPathDetector.cpp b/src/lib_gui/utility/path_detector/CombinedPathDetector.cpp index 4503f474..3766aee9 100644 --- a/src/lib_gui/utility/path_detector/CombinedPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/CombinedPathDetector.cpp @@ -1,6 +1,6 @@ -#include "utility/path_detector/CombinedPathDetector.h" +#include "CombinedPathDetector.h" -#include "utility/file/FilePath.h" +#include "FilePath.h" CombinedPathDetector::CombinedPathDetector() : PathDetector("combined") diff --git a/src/lib_gui/utility/path_detector/CombinedPathDetector.h b/src/lib_gui/utility/path_detector/CombinedPathDetector.h index 92cb10e1..9fc682b2 100644 --- a/src/lib_gui/utility/path_detector/CombinedPathDetector.h +++ b/src/lib_gui/utility/path_detector/CombinedPathDetector.h @@ -6,7 +6,7 @@ #include #include -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class CombinedPathDetector: public PathDetector { diff --git a/src/lib_gui/utility/path_detector/PathDetector.cpp b/src/lib_gui/utility/path_detector/PathDetector.cpp index a4bae812..eac741c4 100644 --- a/src/lib_gui/utility/path_detector/PathDetector.cpp +++ b/src/lib_gui/utility/path_detector/PathDetector.cpp @@ -1,6 +1,6 @@ -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" -#include "utility/file/FilePath.h" +#include "FilePath.h" PathDetector::PathDetector(const std::string& name) : m_name(name) diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp index 11c7f4a4..b8a99895 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.cpp @@ -1,8 +1,8 @@ -#include "utility/path_detector/cxx_header/CxxFrameworkPathDetector.h" +#include "CxxFrameworkPathDetector.h" -#include "utility/file/FilePath.h" -#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "utilityCxxHeaderDetection.h" +#include "utilityString.h" CxxFrameworkPathDetector::CxxFrameworkPathDetector(const std::string& compilerName) : PathDetector(compilerName) diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.h b/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.h index 46d6515a..9d3aca36 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.h +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxFrameworkPathDetector.h @@ -1,7 +1,7 @@ #ifndef CXX_FRAMEWORK_PATH_DETECTOR_H #define CXX_FRAMEWORK_PATH_DETECTOR_H -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class CxxFrameworkPathDetector: public PathDetector { diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp index 46f94171..22b09900 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.cpp @@ -1,9 +1,9 @@ -#include "utility/path_detector/cxx_header/CxxHeaderPathDetector.h" +#include "CxxHeaderPathDetector.h" -#include "utility/file/FilePath.h" -#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h" -#include "utility/utilityString.h" -#include "utility/utilityCxx.h" +#include "FilePath.h" +#include "utilityCxxHeaderDetection.h" +#include "utilityString.h" +#include "utilityCxx.h" CxxHeaderPathDetector::CxxHeaderPathDetector(const std::string& compilerName) : PathDetector(compilerName) diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.h b/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.h index d8d79519..174b0425 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.h +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxHeaderPathDetector.h @@ -1,7 +1,7 @@ #ifndef CXX_HEADER_PATH_DETECTOR_H #define CXX_HEADER_PATH_DETECTOR_H -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class CxxHeaderPathDetector: public PathDetector { diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp index f66273b6..bf779fa1 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp @@ -1,14 +1,14 @@ -#include "utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h" +#include "CxxVs10To14HeaderPathDetector.h" #include #include #include -#include "utility/file/FilePath.h" -#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h" -#include "utility/utility.h" -#include "utility/utilityCxx.h" +#include "FilePath.h" +#include "utilityCxxHeaderDetection.h" +#include "utility.h" +#include "utilityCxx.h" CxxVs10To14HeaderPathDetector::CxxVs10To14HeaderPathDetector(VisualStudioType type, bool isExpress, ApplicationArchitectureType architecture) : PathDetector(visualStudioTypeToString(type) + (isExpress ? " Express" : "") + (architecture == APPLICATION_ARCHITECTURE_X86_64 ? " 64 Bit" : "")) diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h b/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h index f105e72d..af6e8549 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h @@ -1,8 +1,8 @@ #ifndef CXX_VS_10_TO_14_HEADER_PATH_DETECTOR_H #define CXX_VS_10_TO_14_HEADER_PATH_DETECTOR_H -#include "utility/path_detector/PathDetector.h" -#include "utility/ApplicationArchitectureType.h" +#include "PathDetector.h" +#include "ApplicationArchitectureType.h" class CxxVs10To14HeaderPathDetector : public PathDetector { diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp b/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp index 76791978..20a5d293 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.cpp @@ -1,13 +1,13 @@ -#include "utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h" +#include "CxxVs15HeaderPathDetector.h" #include -#include "utility/file/FilePath.h" -#include "utility/file/FileSystem.h" -#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h" -#include "utility/utility.h" -#include "utility/utilityApp.h" -#include "utility/utilityCxx.h" +#include "FilePath.h" +#include "FileSystem.h" +#include "utilityCxxHeaderDetection.h" +#include "utility.h" +#include "utilityApp.h" +#include "utilityCxx.h" CxxVs15HeaderPathDetector::CxxVs15HeaderPathDetector() : PathDetector("Visual Studio 2017") diff --git a/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h b/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h index b603abc1..b8ac5094 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h @@ -1,8 +1,8 @@ #ifndef CXX_VS_15_HEADER_PATH_DETECTOR_H #define CXX_VS_15_HEADER_PATH_DETECTOR_H -#include "utility/path_detector/PathDetector.h" -#include "utility/ApplicationArchitectureType.h" +#include "PathDetector.h" +#include "ApplicationArchitectureType.h" class CxxVs15HeaderPathDetector: public PathDetector { diff --git a/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp b/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp index ad318caf..d2eb0f61 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp +++ b/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.cpp @@ -1,11 +1,11 @@ -#include "utility/path_detector/cxx_header/utilityCxxHeaderDetection.h" +#include "utilityCxxHeaderDetection.h" #include #include -#include "utility/file/FileSystem.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" +#include "FileSystem.h" +#include "utilityApp.h" +#include "utilityString.h" namespace utility { diff --git a/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.h b/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.h index 0ef9467b..13b8ec0d 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.h +++ b/src/lib_gui/utility/path_detector/cxx_header/utilityCxxHeaderDetection.h @@ -4,8 +4,8 @@ #include #include -#include "utility/file/FilePath.h" -#include "utility/ApplicationArchitectureType.h" +#include "FilePath.h" +#include "ApplicationArchitectureType.h" namespace utility { diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.cpp index d121bd9b..ddfc49c7 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.cpp @@ -1,4 +1,4 @@ -#include "utility/path_detector/java_runtime/JavaPathDetector.h" +#include "JavaPathDetector.h" JavaPathDetector::JavaPathDetector(const std::string& name, const std::string& javaVersion) : PathDetector(name) diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.h b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.h index f2174ddb..792e990d 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.h +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetector.h @@ -1,7 +1,7 @@ #ifndef JAVA_PATH_DETECTOR_H #define JAVA_PATH_DETECTOR_H -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class JavaPathDetector: public PathDetector { diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp index 9630c938..64132e8d 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.cpp @@ -1,8 +1,8 @@ -#include "utility/path_detector/java_runtime/JavaPathDetectorLinux.h" +#include "JavaPathDetectorLinux.h" -#include "utility/file/FilePath.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "utilityApp.h" +#include "utilityString.h" #ifdef __x86_64__ const wchar_t jvmLibPathRelativeToJavaExecutable[] = L"/../lib/amd64/server/libjvm.so"; diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.h b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.h index 5a2fb7b8..97294718 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.h +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorLinux.h @@ -1,7 +1,7 @@ #ifndef JAVA_PATH_DETECTOR_LINUX_H #define JAVA_PATH_DETECTOR_LINUX_H -#include "utility/path_detector/java_runtime/JavaPathDetector.h" +#include "JavaPathDetector.h" class JavaPathDetectorLinux : public JavaPathDetector diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp index 18b489b0..9cc5dc20 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.cpp @@ -1,8 +1,8 @@ -#include "utility/path_detector/java_runtime/JavaPathDetectorMac.h" +#include "JavaPathDetectorMac.h" -#include "utility/file/FilePath.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" +#include "FilePath.h" +#include "utilityApp.h" +#include "utilityString.h" JavaPathDetectorMac::JavaPathDetectorMac(const std::string javaVersion) : JavaPathDetector("Java " + javaVersion + " for Mac", javaVersion) diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.h b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.h index 1d52984e..3e57db60 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.h +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorMac.h @@ -1,7 +1,7 @@ #ifndef JAVA_PATH_DETECTOR_MAC_H #define JAVA_PATH_DETECTOR_MAC_H -#include "utility/path_detector/java_runtime/JavaPathDetector.h" +#include "JavaPathDetector.h" class JavaPathDetectorMac : public JavaPathDetector diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp index 35446d3c..256dc1ea 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.cpp @@ -1,10 +1,10 @@ -#include "utility/path_detector/java_runtime/JavaPathDetectorWindows.h" +#include "JavaPathDetectorWindows.h" #include #include -#include "utility/file/FilePath.h" -#include "utility/utility.h" +#include "FilePath.h" +#include "utility.h" JavaPathDetectorWindows::JavaPathDetectorWindows(const std::string javaVersion) : JavaPathDetector("Java " + javaVersion + " for Windows", javaVersion) diff --git a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.h b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.h index e5859c0e..60cb6966 100644 --- a/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.h +++ b/src/lib_gui/utility/path_detector/java_runtime/JavaPathDetectorWindows.h @@ -1,7 +1,7 @@ #ifndef JAVA_PATH_DETECTOR_WINDOWS_H #define JAVA_PATH_DETECTOR_WINDOWS_H -#include "utility/path_detector/java_runtime/JavaPathDetector.h" +#include "JavaPathDetector.h" class JavaPathDetectorWindows: public JavaPathDetector { diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp index 65ad4ce3..ea5cf8fe 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.cpp @@ -1,10 +1,10 @@ -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h" +#include "JreSystemLibraryPathDetector.h" -#include "utility/path_detector/java_runtime/JavaPathDetector.h" +#include "JavaPathDetector.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FilePath.h" -#include "utility/file/FileSystem.h" +#include "ApplicationSettings.h" +#include "FilePath.h" +#include "FileSystem.h" JreSystemLibraryPathDetector::JreSystemLibraryPathDetector(std::shared_ptr javaPathDetector) : PathDetector("JRE System Library") diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h index 00f072ac..82887d35 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h @@ -3,7 +3,7 @@ #include -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class JavaPathDetector; diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp index 8f93cb93..30afe070 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.cpp @@ -1,6 +1,6 @@ -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h" +#include "JreSystemLibraryPathDetectorLinux.h" -#include "utility/path_detector/java_runtime/JavaPathDetectorLinux.h" +#include "JavaPathDetectorLinux.h" JreSystemLibraryPathDetectorLinux::JreSystemLibraryPathDetectorLinux(const std::string javaVersion) : JreSystemLibraryPathDetector(std::make_shared(javaVersion)) diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h index 90d56565..4974e4df 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h @@ -1,7 +1,7 @@ #ifndef JRE_SYSTEM_LIBRARY_PATH_DETECTOR_LINUX_H #define JRE_SYSTEM_LIBRARY_PATH_DETECTOR_LINUX_H -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h" +#include "JreSystemLibraryPathDetector.h" class JreSystemLibraryPathDetectorLinux: public JreSystemLibraryPathDetector { diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp index 0a514312..16774254 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.cpp @@ -1,6 +1,6 @@ -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h" +#include "JreSystemLibraryPathDetectorMac.h" -#include "utility/path_detector/java_runtime/JavaPathDetectorMac.h" +#include "JavaPathDetectorMac.h" JreSystemLibraryPathDetectorMac::JreSystemLibraryPathDetectorMac(const std::string javaVersion) : JreSystemLibraryPathDetector(std::make_shared(javaVersion)) diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h index d06edfcf..8cc9f08b 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h @@ -1,7 +1,7 @@ #ifndef JRE_SYSTEM_LIBRARY_PATH_DETECTOR_MAC_H #define JRE_SYSTEM_LIBRARY_PATH_DETECTOR_MAC_H -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h" +#include "JreSystemLibraryPathDetector.h" class JreSystemLibraryPathDetectorMac: public JreSystemLibraryPathDetector { diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp index 60a9e09e..8fb28965 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.cpp @@ -1,6 +1,6 @@ -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h" +#include "JreSystemLibraryPathDetectorWindows.h" -#include "utility/path_detector/java_runtime/JavaPathDetectorWindows.h" +#include "JavaPathDetectorWindows.h" JreSystemLibraryPathDetectorWindows::JreSystemLibraryPathDetectorWindows(const std::string javaVersion) : JreSystemLibraryPathDetector(std::make_shared(javaVersion)) diff --git a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h index daa3a85e..96cfad82 100644 --- a/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h +++ b/src/lib_gui/utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h @@ -1,7 +1,7 @@ #ifndef JRE_SYSTEM_LIBRARY_PATH_DETECTOR_WINDOWS_H #define JRE_SYSTEM_LIBRARY_PATH_DETECTOR_WINDOWS_H -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetector.h" +#include "JreSystemLibraryPathDetector.h" class JreSystemLibraryPathDetectorWindows: public JreSystemLibraryPathDetector { diff --git a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp index 3e3af846..72f2740a 100644 --- a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp +++ b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.cpp @@ -1,7 +1,7 @@ -#include "utility/path_detector/maven_executable/MavenPathDetectorUnix.h" +#include "MavenPathDetectorUnix.h" -#include "utility/file/FilePath.h" -#include "utility/utilityApp.h" +#include "FilePath.h" +#include "utilityApp.h" MavenPathDetectorUnix::MavenPathDetectorUnix() : PathDetector("Maven for Unix") diff --git a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.h b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.h index 7766fc33..cdf538be 100644 --- a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.h +++ b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorUnix.h @@ -1,7 +1,7 @@ #ifndef MAVEN_PATH_DETECTOR_UNIX_H #define MAVEN_PATH_DETECTOR_UNIX_H -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class MavenPathDetectorUnix: public PathDetector { diff --git a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp index c8d58f4c..fd79eb97 100644 --- a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp +++ b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.cpp @@ -1,7 +1,7 @@ -#include "utility/path_detector/maven_executable/MavenPathDetectorWindows.h" +#include "MavenPathDetectorWindows.h" -#include "utility/file/FilePath.h" -#include "utility/utilityApp.h" +#include "FilePath.h" +#include "utilityApp.h" MavenPathDetectorWindows::MavenPathDetectorWindows() : PathDetector("Maven for Windows") diff --git a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.h b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.h index b4df3fe0..036cb176 100644 --- a/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.h +++ b/src/lib_gui/utility/path_detector/maven_executable/MavenPathDetectorWindows.h @@ -1,7 +1,7 @@ #ifndef MAVEN_PATH_DETECTOR_WINDOWS_H #define MAVEN_PATH_DETECTOR_WINDOWS_H -#include "utility/path_detector/PathDetector.h" +#include "PathDetector.h" class MavenPathDetectorWindows: public PathDetector { diff --git a/src/lib_gui/utility/utilityApp.cpp b/src/lib_gui/utility/utilityApp.cpp index 7f2030ad..ff09d610 100644 --- a/src/lib_gui/utility/utilityApp.cpp +++ b/src/lib_gui/utility/utilityApp.cpp @@ -1,4 +1,4 @@ -#include "utility/utilityApp.h" +#include "utilityApp.h" #include #include @@ -6,11 +6,11 @@ #include #include "License.h" -#include "settings/ApplicationSettings.h" -#include "utility/logging/logging.h" -#include "utility/AppPath.h" -#include "utility/UserPaths.h" -#include "utility/utilityString.h" +#include "ApplicationSettings.h" +#include "logging.h" +#include "AppPath.h" +#include "UserPaths.h" +#include "utilityString.h" namespace utility { diff --git a/src/lib_gui/utility/utilityApp.h b/src/lib_gui/utility/utilityApp.h index a320c3a8..9ab8376a 100644 --- a/src/lib_gui/utility/utilityApp.h +++ b/src/lib_gui/utility/utilityApp.h @@ -5,8 +5,8 @@ #include #include -#include "utility/OsType.h" -#include "utility/file/FilePath.h" +#include "OsType.h" +#include "FilePath.h" class License; diff --git a/src/lib_gui/utility/utilityPathDetection.cpp b/src/lib_gui/utility/utilityPathDetection.cpp index 5c0bd9d0..8a0c5262 100644 --- a/src/lib_gui/utility/utilityPathDetection.cpp +++ b/src/lib_gui/utility/utilityPathDetection.cpp @@ -1,24 +1,24 @@ -#include "utility/utilityPathDetection.h" +#include "utilityPathDetection.h" -#include "utility/logging/logging.h" +#include "logging.h" -#include "utility/path_detector/java_runtime/JavaPathDetectorLinux.h" -#include "utility/path_detector/java_runtime/JavaPathDetectorMac.h" -#include "utility/path_detector/java_runtime/JavaPathDetectorWindows.h" +#include "JavaPathDetectorLinux.h" +#include "JavaPathDetectorMac.h" +#include "JavaPathDetectorWindows.h" -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorLinux.h" -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorMac.h" -#include "utility/path_detector/jre_system_library/JreSystemLibraryPathDetectorWindows.h" +#include "JreSystemLibraryPathDetectorLinux.h" +#include "JreSystemLibraryPathDetectorMac.h" +#include "JreSystemLibraryPathDetectorWindows.h" -#include "utility/path_detector/maven_executable/MavenPathDetectorUnix.h" -#include "utility/path_detector/maven_executable/MavenPathDetectorWindows.h" +#include "MavenPathDetectorUnix.h" +#include "MavenPathDetectorWindows.h" -#include "utility/path_detector/cxx_header/CxxFrameworkPathDetector.h" -#include "utility/path_detector/cxx_header/CxxHeaderPathDetector.h" -#include "utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.h" -#include "utility/path_detector/cxx_header/CxxVs15HeaderPathDetector.h" +#include "CxxFrameworkPathDetector.h" +#include "CxxHeaderPathDetector.h" +#include "CxxVs10To14HeaderPathDetector.h" +#include "CxxVs15HeaderPathDetector.h" -#include "utility/utilityApp.h" +#include "utilityApp.h" std::shared_ptr utility::getJavaRuntimePathDetector() { diff --git a/src/lib_gui/utility/utilityPathDetection.h b/src/lib_gui/utility/utilityPathDetection.h index 893c97fd..54511cdd 100644 --- a/src/lib_gui/utility/utilityPathDetection.h +++ b/src/lib_gui/utility/utilityPathDetection.h @@ -1,7 +1,7 @@ #ifndef UTILITY_PATH_DETECTION_H #define UTILITY_PATH_DETECTION_H -#include "utility/path_detector/CombinedPathDetector.h" +#include "CombinedPathDetector.h" namespace utility { diff --git a/src/lib_java/CMakeLists.txt b/src/lib_java/CMakeLists.txt index cb1859ae..ef1cd547 100644 --- a/src/lib_java/CMakeLists.txt +++ b/src/lib_java/CMakeLists.txt @@ -1,6 +1,6 @@ add_files( - LIB_JAVA_FILES + LIB_JAVA data/indexer/IndexerCommandJava.cpp data/indexer/IndexerCommandJava.h diff --git a/src/lib_java/LanguagePackageJava.cpp b/src/lib_java/LanguagePackageJava.cpp index 81124e45..46f29047 100644 --- a/src/lib_java/LanguagePackageJava.cpp +++ b/src/lib_java/LanguagePackageJava.cpp @@ -1,6 +1,6 @@ #include "LanguagePackageJava.h" -#include "data/indexer/IndexerJava.h" +#include "IndexerJava.h" std::vector> LanguagePackageJava::instantiateSupportedIndexers() const { diff --git a/src/lib_java/data/indexer/IndexerCommandJava.cpp b/src/lib_java/data/indexer/IndexerCommandJava.cpp index 65b80c40..38d9dfbe 100644 --- a/src/lib_java/data/indexer/IndexerCommandJava.cpp +++ b/src/lib_java/data/indexer/IndexerCommandJava.cpp @@ -1,9 +1,9 @@ -#include "data/indexer/IndexerCommandJava.h" +#include "IndexerCommandJava.h" #include #include -#include "utility/utilityString.h" +#include "utilityString.h" IndexerCommandType IndexerCommandJava::getStaticIndexerCommandType() { diff --git a/src/lib_java/data/indexer/IndexerCommandJava.h b/src/lib_java/data/indexer/IndexerCommandJava.h index d04fccc6..e0f6d780 100644 --- a/src/lib_java/data/indexer/IndexerCommandJava.h +++ b/src/lib_java/data/indexer/IndexerCommandJava.h @@ -3,7 +3,7 @@ #include -#include "data/indexer/IndexerCommand.h" +#include "IndexerCommand.h" class FilePath; class FilePathFilter; diff --git a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp b/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp index f7e378d6..e1fd3963 100644 --- a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp +++ b/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.cpp @@ -1,6 +1,6 @@ -#include "data/indexer/IndexerCommandJava.h" +#include "IndexerCommandJava.h" -#include "utility/utilityString.h" +#include "utilityString.h" IndexerCommandType IndexerCommandJava::getStaticIndexerCommandType() { diff --git a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h b/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h index 18d005a9..7a6c8a03 100644 --- a/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h +++ b/src/lib_java/data/indexer/IndexerCommandJavaSonargraph.h @@ -3,7 +3,7 @@ #include -#include "data/indexer/IndexerCommand.h" +#include "IndexerCommand.h" class FilePath; diff --git a/src/lib_java/data/indexer/IndexerJava.cpp b/src/lib_java/data/indexer/IndexerJava.cpp index e37401c7..937b5c71 100644 --- a/src/lib_java/data/indexer/IndexerJava.cpp +++ b/src/lib_java/data/indexer/IndexerJava.cpp @@ -1,8 +1,8 @@ -#include "data/indexer/IndexerJava.h" +#include "IndexerJava.h" -#include "data/indexer/IndexerCommandJava.h" -#include "data/parser/ParserClientImpl.h" -#include "data/parser/java/JavaParser.h" +#include "IndexerCommandJava.h" +#include "ParserClientImpl.h" +#include "JavaParser.h" IndexerJava::~IndexerJava() { diff --git a/src/lib_java/data/indexer/IndexerJava.h b/src/lib_java/data/indexer/IndexerJava.h index db690790..662f2c31 100644 --- a/src/lib_java/data/indexer/IndexerJava.h +++ b/src/lib_java/data/indexer/IndexerJava.h @@ -3,8 +3,8 @@ #include -#include "data/indexer/IndexerCommandJava.h" -#include "data/indexer/Indexer.h" +#include "IndexerCommandJava.h" +#include "Indexer.h" class IndexerJava: public Indexer { diff --git a/src/lib_java/data/parser/java/JavaEnvironment.cpp b/src/lib_java/data/parser/java/JavaEnvironment.cpp index b00a763a..ca6d0bd2 100644 --- a/src/lib_java/data/parser/java/JavaEnvironment.cpp +++ b/src/lib_java/data/parser/java/JavaEnvironment.cpp @@ -1,9 +1,9 @@ -#include "data/parser/java/JavaEnvironment.h" +#include "JavaEnvironment.h" #include -#include "utility/logging/logging.h" -#include "data/parser/java/JavaEnvironmentFactory.h" +#include "logging.h" +#include "JavaEnvironmentFactory.h" JavaEnvironment::~JavaEnvironment() { diff --git a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp index bff5a2fd..e9859466 100644 --- a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp +++ b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp @@ -1,14 +1,14 @@ -#include "data/parser/java/JavaEnvironmentFactory.h" +#include "JavaEnvironmentFactory.h" #include #include -#include "data/parser/java/JavaEnvironment.h" -#include "settings/ApplicationSettings.h" -#include "utility/logging/logging.h" -#include "utility/utilityLibrary.h" -#include "utility/utilityWindows.h" +#include "JavaEnvironment.h" +#include "ApplicationSettings.h" +#include "logging.h" +#include "utilityLibrary.h" +#include "utilityWindows.h" void JavaEnvironmentFactory::createInstance(std::string classPath, std::string& errorString) { diff --git a/src/lib_java/data/parser/java/JavaParser.cpp b/src/lib_java/data/parser/java/JavaParser.cpp index e824a48d..4b726404 100644 --- a/src/lib_java/data/parser/java/JavaParser.cpp +++ b/src/lib_java/data/parser/java/JavaParser.cpp @@ -1,17 +1,17 @@ -#include "data/parser/java/JavaParser.h" +#include "JavaParser.h" #include -#include "data/name/NameHierarchy.h" -#include "data/parser/java/JavaEnvironmentFactory.h" -#include "data/parser/ParseLocation.h" -#include "data/parser/ReferenceKind.h" -#include "data/parser/ParserClient.h" -#include "settings/ApplicationSettings.h" -#include "utility/text/TextAccess.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityJava.h" -#include "utility/utilityString.h" +#include "NameHierarchy.h" +#include "JavaEnvironmentFactory.h" +#include "ParseLocation.h" +#include "ReferenceKind.h" +#include "ParserClient.h" +#include "ApplicationSettings.h" +#include "TextAccess.h" +#include "ResourcePaths.h" +#include "utilityJava.h" +#include "utilityString.h" void JavaParser::clearCaches() { diff --git a/src/lib_java/data/parser/java/JavaParser.h b/src/lib_java/data/parser/java/JavaParser.h index 05bb2796..96e59246 100644 --- a/src/lib_java/data/parser/java/JavaParser.h +++ b/src/lib_java/data/parser/java/JavaParser.h @@ -5,12 +5,12 @@ #include #include -#include "data/indexer/IndexerCommandJava.h" -#include "data/parser/Parser.h" -#include "data/parser/java/JavaEnvironment.h" -#include "utility/file/FilePath.h" -#include "utility/logging/logging.h" -#include "utility/messaging/MessageInterruptTasksCounter.h" +#include "IndexerCommandJava.h" +#include "Parser.h" +#include "JavaEnvironment.h" +#include "FilePath.h" +#include "logging.h" +#include "MessageInterruptTasksCounter.h" struct JNIEnv_; typedef JNIEnv_ JNIEnv; diff --git a/src/lib_java/project/SourceGroupFactoryModuleJava.cpp b/src/lib_java/project/SourceGroupFactoryModuleJava.cpp index f9d79887..1ff8a53c 100644 --- a/src/lib_java/project/SourceGroupFactoryModuleJava.cpp +++ b/src/lib_java/project/SourceGroupFactoryModuleJava.cpp @@ -1,13 +1,13 @@ -#include "project/SourceGroupFactoryModuleJava.h" +#include "SourceGroupFactoryModuleJava.h" -#include "project/SourceGroupJavaEmpty.h" -#include "project/SourceGroupJavaGradle.h" -#include "project/SourceGroupJavaMaven.h" -#include "project/SourceGroupJavaSonargraph.h" -#include "settings/SourceGroupSettingsJavaEmpty.h" -#include "settings/SourceGroupSettingsJavaGradle.h" -#include "settings/SourceGroupSettingsJavaMaven.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" +#include "SourceGroupJavaEmpty.h" +#include "SourceGroupJavaGradle.h" +#include "SourceGroupJavaMaven.h" +#include "SourceGroupJavaSonargraph.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaSonargraph.h" bool SourceGroupFactoryModuleJava::supports(SourceGroupType type) const { diff --git a/src/lib_java/project/SourceGroupFactoryModuleJava.h b/src/lib_java/project/SourceGroupFactoryModuleJava.h index f07f15a4..42b97b62 100644 --- a/src/lib_java/project/SourceGroupFactoryModuleJava.h +++ b/src/lib_java/project/SourceGroupFactoryModuleJava.h @@ -1,7 +1,7 @@ #ifndef SOURCE_GROUP_FACTORY_MODULE_JAVA_H #define SOURCE_GROUP_FACTORY_MODULE_JAVA_H -#include "project/SourceGroupFactoryModule.h" +#include "SourceGroupFactoryModule.h" class SourceGroupFactoryModuleJava: public SourceGroupFactoryModule { diff --git a/src/lib_java/project/SourceGroupJava.cpp b/src/lib_java/project/SourceGroupJava.cpp index 7c58ad88..42b94cc1 100644 --- a/src/lib_java/project/SourceGroupJava.cpp +++ b/src/lib_java/project/SourceGroupJava.cpp @@ -1,9 +1,9 @@ -#include "project/SourceGroupJava.h" +#include "SourceGroupJava.h" -#include "data/indexer/IndexerCommandJava.h" -#include "settings/SourceGroupSettingsJava.h" -#include "utility/file/FileManager.h" -#include "utility/logging/logging.h" +#include "IndexerCommandJava.h" +#include "SourceGroupSettingsJava.h" +#include "FileManager.h" +#include "logging.h" std::set SourceGroupJava::filterToContainedFilePaths(const std::set& filePaths) const { diff --git a/src/lib_java/project/SourceGroupJava.h b/src/lib_java/project/SourceGroupJava.h index 08d0c212..fb92e480 100644 --- a/src/lib_java/project/SourceGroupJava.h +++ b/src/lib_java/project/SourceGroupJava.h @@ -5,7 +5,7 @@ #include #include -#include "project/SourceGroup.h" +#include "SourceGroup.h" class SourceGroupSettingsJava; diff --git a/src/lib_java/project/SourceGroupJavaEmpty.cpp b/src/lib_java/project/SourceGroupJavaEmpty.cpp index 7915e996..80df830d 100644 --- a/src/lib_java/project/SourceGroupJavaEmpty.cpp +++ b/src/lib_java/project/SourceGroupJavaEmpty.cpp @@ -1,7 +1,7 @@ -#include "project/SourceGroupJavaEmpty.h" +#include "SourceGroupJavaEmpty.h" -#include "settings/SourceGroupSettingsJavaEmpty.h" -#include "utility/utilityJava.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "utilityJava.h" SourceGroupJavaEmpty::SourceGroupJavaEmpty(std::shared_ptr settings) : m_settings(settings) diff --git a/src/lib_java/project/SourceGroupJavaEmpty.h b/src/lib_java/project/SourceGroupJavaEmpty.h index cd10e417..64b00623 100644 --- a/src/lib_java/project/SourceGroupJavaEmpty.h +++ b/src/lib_java/project/SourceGroupJavaEmpty.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroupJava.h" +#include "SourceGroupJava.h" class SourceGroupSettingsJavaEmpty; diff --git a/src/lib_java/project/SourceGroupJavaGradle.cpp b/src/lib_java/project/SourceGroupJavaGradle.cpp index 252d71e3..ae950578 100644 --- a/src/lib_java/project/SourceGroupJavaGradle.cpp +++ b/src/lib_java/project/SourceGroupJavaGradle.cpp @@ -1,12 +1,12 @@ -#include "project/SourceGroupJavaGradle.h" +#include "SourceGroupJavaGradle.h" -#include "component/view/DialogView.h" -#include "settings/SourceGroupSettingsJavaGradle.h" -#include "utility/file/FileSystem.h" -#include "utility/ScopedFunctor.h" -#include "utility/utility.h" -#include "utility/utilityGradle.h" -#include "utility/utilityJava.h" +#include "DialogView.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "FileSystem.h" +#include "ScopedFunctor.h" +#include "utility.h" +#include "utilityGradle.h" +#include "utilityJava.h" #include "Application.h" SourceGroupJavaGradle::SourceGroupJavaGradle(std::shared_ptr settings) diff --git a/src/lib_java/project/SourceGroupJavaGradle.h b/src/lib_java/project/SourceGroupJavaGradle.h index 832f35a6..4947736f 100644 --- a/src/lib_java/project/SourceGroupJavaGradle.h +++ b/src/lib_java/project/SourceGroupJavaGradle.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroupJava.h" +#include "SourceGroupJava.h" class SourceGroupSettingsJavaGradle; diff --git a/src/lib_java/project/SourceGroupJavaMaven.cpp b/src/lib_java/project/SourceGroupJavaMaven.cpp index e39f04b7..10ccd3ff 100644 --- a/src/lib_java/project/SourceGroupJavaMaven.cpp +++ b/src/lib_java/project/SourceGroupJavaMaven.cpp @@ -1,14 +1,14 @@ -#include "project/SourceGroupJavaMaven.h" +#include "SourceGroupJavaMaven.h" -#include "component/view/DialogView.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsJavaMaven.h" -#include "utility/file/FileSystem.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/ScopedFunctor.h" -#include "utility/utility.h" -#include "utility/utilityJava.h" -#include "utility/utilityMaven.h" +#include "DialogView.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "FileSystem.h" +#include "MessageStatus.h" +#include "ScopedFunctor.h" +#include "utility.h" +#include "utilityJava.h" +#include "utilityMaven.h" #include "Application.h" SourceGroupJavaMaven::SourceGroupJavaMaven(std::shared_ptr settings) diff --git a/src/lib_java/project/SourceGroupJavaMaven.h b/src/lib_java/project/SourceGroupJavaMaven.h index 6408f0a6..df77a94a 100644 --- a/src/lib_java/project/SourceGroupJavaMaven.h +++ b/src/lib_java/project/SourceGroupJavaMaven.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroupJava.h" +#include "SourceGroupJava.h" class SourceGroupSettingsJavaMaven; diff --git a/src/lib_java/project/SourceGroupJavaSonargraph.cpp b/src/lib_java/project/SourceGroupJavaSonargraph.cpp index ea389440..2cf4a8c5 100644 --- a/src/lib_java/project/SourceGroupJavaSonargraph.cpp +++ b/src/lib_java/project/SourceGroupJavaSonargraph.cpp @@ -1,11 +1,11 @@ -#include "project/SourceGroupJavaSonargraph.h" +#include "SourceGroupJavaSonargraph.h" -#include "data/indexer/IndexerCommandJava.h" -#include "settings/ApplicationSettings.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/sonargraph/SonargraphProject.h" -#include "utility/utilityJava.h" +#include "IndexerCommandJava.h" +#include "ApplicationSettings.h" +#include "SourceGroupSettingsJavaSonargraph.h" +#include "MessageStatus.h" +#include "SonargraphProject.h" +#include "utilityJava.h" #include "Application.h" SourceGroupJavaSonargraph::SourceGroupJavaSonargraph(std::shared_ptr settings) diff --git a/src/lib_java/project/SourceGroupJavaSonargraph.h b/src/lib_java/project/SourceGroupJavaSonargraph.h index 3f4b7ecf..c0584ad7 100644 --- a/src/lib_java/project/SourceGroupJavaSonargraph.h +++ b/src/lib_java/project/SourceGroupJavaSonargraph.h @@ -4,7 +4,7 @@ #include #include -#include "project/SourceGroup.h" +#include "SourceGroup.h" class SourceGroupSettingsJavaSonargraph; diff --git a/src/lib_java/utility/utilityGradle.cpp b/src/lib_java/utility/utilityGradle.cpp index dcc51708..c92ba31b 100644 --- a/src/lib_java/utility/utilityGradle.cpp +++ b/src/lib_java/utility/utilityGradle.cpp @@ -1,15 +1,15 @@ -#include "utility/utilityGradle.h" +#include "utilityGradle.h" #include -#include "data/parser/java/JavaEnvironment.h" -#include "data/parser/java/JavaEnvironmentFactory.h" -#include "settings/ApplicationSettings.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/ResourcePaths.h" -#include "utility/utilityJava.h" -#include "utility/utilityString.h" +#include "JavaEnvironment.h" +#include "JavaEnvironmentFactory.h" +#include "ApplicationSettings.h" +#include "logging.h" +#include "MessageStatus.h" +#include "ResourcePaths.h" +#include "utilityJava.h" +#include "utilityString.h" #include "Application.h" namespace diff --git a/src/lib_java/utility/utilityJava.cpp b/src/lib_java/utility/utilityJava.cpp index 1a3c8d0f..1ad8b061 100644 --- a/src/lib_java/utility/utilityJava.cpp +++ b/src/lib_java/utility/utilityJava.cpp @@ -1,16 +1,16 @@ -#include "utility/utilityGradle.h" +#include "utilityGradle.h" -#include "component/view/DialogView.h" -#include "data/parser/java/JavaEnvironment.h" -#include "data/parser/java/JavaEnvironmentFactory.h" -#include "settings/SourceGroupSettingsWithClasspath.h" -#include "settings/ApplicationSettings.h" -#include "utility/logging/logging.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/text/TextAccess.h" -#include "utility/ResourcePaths.h" -#include "utility/ScopedFunctor.h" -#include "utility/utilityString.h" +#include "DialogView.h" +#include "JavaEnvironment.h" +#include "JavaEnvironmentFactory.h" +#include "SourceGroupSettingsWithClasspath.h" +#include "ApplicationSettings.h" +#include "logging.h" +#include "MessageStatus.h" +#include "TextAccess.h" +#include "ResourcePaths.h" +#include "ScopedFunctor.h" +#include "utilityString.h" #include "Application.h" namespace utility diff --git a/src/lib_java/utility/utilityMaven.cpp b/src/lib_java/utility/utilityMaven.cpp index 6cca9697..d6409da2 100644 --- a/src/lib_java/utility/utilityMaven.cpp +++ b/src/lib_java/utility/utilityMaven.cpp @@ -1,15 +1,15 @@ -#include "utility/utilityMaven.h" +#include "utilityMaven.h" #include -#include "settings/ApplicationSettings.h" -#include "utility/file/FilePath.h" -#include "utility/messaging/type/MessageStatus.h" -#include "utility/text/TextAccess.h" -#include "utility/utilityApp.h" -#include "utility/utilityString.h" -#include "utility/utilityXml.h" -#include "utility/utility.h" +#include "ApplicationSettings.h" +#include "FilePath.h" +#include "MessageStatus.h" +#include "TextAccess.h" +#include "utilityApp.h" +#include "utilityString.h" +#include "utilityXml.h" +#include "utility.h" #include "Application.h" namespace diff --git a/src/lib_license/CMakeLists.txt b/src/lib_license/CMakeLists.txt index d5b0a5b6..1e678239 100644 --- a/src/lib_license/CMakeLists.txt +++ b/src/lib_license/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - LIB_LICENSE_FILES + LIB_LICENSE utility/Version.cpp utility/Version.h diff --git a/src/lib_license/License.cpp b/src/lib_license/License.cpp index 90e18fb4..8de2eda7 100644 --- a/src/lib_license/License.cpp +++ b/src/lib_license/License.cpp @@ -8,20 +8,20 @@ #include #include -//#include "botan_all.h" -#include "boost/date_time.hpp" -#include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/filesystem.hpp" -#include "botan/rsa.h" -#include "botan/cryptobox.h" -#include "botan/passhash9.h" -#include "botan/base64.h" -#include "botan/pubkey.h" -#include "botan/pk_keys.h" -#include "botan/auto_rng.h" -#include "botan/pbkdf.h" +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "utility/Version.h" +#include "Version.h" #include "PublicKey.h" namespace diff --git a/src/lib_license/utility/Version.cpp b/src/lib_license/utility/Version.cpp index 55162c3a..6ee6a809 100644 --- a/src/lib_license/utility/Version.cpp +++ b/src/lib_license/utility/Version.cpp @@ -1,4 +1,4 @@ -#include "utility/Version.h" +#include "Version.h" #include #include diff --git a/src/lib_utility/CMakeLists.txt b/src/lib_utility/CMakeLists.txt index 9eb90aaf..325ef0c1 100644 --- a/src/lib_utility/CMakeLists.txt +++ b/src/lib_utility/CMakeLists.txt @@ -1,6 +1,6 @@ add_files( - LIB_UTILITY_FILES + LIB_UTILITY utility/TextCodec.cpp utility/TextCodec.h diff --git a/src/lib_utility/utility/TextCodec.cpp b/src/lib_utility/utility/TextCodec.cpp index 3872ab99..73c1354f 100644 --- a/src/lib_utility/utility/TextCodec.cpp +++ b/src/lib_utility/utility/TextCodec.cpp @@ -1,4 +1,4 @@ -#include "utility/TextCodec.h" +#include "TextCodec.h" #include diff --git a/src/lib_utility/utility/utilityString.cpp b/src/lib_utility/utility/utilityString.cpp index 5c5703b8..4869bc73 100644 --- a/src/lib_utility/utility/utilityString.cpp +++ b/src/lib_utility/utility/utilityString.cpp @@ -1,4 +1,4 @@ -#include "utility/utilityString.h" +#include "utilityString.h" #include #include diff --git a/src/license_generator/CMakeLists.txt b/src/license_generator/CMakeLists.txt index 18bdd1da..4164af63 100644 --- a/src/license_generator/CMakeLists.txt +++ b/src/license_generator/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - LICENSE_GENERATOR_FILES + LICENSE_GENERATOR Generator.cpp Generator.h diff --git a/src/license_generator/Generator.cpp b/src/license_generator/Generator.cpp index 238a69c7..1c61b893 100644 --- a/src/license_generator/Generator.cpp +++ b/src/license_generator/Generator.cpp @@ -5,19 +5,19 @@ #include #include -#include "boost/filesystem.hpp" -#include "boost/date_time/gregorian/gregorian.hpp" -#include "botan/pk_keys.h" -#include "botan/pkcs8.h" -#include "botan/rsa.h" -#include "botan/pbkdf.h" -#include "botan/pubkey.h" -#include "botan/passhash9.h" -#include "botan/base64.h" -#include "botan/auto_rng.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "License.h" -#include "utility/Version.h" +#include "Version.h" #include "PrivateKey.h" #include "PublicKey.h" diff --git a/src/license_generator/Generator.h b/src/license_generator/Generator.h index d01219e5..906fce35 100644 --- a/src/license_generator/Generator.h +++ b/src/license_generator/Generator.h @@ -4,7 +4,7 @@ #include #include -#include "botan/auto_rng.h" +#include namespace Botan { diff --git a/src/license_generator/main.cpp b/src/license_generator/main.cpp index 84e77ed9..af6b1cb1 100644 --- a/src/license_generator/main.cpp +++ b/src/license_generator/main.cpp @@ -3,7 +3,7 @@ #include #include -#include "boost/program_options.hpp" +#include #include "Generator.h" #include "PrivateKey.h" diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 41e7dd4d..f6625abc 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -1,5 +1,5 @@ add_files( - TEST_FILES + TEST helper/DumpParserClient.h helper/TestFileRegister.cpp diff --git a/src/test/CommandlineTestSuite.h b/src/test/CommandlineTestSuite.h index aa838cb2..4d85dc79 100644 --- a/src/test/CommandlineTestSuite.h +++ b/src/test/CommandlineTestSuite.h @@ -1,7 +1,7 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/commandline/CommandLineParser.h" -#include "settings/ApplicationSettings.h" +#include "CommandLineParser.h" +#include "ApplicationSettings.h" #include #include diff --git a/src/test/ConfigManagerTestSuite.h b/src/test/ConfigManagerTestSuite.h index fa498ec2..fc607abb 100644 --- a/src/test/ConfigManagerTestSuite.h +++ b/src/test/ConfigManagerTestSuite.h @@ -1,7 +1,7 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/ConfigManager.h" -#include "utility/text/TextAccess.h" +#include "ConfigManager.h" +#include "TextAccess.h" class ConfigManagerTestSuite: public CxxTest::TestSuite { diff --git a/src/test/CxxIncludeProcessingTestSuite.h b/src/test/CxxIncludeProcessingTestSuite.h index a3268fcb..33721fc6 100644 --- a/src/test/CxxIncludeProcessingTestSuite.h +++ b/src/test/CxxIncludeProcessingTestSuite.h @@ -1,9 +1,9 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/text/TextAccess.h" -#include "utility/IncludeDirective.h" -#include "utility/IncludeProcessing.h" -#include "utility/utility.h" +#include "TextAccess.h" +#include "IncludeDirective.h" +#include "IncludeProcessing.h" +#include "utility.h" class CxxIncludeProcessingTestSuite: public CxxTest::TestSuite { diff --git a/src/test/CxxIndexSampleProjectsTestSuite.h b/src/test/CxxIndexSampleProjectsTestSuite.h index bd4e397f..2e5e0a77 100644 --- a/src/test/CxxIndexSampleProjectsTestSuite.h +++ b/src/test/CxxIndexSampleProjectsTestSuite.h @@ -1,16 +1,16 @@ -#include "cxxtest/TestSuite.h" +#include #include #include -#include "data/indexer/IndexerCommandCxx.h" -#include "data/parser/cxx/CxxParser.h" -#include "helper/DumpParserClient.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FileRegister.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "IndexerCommandCxx.h" +#include "CxxParser.h" +#include "DumpParserClient.h" +#include "ApplicationSettings.h" +#include "FileRegister.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityString.h" class CxxIndexSampleProjectsTestSuite : public CxxTest::TestSuite { diff --git a/src/test/CxxParserTestSuite.h b/src/test/CxxParserTestSuite.h index bec0fdc9..8c20b754 100644 --- a/src/test/CxxParserTestSuite.h +++ b/src/test/CxxParserTestSuite.h @@ -1,14 +1,14 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityString.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityString.h" -#include "data/indexer/IndexerCommandCxx.h" -#include "data/parser/cxx/CxxParser.h" +#include "IndexerCommandCxx.h" +#include "CxxParser.h" -#include "helper/TestFileRegister.h" -#include "helper/TestParserClient.h" +#include "TestFileRegister.h" +#include "TestParserClient.h" class CxxParserTestSuite: public CxxTest::TestSuite { diff --git a/src/test/CxxTypeNameTestSuite.h b/src/test/CxxTypeNameTestSuite.h index cf0221f7..6ad07bd4 100644 --- a/src/test/CxxTypeNameTestSuite.h +++ b/src/test/CxxTypeNameTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "data/parser/cxx/name/CxxTypeName.h" +#include "CxxTypeName.h" class CxxTypeNameTestSuite: public CxxTest::TestSuite { diff --git a/src/test/FileManagerTestSuite.h b/src/test/FileManagerTestSuite.h index f8f097be..026d7a34 100644 --- a/src/test/FileManagerTestSuite.h +++ b/src/test/FileManagerTestSuite.h @@ -1,9 +1,9 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/file/FileManager.h" -#include "utility/file/FilePath.h" -#include "utility/file/FileSystem.h" -#include "utility/utility.h" +#include "FileManager.h" +#include "FilePath.h" +#include "FileSystem.h" +#include "utility.h" class FileManagerTestSuite : public CxxTest::TestSuite { diff --git a/src/test/FilePathFilterTestSuite.h b/src/test/FilePathFilterTestSuite.h index 4ac0fdaf..36ff722c 100644 --- a/src/test/FilePathFilterTestSuite.h +++ b/src/test/FilePathFilterTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/file/FilePathFilter.h" +#include "FilePathFilter.h" class FilePathFilterTestSuite: public CxxTest::TestSuite { diff --git a/src/test/FilePathTestSuite.h b/src/test/FilePathTestSuite.h index 193212f6..27c767ee 100644 --- a/src/test/FilePathTestSuite.h +++ b/src/test/FilePathTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/file/FilePath.h" +#include "FilePath.h" class FilePathTestSuite : public CxxTest::TestSuite { diff --git a/src/test/FileSystemTestSuite.h b/src/test/FileSystemTestSuite.h index 65432318..456f7fd8 100644 --- a/src/test/FileSystemTestSuite.h +++ b/src/test/FileSystemTestSuite.h @@ -1,12 +1,12 @@ -#include "cxxtest/TestSuite.h" +#include #include #include #include #include -#include "utility/file/FileSystem.h" -#include "utility/utility.h" +#include "FileSystem.h" +#include "utility.h" class FileSystemTestSuite: public CxxTest::TestSuite { diff --git a/src/test/GeneratorTestSuite.h b/src/test/GeneratorTestSuite.h index 4c6c55fc..dbb6f9e0 100644 --- a/src/test/GeneratorTestSuite.h +++ b/src/test/GeneratorTestSuite.h @@ -1,4 +1,4 @@ -#include "cxxtest/TestSuite.h" +#include #include "License.h" #include "Generator.h" diff --git a/src/test/GraphTestSuite.h b/src/test/GraphTestSuite.h index fe157d6f..9c06fac7 100644 --- a/src/test/GraphTestSuite.h +++ b/src/test/GraphTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "data/graph/Graph.h" +#include "Graph.h" class GraphTestSuite : public CxxTest::TestSuite { diff --git a/src/test/JavaIndexSampleProjectsTestSuite.h b/src/test/JavaIndexSampleProjectsTestSuite.h index 613a8698..f8286f9b 100644 --- a/src/test/JavaIndexSampleProjectsTestSuite.h +++ b/src/test/JavaIndexSampleProjectsTestSuite.h @@ -1,19 +1,19 @@ -#include "cxxtest/TestSuite.h" +#include #include #include -#include "data/indexer/IndexerCommandJava.h" -#include "data/parser/java/JavaEnvironmentFactory.h" -#include "data/parser/java/JavaParser.h" -#include "helper/DumpParserClient.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FileRegister.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityJava.h" -#include "utility/utilityPathDetection.h" -#include "utility/utilityString.h" +#include "IndexerCommandJava.h" +#include "JavaEnvironmentFactory.h" +#include "JavaParser.h" +#include "DumpParserClient.h" +#include "ApplicationSettings.h" +#include "FileRegister.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityJava.h" +#include "utilityPathDetection.h" +#include "utilityString.h" class JavaIndexSampleProjectsTestSuite : public CxxTest::TestSuite { diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h index b77b9342..66f66206 100644 --- a/src/test/JavaParserTestSuite.h +++ b/src/test/JavaParserTestSuite.h @@ -1,15 +1,15 @@ -#include "cxxtest/TestSuite.h" +#include -#include "data/parser/java/JavaEnvironmentFactory.h" -#include "data/parser/java/JavaParser.h" +#include "JavaEnvironmentFactory.h" +#include "JavaParser.h" -#include "helper/TestParserClient.h" +#include "TestParserClient.h" -#include "settings/ApplicationSettings.h" -#include "utility/utilityPathDetection.h" -#include "utility/text/TextAccess.h" -#include "utility/utility.h" -#include "utility/utilityJava.h" +#include "ApplicationSettings.h" +#include "utilityPathDetection.h" +#include "TextAccess.h" +#include "utility.h" +#include "utilityJava.h" class JavaParserTestSuite: public CxxTest::TestSuite { diff --git a/src/test/LogManagerTestSuite.h b/src/test/LogManagerTestSuite.h index e5ad4a18..b7a82ba9 100644 --- a/src/test/LogManagerTestSuite.h +++ b/src/test/LogManagerTestSuite.h @@ -1,8 +1,8 @@ -#include "cxxtest/TestSuite.h" +#include #include -#include "utility/logging/LogManagerImplementation.h" +#include "LogManagerImplementation.h" class LogManagerTestSuite : public CxxTest::TestSuite { diff --git a/src/test/LowMemoryStringMapTestSuite.h b/src/test/LowMemoryStringMapTestSuite.h index d9e6e2af..9044d01d 100644 --- a/src/test/LowMemoryStringMapTestSuite.h +++ b/src/test/LowMemoryStringMapTestSuite.h @@ -1,9 +1,9 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/LowMemoryStringMap.h" -#include "utility/text/TextAccess.h" -#include "utility/types.h" -#include "utility/utilityString.h" +#include "LowMemoryStringMap.h" +#include "TextAccess.h" +#include "types.h" +#include "utilityString.h" class LowMemoryStringMapTestSuite : public CxxTest::TestSuite { diff --git a/src/test/MatrixBaseTestSuite.h b/src/test/MatrixBaseTestSuite.h index 7700cf5f..cd5327f5 100644 --- a/src/test/MatrixBaseTestSuite.h +++ b/src/test/MatrixBaseTestSuite.h @@ -1,7 +1,7 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/math/MatrixBase.h" -#include "utility/math/VectorBase.h" +#include "MatrixBase.h" +#include "VectorBase.h" class MatrixBaseTestSuite : public CxxTest::TestSuite { diff --git a/src/test/MatrixDynamicBaseTestSuite.h b/src/test/MatrixDynamicBaseTestSuite.h index b884fcef..8d3fc371 100644 --- a/src/test/MatrixDynamicBaseTestSuite.h +++ b/src/test/MatrixDynamicBaseTestSuite.h @@ -1,7 +1,7 @@ -#include "cxxtest/TestSuite.h" +#include "TestSuite.h" -#include "utility/logging/logging.h" -#include "utility/math/MatrixDynamicBase.h" +#include "logging.h" +#include "MatrixDynamicBase.h" class MatrixDynamicBaseTestSuite : public CxxTest::TestSuite { diff --git a/src/test/MessageQueueTestSuite.h b/src/test/MessageQueueTestSuite.h index d9404b9a..7d642ccb 100644 --- a/src/test/MessageQueueTestSuite.h +++ b/src/test/MessageQueueTestSuite.h @@ -3,9 +3,9 @@ #include #include -#include "utility/messaging/Message.h" -#include "utility/messaging/MessageListener.h" -#include "utility/messaging/MessageQueue.h" +#include "Message.h" +#include "MessageListener.h" +#include "MessageQueue.h" class MessageQueueTestSuite: public CxxTest::TestSuite { diff --git a/src/test/NetworkProtocolHelperTestSuite.h b/src/test/NetworkProtocolHelperTestSuite.h index d6a49a23..5ad65799 100644 --- a/src/test/NetworkProtocolHelperTestSuite.h +++ b/src/test/NetworkProtocolHelperTestSuite.h @@ -1,6 +1,6 @@ #include -#include "component/controller/helper/NetworkProtocolHelper.h" +#include "NetworkProtocolHelper.h" class NetworkProtocolHelperTestSuite : public CxxTest::TestSuite { diff --git a/src/test/RefreshInfoGeneratorTestSuite.h b/src/test/RefreshInfoGeneratorTestSuite.h index 5e89b8c3..6574f370 100644 --- a/src/test/RefreshInfoGeneratorTestSuite.h +++ b/src/test/RefreshInfoGeneratorTestSuite.h @@ -1,13 +1,13 @@ -#include "cxxtest/TestSuite.h" +#include -#include "data/storage/PersistentStorage.h" -#include "project/RefreshInfo.h" -#include "project/RefreshInfoGenerator.h" -#include "project/SourceGroup.h" -#include "settings/ProjectSettings.h" -#include "settings/SourceGroupSettings.h" -#include "utility/file/FileSystem.h" -#include "utility/utility.h" +#include "PersistentStorage.h" +#include "RefreshInfo.h" +#include "RefreshInfoGenerator.h" +#include "SourceGroup.h" +#include "ProjectSettings.h" +#include "SourceGroupSettings.h" +#include "FileSystem.h" +#include "utility.h" class RefreshInfoGeneratorTestSuite: public CxxTest::TestSuite { diff --git a/src/test/SearchIndexTestSuite.h b/src/test/SearchIndexTestSuite.h index 63a7b5a1..3a674cf4 100644 --- a/src/test/SearchIndexTestSuite.h +++ b/src/test/SearchIndexTestSuite.h @@ -1,8 +1,8 @@ -#include "cxxtest/TestSuite.h" +#include -#include "data/name/NameHierarchy.h" -#include "data/search/SearchIndex.h" -#include "utility/utility.h" +#include "NameHierarchy.h" +#include "SearchIndex.h" +#include "utility.h" class SearchIndexTestSuite : public CxxTest::TestSuite { diff --git a/src/test/SettingsMigratorTestSuite.h b/src/test/SettingsMigratorTestSuite.h index b77b35eb..68df8555 100644 --- a/src/test/SettingsMigratorTestSuite.h +++ b/src/test/SettingsMigratorTestSuite.h @@ -1,10 +1,10 @@ #include -#include "settings/Settings.h" -#include "settings/migration/SettingsMigrator.h" -#include "settings/migration/SettingsMigrationLambda.h" -#include "settings/migration/SettingsMigrationMoveKey.h" -#include "utility/text/TextAccess.h" +#include "Settings.h" +#include "SettingsMigrator.h" +#include "SettingsMigrationLambda.h" +#include "SettingsMigrationMoveKey.h" +#include "TextAccess.h" class SettingsMigratorTestSuite : public CxxTest::TestSuite { diff --git a/src/test/SettingsTestSuite.h b/src/test/SettingsTestSuite.h index 279a03ed..ad74e31b 100644 --- a/src/test/SettingsTestSuite.h +++ b/src/test/SettingsTestSuite.h @@ -1,9 +1,9 @@ #include -#include "settings/ProjectSettings.h" -#include "settings/Settings.h" -#include "settings/SourceGroupSettingsCxx.h" -#include "settings/SourceGroupSettingsWithSourcePaths.h" +#include "ProjectSettings.h" +#include "Settings.h" +#include "SourceGroupSettingsCxx.h" +#include "SourceGroupSettingsWithSourcePaths.h" class SettingsTestSuite : public CxxTest::TestSuite { diff --git a/src/test/SharedMemoryTestSuite.h b/src/test/SharedMemoryTestSuite.h index 7c26cab8..fcb18946 100644 --- a/src/test/SharedMemoryTestSuite.h +++ b/src/test/SharedMemoryTestSuite.h @@ -1,6 +1,6 @@ #include -#include "utility/interprocess/SharedMemory.h" +#include "SharedMemory.h" class SharedMemoryTestSuite : public CxxTest::TestSuite { diff --git a/src/test/SourceGroupTestSuite.h b/src/test/SourceGroupTestSuite.h index e92acf0e..93a9a06f 100644 --- a/src/test/SourceGroupTestSuite.h +++ b/src/test/SourceGroupTestSuite.h @@ -1,36 +1,36 @@ -#include "cxxtest/TestSuite.h" +#include #include -#include "data/indexer/IndexerCommandCxx.h" -#include "data/indexer/IndexerCommandJava.h" -#include "data/parser/java/JavaEnvironmentFactory.h" -#include "project/SourceGroupCxxEmpty.h" -#include "project/SourceGroupCxxCdb.h" -#include "project/SourceGroupCxxCodeblocks.h" -#include "project/SourceGroupCxxSonargraph.h" -#include "project/SourceGroupJavaEmpty.h" -#include "project/SourceGroupJavaGradle.h" -#include "project/SourceGroupJavaMaven.h" -#include "project/SourceGroupJavaSonargraph.h" -#include "settings/SourceGroupSettingsCEmpty.h" -#include "settings/SourceGroupSettingsCppEmpty.h" -#include "settings/SourceGroupSettingsCxxCdb.h" -#include "settings/SourceGroupSettingsCxxCodeblocks.h" -#include "settings/SourceGroupSettingsCxxSonargraph.h" -#include "settings/SourceGroupSettingsJavaEmpty.h" -#include "settings/SourceGroupSettingsJavaGradle.h" -#include "settings/SourceGroupSettingsJavaMaven.h" -#include "settings/SourceGroupSettingsJavaSonargraph.h" -#include "settings/ProjectSettings.h" -#include "settings/ApplicationSettings.h" -#include "utility/file/FileSystem.h" -#include "utility/text/TextAccess.h" -#include "utility/AppPath.h" -#include "utility/utilityJava.h" -#include "utility/utilityPathDetection.h" -#include "utility/utilityString.h" -#include "utility/Version.h" +#include "IndexerCommandCxx.h" +#include "IndexerCommandJava.h" +#include "JavaEnvironmentFactory.h" +#include "SourceGroupCxxEmpty.h" +#include "SourceGroupCxxCdb.h" +#include "SourceGroupCxxCodeblocks.h" +#include "SourceGroupCxxSonargraph.h" +#include "SourceGroupJavaEmpty.h" +#include "SourceGroupJavaGradle.h" +#include "SourceGroupJavaMaven.h" +#include "SourceGroupJavaSonargraph.h" +#include "SourceGroupSettingsCEmpty.h" +#include "SourceGroupSettingsCppEmpty.h" +#include "SourceGroupSettingsCxxCdb.h" +#include "SourceGroupSettingsCxxCodeblocks.h" +#include "SourceGroupSettingsCxxSonargraph.h" +#include "SourceGroupSettingsJavaEmpty.h" +#include "SourceGroupSettingsJavaGradle.h" +#include "SourceGroupSettingsJavaMaven.h" +#include "SourceGroupSettingsJavaSonargraph.h" +#include "ProjectSettings.h" +#include "ApplicationSettings.h" +#include "FileSystem.h" +#include "TextAccess.h" +#include "AppPath.h" +#include "utilityJava.h" +#include "utilityPathDetection.h" +#include "utilityString.h" +#include "Version.h" #include "Application.h" class SourceGroupTestSuite: public CxxTest::TestSuite diff --git a/src/test/SourceLocationCollectionTestSuite.h b/src/test/SourceLocationCollectionTestSuite.h index b3d3471f..4698b4f0 100644 --- a/src/test/SourceLocationCollectionTestSuite.h +++ b/src/test/SourceLocationCollectionTestSuite.h @@ -1,8 +1,8 @@ -#include "cxxtest/TestSuite.h" +#include -#include "data/location/SourceLocation.h" -#include "data/location/SourceLocationCollection.h" -#include "data/location/SourceLocationFile.h" +#include "SourceLocation.h" +#include "SourceLocationCollection.h" +#include "SourceLocationFile.h" class SourceLocationCollectionTestSuite : public CxxTest::TestSuite { diff --git a/src/test/SqliteBookmarkStorageTestSuite.h b/src/test/SqliteBookmarkStorageTestSuite.h index 6f579ac5..53ad0b02 100644 --- a/src/test/SqliteBookmarkStorageTestSuite.h +++ b/src/test/SqliteBookmarkStorageTestSuite.h @@ -1,8 +1,8 @@ -#include "cxxtest/TestSuite.h" +#include -#include "boost/filesystem.hpp" +#include -#include "data/storage/sqlite/SqliteBookmarkStorage.h" +#include "SqliteBookmarkStorage.h" class SqliteBookmarkStorageTestSuite: public CxxTest::TestSuite { diff --git a/src/test/SqliteIndexStorageTestSuite.h b/src/test/SqliteIndexStorageTestSuite.h index d64225f1..7de11b92 100644 --- a/src/test/SqliteIndexStorageTestSuite.h +++ b/src/test/SqliteIndexStorageTestSuite.h @@ -1,8 +1,8 @@ -#include "cxxtest/TestSuite.h" +#include -#include "boost/filesystem.hpp" +#include -#include "data/storage/sqlite/SqliteIndexStorage.h" +#include "SqliteIndexStorage.h" class SqliteIndexStorageTestSuite: public CxxTest::TestSuite { diff --git a/src/test/StorageTestSuite.h b/src/test/StorageTestSuite.h index 37622ca2..dba29436 100644 --- a/src/test/StorageTestSuite.h +++ b/src/test/StorageTestSuite.h @@ -1,10 +1,10 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/utilityString.h" +#include "utilityString.h" -#include "data/parser/ParseLocation.h" -#include "data/storage/IntermediateStorage.h" -#include "data/storage/PersistentStorage.h" +#include "ParseLocation.h" +#include "IntermediateStorage.h" +#include "PersistentStorage.h" class StorageTestSuite: public CxxTest::TestSuite { diff --git a/src/test/TaskSchedulerTestSuite.h b/src/test/TaskSchedulerTestSuite.h index 763ea750..ebf976c1 100644 --- a/src/test/TaskSchedulerTestSuite.h +++ b/src/test/TaskSchedulerTestSuite.h @@ -3,11 +3,11 @@ #include #include -#include "utility/scheduling/Blackboard.h" -#include "utility/scheduling/Task.h" -#include "utility/scheduling/TaskGroupSelector.h" -#include "utility/scheduling/TaskGroupSequence.h" -#include "utility/scheduling/TaskScheduler.h" +#include "Blackboard.h" +#include "Task.h" +#include "TaskGroupSelector.h" +#include "TaskGroupSequence.h" +#include "TaskScheduler.h" class TaskSchedulerTestSuite: public CxxTest::TestSuite { diff --git a/src/test/TestSuiteFixture.cpp b/src/test/TestSuiteFixture.cpp index 9a9a28c7..1b85bf40 100644 --- a/src/test/TestSuiteFixture.cpp +++ b/src/test/TestSuiteFixture.cpp @@ -2,7 +2,7 @@ #include -#include "settings/ApplicationSettings.h" +#include "ApplicationSettings.h" TestSuiteFixture::TestSuiteFixture() { diff --git a/src/test/TestSuiteFixture.h b/src/test/TestSuiteFixture.h index ac822e78..aea73704 100644 --- a/src/test/TestSuiteFixture.h +++ b/src/test/TestSuiteFixture.h @@ -1,7 +1,7 @@ #ifndef TEST_SUITE_FIXTURE_H #define TEST_SUITE_FIXTURE_H -#include "cxxtest/GlobalFixture.h" +#include class TestSuiteFixture : public CxxTest::GlobalFixture { diff --git a/src/test/TextAccessTestSuite.h b/src/test/TextAccessTestSuite.h index 59ccad2c..a9f073a7 100644 --- a/src/test/TextAccessTestSuite.h +++ b/src/test/TextAccessTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/text/TextAccess.h" +#include "TextAccess.h" class TextAccessTestSuite : public CxxTest::TestSuite { diff --git a/src/test/UtilityMavenTestSuite.h b/src/test/UtilityMavenTestSuite.h index 781666a3..1e8a14b5 100644 --- a/src/test/UtilityMavenTestSuite.h +++ b/src/test/UtilityMavenTestSuite.h @@ -1,8 +1,8 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/file/FilePath.h" -#include "utility/utilityMaven.h" -#include "utility/utilityPathDetection.h" +#include "FilePath.h" +#include "utilityMaven.h" +#include "utilityPathDetection.h" class UtilityMavenTestSuite : public CxxTest::TestSuite { diff --git a/src/test/UtilityStringTestSuite.h b/src/test/UtilityStringTestSuite.h index 87b66c5e..117fcfa4 100644 --- a/src/test/UtilityStringTestSuite.h +++ b/src/test/UtilityStringTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/utilityString.h" +#include "utilityString.h" class UtilityStringTestSuite : public CxxTest::TestSuite { diff --git a/src/test/UtilityTestSuite.h b/src/test/UtilityTestSuite.h index dc23be42..875dd080 100644 --- a/src/test/UtilityTestSuite.h +++ b/src/test/UtilityTestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/utility.h" +#include "utility.h" class UtilityTestSuite : public CxxTest::TestSuite { diff --git a/src/test/Vector2TestSuite.h b/src/test/Vector2TestSuite.h index fe7a132f..f95025a7 100644 --- a/src/test/Vector2TestSuite.h +++ b/src/test/Vector2TestSuite.h @@ -1,6 +1,6 @@ -#include "cxxtest/TestSuite.h" +#include -#include "utility/math/Vector2.h" +#include "Vector2.h" class Vector2TestSuite : public CxxTest::TestSuite { diff --git a/src/test/helper/DumpParserClient.h b/src/test/helper/DumpParserClient.h index 6cb7256c..57eb4a47 100644 --- a/src/test/helper/DumpParserClient.h +++ b/src/test/helper/DumpParserClient.h @@ -1,8 +1,8 @@ #ifndef DUMP_PARSER_CLIENT_H #define DUMP_PARSER_CLIENT_H -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" +#include "ParseLocation.h" +#include "ParserClient.h" #include diff --git a/src/test/helper/TestFileRegister.cpp b/src/test/helper/TestFileRegister.cpp index 709f5c4e..0cac6156 100644 --- a/src/test/helper/TestFileRegister.cpp +++ b/src/test/helper/TestFileRegister.cpp @@ -1,6 +1,6 @@ #include "TestFileRegister.h" -#include "utility/file/FilePathFilter.h" +#include "FilePathFilter.h" TestFileRegister::TestFileRegister() : FileRegister(FilePath(), std::set(), { FilePathFilter(L"") }) diff --git a/src/test/helper/TestFileRegister.h b/src/test/helper/TestFileRegister.h index 980ebf71..8eea1c69 100644 --- a/src/test/helper/TestFileRegister.h +++ b/src/test/helper/TestFileRegister.h @@ -1,7 +1,7 @@ #ifndef TEST_FILE_MANAGER_H #define TEST_FILE_MANAGER_H -#include "utility/file/FileRegister.h" +#include "FileRegister.h" class TestFileRegister : public FileRegister diff --git a/src/test/helper/TestParserClient.h b/src/test/helper/TestParserClient.h index e8b91a9b..b1e2acb1 100644 --- a/src/test/helper/TestParserClient.h +++ b/src/test/helper/TestParserClient.h @@ -1,8 +1,8 @@ #ifndef TEST_PARSER_CLIENT_H #define TEST_PARSER_CLIENT_H -#include "data/parser/ParseLocation.h" -#include "data/parser/ParserClient.h" +#include "ParseLocation.h" +#include "ParserClient.h" class TestParserClient: public ParserClient {