From 9fa1a9ed2f99b81348c5636b1bd4d82dba553e1e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 3 May 2024 12:17:04 +0900 Subject: [PATCH] Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT Signed-off-by: Michele Calgaro (cherry picked from commit 8bc8b24757e1cdf11d60bbeea3c7eaac7e4b8dd0) --- .../scripting/chalkcore/chalkcoremodule.cpp | 2 +- .../scripting/chalkcore/chalkcoremodule.h | 2 +- .../viewplugins/scripting/scripting.cpp | 2 +- kexi/kexi_export.h | 34 ++++----- kexi/kexidb/kexidb_export.h | 10 +-- kexi/kexiutils/kexiutils_export.h | 2 +- kexi/plugins/macros/lib/komacro_export.h | 8 +- .../scripting/kexiapp/kexiappmodule.cpp | 2 +- .../plugins/scripting/kexidb/kexidbmodule.cpp | 2 +- .../scripting/kspreadcore/kspreadcoremodule.h | 2 +- kspread/plugins/scripting/scripting.cpp | 2 +- lib/kofficecore/koffice_export.h | 76 +++++++++---------- lib/kross/main/manager.h | 2 +- lib/kross/main/scriptguiclient.h | 2 +- 14 files changed, 74 insertions(+), 74 deletions(-) diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index 45c1705af..14419eb18 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -51,7 +51,7 @@ extern "C" * Exported an loadable function as entry point to use * the \a KexiAppModule. */ - Kross::Api::Object* KDE_EXPORT init_module(Kross::Api::Manager* manager) + Kross::Api::Object* TDE_EXPORT init_module(Kross::Api::Manager* manager) { return new Kross::ChalkCore::ChalkCoreModule(manager); } diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h index 5ddb004de..e0dbda7d5 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h @@ -22,7 +22,7 @@ #include #include -#define KROSS_MAIN_EXPORT KDE_EXPORT +#define KROSS_MAIN_EXPORT TDE_EXPORT #include #include diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp index 0642af52c..dff94b36a 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cpp +++ b/chalk/plugins/viewplugins/scripting/scripting.cpp @@ -34,7 +34,7 @@ #include #include -#define KROSS_MAIN_EXPORT KDE_EXPORT +#define KROSS_MAIN_EXPORT TDE_EXPORT #include
#include
#include
diff --git a/kexi/kexi_export.h b/kexi/kexi_export.h index f8b238bd9..f73c9a34a 100644 --- a/kexi/kexi_export.h +++ b/kexi/kexi_export.h @@ -23,7 +23,7 @@ #include #ifdef MAKE_KEXICORE_LIB -# define KEXICORE_EXPORT KDE_EXPORT +# define KEXICORE_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXICORE_EXPORT KDE_IMPORT #else @@ -31,7 +31,7 @@ #endif #ifdef MAKE_KEXIMAIN_LIB -# define KEXIMAIN_EXPORT KDE_EXPORT +# define KEXIMAIN_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIMAIN_EXPORT KDE_IMPORT #else @@ -39,7 +39,7 @@ #endif #ifdef MAKE_KEXITABLEFILTERS_LIB -# define KEXITABLEFILTERS_EXPORT KDE_EXPORT +# define KEXITABLEFILTERS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXITABLEFILTERS_EXPORT KDE_IMPORT #else @@ -47,7 +47,7 @@ #endif #ifdef MAKE_KEXIDATATABLE_LIB -# define KEXIDATATABLE_EXPORT KDE_EXPORT +# define KEXIDATATABLE_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIDATATABLE_EXPORT KDE_IMPORT #else @@ -57,7 +57,7 @@ #ifndef KEXIEXTWIDGETS_EXPORT //tmp #ifdef MAKE_KEXIEXTWIDGETS_LIB -# define KEXIEXTWIDGETS_EXPORT KDE_EXPORT +# define KEXIEXTWIDGETS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIEXTWIDGETS_EXPORT KDE_IMPORT #else @@ -67,7 +67,7 @@ #endif #ifdef MAKE_KFORMEDITOR_LIB -# define KFORMEDITOR_EXPORT KDE_EXPORT +# define KFORMEDITOR_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KFORMEDITOR_EXPORT KDE_IMPORT #else @@ -75,7 +75,7 @@ #endif #ifdef MAKE_KEXIPRJWIZARD_LIB -# define KEXIPRJWIZARD_EXPORT KDE_EXPORT +# define KEXIPRJWIZARD_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIPRJWIZARD_EXPORT KDE_IMPORT #else @@ -83,7 +83,7 @@ #endif #ifdef MAKE_KEXIFILTER_LIB -# define KEXIFILTER_EXPORT KDE_EXPORT +# define KEXIFILTER_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIFILTER_EXPORT KDE_IMPORT #else @@ -91,7 +91,7 @@ #endif #ifdef MAKE_KEXIWIDGETS_LIB -# define KEXIWIDGETS_EXPORT KDE_EXPORT +# define KEXIWIDGETS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIWIDGETS_EXPORT KDE_IMPORT #else @@ -99,13 +99,13 @@ #endif #ifdef MAKE_KEXIUUID_LIB -# define KEXIUUID_EXPORT KDE_EXPORT +# define KEXIUUID_EXPORT TDE_EXPORT #else # define KEXIUUID_EXPORT //for apps #endif #ifdef MAKE_KEXIRELATIONSVIEW_LIB -# define KEXIRELATIONSVIEW_EXPORT KDE_EXPORT +# define KEXIRELATIONSVIEW_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIRELATIONSVIEW_EXPORT KDE_IMPORT #else @@ -113,7 +113,7 @@ #endif #ifdef MAKE_KEXIGUIUTILS_LIB -# define KEXIGUIUTILS_EXPORT KDE_EXPORT +# define KEXIGUIUTILS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIGUIUTILS_EXPORT KDE_IMPORT #else @@ -121,7 +121,7 @@ #endif #ifdef MAKE_KROSS_MAIN_LIB -# define KROSS_MAIN_EXPORT KDE_EXPORT +# define KROSS_MAIN_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KROSS_MAIN_EXPORT KDE_IMPORT #else @@ -129,7 +129,7 @@ #endif #ifdef MAKE_KEXIFORMUTILS_LIB -# define KEXIFORMUTILS_EXPORT KDE_EXPORT +# define KEXIFORMUTILS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIFORMUTILS_EXPORT KDE_IMPORT #else @@ -137,7 +137,7 @@ #endif #ifdef MAKE_KEXIREPORTUTILS_LIB -# define KEXIREPORTUTILS_EXPORT KDE_EXPORT +# define KEXIREPORTUTILS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIREPORTUTILS_EXPORT KDE_IMPORT #else @@ -147,7 +147,7 @@ /* temporary */ #ifndef KOPROPERTY_EXPORT # ifdef MAKE_KOPROPERTY_LIB -# define KOPROPERTY_EXPORT KDE_EXPORT +# define KOPROPERTY_EXPORT TDE_EXPORT # elif defined(KDE_MAKE_LIB) # define KOPROPERTY_EXPORT KDE_IMPORT # else @@ -158,7 +158,7 @@ /* temporary */ #ifndef KOMACRO_EXPORT # ifdef MAKE_KOMACRO_LIB -# define KOMACRO_EXPORT KDE_EXPORT +# define KOMACRO_EXPORT TDE_EXPORT # elif defined(KDE_MAKE_LIB) # define KOMACRO_EXPORT KDE_IMPORT # else diff --git a/kexi/kexidb/kexidb_export.h b/kexi/kexidb/kexidb_export.h index cd18539f4..220331a16 100644 --- a/kexi/kexidb/kexidb_export.h +++ b/kexi/kexidb/kexidb_export.h @@ -23,17 +23,17 @@ #ifdef __cplusplus # include /* this will also include , if available */ #endif -/* KDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ +/* TDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include /* workaround for KDElibs < 3.2 on !win32 */ -#ifndef KDE_EXPORT -# define KDE_EXPORT +#ifndef TDE_EXPORT +# define TDE_EXPORT #endif /* TODO: #include ??? */ #ifdef MAKE_KEXI_DB_LIB -# define KEXI_DB_EXPORT KDE_EXPORT +# define KEXI_DB_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXI_DB_EXPORT KDE_IMPORT #else @@ -41,7 +41,7 @@ #endif #ifdef MAKE_KEXIMIGR_LIB -# define KEXIMIGR_EXPORT KDE_EXPORT +# define KEXIMIGR_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIMIGR_EXPORT KDE_IMPORT #else diff --git a/kexi/kexiutils/kexiutils_export.h b/kexi/kexiutils/kexiutils_export.h index f3d4d2960..31a1fe7a9 100644 --- a/kexi/kexiutils/kexiutils_export.h +++ b/kexi/kexiutils/kexiutils_export.h @@ -23,7 +23,7 @@ #include #ifdef MAKE_KEXIUTILS_LIB -# define KEXIUTILS_EXPORT KDE_EXPORT +# define KEXIUTILS_EXPORT TDE_EXPORT #elif defined(KDE_MAKE_LIB) # define KEXIUTILS_EXPORT KDE_IMPORT #else diff --git a/kexi/plugins/macros/lib/komacro_export.h b/kexi/plugins/macros/lib/komacro_export.h index d3174235b..76e68f6d9 100644 --- a/kexi/plugins/macros/lib/komacro_export.h +++ b/kexi/plugins/macros/lib/komacro_export.h @@ -24,16 +24,16 @@ # include /* this will also include , if available */ #endif -/* KDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ +/* TDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include /* workaround for KDElibs < 3.2 on !win32 */ -#ifndef KDE_EXPORT -# define KDE_EXPORT +#ifndef TDE_EXPORT +# define TDE_EXPORT #endif #ifndef KOMACRO_EXPORT -# define KOMACRO_EXPORT KDE_EXPORT +# define KOMACRO_EXPORT TDE_EXPORT #endif #endif diff --git a/kexi/plugins/scripting/kexiapp/kexiappmodule.cpp b/kexi/plugins/scripting/kexiapp/kexiappmodule.cpp index 9a1c73d7e..ffdfebb93 100644 --- a/kexi/plugins/scripting/kexiapp/kexiappmodule.cpp +++ b/kexi/plugins/scripting/kexiapp/kexiappmodule.cpp @@ -37,7 +37,7 @@ extern "C" * Exported an loadable function as entry point to use * the \a KexiAppModule. */ - Kross::Api::Object* KDE_EXPORT init_module(Kross::Api::Manager* manager) + Kross::Api::Object* TDE_EXPORT init_module(Kross::Api::Manager* manager) { return new Kross::KexiApp::KexiAppModule(manager); } diff --git a/kexi/plugins/scripting/kexidb/kexidbmodule.cpp b/kexi/plugins/scripting/kexidb/kexidbmodule.cpp index 91472a1fa..f9dcf841c 100644 --- a/kexi/plugins/scripting/kexidb/kexidbmodule.cpp +++ b/kexi/plugins/scripting/kexidb/kexidbmodule.cpp @@ -36,7 +36,7 @@ extern "C" * Exported an loadable function as entry point to use * the \a KexiDBModule. */ - Kross::Api::Object* KDE_EXPORT init_module(Kross::Api::Manager* manager) + Kross::Api::Object* TDE_EXPORT init_module(Kross::Api::Manager* manager) { return new Kross::KexiDB::KexiDBModule(manager); } diff --git a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.h b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.h index 1816096c3..6800561b2 100644 --- a/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.h +++ b/kspread/plugins/scripting/kspreadcore/kspreadcoremodule.h @@ -23,7 +23,7 @@ #include #include -#define KROSS_MAIN_EXPORT KDE_EXPORT +#define KROSS_MAIN_EXPORT TDE_EXPORT #include #include diff --git a/kspread/plugins/scripting/scripting.cpp b/kspread/plugins/scripting/scripting.cpp index 2286ebdfc..ca5ef2678 100644 --- a/kspread/plugins/scripting/scripting.cpp +++ b/kspread/plugins/scripting/scripting.cpp @@ -26,7 +26,7 @@ #include #include -#define KROSS_MAIN_EXPORT KDE_EXPORT +#define KROSS_MAIN_EXPORT TDE_EXPORT #include
#include
#include
diff --git a/lib/kofficecore/koffice_export.h b/lib/kofficecore/koffice_export.h index 0f91de958..e425aff61 100644 --- a/lib/kofficecore/koffice_export.h +++ b/lib/kofficecore/koffice_export.h @@ -28,13 +28,13 @@ #ifdef TQ_WS_WIN /* workaround for KDElibs < 3.2 on !win32 */ -#ifndef KDE_EXPORT -# define KDE_EXPORT +#ifndef TDE_EXPORT +# define TDE_EXPORT #endif #ifndef KOFFICECORE_EXPORT # ifdef MAKE_KOFFICECORE_LIB -# define KOFFICECORE_EXPORT KDE_EXPORT +# define KOFFICECORE_EXPORT TDE_EXPORT # elif KDE_MAKE_LIB # define KOFFICECORE_EXPORT KDE_IMPORT # else @@ -44,7 +44,7 @@ #ifndef KOFFICEUI_EXPORT # ifdef MAKE_KOFFICEUI_LIB -# define KOFFICEUI_EXPORT KDE_EXPORT +# define KOFFICEUI_EXPORT TDE_EXPORT # elif KDE_MAKE_LIB # define KOFFICEUI_EXPORT KDE_IMPORT # else @@ -53,7 +53,7 @@ #endif #ifdef MAKE_KOSTORE_LIB -# define KOSTORE_EXPORT KDE_EXPORT +# define KOSTORE_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KOSTORE_EXPORT KDE_IMPORT #else @@ -61,7 +61,7 @@ #endif #ifdef MAKE_KOPALETTE_LIB -# define KOPALETTE_EXPORT KDE_EXPORT +# define KOPALETTE_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KOPALETTE_EXPORT KDE_IMPORT #else @@ -69,7 +69,7 @@ #endif #ifdef MAKE_KOWMF_LIB -# define KOWMF_EXPORT KDE_EXPORT +# define KOWMF_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KOWMF_EXPORT KDE_IMPORT #else @@ -77,7 +77,7 @@ #endif #ifdef MAKE_KWMF_LIB -# define KWMF_EXPORT KDE_EXPORT +# define KWMF_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KWMF_EXPORT KDE_IMPORT #else @@ -85,7 +85,7 @@ #endif #ifdef MAKE_KOTEXT_LIB -# define KOTEXT_EXPORT KDE_EXPORT +# define KOTEXT_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KOTEXT_EXPORT KDE_IMPORT #else @@ -93,7 +93,7 @@ #endif #ifdef MAKE_KOFORMULA_LIB -# define KOFORMULA_EXPORT KDE_EXPORT +# define KOFORMULA_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KOFORMULA_EXPORT KDE_IMPORT #else @@ -101,7 +101,7 @@ #endif #ifdef MAKE_KOPAINTER_LIB -# define KOPAINTER_EXPORT KDE_EXPORT +# define KOPAINTER_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KOPAINTER_EXPORT KDE_IMPORT #else @@ -109,7 +109,7 @@ #endif #ifdef MAKE_KWORD_LIB -# define KWORD_EXPORT KDE_EXPORT +# define KWORD_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KWORD_EXPORT KDE_IMPORT #else @@ -117,7 +117,7 @@ #endif #ifdef MAKE_KWMAILMERGE_LIB -# define KWMAILMERGE_EXPORT KDE_EXPORT +# define KWMAILMERGE_EXPORT TDE_EXPORT #elif KDE_MAKE_LIB # define KWMAILMERGE_EXPORT KDE_IMPORT #else @@ -126,7 +126,7 @@ #ifndef KOPROPERTY_EXPORT # ifdef MAKE_KOPROPERTY_LIB -# define KOPROPERTY_EXPORT KDE_EXPORT +# define KOPROPERTY_EXPORT TDE_EXPORT # elif KDE_MAKE_LIB # define KOPROPERTY_EXPORT KDE_IMPORT # else @@ -134,33 +134,33 @@ # endif #endif -#define KPRESENTER_EXPORT KDE_EXPORT -#define KCHART_EXPORT KDE_EXPORT -#define KDCHART_EXPORT KDE_EXPORT -#define KARBONCOMMON_EXPORT KDE_EXPORT -#define KARBONBASE_EXPORT KDE_EXPORT -#define KARBONCOMMAND_EXPORT KDE_EXPORT -#define KSPREAD_EXPORT KDE_EXPORT -#define KOSHELL_EXPORT KDE_EXPORT -#define KPLATO_EXPORT KDE_EXPORT -#define KPLATOCHART_EXPORT KDE_EXPORT -#define KUGAR_EXPORT KDE_EXPORT -#define KUGARDESIGNER_EXPORT KDE_EXPORT -#define KOFFICETOOLS_EXPORT KDE_EXPORT -#define KOFFICEFILTER_EXPORT KDE_EXPORT -#define KOCHARTINTERFACE_EXPORT KDE_EXPORT -#define KIVIOPLUGINS_EXPORT KDE_EXPORT -#define KIVIO_EXPORT KDE_EXPORT -#define KRITA_EXPORT KDE_EXPORT -#define KRITAUI_EXPORT KDE_EXPORT -#define KRITACORE_EXPORT KDE_EXPORT -#define KRITATOOL_EXPORT KDE_EXPORT -#define KRITAPAINT_EXPORT KDE_EXPORT -#define EXAMPLE_EXPORT KDE_EXPORT +#define KPRESENTER_EXPORT TDE_EXPORT +#define KCHART_EXPORT TDE_EXPORT +#define KDCHART_EXPORT TDE_EXPORT +#define KARBONCOMMON_EXPORT TDE_EXPORT +#define KARBONBASE_EXPORT TDE_EXPORT +#define KARBONCOMMAND_EXPORT TDE_EXPORT +#define KSPREAD_EXPORT TDE_EXPORT +#define KOSHELL_EXPORT TDE_EXPORT +#define KPLATO_EXPORT TDE_EXPORT +#define KPLATOCHART_EXPORT TDE_EXPORT +#define KUGAR_EXPORT TDE_EXPORT +#define KUGARDESIGNER_EXPORT TDE_EXPORT +#define KOFFICETOOLS_EXPORT TDE_EXPORT +#define KOFFICEFILTER_EXPORT TDE_EXPORT +#define KOCHARTINTERFACE_EXPORT TDE_EXPORT +#define KIVIOPLUGINS_EXPORT TDE_EXPORT +#define KIVIO_EXPORT TDE_EXPORT +#define KRITA_EXPORT TDE_EXPORT +#define KRITAUI_EXPORT TDE_EXPORT +#define KRITACORE_EXPORT TDE_EXPORT +#define KRITATOOL_EXPORT TDE_EXPORT +#define KRITAPAINT_EXPORT TDE_EXPORT +#define EXAMPLE_EXPORT TDE_EXPORT #else // not windows #if TDE_VERSION >= TDE_MAKE_VERSION(3,3,90) -#define KOFFICE_EXPORT KDE_EXPORT +#define KOFFICE_EXPORT TDE_EXPORT #else #define KOFFICE_EXPORT #endif diff --git a/lib/kross/main/manager.h b/lib/kross/main/manager.h index 5e7c43f45..ec4aa795b 100644 --- a/lib/kross/main/manager.h +++ b/lib/kross/main/manager.h @@ -51,7 +51,7 @@ namespace Kross { namespace Api { * interpreter like python. While \a Script spends a more * flexible container. */ - class KDE_EXPORT Manager : public MainModule + class TDE_EXPORT Manager : public MainModule { protected: diff --git a/lib/kross/main/scriptguiclient.h b/lib/kross/main/scriptguiclient.h index 28bb62c0b..8dd1cc713 100644 --- a/lib/kross/main/scriptguiclient.h +++ b/lib/kross/main/scriptguiclient.h @@ -40,7 +40,7 @@ namespace Kross { namespace Api { * The ScriptGUIClient class provides abstract access to * scripting code used to extend an applications functionality. */ - class KDE_EXPORT ScriptGUIClient + class TDE_EXPORT ScriptGUIClient : public TQObject , public KXMLGUIClient {