Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-05-07 18:45:47 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-05-07 18:45:47 (GMT) |
| commit | 203ca1c122db89c4a9f9f01bff2cadb3b9daca04 (patch) | |
| tree | e57d7f5997aad1832146d2806418b184e1dfe6bb /Swift/QtUI/QtBookmarkDetailWindow.cpp | |
| parent | 61620db053088fac637799b27f04efa44d0bcc6b (diff) | |
| download | swift-contrib-203ca1c122db89c4a9f9f01bff2cadb3b9daca04.zip swift-contrib-203ca1c122db89c4a9f9f01bff2cadb3b9daca04.tar.bz2 | |
Cleaned up MUC code.
Diffstat (limited to 'Swift/QtUI/QtBookmarkDetailWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtBookmarkDetailWindow.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Swift/QtUI/QtBookmarkDetailWindow.cpp b/Swift/QtUI/QtBookmarkDetailWindow.cpp index b27ed7c..d83e2eb 100644 --- a/Swift/QtUI/QtBookmarkDetailWindow.cpp +++ b/Swift/QtUI/QtBookmarkDetailWindow.cpp @@ -23,30 +23,29 @@ void QtBookmarkDetailWindow::accept() { } } -boost::shared_ptr<MUCBookmark> QtBookmarkDetailWindow::createBookmarkFromForm() { +boost::optional<MUCBookmark> QtBookmarkDetailWindow::createBookmarkFromForm() { //check room //check bookmarkName JID room(Q2PSTRING(room_->text())); if (!room.isValid() || room.getNode().isEmpty() || !room.getResource().isEmpty()) { QMessageBox::warning(this, "Bookmark not valid", "You must specify a valid room address (e.g. myroom@chats.example.com)."); - return boost::shared_ptr<MUCBookmark>(); + return boost::optional<MUCBookmark>(); } String name(Q2PSTRING(name_->text())); if (name.isEmpty()) { name = room.toString(); } + MUCBookmark bookmark(room, name); String nick(Q2PSTRING(nick_->text())); String password(Q2PSTRING(password_->text())); - bool autojoin = autojoin_->isChecked(); - boost::shared_ptr<MUCBookmark> bookmark(new MUCBookmark(room, name)); + bookmark.setAutojoin(autojoin_->isChecked()); if (!nick.isEmpty()) { - bookmark->setNick(nick); + bookmark.setNick(nick); } if (!password.isEmpty()) { - bookmark->setPassword(password); + bookmark.setPassword(password); } - bookmark->setAutojoin(autojoin); return bookmark; } |