1
=== modified file 'src/CMakeLists.txt'
2
--- src/CMakeLists.txt	2014-03-07 18:36:53 +0000
3
+++ src/CMakeLists.txt	2014-06-04 11:13:15 +0000
4
@@ -19,6 +19,7 @@
5
19
    ApplicationArguments.h
19
    ApplicationArguments.h
6
20
    main.cpp
20
    main.cpp
7
21
    MouseTouchAdaptor.cpp
21
    MouseTouchAdaptor.cpp
8
22
    CachingNetworkManagerFactory.cpp
9
22
    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
23
    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
10
23
    )
24
    )
11
24
add_executable(${SHELL_APP} ${COMMON_SRCS})
25
add_executable(${SHELL_APP} ${COMMON_SRCS})
12
25
26
13
=== added file 'src/CachingNetworkManagerFactory.cpp'
14
--- src/CachingNetworkManagerFactory.cpp	1970-01-01 00:00:00 +0000
15
+++ src/CachingNetworkManagerFactory.cpp	2014-06-04 11:13:15 +0000
16
@@ -0,0 +1,34 @@
17
1
/*
18
2
 * Copyright (C) 2014 Canonical, Ltd.
19
3
 *
20
4
 * This program is free software; you can redistribute it and/or modify
21
5
 * it under the terms of the GNU General Public License as published by
22
6
 * the Free Software Foundation; version 3.
23
7
 *
24
8
 * This program is distributed in the hope that it will be useful,
25
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
27
11
 * GNU General Public License for more details.
28
12
 *
29
13
 * You should have received a copy of the GNU General Public License
30
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
15
 *
32
16
 */
33
17
34
18
#include "CachingNetworkManagerFactory.h"
35
19
36
20
#include <QNetworkDiskCache>
37
21
#include <QNetworkAccessManager>
38
22
#include <QStandardPaths>
39
23
40
24
CachingNetworkManagerFactory::CachingNetworkManagerFactory()
41
25
    : m_cache(new QNetworkDiskCache())
42
26
{
43
27
    m_cache->setCacheDirectory(QString("%1/network").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
44
28
}
45
29
46
30
QNetworkAccessManager *CachingNetworkManagerFactory::create(QObject *parent) {
47
31
    QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
48
32
    manager->setCache(m_cache);
49
33
    return manager;
50
34
}
51
0
35
52
=== added file 'src/CachingNetworkManagerFactory.h'
53
--- src/CachingNetworkManagerFactory.h	1970-01-01 00:00:00 +0000
54
+++ src/CachingNetworkManagerFactory.h	2014-06-04 11:13:15 +0000
55
@@ -0,0 +1,37 @@
56
1
/*
57
2
 * Copyright (C) 2014 Canonical, Ltd.
58
3
 *
59
4
 * This program is free software; you can redistribute it and/or modify
60
5
 * it under the terms of the GNU General Public License as published by
61
6
 * the Free Software Foundation; version 3.
62
7
 *
63
8
 * This program is distributed in the hope that it will be useful,
64
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
65
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
66
11
 * GNU General Public License for more details.
67
12
 *
68
13
 * You should have received a copy of the GNU General Public License
69
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
70
15
 *
71
16
 */
72
17
73
18
#ifndef CACHINGNETWORKMANAGERFACTORY_H
74
19
#define CACHINGNETWORKMANAGERFACTORY_H
75
20
76
21
#include <QQmlNetworkAccessManagerFactory>
77
22
78
23
class QNetworkDiskCache;
79
24
class QNetworkAccessManager;
80
25
81
26
class CachingNetworkManagerFactory : public QQmlNetworkAccessManagerFactory
82
27
{
83
28
public:
84
29
    CachingNetworkManagerFactory();
85
30
86
31
    QNetworkAccessManager *create(QObject *parent) override;
87
32
88
33
private:
89
34
    QNetworkDiskCache *m_cache;
90
35
};
91
36
92
37
#endif // CACHINGNETWORKMANAGERFACTORY_H
93
0
38
94
=== modified file 'src/main.cpp'
95
--- src/main.cpp	2014-05-20 03:01:51 +0000
96
+++ src/main.cpp	2014-06-04 11:13:15 +0000
97
@@ -35,15 +35,15 @@
98
35
#include <paths.h>
35
#include <paths.h>
99
36
#include "MouseTouchAdaptor.h"
36
#include "MouseTouchAdaptor.h"
100
37
#include "ApplicationArguments.h"
37
#include "ApplicationArguments.h"
101
38
#include "CachingNetworkManagerFactory.h"
102
38
39
103
39
#include <unity-mir/qmirserver.h>
40
#include <unity-mir/qmirserver.h>
104
40
41
105
41
106
42
int startShell(int argc, const char** argv, void* server)
42
int startShell(int argc, const char** argv, void* server)
107
43
{
43
{
108
44
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
44
    const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
109
45
45
111
46
    QGuiApplication::setApplicationName(UNITY8_GREETER ? "Unity 8 Greeter" : "Unity 8");
46
    QGuiApplication::setApplicationName(UNITY8_GREETER ? "unity8-greeter" : "unity8");
112
47
    QGuiApplication *application;
47
    QGuiApplication *application;
113
48
48
114
49
    QCommandLineParser parser;
49
    QCommandLineParser parser;
115
@@ -160,6 +160,9 @@
116
160
    }
160
    }
117
161
    appendImportPaths(view->engine(), ::fallbackImportPaths());
161
    appendImportPaths(view->engine(), ::fallbackImportPaths());
118
162
162
119
163
    CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
120
164
    view->engine()->setNetworkAccessManagerFactory(managerFactory);
121
165
122
163
    view->setSource(source);
166
    view->setSource(source);
123
164
    view->setColor(Qt::transparent);
167
    view->setColor(Qt::transparent);
124
165
168
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-05-27	Needs Fixing on 2014-06-04
Florian Boucault		2014-05-27	Pending
Review via email: mp+221079@code.launchpad.net