1 files changed, 33 insertions, 66 deletions
diff --git a/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
index 008bac11..6bca547a 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
+++ b/lib/compatibility/tdemdi/qextmdi/kdemacros.h.in
@@ -24,7 +24,7 @@
 #undef __KDE_HAVE_GCC_VISIBILITY
 
 /**
- * The KDE_NO_EXPORT macro marks the symbol of the given variable 
+ * The TDE_NO_EXPORT macro marks the symbol of the given variable 
  * to be hidden. A hidden symbol is stripped during the linking step, 
  * so it can't be used from outside the resulting library, which is similar
  * to static. However, static limits the visibility to the current 
@@ -32,76 +32,76 @@
  * units.
  *
  * \code
- * int KDE_NO_EXPORT foo;
- * int KDE_EXPORT bar;
+ * int TDE_NO_EXPORT foo;
+ * int TDE_EXPORT bar;
  * \end
  */
 
 #ifdef __KDE_HAVE_GCC_VISIBILITY
-#define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
-#define KDE_EXPORT __attribute__ ((visibility("default")))
+#define TDE_NO_EXPORT __attribute__ ((visibility("hidden")))
+#define TDE_EXPORT __attribute__ ((visibility("default")))
 #elif defined(TQ_WS_WIN)
-#define KDE_NO_EXPORT
-#define KDE_EXPORT __declspec(dllexport)
+#define TDE_NO_EXPORT
+#define TDE_EXPORT __declspec(dllexport)
 #else
-#define KDE_NO_EXPORT
-#define KDE_EXPORT
+#define TDE_NO_EXPORT
+#define TDE_EXPORT
 #endif
 
 /**
- * KDE_TQ_EXPORT_PLUGIN is a workaround for TQt not being able to
+ * TDE_EXPORT_PLUGIN is a workaround for TQt not being able to
  * cope with symbol visibility.
  */
-#define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+#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)
 
 /**
- * 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
 
 /**
- * The KDE_DEPRECATED macro can be used to trigger compile-time warnings
+ * The TDE_DEPRECATED macro can be used to trigger compile-time warnings
  * with newer compilers when deprecated functions are used.
  *
  * For non-inline functions, the macro gets inserted at the very end of the
  * function declaration, right before the semicolon:
  *
  * \code
- * DeprecatedConstructor() KDE_DEPRECATED;
- * void deprecatedFunctionA() KDE_DEPRECATED;
- * int deprecatedFunctionB() const KDE_DEPRECATED;
+ * DeprecatedConstructor() TDE_DEPRECATED;
+ * void deprecatedFunctionA() TDE_DEPRECATED;
+ * int deprecatedFunctionB() const TDE_DEPRECATED;
  * \endcode
  *
  * Functions which are implemented inline are handled differently: for them,
- * the KDE_DEPRECATED macro is inserted at the front, right before the return
+ * the TDE_DEPRECATED macro is inserted at the front, right before the return
  * type, but after "static" or "virtual":
  *
  * \code
- * KDE_DEPRECATED void deprecatedInlineFunctionA() { .. }
- * virtual KDE_DEPRECATED int deprecatedInlineFunctionB() { .. }
- * static KDE_DEPRECATED bool deprecatedInlineFunctionC() { .. }
+ * TDE_DEPRECATED void deprecatedInlineFunctionA() { .. }
+ * virtual TDE_DEPRECATED int deprecatedInlineFunctionB() { .. }
+ * static TDE_DEPRECATED bool deprecatedInlineFunctionC() { .. }
  * \end
  *
  * You can also mark whole structs or classes as deprecated, by inserting the
- * KDE_DEPRECATED macro after the struct/class keyword, but before the
+ * TDE_DEPRECATED macro after the struct/class keyword, but before the
  * name of the struct/class:
  *
  * \code
- * class KDE_DEPRECATED DeprecatedClass { };
- * struct KDE_DEPRECATED DeprecatedStruct { };
+ * class TDE_DEPRECATED DeprecatedClass { };
+ * struct TDE_DEPRECATED DeprecatedStruct { };
  * \endcode
  *
  * \note
- * It does not make much sense to use the KDE_DEPRECATED keyword for a TQt 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
@@ -112,58 +112,25 @@
  * moc code as well and thus the warnings are useless.
  *
  * \par
- * Also note that it is not possible to use KDE_DEPRECATED for classes which
+ * Also note that it is not possible to use TDE_DEPRECATED for classes which
  * use the k_dcop keyword (to indicate a DCOP interface declaration); this is
  * because the dcopidl program would choke on the unexpected declaration
  * syntax.
  */
 
-#ifndef KDE_DEPRECATED
+#ifndef TDE_DEPRECATED
 #if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 >= 2)
   /* gcc >= 3.2 */
-# define KDE_DEPRECATED __attribute__ ((deprecated))
+# define TDE_DEPRECATED __attribute__ ((deprecated))
 #elif defined(_MSC_VER) && (_MSC_VER >= 1300)
   /* msvc >= 7 */
-# define KDE_DEPRECATED __declspec(deprecated)
+# define TDE_DEPRECATED __declspec(deprecated)
 #else
-# define KDE_DEPRECATED
+# define TDE_DEPRECATED
 #endif
 #endif
 
 /**
- * The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate to
- * 'true'. When used in an if ( ) statement, it gives a hint to the compiler
- * that the following codeblock is likely to get executed. Providing this
- * information helps the compiler to optimize the code for better performance.
- * Using the macro has an insignificant code size or runtime memory footprint impact.
- * The code semantics is not affected.
- *
- * \note
- * Providing wrong information ( like marking a condition that almost never
- * passes as 'likely' ) will cause a significant runtime slowdown. Therefore only
- * use it for cases where you can be sure about the odds of the expression to pass
- * in all cases ( independent from e.g. user configuration ).
- *
- * \par
- * The KDE_ISUNLIKELY macro tags an expression as unlikely evaluating to 'true'. 
- *
- * \note
- * Do NOT use ( !KDE_ISLIKELY(foo) ) as an replacement for KDE_ISUNLIKELY !
- *
- * \code
- * if ( KDE_ISUNLIKELY( testsomething() ) )
- *     abort();     // assume its unlikely that the application aborts
- * \endcode
- */
-#if __GNUC__ - 0 >= 3
-# define KDE_ISLIKELY( x )    __builtin_expect(!!(x),1)
-# define KDE_ISUNLIKELY( x )  __builtin_expect(!!(x),0)
-#else
-# define KDE_ISLIKELY( x )   ( x )
-# define KDE_ISUNLIKELY( x )  ( x )
-#endif
-
-/**
  * This macro, and it's friends going up to 10 reserve a fixed number of virtual
  * functions in a class.  Because adding virtual functions to a class changes the
  * size of the vtable, adding virtual functions to a class breaks binary