/***************************************************************************
- * Copyright (C) 2005-2015 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 *
_joinTimer.setSingleShot(true);
_quitTimer.setSingleShot(true);
- connect(&_discardTimer, SIGNAL(timeout()), this, SIGNAL(finished()));
+ connect(&_discardTimer, &QTimer::timeout, this, &Netsplit::finished);
- connect(&_joinTimer, SIGNAL(timeout()), this, SLOT(joinTimeout()));
- connect(&_quitTimer, SIGNAL(timeout()), this, SLOT(quitTimeout()));
+ connect(&_joinTimer, &QTimer::timeout, this, &Netsplit::joinTimeout);
+ connect(&_quitTimer, &QTimer::timeout, this, &Netsplit::quitTimeout);
// wait for a maximum of 1 hour until we discard the netsplit
_discardTimer.start(3600000);
// now test if message consists only of two dns names as the RFC requests
// but also allow the commonly used "*.net *.split"
- QRegExp hostRx("^(?:[\\w\\d-.]+|\\*)\\.[\\w\\d-]+\\s(?:[\\w\\d-.]+|\\*)\\.[\\w\\d-]+$");
+ QRegExp hostRx(R"(^(?:[\w\d-.]+|\*)\.[\w\d-]+\s(?:[\w\d-.]+|\*)\.[\w\d-]+$)");
if (hostRx.exactMatch(quitMessage))
return true;