From 5f88d03c1ad294b7fcfc3840827b3144fb060ab0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:40:24 -0600 Subject: [PATCH] Rename additional instances of KDE to TDE --- extra/kde340/kaccelaction.h | 4 +-- extra/kde340/kaccelbase.h | 2 +- extra/kde340/kicontheme.h | 4 +-- extra/kde340/kkeyserver_x11.h | 54 ++++++++++++++++---------------- extra/kde340/kpanelmenu.h | 2 +- extra/kde340/ksharedptr.h | 2 +- extra/kde340/ksycocafactory.h | 4 +-- extra/kde340/ktoolbarbutton.h | 4 +-- extra/kde341/kaccelaction.h | 4 +-- extra/kde341/kaccelbase.h | 2 +- extra/kde341/kicontheme.h | 4 +-- extra/kde341/kkeyserver_x11.h | 54 ++++++++++++++++---------------- extra/kde341/kpanelmenu.h | 2 +- extra/kde341/ksharedptr.h | 2 +- extra/kde341/ksycocafactory.h | 4 +-- extra/kde341/ktoolbarbutton.h | 4 +-- extra/kde342/kaccelaction.h | 4 +-- extra/kde342/kaccelbase.h | 2 +- extra/kde342/kicontheme.h | 4 +-- extra/kde342/kkeyserver_x11.h | 56 ++++++++++++++++----------------- extra/kde342/kpanelmenu.h | 2 +- extra/kde342/ksharedptr.h | 2 +- extra/kde342/ksycocafactory.h | 4 +-- extra/kde342/ktoolbarbutton.h | 4 +-- extra/kde343/kaccelaction.h | 4 +-- extra/kde343/kaccelbase.h | 2 +- extra/kde343/kicontheme.h | 4 +-- extra/kde343/kkeyserver_x11.h | 56 ++++++++++++++++----------------- extra/kde343/kpanelmenu.h | 2 +- extra/kde343/ksharedptr.h | 2 +- extra/kde343/ksycocafactory.h | 4 +-- extra/kde343/ktoolbarbutton.h | 4 +-- extra/kde350/kaccelaction.h | 4 +-- extra/kde350/kaccelbase.h | 2 +- extra/kde350/kicontheme.h | 4 +-- extra/kde350/kkeyserver_x11.h | 58 +++++++++++++++++------------------ extra/kde350/kpanelmenu.h | 2 +- extra/kde350/ksharedptr.h | 2 +- extra/kde350/ksycocafactory.h | 4 +-- extra/kde350/ktoolbarbutton.h | 4 +-- extra/kde351/kaccelaction.h | 4 +-- extra/kde351/kaccelbase.h | 2 +- extra/kde351/kicontheme.h | 4 +-- extra/kde351/kkeyserver_x11.h | 58 +++++++++++++++++------------------ extra/kde351/kpanelmenu.h | 2 +- extra/kde351/ksharedptr.h | 2 +- extra/kde351/ksycocafactory.h | 4 +-- extra/kde351/ktoolbarbutton.h | 4 +-- extra/kde352/kaccelaction.h | 4 +-- extra/kde352/kaccelbase.h | 2 +- extra/kde352/kicontheme.h | 4 +-- extra/kde352/kkeyserver_x11.h | 58 +++++++++++++++++------------------ extra/kde352/kpanelmenu.h | 2 +- extra/kde352/ksharedptr.h | 2 +- extra/kde352/ksycocafactory.h | 4 +-- extra/kde352/ktoolbarbutton.h | 4 +-- extra/kde353/kaccelaction.h | 4 +-- extra/kde353/kaccelbase.h | 2 +- extra/kde353/kicontheme.h | 4 +-- extra/kde353/kkeyserver_x11.h | 58 +++++++++++++++++------------------ extra/kde353/kpanelmenu.h | 2 +- extra/kde353/ksharedptr.h | 2 +- extra/kde353/ksycocafactory.h | 4 +-- extra/kde353/ktoolbarbutton.h | 4 +-- pykde350.prj | 8 ++--- pykde351.prj | 8 ++--- pykde352.prj | 8 ++--- pykde353.prj | 8 ++--- 68 files changed, 330 insertions(+), 330 deletions(-) diff --git a/extra/kde340/kaccelaction.h b/extra/kde340/kaccelaction.h index 396e218..52ae113 100644 --- a/extra/kde340/kaccelaction.h +++ b/extra/kde340/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -363,7 +363,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde340/kaccelbase.h b/extra/kde340/kaccelbase.h index f582cce..f366940 100644 --- a/extra/kde340/kaccelbase.h +++ b/extra/kde340/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 }; diff --git a/extra/kde340/kicontheme.h b/extra/kde340/kicontheme.h index 384224e..84fc6f9 100644 --- a/extra/kde340/kicontheme.h +++ b/extra/kde340/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde340/kkeyserver_x11.h b/extra/kde340/kkeyserver_x11.h index dbd983f..63fcb63 100644 --- a/extra/kde340/kkeyserver_x11.h +++ b/extra/kde340/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -335,7 +335,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -346,7 +346,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -356,7 +356,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -366,7 +366,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -378,7 +378,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -389,7 +389,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -401,12 +401,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -417,7 +417,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -430,12 +430,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -443,19 +443,19 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde340/kpanelmenu.h b/extra/kde340/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde340/kpanelmenu.h +++ b/extra/kde340/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde340/ksharedptr.h b/extra/kde340/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde340/ksharedptr.h +++ b/extra/kde340/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde340/ksycocafactory.h b/extra/kde340/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde340/ksycocafactory.h +++ b/extra/kde340/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde340/ktoolbarbutton.h b/extra/kde340/ktoolbarbutton.h index 7b748a0..29da509 100644 --- a/extra/kde340/ktoolbarbutton.h +++ b/extra/kde340/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -319,7 +319,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde341/kaccelaction.h b/extra/kde341/kaccelaction.h index 396e218..52ae113 100644 --- a/extra/kde341/kaccelaction.h +++ b/extra/kde341/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -363,7 +363,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde341/kaccelbase.h b/extra/kde341/kaccelbase.h index f582cce..f366940 100644 --- a/extra/kde341/kaccelbase.h +++ b/extra/kde341/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 }; diff --git a/extra/kde341/kicontheme.h b/extra/kde341/kicontheme.h index 384224e..84fc6f9 100644 --- a/extra/kde341/kicontheme.h +++ b/extra/kde341/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde341/kkeyserver_x11.h b/extra/kde341/kkeyserver_x11.h index dbd983f..63fcb63 100644 --- a/extra/kde341/kkeyserver_x11.h +++ b/extra/kde341/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -335,7 +335,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -346,7 +346,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -356,7 +356,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -366,7 +366,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -378,7 +378,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -389,7 +389,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -401,12 +401,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -417,7 +417,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -430,12 +430,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -443,19 +443,19 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde341/kpanelmenu.h b/extra/kde341/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde341/kpanelmenu.h +++ b/extra/kde341/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde341/ksharedptr.h b/extra/kde341/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde341/ksharedptr.h +++ b/extra/kde341/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde341/ksycocafactory.h b/extra/kde341/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde341/ksycocafactory.h +++ b/extra/kde341/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde341/ktoolbarbutton.h b/extra/kde341/ktoolbarbutton.h index 7b748a0..29da509 100644 --- a/extra/kde341/ktoolbarbutton.h +++ b/extra/kde341/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -319,7 +319,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde342/kaccelaction.h b/extra/kde342/kaccelaction.h index 396e218..52ae113 100644 --- a/extra/kde342/kaccelaction.h +++ b/extra/kde342/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -363,7 +363,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde342/kaccelbase.h b/extra/kde342/kaccelbase.h index f582cce..f366940 100644 --- a/extra/kde342/kaccelbase.h +++ b/extra/kde342/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 }; diff --git a/extra/kde342/kicontheme.h b/extra/kde342/kicontheme.h index 2d2e79f..136bf06 100644 --- a/extra/kde342/kicontheme.h +++ b/extra/kde342/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde342/kkeyserver_x11.h b/extra/kde342/kkeyserver_x11.h index 65d4e0c..eed3d30 100644 --- a/extra/kde342/kkeyserver_x11.h +++ b/extra/kde342/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns the X11 Mode_switch modifier mask/flag. @@ -330,7 +330,7 @@ namespace KKeyServer * @see accelModMaskX() * @since 3.5 */ - KDECORE_EXPORT uint modXModeSwitch(); + TDECORE_EXPORT uint modXModeSwitch(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -343,7 +343,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -354,7 +354,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -364,7 +364,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -374,7 +374,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -386,7 +386,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -397,7 +397,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -409,12 +409,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -425,7 +425,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -438,12 +438,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -451,19 +451,19 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde342/kpanelmenu.h b/extra/kde342/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde342/kpanelmenu.h +++ b/extra/kde342/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde342/ksharedptr.h b/extra/kde342/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde342/ksharedptr.h +++ b/extra/kde342/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde342/ksycocafactory.h b/extra/kde342/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde342/ksycocafactory.h +++ b/extra/kde342/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde342/ktoolbarbutton.h b/extra/kde342/ktoolbarbutton.h index f5e3be3..b26071c 100644 --- a/extra/kde342/ktoolbarbutton.h +++ b/extra/kde342/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -319,7 +319,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde343/kaccelaction.h b/extra/kde343/kaccelaction.h index 396e218..52ae113 100644 --- a/extra/kde343/kaccelaction.h +++ b/extra/kde343/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -363,7 +363,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde343/kaccelbase.h b/extra/kde343/kaccelbase.h index f582cce..f366940 100644 --- a/extra/kde343/kaccelbase.h +++ b/extra/kde343/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 }; diff --git a/extra/kde343/kicontheme.h b/extra/kde343/kicontheme.h index 2d2e79f..136bf06 100644 --- a/extra/kde343/kicontheme.h +++ b/extra/kde343/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde343/kkeyserver_x11.h b/extra/kde343/kkeyserver_x11.h index 65d4e0c..eed3d30 100644 --- a/extra/kde343/kkeyserver_x11.h +++ b/extra/kde343/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns the X11 Mode_switch modifier mask/flag. @@ -330,7 +330,7 @@ namespace KKeyServer * @see accelModMaskX() * @since 3.5 */ - KDECORE_EXPORT uint modXModeSwitch(); + TDECORE_EXPORT uint modXModeSwitch(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -343,7 +343,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -354,7 +354,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -364,7 +364,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -374,7 +374,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -386,7 +386,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -397,7 +397,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -409,12 +409,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -425,7 +425,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -438,12 +438,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -451,19 +451,19 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde343/kpanelmenu.h b/extra/kde343/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde343/kpanelmenu.h +++ b/extra/kde343/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde343/ksharedptr.h b/extra/kde343/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde343/ksharedptr.h +++ b/extra/kde343/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde343/ksycocafactory.h b/extra/kde343/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde343/ksycocafactory.h +++ b/extra/kde343/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde343/ktoolbarbutton.h b/extra/kde343/ktoolbarbutton.h index f5e3be3..b26071c 100644 --- a/extra/kde343/ktoolbarbutton.h +++ b/extra/kde343/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -319,7 +319,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h 372745 2004-12-22 14:08:36Z dfaure $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde350/kaccelaction.h b/extra/kde350/kaccelaction.h index 4164ca5..2785277 100644 --- a/extra/kde350/kaccelaction.h +++ b/extra/kde350/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -366,7 +366,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde350/kaccelbase.h b/extra/kde350/kaccelbase.h index 0becbe0..e21c00c 100644 --- a/extra/kde350/kaccelbase.h +++ b/extra/kde350/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: /** Initialization mode of the KAccelBase, used in constructor. */ diff --git a/extra/kde350/kicontheme.h b/extra/kde350/kicontheme.h index a05ec93..d095d15 100644 --- a/extra/kde350/kicontheme.h +++ b/extra/kde350/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde350/kkeyserver_x11.h b/extra/kde350/kkeyserver_x11.h index 73c800d..b0a9766 100644 --- a/extra/kde350/kkeyserver_x11.h +++ b/extra/kde350/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns the X11 Mode_switch modifier mask/flag. @@ -330,7 +330,7 @@ namespace KKeyServer * @see accelModMaskX() * @since 3.5 */ - KDECORE_EXPORT uint modXModeSwitch(); + TDECORE_EXPORT uint modXModeSwitch(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -343,7 +343,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -354,7 +354,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -364,7 +364,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -374,7 +374,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -386,7 +386,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -397,7 +397,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -409,12 +409,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -425,7 +425,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -438,12 +438,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -451,7 +451,7 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * Converts the modifier given as user-readable string @@ -459,19 +459,19 @@ namespace KKeyServer * @internal * @since 3.5 */ - KDECORE_EXPORT uint stringUserToMod( const QString& mod ); + TDECORE_EXPORT uint stringUserToMod( const QString& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde350/kpanelmenu.h b/extra/kde350/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde350/kpanelmenu.h +++ b/extra/kde350/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde350/ksharedptr.h b/extra/kde350/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde350/ksharedptr.h +++ b/extra/kde350/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde350/ksycocafactory.h b/extra/kde350/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde350/ksycocafactory.h +++ b/extra/kde350/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde350/ktoolbarbutton.h b/extra/kde350/ktoolbarbutton.h index 7526f02..1c97cb7 100644 --- a/extra/kde350/ktoolbarbutton.h +++ b/extra/kde350/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -320,7 +320,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde351/kaccelaction.h b/extra/kde351/kaccelaction.h index 4164ca5..2785277 100644 --- a/extra/kde351/kaccelaction.h +++ b/extra/kde351/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -366,7 +366,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde351/kaccelbase.h b/extra/kde351/kaccelbase.h index 0becbe0..e21c00c 100644 --- a/extra/kde351/kaccelbase.h +++ b/extra/kde351/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: /** Initialization mode of the KAccelBase, used in constructor. */ diff --git a/extra/kde351/kicontheme.h b/extra/kde351/kicontheme.h index 5077005..bdb19d1 100644 --- a/extra/kde351/kicontheme.h +++ b/extra/kde351/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde351/kkeyserver_x11.h b/extra/kde351/kkeyserver_x11.h index 73c800d..b0a9766 100644 --- a/extra/kde351/kkeyserver_x11.h +++ b/extra/kde351/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns the X11 Mode_switch modifier mask/flag. @@ -330,7 +330,7 @@ namespace KKeyServer * @see accelModMaskX() * @since 3.5 */ - KDECORE_EXPORT uint modXModeSwitch(); + TDECORE_EXPORT uint modXModeSwitch(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -343,7 +343,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -354,7 +354,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -364,7 +364,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -374,7 +374,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -386,7 +386,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -397,7 +397,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -409,12 +409,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -425,7 +425,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -438,12 +438,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -451,7 +451,7 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * Converts the modifier given as user-readable string @@ -459,19 +459,19 @@ namespace KKeyServer * @internal * @since 3.5 */ - KDECORE_EXPORT uint stringUserToMod( const QString& mod ); + TDECORE_EXPORT uint stringUserToMod( const QString& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde351/kpanelmenu.h b/extra/kde351/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde351/kpanelmenu.h +++ b/extra/kde351/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde351/ksharedptr.h b/extra/kde351/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde351/ksharedptr.h +++ b/extra/kde351/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde351/ksycocafactory.h b/extra/kde351/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde351/ksycocafactory.h +++ b/extra/kde351/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde351/ktoolbarbutton.h b/extra/kde351/ktoolbarbutton.h index 7526f02..1c97cb7 100644 --- a/extra/kde351/ktoolbarbutton.h +++ b/extra/kde351/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -320,7 +320,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde352/kaccelaction.h b/extra/kde352/kaccelaction.h index 4164ca5..2785277 100644 --- a/extra/kde352/kaccelaction.h +++ b/extra/kde352/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -366,7 +366,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde352/kaccelbase.h b/extra/kde352/kaccelbase.h index 0becbe0..e21c00c 100644 --- a/extra/kde352/kaccelbase.h +++ b/extra/kde352/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: /** Initialization mode of the KAccelBase, used in constructor. */ diff --git a/extra/kde352/kicontheme.h b/extra/kde352/kicontheme.h index 5077005..bdb19d1 100644 --- a/extra/kde352/kicontheme.h +++ b/extra/kde352/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde352/kkeyserver_x11.h b/extra/kde352/kkeyserver_x11.h index 73c800d..b0a9766 100644 --- a/extra/kde352/kkeyserver_x11.h +++ b/extra/kde352/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns the X11 Mode_switch modifier mask/flag. @@ -330,7 +330,7 @@ namespace KKeyServer * @see accelModMaskX() * @since 3.5 */ - KDECORE_EXPORT uint modXModeSwitch(); + TDECORE_EXPORT uint modXModeSwitch(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -343,7 +343,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -354,7 +354,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -364,7 +364,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -374,7 +374,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -386,7 +386,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -397,7 +397,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -409,12 +409,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -425,7 +425,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -438,12 +438,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -451,7 +451,7 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * Converts the modifier given as user-readable string @@ -459,19 +459,19 @@ namespace KKeyServer * @internal * @since 3.5 */ - KDECORE_EXPORT uint stringUserToMod( const QString& mod ); + TDECORE_EXPORT uint stringUserToMod( const QString& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde352/kpanelmenu.h b/extra/kde352/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde352/kpanelmenu.h +++ b/extra/kde352/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde352/ksharedptr.h b/extra/kde352/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde352/ksharedptr.h +++ b/extra/kde352/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde352/ksycocafactory.h b/extra/kde352/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde352/ksycocafactory.h +++ b/extra/kde352/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde352/ktoolbarbutton.h b/extra/kde352/ktoolbarbutton.h index 7526f02..1c97cb7 100644 --- a/extra/kde352/ktoolbarbutton.h +++ b/extra/kde352/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -320,7 +320,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/extra/kde353/kaccelaction.h b/extra/kde353/kaccelaction.h index 4164ca5..2785277 100644 --- a/extra/kde353/kaccelaction.h +++ b/extra/kde353/kaccelaction.h @@ -69,7 +69,7 @@ class KConfigBase; * @see KKeyChooser * @see KKeyDialog */ -class KDECORE_EXPORT KAccelAction +class TDECORE_EXPORT KAccelAction { public: /** @@ -366,7 +366,7 @@ class KDECORE_EXPORT KAccelAction * @short A collection of accelerator actions * @see KAccelAction */ -class KDECORE_EXPORT KAccelActions +class TDECORE_EXPORT KAccelActions { public: /** diff --git a/extra/kde353/kaccelbase.h b/extra/kde353/kaccelbase.h index 0becbe0..e21c00c 100644 --- a/extra/kde353/kaccelbase.h +++ b/extra/kde353/kaccelbase.h @@ -118,7 +118,7 @@ class QWidget; * @short Configurable key binding support. */ -class KDECORE_EXPORT KAccelBase +class TDECORE_EXPORT KAccelBase { public: /** Initialization mode of the KAccelBase, used in constructor. */ diff --git a/extra/kde353/kicontheme.h b/extra/kde353/kicontheme.h index 5077005..bdb19d1 100644 --- a/extra/kde353/kicontheme.h +++ b/extra/kde353/kicontheme.h @@ -32,7 +32,7 @@ class KIconPrivate; * @see KIconTheme * @see KIconLoader */ -class KDECORE_EXPORT KIcon +class TDECORE_EXPORT KIcon { public: KIcon() { size = 0; } @@ -176,7 +176,7 @@ inline KIcon::Group operator++(KIcon::Group& group,int) { KIcon::Group ret = gro * iconloader but can be used by others too. * @see KIconLoader */ -class KDECORE_EXPORT KIconTheme +class TDECORE_EXPORT KIconTheme { public: /** diff --git a/extra/kde353/kkeyserver_x11.h b/extra/kde353/kkeyserver_x11.h index 73c800d..b0a9766 100644 --- a/extra/kde353/kkeyserver_x11.h +++ b/extra/kde353/kkeyserver_x11.h @@ -44,7 +44,7 @@ namespace KKeyServer * @see KKey * @see KKeyServer */ - struct KDECORE_EXPORT Sym + struct TDECORE_EXPORT Sym { public: /// the actual value of the symbol @@ -134,7 +134,7 @@ namespace KKeyServer * Represents a key press. * @see KKey */ - struct KDECORE_EXPORT Key + struct TDECORE_EXPORT Key { /// Code for native Keys in Qt enum { CODE_FOR_QT = 256 }; @@ -241,7 +241,7 @@ namespace KKeyServer /** * TODO: please document this class */ - struct KDECORE_EXPORT Variations + struct TDECORE_EXPORT Variations { enum { MAX_VARIATIONS = 4 }; @@ -257,14 +257,14 @@ namespace KKeyServer }; /// TODO: please document - KDECORE_EXPORT bool initializeMods(); + TDECORE_EXPORT bool initializeMods(); /** * Returns the equivalent X modifier mask of the given modifier flag. * @param modFlag the generic flags to check * @return the window system specific flags */ - KDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); + TDECORE_EXPORT uint modX( KKey::ModFlag modFlag ); /** * Returns true if the current keyboard layout supports the Win key. @@ -272,42 +272,42 @@ namespace KKeyServer * @return true if the keyboard has a Win key * @see modXWin() */ - KDECORE_EXPORT bool keyboardHasWinKey(); + TDECORE_EXPORT bool keyboardHasWinKey(); /** * Returns the X11 Shift modifier mask/flag. * @return the X11 Shift modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXShift(); + TDECORE_EXPORT uint modXShift(); /** * Returns the X11 Lock modifier mask/flag. * @return the X11 Lock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXLock(); + TDECORE_EXPORT uint modXLock(); /** * Returns the X11 Ctrl modifier mask/flag. * @return the X11 Ctrl modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXCtrl(); + TDECORE_EXPORT uint modXCtrl(); /** * Returns the X11 Alt (Mod1) modifier mask/flag. * @return the X11 Alt (Mod1) modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXAlt(); + TDECORE_EXPORT uint modXAlt(); /** * Returns the X11 NumLock modifier mask/flag. * @return the X11 NumLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXNumLock(); + TDECORE_EXPORT uint modXNumLock(); /** * Returns the X11 Win (Mod3) modifier mask/flag. @@ -315,14 +315,14 @@ namespace KKeyServer * @see keyboardHasWinKey() * @see accelModMaskX() */ - KDECORE_EXPORT uint modXWin(); + TDECORE_EXPORT uint modXWin(); /** * Returns the X11 ScrollLock modifier mask/flag. * @return the X11 ScrollLock modifier mask/flag. * @see accelModMaskX() */ - KDECORE_EXPORT uint modXScrollLock(); + TDECORE_EXPORT uint modXScrollLock(); /** * Returns the X11 Mode_switch modifier mask/flag. @@ -330,7 +330,7 @@ namespace KKeyServer * @see accelModMaskX() * @since 3.5 */ - KDECORE_EXPORT uint modXModeSwitch(); + TDECORE_EXPORT uint modXModeSwitch(); /** * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and @@ -343,7 +343,7 @@ namespace KKeyServer * @see modXWin() * @see modXScrollLock() */ - KDECORE_EXPORT uint accelModMaskX(); + TDECORE_EXPORT uint accelModMaskX(); /** * Extracts the symbol from the given Qt key and @@ -354,7 +354,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); + TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym ); /** * Extracts the modifiers from the given Qt key and @@ -364,7 +364,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see Qt::Key */ - KDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); + TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod ); /** * Converts the given symbol to a Qt key code. @@ -374,7 +374,7 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); + TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -386,7 +386,7 @@ namespace KKeyServer * @see Qt::Key * @see KKey */ - KDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); + TDECORE_EXPORT bool modToModQt( uint mod, int& modQt ); /** * Converts the mask of ORed KKey::ModFlag modifiers to @@ -397,7 +397,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modToModX( uint mod, uint& modX ); + TDECORE_EXPORT bool modToModX( uint mod, uint& modX ); /** * Converts the mask of ORed X11 modifiers to @@ -409,12 +409,12 @@ namespace KKeyServer * @see Qt::Key */ //wrapped for win32 - KDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); + TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt ); /** * Converts the Qt-compatible button state to x11 modifier. */ - KDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); + TDECORE_EXPORT int qtButtonStateToMod( Qt::ButtonState s ); /** * Converts the mask of ORed X11 modifiers to @@ -425,7 +425,7 @@ namespace KKeyServer * @return true if successful, false otherwise * @see KKey */ - KDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); + TDECORE_EXPORT bool modXToMod( uint modX, uint& mod ); /** * Converts a X11 key code and a mask of ORed X11 modifiers @@ -438,12 +438,12 @@ namespace KKeyServer * @see Qt::Key * @see Sym */ - KDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); + TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX ); /** * @internal */ - KDECORE_EXPORT QString modToStringInternal( uint mod ); + TDECORE_EXPORT QString modToStringInternal( uint mod ); /** * Converts the mask of ORed KKey::ModFlag modifiers to a @@ -451,7 +451,7 @@ namespace KKeyServer * @param mod the mask of ORed KKey::ModFlag modifiers * @return the user-readable string */ - KDECORE_EXPORT QString modToStringUser( uint mod ); + TDECORE_EXPORT QString modToStringUser( uint mod ); /** * Converts the modifier given as user-readable string @@ -459,19 +459,19 @@ namespace KKeyServer * @internal * @since 3.5 */ - KDECORE_EXPORT uint stringUserToMod( const QString& mod ); + TDECORE_EXPORT uint stringUserToMod( const QString& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); + TDECORE_EXPORT bool stringToSymMod( const QString&, uint& sym, uint& mod ); /** * @internal * Unimplemented? */ - KDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); + TDECORE_EXPORT void keyQtToKeyX( uint keyCombQt, unsigned char *pKeyCodeX, uint *pKeySymX, uint *pKeyModX ); } #endif // !_KKEYSERVER_X11_H diff --git a/extra/kde353/kpanelmenu.h b/extra/kde353/kpanelmenu.h index f89508d..293b26a 100644 --- a/extra/kde353/kpanelmenu.h +++ b/extra/kde353/kpanelmenu.h @@ -50,7 +50,7 @@ class KPanelMenuPrivate; * * @author The kicker maintainers, Michael Goffioul */ -class KDEUI_EXPORT KPanelMenu : public KPopupMenu +class TDEUI_EXPORT KPanelMenu : public KPopupMenu { Q_OBJECT diff --git a/extra/kde353/ksharedptr.h b/extra/kde353/ksharedptr.h index ada0841..8338145 100644 --- a/extra/kde353/ksharedptr.h +++ b/extra/kde353/ksharedptr.h @@ -37,7 +37,7 @@ * * @author Waldo Bastian */ -class KDECORE_EXPORT KShared { +class TDECORE_EXPORT KShared { public: /** * Standard constructor. This will initialize the reference count diff --git a/extra/kde353/ksycocafactory.h b/extra/kde353/ksycocafactory.h index 65bb9d9..fddfb8e 100644 --- a/extra/kde353/ksycocafactory.h +++ b/extra/kde353/ksycocafactory.h @@ -36,7 +36,7 @@ typedef QDict KSycocaEntryDict; * @internal * Base class for sycoca factories */ -class KDECORE_EXPORT KSycocaFactory +class TDECORE_EXPORT KSycocaFactory { public: virtual KSycocaFactoryId factoryId() const = 0; @@ -134,7 +134,7 @@ protected: /** This, instead of a typedef, allows to declare "class ..." in header files * @internal */ -class KDECORE_EXPORT KSycocaFactoryList : public QPtrList +class TDECORE_EXPORT KSycocaFactoryList : public QPtrList { public: KSycocaFactoryList() { } diff --git a/extra/kde353/ktoolbarbutton.h b/extra/kde353/ktoolbarbutton.h index 7526f02..1c97cb7 100644 --- a/extra/kde353/ktoolbarbutton.h +++ b/extra/kde353/ktoolbarbutton.h @@ -41,7 +41,7 @@ class QPainter; * KToolBar methods instead. * @internal */ -class KDEUI_EXPORT KToolBarButton : public QToolButton +class TDEUI_EXPORT KToolBarButton : public QToolButton { Q_OBJECT @@ -320,7 +320,7 @@ private: * @internal * @version $Id: ktoolbarbutton.h 465272 2005-09-29 09:47:40Z mueller $ */ -class KDEUI_EXPORT KToolBarButtonList : public QIntDict +class TDEUI_EXPORT KToolBarButtonList : public QIntDict { public: KToolBarButtonList(); diff --git a/pykde350.prj b/pykde350.prj index 2e2635f..4e48ef9 100644 --- a/pykde350.prj +++ b/pykde350.prj @@ -90,7 +90,7 @@ define = "Q_UINT32", "ulong" define = "Q_INT64", "longlong" define = "Q_UINT64", "ulonglong" define = "mutable union", "union" -define = "KDECORE_EXPORT", "" +define = "TDECORE_EXPORT", "" define = "KDE_EXPORT", "" retain @@ -130,7 +130,7 @@ amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule -define = "KDEFX_EXPORT", "" +define = "TDEFX_EXPORT", "" retain @@ -162,7 +162,7 @@ sipslot = receiver member kaccelmenu sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar sipslot = recvr slot kstdaction define = "QT_VERSION", "301" -define = "KDEUI_EXPORT", "" +define = "TDEUI_EXPORT", "" retain @@ -424,7 +424,7 @@ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\ -ldcopcmodule -ltdeui -ltdeuicmodule -define = "KDEPRINT_EXPORT", "" +define = "TDEPRINT_EXPORT", "" retain // ----------------------------------------- diff --git a/pykde351.prj b/pykde351.prj index d92e263..e272870 100644 --- a/pykde351.prj +++ b/pykde351.prj @@ -90,7 +90,7 @@ define = "Q_UINT32", "ulong" define = "Q_INT64", "longlong" define = "Q_UINT64", "ulonglong" define = "mutable union", "union" -define = "KDECORE_EXPORT", "" +define = "TDECORE_EXPORT", "" define = "KDE_EXPORT", "" retain @@ -130,7 +130,7 @@ amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule -define = "KDEFX_EXPORT", "" +define = "TDEFX_EXPORT", "" retain @@ -162,7 +162,7 @@ sipslot = receiver member kaccelmenu sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar sipslot = recvr slot kstdaction define = "QT_VERSION", "301" -define = "KDEUI_EXPORT", "" +define = "TDEUI_EXPORT", "" retain @@ -424,7 +424,7 @@ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\ -ldcopcmodule -ltdeui -ltdeuicmodule -define = "KDEPRINT_EXPORT", "" +define = "TDEPRINT_EXPORT", "" retain // ----------------------------------------- diff --git a/pykde352.prj b/pykde352.prj index 25a0f86..b8491e8 100644 --- a/pykde352.prj +++ b/pykde352.prj @@ -90,7 +90,7 @@ define = "Q_UINT32", "ulong" define = "Q_INT64", "longlong" define = "Q_UINT64", "ulonglong" define = "mutable union", "union" -define = "KDECORE_EXPORT", "" +define = "TDECORE_EXPORT", "" define = "KDE_EXPORT", "" retain @@ -130,7 +130,7 @@ amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule -define = "KDEFX_EXPORT", "" +define = "TDEFX_EXPORT", "" retain @@ -162,7 +162,7 @@ sipslot = receiver member kaccelmenu sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar sipslot = recvr slot kstdaction define = "QT_VERSION", "301" -define = "KDEUI_EXPORT", "" +define = "TDEUI_EXPORT", "" retain @@ -424,7 +424,7 @@ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\ -ldcopcmodule -ltdeui -ltdeuicmodule -define = "KDEPRINT_EXPORT", "" +define = "TDEPRINT_EXPORT", "" retain // ----------------------------------------- diff --git a/pykde353.prj b/pykde353.prj index 24404b3..4dc5173 100644 --- a/pykde353.prj +++ b/pykde353.prj @@ -90,7 +90,7 @@ define = "Q_UINT32", "ulong" define = "Q_INT64", "longlong" define = "Q_UINT64", "ulonglong" define = "mutable union", "union" -define = "KDECORE_EXPORT", "" +define = "TDECORE_EXPORT", "" define = "KDE_EXPORT", "" retain @@ -130,7 +130,7 @@ amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule -define = "KDEFX_EXPORT", "" +define = "TDEFX_EXPORT", "" retain @@ -162,7 +162,7 @@ sipslot = receiver member kaccelmenu sipslot = receiver slot kaction kactionclasses kbuttonbox ktoolbar sipslot = recvr slot kstdaction define = "QT_VERSION", "301" -define = "KDEUI_EXPORT", "" +define = "TDEUI_EXPORT", "" retain @@ -424,7 +424,7 @@ amend = * all parent /Transfer/ include = ../tdecore @KDE_INCLUDEPATH@/tdeprint libs = -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\ -ldcopcmodule -ltdeui -ltdeuicmodule -define = "KDEPRINT_EXPORT", "" +define = "TDEPRINT_EXPORT", "" retain // -----------------------------------------