TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace KDE_Q_EXPORT_PLUGIN, KDE_PACKED and KDE_WEAK_SYMBOL with TDE_* equivalent

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 0f0c5a4d07)
pull/280/head
Michele Calgaro 6 months ago
parent 9c9f5bf82c
commit 4864f9daf6
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
11 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
kimgio/pcx.h
Unescape View File

@ -98,6 +98,6 @@ class PCXHEADER
// found only in PB IV/IV Plus
TQ_UINT16 VScreenSize; // Vertical screen size in pixels. New field
// found only in PB IV/IV Plus
} KDE_PACKED;
} TDE_PACKED;
#endif // PCX_H

22
tdecore/kdemacros.h.cmake
Unescape View File

@ -50,25 +50,29 @@
#endif
/**
* KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
* TDE_EXPORT_PLUGIN is a workaround for Qt not being able to
* cope with symbol visibility.
*/
#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
#define TDE_EXPORT_PLUGIN(PLUGIN) \
TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
TQ_EXPORT_PLUGIN(PLUGIN)
#define KDE_Q_EXPORT_PLUGIN TDE_EXPORT_PLUGIN
/**
* The KDE_PACKED can be used to hint the compiler that a particular
* The TDE_PACKED can be used to hint the compiler that a particular
* structure or class should not contain unnecessary paddings.
*/
#ifdef __GNUC__
#define KDE_PACKED __attribute__((__packed__))
#define TDE_PACKED __attribute__((__packed__))
#else
#define KDE_PACKED
#define TDE_PACKED
#endif
#define KDE_PACKED TDE_PACKED
/**
* The TDE_DEPRECATED macro can be used to trigger compile-time warnings
* with newer compilers when deprecated functions are used.
@ -205,15 +209,17 @@
RESERVE_VIRTUAL_9
/**
* The KDE_WEAK_SYMBOL macro can be used to tell the compiler that
* The TDE_WEAK_SYMBOL macro can be used to tell the compiler that
* a particular function should be a weak symbol (that e.g. may be overriden
* in another library, -Bdirect will not bind this symbol directly)
*/
#ifdef __GNUC__
#define KDE_WEAK_SYMBOL __attribute__((__weak__))
#define TDE_WEAK_SYMBOL __attribute__((__weak__))
#else
#define KDE_WEAK_SYMBOL
#define TDE_WEAK_SYMBOL
#endif
#define KDE_WEAK_SYMBOL TDE_WEAK_SYMBOL
#endif /* _KDE_MACROS_H_ */

26
tdecore/kdemacros.h.in
Unescape View File

@ -49,25 +49,29 @@
#endif
/**
* KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
* TDE_EXPORT_PLUGIN is a workaround for Qt not being able to
* cope with symbol visibility.
*/
#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
#define TDE_EXPORT_PLUGIN(PLUGIN) \
TQ_EXTERN_C TDE_EXPORT const char* qt_ucm_query_verification_data(); \
TQ_EXTERN_C TDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
TQ_EXPORT_PLUGIN(PLUGIN)
#define KDE_Q_EXPORT_PLUGIN TDE_EXPORT_PLUGIN
/**
* The KDE_PACKED can be used to hint the compiler that a particular
* The TDE_PACKED can be used to hint the compiler that a particular
* structure or class should not contain unnecessary paddings.
*/
#ifdef __GNUC__
#define KDE_PACKED __attribute__((__packed__))
#define TDE_PACKED __attribute__((__packed__))
#else
#define KDE_PACKED
#define TDE_PACKED
#endif
#define KDE_PACKED TDE_PACKED
/**
* The TDE_DEPRECATED macro can be used to trigger compile-time warnings
* with newer compilers when deprecated functions are used.
@ -101,14 +105,14 @@
* \endcode
*
* \note
* It does not make much sense to use the TDE_DEPRECATED keyword for a Qt signal;
* It does not make much sense to use the TDE_DEPRECATED keyword for a TQt signal;
* this is because usually get called by the class which they belong to,
* and one'd assume that a class author doesn't use deprecated methods of his
* own class. The only exception to this are signals which are connected to
* other signals; they get invoked from moc-generated code. In any case,
* printing a warning message in either case is not useful.
* For slots, it can make sense (since slots can be invoked directly) but be
* aware that if the slots get triggered by a signal, the will get called from
* aware that if the slots get triggered by a signal, it will get called from
* moc code as well and thus the warnings are useless.
*
* \par
@ -204,15 +208,17 @@
RESERVE_VIRTUAL_9
/**
* The KDE_WEAK_SYMBOL macro can be used to tell the compiler that
* The TDE_WEAK_SYMBOL macro can be used to tell the compiler that
* a particular function should be a weak symbol (that e.g. may be overriden
* in another library, -Bdirect will not bind this symbol directly)
*/
#ifdef __GNUC__
#define KDE_WEAK_SYMBOL __attribute__((__weak__))
#define TDE_WEAK_SYMBOL __attribute__((__weak__))
#else
#define KDE_WEAK_SYMBOL
#define TDE_WEAK_SYMBOL
#endif
#define KDE_WEAK_SYMBOL TDE_WEAK_SYMBOL
#endif /* _KDE_MACROS_H_ */

6
tdeio/tdeio/kprotocolinfo.h
Unescape View File

@ -98,7 +98,7 @@ public:
*/
static bool isKnownProtocol( const TQString& protocol )
#ifdef KPROTOCOLINFO_TDECORE
KDE_WEAK_SYMBOL
TDE_WEAK_SYMBOL
#endif
;
@ -227,7 +227,7 @@ public:
*/
static bool isHelperProtocol( const TQString& protocol )
#ifdef KPROTOCOLINFO_TDECORE
KDE_WEAK_SYMBOL
TDE_WEAK_SYMBOL
#endif
;
@ -255,7 +255,7 @@ public:
*/
static bool isFilterProtocol( const TQString& protocol )
#ifdef KPROTOCOLINFO_TDECORE
KDE_WEAK_SYMBOL
TDE_WEAK_SYMBOL
#endif
;

2
tdestyles/highcolor/highcolor.cpp
Unescape View File

@ -79,7 +79,7 @@ class HighColorStylePlugin : public TQStylePlugin
}
};
KDE_Q_EXPORT_PLUGIN( HighColorStylePlugin )
TDE_EXPORT_PLUGIN( HighColorStylePlugin )
// ---------------------------------------------------

2
tdestyles/highcontrast/highcontrast.cpp
Unescape View File

@ -73,7 +73,7 @@ class HighContrastStylePlugin : public TQStylePlugin
}
};
KDE_Q_EXPORT_PLUGIN (HighContrastStylePlugin)
TDE_EXPORT_PLUGIN (HighContrastStylePlugin)
// ---------------------------------------------------

2
tdestyles/keramik/keramik.cpp
Unescape View File

@ -93,7 +93,7 @@ public:
}
};
KDE_Q_EXPORT_PLUGIN( KeramikStylePlugin )
TDE_EXPORT_PLUGIN( KeramikStylePlugin )
// ---------------------------------------------------

2
tdestyles/kthemestyle/kthemestyle.cpp
Unescape View File

@ -158,7 +158,7 @@ public:
}
};
KDE_Q_EXPORT_PLUGIN( KThemeStylePlugin )
TDE_EXPORT_PLUGIN( KThemeStylePlugin )
void kDrawWindowsArrow ( TQPainter *p, const TQStyleControlElementData &ceData, const TQStyle::ControlElementFlags elementFlags, const TQStyle* style, TQStyle::PrimitiveElement pe, bool down,

2
tdestyles/light/light.cpp
Unescape View File

@ -58,4 +58,4 @@ TQStyle *LightStylePlugin::create(const TQString &s)
return 0;
}
KDE_Q_EXPORT_PLUGIN( LightStylePlugin )
TDE_EXPORT_PLUGIN( LightStylePlugin )

2
tdestyles/plastik/plastik.cpp
Unescape View File

@ -148,7 +148,7 @@ class PlastikStylePlugin : public TQStylePlugin
}
};
KDE_Q_EXPORT_PLUGIN( PlastikStylePlugin )
TDE_EXPORT_PLUGIN( PlastikStylePlugin )
// -- end --
PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrollBar),

2
tdewidgets/maketdewidgets.cpp
Unescape View File

@ -104,7 +104,7 @@ static const char widgetCreate[] = " if (key == TQString::fromLatin1(\"%
" return new %ImplClass%ConstructorArgs;\n";
static const char endCreate[] = " return 0;\n"
"}\n"
"KDE_Q_EXPORT_PLUGIN(%PluginName)\n";
"TDE_EXPORT_PLUGIN(%PluginName)\n";
static TDECmdLineOptions options[] =

Write Preview
Loading…
Cancel
Save