From 9fc231b65771cde57595a548140a724a829df90b Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 7 Jan 2018 03:02:13 +0100
Subject: [PATCH] Ref T219, changed CForm so it can be used with/without DB
 User

---
 src/blackgui/editors/form.cpp | 28 ++++++++++++++----------
 src/blackgui/editors/form.h   | 40 +++++++++++++++++++++++------------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/src/blackgui/editors/form.cpp b/src/blackgui/editors/form.cpp
index 911f318cc..a8c3271d2 100644
--- a/src/blackgui/editors/form.cpp
+++ b/src/blackgui/editors/form.cpp
@@ -35,27 +35,33 @@ namespace BlackGui
             return CStatusMessageList();
         }
 
-        CAuthenticatedUser CForm::getSwiftDbUser() const
-        {
-            return this->m_swiftDbUser.get();
-        }
-
         void CForm::jsonPasted(const QString &json)
         {
             Q_UNUSED(json);
         }
 
-        void CForm::ps_userChanged()
-        {
-            // void
-        }
-
-        void CForm::ps_pasted()
+        void CForm::pasted()
         {
             if (!QApplication::clipboard()) { return; }
             const QString data = QApplication::clipboard()->text();
             if (!Json::looksLikeSwiftJson(data)) { return; }
             this->jsonPasted(data);
         }
+
+        CFormDbUser::CFormDbUser(QWidget *parent) : CForm(parent)
+        { }
+
+        CFormDbUser::~CFormDbUser()
+        { }
+
+        CAuthenticatedUser CFormDbUser::getSwiftDbUser() const
+        {
+            return m_swiftDbUser.get();
+        }
+
+        void CFormDbUser::userChanged()
+        {
+            // void
+        }
     } // ns
 } // ns
diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h
index da27e7128..1a8bf2fe9 100644
--- a/src/blackgui/editors/form.h
+++ b/src/blackgui/editors/form.h
@@ -26,9 +26,7 @@ namespace BlackGui
 {
     namespace Editors
     {
-        /*!
-         * Form base class
-         */
+        //! Form base class
         class BLACKGUI_EXPORT CForm : public COverlayMessagesFrame
         {
             Q_OBJECT
@@ -53,23 +51,37 @@ namespace BlackGui
             //! Is read only?
             bool isReadOnly() const { return m_readOnly; }
 
-            //! Authenticated DB user
-            BlackMisc::Network::CAuthenticatedUser getSwiftDbUser() const;
-
         protected:
             //! JSON string has been pasted
             //! \remark The JSON string has been pre-checked
             virtual void jsonPasted(const QString &json);
 
-            bool m_readOnly = false; //!< read only
-            BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser {this, &CForm::ps_userChanged}; //!< authenticated user
-
-        protected slots:
-            //! User has been changed
-            virtual void ps_userChanged();
-
             //! Pasted from clipboard
-            void ps_pasted();
+            void pasted();
+
+            bool m_readOnly = false; //!< read only
+        };
+
+        //! Form base class
+        class BLACKGUI_EXPORT CFormDbUser : public CForm
+        {
+            Q_OBJECT
+
+        public:
+            //! Constructor
+            explicit CFormDbUser(QWidget *parent = nullptr);
+
+            //! Destructor
+            virtual ~CFormDbUser();
+
+            //! Authenticated DB user
+            BlackMisc::Network::CAuthenticatedUser getSwiftDbUser() const;
+
+        protected:
+            //! User has been changed
+            virtual void userChanged();
+
+            BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser {this, &CFormDbUser::userChanged}; //!< authenticated user
         };
     } // ns
 } // ns