diff --git a/src/addressbook.h b/src/addressbook.h index f1c2109..9a5672e 100644 --- a/src/addressbook.h +++ b/src/addressbook.h @@ -11,6 +11,8 @@ class MainWindow; class AddressBookModel : public QAbstractTableModel { + Q_OBJECT + public: AddressBookModel(QTableView* parent); ~AddressBookModel(); diff --git a/src/balancestablemodel.h b/src/balancestablemodel.h index c8cffa8..ee1e70f 100644 --- a/src/balancestablemodel.h +++ b/src/balancestablemodel.h @@ -8,8 +8,10 @@ #include "camount.h" -class BalancesTableModel : public QAbstractTableModel -{ +class BalancesTableModel : public QAbstractTableModel { + + Q_OBJECT + public: BalancesTableModel(QObject* parent); ~BalancesTableModel(); diff --git a/src/controller.cpp b/src/controller.cpp index 413c2ec..61660cd 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -1444,8 +1444,8 @@ void Controller::unlockIfEncrypted(std::function cb, std::functiontr("Wallet Password"), - main->tr("Your wallet is encrypted.\nPlease enter your wallet password"), + QObject::tr("Wallet Password"), + QObject::tr("Your wallet is encrypted.\nPlease enter your wallet password"), QLineEdit::Password ); @@ -1453,8 +1453,8 @@ void Controller::unlockIfEncrypted(std::function cb, std::functiontr("Wallet Decryption Failed"), - main->tr("Please enter a valid password"), + QObject::tr("Wallet Decryption Failed"), + QObject::tr("Please enter a valid password"), QMessageBox::Ok ); error(); @@ -1473,7 +1473,7 @@ void Controller::unlockIfEncrypted(std::function cb, std::functiontr("Wallet Decryption Failed"), + QObject::tr("Wallet Decryption Failed"), QString::fromStdString(reply["error"].get()), QMessageBox::Ok ); @@ -1543,7 +1543,7 @@ void Controller::executeTransaction(Tx tx, error("", errStr); }); }, [=]() { - error("", main->tr("Failed to unlock wallet")); + error("", QObject::tr("Failed to unlock wallet")); }); } diff --git a/src/firsttimewizard.h b/src/firsttimewizard.h index a04dd28..994b602 100644 --- a/src/firsttimewizard.h +++ b/src/firsttimewizard.h @@ -51,6 +51,8 @@ private: class NewOrRestorePage: public QWizardPage { + Q_OBJECT + public: NewOrRestorePage(FirstTimeWizard* parent); @@ -65,6 +67,9 @@ private: class NewSeedPage: public QWizardPage { + + Q_OBJECT + public: NewSeedPage(FirstTimeWizard* parent); @@ -80,6 +85,9 @@ private: class RestoreSeedPage: public QWizardPage { + + Q_OBJECT + public: RestoreSeedPage(FirstTimeWizard* parent); diff --git a/src/memoedit.h b/src/memoedit.h index 502f8ef..9d4e310 100644 --- a/src/memoedit.h +++ b/src/memoedit.h @@ -5,8 +5,10 @@ #include "precompiled.h" -class MemoEdit : public QPlainTextEdit -{ +class MemoEdit : public QPlainTextEdit { + + Q_OBJECT + public: MemoEdit(QWidget* parent); diff --git a/src/recurring.h b/src/recurring.h index 5f24fef..2f27f45 100644 --- a/src/recurring.h +++ b/src/recurring.h @@ -121,6 +121,8 @@ private: // Model for list of configured recurring payments class RecurringListViewModel : public QAbstractTableModel { + Q_OBJECT + public: RecurringListViewModel(QTableView* parent); ~RecurringListViewModel() = default; @@ -138,6 +140,8 @@ private: // Model for history of payments class RecurringPaymentsListViewModel : public QAbstractTableModel { + Q_OBJECT + public: RecurringPaymentsListViewModel(QTableView* parent, RecurringPaymentInfo rpi); ~RecurringPaymentsListViewModel() = default; diff --git a/src/viewalladdresses.h b/src/viewalladdresses.h index 942b2d6..cafc47e 100644 --- a/src/viewalladdresses.h +++ b/src/viewalladdresses.h @@ -8,6 +8,8 @@ class ViewAllAddressesModel : public QAbstractTableModel { + Q_OBJECT + public: ViewAllAddressesModel(QTableView* parent, QList taddrs, Controller* rpc); ~ViewAllAddressesModel() = default;