X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=1098b0a33c14e9294c14fd51e48d8662204d47ae;hp=58171fe00391889c5e43d329a99936f1cb6aa97f;hb=1514aaae673660c7a3e2a82545b8c3947ea3f9b7;hpb=692a66647075e54be6d78e44ae5d7eb00d403d98 diff --git a/src/common/network.cpp b/src/common/network.cpp index 58171fe0..1098b0a3 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -684,16 +684,16 @@ void Network::emitConnectionError(const QString &errorMsg) { // ==================== void Network::determinePrefixes() { // seems like we have to construct them first - QString PREFIX = support("PREFIX"); + QString prefix = support("PREFIX"); - if(PREFIX.startsWith("(") && PREFIX.contains(")")) { - _prefixes = PREFIX.section(")", 1); - _prefixModes = PREFIX.mid(1).section(")", 0, 0); + if(prefix.startsWith("(") && prefix.contains(")")) { + _prefixes = prefix.section(")", 1); + _prefixModes = prefix.mid(1).section(")", 0, 0); } else { QString defaultPrefixes("~&@%+"); QString defaultPrefixModes("qaohv"); - if(PREFIX.isEmpty()) { + if(prefix.isEmpty()) { _prefixes = defaultPrefixes; _prefixModes = defaultPrefixModes; return; @@ -701,7 +701,7 @@ void Network::determinePrefixes() { // we just assume that in PREFIX are only prefix chars stored for(int i = 0; i < defaultPrefixes.size(); i++) { - if(PREFIX.contains(defaultPrefixes[i])) { + if(prefix.contains(defaultPrefixes[i])) { _prefixes += defaultPrefixes[i]; _prefixModes += defaultPrefixModes[i]; } @@ -713,7 +713,7 @@ void Network::determinePrefixes() { // well... our assumption was obviously wrong... // check if it's only prefix modes for(int i = 0; i < defaultPrefixes.size(); i++) { - if(PREFIX.contains(defaultPrefixModes[i])) { + if(prefix.contains(defaultPrefixModes[i])) { _prefixes += defaultPrefixes[i]; _prefixModes += defaultPrefixModes[i]; }