From 1ec5e0911c8cef7119df6a85de5d35de329ec5e4 Mon Sep 17 00:00:00 2001
From: onryo <onryo@hush.land>
Date: Fri, 24 Feb 2023 09:05:04 +0100
Subject: [PATCH] Revert "fix 53"

This reverts commit a95eb475c7bebe0d4bc324074e1e0f15a8aa1bca.
---
 src/addressbook.h        |  2 --
 src/balancestablemodel.h |  6 ++----
 src/controller.cpp       | 12 ++++++------
 src/firsttimewizard.h    |  8 --------
 src/memoedit.h           |  6 ++----
 src/recurring.h          |  4 ----
 src/viewalladdresses.h   |  2 --
 7 files changed, 10 insertions(+), 30 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.cpp b/src/controller.cpp
index 159362d..413c2ec 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1444,8 +1444,8 @@ void Controller::unlockIfEncrypted(std::function<void(void)> cb, std::function<v
         // Wallet is encrypted and locked. Ask for the password and unlock.
         QString password = QInputDialog::getText(
             main, 
-            main->QObject::tr("Wallet Password"), 
-            main->QObject::tr("Your wallet is encrypted.\nPlease enter your wallet password"), 
+            main->tr("Wallet Password"), 
+            main->tr("Your wallet is encrypted.\nPlease enter your wallet password"), 
             QLineEdit::Password
         );
 
@@ -1453,8 +1453,8 @@ void Controller::unlockIfEncrypted(std::function<void(void)> cb, std::function<v
         {
             QMessageBox::critical(
                 main, 
-                main->QObject::tr("Wallet Decryption Failed"),
-                main->QObject::tr("Please enter a valid password"),
+                main->tr("Wallet Decryption Failed"),
+                main->tr("Please enter a valid password"),
                 QMessageBox::Ok
             );
             error();
@@ -1473,7 +1473,7 @@ void Controller::unlockIfEncrypted(std::function<void(void)> cb, std::function<v
             {
                 QMessageBox::critical(
                     main, 
-                    main->QObject::tr("Wallet Decryption Failed"),
+                    main->tr("Wallet Decryption Failed"),
                     QString::fromStdString(reply["error"].get<json::string_t>()),
                     QMessageBox::Ok
                 );
@@ -1543,7 +1543,7 @@ void Controller::executeTransaction(Tx tx,
             error("", errStr);
         });
     }, [=]() {
-        error("", main->QObject::tr("Failed to unlock wallet"));
+        error("", main->tr("Failed to unlock wallet"));
     });
 }
 
diff --git a/src/firsttimewizard.h b/src/firsttimewizard.h
index 994b602..a04dd28 100644
--- a/src/firsttimewizard.h
+++ b/src/firsttimewizard.h
@@ -51,8 +51,6 @@ private:
 
 class NewOrRestorePage: public QWizardPage {
 
-	Q_OBJECT
-
 public:
  
     NewOrRestorePage(FirstTimeWizard* parent);
@@ -67,9 +65,6 @@ private:
 
 
 class NewSeedPage: public QWizardPage {
-
-	Q_OBJECT
-
 public:
     NewSeedPage(FirstTimeWizard* parent);
  
@@ -85,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<QString> taddrs, Controller* rpc);
     ~ViewAllAddressesModel() = default;