From 82b7c9da6c7f73bb0a7158182e36856e845501b0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 5 May 2024 17:47:30 +0900 Subject: Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT Signed-off-by: Michele Calgaro (cherry picked from commit 8d98323ef663dedbb8fe7c47bc706d069114af6b) --- styles/phase/config/phasestyleconfig.cpp | 2 +- tdescreensaver/kdesavers/Euphoria.cpp | 10 +++++----- tdescreensaver/kdesavers/Flux.cpp | 10 +++++----- tdescreensaver/kdesavers/SolarWinds.cpp | 10 +++++----- tdescreensaver/kdesavers/banner.cpp | 10 +++++----- tdescreensaver/kdesavers/blob.cpp | 10 +++++----- tdescreensaver/kdesavers/firesaver.cpp | 10 +++++----- tdescreensaver/kdesavers/fountain.cpp | 10 +++++----- tdescreensaver/kdesavers/gravity.cpp | 10 +++++----- tdescreensaver/kdesavers/kclock.cpp | 10 +++++----- tdescreensaver/kdesavers/kvm.cpp | 10 +++++----- tdescreensaver/kdesavers/lines.cpp | 10 +++++----- tdescreensaver/kdesavers/lorenz.cpp | 10 +++++----- tdescreensaver/kdesavers/pendulum.cpp | 10 +++++----- tdescreensaver/kdesavers/polygon.cpp | 10 +++++----- tdescreensaver/kdesavers/rotation.cpp | 10 +++++----- tdescreensaver/kdesavers/science.cpp | 10 +++++----- tdescreensaver/kdesavers/slideshow.cpp | 10 +++++----- tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp | 10 +++++----- tdescreensaver/kdesavers/wave.cpp | 10 +++++----- tdescreensaver/tdepartsaver/tdepartsaver.cpp | 10 +++++----- twin-styles/cde/cdeclient.cpp | 2 +- twin-styles/cde/config/config.cpp | 2 +- twin-styles/glow/config/glowconfigdialog.cpp | 2 +- twin-styles/glow/glowclient.cpp | 2 +- twin-styles/icewm/config/config.cpp | 2 +- twin-styles/icewm/icewm.cpp | 2 +- twin-styles/kde1/kde1client.cpp | 2 +- twin-styles/kstep/nextclient.cpp | 2 +- twin-styles/openlook/OpenLook.cpp | 2 +- twin-styles/riscos/Manager.cpp | 2 +- twin-styles/smooth-blend/client/config/smoothblendconfig.cpp | 2 +- twin-styles/smooth-blend/client/smoothblend.cpp | 2 +- twin-styles/system/systemclient.cpp | 2 +- 34 files changed, 114 insertions(+), 114 deletions(-) diff --git a/styles/phase/config/phasestyleconfig.cpp b/styles/phase/config/phasestyleconfig.cpp index 4a3b7bcd..401361a9 100644 --- a/styles/phase/config/phasestyleconfig.cpp +++ b/styles/phase/config/phasestyleconfig.cpp @@ -103,7 +103,7 @@ void PhaseStyleConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_tdestyle_config(TQWidget* parent) { + TDE_EXPORT TQObject* allocate_tdestyle_config(TQWidget* parent) { return(new PhaseStyleConfig(parent)); } } diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp index ab28e5ab..4bc3c50b 100644 --- a/tdescreensaver/kdesavers/Euphoria.cpp +++ b/tdescreensaver/kdesavers/Euphoria.cpp @@ -896,16 +896,16 @@ void EuphoriaWidget::setDefaults(int which) // libtdescreensaver interface extern "C" { - KDE_EXPORT const char* kss_applicationName = "keuphoria.kss"; - KDE_EXPORT const char* kss_description = I18N_NOOP( "Euphoria" ); - KDE_EXPORT const char* kss_version = "1.0"; + TDE_EXPORT const char* kss_applicationName = "keuphoria.kss"; + TDE_EXPORT const char* kss_description = I18N_NOOP( "Euphoria" ); + TDE_EXPORT const char* kss_version = "1.0"; - KDE_EXPORT KScreenSaver* kss_create( WId id ) + TDE_EXPORT KScreenSaver* kss_create( WId id ) { return new KEuphoriaScreenSaver( id ); } - KDE_EXPORT TQDialog* kss_setup() + TDE_EXPORT TQDialog* kss_setup() { return new KEuphoriaSetup; } diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp index 072d791a..91cf91b4 100644 --- a/tdescreensaver/kdesavers/Flux.cpp +++ b/tdescreensaver/kdesavers/Flux.cpp @@ -780,16 +780,16 @@ void FluxWidget::updateParameters() // libtdescreensaver interface extern "C" { - KDE_EXPORT const char* kss_applicationName = "kflux.kss"; - KDE_EXPORT const char* kss_description = I18N_NOOP( "Flux" ); - KDE_EXPORT const char* kss_version = "1.0"; + TDE_EXPORT const char* kss_applicationName = "kflux.kss"; + TDE_EXPORT const char* kss_description = I18N_NOOP( "Flux" ); + TDE_EXPORT const char* kss_version = "1.0"; - KDE_EXPORT KScreenSaver* kss_create( WId id ) + TDE_EXPORT KScreenSaver* kss_create( WId id ) { return new KFluxScreenSaver( id ); } - KDE_EXPORT TQDialog* kss_setup() + TDE_EXPORT TQDialog* kss_setup() { return new KFluxSetup; } diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp index 3d88edfa..01a0aa01 100644 --- a/tdescreensaver/kdesavers/SolarWinds.cpp +++ b/tdescreensaver/kdesavers/SolarWinds.cpp @@ -594,16 +594,16 @@ void SWindsWidget::setDefaults(int which) // libtdescreensaver interface extern "C" { - KDE_EXPORT const char* kss_applicationName = "ksolarwinds.kss"; - KDE_EXPORT const char* kss_description = I18N_NOOP( "Solar Winds" ); - KDE_EXPORT const char* kss_version = "1.0"; + TDE_EXPORT const char* kss_applicationName = "ksolarwinds.kss"; + TDE_EXPORT const char* kss_description = I18N_NOOP( "Solar Winds" ); + TDE_EXPORT const char* kss_version = "1.0"; - KDE_EXPORT KScreenSaver* kss_create( WId id ) + TDE_EXPORT KScreenSaver* kss_create( WId id ) { return new KSWindsScreenSaver( id ); } - KDE_EXPORT TQDialog* kss_setup() + TDE_EXPORT TQDialog* kss_setup() { return new KSWindsSetup; } diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp index 853e9fee..3e23c0e7 100644 --- a/tdescreensaver/kdesavers/banner.cpp +++ b/tdescreensaver/kdesavers/banner.cpp @@ -40,16 +40,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kbanner.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KBanner" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kbanner.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KBanner" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KBannerSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KBannerSetup(); } diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp index 7f558859..e6fb6c23 100644 --- a/tdescreensaver/kdesavers/blob.cpp +++ b/tdescreensaver/kdesavers/blob.cpp @@ -47,16 +47,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kblob.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlob" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kblob.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KBlob" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KBlobSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KBlobSetup(); } diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp index 240839a8..0bbd14c3 100644 --- a/tdescreensaver/kdesavers/firesaver.cpp +++ b/tdescreensaver/kdesavers/firesaver.cpp @@ -96,16 +96,16 @@ class KFireSaverSetupKDB : public KDialogBase extern "C" { - KDE_EXPORT const char *kss_applicationName = "kfiresaver.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "Fireworks 3D (GL)" ); - KDE_EXPORT const char *kss_version = "0.7"; + TDE_EXPORT const char *kss_applicationName = "kfiresaver.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "Fireworks 3D (GL)" ); + TDE_EXPORT const char *kss_version = "0.7"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KFireSaverKSS( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KFireSaverSetupKDB; } diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp index 9ffb7a40..e022f384 100644 --- a/tdescreensaver/kdesavers/fountain.cpp +++ b/tdescreensaver/kdesavers/fountain.cpp @@ -37,16 +37,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kfountain.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Fountain Screen Saver" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kfountain.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Fountain Screen Saver" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KFountainSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KFountainSetup(); } diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp index 01d86a97..9e0355b7 100644 --- a/tdescreensaver/kdesavers/gravity.cpp +++ b/tdescreensaver/kdesavers/gravity.cpp @@ -36,16 +36,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kgravity.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Gravity Screen Saver" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kgravity.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "Particle Gravity Screen Saver" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KGravitySaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KGravitySetup(); } diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp index 7322cddb..44614a51 100644 --- a/tdescreensaver/kdesavers/kclock.cpp +++ b/tdescreensaver/kdesavers/kclock.cpp @@ -50,15 +50,15 @@ const bool DEFAULT_KEEP_CENTERED = false; extern "C" { - KDE_EXPORT const char *kss_applicationName = "kclock.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP("Clock"); - KDE_EXPORT const char *kss_version = "1.0"; + TDE_EXPORT const char *kss_applicationName = "kclock.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP("Clock"); + TDE_EXPORT const char *kss_version = "1.0"; - KDE_EXPORT KScreenSaver *kss_create(WId id) { + TDE_EXPORT KScreenSaver *kss_create(WId id) { return new KClockSaver(id); } - KDE_EXPORT TQDialog *kss_setup() { + TDE_EXPORT TQDialog *kss_setup() { return new KClockSetup(); } } diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp index 17b686a0..90155b3d 100644 --- a/tdescreensaver/kdesavers/kvm.cpp +++ b/tdescreensaver/kdesavers/kvm.cpp @@ -61,16 +61,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kvm.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "Virtual Machine" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kvm.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "Virtual Machine" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new kVmSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new kVmSetup(); } diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp index 07123934..de09e8c4 100644 --- a/tdescreensaver/kdesavers/lines.cpp +++ b/tdescreensaver/kdesavers/lines.cpp @@ -33,16 +33,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "klines.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KLines" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "klines.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KLines" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new kLinesSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new kLinesSetup(); } diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp index 6f5b4c70..0825ecd2 100644 --- a/tdescreensaver/kdesavers/lorenz.cpp +++ b/tdescreensaver/kdesavers/lorenz.cpp @@ -29,16 +29,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "klorenz.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KLorenz" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "klorenz.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KLorenz" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KLorenzSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KLorenzSetup(); } diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp index d8e8d0ae..5027fdc8 100644 --- a/tdescreensaver/kdesavers/pendulum.cpp +++ b/tdescreensaver/kdesavers/pendulum.cpp @@ -53,21 +53,21 @@ extern "C" { /// application name for libtdescreensaver interface - KDE_EXPORT const char *kss_applicationName = "kpendulum.kss"; + TDE_EXPORT const char *kss_applicationName = "kpendulum.kss"; /// application description for libtdescreensaver interface - KDE_EXPORT const char *kss_description = I18N_NOOP("Simulation of\ + TDE_EXPORT const char *kss_description = I18N_NOOP("Simulation of\ a two-part pendulum"); /// application version for libtdescreensaver interface - KDE_EXPORT const char *kss_version = KPENDULUM_VERSION; + TDE_EXPORT const char *kss_version = KPENDULUM_VERSION; /// function to create screen saver object - KDE_EXPORT KScreenSaver* kss_create(WId id) + TDE_EXPORT KScreenSaver* kss_create(WId id) { return new KPendulumSaver(id); } /// function to create setup dialog for screen saver - KDE_EXPORT TQDialog* kss_setup() + TDE_EXPORT TQDialog* kss_setup() { return new KPendulumSetup(); } diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp index 96787756..b62c8b61 100644 --- a/tdescreensaver/kdesavers/polygon.cpp +++ b/tdescreensaver/kdesavers/polygon.cpp @@ -31,16 +31,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kpolygon.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KPolygon" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kpolygon.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KPolygon" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new kPolygonSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new kPolygonSetup(); } diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp index 6ae1aba6..a51cfb19 100644 --- a/tdescreensaver/kdesavers/rotation.cpp +++ b/tdescreensaver/kdesavers/rotation.cpp @@ -54,21 +54,21 @@ extern "C" { /** application name for the libtdescreensaver interface */ - KDE_EXPORT const char *kss_applicationName = "krotation.kss"; + TDE_EXPORT const char *kss_applicationName = "krotation.kss"; /** application description for the libtdescreensaver interface */ - KDE_EXPORT const char *kss_description = + TDE_EXPORT const char *kss_description = I18N_NOOP("Simulation of a force free rotating asymmetric body"); /** application version for the libtdescreensaver interface */ - KDE_EXPORT const char *kss_version = KROTATION_VERSION; + TDE_EXPORT const char *kss_version = KROTATION_VERSION; /** function to create screen saver object */ - KDE_EXPORT KScreenSaver* kss_create(WId id) + TDE_EXPORT KScreenSaver* kss_create(WId id) { return new KRotationSaver(id); } /** function to create setup dialog for screen saver */ - KDE_EXPORT TQDialog* kss_setup() + TDE_EXPORT TQDialog* kss_setup() { return new KRotationSetup(); } diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp index 3d216cfe..a63733c8 100644 --- a/tdescreensaver/kdesavers/science.cpp +++ b/tdescreensaver/kdesavers/science.cpp @@ -54,16 +54,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kscience.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "Science Screen Saver" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kscience.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "Science Screen Saver" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KScienceSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KScienceSetup(); } diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp index 9cf31ddb..e41db52d 100644 --- a/tdescreensaver/kdesavers/slideshow.cpp +++ b/tdescreensaver/kdesavers/slideshow.cpp @@ -53,16 +53,16 @@ static const char description[] = I18N_NOOP("KSlideshow"); // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kslideshow.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KSlideshow" ); - KDE_EXPORT const char *kss_version = SLIDESHOW_VERSION; + TDE_EXPORT const char *kss_applicationName = "kslideshow.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KSlideshow" ); + TDE_EXPORT const char *kss_version = SLIDESHOW_VERSION; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new kSlideShowSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new kSlideShowSetup(); } diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp index daf09d97..fa3862d5 100644 --- a/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp +++ b/tdescreensaver/kdesavers/tdeasciiquarium/aasaver.cpp @@ -1195,16 +1195,16 @@ void AASaver::paintEvent(TQPaintEvent* pe) // libkscreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "tdeasciiquarium.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "TDEAsciiquarium" ); - KDE_EXPORT const char *kss_version = "0.3.2"; + TDE_EXPORT const char *kss_applicationName = "tdeasciiquarium.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "TDEAsciiquarium" ); + TDE_EXPORT const char *kss_version = "0.3.2"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new AASaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { TDEConfigDialog *dialog = TDEConfigDialog::exists("settings"); if(dialog) diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp index 84d5365e..4d65bfe3 100644 --- a/tdescreensaver/kdesavers/wave.cpp +++ b/tdescreensaver/kdesavers/wave.cpp @@ -38,16 +38,16 @@ extern "C" { - KDE_EXPORT const char *kss_applicationName = "kwave.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "Bitmap Wave Screen Saver" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kwave.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "Bitmap Wave Screen Saver" ); + TDE_EXPORT const char *kss_version = "2.2.0"; - KDE_EXPORT KScreenSaver *kss_create( WId id ) + TDE_EXPORT KScreenSaver *kss_create( WId id ) { return new KWaveSaver( id ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { return new KWaveSetup(); } diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp index 8a5ea76c..eddfa739 100644 --- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp +++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp @@ -58,17 +58,17 @@ bool g_inited = false; extern "C" { - KDE_EXPORT const char *kss_applicationName = "tdepartsaver"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KPart Screen Saver" ); - KDE_EXPORT const char *kss_version = "1.0"; + TDE_EXPORT const char *kss_applicationName = "tdepartsaver"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KPart Screen Saver" ); + TDE_EXPORT const char *kss_version = "1.0"; - KDE_EXPORT KScreenSaver *kss_create( WId d ) + TDE_EXPORT KScreenSaver *kss_create( WId d ) { TDEGlobal::locale()->insertCatalogue("tdepartsaver"); return new KPartSaver( d ); } - KDE_EXPORT TQDialog *kss_setup() + TDE_EXPORT TQDialog *kss_setup() { kdDebug() << "kss_setup" << endl; TDEGlobal::locale()->insertCatalogue("tdepartsaver"); diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 1c89f218..621e9ac1 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -31,7 +31,7 @@ #include #include -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new CDE::CdeClientFactory(); } diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp index e14c82b0..577a9966 100644 --- a/twin-styles/cde/config/config.cpp +++ b/twin-styles/cde/config/config.cpp @@ -6,7 +6,7 @@ #include #include -extern "C" KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) +extern "C" TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return new CdeConfig(conf, parent); } diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index 98234175..9ce337b7 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -45,7 +45,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new GlowConfigDialog(conf, parent)); } diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 7c905e99..efec7724 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -896,7 +896,7 @@ KDecoration* GlowClientGlobals::createDecoration( KDecorationBridge* bridge ) } // end of namespace extern "C" -KDE_EXPORT KDecorationFactory* create_factory() +TDE_EXPORT KDecorationFactory* create_factory() { return Glow::GlowClientGlobals::instance(); } diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp index 3b6b77a6..9d7090ff 100644 --- a/twin-styles/icewm/config/config.cpp +++ b/twin-styles/icewm/config/config.cpp @@ -39,7 +39,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new IceWMConfig(conf, parent)); } diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 4ce0a2c8..d535a357 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -1693,7 +1693,7 @@ bool IceWMClient::eventFilter( TQObject* o, TQEvent* e ) extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { IceWM::clientHandler = new IceWM::ThemeHandler; return IceWM::clientHandler; diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp index 1dbc4535..e13d1b06 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -803,7 +803,7 @@ bool StdFactory::supports( Ability ability ) extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { return new TDE1::StdFactory(); } diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index 8cb138bc..1176db08 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -980,7 +980,7 @@ NextClientFactory::borderSizes() const } // KStep namespace -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new KStep::NextClientFactory(); } diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index b824b9a6..b74f3580 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -40,7 +40,7 @@ #include "OpenLook.h" -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new OpenLook::DecorationFactory(); } diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index dafac2ff..9f540bed 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -44,7 +44,7 @@ extern "C" { - KDE_EXPORT KDecorationFactory* create_factory() + TDE_EXPORT KDecorationFactory* create_factory() { return new RiscOS::Factory(); } diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp index 7f6a2d0d..159ef9cf 100644 --- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp +++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp @@ -174,7 +174,7 @@ void smoothblendConfig::defaults() { extern "C" { - KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) + TDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new smoothblendConfig(config, parent)); } diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp index be1d5bb4..78295cfd 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cpp +++ b/twin-styles/smooth-blend/client/smoothblend.cpp @@ -61,7 +61,7 @@ static const uint ANIMATIONSTEPS = 4; extern "C" { - KDE_EXPORT KDecorationFactory* create_factory() + TDE_EXPORT KDecorationFactory* create_factory() { return new smoothblend::smoothblendFactory(); } diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index 24ca3ba5..f4237c95 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -732,7 +732,7 @@ TQValueList SystemDecoFactory::borderSizes() con } -extern "C" KDE_EXPORT KDecorationFactory *create_factory() +extern "C" TDE_EXPORT KDecorationFactory *create_factory() { return new System::SystemDecoFactory(); } -- cgit v1.2.3