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

diff --git a/src/common/identity.cpp b/src/common/identity.cpp
index b7181106..9d885e0e 100644
--- a/src/common/identity.cpp
+++ b/src/common/identity.cpp
@@ -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  *
@@ -35,14 +35,13 @@
 #  include <unistd.h>
 #endif
 
-#ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN
 #  include <windows.h>
 #  include <Winbase.h>
 #  define SECURITY_WIN32
 #  include <Security.h>
 #endif
 
-INIT_SYNCABLE_OBJECT(Identity)
 Identity::Identity(IdentityId id, QObject *parent)
     : SyncableObject(parent),
     _identityId(id)
@@ -78,7 +77,7 @@ Identity::Identity(const Identity &other, QObject *parent)
 }
 
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 #ifdef UNICODE
 QString tcharToQString(TCHAR *tchar)
 {
@@ -120,7 +119,7 @@ QString Identity::defaultNick()
     if (!userName.isEmpty())
         nick = userName;
 
-#elif defined(Q_OS_WIN32)
+#elif defined(Q_OS_WIN)
     TCHAR infoBuf[128];
     DWORD bufCharCount = 128;
     //if(GetUserNameEx(/* NameSamCompatible */ 1, infoBuf, &bufCharCount))
@@ -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;
 }
@@ -159,7 +158,7 @@ QString Identity::defaultRealName()
     else
         return generalDefault;
 
-#elif defined(Q_OS_WIN32)
+#elif defined(Q_OS_WIN)
     TCHAR infoBuf[128];
     DWORD bufCharCount = 128;
     if (GetUserName(infoBuf, &bufCharCount))
@@ -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