Commit 69a1f6bd authored by Laurent Montel's avatar Laurent Montel 😁

Rename akonadicontactcombobox

parent 2ff3ef85
......@@ -45,7 +45,7 @@ set(contacteditor_editor_utils_SRCS
set(contacteditor_editor_widgets_SRCS
editor/widgets/kwidgetlister.cpp
editor/widgets/akonadicontactcombobox.cpp
editor/widgets/contacteditorcombobox.cpp
)
set(contacteditor_editor_generalinfo_phone_SRCS
......
......@@ -25,7 +25,7 @@
using namespace ContactEditor;
ContactSelectTypeCombobox::ContactSelectTypeCombobox(QWidget *parent)
: ContactEditor::AkonadiContactComboBox(parent)
: ContactEditor::ContactEditorComboBox(parent)
{
initialize();
}
......
......@@ -22,12 +22,12 @@
#ifndef ContactSelectTypeCombobox_H
#define ContactSelectTypeCombobox_H
#include "../widgets/akonadicontactcombobox.h"
#include "../widgets/contacteditorcombobox.h"
#include "contacteditor_private_export.h"
namespace ContactEditor
{
class CONTACTEDITOR_TESTS_EXPORT ContactSelectTypeCombobox : public ContactEditor::AkonadiContactComboBox
class CONTACTEDITOR_TESTS_EXPORT ContactSelectTypeCombobox : public ContactEditor::ContactEditorComboBox
{
Q_OBJECT
public:
......
......@@ -22,7 +22,7 @@
#include "messagingwidget.h"
#include "../../im/improtocols.h"
#include "../../widgets/akonadicontactcombobox.h"
#include "../../widgets/contacteditorcombobox.h"
#include <QComboBox>
#include <KLocalizedString>
#include <QHBoxLayout>
......@@ -45,7 +45,7 @@ MessagingWidget::MessagingWidget(QWidget *parent)
connect(mMessagingEdit, &PreferredLineEditWidget::preferredChanged, this, &MessagingWidget::slotPreferredChanged);
layout->addWidget(mMessagingEdit);
mProtocolCombo = new ContactEditor::AkonadiContactComboBox(this);
mProtocolCombo = new ContactEditor::ContactEditorComboBox(this);
mProtocolCombo->setObjectName(QStringLiteral("protocol"));
mProtocolCombo->addItem(i18nc("@item:inlistbox select from a list of IM protocols",
"Select..."));
......
......@@ -31,7 +31,7 @@ class QToolButton;
namespace ContactEditor
{
class PreferredLineEditWidget;
class AkonadiContactComboBox;
class ContactEditorComboBox;
class CONTACTEDITOR_TESTS_EXPORT MessagingWidget : public QWidget
{
Q_OBJECT
......@@ -57,7 +57,7 @@ private:
PreferredLineEditWidget *mMessagingEdit;
QToolButton *mAddButton;
QToolButton *mRemoveButton;
ContactEditor::AkonadiContactComboBox *mProtocolCombo;
ContactEditor::ContactEditorComboBox *mProtocolCombo;
};
}
#endif // MESSAGINGWIDGET_H
......@@ -28,7 +28,7 @@
using namespace ContactEditor;
PhoneComboBoxType::PhoneComboBoxType(QWidget *parent)
: ContactEditor::AkonadiContactComboBox(parent)
: ContactEditor::ContactEditorComboBox(parent)
, mType(KContacts::PhoneNumber::Home)
, mLastSelected(0)
{
......
......@@ -23,7 +23,7 @@
#ifndef PHONECOMBOBOXTYPE_H
#define PHONECOMBOBOXTYPE_H
#include <editor/widgets/akonadicontactcombobox.h>
#include <editor/widgets/contacteditorcombobox.h>
#include <kcontacts/addressee.h>
#include "contacteditor_private_export.h"
namespace ContactEditor
......@@ -31,7 +31,7 @@ namespace ContactEditor
/**
* @short A combobox to select a phone number type.
*/
class CONTACTEDITOR_TESTS_EXPORT PhoneComboBoxType : public ContactEditor::AkonadiContactComboBox
class CONTACTEDITOR_TESTS_EXPORT PhoneComboBoxType : public ContactEditor::ContactEditorComboBox
{
Q_OBJECT
......
......@@ -22,7 +22,7 @@ set(generalinfoeditor_SRCS
../../utils/utils.cpp
../categorieseditwidget.cpp
../nameeditdialog.cpp
../../widgets/akonadicontactcombobox.cpp
../../widgets/contacteditorcombobox.cpp
../../widgets/preferredlineeditwidget.cpp
../phone/phonetypedialog.cpp
../displaynameeditwidget.cpp
......
......@@ -19,22 +19,22 @@
02110-1301, USA.
*/
#include "akonadicontactcombobox.h"
#include "contacteditorcombobox.h"
using namespace ContactEditor;
AkonadiContactComboBox::AkonadiContactComboBox(QWidget *parent)
ContactEditorComboBox::ContactEditorComboBox(QWidget *parent)
: QComboBox(parent)
{
setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
}
AkonadiContactComboBox::~AkonadiContactComboBox()
ContactEditorComboBox::~ContactEditorComboBox()
{
}
QSize AkonadiContactComboBox::minimumSizeHint() const
QSize ContactEditorComboBox::minimumSizeHint() const
{
return QSize(150, QComboBox::minimumSizeHint().height());
}
......@@ -26,12 +26,12 @@
#include "contacteditor_private_export.h"
namespace ContactEditor
{
class CONTACTEDITOR_TESTS_EXPORT AkonadiContactComboBox : public QComboBox
class CONTACTEDITOR_TESTS_EXPORT ContactEditorComboBox : public QComboBox
{
Q_OBJECT
public:
explicit AkonadiContactComboBox(QWidget *parent = nullptr);
~AkonadiContactComboBox();
explicit ContactEditorComboBox(QWidget *parent = nullptr);
~ContactEditorComboBox();
protected:
QSize minimumSizeHint() const override;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment