Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Telemetry
KUserFeedback
Commits
2f0267b1
Commit
2f0267b1
authored
Dec 30, 2016
by
Volker Krause
Browse files
Rename in preparation for making schema templates more generic
parent
ecfb98bc
Changes
21
Hide whitespace changes
Inline
Side-by-side
analyzer/CMakeLists.txt
View file @
2f0267b1
...
...
@@ -23,7 +23,7 @@ set(analyzer_lib_srcs
model/surveymodel.cpp
model/timeaggregationmodel.cpp
schema
entry
templates/schema
entry
templates.qrc
schematemplates/schematemplates.qrc
)
add_library
(
UserFeedbackAnalyzer STATIC
${
analyzer_lib_srcs
}
)
...
...
analyzer/core/schemaentrytemplates.cpp
View file @
2f0267b1
...
...
@@ -34,8 +34,8 @@ QVector<SchemaEntry> SchemaEntryTemplates::availableTemplates()
{
QVector
<
SchemaEntry
>
templates
;
auto
dirs
=
QStandardPaths
::
locateAll
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"org.kde.user-feedback/schema
entry
templates"
),
QStandardPaths
::
LocateDirectory
);
dirs
+=
QStringLiteral
(
":/org.kde.user-feedback/schema
entry
templates"
);
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
())
{
...
...
analyzer/main.cpp
View file @
2f0267b1
...
...
@@ -27,7 +27,7 @@ int main(int argc, char** argv)
QCoreApplication
::
setOrganizationName
(
QStringLiteral
(
"KDE"
));
QCoreApplication
::
setOrganizationDomain
(
QStringLiteral
(
"kde.org"
));
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QApplication
app
(
argc
,
argv
);
...
...
analyzer/schema
entry
templates/applicationVersion.json
→
analyzer/schematemplates/applicationVersion.json
View file @
2f0267b1
File moved
analyzer/schema
entry
templates/platform.json
→
analyzer/schematemplates/platform.json
View file @
2f0267b1
File moved
analyzer/schema
entry
templates/propertyRatio.json
→
analyzer/schematemplates/propertyRatio.json
View file @
2f0267b1
File moved
analyzer/schema
entry
templates/qtVersion.json
→
analyzer/schematemplates/qtVersion.json
View file @
2f0267b1
File moved
analyzer/schema
entry
templates/schema
entry
templates.qrc
→
analyzer/schematemplates/schematemplates.qrc
View file @
2f0267b1
<!DOCTYPE RCC>
<RCC
version=
"1.0"
>
<qresource
prefix=
"/org.kde.user-feedback/schema
entry
templates"
>
<qresource
prefix=
"/org.kde.user-feedback/schematemplates"
>
<file>
platform.json
</file>
<file>
applicationVersion.json
</file>
<file>
qtVersion.json
</file>
...
...
analyzer/schema
entry
templates/screens.json
→
analyzer/schematemplates/screens.json
View file @
2f0267b1
File moved
analyzer/schema
entry
templates/usageCount.json
→
analyzer/schematemplates/usageCount.json
View file @
2f0267b1
File moved
analyzer/schema
entry
templates/usageTime.json
→
analyzer/schematemplates/usageTime.json
View file @
2f0267b1
File moved
tests/auto/categoryaggregationmodeltest.cpp
View file @
2f0267b1
...
...
@@ -36,7 +36,7 @@ class CategoryAggregationModelTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/datamodeltest.cpp
View file @
2f0267b1
...
...
@@ -44,7 +44,7 @@ private:
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/numericaggregationmodeltest.cpp
View file @
2f0267b1
...
...
@@ -36,7 +36,7 @@ class NumericAggregationModelTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/producttest.cpp
View file @
2f0267b1
...
...
@@ -33,7 +33,6 @@ class ProductTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schemaentrytemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/providertest.cpp
View file @
2f0267b1
...
...
@@ -65,7 +65,7 @@ private:
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
QVERIFY
(
m_server
.
start
());
}
...
...
tests/auto/ratiosetaggregationmodeltest.cpp
View file @
2f0267b1
...
...
@@ -36,7 +36,7 @@ class RatioSetAggregationModelTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/sampletest.cpp
View file @
2f0267b1
...
...
@@ -32,7 +32,7 @@ class SampleTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/schemamodeltest.cpp
View file @
2f0267b1
...
...
@@ -34,7 +34,7 @@ class SchemaModelTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
tests/auto/schematemplatetest.cpp
View file @
2f0267b1
...
...
@@ -32,7 +32,7 @@ class SchemaTemplateTest : public QObject
private
slots
:
void
initTestCase
()
{
Q_INIT_RESOURCE
(
schema
entry
templates
);
Q_INIT_RESOURCE
(
schematemplates
);
QStandardPaths
::
setTestModeEnabled
(
true
);
}
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment