Project

General

Profile

enable_bang_channels_in_chatmonitor.diff

admin, 07/08/2008 01:46 AM

View differences:

src/common/util.cpp
27 27
class QMetaMethod;
28 28

  
29 29
QString nickFromMask(QString mask) {
30
  return mask.section('!', 0, 0);
30
    if (mask.count("!") > 1) {
31
        return mask.section('!', 0, 1);
32
    }
33
    else {
34
        return mask.section('!', 0, 0);
35
    }
31 36
}
32 37

  
33 38
QString userFromMask(QString mask) {
34
  QString userhost = mask.section('!', 1);
39
  QString userhost;
40
  if (mask.count("!") > 1) {
41
    userhost = mask.section('!', 2);
42
  }
43
  else {
44
    userhost = mask.section('!', 1);
45
  }
35 46
  if(userhost.isEmpty()) return QString();
36 47
  return userhost.section('@', 0, 0);
37 48
}
38 49

  
39 50
QString hostFromMask(QString mask) {
40
  QString userhost = mask.section('!', 1);
51
  QString userhost;
52
  if (mask.count("!") > 1) {
53
    userhost = mask.section('!', 2);
54
  }
55
  else {
56
    userhost = mask.section('!', 1);
57
  }
41 58
  if(userhost.isEmpty()) return QString();
42 59
  return userhost.section('@', 1);
43 60
}