kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

automoc: some more linebreaks for the warnings for better readability

Browse Source 
Alex
This commit is contained in:
Alex Neundorf 2011-11-29 21:07:50 +01:00
parent 3b93e266c0
commit 7ada172002
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmQtAutomoc.cxx
View File

@ -585,7 +585,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
const std::string contentsString = this->ReadAll(absFilename); const std::string contentsString = this->ReadAll(absFilename);
if (contentsString.empty()) if (contentsString.empty())
{ {
std::cerr << "AUTOMOC: warning: " << absFilename << ": file is empty" std::cerr << "AUTOMOC: warning: " << absFilename << ": file is empty\n"
<< std::endl; << std::endl;
return; return;
} }
@ -650,12 +650,12 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
<< '{' << this->Join(headerExtensions, ',') << "}\" "; << '{' << this->Join(headerExtensions, ',') << "}\" ";
if (mocSubDir.empty()) if (mocSubDir.empty())
{ {
std::cerr << "in " << absPath << std::endl; std::cerr << "in " << absPath << "\n" << std::endl;
} }
else else
{ {
std::cerr << "neither in " << absPath std::cerr << "neither in " << absPath
<< " nor in " << mocSubDir << std::endl; << " nor in " << mocSubDir << "\n" << std::endl;
} }
::exit(EXIT_FAILURE); ::exit(EXIT_FAILURE);
@ -682,7 +682,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"\" instead of \"moc_" << basename << ".cpp\". " "\" instead of \"moc_" << basename << ".cpp\". "
"Running moc on " "Running moc on "
<< "\"" << headerToMoc << "\" ! Better include \"moc_" << "\"" << headerToMoc << "\" ! Better include \"moc_"
<< basename << ".cpp\" for a robust build." << basename << ".cpp\" for a robust build.\n"
<< std::endl; << std::endl;
} }
} }
@ -694,7 +694,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"\", which seems to be the moc file from a different " "\", which seems to be the moc file from a different "
"source file. This is not supported. " "source file. This is not supported. "
"Include \"" << scannedFileBasename << ".moc\" to run " "Include \"" << scannedFileBasename << ".moc\" to run "
"moc on this source file." << std::endl; "moc on this source file.\n" << std::endl;
::exit(EXIT_FAILURE); ::exit(EXIT_FAILURE);
} }
} }
@ -724,7 +724,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
"includes " "includes "
<< "\"" << ownMocUnderscoreFile << "\". Running moc on " << "\"" << ownMocUnderscoreFile << "\". Running moc on "
<< "\"" << absFilename << "\" ! Better include \"" << "\"" << absFilename << "\" ! Better include \""
<< scannedFileBasename << ".moc\" for a robust build." << scannedFileBasename << ".moc\" for a robust build.\n"
<< std::endl; << std::endl;
includedMocs[absFilename] = ownMocUnderscoreFile; includedMocs[absFilename] = ownMocUnderscoreFile;
includedMocs.erase(ownMocHeaderFile); includedMocs.erase(ownMocHeaderFile);
@ -734,7 +734,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
// otherwise always error out since it will not compile: // otherwise always error out since it will not compile:
std::cerr << "AUTOMOC: error: " << absFilename << ": The file " std::cerr << "AUTOMOC: error: " << absFilename << ": The file "
<< "contains a Q_OBJECT macro, but does not include " << "contains a Q_OBJECT macro, but does not include "
<< "\"" << scannedFileBasename << ".moc\" !" << "\"" << scannedFileBasename << ".moc\" !\n"
<< std::endl; << std::endl;
::exit(EXIT_FAILURE); ::exit(EXIT_FAILURE);
} }
@ -761,7 +761,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
<< "Q_PRIVATE_SLOT macro. " << "Q_PRIVATE_SLOT macro. "
<< "Running moc on " << "\"" << absFilename << "\" ! " << "Running moc on " << "\"" << absFilename << "\" ! "
<< "Better include \"moc_" << scannedFileBasename << ".cpp\"" << "Better include \"moc_" << scannedFileBasename << ".cpp\""
<< " for a robust build." << " for a robust build.\n"
<< std::endl; << std::endl;
includedMocs[ownHeader] = ownDotMocFile; includedMocs[ownHeader] = ownDotMocFile;
includedMocs.erase(absFilename); includedMocs.erase(absFilename);