Quellcode durchsuchen

STYLE: fix line length

Ken Martin vor 19 Jahren
Ursprung
Commit
2bb24565e5

+ 8 - 6
Source/cmProjectCommand.cxx

@@ -31,12 +31,14 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args)
   std::string srcdir = args[0];
   srcdir += "_SOURCE_DIR";
   
-  this->Makefile->AddCacheDefinition(bindir.c_str(),
-                                 this->Makefile->GetCurrentOutputDirectory(),
-                                 "Value Computed by CMake", cmCacheManager::STATIC);
-  this->Makefile->AddCacheDefinition(srcdir.c_str(),
-                                 this->Makefile->GetCurrentDirectory(),
-                                 "Value Computed by CMake", cmCacheManager::STATIC);
+  this->Makefile->AddCacheDefinition
+    (bindir.c_str(),
+     this->Makefile->GetCurrentOutputDirectory(),
+     "Value Computed by CMake", cmCacheManager::STATIC);
+  this->Makefile->AddCacheDefinition
+    (srcdir.c_str(),
+     this->Makefile->GetCurrentDirectory(),
+     "Value Computed by CMake", cmCacheManager::STATIC);
   
   bindir = "PROJECT_BINARY_DIR";
   srcdir = "PROJECT_SOURCE_DIR";

+ 10 - 5
Source/cmQTWrapCPPCommand.cxx

@@ -57,9 +57,11 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
         {
         file.SetProperty("ABSTRACT",curr->GetProperty("ABSTRACT"));
         }
-      std::string srcName = cmSystemTools::GetFilenameWithoutLastExtension(*j);
+      std::string srcName = 
+        cmSystemTools::GetFilenameWithoutLastExtension(*j);
       std::string newName = "moc_" + srcName;
-      file.SetName(newName.c_str(), this->Makefile->GetCurrentOutputDirectory(),
+      file.SetName(newName.c_str(), 
+                   this->Makefile->GetCurrentOutputDirectory(),
                    "cxx",false);
       std::string hname;
       if ( (*j)[0] == '/' || (*j)[1] == ':' )
@@ -70,7 +72,8 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
         {
         if ( curr && curr->GetPropertyAsBool("GENERATED") )
           {
-          hname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j;
+          hname = std::string(this->Makefile->GetCurrentOutputDirectory()) 
+            + "/" + *j;
           }
         else
           {
@@ -89,7 +92,8 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn)
       }
     }
   
-  this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str());
+  this->Makefile->AddDefinition(this->SourceList.c_str(), 
+                                sourceListValue.c_str());
   return true;
 }
 
@@ -99,7 +103,8 @@ void cmQTWrapCPPCommand::FinalPass()
   // first we add the rules for all the .h to Moc files
   size_t lastClass = this->WrapClasses.size();
   std::vector<std::string> depends;
-  const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
+  const char* moc_exe = 
+    this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
 
   // wrap all the .h files
   depends.push_back(moc_exe);

+ 10 - 5
Source/cmQTWrapUICommand.cxx

@@ -75,7 +75,8 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
         {
         if ( curr && curr->GetPropertyAsBool("GENERATED") )
           {
-          origname = std::string( this->Makefile->GetCurrentOutputDirectory() ) + "/" + *j;
+          origname = std::string(this->Makefile->GetCurrentOutputDirectory()) 
+            + "/" + *j;
           }
         else
           {
@@ -114,8 +115,10 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& argsIn)
       }
     }
   
-  this->Makefile->AddDefinition(this->SourceList.c_str(), sourceListValue.c_str());  
-  this->Makefile->AddDefinition(this->HeaderList.c_str(), headerListValue.c_str());  
+  this->Makefile->AddDefinition(this->SourceList.c_str(),
+                                sourceListValue.c_str());  
+  this->Makefile->AddDefinition(this->HeaderList.c_str(),
+                                headerListValue.c_str());  
   return true;
 }
 
@@ -125,8 +128,10 @@ void cmQTWrapUICommand::FinalPass()
   // first we add the rules for all the .ui to .h and .cxx files
   size_t lastHeadersClass = this->WrapHeadersClasses.size();
   std::vector<std::string> depends;
-  const char* uic_exe = this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
-  const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
+  const char* uic_exe =
+    this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
+  const char* moc_exe =
+    this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
 
   // wrap all the .h files
   depends.push_back(uic_exe);

+ 2 - 1
Source/cmRemoveDefinitionsCommand.cxx

@@ -17,7 +17,8 @@
 #include "cmRemoveDefinitionsCommand.h"
 
 // cmRemoveDefinitionsCommand
-bool cmRemoveDefinitionsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmRemoveDefinitionsCommand
+::InitialPass(std::vector<std::string> const& args)
 {
   // it is OK to have no arguments
   if(args.size() < 1 )