Browse Source

Cleanup: Fix typos and grammar in docs and code

No functional changes, just docs, comments and error messages.
Craig Scott 7 years ago
parent
commit
8e841a473f

+ 3 - 3
Help/prop_tgt/AUTOMOC_MACRO_NAMES.rst

@@ -25,8 +25,8 @@ with Qt.
 Example
 ^^^^^^^
 
-In this case the the ``Q_OBJECT`` macro is hidden inside an other macro
-called ``CUSTOM_MACRO``. To let CMake know that source files, that contain
-``CUSTOM_MACRO``, need to be ``moc`` processed, we call::
+In this case the ``Q_OBJECT`` macro is hidden inside another macro
+called ``CUSTOM_MACRO``.  To let CMake know that source files that contain
+``CUSTOM_MACRO`` need to be ``moc`` processed, we call::
 
   set_property(TARGET tgt APPEND PROPERTY AUTOMOC_MACRO_NAMES "CUSTOM_MACRO")

+ 1 - 1
Help/variable/CMAKE_MODULE_PATH.rst

@@ -2,6 +2,6 @@ CMAKE_MODULE_PATH
 -----------------
 
 :ref:`;-list <CMake Language Lists>` of directories specifying a search path
-for CMake modules to be loaded by the the :command:`include` or
+for CMake modules to be loaded by the :command:`include` or
 :command:`find_package` commands before checking the default modules that come
 with CMake.  By default it is empty, it is intended to be set by the project.

+ 1 - 1
Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -793,7 +793,7 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2(
   }
 }
 
-// Build a map that contains a the set of targets used by each local
+// Build a map that contains the set of targets used by each local
 // generator directory level.
 void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
 {

+ 1 - 1
Source/cmQtAutoGen.h

@@ -34,7 +34,7 @@ public:
   /// @brief Returns the generator name in upper case
   static std::string GeneratorNameUpper(GeneratorT genType);
 
-  /// @brief Returns a the string escaped and enclosed in quotes
+  /// @brief Returns the string escaped and enclosed in quotes
   static std::string Quoted(std::string const& text);
 
   static std::string QuotedCommand(std::vector<std::string> const& command);

+ 2 - 2
Source/cmQtAutoGeneratorMocUic.cxx

@@ -1884,7 +1884,7 @@ bool cmQtAutoGeneratorMocUic::ParallelJobPushMoc(JobHandleT& jobHandle)
               error += Quoted(mocJob.IncluderFile);
               error += " and\n  ";
               error += Quoted(otherJob.IncluderFile);
-              error += "\ncontain the the same moc include string ";
+              error += "\ncontain the same moc include string ";
               error += Quoted(mocJob.IncludeString);
               error += "\nbut the moc file would be generated from different "
                        "source files\n  ";
@@ -1933,7 +1933,7 @@ bool cmQtAutoGeneratorMocUic::ParallelJobPushUic(JobHandleT& jobHandle)
           error += Quoted(uicJob.IncluderFile);
           error += " and\n  ";
           error += Quoted(otherJob.IncluderFile);
-          error += "\ncontain the the same uic include string ";
+          error += "\ncontain the same uic include string ";
           error += Quoted(uicJob.IncludeString);
           error += "\nbut the uic file would be generated from different "
                    "source files\n  ";

+ 2 - 2
Source/cmVisualStudioGeneratorOptions.cxx

@@ -127,7 +127,7 @@ bool cmVisualStudioGeneratorOptions::IsManaged() const
 
 bool cmVisualStudioGeneratorOptions::UsingUnicode() const
 {
-  // Look for the a _UNICODE definition.
+  // Look for a _UNICODE definition.
   for (std::string const& di : this->Defines) {
     if (di == "_UNICODE") {
       return true;
@@ -137,7 +137,7 @@ bool cmVisualStudioGeneratorOptions::UsingUnicode() const
 }
 bool cmVisualStudioGeneratorOptions::UsingSBCS() const
 {
-  // Look for the a _SBCS definition.
+  // Look for a _SBCS definition.
   for (std::string const& di : this->Defines) {
     if (di == "_SBCS") {
       return true;

+ 1 - 1
Tests/QtAutogen/RerunRccDepends/CMakeLists.txt

@@ -62,7 +62,7 @@ if (NOT rdGenAfter GREATER rdGenBefore)
 endif()
 
 
-message("Changing a the .qrc file")
+message("Changing the .qrc file")
 # - Acquire binary timestamps before the build
 file(TIMESTAMP "${rccDepBinPlain}" rdPlainBefore "${timeformat}")
 file(TIMESTAMP "${rccDepBinGen}" rdGenBefore "${timeformat}")