[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kio] src/widgets: Fix ABI break in kio
From:       José_Manuel_Santamaría_Lema <panfaust () gmail ! com>
Date:       2016-09-28 8:40:37
Message-ID: E1bpAPt-0002bj-PR () code ! kde ! org
[Download RAW message or body]

Git commit 89f8bcf00fc2fc17527d7bb4e0e2aea51f8776cb by Jos=C3=A9 Manuel San=
tamar=C3=ADa Lema.
Committed on 28/09/2016 at 08:40.
Pushed by joselema into branch 'master'.

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 defin=
ition, even without the inline keyword).

REVIEW: 129032

M  +10   -0    src/widgets/kpropertiesdialog.cpp
M  +2    -2    src/widgets/kpropertiesdialog.h

http://commits.kde.org/kio/89f8bcf00fc2fc17527d7bb4e0e2aea51f8776cb

diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdia=
log.cpp
index 5f64478..b570a85 100644
--- a/src/widgets/kpropertiesdialog.cpp
+++ b/src/widgets/kpropertiesdialog.cpp
@@ -500,6 +500,11 @@ bool KPropertiesDialog::canDisplay(const KFileItemList=
 &_items)
             KPreviewPropsPlugin::supports( _items )*/;
 }
 =

+void KPropertiesDialog::slotOk()
+{
+    accept();
+}
+
 void KPropertiesDialog::accept()
 {
     QList<KPropertiesDialogPlugin *>::const_iterator pageListIt;
@@ -543,6 +548,11 @@ void KPropertiesDialog::accept()
     } // else, keep dialog open for user to fix the problem.
 }
 =

+void KPropertiesDialog::slotCancel()
+{
+    reject();
+}
+
 void KPropertiesDialog::reject()
 {
     emit canceled();
diff --git a/src/widgets/kpropertiesdialog.h b/src/widgets/kpropertiesdialo=
g.h
index a85037a..a55fa9f 100644
--- a/src/widgets/kpropertiesdialog.h
+++ b/src/widgets/kpropertiesdialog.h
@@ -341,12 +341,12 @@ public Q_SLOTS:
      * 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'.
[prev in list] [next in list] [prev in thread] [next in thread]