X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=698cd4c930b6fd3e52ba10236fe1f236567b3a9e;hp=80db0d0e07996f0dc4aa1d17c210bfb433c27315;hb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h index 80db0d0e..698cd4c9 100644 --- a/src/core/coreidentity.h +++ b/src/core/coreidentity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef COREIDENTITY_H -#define COREIDENTITY_H +#pragma once #include "identity.h" @@ -37,8 +36,7 @@ class SignalProxy; class CoreIdentity; class CoreCertManager : public CertManager { - SYNCABLE_OBJECT - Q_OBJECT + Q_OBJECT public: CoreCertManager(CoreIdentity &identity); @@ -66,8 +64,7 @@ private: // ========================================= class CoreIdentity : public Identity { - SYNCABLE_OBJECT - Q_OBJECT + Q_OBJECT public: CoreIdentity(IdentityId id, QObject *parent = 0); @@ -109,7 +106,4 @@ inline const QSslCertificate &CoreCertManager::sslCert() const return identity.sslCert(); } - #endif - -#endif //COREIDENTITY_H