From e80100ffcf27f5323a5d0670d8fa062e3b88e7f9 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 6 May 2012 14:14:10 -0500 Subject: [PATCH] GCC 4.7 fixes. Thanks to Francois Andriot. (cherry picked from commit 4ff6a82b0a192d224100ac8526c19e1b52ede0e6) --- sip/kdecore/kaccel.sip | 2 +- sip/kdecore/kaccelbase.sip | 2 +- sip/kdecore/kglobalaccel.sip | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sip/kdecore/kaccel.sip b/sip/kdecore/kaccel.sip index 5ae4756..29861f3 100644 --- a/sip/kdecore/kaccel.sip +++ b/sip/kdecore/kaccel.sip @@ -35,7 +35,7 @@ public: KAccel (QWidget* /TransferThis/, const char* = 0); KAccel (QWidget*, QObject* /TransferThis/, const char* = 0); KAccelActions& actions (); - bool isEnabled () const; + bool isEnabled (); void setEnabled (bool); bool setAutoUpdate (bool); diff --git a/sip/kdecore/kaccelbase.sip b/sip/kdecore/kaccelbase.sip index 74b5206..87bb74e 100644 --- a/sip/kdecore/kaccelbase.sip +++ b/sip/kdecore/kaccelbase.sip @@ -48,7 +48,7 @@ public: KAccelBase (int); uint actionCount () const; KAccelActions& actions (); - bool isEnabled () const; + bool isEnabled (); KAccelAction* actionPtr (const QString&); KAccelAction* actionPtr (const KKey&); KAccelAction* actionPtr (const KKeyServer::Key&); diff --git a/sip/kdecore/kglobalaccel.sip b/sip/kdecore/kglobalaccel.sip index 81d2bf8..80b6d64 100644 --- a/sip/kdecore/kglobalaccel.sip +++ b/sip/kdecore/kglobalaccel.sip @@ -33,7 +33,7 @@ class KGlobalAccel : QObject public: KGlobalAccel (QObject*, const char* = 0); - bool isEnabled () const; + bool isEnabled (); void setEnabled (bool); KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);