blob: 02c369cc4ee84089e187f3f5027b1b1ebafd8e7f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
===================================================================
--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
@@ -50,9 +50,9 @@ public:
mTemplateLoader.clear();
}
- void changeGrantleePath(const QString &path)
+ void changeGrantleePath(const QStringList &paths)
{
- mTemplateLoader->setTemplateDirs(QStringList() << path);
+ mTemplateLoader->setTemplateDirs(paths);
mEngine->addTemplateLoader(mTemplateLoader);
mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
{
- d->changeGrantleePath(path);
+ d->changeGrantleePath(QStringList(path));
}
void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
{
- d->changeGrantleePath(theme.absolutePath());
+ d->changeGrantleePath(theme.absolutePaths());
}
inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
===================================================================
--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
@@ -74,9 +74,9 @@ public:
mTemplateLoader.clear();
}
- void changeGrantleePath(const QString &path)
+ void changeGrantleePath(const QStringList &paths)
{
- mTemplateLoader->setTemplateDirs(QStringList() << path);
+ mTemplateLoader->setTemplateDirs(paths);
mEngine->addTemplateLoader(mTemplateLoader);
mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
{
- d->changeGrantleePath(path);
+ d->changeGrantleePath(QStringList(path));
}
void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
{
- d->changeGrantleePath(theme.absolutePath());
+ d->changeGrantleePath(theme.absolutePaths());
}
void GrantleeContactFormatter::setForceDisableQRCode(bool b)
|
