diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b4ac2cb..fbaab8aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -292,7 +292,7 @@ released 2018-08-31 * Windows: Fixed policy for finding Windows user data folder (issue [#612](https://github.com/CoatiSoftware/Sourcetrail/issues/612)) * C/C++: Fixed recording of multiple cxx anonymous namespaces within the same file * C/C++: Fixed files within indexed directories always refreshed in empty C/C++ source groups -* Code: Don't show list of overriden methods when clicking overriding method +* Code: Don't show list of overridden methods when clicking overriding method * Code: Fixed local reference navigation not shown for edges when file content was not cached * Fixed crash related to update check when app was opened with a project * Tooltip: Fixed repeated signature name qualification and line breaks @@ -477,7 +477,7 @@ released 2018-01-30 * Group include validation results by file and add line breaks for readability * Fixed location pickers used system root directory when empty * Graph: Add "bidirectional" to tooltip of bidirectional aggregation edges -* Linux: Don't explicitely open terminal when running on Linux (issue [#525](https://github.com/CoatiSoftware/Sourcetrail/issues/525)) +* Linux: Don't explicitly open terminal when running on Linux (issue [#525](https://github.com/CoatiSoftware/Sourcetrail/issues/525)) * Fixed files and directories dialog to offer selection of files (issue [#521](https://github.com/CoatiSoftware/Sourcetrail/issues/521)) * C++: Fixed cases where references to members were recorded as usage instead of call * Fixed crash when Start Screen is closed while checking for update @@ -554,7 +554,7 @@ released 2017-10-25 * Code: Added indexing of qualifier source locations and allow symbol activation by clicking qualifiers * Linux: Enabled Qt highDPI scaling to fix UI issues on high resolution screens * Fixed handling of non-indexed files in Graph and Code -* C/C++: Removed include check validataion for compilation database source groups +* C/C++: Removed include check validation for compilation database source groups * Graph: Bundle nested anonymous namespaces into anonymous namespace bundle in namespace overview (issue [#465](https://github.com/CoatiSoftware/Sourcetrail/issues/465)) * Search: Fixed vertical growth of search bar area when resizing window * Visual Studio plugin: Lots off fixes, see changelog (https://github.com/CoatiSoftware/vs-sourcetrail/blob/master/CHANGELOG.md) @@ -722,7 +722,7 @@ released 2017-04-12 #### 0.11.15 released 2017-03-01 -* Don't accept richt text in 'enter license' dialog field (issue [#207](https://github.com/CoatiSoftware/Sourcetrail/issues/207)) +* Don't accept rich text in 'enter license' dialog field (issue [#207](https://github.com/CoatiSoftware/Sourcetrail/issues/207)) * Updated EULA to include Test License and better clarify other license types * Fixed icons in project setup dialogs blurry on highDPI screens * Added link to additional downloadable pre-indexed projects to trial start screen @@ -787,7 +787,7 @@ released 2017-03-01 * Code: Added single file view mode * Code: Added navigation bar with mode toggle and buttons to navigate references * Graph: Removed underscores in edge hover names -* Infere some non-indexed node types by their edges +* Infer some non-indexed node types by their edges #### 0.10.0 @@ -1004,7 +1004,7 @@ released 2016-06-15 * Added link to download page to start screen to remind users of updating once in a while * Check if compilation database still exists before refreshing * Added separate step for defining project name, project location and compilation database to project setup -* Explain that the project stays up-to-date with the compilation databes on refresh in project setup UI +* Explain that the project stays up-to-date with the compilation database on refresh in project setup UI * Disregard source extensions when loading from compilation database * Removed error logs in name resolver * Added plugin for VIM: https://github.com/CoatiSoftware/vim-coati @@ -1096,7 +1096,7 @@ released 2016-02-25 * Show overview on project open with node bundles per type * Added application move protection to reenter license key * Improved log file names to be sorted chronologically -* Improved graph view node bundeling to bundle more +* Improved graph view node bundling to bundle more * Display scope name at bottom of code snippet * Added .coatiproject file associations with icon for Mac and Windows * Return to last scroll position when going back in code view diff --git a/README.md b/README.md index 79838920..1da44a29 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ Building Sourcetrail requires several dependencies to be in place on your machin ### Required dependencies * __LLVM/Clang 11.0.0__ - * __Reason__: Used for running the preprocessor on the indexedes source code, building and traversing an Abstract Syntax Tree and generating error messages. + * __Reason__: Used for running the preprocessor on the indexed source code, building and traversing an Abstract Syntax Tree and generating error messages. * __Building__: Make sure to check out the correct tag: `git checkout llvmorg-11.0.0` * __Building for Windows__: Follow [these steps](https://clang.llvm.org/get_started.html) to build the project. Run the cmake command exactly as described. * __Building for Unix__: Follow this [installation guide](http://clang.llvm.org/docs/LibASTMatchersTutorial.html) to build the project. Make sure to build with `-DLLVM_ENABLE_RTTI=ON`. @@ -163,14 +163,14 @@ Building Sourcetrail requires several dependencies to be in place on your machin * __JDK 1.8__ * __Reason__: Used to build the Java indexer and make it callable from the C++ code via JNI. - * __Remarks__: Make sure that `/bin` is available in your `PATH` environmen variable and that the `JAVA_HOME` environment variable is set: + * __Remarks__: Make sure that `/bin` is available in your `PATH` environment variable and that the `JAVA_HOME` environment variable is set: ``` JAVA_HOME=/jdk1.x.x_xxx ``` * __Maven__ * __REASON__: Used within Sourcetrail's automated tests. - * __Remarks__: Make sure `.../apache-maven-x.x.x/bin` is available in your `PATH` environmen variable and that both `M2_HOME` and `MAVEN_HOME` environment variables are set: + * __Remarks__: Make sure `.../apache-maven-x.x.x/bin` is available in your `PATH` environment variable and that both `M2_HOME` and `MAVEN_HOME` environment variables are set: ``` M2_HOME=.../apache-maven-x.x.x MAVEN_HOME=.../apache-maven-x.x.x diff --git a/bin/app/data/color_scheme_template.xml b/bin/app/data/color_scheme_template.xml index cb18c96f..ffd9fec9 100644 --- a/bin/app/data/color_scheme_template.xml +++ b/bin/app/data/color_scheme_template.xml @@ -171,7 +171,7 @@ - + @@ -211,7 +211,7 @@ - + diff --git a/bin/app/user/projects/tictactoe_py/src/tictactoe.py b/bin/app/user/projects/tictactoe_py/src/tictactoe.py index 3cd5a0c1..6937e1de 100644 --- a/bin/app/user/projects/tictactoe_py/src/tictactoe.py +++ b/bin/app/user/projects/tictactoe_py/src/tictactoe.py @@ -172,7 +172,7 @@ class HumanPlayer(Player): def _check(self, field, move): if not field.inRange(move): - stringOut("Wrong inpot!\n") + stringOut("Wrong input!\n") return False elif not field.isEmpty(move): stringOut("Is occupied!\n") diff --git a/bin/app/user/projects/tutorial/src/my_next_step.h b/bin/app/user/projects/tutorial/src/my_next_step.h index 97d2ec1c..38d14218 100644 --- a/bin/app/user/projects/tutorial/src/my_next_step.h +++ b/bin/app/user/projects/tutorial/src/my_next_step.h @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ // -// ANYTING ELSE I SHOULD KNOW? +// ANYTHING ELSE I SHOULD KNOW? // I'm glad that you asked. Take a look at the code below. You will notice two // different highlights when hovering different symbols in that snippet. One // is used for symbols that may be used everywhere throughout your code base diff --git a/bin/app/user/projects/tutorial/src/search_tutorial_5.h b/bin/app/user/projects/tutorial/src/search_tutorial_5.h index f57a40c9..2a731340 100644 --- a/bin/app/user/projects/tutorial/src/search_tutorial_5.h +++ b/bin/app/user/projects/tutorial/src/search_tutorial_5.h @@ -7,7 +7,7 @@ //------------------------------------------------------------------------------ // -// 9 - CONGRATULATONS +// 9 - CONGRATULATIONS // You have completed the challenge of search. // Oh, I almost forgot: You can only find nodes such as symbols via the search // bar. It doesn't allow you to find edges like calls or inheritance. At least diff --git a/bin/test/data/SourceGroupTestSuite/java_maven/input/my-app/src/test/java/com/mycompany/app/AppTest.java b/bin/test/data/SourceGroupTestSuite/java_maven/input/my-app/src/test/java/com/mycompany/app/AppTest.java index 33559900..e1544362 100644 --- a/bin/test/data/SourceGroupTestSuite/java_maven/input/my-app/src/test/java/com/mycompany/app/AppTest.java +++ b/bin/test/data/SourceGroupTestSuite/java_maven/input/my-app/src/test/java/com/mycompany/app/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/bin/test/data/TextAccessTestSuite/text.txt b/bin/test/data/TextAccessTestSuite/text.txt index 31b18034..dfb20a88 100644 --- a/bin/test/data/TextAccessTestSuite/text.txt +++ b/bin/test/data/TextAccessTestSuite/text.txt @@ -1,7 +1,7 @@ "If you're a researcher on this book thing and you were on Earth, you must have been gathering material on it." "Well, I was able to extend the original entry a bit, yes." "Let me see what it says in this edition, then. I've got to see it." -... "What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for God's sake I hope you managed to recitify that a bit." +... "What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for God's sake I hope you managed to rectify that a bit." "Oh yes, well I managed to transmit a new entry off to the editor. He had to trim it a bit, but it's still an improvement." "And what does it say now?" asked Arthur. "Mostly harmless," admitted Ford with a slightly embarrassed cough. \ No newline at end of file diff --git a/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_1/src/test/java/com/mycompany/app/AppTest.java b/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_1/src/test/java/com/mycompany/app/AppTest.java index 33559900..e1544362 100644 --- a/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_1/src/test/java/com/mycompany/app/AppTest.java +++ b/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_1/src/test/java/com/mycompany/app/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_2/src/test/java/com/mycompany/app/AppTest.java b/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_2/src/test/java/com/mycompany/app/AppTest.java index 33559900..e1544362 100644 --- a/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_2/src/test/java/com/mycompany/app/AppTest.java +++ b/bin/test/data/UtilityMavenTestSuite/nested_maven_project/module_2/src/test/java/com/mycompany/app/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/bin/test/data/UtilityMavenTestSuite/simple_maven_project/src/test/java/com/mycompany/app/AppTest.java b/bin/test/data/UtilityMavenTestSuite/simple_maven_project/src/test/java/com/mycompany/app/AppTest.java index 33559900..e1544362 100644 --- a/bin/test/data/UtilityMavenTestSuite/simple_maven_project/src/test/java/com/mycompany/app/AppTest.java +++ b/bin/test/data/UtilityMavenTestSuite/simple_maven_project/src/test/java/com/mycompany/app/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() { diff --git a/deployment/windows/wixSetup/CustomActions/Microsoft.Deployment.WindowsInstaller.xml b/deployment/windows/wixSetup/CustomActions/Microsoft.Deployment.WindowsInstaller.xml index 20f6d58a..4174ebdb 100644 --- a/deployment/windows/wixSetup/CustomActions/Microsoft.Deployment.WindowsInstaller.xml +++ b/deployment/windows/wixSetup/CustomActions/Microsoft.Deployment.WindowsInstaller.xml @@ -776,7 +776,7 @@ Detects the range of versions including the value in VersionMin. - Dectects the range of versions including the value in VersionMax. + Detects the range of versions including the value in VersionMax. Detects all languages, excluding the languages listed in the Language column. @@ -1115,7 +1115,7 @@ Gets the set of registered qualifiers for the component. - Enumeration of the qulifiers for the component. + Enumeration of the qualifiers for the component. The installer configuration data is corrupt

Because qualifiers are not ordered, any new qualifier has an arbitrary index, @@ -1438,7 +1438,7 @@

- Checks if a method has the right return and paramater types + Checks if a method has the right return and parameter types for a custom action, and that it is marked by a CustomActionAttribute. Method to be checked. @@ -1508,7 +1508,7 @@ needed, as leaving lots of unused handles open can degrade performance.

The database is opened in mode, and will be - automatically commited when it is closed. + automatically committed when it is closed.

Win32 MSI API: MsiOpenDatabase @@ -1532,7 +1532,7 @@ longer needed, as leaving lots of unused handles open can degrade performance.

A database opened in or - mode will be automatically commited when it is + mode will be automatically committed when it is closed. However a database opened in or mode must have the method called before it is closed, otherwise no changes will be persisted. @@ -2779,7 +2779,7 @@

Patches that are superseded by other patches. - Patches that are obsolesced by other patches. + Patches that are obsoleted by other patches. Patches that are registered to a product but not applied. @@ -3340,7 +3340,7 @@ - Gets a message that describes the merge conflits. + Gets a message that describes the merge conflicts. @@ -3471,7 +3471,7 @@ One or more mode flags specifying the type of messages to log Full path to the log file. A null path disables logging, - in which case the logModes paraneter is ignored. + in which case the logModes parameter is ignored. an invalid log mode was specified This method takes effect on any new installation processes. Calling this method from within a custom action will not start logging for that installation. @@ -3483,7 +3483,7 @@ One or more mode flags specifying the type of messages to log Full path to the log file. A null path disables logging, - in which case the logModes paraneter is ignored. + in which case the logModes parameter is ignored. If true, the log lines will be appended to any existing file content. If false, the log file will be truncated if it exists. The default is false. If true, the log will be flushed after every line. @@ -3846,7 +3846,7 @@ Determines which patches apply to a specified product and in what sequence. If the product is installed, this method accounts for patches that have already been applied to - the product and accounts for obsolete and superceded patches. + the product and accounts for obsolete and superseded patches. The product that is the target for the set of patches. This may be either a ProductCode (GUID) of a product that is currently installed, or the path to a an @@ -4267,7 +4267,7 @@ MsiGetFeatureInfo, MsiSetFeatureAttributes

- Since the lpAttributes paramter of + Since the lpAttributes parameter of MsiGetFeatureInfo does not contain an equivalent flag for , this flag will not be retrieved. @@ -4453,7 +4453,7 @@

- Gets an object that can be used internally for safe syncronization. + Gets an object that can be used internally for safe synchronization. @@ -4824,7 +4824,7 @@ - Gets a value indicating whether this patch is marked as obsolte. + Gets a value indicating whether this patch is marked as obsolete. @@ -5328,7 +5328,7 @@

Win32 MSI API: - MsiRecordClearData + MsiRecordClearData

@@ -6085,7 +6085,7 @@ The Select and Installed states for all features in the Feature table The Action state of each component in the Component table, based on the new level - If 0 or a negative number is passed in the ilnstallLevel parameter, + If 0 or a negative number is passed in the installLevel parameter, the current installation level does not change, but all features are still updated based on the current installation level.

@@ -6200,7 +6200,7 @@

- Throws an exception if the custom action is not able to access immedate session details. + Throws an exception if the custom action is not able to access immediate session details. @@ -6605,7 +6605,7 @@ Gets or sets the Template summary information property.

- The Template summary information propery indicates the platform and language versions supported by the database. + The Template summary information property indicates the platform and language versions supported by the database.

The syntax of the Template Summary property information is: [platform property][,platform property][,...];[language id][,language id][,...] diff --git a/deployment/windows/wixSetup/build.sh b/deployment/windows/wixSetup/build.sh index 6b64bfeb..c87361ed 100644 --- a/deployment/windows/wixSetup/build.sh +++ b/deployment/windows/wixSetup/build.sh @@ -23,7 +23,7 @@ echo "installer version is $VERSION_STRING" PRODUCT_GUID=$("uuidgen") if [ -z "$PRODUCT_GUID" ]; then - echo "Unable to generate GUID. Make sure to run this script from the Visual Studio command propmt. Aborting now." + echo "Unable to generate GUID. Make sure to run this script from the Visual Studio command prompt. Aborting now." exit 1 else echo "$WIN_ARCH product guid is $PRODUCT_GUID" diff --git a/deployment/windows/wixSetup/wixReadme.txt b/deployment/windows/wixSetup/wixReadme.txt index 24ae8cd3..d1ad2e35 100644 --- a/deployment/windows/wixSetup/wixReadme.txt +++ b/deployment/windows/wixSetup/wixReadme.txt @@ -10,7 +10,7 @@ Build the installer -I used stable version 3.10.3 for development -make sure the WiX directory is in you OS path variable ('..\WiX Toolset v3.10\bin') -Sourcetrail has to be built with the 'deploy' flag - -installer would still build if the deploy flag wasnt set, but the Sourcetrail wont run properly on a user machine + -installer would still build if the deploy flag wasn't set, but the Sourcetrail wont run properly on a user machine -Execute build.bat -This will build sourcetrail.msi file, all needed custom action dlls and the setup.exe file @@ -41,10 +41,10 @@ Add new components (e.g. files) to the installation -... -Generel +General -to add a file create a element -mind the tags, they define where the component will be installed. Add new directories if necessary - -Id: the directory will be refered to within the wix project using this id + -Id: the directory will be referred to within the wix project using this id -Name: the name of the folder that will be created on the user machine -Id: is used to refer to the component within the wix project -Guid: GUIDs are unique id's used by windows to identify and refer to installed files, applications and so on. You need to create a new GUID for every new component @@ -55,7 +55,7 @@ Generel -Name: the name that the file will have on the user machine, may be different from the file name on the source machine -Source: the path and name to the file on the source machine, relative to the current .wxs file -KeyPath: depends on where you want to install the file, see below in 'Add new file to...' - -usually there is one component for each single file. Multiple files can be added to a component, this might make sense if the files are considered 100% unseperable. The recommended way however is one file per component + -usually there is one component for each single file. Multiple files can be added to a component, this might make sense if the files are considered 100% inseparable. The recommended way however is one file per component Add new file to the installation directory (installDir.wxs) @@ -76,7 +76,7 @@ Not quite done yet! (sourcetrail.wxs) -components need to be added to a feature (a feature is part of a software, consisting of components, that may or may not be installed during setup) -right now we only have the Complete/Program feature, so no part of sourcetrail is optional right now -to add a component to a feature use the tag - -Id: id of the component you want to refere to + -Id: id of the component you want to reference ------------------ @@ -89,7 +89,7 @@ Version Number -candle.exe -dprojectVersion="0.7.0" ... -replace 0.7.0 with the desired version number -Minor upgrage (sourcetrail.wxs) +Minor upgrade (sourcetrail.wxs) -for when only a few files are to be updated -update the version number in build.bat script -do NOT change the product GUID @@ -101,4 +101,4 @@ Major upgrade (sourcetrail.wxs) -update the version number in build.bat script -DO change the product GUID -insert the same GUID into the uninstall_wix.bat script - -package GUID changes too, but thats again done automatically \ No newline at end of file + -package GUID changes too, but that's again done automatically \ No newline at end of file diff --git a/docs/documentation/index.html b/docs/documentation/index.html index 712194d1..a63b9efa 100644 --- a/docs/documentation/index.html +++ b/docs/documentation/index.html @@ -197,7 +197,7 @@

Are you using CMake, Make or Qt Creator? -

If you are using CMake or Make as build environment you can export a clang JSON Compilaton Database as compile_commands.json file. A Compilation Database holds all information necessary for building the project, such as source files, include paths and compiler flags. Having a Compilation Database makes project setup within Sourcetrail a lot easier. We recommend using this approach if possible.

+

If you are using CMake or Make as build environment you can export a clang JSON Compilation Database as compile_commands.json file. A Compilation Database holds all information necessary for building the project, such as source files, include paths and compiler flags. Having a Compilation Database makes project setup within Sourcetrail a lot easier. We recommend using this approach if possible.

Exporting a Compilation Database:

    @@ -753,7 +753,7 @@ Multi process C/C++ indexing - Enable C/C++ indexer threads to run in a different process. This prevents the application from crashing due to unforseen exceptions while indexing. + Enable C/C++ indexer threads to run in a different process. This prevents the application from crashing due to unforeseen exceptions while indexing. Java Path @@ -821,7 +821,7 @@ Interactions:
      -
    • Swith indexing mode by clicking a different option.
      • +
    • Switch indexing mode by clicking a different option.
    • Clicking Cancel will abort indexing.
    • Clicking Start will start the file clearing and indexing.
    @@ -1848,7 +1848,7 @@

Keywords

-

Additionally the search view provides specific keywords that select a certein group of symbols.

+

Additionally the search view provides specific keywords that select a certain group of symbols.

@@ -1868,7 +1868,7 @@ Interactions:
    -
  • Start a query with ? or use the Find Text action to do a case-insensitive full text serach.
    • +
  • Start a query with ? or use the Find Text action to do a case-insensitive full text search.
  • Start a query with ?? to do a case-sensitive full text search.
@@ -1960,7 +1960,7 @@

Errors Tab

-

This list shows errors occured durring indexing.

+

This list shows errors occurred during indexing.

@@ -2043,7 +2043,7 @@
  • Clicking a Source Group will let you edit it's configuration and change it's name.
  • Clicking + beneath the Source Group list will take you to the creation of a new Source Group.
  • Clicking - beneath the Source Group list will delete the currently selected Source Group.
    • -
  • Clicking ☐ beneath the Source Group list will duplicate the currenlty selected Source Group.
    • +
  • Clicking ☐ beneath the Source Group list will duplicate the currently selected Source Group.
  • Clicking Create will close this window and create the new project.
    • @@ -2068,7 +2068,7 @@

    Choose a Source Group Type

    -

    When creating a new Source Group you can choose between different methods of setup depending on your project language. Please have a look at our QUCICK START GUIDE section for help on choosing the right Source Group type.

    +

    When creating a new Source Group you can choose between different methods of setup depending on your project language. Please have a look at our QUICK START GUIDE section for help on choosing the right Source Group type.

    @@ -2157,7 +2157,7 @@

    C/C++ Source Group from Compilation Database

    -

    If you are using CMake you can export compile commands by defining the CMAKE_EXPORT_COMPILE_COMMANDS flag and then use the exportet .json file for Sourcetrail project setup.

    +

    If you are using CMake you can export compile commands by defining the CMAKE_EXPORT_COMPILE_COMMANDS flag and then use the exported .json file for Sourcetrail project setup.

    For non-CMake projects you can use Bear. Bear generates a .json file during the simulated build process. Bear has been tested on FreeBSD, GNU/Linux and OS X.

    C/C++ Source Groups from Compilation Database offer the following configuration options:

    @@ -2527,7 +2527,7 @@
    - +
    keyword effect
    Source File ExtensionsDefine the valid extensions for source files including the dot e.g. .ext. Sourcetrail will only try to index files that match one of these extensions. If no extion is defined, any file extension is valid.Define the valid extensions for source files including the dot e.g. .ext. Sourcetrail will only try to index files that match one of these extensions. If no extension is defined, any file extension is valid.
    @@ -2537,7 +2537,7 @@

    Command Line

    -

    Currently you can use the command line to configue Sourcetrail or index a Sourcetrail project.

    +

    Currently you can use the command line to configure Sourcetrail or index a Sourcetrail project.

    When no command is given

    sourcetrail [options...]
    @@ -2572,7 +2572,7 @@ --indexer-threads Number of threads used for indexing (0 means ideal thread count). --use-processes Enable C/C++ indexer threads to run in different processes. --logging-enabled Enable (true) or disable (false) file/console logging. - --verbose-indexer-logging-enabled Enable additaional log of abstract syntax tree during the indexing. Be careful with this, it slows down the indexing tremendously. + --verbose-indexer-logging-enabled Enable additional log of abstract syntax tree during the indexing. Be careful with this, it slows down the indexing tremendously. --jvm-path Path to the location of the jvm library. --jvm-max-memory Set the maximum amount of memory for the JVM indexer(-1 for using the JVM default settings). --maven-path Path to the maven executable. @@ -2756,7 +2756,7 @@ Installation

      -
    • Manuelly
      • +
    • Manually
      1. Download the sourcetrail.el from https://github.com/CoatiSoftware/emacs-sourcetrail
      2. In Emacs press M + x and type in package-install-file
        3. @@ -2806,12 +2806,12 @@
      3. restart Sublime
      -
    • Package Controll
      • +
    • Package Control
        • -
      1. If you dont have Package Controll for Sublime go to https://packagecontrol.io and +
      2. If you don't have Package Control for Sublime go to https://packagecontrol.io and install it
        3. -
      3. Open Command Pallete with Ctrl + Shift + P
        4. -
      4. Select Package Controll: Install Package
        5. +
      5. Open Command Palette with Ctrl + Shift + P
        6. +
      6. Select Package Control: Install Package
      7. Install sourcetrail

    @@ -2829,7 +2829,7 @@ Installation

    -

    Please visit the vim-sourcetrail repository on Github for details.

    +

    Please visit the vim-sourcetrail repository on GitHub for details.

    Use

    If you want Vim to activate a certain element in Sourcetrail, go to the code location and use @@ -2850,9 +2850,9 @@

    Use -

    To start the Tcp Server go to the Command Pallete(Ctrl + Shift + P) and type: Sourcetrail: (Re)start server

    +

    To start the Tcp Server go to the Command Palette(Ctrl + Shift + P) and type: Sourcetrail: (Re)start server

    To send a location to Sourcetrail, place the cursor and right-click and select Sourcetrail: Send Location - or type in the Command Pallete: Sourcetrail: Send Location

    + or type in the Command Palette: Sourcetrail: Send Location

    Visual Studio

    Download, Reviews: @@ -2903,19 +2903,19 @@ Option Description - Select Projects The list of C/C++ projects in your solution. Check all projects you want to be included in the generated JSON Compilaton Database file. + Select Projects The list of C/C++ projects in your solution. Check all projects you want to be included in the generated JSON Compilation Database file. De/Select All Will select all projects if at least one project is not selected. If all projects are selected they will all be unselected. - Configuration A dropdown list of the available build configurations. The selected configuration affects include paths and compile flags for the Compilaton Database. - Platform A dropdown list of the available target platforms. The selected platform affects include paths and compile flags for the Compilaton Database. - Browse Opens a folder browser to select the directory where the Compilaton Database will be created in. By default it is the directory of your solution. Instead of using the folder browser you can also paste a path into the adjacent text field. - filename This is the name for the Compilaton Database file. By default it is the same name as your solution. + Configuration A dropdown list of the available build configurations. The selected configuration affects include paths and compile flags for the Compilation Database. + Platform A dropdown list of the available target platforms. The selected platform affects include paths and compile flags for the Compilation Database. + Browse Opens a folder browser to select the directory where the Compilation Database will be created in. By default it is the directory of your solution. Instead of using the folder browser you can also paste a path into the adjacent text field. + filename This is the name for the Compilation Database file. By default it is the same name as your solution. C Standard A dropdown list of all C standards supported by Sourcetrail. If your projects contain C files select the appropriate standard. Cancel Aborts the process and closes the wizard. - Create Creates the Compilaton Database using the specified options. Note that at least one project has to be selected to start creating. + Create Creates the Compilation Database using the specified options. Note that at least one project has to be selected to start creating. -

    Once the Compilaton Database was successfully created it can be found in the specified target directory. From this Compilaton Database you can create a Sourcetrail project as described above.

    +

    Once the Compilation Database was successfully created it can be found in the specified target directory. From this Compilation Database you can create a Sourcetrail project as described above.

    Settings

    Network settings and logging options can be changed in the plugin's Tools/Options entry.

    @@ -2941,8 +2941,8 @@ Option Description - File Logging Enable log output for the plugin. Additionaly to the output file, log messages will also be displayed in VS' - Log Obfuscation Obfuscate project names and file names as well as directories in the log output. Note that already logged data will not be obfuscated retroactively. A dictionary, mapping obfuscated names to original names, will be created in a seperate file. + File Logging Enable log output for the plugin. Additionally to the output file, log messages will also be displayed in VS' + Log Obfuscation Obfuscate project names and file names as well as directories in the log output. Note that already logged data will not be obfuscated retroactively. A dictionary, mapping obfuscated names to original names, will be created in a separate file. Sourcetrail Port The port on which Sourcetrail will receive messages. Note that this must match the port setting in Sourcetrail itself. Thread Count The number of threads used during creation of the Compilation Database VS Port The port on which Visual Studio will receive messages. Note that this must match the port setting in Sourcetrail itself. @@ -2960,7 +2960,7 @@ -

    Note that the logs will include project names and file names as well as directories specific to your project. If you wish to keep this informatin secret you can enable log obfuscation.

    +

    Note that the logs will include project names and file names as well as directories specific to your project. If you wish to keep this information secret you can enable log obfuscation.

    Project- and file names as well as directories will be replaced by an alphanumeric sequence. The sequence has the form a0, b0, c0,..., a1, b1, c1,.... Note that after switching on obfuscation, already logged data will not be obfuscated retroactively. No log files will be send to Coati Software automatically. You can check any file you may want to send us for sensible information before sending it.

    A dictionary, mapping obfuscated names to original names, will be created in your log folder if log obfuscation is switched on. When during the support process we refer to project items by their obfuscated name you can still make sense of it. Do not send the dictionary to anybody else.

    @@ -2980,7 +2980,7 @@

    Message Structure

    -

    The basic structure of the messages used by Sourcetrail plugins consists of a prefix to identify the message type, followed by no, one, or multiple parameters and ends with an 'end-of-message' token. Parameters and tokens are seperated by a 'divider' token.

    +

    The basic structure of the messages used by Sourcetrail plugins consists of a prefix to identify the message type, followed by no, one, or multiple parameters and ends with an 'end-of-message' token. Parameters and tokens are separated by a 'divider' token.

    @@ -2988,7 +2988,7 @@ - + @@ -3027,7 +3027,7 @@ - +
    messageType see below A string that determines how the message will be interpreted by Sourcetrail or the plugin
    divider >> Seperates the tokens of the message
    divider >> Separates the tokens of the message
    parameter see below Typically an integer or string
    endOfMessage <EOM> Helps to determine the end of a message
    setActiveToken fileLocation: string
    row: integer
    column: integer    		 Tells Sourcetrail to shift focus to the token located at the given position. Note that fileLocation is the absolute path and name of the target file.
    createCDBProject cdbPath: string
    headerPaths: string    		 If your plugin can provide a Compilation Database this message can prompt Sourcetrail to import it and display an appropriate dialog for the user. headerPaths is a list of the base project's header include paths. Seperate the single paths using the divider token. You can add as many paths as you need.
    createCDBProject cdbPath: string
    headerPaths: string    		 If your plugin can provide a Compilation Database this message can prompt Sourcetrail to import it and display an appropriate dialog for the user. headerPaths is a list of the base project's header include paths. Separate the single paths using the divider token. You can add as many paths as you need.
    ping Your plugin may send this message to Sourcetrail to tell it it's listening.
    @@ -3038,7 +3038,7 @@
    -

    Can I use Sourcetrail on confidental source code?

    +

    Can I use Sourcetrail on confidential source code?

    Yes. Sourcetrail keeps the data completely offline and unless disabled, will only establish a connection to the internet to check if a more recent version is available. @@ -3053,10 +3053,10 @@

    Sourcetrail does two things with the data collected during indexing:

    1. The data is stored in the .srctrldb file which is in the same directory as the .srctrlprj file. This database file is used by Sourcetrail to serve its purpose of letting you navigate your source code and also allowing Sourcetrail to re-open the project without re-indexing the source code each time. -

      Note: The .srctrldb file is actualy a .sqlite database file and can be inspected using the DB Browser for SQLite.

      +

      Note: The .srctrldb file is actually a .sqlite database file and can be inspected using the DB Browser for SQLite.

      2. -
    2. If logging is enabled, some of the data gets logged into a log file saved in data/logs. These logs can be useful to us for fixing bugs. We may ask for log information on bug reports, but you should only provide it, if your source code is not confidental.
      3. +
    3. If logging is enabled, some of the data gets logged into a log file saved in data/logs. These logs can be useful to us for fixing bugs. We may ask for log information on bug reports, but you should only provide it, if your source code is not confidential.
    diff --git a/ide_plugins/atom/README.md b/ide_plugins/atom/README.md index 6ca2229f..6fde3a87 100644 --- a/ide_plugins/atom/README.md +++ b/ide_plugins/atom/README.md @@ -1,5 +1,5 @@ #atom-sourcetrail -The Atom plugin is hosted at Github. +The Atom plugin is hosted at GitHub. Link to the repository: [atom-sourcetrail](https://github.com/CoatiSoftware/atom-sourcetrail). diff --git a/ide_plugins/eclipse/README.md b/ide_plugins/eclipse/README.md index 5b6211b3..df4d502e 100644 --- a/ide_plugins/eclipse/README.md +++ b/ide_plugins/eclipse/README.md @@ -1,5 +1,5 @@ #eclipse-sourcetrail -The Eclipse plugin is hosted at Github. +The Eclipse plugin is hosted at GitHub. Link to the repository: [eSourcetrail](https://github.com/CoatiSoftware/eSourcetrail). diff --git a/ide_plugins/emacs/README.md b/ide_plugins/emacs/README.md index 7cff3535..501f5317 100644 --- a/ide_plugins/emacs/README.md +++ b/ide_plugins/emacs/README.md @@ -1,5 +1,5 @@ #emacs-sourcetrail -The Emacs plugin is hosted at Github. +The Emacs plugin is hosted at GitHub. Link to the repository: [emacs-sourcetrail](https://github.com/CoatiSoftware/emacs-sourcetrail). diff --git a/ide_plugins/idea/README.md b/ide_plugins/idea/README.md index c4af5e4c..08266e84 100644 --- a/ide_plugins/idea/README.md +++ b/ide_plugins/idea/README.md @@ -1,5 +1,5 @@ #idea-sourcetrail -The CLion/IntelliJ plugin is hosted at Github. +The CLion/IntelliJ plugin is hosted at GitHub. Link to the repository: [idea-sourcetrail](https://github.com/CoatiSoftware/idea-sourcetrail). diff --git a/ide_plugins/qt_creator/README.md b/ide_plugins/qt_creator/README.md index 85836e62..a15187c0 100644 --- a/ide_plugins/qt_creator/README.md +++ b/ide_plugins/qt_creator/README.md @@ -1,6 +1,6 @@ #qtc-sourcetrail -The QtCreator plugin is hosted at Github. +The QtCreator plugin is hosted at GitHub. Link to the repository: [qtc-sourcetrail](https://github.com/CoatiSoftware/qtc-sourcetrail). diff --git a/ide_plugins/sublime_text/README.md b/ide_plugins/sublime_text/README.md index 3ec9b6f6..821c7cc7 100644 --- a/ide_plugins/sublime_text/README.md +++ b/ide_plugins/sublime_text/README.md @@ -1,5 +1,5 @@ #sublime-sourcetrail -The Sublime plugin is hosted at Github. +The Sublime plugin is hosted at GitHub. Link to the repository: [sublime-sourcetrail](https://github.com/CoatiSoftware/sublime-sourcetrail). diff --git a/ide_plugins/vim/README.md b/ide_plugins/vim/README.md index e922335e..031565ce 100644 --- a/ide_plugins/vim/README.md +++ b/ide_plugins/vim/README.md @@ -1,5 +1,5 @@ #vim-sourcetrail -The Vim plugin is hosted at Github. +The Vim plugin is hosted at GitHub. Link to the repository: [vim-sourcetrail](https://github.com/CoatiSoftware/vim-sourcetrail). diff --git a/ide_plugins/visual_studio/README.md b/ide_plugins/visual_studio/README.md index 4cc6dcf2..c727b336 100644 --- a/ide_plugins/visual_studio/README.md +++ b/ide_plugins/visual_studio/README.md @@ -1,6 +1,6 @@ #vs-sourcetrail -The Visual Studio extension source code is hosted at Github. +The Visual Studio extension source code is hosted at GitHub. The extension is available in the Visual Studio Marketplace. To install this extension follow these steps: * open Visual Studio diff --git a/ide_plugins/vscode/README.md b/ide_plugins/vscode/README.md index 050407b7..93517e22 100644 --- a/ide_plugins/vscode/README.md +++ b/ide_plugins/vscode/README.md @@ -1,6 +1,6 @@ #vsce-sourcetrail -The VS Code extension source code is hosted at Github. +The VS Code extension source code is hosted at GitHub. The extension is available in the marketplace, to install it simple use the marketplace inside VS Code diff --git a/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java b/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java index 3d34bbad..c7654917 100644 --- a/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java +++ b/java_indexer/src/main/java/com/sourcetrail/AstVisitor.java @@ -453,7 +453,7 @@ public abstract class AstVisitor extends ASTVisitor ReferenceKind.IMPORT, symbolName.toNameHierarchy(), context.toNameHierarchy(), range); } - // record package symbol kind of current node if appliccable + // record package symbol kind of current node if applicable if (binding instanceof IPackageBinding) { Optional packageName = BindingNameResolver.getQualifiedName( diff --git a/java_indexer/src/main/java/com/sourcetrail/name/NameHierarchy.java b/java_indexer/src/main/java/com/sourcetrail/name/NameHierarchy.java index 54693f45..84197524 100644 --- a/java_indexer/src/main/java/com/sourcetrail/name/NameHierarchy.java +++ b/java_indexer/src/main/java/com/sourcetrail/name/NameHierarchy.java @@ -7,7 +7,7 @@ import java.util.Optional; public class NameHierarchy { private List m_elements = new ArrayList<>(); - private char m_separatpr = '.'; + private char m_separator = '.'; public NameHierarchy() {} @@ -28,7 +28,7 @@ public class NameHierarchy public void setSeparator(char separator) { - m_separatpr = separator; + m_separator = separator; } public void push(NameElement element) @@ -55,7 +55,7 @@ public class NameHierarchy public String serialize() { - String serialized = m_separatpr + "\tm"; + String serialized = m_separator + "\tm"; for (int i = 0; i < m_elements.size(); i++) { diff --git a/setup/git/git_pre_commit_hook.sh b/setup/git/git_pre_commit_hook.sh index 2c893bef..770d7ddb 100755 --- a/setup/git/git_pre_commit_hook.sh +++ b/setup/git/git_pre_commit_hook.sh @@ -38,7 +38,7 @@ function build_type { echo -e $INFO Starting with buildtype: $1 if [ "$PLATFORM" == "Windows" ] then - echo -e $INFO Builing the Sourcetrail VS Solution + echo -e $INFO Building the Sourcetrail VS Solution cmake --build build/win32 --config $1 if [ $? -ne 0 ] then @@ -68,7 +68,7 @@ function run_tests { cd $ROOTDIR } -# testing before commiting to a publish branch +# testing before committing to a publish branch if [[ ${BRANCH_NAME:0:9} == "_publish_" ]] then echo Try to publish @@ -87,7 +87,7 @@ fi if [ $BRANCH_NAME == "master" ] then - echo -e $ABORT "Commiting to master is prohibited." + echo -e $ABORT "Committing to master is prohibited." exit 1 fi diff --git a/setup/git/git_pre_push_hook.sh b/setup/git/git_pre_push_hook.sh index a3219723..465c4080 100755 --- a/setup/git/git_pre_push_hook.sh +++ b/setup/git/git_pre_push_hook.sh @@ -13,7 +13,7 @@ do then if [ "$remote_ref" == "refs/heads/master" ] then - echo -e $FAIL "seriously dont delete the master" + echo -e $FAIL "seriously don't delete the master" exit 1 else echo "delete remote branch $remote_ref" diff --git a/src/lib/component/controller/BookmarkController.cpp b/src/lib/component/controller/BookmarkController.cpp index 12ec1397..61abc716 100644 --- a/src/lib/component/controller/BookmarkController.cpp +++ b/src/lib/component/controller/BookmarkController.cpp @@ -16,7 +16,7 @@ #include "utility.h" #include "utilityString.h" -const std::wstring BookmarkController::s_edgeSeperatorToken = L" => "; +const std::wstring BookmarkController::s_edgeSeparatorToken = L" => "; const std::wstring BookmarkController::s_defaultCategoryName = L"default"; BookmarkController::BookmarkController(StorageAccess* storageAccess) @@ -509,7 +509,7 @@ std::vector BookmarkController::getActiveEdgeDisplayNames() const const StorageEdge activeEdge = m_storageAccess->getEdgeById(activeEdgeId); const std::wstring sourceDisplayName = getNodeDisplayName(activeEdge.sourceNodeId); const std::wstring targetDisplayName = getNodeDisplayName(activeEdge.targetNodeId); - activeEdgeDisplayNames.push_back(sourceDisplayName + s_edgeSeperatorToken + targetDisplayName); + activeEdgeDisplayNames.push_back(sourceDisplayName + s_edgeSeparatorToken + targetDisplayName); } return activeEdgeDisplayNames; } diff --git a/src/lib/component/controller/BookmarkController.h b/src/lib/component/controller/BookmarkController.h index cb3023b1..a7074118 100644 --- a/src/lib/component/controller/BookmarkController.h +++ b/src/lib/component/controller/BookmarkController.h @@ -120,7 +120,7 @@ private: void update(); - static const std::wstring s_edgeSeperatorToken; + static const std::wstring s_edgeSeparatorToken; static const std::wstring s_defaultCategoryName; StorageAccess* m_storageAccess; diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp index 9266fa49..6373905b 100644 --- a/src/lib/component/controller/CodeController.cpp +++ b/src/lib/component/controller/CodeController.cpp @@ -1333,7 +1333,7 @@ CodeFileParams* CodeController::addSourceLocations(std::shared_ptr end) // overlaping + else if (oldSnippet.startLineNumber < start || oldSnippet.endLineNumber > end) // overlapping { newSnippet = CodeSnippetParams::merge(newSnippet, oldSnippet); } diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index 3f4d0cf7..1252e3fe 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -2151,7 +2151,7 @@ void GraphController::layoutToGrid(DummyNode* node) const return; } - // Increase size of nodes with visible chilren to cover full grid cells + // Increase size of nodes with visible children to cover full grid cells size_t width = GraphViewStyle::toGridSize(node->size.x); size_t height = GraphViewStyle::toGridSize(node->size.y); @@ -2440,7 +2440,7 @@ void GraphController::createLegendGraph() Node* main = addNode(NODE_CLASS, L"Class", Vec2i(x + 200, y + 130)); Node* derived = addNode(NODE_CLASS, L"Derived Class", Vec2i(x + 210, y + 380)); Node* user = addNode(NODE_TYPE, L"Referencing Type", Vec2i(x - 10, y + 220)); - Node* usee = addNode(NODE_TYPE, L"Referenced Type", Vec2i(x + 410, y + 220)); + Node* used = addNode(NODE_TYPE, L"Referenced Type", Vec2i(x + 410, y + 220)); addEdge(Edge::EDGE_INHERITANCE, main, base); addEdge(Edge::EDGE_INHERITANCE, derived, main); @@ -2457,7 +2457,7 @@ void GraphController::createLegendGraph() } { - Edge* edge = addEdge(Edge::EDGE_BUNDLED_EDGES, main, usee); + Edge* edge = addEdge(Edge::EDGE_BUNDLED_EDGES, main, used); std::shared_ptr bundledEdgesComp = std::make_shared(); for (size_t i = 0; i < 10; i++) diff --git a/src/lib/component/controller/helper/SnippetMerger.cpp b/src/lib/component/controller/helper/SnippetMerger.cpp index 698186fd..f147102d 100644 --- a/src/lib/component/controller/helper/SnippetMerger.cpp +++ b/src/lib/component/controller/helper/SnippetMerger.cpp @@ -35,7 +35,7 @@ std::deque SnippetMerger::merge(std::vector* queue = access.accessValueWithAllocator>( - s_intermediatStoragesKeyName); + s_intermediateStoragesKeyName); if (!queue) { return; @@ -97,7 +97,7 @@ std::shared_ptr InterprocessIntermediateStorageManager::pop SharedMemory::Queue* queue = access.accessValueWithAllocator>( - s_intermediatStoragesKeyName); + s_intermediateStoragesKeyName); if (!queue || !queue->size()) { return nullptr; @@ -131,7 +131,7 @@ size_t InterprocessIntermediateStorageManager::getIntermediateStorageCount() SharedMemory::Queue* queue = access.accessValueWithAllocator>( - s_intermediatStoragesKeyName); + s_intermediateStoragesKeyName); if (!queue) { return 0; diff --git a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h index ace93e8d..ba02e218 100644 --- a/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h +++ b/src/lib/data/indexer/interprocess/InterprocessIntermediateStorageManager.h @@ -18,7 +18,7 @@ public: private: static const char* s_sharedMemoryNamePrefix; - static const char* s_intermediatStoragesKeyName; + static const char* s_intermediateStoragesKeyName; size_t m_insertsWithoutGrowth; }; diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.cpp b/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.cpp index 927a8a1a..3e638e6f 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.cpp +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.cpp @@ -167,11 +167,11 @@ std::set SharedIntermediateStorage::getStorageOccurrences() c return result; } -void SharedIntermediateStorage::setStorageOccurrences(const std::set& storageOccurences) +void SharedIntermediateStorage::setStorageOccurrences(const std::set& storageOccurrences) { m_storageOccurrences.clear(); - for (const StorageOccurrence& occurrence: storageOccurences) + for (const StorageOccurrence& occurrence: storageOccurrences) { m_storageOccurrences.push_back(toShared(occurrence, m_allocator)); } diff --git a/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h b/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h index ee4e4cc6..f90635bc 100644 --- a/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h +++ b/src/lib/data/indexer/interprocess/shared_types/SharedIntermediateStorage.h @@ -32,7 +32,7 @@ public: void setStorageSourceLocations(const std::set& storageSourceLocations); std::set getStorageOccurrences() const; - void setStorageOccurrences(const std::set& storageOccurences); + void setStorageOccurrences(const std::set& storageOccurrences); std::set getStorageComponentAccesses() const; void setStorageComponentAccesses(const std::set& storageComponentAccesses); diff --git a/src/lib/data/storage/PersistentStorage.cpp b/src/lib/data/storage/PersistentStorage.cpp index aff01dbb..e1a8f734 100644 --- a/src/lib/data/storage/PersistentStorage.cpp +++ b/src/lib/data/storage/PersistentStorage.cpp @@ -619,7 +619,7 @@ std::shared_ptr PersistentStorage::getFullTextSearchLo { std::vector> threads; std::mutex collectionMutex; - for (std::vector fileResults: utility::splitToEqualySizedParts( + for (std::vector fileResults: utility::splitToEquallySizedParts( m_fullTextSearchIndex.searchForTerm(searchTerm), utility::getIdealThreadCount())) { std::shared_ptr thread = std::make_shared( @@ -2132,11 +2132,11 @@ std::vector PersistentStorage::getAllEdgeBookmarks() const std::vector PersistentStorage::getAllBookmarkCategories() const { std::vector categories; - for (const StorageBookmarkCategory& storageBookmarkCategoriy: + for (const StorageBookmarkCategory& storageBookmarkCategory: m_sqliteBookmarkStorage.getAllBookmarkCategories()) { categories.push_back( - BookmarkCategory(storageBookmarkCategoriy.id, storageBookmarkCategoriy.name)); + BookmarkCategory(storageBookmarkCategory.id, storageBookmarkCategory.name)); } return categories; } @@ -3347,7 +3347,7 @@ void PersistentStorage::buildFullTextSearchIndex() const } } for (std::vector part: - utility::splitToEqualySizedParts(indexedFiles, utility::getIdealThreadCount())) + utility::splitToEquallySizedParts(indexedFiles, utility::getIdealThreadCount())) { std::shared_ptr thread = std::make_shared( [&](const std::vector& files) { diff --git a/src/lib/data/storage/PersistentStorage.h b/src/lib/data/storage/PersistentStorage.h index 2153baba..c4cc8b7b 100644 --- a/src/lib/data/storage/PersistentStorage.h +++ b/src/lib/data/storage/PersistentStorage.h @@ -241,7 +241,7 @@ private: void addNodesWithParentsAndEdgesToGraph( const std::vector& nodeIds, const std::vector& edgeIds, - Graph* graphh, + Graph* graph, bool addChildCount) const; inline void addFileNodeToGraph(const StorageNode& storageNode, Graph* const graph) const; void addNodeToGraph( diff --git a/src/lib/data/storage/Storage.cpp b/src/lib/data/storage/Storage.cpp index 22425e22..15544623 100644 --- a/src/lib/data/storage/Storage.cpp +++ b/src/lib/data/storage/Storage.cpp @@ -193,12 +193,12 @@ void Storage::inject(Storage* injected) { // TRACE("inject occurrences"); - const std::set& oldOccurences = injected->getStorageOccurrences(); + const std::set& oldOccurrences = injected->getStorageOccurrences(); std::vector occurrences; - occurrences.reserve(oldOccurences.size()); + occurrences.reserve(oldOccurrences.size()); - for (const StorageOccurrence& occurrence: oldOccurences) + for (const StorageOccurrence& occurrence: oldOccurrences) { Id elementId = 0; Id sourceLocationId = 0; diff --git a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp index fc112c94..3f121d40 100644 --- a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp +++ b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp @@ -395,7 +395,7 @@ bool SqliteIndexStorage::addOccurrence(const StorageOccurrence& data) bool SqliteIndexStorage::addOccurrences(const std::vector& occurrences) { - return m_insertOccurenceBatchStatement.execute(occurrences, this); + return m_insertOccurrenceBatchStatement.execute(occurrences, this); } bool SqliteIndexStorage::addComponentAccess(const StorageComponentAccess& componentAccess) @@ -1293,7 +1293,7 @@ void SqliteIndexStorage::setupTables() m_database.execDML( "CREATE TABLE IF NOT EXISTS filecontent(" - "id INTERGER, " + "id INTEGER, " "content TEXT, " "PRIMARY KEY(id), " "FOREIGN KEY(id) REFERENCES file(id)" @@ -1404,7 +1404,7 @@ void SqliteIndexStorage::setupPrecompiledStatements() stmt.bind(int(index) * 6 + 6, int(location.type)); }, m_database); - m_insertOccurenceBatchStatement.compile( + m_insertOccurrenceBatchStatement.compile( "INSERT OR IGNORE INTO occurrence(element_id, source_location_id) VALUES", 2, [](CppSQLite3Statement& stmt, const StorageOccurrence& occurrence, size_t index) { diff --git a/src/lib/data/storage/sqlite/SqliteIndexStorage.h b/src/lib/data/storage/sqlite/SqliteIndexStorage.h index 7d07de7e..ab644dce 100644 --- a/src/lib/data/storage/sqlite/SqliteIndexStorage.h +++ b/src/lib/data/storage/sqlite/SqliteIndexStorage.h @@ -357,7 +357,7 @@ private: InsertBatchStatement m_insertSymbolBatchStatement; InsertBatchStatement m_insertLocalSymbolBatchStatement; InsertBatchStatement m_insertSourceLocationBatchStatement; - InsertBatchStatement m_insertOccurenceBatchStatement; + InsertBatchStatement m_insertOccurrenceBatchStatement; InsertBatchStatement m_insertComponentAccessBatchStatement; CppSQLite3Statement m_insertElementStmt; diff --git a/src/lib/project/RefreshInfoGenerator.cpp b/src/lib/project/RefreshInfoGenerator.cpp index e1dad72d..7ae6b047 100644 --- a/src/lib/project/RefreshInfoGenerator.cpp +++ b/src/lib/project/RefreshInfoGenerator.cpp @@ -102,7 +102,7 @@ RefreshInfo RefreshInfoGenerator::getRefreshInfoForUpdatedFiles( const std::set staticReferencedFilePaths = storage->getReferenced(staticSourceFiles); const std::set dynamicReferencedFilePaths = storage->getReferenced(filesToClear); - // 2.3.3) Add "dynamicReferencedFilePaths" to "filesToClear" that are not refenced by static + // 2.3.3) Add "dynamicReferencedFilePaths" to "filesToClear" that are not referenced by static // paths, because these files may not be // referenced anymore. If they still are, they will be re-added when encountered during // re-indexing. diff --git a/src/lib/settings/migration/SettingsMigrator.h b/src/lib/settings/migration/SettingsMigrator.h index 095c2482..3c9c130b 100644 --- a/src/lib/settings/migration/SettingsMigrator.h +++ b/src/lib/settings/migration/SettingsMigrator.h @@ -1,5 +1,5 @@ -#ifndef SETTNGS_MIGRATOR_H -#define SETTNGS_MIGRATOR_H +#ifndef SETTINGS_MIGRATOR_H +#define SETTINGS_MIGRATOR_H #include "Migrator.h" diff --git a/src/lib/utility/LowMemoryStringMap.h b/src/lib/utility/LowMemoryStringMap.h index 16d061a3..04d3342b 100644 --- a/src/lib/utility/LowMemoryStringMap.h +++ b/src/lib/utility/LowMemoryStringMap.h @@ -247,7 +247,7 @@ private: /* * Nodes * - * These types are used to build the tree structure. They are either branches or leafes and + * These types are used to build the tree structure. They are either branches or leaves and * contain a StringType */ @@ -318,7 +318,7 @@ private: /* * StringLeaf * - * Combines Leaf and StringType to allow for creating leafes of different string lengths, that + * Combines Leaf and StringType to allow for creating leaves of different string lengths, that * can still be stored in a collection of Node types. */ template diff --git a/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp b/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp index a334c8af..9df60783 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp +++ b/src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp @@ -90,7 +90,7 @@ void CommandlineCommandConfig::setup() "logging-enabled,l", po::value(), "Enable file/console logging ")( "verbose-indexer-logging-enabled,L", po::value(), - "Enable additional log of abstract syntax tree during the indexing. WARNINIG " + "Enable additional log of abstract syntax tree during the indexing. WARNING " "Slows down " "indexing speed")( "jvm-path,j", po::value(), "Path to the location of the jvm library")( diff --git a/src/lib/utility/file/utilityFile.cpp b/src/lib/utility/file/utilityFile.cpp index a51ba44a..b5e51107 100644 --- a/src/lib/utility/file/utilityFile.cpp +++ b/src/lib/utility/file/utilityFile.cpp @@ -94,12 +94,12 @@ FilePath utility::getExpandedPath(const FilePath& path) std::vector utility::getExpandedPaths(const std::vector& paths) { - std::vector expanedPaths; + std::vector expandedPaths; for (const FilePath& path: paths) { - utility::append(expanedPaths, path.expandEnvironmentVariables()); + utility::append(expandedPaths, path.expandEnvironmentVariables()); } - return expanedPaths; + return expandedPaths; } FilePath utility::getExpandedAndAbsolutePath(const FilePath& path, const FilePath& baseDirectory) diff --git a/src/lib/utility/logging/logging.h b/src/lib/utility/logging/logging.h index d4c81586..fb3c58b9 100644 --- a/src/lib/utility/logging/logging.h +++ b/src/lib/utility/logging/logging.h @@ -6,7 +6,7 @@ #include "LogManager.h" /** - * @brief Makros to simplify usage of the log manager + * @brief Macros to simplify usage of the log manager */ #define LOG_INFO(__str__) \ do \ diff --git a/src/lib/utility/messaging/MessageQueue.cpp b/src/lib/utility/messaging/MessageQueue.cpp index 71f47bc4..23a27485 100644 --- a/src/lib/utility/messaging/MessageQueue.cpp +++ b/src/lib/utility/messaging/MessageQueue.cpp @@ -243,7 +243,7 @@ void MessageQueue::sendMessage(std::shared_ptr message) { std::lock_guard lock(m_listenersMutex); - // m_listenersLength is saved, so that new listeners registered whithin message handling don't + // m_listenersLength is saved, so that new listeners registered within message handling don't // get the current message and the length can be reduced when a listener gets unregistered. m_listenersLength = m_listeners.size(); diff --git a/src/lib/utility/utility.h b/src/lib/utility/utility.h index aa967840..794b0010 100644 --- a/src/lib/utility/utility.h +++ b/src/lib/utility/utility.h @@ -17,7 +17,7 @@ namespace utility { template -std::vector> splitToEqualySizedParts( +std::vector> splitToEquallySizedParts( const std::vector& values, const size_t desiredPartCount); template @@ -131,7 +131,7 @@ size_t digits(size_t n); } // namespace utility template -std::vector> utility::splitToEqualySizedParts( +std::vector> utility::splitToEquallySizedParts( const std::vector& values, const size_t desiredPartCount) { const size_t partCount = std::max(1, std::min(desiredPartCount, values.size())); diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp index 87f4d072..d0099204 100644 --- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp +++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp @@ -129,7 +129,7 @@ std::shared_ptr CxxIndexerCommandProvider::consumeCommand() m_commands.begin(); if (it->second) { - std::shared_ptr command = represetationToCommand(it->first, it->second); + std::shared_ptr command = representationToCommand(it->first, it->second); m_commands.erase(it); return command; } @@ -144,7 +144,7 @@ std::shared_ptr CxxIndexerCommandProvider::consumeCommandForSour filePath); if (it != m_commands.end() && it->second) { - std::shared_ptr command = represetationToCommand(it->first, it->second); + std::shared_ptr command = representationToCommand(it->first, it->second); m_commands.erase(it); return command; } @@ -160,7 +160,7 @@ std::vector> CxxIndexerCommandProvider::consumeA it != m_commands.end(); it++) { - commands.emplace_back(represetationToCommand(it->first, it->second)); + commands.emplace_back(representationToCommand(it->first, it->second)); } m_commands.clear(); return commands; @@ -191,7 +191,7 @@ Id CxxIndexerCommandProvider::getId() return m_nextId++; } -std::shared_ptr CxxIndexerCommandProvider::represetationToCommand( +std::shared_ptr CxxIndexerCommandProvider::representationToCommand( const FilePath& sourceFilePath, std::shared_ptr representation) { std::set indexedPaths; diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h index cafd4be7..eb4f1583 100644 --- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h +++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h @@ -35,7 +35,7 @@ private: }; Id getId(); - std::shared_ptr represetationToCommand( + std::shared_ptr representationToCommand( const FilePath& sourceFilePath, std::shared_ptr representation); Id m_nextId; diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h index fd6979be..7b8afc58 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentTypeRefKind.h @@ -8,7 +8,7 @@ // 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 {}; For this snippet the type "Bar" is used in the context of an inheritence. +// Foo: public Bar {}; For this snippet the type "Bar" is used in the context of an inheritance. class CxxAstVisitorComponentTypeRefKind: public CxxAstVisitorComponent { public: diff --git a/src/lib_cxx/data/parser/cxx/CxxParser.cpp b/src/lib_cxx/data/parser/cxx/CxxParser.cpp index 67b55265..454ffca4 100644 --- a/src/lib_cxx/data/parser/cxx/CxxParser.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxParser.cpp @@ -38,7 +38,7 @@ std::vector appendFilePath(const std::vector& args, ll return utility::concat(args, {filePath.str()}); } -// custom implementation of clang::runToolOnCodeWithArgs which also sets our custon DiagnosticConsumer +// custom implementation of clang::runToolOnCodeWithArgs which also sets our custom DiagnosticConsumer bool runToolOnCodeWithArgs( clang::DiagnosticConsumer* DiagConsumer, std::unique_ptr ToolAction, @@ -107,14 +107,14 @@ std::vector CxxParser::getCommandlineArgumentsEssential( void CxxParser::initializeLLVM() { - static bool intialized = false; - if (!intialized) + static bool initialized = false; + if (!initialized) { llvm::InitializeAllTargets(); llvm::InitializeAllTargetMCs(); llvm::InitializeAllAsmPrinters(); llvm::InitializeAllAsmParsers(); - intialized = true; + initialized = true; } } diff --git a/src/lib_cxx/utility/CompilationDatabase.h b/src/lib_cxx/utility/CompilationDatabase.h index 3034d09c..5eacddd1 100644 --- a/src/lib_cxx/utility/CompilationDatabase.h +++ b/src/lib_cxx/utility/CompilationDatabase.h @@ -1,5 +1,5 @@ -#ifndef UTILITY_COMPLIATION_DATABASE_H -#define UTILITY_COMPLIATION_DATABASE_H +#ifndef UTILITY_COMPILATION_DATABASE_H +#define UTILITY_COMPILATION_DATABASE_H #include #include @@ -29,4 +29,4 @@ private: } // namespace utility -#endif // UTILITY_COMPLIATION_DATABASE_H +#endif // UTILITY_COMPILATION_DATABASE_H diff --git a/src/lib_cxx/utility/IncludeProcessing.cpp b/src/lib_cxx/utility/IncludeProcessing.cpp index 3baad248..7b69d3d2 100644 --- a/src/lib_cxx/utility/IncludeProcessing.cpp +++ b/src/lib_cxx/utility/IncludeProcessing.cpp @@ -34,7 +34,7 @@ std::vector IncludeProcessing::getUnresolvedIncludeDirectives( std::unordered_set processedFilePaths; std::set unresolvedIncludeDirectives; - std::vector> parts = utility::splitToEqualySizedParts( + std::vector> parts = utility::splitToEquallySizedParts( utility::toVector(sourceFilePaths), desiredQuantileCount); for (size_t i = 0; i < parts.size(); i++) @@ -78,7 +78,7 @@ std::set IncludeProcessing::getHeaderSearchDirectories( std::set headerSearchDirectories; std::unordered_set processedFilePaths; - std::vector> parts = utility::splitToEqualySizedParts( + std::vector> parts = utility::splitToEquallySizedParts( utility::toVector(sourceFilePaths), desiredQuantileCount); for (size_t i = 0; i < parts.size(); i++) diff --git a/src/lib_gui/CMakeLists.txt b/src/lib_gui/CMakeLists.txt index 69204996..f5689b93 100644 --- a/src/lib_gui/CMakeLists.txt +++ b/src/lib_gui/CMakeLists.txt @@ -37,8 +37,8 @@ add_files( qt/element/code/QtCodeFileTitleBar.h qt/element/code/QtCodeFileTitleButton.cpp qt/element/code/QtCodeFileTitleButton.h - qt/element/code/QtCodeNavigateable.cpp - qt/element/code/QtCodeNavigateable.h + qt/element/code/QtCodeNavigable.cpp + qt/element/code/QtCodeNavigable.h qt/element/code/QtCodeNavigator.cpp qt/element/code/QtCodeNavigator.h qt/element/code/QtCodeSnippet.cpp diff --git a/src/lib_gui/qt/QtCoreApplication.h b/src/lib_gui/qt/QtCoreApplication.h index 9e5bf78c..89e48543 100644 --- a/src/lib_gui/qt/QtCoreApplication.h +++ b/src/lib_gui/qt/QtCoreApplication.h @@ -1,5 +1,5 @@ -#ifndef QT_COREAPPLICTION_H -#define QT_COREAPPLICTION_H +#ifndef QT_COREAPPLICATION_H +#define QT_COREAPPLICATION_H #include diff --git a/src/lib_gui/qt/element/QtTabBar.cpp b/src/lib_gui/qt/element/QtTabBar.cpp index 07852bdb..69e65ea0 100644 --- a/src/lib_gui/qt/element/QtTabBar.cpp +++ b/src/lib_gui/qt/element/QtTabBar.cpp @@ -34,7 +34,7 @@ void QtTabBar::contextMenuEvent(QContextMenuEvent* event) menu.addAction(m_closeTabsToRight); connect(m_closeTabsToRight, &QAction::triggered, this, [&]() { - // We dont want to close tabs right of the current active tab. + // We don't want to close tabs right of the current active tab. // No, our intend is to close tabs right of the currently hovered tab. auto tabNum = tabAt(event->pos()); LOG_INFO( diff --git a/src/lib_gui/qt/element/code/QtCodeArea.cpp b/src/lib_gui/qt/element/code/QtCodeArea.cpp index e717a14a..c7fb9592 100644 --- a/src/lib_gui/qt/element/code/QtCodeArea.cpp +++ b/src/lib_gui/qt/element/code/QtCodeArea.cpp @@ -824,7 +824,7 @@ void QtCodeArea::mouseReleaseEvent(QMouseEvent* event) viewport()->setCursor(Qt::ArrowCursor); const int panningThreshold = 5; - if (m_panningDistance < panningThreshold) // dont do anything if mouse is release to end + if (m_panningDistance < panningThreshold) // don't do anything if mouse is release to end // some real panning action. { if (Qt::KeyboardModifier::ControlModifier & QApplication::keyboardModifiers()) diff --git a/src/lib_gui/qt/element/code/QtCodeFileList.h b/src/lib_gui/qt/element/code/QtCodeFileList.h index 8ec1f8f7..c86ccc81 100644 --- a/src/lib_gui/qt/element/code/QtCodeFileList.h +++ b/src/lib_gui/qt/element/code/QtCodeFileList.h @@ -7,7 +7,7 @@ #include #include "CodeSnippetParams.h" -#include "QtCodeNavigateable.h" +#include "QtCodeNavigable.h" #include "QtScrollSpeedChangeListener.h" class QtCodeFile; @@ -23,7 +23,7 @@ protected: class QtCodeFileList : public QFrame - , public QtCodeNavigateable + , public QtCodeNavigable { Q_OBJECT @@ -38,7 +38,7 @@ public: void addFile(const CodeFileParams& params); - // QtCodeNavigatebale implementation + // QtCodeNavigable implementation QScrollArea* getScrollArea() override; void updateSourceLocations(const CodeSnippetParams& params) override; diff --git a/src/lib_gui/qt/element/code/QtCodeFileSingle.h b/src/lib_gui/qt/element/code/QtCodeFileSingle.h index ed5847e8..1ebd61a6 100644 --- a/src/lib_gui/qt/element/code/QtCodeFileSingle.h +++ b/src/lib_gui/qt/element/code/QtCodeFileSingle.h @@ -9,7 +9,7 @@ #include "FilePath.h" #include "TimeStamp.h" -#include "QtCodeNavigateable.h" +#include "QtCodeNavigable.h" class QLabel; class QPushButton; @@ -19,7 +19,7 @@ class QtCodeNavigator; class QtCodeFileSingle : public QFrame - , public QtCodeNavigateable + , public QtCodeNavigable { Q_OBJECT @@ -32,7 +32,7 @@ public: bool addFile(const CodeFileParams& params, bool useSingleFileCache); - // QtCodeNavigateable implementation + // QtCodeNavigable implementation QAbstractScrollArea* getScrollArea() override; void updateSourceLocations(const CodeSnippetParams& params) override; diff --git a/src/lib_gui/qt/element/code/QtCodeNavigateable.cpp b/src/lib_gui/qt/element/code/QtCodeNavigable.cpp similarity index 95% rename from src/lib_gui/qt/element/code/QtCodeNavigateable.cpp rename to src/lib_gui/qt/element/code/QtCodeNavigable.cpp index 12ba23c3..f9a855fd 100644 --- a/src/lib_gui/qt/element/code/QtCodeNavigateable.cpp +++ b/src/lib_gui/qt/element/code/QtCodeNavigable.cpp @@ -1,4 +1,4 @@ -#include "QtCodeNavigateable.h" +#include "QtCodeNavigable.h" #include #include @@ -6,9 +6,9 @@ #include "ApplicationSettings.h" -QtCodeNavigateable::~QtCodeNavigateable() {} +QtCodeNavigable::~QtCodeNavigable() {} -void QtCodeNavigateable::ensureWidgetVisibleAnimated( +void QtCodeNavigable::ensureWidgetVisibleAnimated( const QWidget* parentWidget, const QWidget* childWidget, const QRectF& rect, @@ -96,7 +96,7 @@ void QtCodeNavigateable::ensureWidgetVisibleAnimated( } } -void QtCodeNavigateable::ensurePercentVisibleAnimated( +void QtCodeNavigable::ensurePercentVisibleAnimated( double percentA, double percentB, bool animated, CodeScrollParams::Target target) { QAbstractScrollArea* area = getScrollArea(); @@ -186,7 +186,7 @@ void QtCodeNavigateable::ensurePercentVisibleAnimated( } } -QRect QtCodeNavigateable::getFocusRectForWidget( +QRect QtCodeNavigable::getFocusRectForWidget( const QWidget* childWidget, const QWidget* parentWidget) const { const QRect microFocus = childWidget->inputMethodQuery(Qt::ImCursorRectangle).toRect(); diff --git a/src/lib_gui/qt/element/code/QtCodeNavigateable.h b/src/lib_gui/qt/element/code/QtCodeNavigable.h similarity index 89% rename from src/lib_gui/qt/element/code/QtCodeNavigateable.h rename to src/lib_gui/qt/element/code/QtCodeNavigable.h index 6982ab80..c8335246 100644 --- a/src/lib_gui/qt/element/code/QtCodeNavigateable.h +++ b/src/lib_gui/qt/element/code/QtCodeNavigable.h @@ -1,5 +1,5 @@ -#ifndef QT_CODE_NAVIGATEABLE_H -#define QT_CODE_NAVIGATEABLE_H +#ifndef QT_CODE_NAVIGABLE_H +#define QT_CODE_NAVIGABLE_H #include @@ -15,10 +15,10 @@ class QRect; class QtCodeArea; class QWidget; -class QtCodeNavigateable +class QtCodeNavigable { public: - virtual ~QtCodeNavigateable(); + virtual ~QtCodeNavigable(); virtual QAbstractScrollArea* getScrollArea() = 0; @@ -59,4 +59,4 @@ protected: QRect getFocusRectForWidget(const QWidget* childWidget, const QWidget* parentWidget) const; }; -#endif // QT_CODE_NAVIGATEABLE_H +#endif // QT_CODE_NAVIGABLE_H diff --git a/src/lib_gui/qt/element/code/QtCodeNavigator.h b/src/lib_gui/qt/element/code/QtCodeNavigator.h index fc1850a2..5d2491c3 100644 --- a/src/lib_gui/qt/element/code/QtCodeNavigator.h +++ b/src/lib_gui/qt/element/code/QtCodeNavigator.h @@ -133,7 +133,7 @@ private: QtThreadedLambdaFunctor m_onQtThread; - QtCodeNavigateable* m_current; + QtCodeNavigable* m_current; QtCodeFileList* m_list; QtCodeFileSingle* m_single; diff --git a/src/lib_gui/qt/network/QtRequest.cpp b/src/lib_gui/qt/network/QtRequest.cpp index db3c6cc6..301c30b8 100644 --- a/src/lib_gui/qt/network/QtRequest.cpp +++ b/src/lib_gui/qt/network/QtRequest.cpp @@ -40,7 +40,7 @@ void QtRequest::finished(QNetworkReply* reply) if (reply->error() != QNetworkReply::NoError) { - LOG_ERROR_STREAM(<< "An error occured during http request. ERRORCODE: " << reply->error()); + LOG_ERROR_STREAM(<< "An error occurred during http request. ERRORCODE: " << reply->error()); } QByteArray bytes = reply->readAll(); diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentPreferences.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentPreferences.cpp index 1365837e..b5eb1294 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentPreferences.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentPreferences.cpp @@ -251,7 +251,7 @@ void QtProjectWizardContentPreferences::populate(QGridLayout* layout, int& row) QStringLiteral( "

    Enable additional logs of abstract syntax tree traversal during indexing. This " "information can help " - "tracking down crashes that occurr during indexing.

    " + "tracking down crashes that occur during indexing.

    " "

    Warning: This slows down indexing performance a lot.

    "), layout, row); @@ -333,7 +333,7 @@ void QtProjectWizardContentPreferences::populate(QGridLayout* layout, int& row) QStringLiteral("Run C/C++ indexer threads in different process"), QStringLiteral( "

    Enable C/C++ indexer threads to run in different process.

    " - "

    This prevents the application from crashing due to unforseen exceptions while " + "

    This prevents the application from crashing due to unforeseen exceptions while " "indexing.

    "), layout, row); diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentSelect.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentSelect.cpp index 8dd4e376..8a1240f9 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentSelect.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentSelect.cpp @@ -166,7 +166,7 @@ void QtProjectWizardContentSelect::populate(QGridLayout* layout, int& row) selectedLanguage = LanguageType(languageTypeInt); } - bool hasRecommeded = false; + bool hasRecommended = false; for (auto& it: m_buttons) { it.second->setExclusive(false); @@ -177,7 +177,7 @@ void QtProjectWizardContentSelect::populate(QGridLayout* layout, int& row) if (it.first == selectedLanguage) { - hasRecommeded = hasRecommeded | button->property("recommended").toBool(); + hasRecommended = hasRecommended | button->property("recommended").toBool(); } } it.second->setExclusive(true); @@ -187,7 +187,7 @@ void QtProjectWizardContentSelect::populate(QGridLayout* layout, int& row) m_title->setText("Source Group Types - " + m_languages->checkedButton()->text()); m_description->setText( - hasRecommeded ? QStringLiteral("* recommended") : QLatin1String("")); + hasRecommended ? QStringLiteral("* recommended") : QLatin1String("")); }); QtFlowLayout* flayout = new QtFlowLayout(10, 0, 0); diff --git a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentUnloadable.cpp b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentUnloadable.cpp index d5123267..71363463 100644 --- a/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentUnloadable.cpp +++ b/src/lib_gui/qt/project_wizard/content/QtProjectWizardContentUnloadable.cpp @@ -23,7 +23,7 @@ void QtProjectWizardContentUnloadable::populate(QGridLayout* layout, int& row) QLabel* infoLabel = new QLabel(QString::fromStdString( "

    The type \"" + m_settings->getTypeString() + - "\" of the selected Source Group is not supportetd by this version of Sourcetrail.

    ")); + "\" of the selected Source Group is not supported by this version of Sourcetrail.

    ")); infoLabel->setObjectName(QStringLiteral("info")); infoLabel->setWordWrap(true); layoutHorz->addWidget(infoLabel); diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp index 459d1600..b2c3b0e8 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearch.cpp @@ -76,16 +76,16 @@ void QtProjectWizardContentPathsHeaderSearch::populate(QGridLayout* layout, int& detectionButton, row, QtProjectWizardWindow::BACK_COL, Qt::AlignLeft | Qt::AlignTop); } { - QPushButton* validateionButton = new QPushButton( + QPushButton* validationButton = new QPushButton( QStringLiteral("validate include directives")); - validateionButton->setObjectName(QStringLiteral("windowButton")); + validationButton->setObjectName(QStringLiteral("windowButton")); connect( - validateionButton, + validationButton, &QPushButton::clicked, this, &QtProjectWizardContentPathsHeaderSearch::validateIncludesButtonClicked); layout->addWidget( - validateionButton, row, QtProjectWizardWindow::BACK_COL, Qt::AlignRight | Qt::AlignTop); + validationButton, row, QtProjectWizardWindow::BACK_COL, Qt::AlignRight | Qt::AlignTop); } row++; } diff --git a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp index bc7c6c07..c2439767 100644 --- a/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp +++ b/src/lib_gui/qt/project_wizard/content/paths/QtProjectWizardContentPathsHeaderSearchGlobal.cpp @@ -79,7 +79,7 @@ bool QtProjectWizardContentPathsHeaderSearchGlobal::check() "Your Global Include Paths contain other paths that hold C/C++ compiler headers, " "probably those of your local C/C++ compiler. They are possibly in conflict with the " "compiler headers of " - "Sourcetrail's C/C++ indexer. This can lead to compatiblity errors during indexing. Do " + "Sourcetrail's C/C++ indexer. This can lead to compatibility errors during indexing. Do " "you want to remove " "these paths?"); msgBox.setDetailedText(compilerHeaderPaths); diff --git a/src/lib_gui/qt/utility/QtHighlighter.cpp b/src/lib_gui/qt/utility/QtHighlighter.cpp index 83624f31..570fcda8 100644 --- a/src/lib_gui/qt/utility/QtHighlighter.cpp +++ b/src/lib_gui/qt/utility/QtHighlighter.cpp @@ -100,7 +100,7 @@ void QtHighlighter::loadHighlightingRules() if (doc.isNull() || !doc.isArray()) { LOG_ERROR_STREAM( - << "Highlinghting rules in \"" << path.str() + << "Highlighting rules in \"" << path.str() << "\" couldn't be parsed as JSON: " "offset " << error.offset << " - " << error.errorString().toStdString()); diff --git a/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp b/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp index 442e64e1..a4071eb2 100644 --- a/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp +++ b/src/lib_gui/qt/view/QtViewWidgetWrapper.cpp @@ -15,7 +15,7 @@ QWidget* QtViewWidgetWrapper::getWidgetOfView(const View* view) if (!widgetWrapper->getWidget()) { - LOG_ERROR("The QtViewWidgetWrapper is not holdling a QWidget."); + LOG_ERROR("The QtViewWidgetWrapper is not holding a QWidget."); return nullptr; } diff --git a/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp b/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp index 0ec8e8d7..b5e0b543 100644 --- a/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp +++ b/src/lib_gui/qt/window/QtKeyboardShortcuts.cpp @@ -37,12 +37,12 @@ void QtKeyboardShortcuts::populateWindow(QWidget* widget) { QVBoxLayout* layout = new QVBoxLayout(widget); - QLabel* generelLabel = new QLabel(this); - generelLabel->setObjectName(QStringLiteral("general_label")); - generelLabel->setText(QStringLiteral("General Shortcuts")); - layout->addWidget(generelLabel); + QLabel* generalLabel = new QLabel(this); + generalLabel->setObjectName(QStringLiteral("general_label")); + generalLabel->setText(QStringLiteral("General Shortcuts")); + layout->addWidget(generalLabel); - layout->addWidget(createGenerelShortcutsTable()); + layout->addWidget(createGeneralShortcutsTable()); layout->addSpacing(20); @@ -147,7 +147,7 @@ void QtKeyboardShortcuts::addShortcuts(QtShortcutTable* table, const std::vector table->updateSize(); } -QTableWidget* QtKeyboardShortcuts::createGenerelShortcutsTable() +QTableWidget* QtKeyboardShortcuts::createGeneralShortcutsTable() { QtShortcutTable* table = createTableWidget("table_general"); diff --git a/src/lib_gui/qt/window/QtKeyboardShortcuts.h b/src/lib_gui/qt/window/QtKeyboardShortcuts.h index bc14179e..e2e68ff8 100644 --- a/src/lib_gui/qt/window/QtKeyboardShortcuts.h +++ b/src/lib_gui/qt/window/QtKeyboardShortcuts.h @@ -48,7 +48,7 @@ private: QtShortcutTable* createTableWidget(const std::string& objectName); void addShortcuts(QtShortcutTable* table, const std::vector& shortcuts) const; - QTableWidget* createGenerelShortcutsTable(); + QTableWidget* createGeneralShortcutsTable(); QTableWidget* createCodeViewShortcutsTable(); QTableWidget* createGraphViewShortcutsTable(); }; diff --git a/src/lib_gui/qt/window/QtLicenseWindow.cpp b/src/lib_gui/qt/window/QtLicenseWindow.cpp index 696c80d9..09f70d90 100644 --- a/src/lib_gui/qt/window/QtLicenseWindow.cpp +++ b/src/lib_gui/qt/window/QtLicenseWindow.cpp @@ -49,7 +49,7 @@ void QtLicenseWindow::populateWindow(QWidget* widget) QLabel* header3rdParties = new QLabel(QStringLiteral( "Copyrights and Licenses for Third Party Software Distributed with Sourcetrail:
    " - "Sourcetaril contains code written by the following third parties that have
    " + "Sourcetrail contains code written by the following third parties that have
    " "additional or alternate copyrights, licenses, and/or restrictions:")); layout->addWidget(header3rdParties); diff --git a/src/lib_gui/qt/window/QtMainWindow.cpp b/src/lib_gui/qt/window/QtMainWindow.cpp index 7336e761..6a2c70bb 100644 --- a/src/lib_gui/qt/window/QtMainWindow.cpp +++ b/src/lib_gui/qt/window/QtMainWindow.cpp @@ -146,7 +146,7 @@ QtMainWindow::QtMainWindow() setupHelpMenu(); // Need to call loadLayout here for right DockWidget size on Linux - // Seconde call is in Application.cpp + // Second call is in Application.cpp loadLayout(); } 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 165a15d5..5af9071d 100644 --- a/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp +++ b/src/lib_gui/utility/path_detector/cxx_header/CxxVs10To14HeaderPathDetector.cpp @@ -98,7 +98,7 @@ FilePath CxxVs10To14HeaderPathDetector::getVsInstallPathUsingRegistry() const FilePath path(value.toStdWString()); if (path.exists()) { - LOG_INFO(L"Found working regestry key for VS install path: " + key.toStdWString()); + LOG_INFO(L"Found working registry key for VS install path: " + key.toStdWString()); return path; } diff --git a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp index 66ba020d..e677d26a 100644 --- a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp +++ b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp @@ -79,7 +79,7 @@ void JavaEnvironmentFactory::createInstance(std::string classPath, std::string& { if (rc == JNI_EVERSION) { - errorString = "JVM is oudated and doesn't meet requirements"; + errorString = "JVM is outdated and doesn't meet requirements"; } else if (rc == JNI_ENOMEM) { diff --git a/src/lib_java/data/parser/java/JavaParser.h b/src/lib_java/data/parser/java/JavaParser.h index 47d6e609..b76d6ac6 100644 --- a/src/lib_java/data/parser/java/JavaParser.h +++ b/src/lib_java/data/parser/java/JavaParser.h @@ -49,7 +49,7 @@ private: const std::string& classPath, std::shared_ptr textAccess); -// This macro makes available a variable T, the passed-in t. blablabla TODO: write somethign real here +// This macro makes available a variable T, the passed-in t. blablabla TODO: write something real here #define MAKE_PARAMS_0() #define MAKE_PARAMS_1(t1) , t1 arg1 #define MAKE_PARAMS_2(t1, t2) , t1 arg1, t2 arg2 diff --git a/src/test/CxxParserTestSuite.cpp b/src/test/CxxParserTestSuite.cpp index 67470658..0c57ec1e 100644 --- a/src/test/CxxParserTestSuite.cpp +++ b/src/test/CxxParserTestSuite.cpp @@ -844,7 +844,7 @@ TEST_CASE("cxx parser finds template argument of dependent non type template par // TS_ASSERT(utility::containsElement( // client->typeUses, // TODO: record edge between vector> and Alloc (this -// is an issue because we dont have any typeloc for this edge -.- +// is an issue because we don't have any typeloc for this edge -.- // )); //} @@ -2785,7 +2785,7 @@ TEST_CASE( TEST_CASE( "cxx parser finds type template argument in non default constructor of explicit template " - "instaitiation") + "instantiation") { std::shared_ptr client = parseCode( "template \n" @@ -2808,7 +2808,7 @@ TEST_CASE( TEST_CASE( "cxx parser finds type template argument in default constructor of explicit template " - "instaitiation") + "instantiation") { std::shared_ptr client = parseCode( "template \n" @@ -2830,7 +2830,7 @@ TEST_CASE( } TEST_CASE( - "cxx parser finds type template argument in new expression of explicit template instaitiation") + "cxx parser finds type template argument in new expression of explicit template instantiation") { std::shared_ptr client = parseCode( "template \n" @@ -4192,8 +4192,8 @@ TEST_CASE("cxx parser finds correct error location after line directive") TEST_CASE("cxx parser catches error in macro expansion") { std::shared_ptr client = parseCode( - "#define MACRO_WITH_NONEXISTING_PATH \"this_path_does_not_exist.txt\"\n" - "#include MACRO_WITH_NONEXISTING_PATH\n"); + "#define MACRO_WITH_NONEXISTENT_PATH \"this_path_does_not_exist.txt\"\n" + "#include MACRO_WITH_NONEXISTENT_PATH\n"); REQUIRE(utility::containsElement( client->errors, L"'this_path_does_not_exist.txt' file not found <2:10 2:10>")); diff --git a/src/test/FilePathTestSuite.cpp b/src/test/FilePathTestSuite.cpp index 69ebe0db..10e24206 100644 --- a/src/test/FilePathTestSuite.cpp +++ b/src/test/FilePathTestSuite.cpp @@ -195,7 +195,7 @@ TEST_CASE("file_path_differs_for_different_existing_files") REQUIRE(pathA != pathB); } -TEST_CASE("file_path_differs_for_different_nonexisting_files") +TEST_CASE("file_path_differs_for_different_nonexistent_files") { const FilePath pathA(L"data/FilePathTestSuite/a.h"); const FilePath pathB(L"data/FilePathTestSuite/b.c"); @@ -203,7 +203,7 @@ TEST_CASE("file_path_differs_for_different_nonexisting_files") REQUIRE(pathA != pathB); } -TEST_CASE("file_path_differs_for_existing_and_nonexisting_files") +TEST_CASE("file_path_differs_for_existing_and_nonexistent_files") { const FilePath pathA(L"data/FilePathTestSuite/a.h"); const FilePath pathB(L"data/FilePathTestSuite/b.cc"); diff --git a/src/test/MatrixBaseTestSuite.cpp b/src/test/MatrixBaseTestSuite.cpp index 3b0690c0..442ad607 100644 --- a/src/test/MatrixBaseTestSuite.cpp +++ b/src/test/MatrixBaseTestSuite.cpp @@ -8,7 +8,7 @@ namespace * C++ functions can't return statically allocated arrays. * I don't want to use dynamically allocated arrays, so here's my work around for that... * - * Update: acutally they can... see MatrixBase [] operator (in MatrixBase.cpp) + * Update: actually they can... see MatrixBase [] operator (in MatrixBase.cpp) */ template struct Array3x5 diff --git a/src/test/NetworkProtocolHelperTestSuite.cpp b/src/test/NetworkProtocolHelperTestSuite.cpp index 6c3e8d7f..cd8c83e5 100644 --- a/src/test/NetworkProtocolHelperTestSuite.cpp +++ b/src/test/NetworkProtocolHelperTestSuite.cpp @@ -8,7 +8,7 @@ TEST_CASE("parse message") { std::wstring type = L"setActiveToken"; std::wstring divider = L">>"; - std::wstring filePath = L"C:/Users/Manuel/imporant/file/location/fileName.cpp"; + std::wstring filePath = L"C:/Users/Manuel/important/file/location/fileName.cpp"; std::wstring endOfMessageToken = L""; int row = 1; int column = 2; diff --git a/src/test/RefreshInfoGeneratorTestSuite.cpp b/src/test/RefreshInfoGeneratorTestSuite.cpp index 5ae16296..5dc9208c 100644 --- a/src/test/RefreshInfoGeneratorTestSuite.cpp +++ b/src/test/RefreshInfoGeneratorTestSuite.cpp @@ -343,7 +343,7 @@ TEST_CASE("refresh info for updated files is empty for empty storage and empty s // file may be a source file sourcefile / headerfile // file may now be indexed by the source group nottoindex / toindex // -// We now wite a TEST_CASE that checks for the expected result for every possible combination. +// We now write a TEST_CASE that checks for the expected result for every possible combination. // Example: test_unknown_unchanged_sourcefile_that_is_nottoindex namespace { @@ -571,7 +571,7 @@ TEST_CASE("nonindexed changed headerfile that is nottoindex") const RefreshInfo refreshInfo = getRefreshInfo(NON_INDEXED, CHANGED, HEADER_FILE, NOT_TO_INDEX); REQUIRE(REFRESH_UPDATED_FILES == refreshInfo.mode); REQUIRE(1 == refreshInfo.nonIndexedFilesToClear.size()); - ; // must be cleard here and will be re-indexed on demand + ; // must be cleared here and will be re-indexed on demand REQUIRE(0 == refreshInfo.filesToClear.size()); REQUIRE(0 == refreshInfo.filesToIndex.size()); } @@ -848,7 +848,7 @@ TEST_CASE("refresh info for updated files does not clear unknown uptodate header } TEST_CASE( - "refresh info for updated files clears outdated source file and referened uptodate header file") + "refresh info for updated files clears outdated source file and referenced uptodate header file") { cleanup(); { diff --git a/src/test/StorageTestSuite.cpp b/src/test/StorageTestSuite.cpp index f27b9dae..8d778203 100644 --- a/src/test/StorageTestSuite.cpp +++ b/src/test/StorageTestSuite.cpp @@ -60,15 +60,15 @@ TEST_CASE("storage saves file") std::wstring filePath = L"path/to/test.h"; - std::shared_ptr intermetiateStorage = std::make_shared(); - Id id = intermetiateStorage + std::shared_ptr intermediateStorage = std::make_shared(); + Id id = intermediateStorage ->addNode(StorageNodeData( nodeKindToInt(NODE_FILE), NameHierarchy::serialize(NameHierarchy(filePath, NAME_DELIMITER_FILE)))) .first; - intermetiateStorage->addFile(StorageFile(id, filePath, L"someLanguage", "someTime", true, true)); + intermediateStorage->addFile(StorageFile(id, filePath, L"someLanguage", "someTime", true, true)); - storage.inject(intermetiateStorage.get()); + storage.inject(intermediateStorage.get()); REQUIRE(storage.getNameHierarchyForNodeId(id).getQualifiedName() == filePath); REQUIRE(storage.getNodeTypeForNodeWithId(id).isFile()); @@ -80,11 +80,11 @@ TEST_CASE("storage saves node") TestStorage storage; - std::shared_ptr intermetiateStorage = std::make_shared(); - intermetiateStorage->addNode( + std::shared_ptr intermediateStorage = std::make_shared(); + intermediateStorage->addNode( StorageNodeData(nodeKindToInt(NODE_TYPEDEF), NameHierarchy::serialize(a))); - storage.inject(intermetiateStorage.get()); + storage.inject(intermediateStorage.get()); Id storedId = storage.getNodeIdForNameHierarchy(a); @@ -99,20 +99,20 @@ TEST_CASE("storage saves field as member") TestStorage storage; - std::shared_ptr intermetiateStorage = std::make_shared(); + std::shared_ptr intermediateStorage = std::make_shared(); - Id aId = intermetiateStorage + Id aId = intermediateStorage ->addNode(StorageNodeData(nodeKindToInt(NODE_STRUCT), NameHierarchy::serialize(a))) .first; - intermetiateStorage->addSymbol(StorageSymbol(aId, DEFINITION_EXPLICIT)); + intermediateStorage->addSymbol(StorageSymbol(aId, DEFINITION_EXPLICIT)); - Id bId = intermetiateStorage + Id bId = intermediateStorage ->addNode(StorageNodeData(nodeKindToInt(NODE_FIELD), NameHierarchy::serialize(b))) .first; - intermetiateStorage->addSymbol(StorageSymbol(bId, DEFINITION_EXPLICIT)); - intermetiateStorage->addEdge(StorageEdgeData(Edge::typeToInt(Edge::EDGE_MEMBER), aId, bId)); + intermediateStorage->addSymbol(StorageSymbol(bId, DEFINITION_EXPLICIT)); + intermediateStorage->addEdge(StorageEdgeData(Edge::typeToInt(Edge::EDGE_MEMBER), aId, bId)); - storage.inject(intermetiateStorage.get()); + storage.inject(intermediateStorage.get()); bool foundEdge = false; const Id sourceId = storage.getNodeIdForNameHierarchy(a); diff --git a/src/test/TaskSchedulerTestSuite.cpp b/src/test/TaskSchedulerTestSuite.cpp index 8c25a73a..bd77e93e 100644 --- a/src/test/TaskSchedulerTestSuite.cpp +++ b/src/test/TaskSchedulerTestSuite.cpp @@ -13,10 +13,10 @@ namespace { void executeTask(Task& task) { - std::shared_ptr blakboard = std::make_shared(); + std::shared_ptr blackboard = std::make_shared(); while (true) { - if (task.update(blakboard) != Task::STATE_RUNNING) + if (task.update(blackboard) != Task::STATE_RUNNING) { return; } @@ -37,12 +37,12 @@ public: { } - virtual void doEnter(std::shared_ptr blakboard) + virtual void doEnter(std::shared_ptr blackboard) { enterCallOrder = ++orderCount; } - virtual TaskState doUpdate(std::shared_ptr blakboard) + virtual TaskState doUpdate(std::shared_ptr blackboard) { updateCallOrder = ++orderCount; @@ -61,12 +61,12 @@ public: return returnState; } - virtual void doExit(std::shared_ptr blakboard) + virtual void doExit(std::shared_ptr blackboard) { exitCallOrder = ++orderCount; } - virtual void doReset(std::shared_ptr blakboard) + virtual void doReset(std::shared_ptr blackboard) { resetCallOrder = ++orderCount; } @@ -89,12 +89,12 @@ public: { } - virtual TaskState doUpdate(std::shared_ptr blakboard) + virtual TaskState doUpdate(std::shared_ptr blackboard) { subTask = std::make_shared(&orderCount, 1); scheduler->pushTask(subTask); - return TestTask::doUpdate(blakboard); + return TestTask::doUpdate(blackboard); } TaskScheduler* scheduler; diff --git a/src/test/TextAccessTestSuite.cpp b/src/test/TextAccessTestSuite.cpp index a1dcea32..0b5df514 100644 --- a/src/test/TextAccessTestSuite.cpp +++ b/src/test/TextAccessTestSuite.cpp @@ -138,7 +138,7 @@ TEST_CASE("textAccessFile lines content") REQUIRE( lines[3] == "... \"What? Harmless! Is that all it's got to say? Harmless! One word! ... Well, for " - "God's sake I hope you managed to recitify that a bit.\"\n"); + "God's sake I hope you managed to rectify that a bit.\"\n"); } TEST_CASE("textAccessFile get filePath") diff --git a/src/test/UtilityStringTestSuite.cpp b/src/test/UtilityStringTestSuite.cpp index 1f51e308..6f063bfc 100644 --- a/src/test/UtilityStringTestSuite.cpp +++ b/src/test/UtilityStringTestSuite.cpp @@ -153,17 +153,17 @@ TEST_CASE("tokenize with deque") REQUIRE(result.at(6) == "D"); } -TEST_CASE("substr before first with single delimiter occurence") +TEST_CASE("substr before first with single delimiter occurrence") { REQUIRE(utility::substrBeforeFirst("foo bar", ' ') == "foo"); } -TEST_CASE("substr before first with multiple delimiter occurences") +TEST_CASE("substr before first with multiple delimiter occurrences") { REQUIRE(utility::substrBeforeFirst("foo bar foo", ' ') == "foo"); } -TEST_CASE("substr before first with no delimiter occurence") +TEST_CASE("substr before first with no delimiter occurrence") { REQUIRE(utility::substrBeforeFirst("foobar", ' ') == "foobar"); } @@ -178,17 +178,17 @@ TEST_CASE("substr before first with delimiter at end") REQUIRE(utility::substrBeforeFirst("foobar ", ' ') == "foobar"); } -TEST_CASE("substr before last with single delimiter occurence") +TEST_CASE("substr before last with single delimiter occurrence") { REQUIRE(utility::substrBeforeLast("foo bar", ' ') == "foo"); } -TEST_CASE("substr before last with multiple delimiter occurences") +TEST_CASE("substr before last with multiple delimiter occurrences") { REQUIRE(utility::substrBeforeLast("foo bar foo", ' ') == "foo bar"); } -TEST_CASE("substr before last with no delimiter occurence") +TEST_CASE("substr before last with no delimiter occurrence") { REQUIRE(utility::substrBeforeLast("foobar", ' ') == "foobar"); } @@ -203,17 +203,17 @@ TEST_CASE("substr before last with delimiter at end") REQUIRE(utility::substrBeforeLast("foobar ", ' ') == "foobar"); } -TEST_CASE("substr after with single delimiter occurence") +TEST_CASE("substr after with single delimiter occurrence") { REQUIRE(utility::substrAfter("foo bar", ' ') == "bar"); } -TEST_CASE("substr after with multiple delimiter occurences") +TEST_CASE("substr after with multiple delimiter occurrences") { REQUIRE(utility::substrAfter("foo bar foo", ' ') == "bar foo"); } -TEST_CASE("substr after with no delimiter occurence") +TEST_CASE("substr after with no delimiter occurrence") { REQUIRE(utility::substrAfter("foobar", ' ') == "foobar"); } diff --git a/src/test/helper/TestStorage.h b/src/test/helper/TestStorage.h index edcbaa27..b0125941 100644 --- a/src/test/helper/TestStorage.h +++ b/src/test/helper/TestStorage.h @@ -37,9 +37,9 @@ public: } std::multimap occurrenceMap; - for (const StorageOccurrence& occurence: storage->getStorageOccurrences()) + for (const StorageOccurrence& occurrence: storage->getStorageOccurrences()) { - occurrenceMap.emplace(occurence.sourceLocationId, occurence.elementId); + occurrenceMap.emplace(occurrence.sourceLocationId, occurrence.elementId); } std::multimap tokenLocationMap; diff --git a/testing/code_view/data/code_area_tests.cpp b/testing/code_view/data/code_area_tests.cpp index 541391e8..41dd2805 100644 --- a/testing/code_view/data/code_area_tests.cpp +++ b/testing/code_view/data/code_area_tests.cpp @@ -119,7 +119,7 @@ Sample s; -// TEST: clicking on overriden method activates it immediately +// TEST: clicking on overridden method activates it immediately // START ---------------------------------------------------------------------- class Base { @@ -218,7 +218,7 @@ uint b = 12; // <- ACTION 1: hover uint // TEST: horizontal panning // START ---------------------------------------------------------------------- -void very_long_function_name_with_three_parameters_that_is_so_long_it_doesnt_fit_on_the_screen(const std::vector& strings, size_t number, bool flag); +void very_long_function_name_with_three_parameters_that_is_so_long_it_does_not_fit_on_the_screen(const std::vector& strings, size_t number, bool flag); // ACTION 1: Hold SHIFT and drag code left and right diff --git a/testing/graph_view/data/depth_graph_tests.cpp b/testing/graph_view/data/depth_graph_tests.cpp index 33e2395d..835d9194 100644 --- a/testing/graph_view/data/depth_graph_tests.cpp +++ b/testing/graph_view/data/depth_graph_tests.cpp @@ -90,7 +90,7 @@ void level_0_func1() // - horizontal layout using bezier curve edges // - nodes from level 0 to 4 displayed // - layout contains override edge shown horizontally -// - layout contains eplicit template class (dead end) +// - layout contains explicit template class (dead end) // - layout contains implicit template class // END ------------------------------------------------------------------------ @@ -214,7 +214,7 @@ void func5() { func1(); func2(); func3(); func4(); func5(); } #include "depth_files/level_5_file_1.h" // <- ACTION 1: activate -// ACTION 2: show includee graph '<' +// ACTION 2: show included graph '<' // RESULT 2: horizontal layout with bezier curve edges #include "depth_files/level_1_file_1.h" // <- ACTION 3: activate diff --git a/testing/graph_view/data/layout_tests.cpp b/testing/graph_view/data/layout_tests.cpp index 674c1f39..341c8552 100644 --- a/testing/graph_view/data/layout_tests.cpp +++ b/testing/graph_view/data/layout_tests.cpp @@ -96,7 +96,7 @@ enum Category // <- ACTION 1: activate }; // RESULTS 1: -// - enum shows all chilren +// - enum shows all children // - enum is expandable/collapsable // - children layouted in nameless access frame @@ -116,7 +116,7 @@ void foobar() // <- ACTION 1: activate } // RESULTS 1: -// - function shows all chilren +// - function shows all children // - function is not expandable/collapsable // - children layouted in nameless access frame diff --git a/testing/history/data/invocation_tests.cpp b/testing/history/data/invocation_tests.cpp index 3396f09f..338b11fc 100644 --- a/testing/history/data/invocation_tests.cpp +++ b/testing/history/data/invocation_tests.cpp @@ -72,7 +72,7 @@ typedef bool Seven; // RESULTS: // - symbol name goes up // - dropdown position goes up -// - history menu: current symbl always on top, end result: +// - history menu: current symbol always on top, end result: // SIX, FIVE, Four, Three, Seven, two, One // END ------------------------------------------------------------------------ diff --git a/testing/history/data/state_tests.cpp b/testing/history/data/state_tests.cpp index 736cd431..b2c407eb 100644 --- a/testing/history/data/state_tests.cpp +++ b/testing/history/data/state_tests.cpp @@ -133,7 +133,7 @@ // ACTION 2: Search for 'io::stringOut()' // ACTION 3: Minimize 2nd and 3rd snippet // ACTION 4: Expand last snippet -// ACTION 5: Scroll to recognizeable position +// ACTION 5: Scroll to recognizable position // ACTION 6: Activate other symbol // ACTION 7: go back @@ -165,7 +165,7 @@ // ACTION 1: Switch to code single file mode // ACTION 2: Search for 'Field::SameInRow()' -// ACTION 3: Scroll to recognizeable position +// ACTION 3: Scroll to recognizable position // ACTION 4; Activate other symbol // ACTION 5: go back diff --git a/testing/keyboard_controls/data/code_view.cpp b/testing/keyboard_controls/data/code_view.cpp index aa45bfc3..41d7c2ad 100644 --- a/testing/keyboard_controls/data/code_view.cpp +++ b/testing/keyboard_controls/data/code_view.cpp @@ -110,7 +110,7 @@ int cube(int a) // ACTION: Hold Shift and navigate with keyboard // RESULTS: // - focus is moved between the active locations of 'square' -// - focus is moved between the active local locations of 'r' inbetween +// - focus is moved between the active local locations of 'r' // END ------------------------------------------------------------------------ diff --git a/testing/project_setup/java_maven/data/my-app/src/test/java/com/mycompany/app/AppTest.java b/testing/project_setup/java_maven/data/my-app/src/test/java/com/mycompany/app/AppTest.java index 33559900..e1544362 100644 --- a/testing/project_setup/java_maven/data/my-app/src/test/java/com/mycompany/app/AppTest.java +++ b/testing/project_setup/java_maven/data/my-app/src/test/java/com/mycompany/app/AppTest.java @@ -29,7 +29,7 @@ public class AppTest } /** - * Rigourous Test :-) + * Rigorous Test :-) */ public void testApp() {