blob: 0cbe72eef97c23d57ff47fd6ec2bdbc189e4b6a4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From: José Manuel Santamaría Lema <panfaust@gmail.com>
Date: Wed, 28 Sep 2016 07:53:08 +0000
Subject: Fix ABI break in kio
X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=89f8bcf00fc2fc17527d7bb4e0e2aea51f8776cb
---
Fix ABI break in kio
From the binary compatibility page "Do's and Don'ts":
https://community.kde.org/Policies/Binary_Compatibility_Issues_With_C%2B%2B#The_Do.27s_and_Don.27ts
You cannot...
[...]
For existing functions of any type:
[...]
inline it (this includes moving a member function's body to the class definition, even without the inline keyword).
REVIEW: 129032
---
--- a/src/widgets/kpropertiesdialog.cpp
+++ b/src/widgets/kpropertiesdialog.cpp
@@ -500,6 +500,11 @@
KPreviewPropsPlugin::supports( _items )*/;
}
+void KPropertiesDialog::slotOk()
+{
+ accept();
+}
+
void KPropertiesDialog::accept()
{
QList<KPropertiesDialogPlugin *>::const_iterator pageListIt;
@@ -541,6 +546,11 @@
deleteLater(); // somewhat like Qt::WA_DeleteOnClose would do.
KPageDialog::accept();
} // else, keep dialog open for user to fix the problem.
+}
+
+void KPropertiesDialog::slotCancel()
+{
+ reject();
}
void KPropertiesDialog::reject()
--- a/src/widgets/kpropertiesdialog.h
+++ b/src/widgets/kpropertiesdialog.h
@@ -341,12 +341,12 @@
* Called when the user presses 'Ok'.
* @deprecated since 5.25, use accept()
*/
- KIOWIDGETS_DEPRECATED virtual void slotOk() { accept(); }
+ KIOWIDGETS_DEPRECATED virtual void slotOk();
/**
* Called when the user presses 'Cancel'.
* @deprecated since 5.25, use reject()
*/
- KIOWIDGETS_DEPRECATED virtual void slotCancel() { reject(); }
+ KIOWIDGETS_DEPRECATED virtual void slotCancel();
/**
* Called when the user presses 'Ok'.
|
GitWeb
