Diffstat (limited to 'noncore/net/opieirc/ircservereditor.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opieirc/ircservereditor.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp index 1fda868..e5c9ab5 100644 --- a/noncore/net/opieirc/ircservereditor.cpp +++ b/noncore/net/opieirc/ircservereditor.cpp | |||
@@ -1,7 +1,8 @@ | |||
1 | #include "ircservereditor.h" | 1 | #include "ircservereditor.h" |
2 | #include "ircchannel.h" | ||
2 | 3 | ||
3 | /* OPIE */ | 4 | /* OPIE */ |
4 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
5 | 6 | ||
6 | /* QT */ | 7 | /* QT */ |
7 | #include <qmessagebox.h> | 8 | #include <qmessagebox.h> |
@@ -66,14 +67,16 @@ void IRCServerEditor::accept() { | |||
66 | // QMessageBox::critical(this, tr("Error"), tr("Realname required")); | 67 | // QMessageBox::critical(this, tr("Error"), tr("Realname required")); |
67 | else { | 68 | else { |
68 | /* Now verify whether the channel list has a valid format */ | 69 | /* Now verify whether the channel list has a valid format */ |
69 | QStringList channels = QStringList::split(QChar(','), m_channels->text()); | 70 | QStringList channels = QStringList::split(QChar(','), m_channels->text()); |
70 | for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { | 71 | for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { |
71 | QString channelName = (*it).stripWhiteSpace(); | 72 | QString channelName = (*it).stripWhiteSpace(); |
72 | if (!channelName.startsWith("#") && !channelName.startsWith("+")) { | 73 | if (!IRCChannel::isValid(channelName)) { |
73 | QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with either '#' or '+'")); | 74 | QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma " |
75 | "separated list of valid\n channel names (starting \n" | ||
76 | "with one of '#' '+' '&' '!'")); | ||
74 | return; | 77 | return; |
75 | } | 78 | } |
76 | } | 79 | } |
77 | QDialog::accept(); | 80 | QDialog::accept(); |
78 | } | 81 | } |
79 | } | 82 | } |