[Cmake-commits] CMake branch, next, updated. v2.8.12-3891-gc41a59c

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c41a59c000739d1d246badfd7e3fde741196406b (commit)
       via  435d14dd43f9dfd6c56c056dfc2814d2a8248ee1 (commit)
      from  552cb71f9b6f1885ac63e27454c76a6ee9cc8414 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c41a59c000739d1d246badfd7e3fde741196406b
commit c41a59c000739d1d246badfd7e3fde741196406b
Merge: 552cb71 435d14d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 16:13:20 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 11 16:13:20 2013 -0400

    Merge topic 'Qt-auto-generators' into next
    
    435d14d Fix line length.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=435d14dd43f9dfd6c56c056dfc2814d2a8248ee1
commit 435d14dd43f9dfd6c56c056dfc2814d2a8248ee1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 22:12:54 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 22:12:54 2013 +0200

    Fix line length.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 5babaf6..a94d415 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -159,7 +159,8 @@ bool cmQtAutoGenerators::InitializeMocSourceFile(cmTarget* target)
     mocCppFile += "/";
     mocCppFile += automocTargetName;
     mocCppFile += ".cpp";
-    cmSourceFile* mocCppSource = makefile->GetOrCreateSource(mocCppFile.c_str(),
+    cmSourceFile* mocCppSource = makefile->GetOrCreateSource(
+                                                          mocCppFile.c_str(),
                                                           true);
     makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES",
                             mocCppFile.c_str(), false);
@@ -899,7 +900,8 @@ bool cmQtAutoGenerators::ReadOldMocDefinitionsFile(cmMakefile* makefile,
 }
 
 
-void cmQtAutoGenerators::WriteOldMocDefinitionsFile(const char* targetDirectory)
+void
+cmQtAutoGenerators::WriteOldMocDefinitionsFile(const char* targetDirectory)
 {
   std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
   cmSystemTools::ConvertToUnixSlashes(filename);
@@ -1532,7 +1534,8 @@ void cmQtAutoGenerators::ParseForUic(const std::string&,
 }
 
 
-void cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
+void
+cmQtAutoGenerators::SearchHeadersForCppFile(const std::string& absFilename,
                               const std::vector<std::string>& headerExtensions,
                               std::set<std::string>& absHeaders)
 {
@@ -1824,13 +1827,15 @@ std::string cmQtAutoGenerators::Join(const std::vector<std::string>& lst,
 }
 
 
-bool cmQtAutoGenerators::StartsWith(const std::string& str, const std::string& with)
+bool cmQtAutoGenerators::StartsWith(const std::string& str,
+                                    const std::string& with)
 {
   return (str.substr(0, with.length()) == with);
 }
 
 
-bool cmQtAutoGenerators::EndsWith(const std::string& str, const std::string& with)
+bool cmQtAutoGenerators::EndsWith(const std::string& str,
+                                  const std::string& with)
 {
   if (with.length() > (str.length()))
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGenerators.cxx |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake