X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.cpp;h=9d885e0e79ded3c2aea524b7fd2cb31aa8838233;hp=ea7e3ee9dea878be2ba286b690618a00b6287aac;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=0a43227b8cd44625f4881cc1545d42c8c8a4876c

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index ea7e3ee9..9d885e0e 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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  *
@@ -42,7 +42,6 @@
 #  include <Security.h>
 #endif
 
-INIT_SYNCABLE_OBJECT(Identity)
 Identity::Identity(IdentityId id, QObject *parent)
     : SyncableObject(parent),
     _identityId(id)
@@ -136,7 +135,7 @@ QString Identity::defaultNick()
 #endif
 
     // cleaning forbidden characters from nick
-    QRegExp rx(QString("(^[\\d-]+|[^A-Za-z0-9\x5b-\x60\x7b-\x7d])"));
+    QRegExp rx(QString("(^[\\d-]+|[^A-Za-z0-9\x5b-\x60\x7b-\x7d])"));  // NOLINT(modernize-raw-string-literal)
     nick.remove(rx);
     return nick;
 }
@@ -191,8 +190,8 @@ void Identity::setToDefaults()
     setDetachAwayReasonEnabled(false);
     setIdent("quassel");
     setKickReason(tr("Kindergarten is elsewhere!"));
-    setPartReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere."));
-    setQuitReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere."));
+    setPartReason(tr("https://quassel-irc.org - Chat comfortably. Anywhere."));
+    setQuitReason(tr("https://quassel-irc.org - Chat comfortably. Anywhere."));
 }
 
 
@@ -389,8 +388,3 @@ QDataStream &operator>>(QDataStream &in, Identity &id)
     id.fromVariantMap(i);
     return in;
 }
-
-
-#ifdef HAVE_SSL
-INIT_SYNCABLE_OBJECT(CertManager)
-#endif // HAVE_SSL