GCC 4.7 fixes.

Thanks to Francois Andriot.
(cherry picked from commit 4ff6a82b0a)
v3.5.13-sru
Darrell Anderson 13 years ago committed by Slávek Banko
parent 5c8cf184ce
commit e80100ffcf

@ -35,7 +35,7 @@ public:
KAccel (QWidget* /TransferThis/, const char* = 0); KAccel (QWidget* /TransferThis/, const char* = 0);
KAccel (QWidget*, QObject* /TransferThis/, const char* = 0); KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
KAccelActions& actions (); KAccelActions& actions ();
bool isEnabled () const; bool isEnabled ();
void setEnabled (bool); void setEnabled (bool);
bool setAutoUpdate (bool); bool setAutoUpdate (bool);

@ -48,7 +48,7 @@ public:
KAccelBase (int); KAccelBase (int);
uint actionCount () const; uint actionCount () const;
KAccelActions& actions (); KAccelActions& actions ();
bool isEnabled () const; bool isEnabled ();
KAccelAction* actionPtr (const QString&); KAccelAction* actionPtr (const QString&);
KAccelAction* actionPtr (const KKey&); KAccelAction* actionPtr (const KKey&);
KAccelAction* actionPtr (const KKeyServer::Key&); KAccelAction* actionPtr (const KKeyServer::Key&);

@ -33,7 +33,7 @@ class KGlobalAccel : QObject
public: public:
KGlobalAccel (QObject*, const char* = 0); KGlobalAccel (QObject*, const char* = 0);
bool isEnabled () const; bool isEnabled ();
void setEnabled (bool); 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); KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);

Loading…
Cancel
Save