From eba183d4de47093c6e44a99c8d7fe313aa2834c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 17:25:42 -0600 Subject: Fix FTBFS --- kcontrol/keys/kaccel.upd | 3 - kcontrol/keys/kaccelaction.h | 205 ----------------------------------------- kcontrol/keys/tdeaccel.upd | 3 + kcontrol/keys/tdeaccelaction.h | 205 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 208 insertions(+), 208 deletions(-) delete mode 100644 kcontrol/keys/kaccel.upd delete mode 100644 kcontrol/keys/kaccelaction.h create mode 100644 kcontrol/keys/tdeaccel.upd create mode 100644 kcontrol/keys/tdeaccelaction.h (limited to 'kcontrol/keys') diff --git a/kcontrol/keys/kaccel.upd b/kcontrol/keys/kaccel.upd deleted file mode 100644 index f127390a4..000000000 --- a/kcontrol/keys/kaccel.upd +++ /dev/null @@ -1,3 +0,0 @@ -Id=trinity.3/r1 -File=kdeglobals -Script=convertShortcuts.pl,perl diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h deleted file mode 100644 index 248ff2278..000000000 --- a/kcontrol/keys/kaccelaction.h +++ /dev/null @@ -1,205 +0,0 @@ -// THIS FILE IS A COPY OF tdelibs/tdecore/kaccelaction.h AND MUST BE KEPT -// IN SYNC WITH THAT FILE. - -/* This file is part of the KDE libraries - Copyright (C) 2001,2002 Ellis Whitehead - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef _KACCELACTION_H -#define _KACCELACTION_H - -#include -#include -#include -#include - -#include - -class TDEAccelBase; - -class TQObject; -class TDEConfig; -class TDEConfigBase; - -/* - TDEAccelAction holds information an a given action, such as "Run Command" - - 1) TDEAccelAction = "Run Command" - Default3 = "Alt+F2" - Default4 = "Meta+Enter;Alt+F2" - 1) TDEShortcut = "Meta+Enter" - 1) KKeySequence = "Meta+Enter" - 1) KKey = "Meta+Enter" - 1) Meta+Enter - 2) Meta+Keypad_Enter - 2) TDEShortcut = "Alt+F2" - 1) KKeySequence = "Alt+F2" - 1) Alt+F2 - 2) TDEAccelAction = "Something" - Default3 = "" - Default4 = "" - 1) TDEShortcut = "Meta+X,Asterisk" - 1) KKeySequence = "Meta+X,Asterisk" - 1) KKey = "Meta+X" - 1) Meta+X - 2) KKey = "Asterisk" - 1) Shift+8 (English layout) - 2) Keypad_Asterisk -*/ - -//--------------------------------------------------------------------- -// TDEAccelAction -//--------------------------------------------------------------------- - -class TDEAccelAction -{ - public: - TDEAccelAction(); - TDEAccelAction( const TDEAccelAction& ); - TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, - const TDEShortcut& cutDef3, const TDEShortcut& cutDef4, - const TQObject* pObjSlot, const char* psMethodSlot, - bool bConfigurable, bool bEnabled ); - ~TDEAccelAction(); - - void clear(); - bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, - const TDEShortcut& cutDef3, const TDEShortcut& cutDef4, - const TQObject* pObjSlot, const char* psMethodSlot, - bool bConfigurable, bool bEnabled ); - - TDEAccelAction& operator=( const TDEAccelAction& ); - - const TQString& name() const { return m_sName; } - const TQString& label() const { return m_sLabel; } - const TQString& whatsThis() const { return m_sWhatsThis; } - const TDEShortcut& shortcut() const { return m_cut; } - const TDEShortcut& shortcutDefault() const; - const TDEShortcut& shortcutDefault3() const { return m_cutDefault3; } - const TDEShortcut& shortcutDefault4() const { return m_cutDefault4; } - const TQObject* objSlotPtr() const { return m_pObjSlot; } - const char* methodSlotPtr() const { return m_psMethodSlot; } - bool isConfigurable() const { return m_bConfigurable; } - bool isEnabled() const { return m_bEnabled; } - - void setName( const TQString& ); - void setLabel( const TQString& ); - void setWhatsThis( const TQString& ); - bool setShortcut( const TDEShortcut& rgCuts ); - void setSlot( const TQObject* pObjSlot, const char* psMethodSlot ); - void setConfigurable( bool ); - void setEnabled( bool ); - - int getID() const { return m_nIDAccel; } - void setID( int n ) { m_nIDAccel = n; } - bool isConnected() const; - - bool setKeySequence( uint i, const KKeySequence& ); - void clearShortcut(); - bool contains( const KKeySequence& ); - - TQString toString() const; - TQString toStringInternal() const; - - static bool useFourModifierKeys(); - static void useFourModifierKeys( bool ); - - protected: - TQString m_sName, - m_sLabel, - m_sWhatsThis; - TDEShortcut m_cut; - TDEShortcut m_cutDefault3, m_cutDefault4; - const TQObject* m_pObjSlot; - const char* m_psMethodSlot; - bool m_bConfigurable, - m_bEnabled; - int m_nIDAccel; - uint m_nConnections; - - void incConnections(); - void decConnections(); - - private: - static int g_bUseFourModifierKeys; - class TDEAccelActionPrivate* d; - - friend class TDEAccelActions; - friend class TDEAccelBase; -}; - -//--------------------------------------------------------------------- -// TDEAccelActions -//--------------------------------------------------------------------- - -class TDEAccelActions -{ - public: - TDEAccelActions(); - TDEAccelActions( const TDEAccelActions& ); - virtual ~TDEAccelActions(); - - void clear(); - bool init( const TDEAccelActions& ); - bool init( TDEConfigBase& config, const TQString& sGroup ); - - void updateShortcuts( TDEAccelActions& ); - - int actionIndex( const TQString& sAction ) const; - TDEAccelAction* actionPtr( uint ); - const TDEAccelAction* actionPtr( uint ) const; - TDEAccelAction* actionPtr( const TQString& sAction ); - const TDEAccelAction* actionPtr( const TQString& sAction ) const; - TDEAccelAction* actionPtr( KKeySequence cut ); - TDEAccelAction& operator []( uint ); - const TDEAccelAction& operator []( uint ) const; - - TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis, - const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4, - const TQObject* pObjSlot = 0, const char* psMethodSlot = 0, - bool bConfigurable = true, bool bEnabled = true ); - TDEAccelAction* insert( const TQString& sName, const TQString& sLabel ); - bool remove( const TQString& sAction ); - - bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 ); - bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0, - bool bWriteAll = false, bool bGlobal = false ) const; - - void emitKeycodeChanged(); - - uint count() const; - - protected: - TDEAccelBase* m_pTDEAccelBase; - TDEAccelAction** m_prgActions; - uint m_nSizeAllocated, m_nSize; - - void resize( uint ); - void insertPtr( TDEAccelAction* ); - - private: - class TDEAccelActionsPrivate* d; - - TDEAccelActions( TDEAccelBase* ); - void initPrivate( TDEAccelBase* ); - TDEAccelActions& operator =( TDEAccelActions& ); - - friend class TDEAccelBase; -}; - -#endif // _KACCELACTION_H diff --git a/kcontrol/keys/tdeaccel.upd b/kcontrol/keys/tdeaccel.upd new file mode 100644 index 000000000..f127390a4 --- /dev/null +++ b/kcontrol/keys/tdeaccel.upd @@ -0,0 +1,3 @@ +Id=trinity.3/r1 +File=kdeglobals +Script=convertShortcuts.pl,perl diff --git a/kcontrol/keys/tdeaccelaction.h b/kcontrol/keys/tdeaccelaction.h new file mode 100644 index 000000000..248ff2278 --- /dev/null +++ b/kcontrol/keys/tdeaccelaction.h @@ -0,0 +1,205 @@ +// THIS FILE IS A COPY OF tdelibs/tdecore/kaccelaction.h AND MUST BE KEPT +// IN SYNC WITH THAT FILE. + +/* This file is part of the KDE libraries + Copyright (C) 2001,2002 Ellis Whitehead + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef _KACCELACTION_H +#define _KACCELACTION_H + +#include +#include +#include +#include + +#include + +class TDEAccelBase; + +class TQObject; +class TDEConfig; +class TDEConfigBase; + +/* + TDEAccelAction holds information an a given action, such as "Run Command" + + 1) TDEAccelAction = "Run Command" + Default3 = "Alt+F2" + Default4 = "Meta+Enter;Alt+F2" + 1) TDEShortcut = "Meta+Enter" + 1) KKeySequence = "Meta+Enter" + 1) KKey = "Meta+Enter" + 1) Meta+Enter + 2) Meta+Keypad_Enter + 2) TDEShortcut = "Alt+F2" + 1) KKeySequence = "Alt+F2" + 1) Alt+F2 + 2) TDEAccelAction = "Something" + Default3 = "" + Default4 = "" + 1) TDEShortcut = "Meta+X,Asterisk" + 1) KKeySequence = "Meta+X,Asterisk" + 1) KKey = "Meta+X" + 1) Meta+X + 2) KKey = "Asterisk" + 1) Shift+8 (English layout) + 2) Keypad_Asterisk +*/ + +//--------------------------------------------------------------------- +// TDEAccelAction +//--------------------------------------------------------------------- + +class TDEAccelAction +{ + public: + TDEAccelAction(); + TDEAccelAction( const TDEAccelAction& ); + TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, + const TDEShortcut& cutDef3, const TDEShortcut& cutDef4, + const TQObject* pObjSlot, const char* psMethodSlot, + bool bConfigurable, bool bEnabled ); + ~TDEAccelAction(); + + void clear(); + bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis, + const TDEShortcut& cutDef3, const TDEShortcut& cutDef4, + const TQObject* pObjSlot, const char* psMethodSlot, + bool bConfigurable, bool bEnabled ); + + TDEAccelAction& operator=( const TDEAccelAction& ); + + const TQString& name() const { return m_sName; } + const TQString& label() const { return m_sLabel; } + const TQString& whatsThis() const { return m_sWhatsThis; } + const TDEShortcut& shortcut() const { return m_cut; } + const TDEShortcut& shortcutDefault() const; + const TDEShortcut& shortcutDefault3() const { return m_cutDefault3; } + const TDEShortcut& shortcutDefault4() const { return m_cutDefault4; } + const TQObject* objSlotPtr() const { return m_pObjSlot; } + const char* methodSlotPtr() const { return m_psMethodSlot; } + bool isConfigurable() const { return m_bConfigurable; } + bool isEnabled() const { return m_bEnabled; } + + void setName( const TQString& ); + void setLabel( const TQString& ); + void setWhatsThis( const TQString& ); + bool setShortcut( const TDEShortcut& rgCuts ); + void setSlot( const TQObject* pObjSlot, const char* psMethodSlot ); + void setConfigurable( bool ); + void setEnabled( bool ); + + int getID() const { return m_nIDAccel; } + void setID( int n ) { m_nIDAccel = n; } + bool isConnected() const; + + bool setKeySequence( uint i, const KKeySequence& ); + void clearShortcut(); + bool contains( const KKeySequence& ); + + TQString toString() const; + TQString toStringInternal() const; + + static bool useFourModifierKeys(); + static void useFourModifierKeys( bool ); + + protected: + TQString m_sName, + m_sLabel, + m_sWhatsThis; + TDEShortcut m_cut; + TDEShortcut m_cutDefault3, m_cutDefault4; + const TQObject* m_pObjSlot; + const char* m_psMethodSlot; + bool m_bConfigurable, + m_bEnabled; + int m_nIDAccel; + uint m_nConnections; + + void incConnections(); + void decConnections(); + + private: + static int g_bUseFourModifierKeys; + class TDEAccelActionPrivate* d; + + friend class TDEAccelActions; + friend class TDEAccelBase; +}; + +//--------------------------------------------------------------------- +// TDEAccelActions +//--------------------------------------------------------------------- + +class TDEAccelActions +{ + public: + TDEAccelActions(); + TDEAccelActions( const TDEAccelActions& ); + virtual ~TDEAccelActions(); + + void clear(); + bool init( const TDEAccelActions& ); + bool init( TDEConfigBase& config, const TQString& sGroup ); + + void updateShortcuts( TDEAccelActions& ); + + int actionIndex( const TQString& sAction ) const; + TDEAccelAction* actionPtr( uint ); + const TDEAccelAction* actionPtr( uint ) const; + TDEAccelAction* actionPtr( const TQString& sAction ); + const TDEAccelAction* actionPtr( const TQString& sAction ) const; + TDEAccelAction* actionPtr( KKeySequence cut ); + TDEAccelAction& operator []( uint ); + const TDEAccelAction& operator []( uint ) const; + + TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis, + const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4, + const TQObject* pObjSlot = 0, const char* psMethodSlot = 0, + bool bConfigurable = true, bool bEnabled = true ); + TDEAccelAction* insert( const TQString& sName, const TQString& sLabel ); + bool remove( const TQString& sAction ); + + bool readActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0 ); + bool writeActions( const TQString& sConfigGroup = "Shortcuts", TDEConfigBase* pConfig = 0, + bool bWriteAll = false, bool bGlobal = false ) const; + + void emitKeycodeChanged(); + + uint count() const; + + protected: + TDEAccelBase* m_pTDEAccelBase; + TDEAccelAction** m_prgActions; + uint m_nSizeAllocated, m_nSize; + + void resize( uint ); + void insertPtr( TDEAccelAction* ); + + private: + class TDEAccelActionsPrivate* d; + + TDEAccelActions( TDEAccelBase* ); + void initPrivate( TDEAccelBase* ); + TDEAccelActions& operator =( TDEAccelActions& ); + + friend class TDEAccelBase; +}; + +#endif // _KACCELACTION_H -- cgit v1.2.1