Diffstat (limited to 'noncore/net/opieirc/ircservereditor.cpp') (more/less context) (ignore 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,13 +1,14 @@ | |||
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> |
8 | #include <qlayout.h> | 9 | #include <qlayout.h> |
9 | #include <qlabel.h> | 10 | #include <qlabel.h> |
10 | #include <qwhatsthis.h> | 11 | #include <qwhatsthis.h> |
11 | 12 | ||
12 | IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) { | 13 | IRCServerEditor::IRCServerEditor(IRCServer server, QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) { |
13 | QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 5); | 14 | QGridLayout *layout = new QGridLayout(this, 7, 2, 5, 5); |
@@ -60,26 +61,28 @@ void IRCServerEditor::accept() { | |||
60 | QMessageBox::critical(this, tr("Error"), tr("Host name required")); | 61 | QMessageBox::critical(this, tr("Error"), tr("Host name required")); |
61 | //else if (m_port->text().toInt()<=0) | 62 | //else if (m_port->text().toInt()<=0) |
62 | // QMessageBox::critical(this, tr("Error"), tr("Port required")); | 63 | // QMessageBox::critical(this, tr("Error"), tr("Port required")); |
63 | else if (m_nickname->text().length()==0) | 64 | else if (m_nickname->text().length()==0) |
64 | QMessageBox::critical(this, tr("Error"), tr("Nickname required")); | 65 | QMessageBox::critical(this, tr("Error"), tr("Nickname required")); |
65 | //else if (m_realname->text().length()==0) | 66 | //else if (m_realname->text().length()==0) |
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 | } |
80 | 83 | ||
81 | IRCServer IRCServerEditor::getServer() { | 84 | IRCServer IRCServerEditor::getServer() { |
82 | IRCServer server; | 85 | IRCServer server; |
83 | server.setName(m_name->text()); | 86 | server.setName(m_name->text()); |
84 | server.setHostname(m_hostname->text()); | 87 | server.setHostname(m_hostname->text()); |
85 | server.setPort(m_port->text().toInt()); | 88 | server.setPort(m_port->text().toInt()); |