diff options
| author | Michele Calgaro <[email protected]> | 2024-05-05 17:48:00 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2024-05-05 21:05:14 +0900 |
| commit | beb289c9a974045e2c9388bb281203c346578c59 (patch) | |
| tree | 094bfeee684ae5ef627bbf08e1820bff946c18da | |
| parent | 54334e21a2858cac8e8e2b6553c24d0881005c0e (diff) | |
| download | tdebase-beb289c9a974045e2c9388bb281203c346578c59.tar.gz tdebase-beb289c9a974045e2c9388bb281203c346578c59.zip | |
Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 026828840f8255b5c4fde83ea95209f6f1f5ef8f)
220 files changed, 381 insertions, 381 deletions
diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h index 47918a46f..e0c2d4317 100644 --- a/kate/app/kateapp.h +++ b/kate/app/kateapp.h @@ -39,7 +39,7 @@ class TDECmdLineArgs; * Kate Application * This class represents the core kate application object */ -class KDE_EXPORT KateApp : public TDEApplication +class TDE_EXPORT KateApp : public TDEApplication { TQ_OBJECT diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 2291a8668..d0212210b 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -57,7 +57,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char **argv ) { TDEConfig * config = NULL; bool alwaysUseInstance; diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index dea6c95b6..44899a82c 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -536,7 +536,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +extern "C" TDE_EXPORT int kdemain(int argc, char **argv) { Kate::Document::setFileChangedDialogsActivated (true); diff --git a/kate/interfaces/application.h b/kate/interfaces/application.h index 8cbc9abce..42ddf9cb3 100644 --- a/kate/interfaces/application.h +++ b/kate/interfaces/application.h @@ -35,7 +35,7 @@ class MainWindow; * other objects like document/projectmanager, ... no way goes around this * central interface */ -class KDE_EXPORT Application : public TQObject +class TDE_EXPORT Application : public TQObject { friend class PrivateApplication; @@ -72,7 +72,7 @@ class KDE_EXPORT Application : public TQObject * Returns the application object * @return Application application object */ -KDE_EXPORT Application *application (); +TDE_EXPORT Application *application (); } diff --git a/kate/interfaces/documentmanager.h b/kate/interfaces/documentmanager.h index d3f55fdf5..d9cc50a2b 100644 --- a/kate/interfaces/documentmanager.h +++ b/kate/interfaces/documentmanager.h @@ -26,7 +26,7 @@ namespace Kate { /** This interface provides access to the Kate Document Manager. */ -class KDE_EXPORT DocumentManager : public TQObject +class TDE_EXPORT DocumentManager : public TQObject { friend class PrivateDocumentManager; @@ -104,7 +104,7 @@ class KDE_EXPORT DocumentManager : public TQObject * Returns the document manager object * @return DocumentManager document manager object */ -KDE_EXPORT DocumentManager *documentManager (); +TDE_EXPORT DocumentManager *documentManager (); } diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h index 7e9033ce3..38f8232f2 100644 --- a/kate/interfaces/mainwindow.h +++ b/kate/interfaces/mainwindow.h @@ -29,7 +29,7 @@ namespace Kate class ViewManager; -class KDE_EXPORT MainWindow : public TQObject +class TDE_EXPORT MainWindow : public TQObject { friend class PrivateMainWindow; diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h index bc79a0491..1048a9e88 100644 --- a/kate/interfaces/plugin.h +++ b/kate/interfaces/plugin.h @@ -32,7 +32,7 @@ namespace Kate class Application; class MainWindow; -class KDE_EXPORT Plugin : public TQObject +class TDE_EXPORT Plugin : public TQObject { friend class PrivatePlugin; @@ -52,13 +52,13 @@ class KDE_EXPORT Plugin : public TQObject unsigned int myPluginNumber; }; -KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application = 0, const char *name = 0,const TQStringList &args = TQStringList() ); +TDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application = 0, const char *name = 0,const TQStringList &args = TQStringList() ); /* * view plugin class * this plugin will be bound to a tdetexteditor::view */ -class KDE_EXPORT PluginViewInterface +class TDE_EXPORT PluginViewInterface { friend class PrivatePluginViewInterface; @@ -80,7 +80,7 @@ class KDE_EXPORT PluginViewInterface unsigned int myPluginViewInterfaceNumber; }; -KDE_EXPORT PluginViewInterface *pluginViewInterface (Plugin *plugin); +TDE_EXPORT PluginViewInterface *pluginViewInterface (Plugin *plugin); } diff --git a/kate/interfaces/pluginconfiginterface.h b/kate/interfaces/pluginconfiginterface.h index f626b1cde..b3180bc96 100644 --- a/kate/interfaces/pluginconfiginterface.h +++ b/kate/interfaces/pluginconfiginterface.h @@ -27,7 +27,7 @@ namespace Kate /* * This is an interface for the KTextEditor::Document/Plugin/ViewPlugin classes !!! */ -class KDE_EXPORT PluginConfigInterface +class TDE_EXPORT PluginConfigInterface { friend class PrivatePluginConfigInterface; @@ -56,7 +56,7 @@ class KDE_EXPORT PluginConfigInterface }; class Plugin; -KDE_EXPORT PluginConfigInterface *pluginConfigInterface (Plugin *plugin); +TDE_EXPORT PluginConfigInterface *pluginConfigInterface (Plugin *plugin); } diff --git a/kate/interfaces/pluginconfiginterfaceextension.h b/kate/interfaces/pluginconfiginterfaceextension.h index d70d35069..c3db71fde 100644 --- a/kate/interfaces/pluginconfiginterfaceextension.h +++ b/kate/interfaces/pluginconfiginterfaceextension.h @@ -26,7 +26,7 @@ namespace Kate { -class KDE_EXPORT PluginConfigPage : public TQWidget +class TDE_EXPORT PluginConfigPage : public TQWidget { TQ_OBJECT @@ -60,7 +60,7 @@ class KDE_EXPORT PluginConfigPage : public TQWidget /* * This is an interface for the KTextEditor::Document/Plugin/ViewPlugin classes !!! */ -class KDE_EXPORT PluginConfigInterfaceExtension +class TDE_EXPORT PluginConfigInterfaceExtension { friend class PrivatePluginConfigInterfaceExtension; @@ -97,7 +97,7 @@ class KDE_EXPORT PluginConfigInterfaceExtension }; class Plugin; -KDE_EXPORT PluginConfigInterfaceExtension *pluginConfigInterfaceExtension (Plugin *plugin); +TDE_EXPORT PluginConfigInterfaceExtension *pluginConfigInterfaceExtension (Plugin *plugin); } diff --git a/kate/interfaces/pluginmanager.h b/kate/interfaces/pluginmanager.h index 26d77b26c..74aa4d874 100644 --- a/kate/interfaces/pluginmanager.h +++ b/kate/interfaces/pluginmanager.h @@ -27,7 +27,7 @@ namespace Kate { /** This interface provides access to the Kate Plugin Manager. */ -class KDE_EXPORT PluginManager : public TQObject +class TDE_EXPORT PluginManager : public TQObject { friend class PrivatePluginManager; diff --git a/kate/interfaces/toolviewmanager.h b/kate/interfaces/toolviewmanager.h index fec942b2b..48c14f93f 100644 --- a/kate/interfaces/toolviewmanager.h +++ b/kate/interfaces/toolviewmanager.h @@ -29,7 +29,7 @@ namespace Kate /** Interface to the toolviewmanager */ -class KDE_EXPORT ToolViewManager : public TQObject +class TDE_EXPORT ToolViewManager : public TQObject { friend class PrivateToolViewManager; diff --git a/kate/interfaces/viewmanager.h b/kate/interfaces/viewmanager.h index 0ca689680..12b296702 100644 --- a/kate/interfaces/viewmanager.h +++ b/kate/interfaces/viewmanager.h @@ -30,7 +30,7 @@ class View; /** * Interface to the viewmanager */ -class KDE_EXPORT ViewManager : public TQObject +class TDE_EXPORT ViewManager : public TQObject { friend class PrivateViewManager; diff --git a/kcminit/main.cpp b/kcminit/main.cpp index de62c9834..230d4c3dd 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -218,7 +218,7 @@ void KCMInit::runPhase2() tqApp->exit( 0 ); } -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { // tdeinit waits for kcminit to finish, but during KDE startup // only important kcm's are started very early in the login process, diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 5c6cc68b4..374bec295 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -799,7 +799,7 @@ void KAccessConfig::checkAccess() extern "C" { - KDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_access(TQWidget *parent, const char *name) { return new KAccessConfig(parent, name); } @@ -807,7 +807,7 @@ extern "C" /* This one gets called by kcminit */ - KDE_EXPORT void init_access() + TDE_EXPORT void init_access() { TDEConfig *config = new TDEConfig("kaccessrc", true, false); bool run = needToRunKAccessDaemon( config ); diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index aede70579..11aedc50b 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -4,7 +4,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> -extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) +extern "C" TDE_EXPORT int kdemain(int argc, char * argv[] ) { TDEAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("TDE Accessibility Tool"), 0, 0, TDEAboutData::License_GPL, diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 5f78072a1..b3e02595d 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -53,9 +53,9 @@ #include "arts.h" extern "C" { - KDE_EXPORT void init_arts(); + TDE_EXPORT void init_arts(); - KDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_arts(TQWidget *parent, const char* /*name*/) { TDEGlobal::locale()->insertCatalogue("kcmarts"); return new KArtsModule(parent, "kcmarts" ); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 8abc606db..0b956523b 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -40,12 +40,12 @@ extern "C" { - KDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_bell(TQWidget *parent, const char *) { return new KBellConfig(parent, "kcmbell"); } - KDE_EXPORT void init_bell() + TDE_EXPORT void init_bell() { XKeyboardState kbd; XKeyboardControl kbdc; diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 6c71f8a42..279a16fc1 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -55,7 +55,7 @@ void KCMComponentChooser::defaults(){ extern "C" { - KDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_componentchooser( TQWidget *parent, const char * ) { TDEGlobal::locale()->insertCatalogue("kcmcomponentchooser"); return new KCMComponentChooser( parent, "kcmcomponentchooser" ); diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index f967387e8..04f5c8c17 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -80,11 +80,11 @@ static const int DFLT_OFF = 60; extern "C" { - KDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) { + TDE_EXPORT TDECModule *create_energy(TQWidget *parent, char *) { return new KEnergy(parent, "kcmenergy"); } - KDE_EXPORT void init_energy() { + TDE_EXPORT void init_energy() { #ifdef HAVE_DPMS TDEConfig *cfg = new TDEConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); cfg->setGroup("DisplayEnergy"); diff --git a/kcontrol/filetypes/control.cpp b/kcontrol/filetypes/control.cpp index 5a0fd097b..ef46b8b8b 100644 --- a/kcontrol/filetypes/control.cpp +++ b/kcontrol/filetypes/control.cpp @@ -2,7 +2,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_filetypes(TQWidget *parent, const char *) { return new FileTypesView(parent, "filetypes"); } diff --git a/kcontrol/info/main.cpp b/kcontrol/info/main.cpp index 780b6532e..85ef53687 100644 --- a/kcontrol/info/main.cpp +++ b/kcontrol/info/main.cpp @@ -34,7 +34,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_cpu(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CPU_AVAILABLE return new KInfoListWidget(i18n("Processor(s)"), parent, "kcminfo", GetInfo_CPU); @@ -43,7 +43,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_irq(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IRQ_AVAILABLE return new KInfoListWidget(i18n("Interrupt"), parent, "kcminfo", GetInfo_IRQ); @@ -52,7 +52,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_pci(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PCI_AVAILABLE return new KInfoListWidget(i18n("PCI"), parent, "kcminfo", GetInfo_PCI); @@ -61,7 +61,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_dma(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DMA_AVAILABLE return new KInfoListWidget(i18n("DMA-Channel"), parent, "kcminfo", GetInfo_DMA); @@ -70,7 +70,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_ioports(TQWidget *parent, const char * /*name*/) { #ifdef INFO_IOPORTS_AVAILABLE return new KInfoListWidget(i18n("I/O-Port"), parent, "kcminfo", GetInfo_IO_Ports); @@ -79,7 +79,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_sound(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SOUND_AVAILABLE return new KInfoListWidget(i18n("Soundcard"), parent, "kcminfo", GetInfo_Sound); @@ -88,7 +88,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_scsi(TQWidget *parent, const char * /*name*/) { #ifdef INFO_SCSI_AVAILABLE return new KInfoListWidget(i18n("SCSI"), parent, "kcminfo", GetInfo_SCSI); @@ -97,7 +97,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_devices(TQWidget *parent, const char * /*name*/) { #ifdef INFO_DEVICES_AVAILABLE return new KInfoListWidget(i18n("Devices"), parent, "kcminfo", GetInfo_Devices); @@ -106,7 +106,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_partitions(TQWidget *parent, const char * /*name*/) { #ifdef INFO_PARTITIONS_AVAILABLE return new KInfoListWidget(i18n("Partitions"), parent, "kcminfo", GetInfo_Partitions); @@ -115,7 +115,7 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_xserver(TQWidget *parent, const char * /*name*/) { #ifdef INFO_XSERVER_AVAILABLE return new KInfoListWidget(i18n("X-Server"), parent, "kcminfo", GetInfo_XServer_and_Video); @@ -124,12 +124,12 @@ extern "C" #endif } - KDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_memory(TQWidget *parent, const char * /*name*/) { return new KMemoryWidget(parent, "kcminfo"); } - KDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_opengl(TQWidget *parent, const char * ) { #ifdef INFO_OPENGL_AVAILABLE return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL); @@ -139,7 +139,7 @@ extern "C" } /* create_cdinfo function for CD-ROM Info ~Jahshan */ - KDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_cdinfo(TQWidget *parent, const char * /*name*/) { #ifdef INFO_CD_ROM_AVAILABLE return new KInfoListWidget(i18n("CD-ROM Info"), parent, "kcminfo", GetInfo_CD_ROM); diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 254f2ee5c..d72dd0aa6 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -41,12 +41,12 @@ extern "C" { - KDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_mouse(TQWidget *parent, const char *) { return new MouseConfig(parent, "kcminput"); } - KDE_EXPORT void init_mouse() + TDE_EXPORT void init_mouse() { TDEConfig *config = new TDEConfig("kcminputrc", true, false); // Read-only, no globals MouseSettings settings; diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index d0521d81e..05e431af9 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY(kcm_joystick, JoystickFactory("joystick")) extern "C" { - KDE_EXPORT bool test_joystick() + TDE_EXPORT bool test_joystick() { /* Code stolen from JoyWidget::init() */ int i; char dev[30]; diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index aa5227532..7d709bce5 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -98,7 +98,7 @@ KControlApp::~KControlApp() delete toplevel; } -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDELocale::setMainCatalogue("kcontrol"); TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index de0cc2dbc..bba777adb 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -146,7 +146,7 @@ TQString KeyModule::handbookSection() const extern "C" { - KDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 TDEGlobal::locale()->insertCatalogue("twin"); @@ -155,7 +155,7 @@ extern "C" return new KeyModule(parent, "kcmkeys"); } - KDE_EXPORT void initModifiers() + TDE_EXPORT void initModifiers() { kdDebug(125) << "KeyModule::initModifiers()" << endl; @@ -165,7 +165,7 @@ extern "C" ModifiersModule::setupMacModifierKeys(); } - KDE_EXPORT void init_keys() + TDE_EXPORT void init_keys() { kdDebug(125) << "KeyModule::init()\n"; diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index a0e14ba17..db7d5339f 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -371,7 +371,7 @@ TDEAboutData *KickerConfig::aboutData() extern "C" { - KDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_kicker(TQWidget *parent, const char *name) { TDECModuleContainer *container = new TDECModuleContainer(parent, "kcmkicker"); container->addModule("kicker_config_arrangement"); @@ -381,26 +381,26 @@ extern "C" return container; } - KDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_arrangement(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new PositionConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_hiding(TQWidget *parent, const char * /*name*/) { TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") + "kicker/extensions"); return new HidingConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_menus(TQWidget *parent, const char * /*name*/) { return new MenuConfig(parent, "kcmkicker"); } - KDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_kicker_appearance(TQWidget *parent, const char * /*name*/) { KImageIO::registerFormats(); TDEGlobal::dirs()->addResourceType("tiles", TDEStandardDirs::kde_default("data") + diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 5125a03f1..6ea6178db 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -39,7 +39,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_virtualdesktops(TQWidget *parent, const char * /*name*/) { return new KDesktopConfig(parent, "kcmkonq"); } diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index 5ca7cb4ad..c4e3ea506 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -48,48 +48,48 @@ static TQCString configname() extern "C" { - KDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_browser(TQWidget *parent, const char *name) { TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBrowserOptions(config, "FMSettings", parent, name); } - KDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_behavior(TQWidget *parent, const char *name) { TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KBehaviourOptions(config, "FMSettings", parent, name); } - KDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_appearance(TQWidget *parent, const char *name) { TDEConfig *config = new TDEConfig("konquerorrc", false, true); return new KonqFontOptions(config, "FMSettings", false, parent, name); } - KDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_previews(TQWidget *parent, const char *name) { return new KPreviewOptions(parent, name); } - KDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_dbehavior(TQWidget *parent, const char* /*name*/) { TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopBehaviorModule(config, parent); } - KDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_dappearance(TQWidget *parent, const char* /*name*/) { TDEConfig *config = new TDEConfig(configname(), false, false); return new KonqFontOptions(config, "FMSettings", true, parent); } - KDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_dpath(TQWidget *parent, const char* /*name*/) { //TDEConfig *config = new TDEConfig(configname(), false, false); return new DesktopPathConfig(parent); } - KDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_ddesktop(TQWidget *parent, const char* /*name*/) { return new KDesktopConfig(parent, "VirtualDesktops"); } diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 0794b390b..3f407fa23 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -44,37 +44,37 @@ extern "C" { - KDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_tdehtml_behavior(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KMiscHTMLOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_tdehtml_fonts(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KAppearanceOptions(c, "HTML Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/) + TDE_EXPORT TDECModule *create_tdehtml_java_js(TQWidget *parent, const char* /*name*/) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KJSParts(c, parent, "kcmkonqhtml"); } - KDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_tdehtml_plugins(TQWidget *parent, const char *name) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new KPluginOptions(c, "Java/JavaScript Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name ) + TDE_EXPORT TDECModule *create_tdehtml_filter(TQWidget *parent, const char *name ) { TDEConfig *c = new TDEConfig( "tdehtmlrc", false, false ); return new KCMFilter(c, "Filter Settings", parent, name); } - KDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name ) + TDE_EXPORT TDECModule *create_tdehtml_userinterface(TQWidget *parent, const char *name ) { TDEConfig *c = new TDEConfig( "konquerorrc", false, false ); return new userInterConfig(c, "FMSettings", parent, name); diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 4d3791511..dec553976 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -413,7 +413,7 @@ void kthememanager::updatePreview( const TQString & pixFile ) extern "C" { - KDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_kthememanager(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue( "kthememanager" ); return new kthememanager( parent, "kthememanager" ); diff --git a/kcontrol/locale/main.cpp b/kcontrol/locale/main.cpp index 634c3bd45..8842b3852 100644 --- a/kcontrol/locale/main.cpp +++ b/kcontrol/locale/main.cpp @@ -22,7 +22,7 @@ #include "toplevel.h" extern "C" { - KDE_EXPORT void *init_kcm_locale() { + TDE_EXPORT void *init_kcm_locale() { TDELocale::setMainCatalogue("kcmlocale"); return new TDELocaleFactory("kcmlocale"); } diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index c6d1d9068..328e55294 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -28,12 +28,12 @@ extern "C" { - KDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P ) + TDE_EXPORT TDECModule* create_performance( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::Config( parent_P, name_P ); } - KDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P ) + TDE_EXPORT TDECModule* create_konqueror( TQWidget* parent_P, const char* name_P ) { return new KCMPerformance::KonquerorConfig( parent_P, name_P ); } diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 0aa05a90e..87247547e 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -318,7 +318,7 @@ void Privacy::cleanup() extern "C" { - KDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/) + TDE_EXPORT TDECModule *create_privacy(TQWidget *parent, const char * /*name*/) { TDEGlobal::locale()->insertCatalogue("privacy"); return new Privacy(parent, "Privacy"); diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index f13a863b9..b8a53ce89 100644 --- a/kcontrol/randr/tderandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -48,12 +48,12 @@ K_EXPORT_COMPONENT_FACTORY (kcm_randr, KSSFactory("tderandr") ) extern "C" { - KDE_EXPORT void init_randr() + TDE_EXPORT void init_randr() { KRandRModule::performApplyOnStartup(); } - KDE_EXPORT bool test_randr() + TDE_EXPORT bool test_randr() { int eventBase, errorBase; if( XRRQueryExtension(tqt_xdisplay(), &eventBase, &errorBase ) ) diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 1e53bc3d9..8c58b1e8f 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -372,12 +372,12 @@ TQString KSmartcardConfig::quickHelp() const extern "C" { - KDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_smartcard(TQWidget *parent, const char *) { return new KSmartcardConfig(parent, "kcmsmartcard"); } - KDE_EXPORT void init_smartcard() + TDE_EXPORT void init_smartcard() { TDEConfig *config = new TDEConfig("ksmartcardrc", false, false); bool start = config->readBoolEntry("Enable Support", false); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 27a599b09..9dd53616c 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -73,13 +73,13 @@ // Danimo: Why do we use the old interface?! extern "C" { - KDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) + TDE_EXPORT TDECModule *create_style(TQWidget *parent, const char*) { TDEGlobal::locale()->insertCatalogue("kcmstyle"); return new KCMStyle(parent, "kcmstyle"); } - KDE_EXPORT void init_style() + TDE_EXPORT void init_style() { uint flags = KRdbExportQtSettings | KRdbExportQtColors | KRdbExportXftSettings; TDEConfig config("kcmdisplayrc", true /*readonly*/, false /*don't read kdeglobals etc.*/); diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 6ac4e6d4c..17000c1d2 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -32,7 +32,7 @@ DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) + TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) { return new KeramikStyleConfig(parent); } diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h index 535baa6e1..5db48b0c3 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.h +++ b/kcontrol/tdefontinst/lib/FcEngine.h @@ -45,7 +45,7 @@ typedef struct _XftFont XftFont; namespace KFI { -class KDE_EXPORT CFcEngine +class TDE_EXPORT CFcEngine { public: diff --git a/kcontrol/tdefontinst/lib/Misc.h b/kcontrol/tdefontinst/lib/Misc.h index ee8de5445..3fd49d34a 100644 --- a/kcontrol/tdefontinst/lib/Misc.h +++ b/kcontrol/tdefontinst/lib/Misc.h @@ -50,25 +50,25 @@ namespace Misc DIR_PERMS = 0755 }; - extern KDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); - inline KDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } - inline KDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } - inline KDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } - inline KDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } - inline KDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } - extern KDE_EXPORT TQString linkedTo(const TQString &i); - extern KDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ - extern KDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path - inline KDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } - extern KDE_EXPORT TQString getDir(const TQString &f); - extern KDE_EXPORT TQString getFile(const TQString &f); - extern KDE_EXPORT bool createDir(const TQString &dir); - extern KDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); - extern KDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); - inline KDE_EXPORT bool root() { return 0==getuid(); } - extern KDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); - extern KDE_EXPORT void createBackup(const TQString &f); - extern KDE_EXPORT time_t getTimeStamp(const TQString &item); + extern TDE_EXPORT bool check(const TQString &path, unsigned int fmt, bool checkW=false); + inline TDE_EXPORT bool fExists(const TQString &p) { return check(p, S_IFREG, false); } + inline TDE_EXPORT bool dExists(const TQString &p) { return check(p, S_IFDIR, false); } + inline TDE_EXPORT bool fWritable(const TQString &p) { return check(p, S_IFREG, true); } + inline TDE_EXPORT bool dWritable(const TQString &p) { return check(p, S_IFDIR, true); } + inline TDE_EXPORT bool isLink(const TQString &i) { return check(i, S_IFLNK, false); } + extern TDE_EXPORT TQString linkedTo(const TQString &i); + extern TDE_EXPORT TQString dirSyntax(const TQString &d); // Has trailing slash: /file/path/ + extern TDE_EXPORT TQString xDirSyntax(const TQString &d); // No trailing slash: /file/path + inline TDE_EXPORT TQString fileSyntax(const TQString &f) { return xDirSyntax(f); } + extern TDE_EXPORT TQString getDir(const TQString &f); + extern TDE_EXPORT TQString getFile(const TQString &f); + extern TDE_EXPORT bool createDir(const TQString &dir); + extern TDE_EXPORT TQString changeExt(const TQString &f, const TQString &newExt); + extern TDE_EXPORT bool doCmd(const TQString &cmd, const TQString &p1=TQString::null, const TQString &p2=TQString::null, const TQString &p3=TQString::null); + inline TDE_EXPORT bool root() { return 0==getuid(); } + extern TDE_EXPORT void getAssociatedUrls(const KURL &url, KURL::List &list, bool afmAndPfm=true, TQWidget *widget=NULL); + extern TDE_EXPORT void createBackup(const TQString &f); + extern TDE_EXPORT time_t getTimeStamp(const TQString &item); } } diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index 54de7bdcf..0dccc06a3 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -97,7 +97,7 @@ static const int constMaxFcCheckTime=10; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp index a053393f4..c7c00ef0f 100644 --- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp +++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp @@ -38,7 +38,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new KFI::CFontThumbnail; } diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index a43f9d1d2..90b65eebf 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -35,7 +35,7 @@ extern "C" { - KDE_EXPORT void* init_libtdefontviewpart() + TDE_EXPORT void* init_libtdefontviewpart() { TDEGlobal::locale()->insertCatalogue("tdefontinst"); return new KFI::CFontViewPartFactory; diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp index 0116764c8..7000f2542 100644 --- a/kcontrol/tdeio/main.cpp +++ b/kcontrol/tdeio/main.cpp @@ -40,37 +40,37 @@ extern "C" { - KDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_cookie(TQWidget *parent, const char /**name*/) { return new KCookiesMain(parent); } - KDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_smb(TQWidget *parent, const char /**name*/) { return new SMBRoOptions(parent); } - KDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_useragent(TQWidget *parent, const char /**name*/) { return new UserAgentDlg(parent); } - KDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_proxy(TQWidget *parent, const char /**name*/) { return new KProxyOptions(parent); } - KDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_cache(TQWidget *parent, const char /**name*/) { return new KCacheConfigDialog( parent ); } - KDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/) + TDE_EXPORT TDECModule *create_netpref(TQWidget *parent, const char /**name*/) { return new KIOPreferences(parent); } - KDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_lanbrowser(TQWidget *parent, const char *) { return new LanBrowser(parent); } diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index a3815b90f..c9b9ccc30 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -323,7 +323,7 @@ TQString OuiDb::vendor(octlet_t guid) extern "C" { - KDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_view1394(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmview1394"); return new View1394(parent, name); diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 2c0fd2bba..4456a6d84 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -239,12 +239,12 @@ void KCMXinerama::clearIndicator() { } extern "C" { - KDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) { + TDE_EXPORT TDECModule *create_xinerama(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmxinerama"); return new KCMXinerama(parent, name); } - KDE_EXPORT bool test_xinerama() { + TDE_EXPORT bool test_xinerama() { return TQApplication::desktop()->isVirtualDesktop(); } } diff --git a/kdesktop/main.cpp b/kdesktop/main.cpp index 7435acd62..5a04c9bed 100644 --- a/kdesktop/main.cpp +++ b/kdesktop/main.cpp @@ -105,7 +105,7 @@ void KDesktop::slotUpAndRunning() TDECrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash } -extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char **argv ) { //setup signal handling signal(SIGTERM, signalHandler); diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index cb9f17abb..628b844a5 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -58,7 +58,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) +extern "C" int TDE_EXPORT kdemain( int argc, char **argv ) { TDEAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"), HELPCENTER_VERSION, diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index cd4e56021..428f56d9e 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -362,7 +362,7 @@ void TDEHTMLSearchConfig::indexTerminated(TDEProcess *) extern "C" { - KDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_htmlsearch(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmhtmlsearch"); return new TDEHTMLSearchConfig(parent, name); diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index 27e78d90c..d05f3fd93 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -92,7 +92,7 @@ using namespace KHotKeys; static int khotkeys_screen_number = 0; extern "C" -int KDE_EXPORT kdemain( int argc, char** argv ) +int TDE_EXPORT kdemain( int argc, char** argv ) { { // multiheaded hotkeys diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp index afbd2bceb..db4153e01 100644 --- a/khotkeys/app/kded.cpp +++ b/khotkeys/app/kded.cpp @@ -34,7 +34,7 @@ #include <voices.h> extern "C" -KDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj ) +TDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj ) { return new KHotKeys::KHotKeysModule( obj ); } diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index 22732fa97..e556d218f 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -41,7 +41,7 @@ #define ABS(X) ( ((X)>0) ? (X) : -(X) ) extern "C" -KDE_EXPORT +TDE_EXPORT KHotKeys::SoundRecorder* khotkeys_soundrecorder_create( TQObject* parent, const char* name ) { return new KHotKeys::SoundRecorderArts( parent, name ); diff --git a/khotkeys/arts/voicerecorder_arts.cpp b/khotkeys/arts/voicerecorder_arts.cpp index 8b5c752ad..b63e16cad 100644 --- a/khotkeys/arts/voicerecorder_arts.cpp +++ b/khotkeys/arts/voicerecorder_arts.cpp @@ -25,7 +25,7 @@ #include <arts/kplayobjectfactory.h> extern "C" -KDE_EXPORT +TDE_EXPORT void khotkeys_voicerecorder_arts_play( const TQString& file ) { KHotKeys::VoiceRecorder::arts_play_fun check = khotkeys_voicerecorder_arts_play; // check the type matches diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 9b34b2686..14a9c964b 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -22,7 +22,7 @@ extern "C" { - KDE_EXPORT void init_khotkeys() + TDE_EXPORT void init_khotkeys() { TDEConfig cfg( "khotkeysrc", true ); cfg.setGroup( "Main" ); diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 48349a65c..b63416eeb 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -48,7 +48,7 @@ extern "C" { - KDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P ) + TDE_EXPORT TDECModule* create_khotkeys( TQWidget* parent_P, const char* name_P ) { // sleep( 20 ); // CHECKME DEBUG TDEGlobal::locale()->insertCatalogue("khotkeys"); diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h index f7aa43436..776076e1d 100644 --- a/khotkeys/kcontrol/menuedit.h +++ b/khotkeys/kcontrol/menuedit.h @@ -21,24 +21,24 @@ extern "C" { // initializes khotkeys DSO - loads i18n catalogue // handled automatically by KHotKeys wrapper class in kmenuedit -KDE_EXPORT void khotkeys_init( void ); +TDE_EXPORT void khotkeys_init( void ); // clean up khotkeys DSO // handled automatically by KHotKeys wrapper class in kmenuedit -KDE_EXPORT void khotkeys_cleanup( void ); +TDE_EXPORT void khotkeys_cleanup( void ); // return keyboard shortcut ( e.g. "ALT+T" ) for given menu entry ( e.g. // "System/Konsole.desktop" -KDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P ); +TDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P ); // changes assigned shortcut to menu entry a updates config file -KDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, +TDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, const TQString& shortcut_P ); // menu entry was moved in TDE Menu -KDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P ); +TDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P ); // menu entry was removed -KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P ); +TDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P ); // List of all hotkeys in use -KDE_EXPORT TQStringList khotkeys_get_all_shortcuts( ); +TDE_EXPORT TQStringList khotkeys_get_all_shortcuts( ); // Find menu entry that uses shortcut -KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P ); +TDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P ); } // extern "C" #endif diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp index 4f481ea59..7993f1dc8 100644 --- a/khotkeys/shared/action_data.cpp +++ b/khotkeys/shared/action_data.cpp @@ -295,7 +295,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_ set_trigger( new Shortcut_trigger( this, shortcut_P )); } -template<> KDE_EXPORT +template<> TDE_EXPORT void Simple_action_data< Shortcut_trigger, Command_url_action > ::cfg_write( TDEConfig& cfg_P ) const { @@ -315,7 +315,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_grou set_trigger( new Shortcut_trigger( this, shortcut_P )); } -template<> KDE_EXPORT +template<> TDE_EXPORT void Simple_action_data< Shortcut_trigger, Menuentry_action > ::cfg_write( TDEConfig& cfg_P ) const { @@ -325,7 +325,7 @@ void Simple_action_data< Shortcut_trigger, Menuentry_action > // Dcop_shortcut_action_data -template<> KDE_EXPORT +template<> TDE_EXPORT void Simple_action_data< Shortcut_trigger, Dcop_action > ::cfg_write( TDEConfig& cfg_P ) const { @@ -335,7 +335,7 @@ void Simple_action_data< Shortcut_trigger, Dcop_action > // Keyboard_input_shortcut_action_data -template<> KDE_EXPORT +template<> TDE_EXPORT void Simple_action_data< Shortcut_trigger, Keyboard_input_action > ::cfg_write( TDEConfig& cfg_P ) const { @@ -345,7 +345,7 @@ void Simple_action_data< Shortcut_trigger, Keyboard_input_action > // Activate_window_shortcut_action_data -template<> KDE_EXPORT +template<> TDE_EXPORT void Simple_action_data< Shortcut_trigger, Activate_window_action > ::cfg_write( TDEConfig& cfg_P ) const { diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h index 5d84c6f18..a29ef591f 100644 --- a/khotkeys/shared/action_data.h +++ b/khotkeys/shared/action_data.h @@ -31,7 +31,7 @@ namespace KHotKeys class Action_data_group; -class KDE_EXPORT Action_data_base +class TDE_EXPORT Action_data_base { public: Action_data_base( Action_data_group* parent_P, const TQString& name_P, @@ -61,7 +61,7 @@ class KDE_EXPORT Action_data_base KHOTKEYS_DISABLE_COPY( Action_data_base ); }; -class KDE_EXPORT Action_data_group +class TDE_EXPORT Action_data_group : public Action_data_base { public: @@ -88,7 +88,7 @@ class KDE_EXPORT Action_data_group }; // this one represents a "whole" action, i.e. triggers, resulting actions, etc. -class KDE_EXPORT Action_data +class TDE_EXPORT Action_data : public Action_data_base { typedef Action_data_base base; @@ -121,7 +121,7 @@ class KDE_EXPORT Action_data #endif }; -class KDE_EXPORT Generic_action_data +class TDE_EXPORT Generic_action_data : public Action_data { typedef Action_data base; @@ -141,7 +141,7 @@ class KDE_EXPORT Generic_action_data }; template< typename T, typename A > -class KDE_EXPORT Simple_action_data +class TDE_EXPORT Simple_action_data : public Action_data { typedef Action_data base; @@ -157,7 +157,7 @@ class KDE_EXPORT Simple_action_data virtual void cfg_write( TDEConfig& cfg_P ) const; }; -class KDE_EXPORT Command_url_shortcut_action_data +class TDE_EXPORT Command_url_shortcut_action_data : public Simple_action_data< Shortcut_trigger, Command_url_action > { typedef Simple_action_data< Shortcut_trigger, Command_url_action > base; @@ -170,7 +170,7 @@ class KDE_EXPORT Command_url_shortcut_action_data Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; -class KDE_EXPORT Menuentry_shortcut_action_data +class TDE_EXPORT Menuentry_shortcut_action_data : public Simple_action_data< Shortcut_trigger, Menuentry_action > { typedef Simple_action_data< Shortcut_trigger, Menuentry_action > base; @@ -189,7 +189,7 @@ typedef Simple_action_data< Shortcut_trigger, Keyboard_input_action > typedef Simple_action_data< Shortcut_trigger, Activate_window_action > Activate_window_shortcut_action_data; -class KDE_EXPORT Keyboard_input_gesture_action_data +class TDE_EXPORT Keyboard_input_gesture_action_data : public Action_data { typedef Action_data base; diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h index c7cabf0fc..d2e63db85 100644 --- a/khotkeys/shared/actions.h +++ b/khotkeys/shared/actions.h @@ -30,7 +30,7 @@ class Windowdef_list; // this one is a base for all "real" resulting actions, e.g. running a command, // Action_data instances usually contain at least one Action -class KDE_EXPORT Action +class TDE_EXPORT Action { public: Action( Action_data* data_P ); @@ -46,7 +46,7 @@ class KDE_EXPORT Action KHOTKEYS_DISABLE_COPY( Action ); }; -class KDE_EXPORT Action_list +class TDE_EXPORT Action_list : public TQPtrList< Action > { public: @@ -60,7 +60,7 @@ class KDE_EXPORT Action_list KHOTKEYS_DISABLE_COPY( Action_list ); }; -class KDE_EXPORT Command_url_action +class TDE_EXPORT Command_url_action : public Action { typedef Action base; @@ -78,7 +78,7 @@ class KDE_EXPORT Command_url_action TQString _command_url; }; -class KDE_EXPORT Menuentry_action +class TDE_EXPORT Menuentry_action : public Command_url_action { typedef Command_url_action base; @@ -94,7 +94,7 @@ class KDE_EXPORT Menuentry_action KService::Ptr _service; }; -class KDE_EXPORT Dcop_action +class TDE_EXPORT Dcop_action : public Action { typedef Action base; @@ -117,7 +117,7 @@ class KDE_EXPORT Dcop_action TQString args; }; -class KDE_EXPORT Keyboard_input_action +class TDE_EXPORT Keyboard_input_action : public Action { typedef Action base; @@ -142,7 +142,7 @@ class KDE_EXPORT Keyboard_input_action bool _active_window; }; -class KDE_EXPORT Activate_window_action +class TDE_EXPORT Activate_window_action : public Action { typedef Action base; @@ -159,7 +159,7 @@ class KDE_EXPORT Activate_window_action const Windowdef_list* _window; }; -class KDE_EXPORT Waiting_action +class TDE_EXPORT Waiting_action : public Action { typedef Action base; diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h index 8e5b9e813..02b43a63c 100644 --- a/khotkeys/shared/conditions.h +++ b/khotkeys/shared/conditions.h @@ -30,7 +30,7 @@ class Action_data_base; class Action_data; class Condition_list_base; -class KDE_EXPORT Condition +class TDE_EXPORT Condition { public: Condition( Condition_list_base* parent_P ); @@ -49,7 +49,7 @@ class KDE_EXPORT Condition KHOTKEYS_DISABLE_COPY( Condition ); }; -class KDE_EXPORT Condition_list_base +class TDE_EXPORT Condition_list_base : public Condition, public TQPtrList< Condition > // inheritance ? { typedef Condition base; @@ -64,7 +64,7 @@ class KDE_EXPORT Condition_list_base typedef TQPtrListIterator< Condition > Iterator; }; -class KDE_EXPORT Condition_list +class TDE_EXPORT Condition_list : public Condition_list_base { typedef Condition_list_base base; @@ -84,7 +84,7 @@ class KDE_EXPORT Condition_list Action_data_base* data; }; -class KDE_EXPORT Active_window_condition +class TDE_EXPORT Active_window_condition : public TQObject, public Condition { TQ_OBJECT @@ -111,7 +111,7 @@ class KDE_EXPORT Active_window_condition bool is_match; }; -class KDE_EXPORT Existing_window_condition +class TDE_EXPORT Existing_window_condition : public TQObject, public Condition { TQ_OBJECT @@ -139,7 +139,7 @@ class KDE_EXPORT Existing_window_condition bool is_match; }; -class KDE_EXPORT Not_condition +class TDE_EXPORT Not_condition : public Condition_list_base { typedef Condition_list_base base; @@ -154,7 +154,7 @@ class KDE_EXPORT Not_condition virtual bool accepts_children() const; }; -class KDE_EXPORT And_condition +class TDE_EXPORT And_condition : public Condition_list_base { typedef Condition_list_base base; @@ -167,7 +167,7 @@ class KDE_EXPORT And_condition virtual const TQString description() const; }; -class KDE_EXPORT Or_condition +class TDE_EXPORT Or_condition : public Condition_list_base { typedef Condition_list_base base; diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h index 01da65d00..9f4825f93 100644 --- a/khotkeys/shared/gestures.h +++ b/khotkeys/shared/gestures.h @@ -23,9 +23,9 @@ namespace KHotKeys { class Gesture; -KDE_EXPORT extern Gesture* gesture_handler; +TDE_EXPORT extern Gesture* gesture_handler; -class KDE_EXPORT Stroke +class TDE_EXPORT Stroke { public: // maximum number of numbers in stroke @@ -62,7 +62,7 @@ class KDE_EXPORT Stroke char ret_val[ MAX_SEQUENCE ]; }; -class KDE_EXPORT Gesture +class TDE_EXPORT Gesture : public TQWidget // not TQObject because of x11EventFilter() { TQ_OBJECT diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h index 1a0f27e2b..7f89cd62b 100644 --- a/khotkeys/shared/khlistview.h +++ b/khotkeys/shared/khlistview.h @@ -19,7 +19,7 @@ namespace KHotKeys { -class KDE_EXPORT KHListView +class TDE_EXPORT KHListView : public TDEListView { TQ_OBJECT diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h index c97ef1dea..427958936 100644 --- a/khotkeys/shared/khotkeysglobal.h +++ b/khotkeys/shared/khotkeysglobal.h @@ -38,17 +38,17 @@ extern Windows* windows_handler; #define KHOTKEYS_DISABLE_COPY( cls ) private: cls( const cls& ); cls& operator=( const cls& ) // CHECKME hmms :( -KDE_EXPORT bool khotkeys_active(); -KDE_EXPORT void khotkeys_set_active( bool active_P ); +TDE_EXPORT bool khotkeys_active(); +TDE_EXPORT void khotkeys_set_active( bool active_P ); TQString get_menu_entry_from_path( const TQString& path_P ); -KDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P ); +TDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P ); const char* const MENU_EDITOR_ENTRIES_GROUP_NAME = I18N_NOOP( "Menu Editor entries" ); -KDE_EXPORT bool haveArts(); -KDE_EXPORT void disableArts(); +TDE_EXPORT bool haveArts(); +TDE_EXPORT void disableArts(); //*************************************************************************** // Inline diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h index e28502cfe..753d056c3 100644 --- a/khotkeys/shared/settings.h +++ b/khotkeys/shared/settings.h @@ -26,7 +26,7 @@ enum ImportType ImportSilent // if already imported before, ignore (called from the update script) }; -class KDE_EXPORT Settings +class TDE_EXPORT Settings { public: Settings(); diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 6453563de..28dfeb0b6 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -27,7 +27,7 @@ /** @author Olivier Goffart */ -class KDE_EXPORT Sound{ +class TDE_EXPORT Sound{ public: Sound(); ~Sound(); diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h index 5a770abbe..54324f27f 100644 --- a/khotkeys/shared/soundrecorder.h +++ b/khotkeys/shared/soundrecorder.h @@ -34,7 +34,7 @@ namespace KHotKeys /** @author Olivier Goffart */ -class KDE_EXPORT SoundRecorder : public TQObject +class TDE_EXPORT SoundRecorder : public TQObject { TQ_OBJECT public: diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h index 3ed2171f0..ddc757e30 100644 --- a/khotkeys/shared/triggers.h +++ b/khotkeys/shared/triggers.h @@ -29,7 +29,7 @@ namespace KHotKeys class Windowdef_list; class Action_data; -class KDE_EXPORT Trigger +class TDE_EXPORT Trigger { public: Trigger( Action_data* data_P ); @@ -45,7 +45,7 @@ class KDE_EXPORT Trigger KHOTKEYS_DISABLE_COPY( Trigger ); }; -class KDE_EXPORT Trigger_list +class TDE_EXPORT Trigger_list : public TQPtrList< Trigger > { public: @@ -61,7 +61,7 @@ class KDE_EXPORT Trigger_list KHOTKEYS_DISABLE_COPY( Trigger_list ); }; -class KDE_EXPORT Shortcut_trigger +class TDE_EXPORT Shortcut_trigger : public Trigger, public Kbd_receiver { typedef Trigger base; @@ -79,7 +79,7 @@ class KDE_EXPORT Shortcut_trigger TDEShortcut _shortcut; }; -class KDE_EXPORT Window_trigger +class TDE_EXPORT Window_trigger : public TQObject, public Trigger { TQ_OBJECT @@ -121,7 +121,7 @@ class KDE_EXPORT Window_trigger bool active; }; -class KDE_EXPORT Gesture_trigger +class TDE_EXPORT Gesture_trigger : public TQObject, public Trigger { TQ_OBJECT @@ -142,7 +142,7 @@ class KDE_EXPORT Gesture_trigger }; -class KDE_EXPORT Voice_trigger +class TDE_EXPORT Voice_trigger : public TQObject, public Trigger { TQ_OBJECT diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index ccf7943fc..f5e1127ff 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -28,7 +28,7 @@ class Voice_trigger; class VoiceSignature; -class KDE_EXPORT Voice : public TQObject +class TDE_EXPORT Voice : public TQObject { TQ_OBJECT public: @@ -76,7 +76,7 @@ class KDE_EXPORT Voice : public TQObject }; -KDE_EXPORT extern Voice* voice_handler; +TDE_EXPORT extern Voice* voice_handler; } // namespace KHotKeys diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h index af987cce1..7b29802a2 100644 --- a/khotkeys/shared/voicesignature.h +++ b/khotkeys/shared/voicesignature.h @@ -66,7 +66,7 @@ namespace KHotKeys /** @author Olivier Goffart */ -class KDE_EXPORT VoiceSignature{ +class TDE_EXPORT VoiceSignature{ public: explicit VoiceSignature(const Sound& s); diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index e9868e52b..05890c435 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -34,7 +34,7 @@ const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET class Windowdef_list; /*class Action_data_base;*/ -class KDE_EXPORT Windows +class TDE_EXPORT Windows : public TQObject { TQ_OBJECT @@ -67,7 +67,7 @@ class KDE_EXPORT Windows WId _action_window; }; -struct KDE_EXPORT Window_data +struct TDE_EXPORT Window_data { Window_data( WId id_P ); TQString title; // _NET_WM_NAME or WM_NAME @@ -76,7 +76,7 @@ struct KDE_EXPORT Window_data NET::WindowType type; }; -class KDE_EXPORT Windowdef +class TDE_EXPORT Windowdef { public: Windowdef( const TQString& comment_P ); @@ -93,7 +93,7 @@ class KDE_EXPORT Windowdef KHOTKEYS_DISABLE_COPY( Windowdef ); // CHECKME asi pak udelat i pro vsechny potomky, at se nezapomene }; -class KDE_EXPORT Windowdef_list +class TDE_EXPORT Windowdef_list : public TQPtrList< Windowdef > { public: @@ -109,7 +109,7 @@ class KDE_EXPORT Windowdef_list KHOTKEYS_DISABLE_COPY( Windowdef_list ); }; -class KDE_EXPORT Windowdef_simple +class TDE_EXPORT Windowdef_simple : public Windowdef { typedef Windowdef base; diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index 55ee382fd..9ef80514f 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -68,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("clockapplet"); TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translations diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 3f0ee88a8..876c85926 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append; extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("quicklauncher"); return new QuickLauncher(configFile, KPanelApplet::Normal, diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index fcda62468..f0d6a7e85 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("lockout"); return new Lockout(configFile, parent, "lockout"); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 89f836492..f1d6c6e2a 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile) { TDEGlobal::locale()->insertCatalogue("mediaapplet"); return new MediaApplet(configFile, KPanelApplet::Normal, diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index dff03a036..52e3da93b 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) + TDE_EXPORT KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) { TDEGlobal::locale()->insertCatalogue("kmenuapplet"); return new KickerMenuApplet::Applet( configFile_P, parent_P ); diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 437bae679..003df72fc 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -73,7 +73,7 @@ static const int bgOffset = 300; extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("kminipagerapplet"); return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet"); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 83db26d12..71e08bbe1 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -38,7 +38,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile) + TDE_EXPORT KPanelApplet* init(TQWidget * parent, const TQString & configFile) { TDEGlobal::locale()->insertCatalogue("naughtyapplet"); diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 638ce93c8..3d1321140 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("krunapplet"); return new RunApplet(configFile, KPanelApplet::Stretch, 0, parent, "krunapplet"); diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index c30a31cff..272096fb8 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -53,7 +53,7 @@ SwallowApplet * SwallowApplet::self = 0L; extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { return new SwallowApplet(configFile, parent, "kswallow applet"); } } diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 664dd85ad..50781f9cd 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -63,7 +63,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("ksystemtrayapplet"); return new SystemTrayApplet(configFile, KPanelApplet::Normal, diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 37a78a923..3c9bbead7 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { // FIXME: what about two taskbars? perhaps this should be inserted just once TDEGlobal::locale()->insertCatalogue( "ktaskbarapplet" ); diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 9fe7eccf6..b86b5ef9d 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -31,7 +31,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("trashapplet"); return new TrashApplet(configFile, KPanelApplet::Normal, diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index a5aeefa57..56d002b7b 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelExtension* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("dockbarextension"); return new DockBarExtension(configFile, KPanelExtension::Normal, diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 5aad7392a..7780775f5 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -72,7 +72,7 @@ typedef TQPtrList<KasItem> KasItemList; /** * The main view for KasBar. */ -class KDE_EXPORT KasBar : public TQWidget +class TDE_EXPORT KasBar : public TQWidget { TQ_OBJECT TQ_PROPERTY( int maxBoxes READ maxBoxes ) diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 327fd564c..ff29d4dd3 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -74,7 +74,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue("kasbarextension"); return new KasBarExtension( configFile, diff --git a/kicker/extensions/kasbar/kasclockitem.h b/kicker/extensions/kasbar/kasclockitem.h index b6b263318..d81815c7f 100644 --- a/kicker/extensions/kasbar/kasclockitem.h +++ b/kicker/extensions/kasbar/kasclockitem.h @@ -6,7 +6,7 @@ /** * An item that displays a clock. */ -class KDE_EXPORT KasClockItem : public KasItem +class TDE_EXPORT KasClockItem : public KasItem { TQ_OBJECT diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 508955f9d..0a6dff12e 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -73,7 +73,7 @@ class KasPopup; * * @author Richard Moore, [email protected] */ -class KDE_EXPORT KasItem : public TQObject +class TDE_EXPORT KasItem : public TQObject { TQ_OBJECT diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h index 91af06080..0c0d179e7 100644 --- a/kicker/extensions/kasbar/kasloaditem.h +++ b/kicker/extensions/kasbar/kasloaditem.h @@ -8,7 +8,7 @@ /** * An item that displays the system load. */ -class KDE_EXPORT KasLoadItem : public KasItem +class TDE_EXPORT KasLoadItem : public KasItem { TQ_OBJECT diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index c05c13bb6..c37ea39ef 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -80,7 +80,7 @@ class KasGrouper; * * @author Richard Moore, [email protected] */ -class KDE_EXPORT KasTasker : public KasBar +class TDE_EXPORT KasTasker : public KasBar { TQ_OBJECT TQ_PROPERTY( bool isTopLevel READ isTopLevel ) diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 142b42ee3..ae30b6174 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -31,7 +31,7 @@ extern "C" { - KDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelExtension *init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue("kickersidebarextension"); TDEGlobal::locale()->insertCatalogue("konqueror"); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 56f33c66d..382e42795 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelExtension* init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue( "taskbarextension" ); return new TaskBarExtension( configFile, KPanelExtension::Stretch, diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 23cefb044..02941c127 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -54,7 +54,7 @@ static void sighandler(int) TQApplication::exit(); } -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { { TQCString multiHead = getenv("TDE_MULTIHEAD"); diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index d78d1b07a..f2d2adccf 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -38,7 +38,7 @@ class KPanelApplet; class KPanelExtension; class TQPopupMenu; -class KDE_EXPORT PluginManager : public TQObject +class TDE_EXPORT PluginManager : public TQObject { TQ_OBJECT diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index fc733f207..39af6a1f6 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -89,7 +89,7 @@ public: namespace KickoffSearch { - class KDE_EXPORT Plugin : public TQObject + class TDE_EXPORT Plugin : public TQObject { TQ_OBJECT diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.cpp b/kicker/kicker/interfaces/kickoffsearchinterface.cpp index 66b1add77..7c77cff0c 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.cpp +++ b/kicker/kicker/interfaces/kickoffsearchinterface.cpp @@ -19,7 +19,7 @@ #include "kickoffsearchinterface.h" -KDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name ) +TDE_EXPORT KickoffSearch::KickoffSearchInterface::KickoffSearchInterface( TQObject* parent, const char* name ) :TQObject( parent, name ) { } diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h index b8a866c7b..9c2a647af 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.h +++ b/kicker/kicker/interfaces/kickoffsearchinterface.h @@ -28,7 +28,7 @@ class HitMenuItem; namespace KickoffSearch { - class KDE_EXPORT KickoffSearchInterface :public TQObject + class TDE_EXPORT KickoffSearchInterface :public TQObject { TQ_OBJECT diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h index 22dc8f904..d6dbcc4f1 100644 --- a/kicker/kicker/ui/clicklineedit.h +++ b/kicker/kicker/ui/clicklineedit.h @@ -33,7 +33,7 @@ namespace KPIM { @short LineEdit with customizable "Click here" text @author Daniel Molkentin */ -class KDE_EXPORT ClickLineEdit : public KLineEdit +class TDE_EXPORT ClickLineEdit : public KLineEdit { TQ_OBJECT public: diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h index a52e10d45..be4d47332 100644 --- a/kicker/kicker/ui/service_mnu.h +++ b/kicker/kicker/ui/service_mnu.h @@ -48,7 +48,7 @@ typedef TQValueVector<TQPopupMenu*> PopupMenuList; class PanelServiceMenu; typedef TQMap<PanelServiceMenu*,int> PanelServiceMenuMap; -class KDE_EXPORT PanelServiceMenu : public KPanelMenu +class TDE_EXPORT PanelServiceMenu : public KPanelMenu { TQ_OBJECT diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h index f89bb6aea..b6b41fbed 100644 --- a/kicker/libkicker/appletinfo.h +++ b/kicker/libkicker/appletinfo.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdemacros.h> -class KDE_EXPORT AppletInfo +class TDE_EXPORT AppletInfo { public: typedef TQValueVector<AppletInfo> List; diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index 61ba2f0ea..6520d55c8 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -37,38 +37,38 @@ namespace KickerLib /* * Functions to convert between various enums */ -KDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); -KDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); -KDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); -KDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); -KDE_EXPORT int sizeValue(KPanelExtension::Size s); +TDE_EXPORT KPanelExtension::Position directionToPosition(KPanelApplet::Direction d); +TDE_EXPORT KPanelExtension::Position directionToPopupPosition(KPanelApplet::Direction d); +TDE_EXPORT KPanelApplet::Direction positionToDirection(KPanelExtension::Position p); +TDE_EXPORT KPanelApplet::Direction arrowToDirection(TQt::ArrowType p); +TDE_EXPORT int sizeValue(KPanelExtension::Size s); /** * Pixel sizes for but sizes and margins */ -KDE_EXPORT int maxButtonDim(); +TDE_EXPORT int maxButtonDim(); /** * Tint the image to reflect the current color scheme * Used, for instance, by KMenu side bar */ -KDE_EXPORT void colorize(TQImage& image); +TDE_EXPORT void colorize(TQImage& image); /** * Blend a color rectangle on a painter */ -KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40); +TDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40); /** * Blend two colours together to get a colour halfway in between */ -KDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); +TDE_EXPORT TQColor blendColors(const TQColor& c1, const TQColor& c2); /** * Create or copy .desktop files for use in kicker safely and easily */ -KDE_EXPORT TQString copyDesktopFile(const KURL&url); -KDE_EXPORT TQString newDesktopFile(const KURL&url); +TDE_EXPORT TQString copyDesktopFile(const KURL&url); +TDE_EXPORT TQString newDesktopFile(const KURL&url); /** @@ -80,7 +80,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url); * This function checks whether that is the case and returns either the * original menu or the sub-menu when appropriate. */ -KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); +TDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); /** @@ -88,7 +88,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); * direction, the size of the menu, the widget geometry, and a optional * point in the local coordinates of the widget. */ -KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, +TDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, const TQWidget* popup, const TQWidget* source, const TQPoint& offset = TQPoint(0, 0)); @@ -97,7 +97,7 @@ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, * Calculate an acceptable inverse of the given color wich will be used * as the shadow color. */ -KDE_EXPORT TQColor shadowColor(const TQColor& c); +TDE_EXPORT TQColor shadowColor(const TQColor& c); /** * Get an appropriate for a menu in Plasma. As the user may set this size @@ -105,7 +105,7 @@ KDE_EXPORT TQColor shadowColor(const TQColor& c); * @param icon the name of icon requested * @return the icon set for the requested icon */ -KDE_EXPORT TQIconSet menuIconSet(const TQString& icon); +TDE_EXPORT TQIconSet menuIconSet(const TQString& icon); } diff --git a/kicker/libkicker/kickerSettings.kcfgc b/kicker/libkicker/kickerSettings.kcfgc index 8e0b42d93..1ac8fa567 100644 --- a/kicker/libkicker/kickerSettings.kcfgc +++ b/kicker/libkicker/kickerSettings.kcfgc @@ -2,7 +2,7 @@ File=kickerSettings.kcfg Singleton=true ClassName=KickerSettings Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT IncludeFiles=tqapplication.h GlobalEnums=true MemberVariables=dpointer diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index 7295b4efa..bcc956eee 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -38,7 +38,7 @@ class TQPaintEvent; class TQSimpleRichText; class TQTimer; -class KDE_EXPORT KickerTip : public TQWidget +class TDE_EXPORT KickerTip : public TQWidget { TQ_OBJECT @@ -58,7 +58,7 @@ public: TQMimeSourceFactory* mimeFactory; }; - class KDE_EXPORT Client + class TDE_EXPORT Client { public: virtual void updateKickerTip(KickerTip::Data&) = 0; diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 1ddc093ff..9757ebede 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -40,7 +40,7 @@ class KShadowSettings; * @author [email protected] * @since 3.2 */ -class KDE_EXPORT KShadowEngine +class TDE_EXPORT KShadowEngine { public: /// Creates a new shadow engine. @@ -112,7 +112,7 @@ private: void *d; }; -class KDE_EXPORT KTextShadowEngine : public KShadowEngine +class TDE_EXPORT KTextShadowEngine : public KShadowEngine { public: KTextShadowEngine(); diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h index e222b964d..774340c01 100644 --- a/kicker/libkicker/kshadowsettings.h +++ b/kicker/libkicker/kshadowsettings.h @@ -41,7 +41,7 @@ * @author [email protected] * @since 3.2 */ -class KDE_EXPORT KShadowSettings +class TDE_EXPORT KShadowSettings { public: /** diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h index 5925d4826..8d9b2d5e1 100644 --- a/kicker/libkicker/menuinfo.h +++ b/kicker/libkicker/menuinfo.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KPanelMenu; class TQWidget; -class KDE_EXPORT MenuInfo +class TDE_EXPORT MenuInfo { public: MenuInfo(const TQString& desktopFile); diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index cea132680..15193c3bf 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -43,7 +43,7 @@ class KShadowEngine; * placed in Kicker's panels. It inherits TQButton, and * KickerTip::Client. */ -class KDE_EXPORT PanelButton: public TQButton, public KickerTip::Client +class TDE_EXPORT PanelButton: public TQButton, public KickerTip::Client { TQ_OBJECT @@ -420,7 +420,7 @@ private: /** * Base class for panelbuttons which popup a menu */ -class KDE_EXPORT PanelPopupButton : public PanelButton +class TDE_EXPORT PanelPopupButton : public PanelButton { TQ_OBJECT diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 6684c32c6..435e06b6d 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class BaseContainer; -class KDE_EXPORT PanelDrag : public TQDragObject +class TDE_EXPORT PanelDrag : public TQDragObject { public: PanelDrag(BaseContainer* container, TQWidget *dragSource); @@ -48,7 +48,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject TQByteArray a; }; -class KDE_EXPORT AppletInfoDrag : public TQDragObject +class TDE_EXPORT AppletInfoDrag : public TQDragObject { public: AppletInfoDrag(const AppletInfo& container, TQWidget *dragSource); diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 36305bb0c..6d73ba5a8 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQBoxLayout; class TQTimer; -class KDE_EXPORT Panner : public TQWidget +class TDE_EXPORT Panner : public TQWidget { TQ_OBJECT diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 7f1718273..d923eef55 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -26,7 +26,7 @@ #include <kdemacros.h> -class KDE_EXPORT SimpleButton : public TQButton +class TDE_EXPORT SimpleButton : public TQButton { TQ_OBJECT @@ -61,7 +61,7 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButtonPrivate* d; }; -class KDE_EXPORT SimpleArrowButton: public SimpleButton +class TDE_EXPORT SimpleArrowButton: public SimpleButton { TQ_OBJECT diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp index 973c52ee9..3e97cf385 100644 --- a/kicker/menuext/tom/tom.cpp +++ b/kicker/menuext/tom/tom.cpp @@ -62,7 +62,7 @@ const int destMenuTitleID = 10001; extern "C" { - KDE_EXPORT void* init_kickermenu_tom() + TDE_EXPORT void* init_kickermenu_tom() { TDEGlobal::locale()->insertCatalogue("libkickermenu_tom"); return new TOMFactory; diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index daf6312d9..9c0bdbfb4 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -68,7 +68,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.") , "v0.1.0" diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 4168bc14a..9a255ab26 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -54,7 +54,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char ** argv ) { TDEAboutData aboutData( "extensionproxy", I18N_NOOP("Panel Extension Proxy") , "v0.1.0" diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index a8b078d67..006724e30 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -36,7 +36,7 @@ class KWindowListMenu; class TaskBar; class TaskBarSettings; -class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject +class TDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject { TQ_OBJECT K_DCOP diff --git a/kicker/taskbar/taskbarsettings.kcfgc b/kicker/taskbar/taskbarsettings.kcfgc index c5219f64e..1e6a7c8cc 100644 --- a/kicker/taskbar/taskbarsettings.kcfgc +++ b/kicker/taskbar/taskbarsettings.kcfgc @@ -2,6 +2,6 @@ File=taskbar.kcfg Singleton=false ClassName=TaskBarSettings Mutators=true -Visibility=KDE_EXPORT +Visibility=TDE_EXPORT SetUserTexts=true GlobalEnums=true diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 4c20819b6..f0ff70afc 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -51,7 +51,7 @@ private: /*****************************************************************************/ -class KDE_EXPORT TaskLMBMenu : public TQPopupMenu +class TDE_EXPORT TaskLMBMenu : public TQPopupMenu { TQ_OBJECT diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index 3771d29a6..289c6af55 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -68,7 +68,7 @@ typedef TQValueList<WId> WindowList; * @see TaskManager * @see KWinModule */ -class KDE_EXPORT Task: public TQObject, public TDEShared +class TDE_EXPORT Task: public TQObject, public TDEShared { TQ_OBJECT TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName ) @@ -483,7 +483,7 @@ private: /** * Provids a drag object for tasks across desktops. */ -class KDE_EXPORT TaskDrag : public TQStoredDrag +class TDE_EXPORT TaskDrag : public TQStoredDrag { public: /** @@ -511,7 +511,7 @@ public: * * @see TaskManager */ -class KDE_EXPORT Startup: public TQObject, public TDEShared +class TDE_EXPORT Startup: public TQObject, public TDEShared { TQ_OBJECT TQ_PROPERTY( TQString text READ text ) @@ -565,7 +565,7 @@ private: * @see Startup * @see KWinModule */ -class KDE_EXPORT TaskManager : public TQObject +class TDE_EXPORT TaskManager : public TQObject { TQ_OBJECT TQ_PROPERTY( int currentDesktop READ currentDesktop ) diff --git a/kicker/taskmanager/taskrmbmenu.h b/kicker/taskmanager/taskrmbmenu.h index a73d83d3a..b82d0338d 100644 --- a/kicker/taskmanager/taskrmbmenu.h +++ b/kicker/taskmanager/taskrmbmenu.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpopupmenu.h> -class KDE_EXPORT TaskRMBMenu : public TQPopupMenu +class TDE_EXPORT TaskRMBMenu : public TQPopupMenu { TQ_OBJECT diff --git a/klipper/applet.cpp b/klipper/applet.cpp index ac47f4d9b..d4add1609 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -31,7 +31,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) + TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("klipper"); int actions = KPanelApplet::Preferences | KPanelApplet::About | KPanelApplet::Help; diff --git a/klipper/main.cpp b/klipper/main.cpp index 4fc686f67..813102af0 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -34,7 +34,7 @@ #endif -extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char *argv[]) { Klipper::createAboutData(); TDECmdLineArgs::init( argc, argv, Klipper::aboutData()); diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index cd580e02e..31f6b002e 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -32,7 +32,7 @@ static const char description[] = I18N_NOOP("TDE control center editor"); static const char version[] = "1.0"; -extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) +extern "C" int TDE_EXPORT kdemain( int argc, char **argv ) { TDELocale::setMainCatalogue("kmenuedit"); TDEAboutData aboutData("kcontroledit", I18N_NOOP("Trinity Control Center Editor"), diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index b78a71ef0..4d55eb4e2 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -62,7 +62,7 @@ public: }; -extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) +extern "C" int TDE_EXPORT kdemain( int argc, char **argv ) { TDEAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"), version, description, TDEAboutData::License_GPL, diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp index 001734cdb..db9d40fd3 100644 --- a/konqueror/client/kfmclient.cpp +++ b/konqueror/client/kfmclient.cpp @@ -68,7 +68,7 @@ static const TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char **argv ) { TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 94e08a357..27c5b2ad5 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -110,7 +110,7 @@ static int askUser(TDEApplication &app, TQString filename, bool &readonly) { #include <tdeactioncollection.h> -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { +extern "C" TDE_EXPORT int kdemain(int argc, char **argv) { TDELocale::setMainCatalogue("konqueror"); TDEAboutData aboutData("keditbookmarks", I18N_NOOP("Bookmark Editor"), VERSION, I18N_NOOP("Konqueror Bookmarks Editor"), diff --git a/konqueror/konq_main.cpp b/konqueror/konq_main.cpp index ee1fc71db..0f582d1a0 100644 --- a/konqueror/konq_main.cpp +++ b/konqueror/konq_main.cpp @@ -48,7 +48,7 @@ static const TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char **argv ) { TDECmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp index ecc6691da..fcfa4b4d0 100644 --- a/konqueror/preloader/preloader.cpp +++ b/konqueror/preloader/preloader.cpp @@ -143,7 +143,7 @@ void KonqyPreloader::unloadAllPreloaded() } extern "C" -KDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj ) +TDE_EXPORT KDEDModule *create_konqy_preloader( const TQCString& obj ) { return new KonqyPreloader( obj ); } diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index 367e7324d..7941fb1c9 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -30,7 +30,7 @@ class KonqSidebarPluginPrivate; -class KDE_EXPORT KonqSidebarPlugin : public TQObject +class TDE_EXPORT KonqSidebarPlugin : public TQObject { TQ_OBJECT public: diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index 391db5101..7e31004ad 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -93,7 +93,7 @@ private: TQWidget *m_parent; }; -class KDE_EXPORT Sidebar_Widget: public TQWidget +class TDE_EXPORT Sidebar_Widget: public TQWidget { TQ_OBJECT public: diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index 2032fe202..3c979d5fc 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -19,7 +19,7 @@ extern "C" { - KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + TDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new SidebarTest(instance,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index f1dd0b953..fa4b2b4f6 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -574,7 +574,7 @@ TQString BookmarkEditDialog::finalTitle() const extern "C" { - KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool) + TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_bookmarks(KonqSidebarTree* par,const bool) { return new KonqSidebarBookmarkModule(par); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index e6e4a0af3..7592c5479 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -624,7 +624,7 @@ void KonqSidebarDirTreeModule::followURL( const KURL & url ) extern "C" { - KDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden) + TDE_EXPORT KonqSidebarTreeModule *create_konq_sidebartree_dirtree(KonqSidebarTree* par,const bool showHidden) { return new KonqSidebarDirTreeModule(par,showHidden); } diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 416054cf1..f941bd0f7 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -358,7 +358,7 @@ void KonqSidebarHistoryModule::slotClearHistory() extern "C" { - KDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool) + TDE_EXPORT KonqSidebarTreeModule* create_konq_sidebartree_history(KonqSidebarTree* par, const bool) { return new KonqSidebarHistoryModule(par); } diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 4bd91f9f3..293616f21 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -124,7 +124,7 @@ void KonqSidebar_Tree::rename() extern "C" { - KDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + TDE_EXPORT void* create_konqsidebar_tree(TDEInstance *inst,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new KonqSidebar_Tree(inst,par,widp,desktopname,name); } @@ -132,7 +132,7 @@ extern "C" extern "C" { - KDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) + TDE_EXPORT bool add_konqsidebar_tree(TQString* fn, TQString*, TQMap<TQString,TQString> *map) { TDEStandardDirs *dirs=TDEGlobal::dirs(); TQStringList list=dirs->findAllResources("data","konqsidebartng/dirtree/*.desktop",false,true); diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index feb1a6692..02543b652 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -182,14 +182,14 @@ void KonqSideBarWebModule::pageLoaded() { extern "C" { - KDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { + TDE_EXPORT KonqSidebarPlugin* create_konqsidebar_web(TDEInstance *instance, TQObject *parent, TQWidget *widget, TQString &desktopName, const char *name) { return new KonqSideBarWebModule(instance, parent, widget, desktopName, name); } } extern "C" { - KDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { + TDE_EXPORT bool add_konqsidebar_web(TQString* fn, TQString* param, TQMap<TQString,TQString> *map) { Q_UNUSED(param); TDEGlobal::dirs()->addResourceType("websidebardata", TDEStandardDirs::kde_default("data") + "konqsidebartng/websidebar"); KURL url; diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index 9e70e4c1a..d3ccf6acc 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -136,7 +136,7 @@ KWritedModule::~KWritedModule() } extern "C" -KDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) +TDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) { return new KWritedModule( obj ); } diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 76db9e9cc..9e5cca6de 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -150,7 +150,7 @@ public: /* --| main |------------------------------------------------------ */ -extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char* argv[]) { setgid(getgid()); setuid(getuid()); // drop privileges diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 977ba02e0..5a4360836 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -172,7 +172,7 @@ void sanity_check( int argc, char* argv[] ) } } -extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) +extern "C" TDE_EXPORT int kdemain( int argc, char* argv[] ) { sanity_check(argc, argv); diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h index 0e99d69f7..35aa414eb 100644 --- a/ksplashml/themeengine/default/themelegacy.h +++ b/ksplashml/themeengine/default/themelegacy.h @@ -41,7 +41,7 @@ protected: * @short Traditional Trinity splash screen. */ class ObjKsTheme; -class KDE_EXPORT ThemeDefault : public ThemeEngine +class TDE_EXPORT ThemeDefault : public ThemeEngine { TQ_OBJECT public: diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index f6884b46f..7702371f3 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -26,7 +26,7 @@ class TDEConfig; * of KSplash completely, and offers a friendlier way * of installing custom splash screens. */ -class KDE_EXPORT ObjKsTheme : public TQObject +class TDE_EXPORT ObjKsTheme : public TQObject { TQ_OBJECT public: diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index 27ae5ec11..202adc1ce 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -25,7 +25,7 @@ class TQMouseEvent; /** * @short The base for the ThemeEngine's configuration widget. */ -class KDE_EXPORT ThemeEngineConfig: public TQVBox +class TDE_EXPORT ThemeEngineConfig: public TQVBox { TQ_OBJECT public: @@ -48,7 +48,7 @@ protected: * @short Base class for all theme engines. Member functions need to be * overridden by derived classes in order to provide actual functionality. */ -class KDE_EXPORT ThemeEngine: public TQVBox +class TDE_EXPORT ThemeEngine: public TQVBox { TQ_OBJECT public: diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h index e2930943c..d002af4b0 100644 --- a/ksplashml/themeengine/unified/themeunified.h +++ b/ksplashml/themeengine/unified/themeunified.h @@ -40,7 +40,7 @@ protected: * @short Traditional Trinity splash screen. */ class ObjKsTheme; -class KDE_EXPORT ThemeUnified : public ThemeEngine +class TDE_EXPORT ThemeUnified : public ThemeEngine { TQ_OBJECT public: diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp index d5ae18b46..471a28055 100644 --- a/ksysguard/gui/KSysGuardApplet.cpp +++ b/ksysguard/gui/KSysGuardApplet.cpp @@ -50,7 +50,7 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) + TDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { TDEGlobal::locale()->insertCatalogue( "ksysguard" ); return new KSysGuardApplet( configFile, KPanelApplet::Normal, diff --git a/ksysguard/gui/ksgrd/SensorAgent.h b/ksysguard/gui/ksgrd/SensorAgent.h index 14b9bc014..b165cf701 100644 --- a/ksysguard/gui/ksgrd/SensorAgent.h +++ b/ksysguard/gui/ksgrd/SensorAgent.h @@ -43,7 +43,7 @@ class SensorRequest; ksysguardd. The current implementation only allowes one pending requests. Incoming requests are queued in an input FIFO. */ -class KDE_EXPORT SensorAgent : public TQObject +class TDE_EXPORT SensorAgent : public TQObject { TQ_OBJECT diff --git a/ksysguard/gui/ksgrd/SensorManager.h b/ksysguard/gui/ksgrd/SensorManager.h index 906358c0d..27b24e6de 100644 --- a/ksysguard/gui/ksgrd/SensorManager.h +++ b/ksysguard/gui/ksgrd/SensorManager.h @@ -43,7 +43,7 @@ class SensorManagerIterator; connection yet or the hostname is empty, a dialog will be shown to enter the connections details. */ -class KDE_EXPORT SensorManager : public TQObject +class TDE_EXPORT SensorManager : public TQObject { TQ_OBJECT @@ -110,9 +110,9 @@ class KDE_EXPORT SensorManager : public TQObject HostConnector* mHostConnector; }; -KDE_EXPORT extern SensorManager* SensorMgr; +TDE_EXPORT extern SensorManager* SensorMgr; -class KDE_EXPORT SensorManagerIterator : public TQDictIterator<SensorAgent> +class TDE_EXPORT SensorManagerIterator : public TQDictIterator<SensorAgent> { public: SensorManagerIterator( const SensorManager *sm ) diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h index 15a968eb6..345a91546 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.h +++ b/ksysguard/gui/ksgrd/StyleEngine.h @@ -38,7 +38,7 @@ class StyleSettings; namespace KSGRD { -class KDE_EXPORT StyleEngine : public TQObject +class TDE_EXPORT StyleEngine : public TQObject { TQ_OBJECT @@ -79,7 +79,7 @@ class KDE_EXPORT StyleEngine : public TQObject StyleSettings *mSettingsDialog; }; -KDE_EXPORT extern StyleEngine* Style; +TDE_EXPORT extern StyleEngine* Style; } diff --git a/ksysguard/gui/ksgrd/TimerSettings.h b/ksysguard/gui/ksgrd/TimerSettings.h index 8a2ba9588..79eb331aa 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.h +++ b/ksysguard/gui/ksgrd/TimerSettings.h @@ -30,7 +30,7 @@ class TQCheckBox; class TQLabel; class TQSpinBox; -class KDE_EXPORT TimerSettings : public KDialogBase +class TDE_EXPORT TimerSettings : public KDialogBase { TQ_OBJECT diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 73a500e21..fac058a6f 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -1229,17 +1229,17 @@ OptionListItem * OptionListItem::findChildItem( const TQString& optionName ) extern "C" { - KDE_EXPORT TDECModule *create_keyboard_layout(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_keyboard_layout(TQWidget *parent, const char *) { return new LayoutConfig(parent, "kcmlayout"); } - KDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_keyboard(TQWidget *parent, const char *) { return new KeyboardConfig(parent, "kcmlayout"); } - KDE_EXPORT void init_keyboard() + TDE_EXPORT void init_keyboard() { KeyboardConfig::init_keyboard(); diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 34ed19334..1d899299f 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -373,7 +373,7 @@ bool KXKBApp::x11EventFilter(XEvent *e) { const char *DESCRIPTION = I18N_NOOP("A utility to switch keyboard maps"); -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDEAboutData about("kxkb", I18N_NOOP("TDE Keyboard Tool"), "1.0", DESCRIPTION, TDEAboutData::License_LGPL, diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index c0d5a4f38..756636bc7 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -265,7 +265,7 @@ void FaviconsModule::slotKill() } extern "C" { - KDE_EXPORT KDEDModule *create_favicons(const TQCString &obj) + TDE_EXPORT KDEDModule *create_favicons(const TQCString &obj) { KImageIO::registerFormats(); return new FaviconsModule(obj); diff --git a/libkonq/konq_sound.cpp b/libkonq/konq_sound.cpp index a0c95c19b..a2357dd23 100644 --- a/libkonq/konq_sound.cpp +++ b/libkonq/konq_sound.cpp @@ -128,7 +128,7 @@ TQObject *KonqSoundFactory::createObject(TQObject *, const char *, extern "C" { - KDE_EXPORT KLibFactory *init_konq_sound() + TDE_EXPORT KLibFactory *init_konq_sound() { return new KonqSoundFactory(); } diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h index 7f489e84f..23b8f2f38 100644 --- a/libkonq/libkonq_export.h +++ b/libkonq/libkonq_export.h @@ -21,7 +21,7 @@ #ifndef LIBKONQ_EXPORT_H #define LIBKONQ_EXPORT_H -/* needed for KDE_EXPORT macros */ +/* needed for TDE_EXPORT macros */ #include <kdemacros.h> /* needed, because e.g. Q_OS_UNIX is so frequently used */ @@ -32,7 +32,7 @@ #else /* Q_OS_UNIX */ /* export statements for unix */ -#define LIBKONQ_EXPORT KDE_EXPORT +#define LIBKONQ_EXPORT TDE_EXPORT #endif diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp index da6c5d780..c60a7acbe 100644 --- a/nsplugins/kcm_nsplugins.cpp +++ b/nsplugins/kcm_nsplugins.cpp @@ -86,7 +86,7 @@ static bool checkSearchPathTimestamps( TQStringList paths, TQStringList timestam extern "C" { - KDE_EXPORT void init_nsplugin() + TDE_EXPORT void init_nsplugin() { TDEConfig *config = new TDEConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/); config->setGroup("Misc"); diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 2495556e4..be5a18f9f 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -1233,7 +1233,7 @@ void NSPluginInstance::gotFocusOut() // Prevent plugins from polling the keyboard regardless of focus. static int (*real_xquerykeymap)( Display*, char[32] ) = NULL; -extern "C" KDE_EXPORT +extern "C" TDE_EXPORT int XQueryKeymap( Display* dpy, char k[32] ) { if( real_xquerykeymap == NULL ) diff --git a/tdeioslave/about/tdeio_about.cpp b/tdeioslave/about/tdeio_about.cpp index f8ac109f3..7ed4a5719 100644 --- a/tdeioslave/about/tdeio_about.cpp +++ b/tdeioslave/about/tdeio_about.cpp @@ -57,7 +57,7 @@ void AboutProtocol::mimetype( const KURL& ) extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) { + int TDE_EXPORT kdemain( int argc, char **argv ) { TDEInstance instance("tdeio_about"); diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp index 4f54d6668..20e036370 100644 --- a/tdeioslave/cgi/cgi.cpp +++ b/tdeioslave/cgi/cgi.cpp @@ -250,7 +250,7 @@ void CgiProtocol::get( const KURL& url ) kdDebug(7124) << "CgiProtocol::get - done" << endl; } -extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); } +extern "C" { int TDE_EXPORT kdemain( int argc, char **argv ); } /*! The kdemain function generates an instance of the ioslave and starts its * dispatch loop. */ diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp index 456c9d45f..95da88415 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * ) + TDE_EXPORT TDECModule *create_cgi( TQWidget *parent, const char * ) { TDEGlobal::locale()->insertCatalogue("kcmcgi"); return new KCMCgi( parent, "kcmcgi" ); diff --git a/tdeioslave/filter/filter.cpp b/tdeioslave/filter/filter.cpp index a429103e1..79e9977e2 100644 --- a/tdeioslave/filter/filter.cpp +++ b/tdeioslave/filter/filter.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "filter.h" -extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } +extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char ** argv) { diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp index 621d33301..610a29ee0 100644 --- a/tdeioslave/finger/tdeio_finger.cpp +++ b/tdeioslave/finger/tdeio_finger.cpp @@ -43,7 +43,7 @@ static const TQString defaultRefreshRate = "60"; extern "C" { - KDE_EXPORT int kdemain( int argc, char **argv ) + TDE_EXPORT int kdemain( int argc, char **argv ) { TDEInstance instance( "tdeio_finger" ); diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp index 6f6cd93c6..7404ffa66 100644 --- a/tdeioslave/fish/fish.cpp +++ b/tdeioslave/fish/fish.cpp @@ -124,7 +124,7 @@ static void ripper(int) } } -int KDE_EXPORT kdemain( int argc, char **argv ) +int TDE_EXPORT kdemain( int argc, char **argv ) { TDELocale::setMainCatalogue("tdeio_fish"); TDEInstance instance("fish"); diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp index 50303f1b7..daa3cd9a0 100644 --- a/tdeioslave/floppy/tdeio_floppy.cpp +++ b/tdeioslave/floppy/tdeio_floppy.cpp @@ -49,7 +49,7 @@ using namespace TDEIO; -extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } +extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { diff --git a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp index ac4e79f66..cc2dea334 100644 --- a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp +++ b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp @@ -28,7 +28,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj) } extern "C" { - KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj) + TDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj) { TDEGlobal::locale()->insertCatalogue("tdeio_home"); return new HomeDirNotifyModule(obj); diff --git a/tdeioslave/home/tdeio_home.cpp b/tdeioslave/home/tdeio_home.cpp index c4db91128..352fadc8e 100644 --- a/tdeioslave/home/tdeio_home.cpp +++ b/tdeioslave/home/tdeio_home.cpp @@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] = }; extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) + int TDE_EXPORT kdemain( int argc, char **argv ) { // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); diff --git a/tdeioslave/info/info.cpp b/tdeioslave/info/info.cpp index 83b41dae8..fc6c58c44 100644 --- a/tdeioslave/info/info.cpp +++ b/tdeioslave/info/info.cpp @@ -240,7 +240,7 @@ void InfoProtocol::stat( const KURL & ) finished(); } -extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); } +extern "C" { int TDE_EXPORT kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) { diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index b61c2af74..6bba50dcd 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -27,7 +27,7 @@ using namespace TDEIO; using namespace TDEABC; -extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } +extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); } /** * The main program. diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index d116ef909..8832d267c 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -35,7 +35,7 @@ using namespace TDEIO; extern "C" { - int KDE_EXPORT kdemain(int, char **argv) { + int TDE_EXPORT kdemain(int, char **argv) { TDEInstance instance("tdeio_mac"); MacProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 703ec2202..a93d3daf8 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/tdeioslave/man/kmanpart.cpp @@ -30,7 +30,7 @@ extern "C" { - KDE_EXPORT void* init_libkmanpart() + TDE_EXPORT void* init_libkmanpart() { return new KManPartFactory; } diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp index cd04f702e..073367d50 100644 --- a/tdeioslave/man/tdeio_man.cpp +++ b/tdeioslave/man/tdeio_man.cpp @@ -738,7 +738,7 @@ void MANProtocol::stat( const KURL& url) extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) { + int TDE_EXPORT kdemain( int argc, char **argv ) { TDEInstance instance("tdeio_man"); diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp index 66c456a24..d61e6946c 100644 --- a/tdeioslave/media/mediamanager/mediamanager.cpp +++ b/tdeioslave/media/mediamanager/mediamanager.cpp @@ -483,7 +483,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam extern "C" { - KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj) + TDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj) { TDEGlobal::locale()->insertCatalogue("tdeio_media"); return new MediaManager(obj); diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index 2510019f2..46a758a7f 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -367,7 +367,7 @@ void MediaNotifier::notificationDialogDestroyed(TQObject* object) extern "C" { - KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name) + TDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name) { TDEGlobal::locale()->insertCatalogue("kay"); return new MediaNotifier(name); diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp index c68bc25d5..33bc4a05b 100644 --- a/tdeioslave/media/tdeio_media.cpp +++ b/tdeioslave/media/tdeio_media.cpp @@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] = }; extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) + int TDE_EXPORT kdemain( int argc, char **argv ) { // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp index e2908f815..8ab3817af 100644 --- a/tdeioslave/nfs/tdeio_nfs.cpp +++ b/tdeioslave/nfs/tdeio_nfs.cpp @@ -109,7 +109,7 @@ int x_getdomainname(char *name, size_t len) //#endif -extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } +extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp index 7b5fedf6c..241b00294 100644 --- a/tdeioslave/nntp/nntp.cpp +++ b/tdeioslave/nntp/nntp.cpp @@ -35,7 +35,7 @@ using namespace TDEIO; -extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } +extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) { diff --git a/tdeioslave/pop3/pop3.cpp b/tdeioslave/pop3/pop3.cpp index f45f06d60..494c4a6a3 100644 --- a/tdeioslave/pop3/pop3.cpp +++ b/tdeioslave/pop3/pop3.cpp @@ -70,7 +70,7 @@ extern "C" { #define POP3_DEBUG kdDebug(7105) extern "C" { - int KDE_EXPORT kdemain(int argc, char **argv); + int TDE_EXPORT kdemain(int argc, char **argv); } using namespace TDEIO; diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp index a93ec7eae..e3e32fb5c 100644 --- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp +++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp @@ -28,7 +28,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj) } extern "C" { - KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj) + TDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj) { TDEGlobal::locale()->insertCatalogue("tdeio_remote"); return new RemoteDirNotifyModule(obj); diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp index 271b0913f..258102a97 100644 --- a/tdeioslave/remote/tdeio_remote.cpp +++ b/tdeioslave/remote/tdeio_remote.cpp @@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] = }; extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) + int TDE_EXPORT kdemain( int argc, char **argv ) { // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); diff --git a/tdeioslave/settings/tdeio_settings.cpp b/tdeioslave/settings/tdeio_settings.cpp index 5d1e67a0e..48abb9c02 100644 --- a/tdeioslave/settings/tdeio_settings.cpp +++ b/tdeioslave/settings/tdeio_settings.cpp @@ -49,7 +49,7 @@ private: }; extern "C" { - KDE_EXPORT int kdemain( int, char **argv ) + TDE_EXPORT int kdemain( int, char **argv ) { kdDebug() << "kdemain for settings tdeioslave" << endl; TDEInstance instance( "tdeio_settings" ); diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp index 0abcd6238..d2a9e859a 100644 --- a/tdeioslave/sftp/tdeio_sftp.cpp +++ b/tdeioslave/sftp/tdeio_sftp.cpp @@ -72,7 +72,7 @@ using namespace TDEIO; extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) + int TDE_EXPORT kdemain( int argc, char **argv ) { TDEInstance instance( "tdeio_sftp" ); diff --git a/tdeioslave/smb/tdeio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp index 28c54b3ac..d21af7e4f 100644 --- a/tdeioslave/smb/tdeio_smb.cpp +++ b/tdeioslave/smb/tdeio_smb.cpp @@ -56,7 +56,7 @@ SMBSlave::~SMBSlave() SMBSlave* G_TheSlave; //=========================================================================== -int KDE_EXPORT kdemain( int argc, char **argv ) +int TDE_EXPORT kdemain( int argc, char **argv ) { TDEInstance instance( "tdeio_smb" ); diff --git a/tdeioslave/smtp/smtp.cpp b/tdeioslave/smtp/smtp.cpp index ba009c1c5..76e79f8a5 100644 --- a/tdeioslave/smtp/smtp.cpp +++ b/tdeioslave/smtp/smtp.cpp @@ -90,7 +90,7 @@ using KioSMTP::TransactionState; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain(int argc, char **argv) diff --git a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp index ec95c0e32..7b12ffb7f 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp @@ -28,7 +28,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj) } extern "C" { - KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj) + TDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj) { TDEGlobal::locale()->insertCatalogue("tdeio_system"); return new SystemDirNotifyModule(obj); diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp index 54dd0da6d..76bfc7f82 100644 --- a/tdeioslave/system/tdeio_system.cpp +++ b/tdeioslave/system/tdeio_system.cpp @@ -39,7 +39,7 @@ static const TDECmdLineOptions options[] = }; extern "C" { - KDE_EXPORT int kdemain( int argc, char **argv ) + TDE_EXPORT int kdemain( int argc, char **argv ) { // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); diff --git a/tdeioslave/tar/tar.cpp b/tdeioslave/tar/tar.cpp index b7ba70687..428a65971 100644 --- a/tdeioslave/tar/tar.cpp +++ b/tdeioslave/tar/tar.cpp @@ -28,7 +28,7 @@ using namespace TDEIO; -extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } +extern "C" { int TDE_EXPORT kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { diff --git a/tdeioslave/thumbnail/cursorcreator.cpp b/tdeioslave/thumbnail/cursorcreator.cpp index a8f6a2eb9..c9d127ceb 100644 --- a/tdeioslave/thumbnail/cursorcreator.cpp +++ b/tdeioslave/thumbnail/cursorcreator.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new CursorCreator; } diff --git a/tdeioslave/thumbnail/djvucreator.cpp b/tdeioslave/thumbnail/djvucreator.cpp index 20a32fb26..296d904a3 100644 --- a/tdeioslave/thumbnail/djvucreator.cpp +++ b/tdeioslave/thumbnail/djvucreator.cpp @@ -47,7 +47,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new DjVuCreator; } diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp index 9ec2dd706..5cc3fe277 100644 --- a/tdeioslave/thumbnail/exrcreator.cpp +++ b/tdeioslave/thumbnail/exrcreator.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new EXRCreator; } diff --git a/tdeioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp index 5a6935010..0a0bac58e 100644 --- a/tdeioslave/thumbnail/htmlcreator.cpp +++ b/tdeioslave/thumbnail/htmlcreator.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new HTMLCreator; } diff --git a/tdeioslave/thumbnail/imagecreator.cpp b/tdeioslave/thumbnail/imagecreator.cpp index 259a8928f..80c34a577 100644 --- a/tdeioslave/thumbnail/imagecreator.cpp +++ b/tdeioslave/thumbnail/imagecreator.cpp @@ -28,7 +28,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { KImageIO::registerFormats(); return new ImageCreator; diff --git a/tdeioslave/thumbnail/textcreator.cpp b/tdeioslave/thumbnail/textcreator.cpp index 13f3ba83f..d4f8cde5f 100644 --- a/tdeioslave/thumbnail/textcreator.cpp +++ b/tdeioslave/thumbnail/textcreator.cpp @@ -30,7 +30,7 @@ extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new TextCreator; } diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp index 98b01138c..9d3e16498 100644 --- a/tdeioslave/thumbnail/thumbnail.cpp +++ b/tdeioslave/thumbnail/thumbnail.cpp @@ -85,7 +85,7 @@ using namespace TDEIO; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); } diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp index 8793be5d9..06c458593 100644 --- a/tdeioslave/trash/kcmtrash.cpp +++ b/tdeioslave/trash/kcmtrash.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *) { return new TrashModule(parent, "kcmtrash"); } diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index aa1f63aa1..ee48679d5 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -50,7 +50,7 @@ static const TDECmdLineOptions options[] = }; extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) + int TDE_EXPORT kdemain( int argc, char **argv ) { //TDEInstance instance( "tdeio_trash" ); // TDEApplication is necessary to use tdeio_file diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index 0445c71a5..48745216b 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -33,7 +33,7 @@ static TDECmdLineOptions options[] = { }; -extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char *argv[]) { TDEAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),TDEAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, 0); aboutData.addAuthor("Michael Goffioul",0,"[email protected]"); diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index b9e04be1f..61ed345d1 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -42,7 +42,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char *argv[]) { TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); TDECmdLineArgs::addCmdLineOptions(options); diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index 5ca66f09b..27c6150da 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -50,7 +50,7 @@ extern "C" { - int KDE_EXPORT kdemain(int argc, char **argv); + int TDE_EXPORT kdemain(int argc, char **argv); } void addAtom(TDEIO::UDSEntry& entry, unsigned int ID, long l, const TQString& s = TQString()) diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp index f1f39ca57..69dcce638 100644 --- a/tdescreensaver/blankscrn.cpp +++ b/tdescreensaver/blankscrn.cpp @@ -23,16 +23,16 @@ // libtdescreensaver interface extern "C" { - KDE_EXPORT const char *kss_applicationName = "kblankscrn.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" ); - KDE_EXPORT const char *kss_version = "2.2.0"; + TDE_EXPORT const char *kss_applicationName = "kblankscrn.kss"; + TDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" ); + 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 KBlankSaver( id ); } - KDE_EXPORT TQDialog* kss_setup() + TDE_EXPORT TQDialog* kss_setup() { return new KBlankSetup(); } diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp index 7a04b7fea..ac310a135 100644 --- a/tdmlib/kgreet_classic.cpp +++ b/tdmlib/kgreet_classic.cpp @@ -611,7 +611,7 @@ create( KGreeterPluginHandler *handler, KdmThemer *themer, return new KClassicGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx ); } -KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = { +TDE_EXPORT kgreeterplugin_info kgreeterplugin_info = { I18N_NOOP("Username + password (classic)"), "classic", kgreeterplugin_info::Local | kgreeterplugin_info::Presettable, init, done, create diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp index 1f6da138c..f0581a601 100644 --- a/tdmlib/kgreet_pam.cpp +++ b/tdmlib/kgreet_pam.cpp @@ -708,7 +708,7 @@ create( KGreeterPluginHandler *handler, KdmThemer *themer, return new KPamGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx ); } -KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = { +TDE_EXPORT kgreeterplugin_info kgreeterplugin_info = { I18N_NOOP("Pam conversation plugin"), "pam", kgreeterplugin_info::Local | kgreeterplugin_info::Presettable, init, done, create diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp index b7a9211b8..d14dcd112 100644 --- a/tdmlib/kgreet_winbind.cpp +++ b/tdmlib/kgreet_winbind.cpp @@ -712,7 +712,7 @@ create( KGreeterPluginHandler *handler, KdmThemer *themer, return new KWinbindGreeter( handler, themer, parent, predecessor, fixedEntity, func, ctx ); } -KDE_EXPORT kgreeterplugin_info kgreeterplugin_info = { +TDE_EXPORT kgreeterplugin_info kgreeterplugin_info = { I18N_NOOP("Winbind / Samba"), "classic", kgreeterplugin_info::Local | kgreeterplugin_info::Fielded | kgreeterplugin_info::Presettable, init, done, create diff --git a/tdmlib/kgreeterplugin.h b/tdmlib/kgreeterplugin.h index 1dcd0233b..70b52cc60 100644 --- a/tdmlib/kgreeterplugin.h +++ b/tdmlib/kgreeterplugin.h @@ -312,7 +312,7 @@ protected: TQLayoutItem *layoutItem; }; -struct KDE_EXPORT kgreeterplugin_info { +struct TDE_EXPORT kgreeterplugin_info { /** * Human readable name of this plugin (should be a little more * informative than just the libary name). Must be I18N_NOOP()ed. diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index 9a7d8f6e3..cf27233a9 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -38,7 +38,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj ) + TDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj ) { return new TDEIntegration::Module( obj ); } diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 16a451932..032065602 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -82,7 +82,7 @@ static bool drawSmallBorders = false; // ===================================== -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new B2::B2ClientFactory(); } diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index b955254ec..70942bce1 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new B2Config(conf, parent)); } diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 36ddb1402..054279fc0 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -17,7 +17,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new KDEDefaultConfig(conf, parent)); } diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index 3513ca5df..33eb46f4d 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -1060,7 +1060,7 @@ TQRegion KDEDefaultClient::cornerShape(WindowCorner corner) } // namespace // Extended KWin plugin interface -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new Default::KDEDefaultHandler(); } diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index 98a46e308..408c5a38a 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -33,7 +33,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return ( new KeramikConfig( conf, parent ) ); } diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 942962693..576d2d97b 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -1836,7 +1836,7 @@ bool KeramikClient::eventFilter( TQObject* o, TQEvent* e ) extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { Keramik::clientHandler = new Keramik::KeramikHandler(); return Keramik::clientHandler; diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index defc8a3df..5cff37b3c 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -927,7 +927,7 @@ TODO extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { return new KWMTheme::KWMThemeFactory(); } diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp index 30fb76b3a..b0bc659dd 100644 --- a/twin/clients/laptop/laptopclient.cpp +++ b/twin/clients/laptop/laptopclient.cpp @@ -65,7 +65,7 @@ static bool pixmaps_created = false; // ===================================== -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new Laptop::LaptopClientFactory(); } diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 187278d43..4fba7538d 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -12,7 +12,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) + TDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) { return(new ModernSysConfig(conf, parent)); } diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index 94615b190..3777df9d8 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -731,7 +731,7 @@ bool ModernSysFactory::supports( Ability ability ) } // KWin extended plugin interface -extern "C" KDE_EXPORT KDecorationFactory* create_factory() +extern "C" TDE_EXPORT KDecorationFactory* create_factory() { return new ModernSystem::ModernSysFactory(); } diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 81192f699..0fdc126e2 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -115,7 +115,7 @@ void PlastikConfig::defaults() extern "C" { - KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { + TDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new PlastikConfig(config, parent)); } } diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index b5a4808d7..6f835fde8 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -590,7 +590,7 @@ PlastikHandler* Handler() extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { KWinPlastik::handler = new KWinPlastik::PlastikHandler(); return KWinPlastik::handler; diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index 106ea28dc..f6bd853b1 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -15,7 +15,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) + TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent ) { return(new QuartzConfig(conf, parent)); } diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp index dff79ff4b..31a0dbcf1 100644 --- a/twin/clients/quartz/quartz.cpp +++ b/twin/clients/quartz/quartz.cpp @@ -783,7 +783,7 @@ void QuartzClient::paintEvent( TQPaintEvent* ) ///////////////////////////////// extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { Quartz::clientHandler = new Quartz::QuartzHandler(); return Quartz::clientHandler; diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp index 6deddeaee..006f19122 100644 --- a/twin/clients/redmond/redmond.cpp +++ b/twin/clients/redmond/redmond.cpp @@ -688,7 +688,7 @@ TQValueList< RedmondDecoFactory::BorderSize > RedmondDecoFactory::borderSizes() } -extern "C" KDE_EXPORT KDecorationFactory *create_factory() +extern "C" TDE_EXPORT KDecorationFactory *create_factory() { return new Redmond::RedmondDecoFactory(); } diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index 0cf45a90b..113254f98 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -333,7 +333,7 @@ bool Factory::reset( unsigned long changed ) extern "C" { -KDE_EXPORT KDecorationFactory *create_factory() +TDE_EXPORT KDecorationFactory *create_factory() { return new KWinTest::Factory(); } diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index 5c2457e1c..f40dc552b 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT KDecorationFactory *create_factory() + TDE_EXPORT KDecorationFactory *create_factory() { return new Web::WebFactory(); } diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index 2ce258c3c..0b392cd14 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_twinfocus(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); @@ -44,14 +44,14 @@ extern "C" return new KFocusConfig(true, c, parent, name); } - KDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_twinactions(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); return new TDEActionsOptions( parent, name); } - KDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_twinmoving(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); @@ -59,14 +59,14 @@ extern "C" return new KMovingConfig(true, c, parent, name); } - KDE_EXPORT TDECModule *create_twinaborders(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_twinaborders(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("kcmkwm"); TDEConfig *c = new TDEConfig("twinrc", false, true); return new KActiveBorderConfig(true, c, parent, name); } - KDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_twinadvanced(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); @@ -74,7 +74,7 @@ extern "C" return new KAdvancedConfig(true, c, parent, name); } - KDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_twintranslucency(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); @@ -82,7 +82,7 @@ extern "C" return new KTranslucencyConfig(true, c, parent, name); } - KDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name) + TDE_EXPORT TDECModule *create_twinoptions ( TQWidget *parent, const char* name) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue("kcmkwm"); diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index fb7451626..e2a75ee62 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -28,7 +28,7 @@ #include "ruleslist.h" extern "C" - KDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name ) + TDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name ) { //CT there's need for decision: kwm or twin? TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" ); diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index 21cb007ec..67e21332c 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -273,7 +273,7 @@ static const TDECmdLineOptions options[] = }; extern "C" -KDE_EXPORT int kdemain( int argc, char* argv[] ) +TDE_EXPORT int kdemain( int argc, char* argv[] ) { TDELocale::setMainCatalogue( "kcmtwinrules" ); TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ), diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index 03e1c863e..ee8e66eef 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -37,7 +37,7 @@ class KDecorationBridge; class KDecorationPrivate; class KDecorationFactory; -#define KWIN_EXPORT KDE_EXPORT +#define KWIN_EXPORT TDE_EXPORT /** * This class provides a namespace for all decoration related classes. diff --git a/twin/main.cpp b/twin/main.cpp index 61fb82847..540595a1b 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -240,7 +240,7 @@ static TDECmdLineOptions args[] = }; extern "C" -KDE_EXPORT int kdemain( int argc, char * argv[] ) +TDE_EXPORT int kdemain( int argc, char * argv[] ) { bool restored = false; for (int arg = 1; arg < argc; arg++) |