mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-26 18:58:34 -06:00
Autogen: Rename cmQtAutoGeneratorRcc to cmQtAutoRcc
The class name `cmQtAutoGeneratorRcc` is long and cumbersome. This shortens it to `cmQtAutoRcc`.
This commit is contained in:
@@ -350,8 +350,8 @@ set(SRCS
|
||||
cmQtAutoGenInitializer.h
|
||||
cmQtAutoGeneratorMocUic.cxx
|
||||
cmQtAutoGeneratorMocUic.h
|
||||
cmQtAutoGeneratorRcc.cxx
|
||||
cmQtAutoGeneratorRcc.h
|
||||
cmQtAutoRcc.cxx
|
||||
cmQtAutoRcc.h
|
||||
cmRST.cxx
|
||||
cmRST.h
|
||||
cmScriptGenerator.h
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
file Copyright.txt or https://cmake.org/licensing for details. */
|
||||
#include "cmQtAutoGeneratorRcc.h"
|
||||
#include "cmQtAutoRcc.h"
|
||||
#include "cmQtAutoGen.h"
|
||||
|
||||
#include "cmAlgorithms.h"
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
// -- Class methods
|
||||
|
||||
cmQtAutoGeneratorRcc::cmQtAutoGeneratorRcc() = default;
|
||||
cmQtAutoRcc::cmQtAutoRcc() = default;
|
||||
|
||||
cmQtAutoGeneratorRcc::~cmQtAutoGeneratorRcc() = default;
|
||||
cmQtAutoRcc::~cmQtAutoRcc() = default;
|
||||
|
||||
bool cmQtAutoGeneratorRcc::Init(cmMakefile* makefile)
|
||||
bool cmQtAutoRcc::Init(cmMakefile* makefile)
|
||||
{
|
||||
// -- Utility lambdas
|
||||
auto InfoGet = [makefile](std::string const& key) {
|
||||
@@ -137,7 +137,7 @@ bool cmQtAutoGeneratorRcc::Init(cmMakefile* makefile)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::Process()
|
||||
bool cmQtAutoRcc::Process()
|
||||
{
|
||||
if (!SettingsFileRead()) {
|
||||
return false;
|
||||
@@ -170,7 +170,7 @@ bool cmQtAutoGeneratorRcc::Process()
|
||||
return SettingsFileWrite();
|
||||
}
|
||||
|
||||
std::string cmQtAutoGeneratorRcc::MultiConfigOutput() const
|
||||
std::string cmQtAutoRcc::MultiConfigOutput() const
|
||||
{
|
||||
static std::string const suffix = "_CMAKE_";
|
||||
std::string res;
|
||||
@@ -180,7 +180,7 @@ std::string cmQtAutoGeneratorRcc::MultiConfigOutput() const
|
||||
return res;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::SettingsFileRead()
|
||||
bool cmQtAutoRcc::SettingsFileRead()
|
||||
{
|
||||
// Compose current settings strings
|
||||
{
|
||||
@@ -259,7 +259,7 @@ bool cmQtAutoGeneratorRcc::SettingsFileRead()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::SettingsFileWrite()
|
||||
bool cmQtAutoRcc::SettingsFileWrite()
|
||||
{
|
||||
// Only write if any setting changed
|
||||
if (SettingsChanged_) {
|
||||
@@ -286,7 +286,7 @@ bool cmQtAutoGeneratorRcc::SettingsFileWrite()
|
||||
}
|
||||
|
||||
/// Do basic checks if rcc generation is required
|
||||
bool cmQtAutoGeneratorRcc::TestQrcRccFiles(bool& generate)
|
||||
bool cmQtAutoRcc::TestQrcRccFiles(bool& generate)
|
||||
{
|
||||
// Test if the rcc input file exists
|
||||
if (!QrcFileTime_.Load(QrcFile_)) {
|
||||
@@ -342,7 +342,7 @@ bool cmQtAutoGeneratorRcc::TestQrcRccFiles(bool& generate)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::TestResources(bool& generate)
|
||||
bool cmQtAutoRcc::TestResources(bool& generate)
|
||||
{
|
||||
// Read resource files list
|
||||
if (Inputs_.empty()) {
|
||||
@@ -383,7 +383,7 @@ bool cmQtAutoGeneratorRcc::TestResources(bool& generate)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::TestInfoFile()
|
||||
bool cmQtAutoRcc::TestInfoFile()
|
||||
{
|
||||
// Test if the rcc output file is older than the info file
|
||||
|
||||
@@ -415,7 +415,7 @@ bool cmQtAutoGeneratorRcc::TestInfoFile()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::GenerateRcc()
|
||||
bool cmQtAutoRcc::GenerateRcc()
|
||||
{
|
||||
// Make parent directory
|
||||
if (!MakeParentDirectory(RccFileOutput_)) {
|
||||
@@ -469,7 +469,7 @@ bool cmQtAutoGeneratorRcc::GenerateRcc()
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmQtAutoGeneratorRcc::GenerateWrapper()
|
||||
bool cmQtAutoRcc::GenerateWrapper()
|
||||
{
|
||||
// Generate a wrapper source file on demand
|
||||
if (IsMultiConfig()) {
|
||||
@@ -1,7 +1,7 @@
|
||||
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
||||
file Copyright.txt or https://cmake.org/licensing for details. */
|
||||
#ifndef cmQtAutoGeneratorRcc_h
|
||||
#define cmQtAutoGeneratorRcc_h
|
||||
#ifndef cmQtAutoRcc_h
|
||||
#define cmQtAutoRcc_h
|
||||
|
||||
#include "cmConfigure.h" // IWYU pragma: keep
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
class cmMakefile;
|
||||
|
||||
// @brief AUTORCC generator
|
||||
class cmQtAutoGeneratorRcc : public cmQtAutoGenerator
|
||||
class cmQtAutoRcc : public cmQtAutoGenerator
|
||||
{
|
||||
public:
|
||||
cmQtAutoGeneratorRcc();
|
||||
~cmQtAutoGeneratorRcc() override;
|
||||
cmQtAutoRcc();
|
||||
~cmQtAutoRcc() override;
|
||||
|
||||
cmQtAutoGeneratorRcc(cmQtAutoGeneratorRcc const&) = delete;
|
||||
cmQtAutoGeneratorRcc& operator=(cmQtAutoGeneratorRcc const&) = delete;
|
||||
cmQtAutoRcc(cmQtAutoRcc const&) = delete;
|
||||
cmQtAutoRcc& operator=(cmQtAutoRcc const&) = delete;
|
||||
|
||||
private:
|
||||
// -- Utility
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "cmLocalGenerator.h"
|
||||
#include "cmMakefile.h"
|
||||
#include "cmQtAutoGeneratorMocUic.h"
|
||||
#include "cmQtAutoGeneratorRcc.h"
|
||||
#include "cmQtAutoRcc.h"
|
||||
#include "cmRange.h"
|
||||
#include "cmState.h"
|
||||
#include "cmStateDirectory.h"
|
||||
@@ -1024,7 +1024,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args)
|
||||
return autoGen.Run(infoDir, config) ? 0 : 1;
|
||||
}
|
||||
if ((args[1] == "cmake_autorcc") && (args.size() >= 3)) {
|
||||
cmQtAutoGeneratorRcc autoGen;
|
||||
cmQtAutoRcc autoGen;
|
||||
std::string const& infoFile = args[2];
|
||||
std::string config;
|
||||
if (args.size() > 3) {
|
||||
|
||||
Reference in New Issue
Block a user