6f4e9a4 · unity8 · git.iko.soy

git.iko.soy/unity8

Use getters/setters for purchasing bool.

commit6f4e9a4a5c325d0b29841f694cb9bc5ab7d0a8f5 authorRodney Dawes <rodney.dawes@canonical.com> dateThu 18 Sep 2014, 09:50 (12 years ago) parentc7a8e4b

2 files changed+18−7

compare with xenial

unifiedsplit

plugins/Ubuntu/Payments/Payments.cpp+15−4 plugins/Ubuntu/Payments/Payments.h+3−3

plugins/Ubuntu/Payments/Payments.cpp+15−4

@@ -42,11 +42,11 @@ static void observer(PayPackage* /* package */, const char* itemid, PayPackageIt

4242 Q_EMIT self->purchaseCompleted();

4343 break;

4444 case PAY_PACKAGE_ITEM_STATUS_PURCHASING:

45− self->m_purchasing = true;

45+ self->setPurchasing(true);

4646 break;

4747 case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:

48− if (self->m_purchasing) {

49− self->m_purchasing = false;

48+ if (self->purchasing()) {

49+ self->setPurchasing(false);

5050 Q_EMIT self->purchaseCancelled();

5151 }

5252 break;

@@ -56,7 +56,8 @@ static void observer(PayPackage* /* package */, const char* itemid, PayPackageIt

5656}

5757

5858Payments::Payments(QObject *parent)

59− : QObject(parent)

59+ : QObject(parent),

60+ m_purchasing(false)

6061{

6162 m_package = pay_package_new("click-scope");

6263 pay_package_item_observer_install(m_package, observer, this);

@@ -89,6 +90,11 @@ QString Payments::formattedPrice() const

8990 return locale.toCurrencyString(m_price, m_currency);

9091}

9192

93+bool Payments::purchasing() const

94+{

95+ return m_purchasing;

96+}

97+

9298void Payments::setCurrency(const QString &currency)

9399{

94100 if(m_currency != currency) {

@@ -121,6 +127,11 @@ void Payments::setStoreItemId(const QString &store_item_id)

121127 pay_package_item_start_verification(m_package, m_store_item_id.toLocal8Bit().data());

122128}

123129

130+void Payments::setPurchasing(bool is_purchasing)

131+{

132+ m_purchasing = is_purchasing;

133+}

134+

124135void Payments::start()

125136{

126137 pay_package_item_start_purchase(m_package, m_store_item_id.toLocal8Bit().data());

plugins/Ubuntu/Payments/Payments.h+3−3

@@ -39,10 +39,12 @@ public:

3939 double price() const;

4040 QString storeItemId() const;

4141 QString formattedPrice() const;

42+ bool purchasing() const;

4243

4344 void setCurrency(const QString& currency);

4445 void setPrice(const double price);

4546 void setStoreItemId(const QString& store_item_id);

47+ void setPurchasing(bool is_purchasing);

4648 Q_INVOKABLE void start();

4749

4850Q_SIGNALS:

@@ -55,13 +57,11 @@ Q_SIGNALS:

5557 void purchaseCompleted();

5658 void purchaseCancelled();

5759

58−public:

59− bool m_purchasing = false;

60−

6160private:

6261 QString m_currency;

6362 double m_price;

6463 QString m_store_item_id;

64+ bool m_purchasing;

6565

6666 PayPackage *m_package;

6767};