Commit 17d44f76 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Port to QCombobox when it's possible

parent 62e2502a
......@@ -29,7 +29,7 @@
#include <Akonadi/Calendar/IncidenceChanger>
#include <KComboBox>
#include <QComboBox>
#include <KDateComboBox>
#include <KLineEdit>
#include <KLocalizedString>
......@@ -163,7 +163,7 @@ ArchiveDialog::ArchiveDialog(const Akonadi::ETMCalendar::Ptr &cal,
"The age of the events and to-dos to archive. All older items "
"will be saved and deleted, the newer will be kept."));
mExpiryUnitsComboBox = new KComboBox(autoArchiveHBox);
mExpiryUnitsComboBox = new QComboBox(autoArchiveHBox);
autoArchiveHBoxHBoxLayout->addWidget(mExpiryUnitsComboBox);
mExpiryUnitsComboBox->setToolTip(
i18nc("@info:tooltip",
......
......@@ -28,7 +28,7 @@
#include <Akonadi/Calendar/ETMCalendar>
#include <QDialog>
class KComboBox;
class QComboBox;
class KDateComboBox;
class QSpinBox;
class KUrlRequester;
......@@ -68,7 +68,7 @@ private:
QRadioButton *mArchiveOnceRB = nullptr;
QRadioButton *mAutoArchiveRB = nullptr;
QSpinBox *mExpiryTimeNumInput = nullptr;
KComboBox *mExpiryUnitsComboBox = nullptr;
QComboBox *mExpiryUnitsComboBox = nullptr;
QCheckBox *mEvents = nullptr;
QCheckBox *mTodos = nullptr;
Akonadi::IncidenceChanger *mChanger = nullptr;
......
......@@ -217,7 +217,7 @@ CalPrintDialog::CalPrintDialog(int initialPrintType, const PrintPlugin::List &pl
orientationLabel->setAlignment(Qt::AlignRight);
splitterRightLayout->addWidget(orientationLabel, 1, 0);
mOrientationSelection = new KComboBox(splitterRight);
mOrientationSelection = new QComboBox(splitterRight);
mOrientationSelection->setToolTip(
i18nc("@info:tooltip", "Set the print orientation"));
mOrientationSelection->setWhatsThis(
......
......@@ -26,7 +26,7 @@
#include "calendarsupport_export.h"
#include "printplugin.h"
#include <KComboBox>
#include <QComboBox>
#include <QDialog>
#include <QPushButton>
class QButtonGroup;
......@@ -118,7 +118,7 @@ private:
QStackedWidget *mConfigArea = nullptr;
QMap<int, PrintPlugin *> mPluginIDs;
QString mPreviewText;
KComboBox *mOrientationSelection = nullptr;
QComboBox *mOrientationSelection = nullptr;
QPushButton *mOkButton = nullptr;
CalPrinter::ePrintOrientation mOrientation;
};
......
......@@ -70,7 +70,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="KComboBox" name="mFromMonth">
<widget class="QComboBox" name="mFromMonth">
<property name="toolTip">
<string>Starting month for printing</string>
</property>
......@@ -109,7 +109,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="KComboBox" name="mToMonth">
<widget class="QComboBox" name="mToMonth">
<property name="toolTip">
<string>Ending month for the print</string>
</property>
......@@ -341,13 +341,6 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mFromMonth</tabstop>
<tabstop>mFromYear</tabstop>
......
......@@ -360,7 +360,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="KComboBox" name="mSortField">
<widget class="QComboBox" name="mSortField">
<property name="enabled">
<bool>true</bool>
</property>
......@@ -387,7 +387,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="KComboBox" name="mSortDirection">
<widget class="QComboBox" name="mSortDirection">
<property name="enabled">
<bool>true</bool>
</property>
......@@ -462,11 +462,6 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>KDateComboBox</class>
<extends>QComboBox</extends>
......
......@@ -112,7 +112,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KComboBox" name="mPages"/>
<widget class="QComboBox" name="mPages"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mSubDaysLabel">
......@@ -125,7 +125,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="KComboBox" name="mSubDays">
<widget class="QComboBox" name="mSubDays">
<property name="currentIndex">
<number>1</number>
</property>
......@@ -152,7 +152,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="KComboBox" name="mHolidays">
<widget class="QComboBox" name="mHolidays">
<item>
<property name="text">
<string>Text</string>
......@@ -185,13 +185,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
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