git.iko.soy/unity8
on xenial help sign in
More fixes per review.
d3c8d3dRodney Dawes
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -6,7 +6,7 @@ include_directories(
6set(PAYMENTS_SOURCES
6set(PAYMENTS_SOURCES
7 plugin.cpp
7 plugin.cpp
8 Payments.cpp
8 Payments.cpp
9− )
9+)
10
10
11add_library(Payments MODULE ${PAYMENTS_SOURCES})
11add_library(Payments MODULE ${PAYMENTS_SOURCES})
12
12
plugins/Ubuntu/Payments/Payments.cpp+2−2
@@ -14,12 +14,12 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17+#include "Payments.h"
18+
17#include <QLocale>
19#include <QLocale>
18
20
19#include <libpay/pay-package.h>
21#include <libpay/pay-package.h>
20
22
21−#include "Payments.h"
22−
23
23
24// The observer callback for the package we are watching.
24// The observer callback for the package we are watching.
25static void observer(PayPackage* /* package */, const char* itemid, PayPackageItemStatus status, void* user_data) {
25static void observer(PayPackage* /* package */, const char* itemid, PayPackageItemStatus status, void* user_data) {
plugins/Ubuntu/Payments/plugin.cpp+2−2
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−#include <QtQml>
18−
19#include "plugin.h"
17#include "plugin.h"
20#include "Payments.h"
18#include "Payments.h"
21
19
20+#include <QtQml>
21+
22
22
23void BackendPlugin::registerTypes(const char *uri)
23void BackendPlugin::registerTypes(const char *uri)
24{
24{
tests/mocks/Ubuntu/Payments/plugin.cpp+2−2
@@ -14,11 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−#include <QtQml>
18−
19#include "plugin.h"
17#include "plugin.h"
20#include "MockPayments.h"
18#include "MockPayments.h"
21
19
20+#include <QtQml>
21+
22
22
23void BackendPlugin::registerTypes(const char *uri)
23void BackendPlugin::registerTypes(const char *uri)
24{
24{