[libcalamares] Rename YamlUtils.h
- Since we have the utils/ filesystem namespace, and use CalamaresUtils:: as C++ namespace, simplify naming.
This commit is contained in:
parent
090aee9196
commit
f076dd76ad
@ -23,7 +23,7 @@
|
||||
*/
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
#include "modulesystem/Module.h"
|
||||
|
||||
#include "GlobalStorage.h"
|
||||
|
@ -28,7 +28,7 @@ set( utilsSources
|
||||
utils/PluginFactory.cpp
|
||||
utils/Retranslator.cpp
|
||||
utils/Variant.cpp
|
||||
utils/YamlUtils.cpp
|
||||
utils/Yaml.cpp
|
||||
)
|
||||
set( kdsagSources
|
||||
kdsingleapplicationguard/kdsingleapplicationguard.cpp
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include "JobQueue.h"
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QJsonDocument>
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#include "utils/CalamaresUtils.h"
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "Tests.h"
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "YamlUtils.h"
|
||||
#include "Yaml.h"
|
||||
|
||||
#include "utils/Logger.h"
|
||||
|
@ -17,8 +17,8 @@
|
||||
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef YAMLUTILS_H
|
||||
#define YAMLUTILS_H
|
||||
#ifndef UTILS_YAML_H
|
||||
#define UTILS_YAML_H
|
||||
|
||||
#include <QStringList>
|
||||
#include <QVariant>
|
||||
@ -77,6 +77,6 @@ void explainYamlException( const YAML::Exception& e, const QByteArray& data, con
|
||||
void explainYamlException( const YAML::Exception& e, const QByteArray& data, const QString& label );
|
||||
void explainYamlException( const YAML::Exception& e, const QByteArray& data );
|
||||
|
||||
} //ns
|
||||
} // namespace
|
||||
|
||||
#endif // YAMLUTILS_H
|
||||
#endif
|
@ -26,7 +26,7 @@
|
||||
#include "utils/ImageRegistry.h"
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/NamedEnum.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include "CppJobModule.h"
|
||||
#include "ViewModule.h"
|
||||
#include "utils/CalamaresUtils.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
#include "utils/Logger.h"
|
||||
#include "Settings.h"
|
||||
#include "CalamaresConfig.h"
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include "ViewManager.h"
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDir>
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include "ContextualProcessJob.h"
|
||||
|
||||
#include "utils/CommandList.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include "Settings.h"
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/Variant.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QByteArray>
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include "utils/CalamaresUtilsGui.h"
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/Variant.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QBoxLayout>
|
||||
#include <QLabel>
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/Retranslator.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkRequest>
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
#include "PackageModel.h"
|
||||
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) :
|
||||
QAbstractItemModel( parent ),
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include "utils/CommandList.h"
|
||||
#include "utils/Logger.h"
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
* shipped with each module for correctness -- well, for parseability.
|
||||
*/
|
||||
|
||||
#include "utils/YamlUtils.h"
|
||||
#include "utils/Yaml.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
|
Loading…
Reference in New Issue
Block a user