diff options
| -rw-r--r-- | bab/main.cpp | 2 | ||||
| -rw-r--r-- | deco/baghiraclient.cc | 8 | ||||
| -rw-r--r-- | deco/config/baghiraconfig.cc | 12 | ||||
| -rw-r--r-- | deco/config/baghiraconfig.cc.new | 12 | ||||
| -rw-r--r-- | kickermenu-3.3/menuapplet.cpp | 2 | ||||
| -rw-r--r-- | sessionapplet/usermanager.cpp | 2 | ||||
| -rw-r--r-- | sidebar/baghirasidebar.cpp | 4 | ||||
| -rw-r--r-- | starter/starter.cpp | 2 |
8 files changed, 24 insertions, 20 deletions
diff --git a/bab/main.cpp b/bab/main.cpp index 11fbd48..076d3d6 100644 --- a/bab/main.cpp +++ b/bab/main.cpp @@ -211,7 +211,7 @@ void bab::configureBaghira() return; } - void* allocPtr = library->symbol("allocate_kstyle_config"); + void* allocPtr = library->symbol("allocate_tdestyle_config"); if (!allocPtr) { diff --git a/deco/baghiraclient.cc b/deco/baghiraclient.cc index ab14cc4..593460a 100644 --- a/deco/baghiraclient.cc +++ b/deco/baghiraclient.cc @@ -130,8 +130,12 @@ bool BaghiraFactory::delAppname_; Atom baghira_deco_design = XInternAtom(tqt_xdisplay(), "BAGHIRA_DECO_DESIGN", False); -extern "C" KDecorationFactory* create_factory() { - return new Baghira::BaghiraFactory(); +extern "C" +{ + KDE_EXPORT KDecorationFactory* create_factory() + { + return new Baghira::BaghiraFactory(); + } } DeMaximizer::DeMaximizer() : TQWidget(0, "deMaximizer", TQt::WType_TopLevel | TQt::WStyle_NoBorder | TQt::WX11BypassWM ) diff --git a/deco/config/baghiraconfig.cc b/deco/config/baghiraconfig.cc index 23faf15..714eabb 100644 --- a/deco/config/baghiraconfig.cc +++ b/deco/config/baghiraconfig.cc @@ -714,16 +714,16 @@ void ButtonColors::init(){ behindColor->init(); shadeColor->init(); } - + ////////////////////////////////////////////////////////////////////////////// // Plugin Stuff // ////////////////////////////////////////////////////////////////////////////// - + extern "C" -{ - TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { +{ + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return(new BaghiraConfig(config, parent)); } -} - +} + #include "baghiraconfig.moc" diff --git a/deco/config/baghiraconfig.cc.new b/deco/config/baghiraconfig.cc.new index 5c64932..1a93ca3 100644 --- a/deco/config/baghiraconfig.cc.new +++ b/deco/config/baghiraconfig.cc.new @@ -715,16 +715,16 @@ void ButtonColors::init(){ behindColor->init(); shadeColor->init(); } - + ////////////////////////////////////////////////////////////////////////////// // Plugin Stuff // ////////////////////////////////////////////////////////////////////////////// - + extern "C" -{ - TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { +{ + KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return(new BaghiraConfig(config, parent)); } -} - +} + #include "baghiraconfig.moc" diff --git a/kickermenu-3.3/menuapplet.cpp b/kickermenu-3.3/menuapplet.cpp index 4b43223..f05e011 100644 --- a/kickermenu-3.3/menuapplet.cpp +++ b/kickermenu-3.3/menuapplet.cpp @@ -61,7 +61,7 @@ extern Time tqt_x_time; extern "C" { - KPanelApplet* init( TQWidget* parent_P, const TQString& configFile_P ) + KDE_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/sessionapplet/usermanager.cpp b/sessionapplet/usermanager.cpp index 5cc49a1..6ccd1f4 100644 --- a/sessionapplet/usermanager.cpp +++ b/sessionapplet/usermanager.cpp @@ -273,7 +273,7 @@ void UserManager::saveSession() extern "C" { - KPanelApplet* init( TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("usermanager"); return new UserManager(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "usermanager"); diff --git a/sidebar/baghirasidebar.cpp b/sidebar/baghirasidebar.cpp index e5f6f69..5df1453 100644 --- a/sidebar/baghirasidebar.cpp +++ b/sidebar/baghirasidebar.cpp @@ -61,8 +61,8 @@ extern "C" { extern "C" { - void* create_konqsidebar_baghirasidebar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_baghirasidebar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new baghiraSidebar(instance,par,widp,desktopname,name); } -}; +} diff --git a/starter/starter.cpp b/starter/starter.cpp index df333e2..6069045 100644 --- a/starter/starter.cpp +++ b/starter/starter.cpp @@ -473,7 +473,7 @@ bool starter::eventFilter( TQObject*, TQEvent *e ) extern "C" { - KPanelApplet* init( TQWidget *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile) { TDEGlobal::locale()->insertCatalogue("starter"); return new starter(configFile, KPanelApplet::Normal, |