From 5a389cf1cf9300b088205792d2af757c4a29e90c Mon Sep 17 00:00:00 2001 From: onryo Date: Fri, 24 Feb 2023 09:41:58 +0100 Subject: [PATCH] Revert "Add Q_OBJECT macros" This reverts commit c50588713a636d21aeaa754905b14f5cdc9e528e. --- src/addressbook.h | 2 -- src/balancestablemodel.h | 6 ++---- src/controller.h | 6 ++---- src/firsttimewizard.h | 11 ++--------- src/memoedit.h | 6 ++---- src/recurring.h | 4 ---- src/viewalladdresses.h | 2 -- 7 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/addressbook.h b/src/addressbook.h index 9a5672e..f1c2109 100644 --- a/src/addressbook.h +++ b/src/addressbook.h @@ -11,8 +11,6 @@ class MainWindow; class AddressBookModel : public QAbstractTableModel { - Q_OBJECT - public: AddressBookModel(QTableView* parent); ~AddressBookModel(); diff --git a/src/balancestablemodel.h b/src/balancestablemodel.h index ee1e70f..c8cffa8 100644 --- a/src/balancestablemodel.h +++ b/src/balancestablemodel.h @@ -8,10 +8,8 @@ #include "camount.h" -class BalancesTableModel : public QAbstractTableModel { - - Q_OBJECT - +class BalancesTableModel : public QAbstractTableModel +{ public: BalancesTableModel(QObject* parent); ~BalancesTableModel(); diff --git a/src/controller.h b/src/controller.h index 855fe5e..a079bec 100644 --- a/src/controller.h +++ b/src/controller.h @@ -29,10 +29,8 @@ struct WatchedTx { }; -class Controller { - - Q_OBJECT - +class Controller +{ public: Controller(MainWindow* main); ~Controller(); diff --git a/src/firsttimewizard.h b/src/firsttimewizard.h index 7652105..a04dd28 100644 --- a/src/firsttimewizard.h +++ b/src/firsttimewizard.h @@ -9,7 +9,8 @@ #include "ui_newwallet.h" #include "mainwindow.h" -class FirstTimeWizard: public QWizard { +class FirstTimeWizard: public QWizard +{ Q_OBJECT @@ -50,8 +51,6 @@ private: class NewOrRestorePage: public QWizardPage { - Q_OBJECT - public: NewOrRestorePage(FirstTimeWizard* parent); @@ -66,9 +65,6 @@ private: class NewSeedPage: public QWizardPage { - - Q_OBJECT - public: NewSeedPage(FirstTimeWizard* parent); @@ -84,9 +80,6 @@ private: class RestoreSeedPage: public QWizardPage { - - Q_OBJECT - public: RestoreSeedPage(FirstTimeWizard* parent); diff --git a/src/memoedit.h b/src/memoedit.h index 9d4e310..502f8ef 100644 --- a/src/memoedit.h +++ b/src/memoedit.h @@ -5,10 +5,8 @@ #include "precompiled.h" -class MemoEdit : public QPlainTextEdit { - - Q_OBJECT - +class MemoEdit : public QPlainTextEdit +{ public: MemoEdit(QWidget* parent); diff --git a/src/recurring.h b/src/recurring.h index 2f27f45..5f24fef 100644 --- a/src/recurring.h +++ b/src/recurring.h @@ -121,8 +121,6 @@ private: // Model for list of configured recurring payments class RecurringListViewModel : public QAbstractTableModel { - Q_OBJECT - public: RecurringListViewModel(QTableView* parent); ~RecurringListViewModel() = default; @@ -140,8 +138,6 @@ 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 cafc47e..942b2d6 100644 --- a/src/viewalladdresses.h +++ b/src/viewalladdresses.h @@ -8,8 +8,6 @@ class ViewAllAddressesModel : public QAbstractTableModel { - Q_OBJECT - public: ViewAllAddressesModel(QTableView* parent, QList taddrs, Controller* rpc); ~ViewAllAddressesModel() = default;