diff options
| author | kh1 <qt-info@nokia.com> | 2010-03-29 14:08:55 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2010-03-30 17:51:39 +0200 |
| commit | 8b918737a8146d678cda16b02765d15567b7213d (patch) | |
| tree | 06f4c3851179018966b99939acc0fddec701c310 /src/shared/help/topicchooser.cpp | |
| parent | 89d20924c805a9acd04d0a2c8786132ed55b05f4 (diff) | |
Adapt changes from Assistant.
Diffstat (limited to 'src/shared/help/topicchooser.cpp')
| -rw-r--r-- | src/shared/help/topicchooser.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp index 031b6533eaf..1b036df1f37 100644 --- a/src/shared/help/topicchooser.cpp +++ b/src/shared/help/topicchooser.cpp @@ -32,30 +32,27 @@ #include "topicchooser.h" -QT_BEGIN_NAMESPACE - TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, - const QMap<QString, QUrl> &links) + const QMap<QString, QUrl> &links) : QDialog(parent) { ui.setupUi(this); ui.label->setText(tr("Choose a topic for <b>%1</b>:").arg(keyword)); - m_links = links; - QMap<QString, QUrl>::const_iterator it = m_links.constBegin(); - for (; it != m_links.constEnd(); ++it) + QMap<QString, QUrl>::const_iterator it = links.constBegin(); + for (; it != links.constEnd(); ++it) { + m_links.append(it.value()); ui.listWidget->addItem(it.key()); - + } + if (ui.listWidget->count() != 0) ui.listWidget->setCurrentRow(0); ui.listWidget->setFocus(); - connect(ui.buttonDisplay, SIGNAL(clicked()), - this, SLOT(accept())); - connect(ui.buttonCancel, SIGNAL(clicked()), - this, SLOT(reject())); - connect(ui.listWidget, SIGNAL(itemActivated(QListWidgetItem*)), - this, SLOT(accept())); + connect(ui.buttonDisplay, SIGNAL(clicked()), this, SLOT(accept())); + connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(ui.listWidget, SIGNAL(itemActivated(QListWidgetItem*)), this, + SLOT(accept())); } QUrl TopicChooser::link() const @@ -64,11 +61,10 @@ QUrl TopicChooser::link() const if (!item) return QUrl(); - QString title = item->text(); - if (title.isEmpty() || !m_links.contains(title)) + if (item->text().isEmpty()) return QUrl(); - return m_links.value(title); + const int row = ui.listWidget->row(item); + Q_ASSERT(row < m_links.count()); + return m_links.at(row); } - -QT_END_NAMESPACE |