Commit 2f0267b1 authored by Volker Krause's avatar Volker Krause
Browse files

Rename in preparation for making schema templates more generic

parent ecfb98bc
......@@ -23,7 +23,7 @@ set(analyzer_lib_srcs
model/surveymodel.cpp
model/timeaggregationmodel.cpp
schemaentrytemplates/schemaentrytemplates.qrc
schematemplates/schematemplates.qrc
)
add_library(UserFeedbackAnalyzer STATIC ${analyzer_lib_srcs})
......
......@@ -34,8 +34,8 @@ QVector<SchemaEntry> SchemaEntryTemplates::availableTemplates()
{
QVector<SchemaEntry> templates;
auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("org.kde.user-feedback/schemaentrytemplates"), QStandardPaths::LocateDirectory);
dirs += QStringLiteral(":/org.kde.user-feedback/schemaentrytemplates");
auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("org.kde.user-feedback/schematemplates"), QStandardPaths::LocateDirectory);
dirs += QStringLiteral(":/org.kde.user-feedback/schematemplates");
foreach (const auto &dir, dirs) {
QDirIterator it(dir, {QStringLiteral("*.json")}, QDir::Files | QDir::Readable);
while (it.hasNext()) {
......
......@@ -27,7 +27,7 @@ int main(int argc, char** argv)
QCoreApplication::setOrganizationName(QStringLiteral("KDE"));
QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QApplication app(argc, argv);
......
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/org.kde.user-feedback/schemaentrytemplates">
<qresource prefix="/org.kde.user-feedback/schematemplates">
<file>platform.json</file>
<file>applicationVersion.json</file>
<file>qtVersion.json</file>
......
......@@ -36,7 +36,7 @@ class CategoryAggregationModelTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -44,7 +44,7 @@ private:
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -36,7 +36,7 @@ class NumericAggregationModelTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -33,7 +33,6 @@ class ProductTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -65,7 +65,7 @@ private:
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
QVERIFY(m_server.start());
}
......
......@@ -36,7 +36,7 @@ class RatioSetAggregationModelTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -32,7 +32,7 @@ class SampleTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -34,7 +34,7 @@ class SchemaModelTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
......@@ -32,7 +32,7 @@ class SchemaTemplateTest : public QObject
private slots:
void initTestCase()
{
Q_INIT_RESOURCE(schemaentrytemplates);
Q_INIT_RESOURCE(schematemplates);
QStandardPaths::setTestModeEnabled(true);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment