Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Messagelib
Commits
c2657842
Commit
c2657842
authored
Apr 04, 2020
by
Aleix Pol Gonzalez
🐧
Committed by
Laurent Montel
Apr 04, 2020
Browse files
Revert premature port of QComboBox::currentIndexChanged
CCMAIL: montel@kde.org (cherry picked from commit
94df4238
)
parent
433986d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp
View file @
c2657842
...
...
@@ -89,11 +89,7 @@ FollowUpReminderSelectDateDialog::FollowUpReminderSelectDateDialog(QWidget *pare
formLayout
->
addRow
(
i18n
(
"Store ToDo in:"
),
d
->
mCollectionCombobox
);
connect
(
d
->
mDateComboBox
->
lineEdit
(),
&
QLineEdit
::
textChanged
,
this
,
&
FollowUpReminderSelectDateDialog
::
slotDateChanged
);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
mCollectionCombobox
,
qOverload
<
int
>
(
&
Akonadi
::
CollectionComboBox
::
currentIndexChanged
),
this
,
&
FollowUpReminderSelectDateDialog
::
updateOkButton
);
#else
connect
(
d
->
mCollectionCombobox
,
qOverload
<
int
,
const
QString
&>
(
&
Akonadi
::
CollectionComboBox
::
currentIndexChanged
),
this
,
&
FollowUpReminderSelectDateDialog
::
updateOkButton
);
#endif
updateOkButton
();
}
...
...
messagecomposer/src/imagescaling/imagescalingwidget.cpp
View file @
c2657842
...
...
@@ -73,26 +73,10 @@ ImageScalingWidget::ImageScalingWidget(QWidget *parent)
connect
(
d
->
ui
->
skipImageSizeLower
,
&
QCheckBox
::
clicked
,
this
,
&
ImageScalingWidget
::
changed
);
connect
(
d
->
ui
->
imageSize
,
qOverload
<
int
>
(
&
QSpinBox
::
valueChanged
),
this
,
&
ImageScalingWidget
::
changed
);
connect
(
d
->
ui
->
pattern
,
&
KLineEdit
::
textChanged
,
this
,
&
ImageScalingWidget
::
changed
);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
ui
->
CBMaximumWidth
,
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#else
connect
(
d
->
ui
->
CBMaximumWidth
,
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
ui
->
CBMaximumHeight
,
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#else
connect
(
d
->
ui
->
CBMaximumHeight
,
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
ui
->
CBMinimumWidth
,
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#else
connect
(
d
->
ui
->
CBMinimumWidth
,
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#endif
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
ui
->
CBMinimumHeight
,
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#else
connect
(
d
->
ui
->
CBMinimumHeight
,
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ImageScalingWidget
::
slotComboboxChanged
);
#endif
connect
(
d
->
ui
->
WriteToImageFormat
,
qOverload
<
int
>
(
&
QComboBox
::
activated
),
this
,
&
ImageScalingWidget
::
changed
);
connect
(
d
->
ui
->
renameResizedImage
,
&
QCheckBox
::
clicked
,
this
,
&
ImageScalingWidget
::
changed
);
connect
(
d
->
ui
->
renameResizedImage
,
&
QCheckBox
::
clicked
,
d
->
ui
->
renameResizedImagePattern
,
&
KLineEdit
::
setEnabled
);
...
...
messagelist/src/core/widgetbase.cpp
View file @
c2657842
...
...
@@ -208,11 +208,7 @@ void Widget::populateStatusFilterCombo()
d
->
mStatusFilterComboPopulationInProgress
=
true
;
QComboBox
*
tagFilterComboBox
=
d
->
quickSearchLine
->
tagFilterComboBox
();
d
->
mCurrentStatusFilterIndex
=
(
tagFilterComboBox
->
currentIndex
()
!=
-
1
)
?
tagFilterComboBox
->
currentIndex
()
:
0
;
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
disconnect
(
tagFilterComboBox
,
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
Widget
::
statusSelected
);
#else
disconnect
(
tagFilterComboBox
,
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
Widget
::
statusSelected
);
#endif
tagFilterComboBox
->
clear
();
...
...
@@ -227,11 +223,7 @@ void Widget::addMessageTagItem(const QPixmap &icon, const QString &text, const Q
void
Widget
::
setCurrentStatusFilterItem
()
{
d
->
quickSearchLine
->
updateComboboxVisibility
();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
quickSearchLine
->
tagFilterComboBox
(),
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
Widget
::
statusSelected
);
#else
connect
(
d
->
quickSearchLine
->
tagFilterComboBox
(),
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
Widget
::
statusSelected
);
#endif
d
->
quickSearchLine
->
tagFilterComboBox
()
->
setCurrentIndex
(
d
->
mCurrentStatusFilterIndex
>=
d
->
quickSearchLine
->
tagFilterComboBox
()
->
count
()
?
0
:
d
->
mCurrentStatusFilterIndex
);
d
->
mStatusFilterComboPopulationInProgress
=
false
;
}
...
...
messageviewer/src/widgets/configurewidget.cpp
View file @
c2657842
...
...
@@ -65,13 +65,8 @@ ConfigureWidget::ConfigureWidget(QWidget *parent)
MessageViewer
::
MessageViewerSettings
::
self
()
->
shrinkQuotesItem
()
->
whatsThis
());
d
->
mSettingsUi
->
kcfg_ShowExpandQuotesMark
->
setWhatsThis
(
MessageViewer
::
MessageViewerSettings
::
self
()
->
showExpandQuotesMarkItem
()
->
whatsThis
());
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect
(
d
->
mSettingsUi
->
overrideCharacterEncoding
,
qOverload
<
int
>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ConfigureWidget
::
settingsChanged
);
#else
connect
(
d
->
mSettingsUi
->
overrideCharacterEncoding
,
qOverload
<
int
,
const
QString
&>
(
&
QComboBox
::
currentIndexChanged
),
this
,
&
ConfigureWidget
::
settingsChanged
);
#endif
}
ConfigureWidget
::~
ConfigureWidget
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment