projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
identd: Remove unneeded strict attribute
[quassel.git]
/
src
/
core
/
oidentdconfiggenerator.cpp
diff --git
a/src/core/oidentdconfiggenerator.cpp
b/src/core/oidentdconfiggenerator.cpp
index
bd4350d
..
c1bd71a
100644
(file)
--- a/
src/core/oidentdconfiggenerator.cpp
+++ b/
src/core/oidentdconfiggenerator.cpp
@@
-23,10
+23,9
@@
#include "corenetwork.h"
#include "oidentdconfiggenerator.h"
#include "corenetwork.h"
#include "oidentdconfiggenerator.h"
-OidentdConfigGenerator::OidentdConfigGenerator(
bool strict,
QObject *parent) :
+OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) :
QObject(parent),
QObject(parent),
- _initialized(false),
- _strict(strict)
+ _initialized(false)
{
if (!_initialized)
init();
{
if (!_initialized)
init();
@@
-71,11
+70,9
@@
bool OidentdConfigGenerator::init()
QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity) const {
QString OidentdConfigGenerator::sysIdentForIdentity(const CoreIdentity *identity) const {
- if (!_strict) {
- return identity->ident();
- }
+ // Make sure the identity's ident complies with strict mode if enabled
const CoreNetwork *network = qobject_cast<CoreNetwork *>(sender());
const CoreNetwork *network = qobject_cast<CoreNetwork *>(sender());
- return network->coreSession()->strict
Sysident(
);
+ return network->coreSession()->strict
CompliantIdent(identity
);
}
}