clang-tidy: Reorder NetworkMO attributes to avoid excessive padding

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

diff --git a/src/core/core.h b/src/core/core.h
index 7da4f22..8d02d9e 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -40,12 +40,12 @@
 #include "authenticator.h"
 #include "bufferinfo.h"
 #include "deferredptr.h"
+#include "identserver.h"
 #include "message.h"
 #include "oidentdconfiggenerator.h"
 #include "sessionthread.h"
 #include "storage.h"
 #include "types.h"
-#include "identserver.h"
 
 class CoreAuthHandler;
 class CoreSession;
@@ -68,6 +68,8 @@ public:
     Core();
     ~Core() override;
 
+    void init();
+
     /*** Storage access ***/
     // These methods are threadsafe.
 
@@ -554,13 +556,6 @@ public:
         return instance()->_storage->setBufferLastSeenMsg(user, bufferId, msgId);
     }
 
-    //! Get the auth username associated with a userId
-    /** \param user  The user to retrieve the username for
-     *  \return      The username for the user
-     */
-    static inline QString getAuthUserName(UserId user) {
-        return instance()->_storage->getAuthUserName(user);
-    }
 
     //! Get a usable sysident for the given user in oidentd-strict mode
     /** \param user    The user to retrieve the sysident for
@@ -707,8 +702,11 @@ signals:
     //! Emitted when database schema upgrade starts or ends
     void dbUpgradeInProgress(bool inProgress);
 
+    //! Emitted when a fatal error was encountered during async initialization
+    void exitRequested(int exitCode, const QString &reason);
+
 public slots:
-    bool init();
+    void initAsync();
 
     /** Persist storage.
      *
@@ -807,7 +805,7 @@ private:
     QDateTime _startTime;
 
     IdentServer *_identServer {nullptr};
-    
+
     bool _initialized{false};
     bool _configured{false};