diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-04-13 09:48:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-04-14 07:02:23 +0000 |
| commit | 77160679943ef8a7ed2906766398449f37d38785 (patch) | |
| tree | b37cc1edd8b35aeec89d590090e85f2633ce59b1 /src/plugins/cpaster | |
| parent | 34cd28aac0c3ef0f2957b86c873f0dea60e5515a (diff) | |
PasteSelectDialog: Fix after refactoring
Don't compare int with QString - which even compiles with Qt 5 (but
luckily doesn't with Qt 6).
Amends 123133841e7d5645fb236ef8bb3a33fccad6d450
Change-Id: I347568c89658896a2e094610dbf1700ff84d81c5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpaster')
| -rw-r--r-- | src/plugins/cpaster/cpasterplugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cpaster/pasteselectdialog.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/cpaster/pasteselectdialog.h | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 6605e4240e..e30ca970a3 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -317,7 +317,7 @@ void CodePasterPluginPrivate::fetch() const QString pasteID = dialog.pasteId(); if (pasteID.isEmpty()) return; - Protocol *protocol = m_protocols[dialog.protocolIndex()]; + Protocol *protocol = m_protocols[dialog.protocol()]; if (Protocol::ensureConfiguration(protocol)) protocol->fetch(pasteID); } diff --git a/src/plugins/cpaster/pasteselectdialog.cpp b/src/plugins/cpaster/pasteselectdialog.cpp index ff4dbcb3dc..55a33ad570 100644 --- a/src/plugins/cpaster/pasteselectdialog.cpp +++ b/src/plugins/cpaster/pasteselectdialog.cpp @@ -89,15 +89,15 @@ int PasteSelectDialog::protocol() const return m_ui.protocolBox->currentIndex(); } -int PasteSelectDialog::protocolIndex() const +QString PasteSelectDialog::protocolName() const { - return m_ui.protocolBox->currentIndex(); + return m_ui.protocolBox->currentText(); } void PasteSelectDialog::listDone(const QString &name, const QStringList &items) { // Set if the protocol is still current - if (name == protocol()) { + if (name == protocolName()) { m_ui.listWidget->clear(); m_ui.listWidget->addItems(items); } @@ -105,7 +105,7 @@ void PasteSelectDialog::listDone(const QString &name, const QStringList &items) void PasteSelectDialog::list() { - const int index = protocolIndex(); + const int index = protocol(); Protocol *protocol = m_protocols[index]; QTC_ASSERT((protocol->capabilities() & Protocol::ListCapability), return); diff --git a/src/plugins/cpaster/pasteselectdialog.h b/src/plugins/cpaster/pasteselectdialog.h index 30faec246a..60ddbbe347 100644 --- a/src/plugins/cpaster/pasteselectdialog.h +++ b/src/plugins/cpaster/pasteselectdialog.h @@ -47,9 +47,8 @@ public: int protocol() const; void setProtocol(const QString &); - int protocolIndex() const; - private: + QString protocolName() const; void protocolChanged(int); void list(); void listDone(const QString &name, const QStringList &items); |