summaryrefslogtreecommitdiffstats
path: root/Source/CPack/IFW/cmCPackIFWCommon.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CPack/IFW/cmCPackIFWCommon.cxx')
-rw-r--r--Source/CPack/IFW/cmCPackIFWCommon.cxx31
1 files changed, 18 insertions, 13 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWCommon.cxx b/Source/CPack/IFW/cmCPackIFWCommon.cxx
index 60954ea..436f4d3 100644
--- a/Source/CPack/IFW/cmCPackIFWCommon.cxx
+++ b/Source/CPack/IFW/cmCPackIFWCommon.cxx
@@ -19,67 +19,72 @@ cmCPackIFWCommon::cmCPackIFWCommon()
const char* cmCPackIFWCommon::GetOption(const std::string& op) const
{
- return Generator ? Generator->cmCPackGenerator::GetOption(op) : CM_NULLPTR;
+ return this->Generator ? this->Generator->cmCPackGenerator::GetOption(op)
+ : CM_NULLPTR;
}
bool cmCPackIFWCommon::IsOn(const std::string& op) const
{
- return Generator ? Generator->cmCPackGenerator::IsOn(op) : false;
+ return this->Generator ? this->Generator->cmCPackGenerator::IsOn(op) : false;
}
bool cmCPackIFWCommon::IsSetToOff(const std::string& op) const
{
- return Generator ? Generator->cmCPackGenerator::IsSetToOff(op) : false;
+ return this->Generator ? this->Generator->cmCPackGenerator::IsSetToOff(op)
+ : false;
}
bool cmCPackIFWCommon::IsSetToEmpty(const std::string& op) const
{
- return Generator ? Generator->cmCPackGenerator::IsSetToEmpty(op) : false;
+ return this->Generator ? this->Generator->cmCPackGenerator::IsSetToEmpty(op)
+ : false;
}
bool cmCPackIFWCommon::IsVersionLess(const char* version)
{
- if (!Generator) {
+ if (!this->Generator) {
return false;
}
return cmSystemTools::VersionCompare(
- cmSystemTools::OP_LESS, Generator->FrameworkVersion.data(), version);
+ cmSystemTools::OP_LESS, this->Generator->FrameworkVersion.data(), version);
}
bool cmCPackIFWCommon::IsVersionGreater(const char* version)
{
- if (!Generator) {
+ if (!this->Generator) {
return false;
}
return cmSystemTools::VersionCompare(
- cmSystemTools::OP_GREATER, Generator->FrameworkVersion.data(), version);
+ cmSystemTools::OP_GREATER, this->Generator->FrameworkVersion.data(),
+ version);
}
bool cmCPackIFWCommon::IsVersionEqual(const char* version)
{
- if (!Generator) {
+ if (!this->Generator) {
return false;
}
return cmSystemTools::VersionCompare(
- cmSystemTools::OP_EQUAL, Generator->FrameworkVersion.data(), version);
+ cmSystemTools::OP_EQUAL, this->Generator->FrameworkVersion.data(),
+ version);
}
void cmCPackIFWCommon::WriteGeneratedByToStrim(cmXMLWriter& xout)
{
- if (!Generator) {
+ if (!this->Generator) {
return;
}
std::ostringstream comment;
comment << "Generated by CPack " << CMake_VERSION << " IFW generator "
<< "for QtIFW ";
- if (IsVersionEqual("1.9.9")) {
+ if (this->IsVersionEqual("1.9.9")) {
comment << "less 2.0";
} else {
- comment << Generator->FrameworkVersion;
+ comment << this->Generator->FrameworkVersion;
}
comment << " tools at " << cmTimestamp().CurrentTime("", true);
xout.Comment(comment.str().c_str());