projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Remove old-style slot usage in NetworkModelController
[quassel.git]
/
src
/
common
/
identity.cpp
diff --git
a/src/common/identity.cpp
b/src/common/identity.cpp
index
c416a1d
..
9d885e0
100644
(file)
--- a/
src/common/identity.cpp
+++ b/
src/common/identity.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-42,7
+42,6
@@
# include <Security.h>
#endif
# include <Security.h>
#endif
-INIT_SYNCABLE_OBJECT(Identity)
Identity::Identity(IdentityId id, QObject *parent)
: SyncableObject(parent),
_identityId(id)
Identity::Identity(IdentityId id, QObject *parent)
: SyncableObject(parent),
_identityId(id)
@@
-136,7
+135,7
@@
QString Identity::defaultNick()
#endif
// cleaning forbidden characters from nick
#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;
}
nick.remove(rx);
return nick;
}
@@
-389,8
+388,3
@@
QDataStream &operator>>(QDataStream &in, Identity &id)
id.fromVariantMap(i);
return in;
}
id.fromVariantMap(i);
return in;
}
-
-
-#ifdef HAVE_SSL
-INIT_SYNCABLE_OBJECT(CertManager)
-#endif // HAVE_SSL