summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-08-12 10:38:43 +0200
committerMontel Laurent <[email protected]>2017-08-12 10:38:43 +0200
commit9c8b641f751ea1aea9a467ee265e9b52a98778ab (patch)
tree1a68473b4559b1ca03af81ea83c4f47b66867b83
parentc423c589c91435feeedbb7784bc027e5b4a27a82 (diff)
Use directly QComboBox
-rw-r--r--src/autotests/identityaddvcarddialogtest.cpp10
-rw-r--r--src/identity/identityaddvcarddialog.cpp6
-rw-r--r--src/identity/identityaddvcarddialog.h4
3 files changed, 10 insertions, 10 deletions
diff --git a/src/autotests/identityaddvcarddialogtest.cpp b/src/autotests/identityaddvcarddialogtest.cpp
index d88b53b..030c362 100644
--- a/src/autotests/identityaddvcarddialogtest.cpp
+++ b/src/autotests/identityaddvcarddialogtest.cpp
@@ -18,7 +18,7 @@
#include "identityaddvcarddialogtest.h"
#include "../identity/identityaddvcarddialog.h"
-#include <KComboBox>
+#include <QComboBox>
#include <KUrlRequester>
#include <QButtonGroup>
@@ -31,7 +31,7 @@ identityaddvcarddialogtest::identityaddvcarddialogtest()
void identityaddvcarddialogtest::shouldHaveDefaultValue()
{
IdentityAddVcardDialog dlg(QStringList(), nullptr);
- KComboBox *identityComboBox = dlg.findChild<KComboBox *>(QStringLiteral("identity_combobox"));
+ QComboBox *identityComboBox = dlg.findChild<QComboBox *>(QStringLiteral("identity_combobox"));
QVERIFY(identityComboBox);
QCOMPARE(identityComboBox->isEnabled(), false);
@@ -55,7 +55,7 @@ void identityaddvcarddialogtest::shouldEnabledUrlRequesterWhenSelectFromExisting
buttonGroup->button(IdentityAddVcardDialog::FromExistingVCard)->toggle();
QCOMPARE(dlg.duplicateMode(), IdentityAddVcardDialog::FromExistingVCard);
- KComboBox *identityComboBox = dlg.findChild<KComboBox *>(QStringLiteral("identity_combobox"));
+ QComboBox *identityComboBox = dlg.findChild<QComboBox *>(QStringLiteral("identity_combobox"));
QCOMPARE(identityComboBox->isEnabled(), false);
KUrlRequester *urlRequester = dlg.findChild<KUrlRequester *>(QStringLiteral("kurlrequester_vcardpath"));
@@ -69,7 +69,7 @@ void identityaddvcarddialogtest::shouldEnabledComboboxWhenSelectDuplicateVCard()
buttonGroup->button(IdentityAddVcardDialog::ExistingEntry)->toggle();
QCOMPARE(dlg.duplicateMode(), IdentityAddVcardDialog::ExistingEntry);
- KComboBox *identityComboBox = dlg.findChild<KComboBox *>(QStringLiteral("identity_combobox"));
+ QComboBox *identityComboBox = dlg.findChild<QComboBox *>(QStringLiteral("identity_combobox"));
QCOMPARE(identityComboBox->isEnabled(), true);
KUrlRequester *urlRequester = dlg.findChild<KUrlRequester *>(QStringLiteral("kurlrequester_vcardpath"));
@@ -83,7 +83,7 @@ void identityaddvcarddialogtest::shouldEnabledComboboxWhenSelectFromExistingVCar
buttonGroup->button(IdentityAddVcardDialog::FromExistingVCard)->toggle();
QCOMPARE(dlg.duplicateMode(), IdentityAddVcardDialog::FromExistingVCard);
- KComboBox *identityComboBox = dlg.findChild<KComboBox *>(QStringLiteral("identity_combobox"));
+ QComboBox *identityComboBox = dlg.findChild<QComboBox *>(QStringLiteral("identity_combobox"));
KUrlRequester *urlRequester = dlg.findChild<KUrlRequester *>(QStringLiteral("kurlrequester_vcardpath"));
diff --git a/src/identity/identityaddvcarddialog.cpp b/src/identity/identityaddvcarddialog.cpp
index eb746f9..6a32cc0 100644
--- a/src/identity/identityaddvcarddialog.cpp
+++ b/src/identity/identityaddvcarddialog.cpp
@@ -17,7 +17,7 @@
#include "identityaddvcarddialog.h"
-#include <KComboBox>
+#include <QComboBox>
#include <KLocalizedString>
#include <KSeparator>
#include <KUrlRequester>
@@ -91,7 +91,7 @@ IdentityAddVcardDialog::IdentityAddVcardDialog(const QStringList &shadowIdentiti
// row 5: combobox with existing identities and label
hlay = new QHBoxLayout(); // inherits spacing
vlay->addLayout(hlay);
- mComboBox = new KComboBox(this);
+ mComboBox = new QComboBox(this);
mComboBox->setObjectName(QStringLiteral("identity_combobox"));
mComboBox->setEditable(false);
@@ -109,7 +109,7 @@ IdentityAddVcardDialog::IdentityAddVcardDialog(const QStringList &shadowIdentiti
// enable/disable combobox and label depending on the third radio
// button's state:
connect(duplicateExistingVCard, &QRadioButton::toggled, label, &QLabel::setEnabled);
- connect(duplicateExistingVCard, &QRadioButton::toggled, mComboBox, &KComboBox::setEnabled);
+ connect(duplicateExistingVCard, &QRadioButton::toggled, mComboBox, &QComboBox::setEnabled);
resize(350, 130);
}
diff --git a/src/identity/identityaddvcarddialog.h b/src/identity/identityaddvcarddialog.h
index 7652357..e98b52e 100644
--- a/src/identity/identityaddvcarddialog.h
+++ b/src/identity/identityaddvcarddialog.h
@@ -20,7 +20,7 @@
#include <QDialog>
#include <QUrl>
class QButtonGroup;
-class KComboBox;
+class QComboBox;
class KUrlRequester;
class IdentityAddVcardDialog : public QDialog
@@ -42,7 +42,7 @@ public:
private:
QButtonGroup *mButtonGroup;
- KComboBox *mComboBox;
+ QComboBox *mComboBox;
KUrlRequester *mVCardPath;
};