common: Make the Quassel class a proper singleton, clean up

[quassel.git] / src / core / coreapplication.h

diff --git a/src/core/coreapplication.h b/src/core/coreapplication.h
index b350d52..4c72b6b 100644 (file)
--- a/src/core/coreapplication.h
+++ b/src/core/coreapplication.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREAPPLICATION_H_
-#define COREAPPLICATION_H_
+#pragma once
 
 #include <QCoreApplication>
 
@@ -38,21 +37,12 @@ public:
 
     bool init();
 
-    /**
-     * Requests a reload of relevant runtime configuration.
-     *
-     * In particular, signals to the Core to reload SSL certificates.
-     *
-     * @return True if configuration reload successful, otherwise false
-     */
-    bool reloadConfig();
-
 private:
     bool _coreCreated;
 };
 
 
-class CoreApplication : public QCoreApplication, public Quassel
+class CoreApplication : public QCoreApplication
 {
     Q_OBJECT
 public:
@@ -61,18 +51,6 @@ public:
 
     bool init();
 
-    /**
-     * Requests a reload of relevant runtime configuration.
-     *
-     * @see Quassel::reloadConfig()
-     *
-     * @return True if configuration reload successful, otherwise false
-     */
-    bool reloadConfig();
-
 private:
     CoreApplicationInternal *_internal;
 };
-
-
-#endif