diff --git a/src/app/data/parser/cxx/TaskParseCxx.cpp b/src/app/data/parser/cxx/TaskParseCxx.cpp index c2f4cb11..5cb406f8 100644 --- a/src/app/data/parser/cxx/TaskParseCxx.cpp +++ b/src/app/data/parser/cxx/TaskParseCxx.cpp @@ -73,7 +73,7 @@ Task::TaskState TaskParseCxx::update() } std::stringstream ss; - ss << "analyzing files (ESC to quit): ["; + ss << "indexing files (ESC to quit): ["; ss << fileRegister->getParsedSourceFilesCount() << "/"; ss << fileRegister->getSourceFilesCount() << "] "; ss << sourcePath.str(); diff --git a/src/app/data/parser/cxx/TaskParseWrapper.cpp b/src/app/data/parser/cxx/TaskParseWrapper.cpp index 3a499ce9..77f378b1 100644 --- a/src/app/data/parser/cxx/TaskParseWrapper.cpp +++ b/src/app/data/parser/cxx/TaskParseWrapper.cpp @@ -51,7 +51,7 @@ void TaskParseWrapper::exit() void TaskParseWrapper::interrupt() { - MessageStatus("analyzing files interrupted", false, true).dispatch(); + MessageStatus("indexing files interrupted", false, true).dispatch(); m_child->interrupt(); } diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp index 20479151..5a477b31 100644 --- a/src/lib/Application.cpp +++ b/src/lib/Application.cpp @@ -130,8 +130,8 @@ void Application::loadProject(const FilePath& projectSettingsFilePath) options.push_back("Yes"); options.push_back("No"); int result = m_mainView->confirm( - "The project file was changed after the last analysis. The project needs to get fully reanalysed to " - "reflect the current project state. Do you want to reanalyze the project?", options); + "The project file was changed after the last indexing. The project needs to get fully reindexed to " + "reflect the current project state. Do you want to reindex the project?", options); reparse = (result == 0); } @@ -148,8 +148,8 @@ void Application::loadProject(const FilePath& projectSettingsFilePath) options.push_back("Yes"); options.push_back("No"); int result = m_mainView->confirm( - "This project was analyzed with a different version of Coati. It needs to be fully reanalyzed to be used " - "with this version of Coati. Do you want to reanalyze the project?", options); + "This project was indexed with a different version of Coati. It needs to be fully reindexed to be used " + "with this version of Coati. Do you want to reindex the project?", options); reparse = (result == 0); } @@ -246,8 +246,8 @@ void Application::handleMessage(MessageLoadProject* message) options.push_back("Yes"); options.push_back("No"); int result = m_mainView->confirm( - "Some settings were changed, the project needs to be fully reanalyzed. " - "Do you want to reanalyze the project?", options); + "Some settings were changed, the project needs to be fully reindexed. " + "Do you want to reindex the project?", options); if (result == 1) { diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp index d72f54a9..3fff78c2 100644 --- a/src/lib/component/controller/CodeController.cpp +++ b/src/lib/component/controller/CodeController.cpp @@ -70,7 +70,7 @@ void CodeController::handleMessage(MessageActivateAll* message) if (stats.errorCount.total > 0) { - ss << "\tWarning: The analysis may be incomplete as long as it yields fatal errors.\n"; + ss << "\tWarning: Indexing may be incomplete as long as it yields fatal errors.\n"; ss << "\tTry resolving them and refresh the project.\n"; ss << "\n"; } diff --git a/src/lib/utility/messaging/type/MessageFinishedParsing.h b/src/lib/utility/messaging/type/MessageFinishedParsing.h index 599b6b26..15727c4e 100644 --- a/src/lib/utility/messaging/type/MessageFinishedParsing.h +++ b/src/lib/utility/messaging/type/MessageFinishedParsing.h @@ -38,7 +38,7 @@ public: } std::stringstream ss; - ss << "Finished analysis: "; + ss << "Finished indexing: "; ss << fileCount << "/" << totalFileCount << " files; "; float secondsLeft = parseTime; diff --git a/src/lib_gui/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp index 514cc9ec..8547ee1f 100644 --- a/src/lib_gui/qt/window/QtStartScreen.cpp +++ b/src/lib_gui/qt/window/QtStartScreen.cpp @@ -130,7 +130,7 @@ void QtStartScreen::setupStartScreen() { QLabel* welcomeLabel = new QLabel( "Welcome to the Coati trial!

" - "Explore our preanalyzed projects to experience Coati's unique user interface.

" + "Explore our preindexed projects to experience Coati's unique user interface.

" "If you want to use Coati on your own source code please " "purchase a license, " "or ask us for a temporary test license by writing to support@coati.io.", this); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp index 4bcce2ab..12f6ffe2 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp @@ -82,5 +82,5 @@ QString QtProjectWizzardContentCDBSource::getFileNamesTitle() const QString QtProjectWizzardContentCDBSource::getFileNamesDescription() const { - return "source files will be analyzed."; + return "source files will be indexed."; } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp index 4559b099..a6171d8d 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentFlags.cpp @@ -15,7 +15,7 @@ void QtProjectWizzardContentFlags::populateForm(QGridLayout* layout, int& row) label->setObjectName("label"); layout->addWidget(label, row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignRight); - addHelpButton("Define compiler flags used during analysis including the dash e.g. -v", layout, row); + addHelpButton("Define compiler flags used during indexing including the dash e.g. -v", layout, row); m_list = new QtDirectoryListBox(this, true); layout->addWidget(m_list, row, QtProjectWizzardWindow::BACK_COL); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp index ea9eab6c..5abb8a92 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp @@ -209,9 +209,9 @@ QtProjectWizzardContentPathsSource::QtProjectWizzardContentPathsSource( setInfo( "Project Paths", - "Add all directories or files you want to analyse. Usually these are all source and header files of " + "Add all directories or files you want to index. Usually these are all source and header files of " "your project or a subset of them.", - "Project Paths define the files and directories that will be analyzed by Coati. Usually these are the " + "Project Paths define the files and directories that will be indexed by Coati. Usually these are the " "source and header files of your project or a subset of them." ); } @@ -273,12 +273,12 @@ QStringList QtProjectWizzardContentPathsSource::getFileNames() const QString QtProjectWizzardContentPathsSource::getFileNamesTitle() const { - return "Analyzed Files"; + return "Indexed Files"; } QString QtProjectWizzardContentPathsSource::getFileNamesDescription() const { - return "files will be analyzed."; + return "files will be indexed."; } QtProjectWizzardContentPathsCDBHeader::QtProjectWizzardContentPathsCDBHeader( @@ -291,11 +291,11 @@ QtProjectWizzardContentPathsCDBHeader::QtProjectWizzardContentPathsCDBHeader( setTitleString("Header Paths"); setDescriptionString( "Where are the header files of the source files? Add the directories or files that should be " - "analyzed if included by one of the source files." + "indexed if included by one of the source files." ); setHelpString( "The compilation database only contains source files. Add the header files or directories containing the header " - "files here. Header files will be analyzed if included." + "files here. Header files will be indexed if included." ); } @@ -307,8 +307,8 @@ QtProjectWizzardContentPathsExclude::QtProjectWizzardContentPathsExclude( { setInfo( "Exclude Paths", - "Add all directories or files you want to exclude from the analysis.", - "Exclude Paths define the files and directories that will be left out from the analysis by Coati." + "Add all directories or files you want to exclude from indexing.", + "Exclude Paths define the files and directories that will be left out from indexing." ); } @@ -330,10 +330,10 @@ QtProjectWizzardContentPathsHeaderSearch::QtProjectWizzardContentPathsHeaderSear { setInfo( "Include Paths", - "Add the paths for resolving #include directives in the analyzed source and header files.", + "Add the paths for resolving #include directives in the indexed source and header files.", "Include Paths define where additional files, that your project depends on, are found. Usually they are " - "header files of frameworks or libraries that your project uses. These files won't be analyzed, but Coati needs " - "them for correct analysis." + "header files of frameworks or libraries that your project uses. These files won't be indexed, but Coati needs " + "them for correct indexing." ); } @@ -363,8 +363,8 @@ QtProjectWizzardContentPathsHeaderSearchGlobal::QtProjectWizzardContentPathsHead "(See Finding System Header Locations " "or use the auto detection below).", "Include Paths define where additional files, that your project depends on, are found. Usually they are " - "header files of frameworks or libraries that your project uses. These files won't be analyzed, but Coati needs " - "them for correct analysis.\n\n" + "header files of frameworks or libraries that your project uses. These files won't be indexed, but Coati needs " + "them for correct indexing.\n\n" "Include Paths defined here will be used for all projects." ); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp index 22b771c7..3d3542eb 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp @@ -62,12 +62,12 @@ void QtProjectWizzardContentPreferences::populateForm(QGridLayout* layout, int& layout->setRowMinimumHeight(row++, 20); - // analysis - layout->addWidget(createFormTitle("ANALYSIS"), row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignLeft); + // indexing + layout->addWidget(createFormTitle("INDEXING"), row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignLeft); row++; - // analysis threads - QLabel* threadsLabel = createFormLabel("Analysis threads"); + // indexer threads + QLabel* threadsLabel = createFormLabel("Indexer threads"); m_threads = new QComboBox(); for (int i = 1; i <= 24; i++) @@ -79,7 +79,7 @@ void QtProjectWizzardContentPreferences::populateForm(QGridLayout* layout, int& layout->addWidget(m_threads, row, QtProjectWizzardWindow::BACK_COL, Qt::AlignLeft); addHelpButton( - "Number of parallel threads used to analyse your projects." + "Number of parallel threads used to index your projects." , layout, row ); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp index b3295f32..892e4534 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp @@ -68,7 +68,7 @@ void QtProjectWizzardContentSelect::populateWindow(QGridLayout* layout) QToolButton* c = createProjectButton( "from Compilation\nDatabase", (ResourcePaths::getGuiPath() + "icon/project_cdb_256_256.png").c_str()); - m_solutionDescription.push_back("Create a new Coati project by defining what files will be analyzed and header search paths."); + m_solutionDescription.push_back("Create a new Coati project by defining what files will be indexed."); m_solutionDescription.push_back("Create a project from an existing Compilation Database. Compilation Databases can be created from " "Make and CMake projects. Have a look at the " "" diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.cpp index d7150523..8c1cbd47 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSimple.cpp @@ -24,7 +24,7 @@ void QtProjectWizzardContentSimple::populateWindow(QGridLayout* layout, int& row layout->setRowStretch(row, 0); QLabel* text = new QLabel("Search for included files in all subdirectories of the project paths. " - "Warning: This slows down analysis speed."); + "Warning: This slows down indexing speed."); text->setWordWrap(true); layout->addWidget(text, row + 1, QtProjectWizzardWindow::FRONT_COL, Qt::AlignTop); layout->setRowStretch(row + 1, 1); @@ -44,8 +44,8 @@ void QtProjectWizzardContentSimple::populateForm(QGridLayout* layout, int& row) layout->addWidget(m_checkBox, row, QtProjectWizzardWindow::BACK_COL); addHelpButton("Check this box to search for included files in all subdirectories of the project paths. " - "This avoids setting them manually if you are not familiar with the project you want to analyse.\n" - "Warning: This option slows down analysis speed.", layout, row); + "This avoids setting them manually if you are not familiar with the project you want to index.\n" + "Warning: This option slows down indexing speed.", layout, row); row++; } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceList.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceList.cpp index 8505a56d..eb0116dd 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceList.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSourceList.cpp @@ -15,7 +15,7 @@ void QtProjectWizzardContentSourceList::populateWindow(QWidget* widget) QVBoxLayout* layout = new QVBoxLayout(widget); layout->setContentsMargins(0, 0, 0, 0); - m_text = new QLabel("0 files will be analyzed."); + m_text = new QLabel("0 files will be indexed."); m_text->setWordWrap(true); layout->addWidget(m_text); diff --git a/src/lib_parser/data/parser/cxx/CxxParser.cpp b/src/lib_parser/data/parser/cxx/CxxParser.cpp index 27704009..1693c5f8 100644 --- a/src/lib_parser/data/parser/cxx/CxxParser.cpp +++ b/src/lib_parser/data/parser/cxx/CxxParser.cpp @@ -99,7 +99,7 @@ std::vector CxxParser::getCommandlineArgumentsEssential(const Argum // be AST elements for unused template functions as well. args.push_back("-fno-delayed-template-parsing"); - // The option -fexceptions signals that clang should watch out for exception-related code during analysis. + // The option -fexceptions signals that clang should watch out for exception-related code during indexing. args.push_back("-fexceptions"); // The option -c signals that no executable is built.