refs #199, cleaned up contexts a bit after rebasing to current master

* friend CRuntime on top
* fixed some public constructors (made protected)
* Also made registerWithDBus protected
* Fixed some copy/paste issues in getIContextXXX
* Reordered private/public sections

src/blackcore/context_settings_impl.h

@@ -24,15 +24,12 @@ namespace BlackCore
     {
         Q_OBJECT
         Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSETTINGS_INTERFACENAME)
+        friend class CRuntime;
 
     protected:
         //! \brief Constructor
         CContextSettings(CRuntimeConfig::ContextMode mode, CRuntime *runtime = nullptr);
 
-    public:
-        //! Destructor
-        virtual ~CContextSettings() {}
-
         //! \brief Register myself in DBus
         CContextSettings *registerWithDBus(CDBusServer *server)
         {
@@ -40,6 +37,10 @@ namespace BlackCore
             return this;
         }
 
+    public:
+        //! Destructor
+        virtual ~CContextSettings() {}
+
         //! \brief settings file
         const QString &getSettingsDirectory() const { return BlackMisc::Settings::CSettingUtilities::getSettingsDirectory(); }
 
@@ -74,7 +75,6 @@ namespace BlackCore
         virtual QString getSettingsAsJsonString() const override;
 
     private:
-        friend class CRuntime;
         BlackMisc::Settings::CSettingsNetwork m_settingsNetwork;
         BlackMisc::Hardware::CKeyboardKeyList m_hotkeys;
         QJsonDocument toJsonDocument() const;