Remove K_EXPORT_PLUGIN macros
Include .moc file in configs_builtins.cpp, and reenable the build of the configs. REVIEW:111940
This commit is contained in:
parent
62ca3fcbe1
commit
08a53e6a11
12 changed files with 7 additions and 14 deletions
|
@ -178,5 +178,5 @@ endif()
|
|||
# Add the builtins plugin
|
||||
KWIN4_ADD_EFFECT( builtins ${kwin4_effect_builtins_sources} )
|
||||
if( NOT KWIN_MOBILE_EFFECTS )
|
||||
# KWIN4_ADD_EFFECT_CONFIG( builtins ${kwin4_effect_builtins_config_sources} )
|
||||
KWIN4_ADD_EFFECT_CONFIG( builtins ${kwin4_effect_builtins_config_sources} )
|
||||
endif()
|
||||
|
|
|
@ -82,3 +82,5 @@ KWIN_EFFECT_CONFIG_MULTIPLE(builtins,
|
|||
)
|
||||
|
||||
} // namespace
|
||||
|
||||
#include "configs_builtins.moc"
|
||||
|
|
|
@ -52,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
K_PLUGIN_FACTORY(KWinCompositingConfigFactory,
|
||||
registerPlugin<KWin::KWinCompositingConfig>();
|
||||
)
|
||||
K_EXPORT_PLUGIN(KWinCompositingConfigFactory("kcmkwincompositing"))
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -61,7 +61,6 @@
|
|||
K_PLUGIN_FACTORY(KWinDecoFactory,
|
||||
registerPlugin<KWin::KWinDecorationModule>();
|
||||
)
|
||||
K_EXPORT_PLUGIN(KWinDecoFactory("kcmkwindecoration"))
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -41,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <netwm.h>
|
||||
|
||||
K_PLUGIN_FACTORY(KWinDesktopConfigFactory, registerPlugin<KWin::KWinDesktopConfig>();)
|
||||
K_EXPORT_PLUGIN(KWinDesktopConfigFactory("kcm_kwindesktop"))
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -247,7 +247,6 @@ K_PLUGIN_FACTORY_DEFINITION(KWinOptionsFactory,
|
|||
registerPlugin<KAdvancedConfigStandalone>("kwinadvanced");
|
||||
registerPlugin<KWinOptions>("kwinoptions");
|
||||
)
|
||||
K_EXPORT_PLUGIN(KWinOptionsFactory("kcmkwm"))
|
||||
|
||||
#include "main.moc"
|
||||
#include "moc_main.cpp"
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
K_PLUGIN_FACTORY(KCMRulesFactory,
|
||||
registerPlugin<KWin::KCMRules>();
|
||||
)
|
||||
K_EXPORT_PLUGIN(KCMRulesFactory("kcmkwinrules"))
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -30,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include <QtDBus/QtDBus>
|
||||
|
||||
K_PLUGIN_FACTORY(KWinScreenEdgesConfigFactory, registerPlugin<KWin::KWinScreenEdgesConfig>();)
|
||||
K_EXPORT_PLUGIN(KWinScreenEdgesConfigFactory("kcmkwinscreenedges"))
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -23,4 +23,3 @@
|
|||
|
||||
K_PLUGIN_FACTORY(KcmKWinScriptsFactory,
|
||||
registerPlugin<Module>("kwin-scripts");)
|
||||
K_EXPORT_PLUGIN(KcmKWinScriptsFactory("kwin-scripts", "kcm-kwin-scripts"))
|
||||
|
|
|
@ -44,7 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "layoutpreview.h"
|
||||
|
||||
K_PLUGIN_FACTORY(KWinTabBoxConfigFactory, registerPlugin<KWin::KWinTabBoxConfig>();)
|
||||
K_EXPORT_PLUGIN(KWinTabBoxConfigFactory("kcm_kwintabbox"))
|
||||
|
||||
namespace KWin
|
||||
{
|
||||
|
|
|
@ -562,8 +562,8 @@ public Q_SLOTS:
|
|||
* E.g. KWIN_EFFECT_CONFIG( flames, MyFlameEffectConfig )
|
||||
**/
|
||||
#define KWIN_EFFECT_CONFIG( name, classname ) \
|
||||
K_PLUGIN_FACTORY(EffectFactory, registerPlugin<classname>(#name);) \
|
||||
K_EXPORT_PLUGIN(EffectFactory("kcm_kwin4_effect_" #name))
|
||||
K_PLUGIN_FACTORY(EffectFactory, registerPlugin<classname>(#name);)
|
||||
|
||||
/**
|
||||
* Defines the function used to retrieve multiple effects' config widget
|
||||
* E.g. KWIN_EFFECT_CONFIG_MULTIPLE( flames,
|
||||
|
@ -572,8 +572,8 @@ public Q_SLOTS:
|
|||
* )
|
||||
**/
|
||||
#define KWIN_EFFECT_CONFIG_MULTIPLE( name, singles ) \
|
||||
K_PLUGIN_FACTORY(EffectFactory, singles) \
|
||||
K_EXPORT_PLUGIN(EffectFactory("kcm_kwin4_effect_" #name))
|
||||
K_PLUGIN_FACTORY(EffectFactory, singles)
|
||||
|
||||
/**
|
||||
* @see KWIN_EFFECT_CONFIG_MULTIPLE
|
||||
*/
|
||||
|
|
|
@ -160,6 +160,5 @@ void ScriptingConfig::reload()
|
|||
// TODO: what to call
|
||||
}
|
||||
|
||||
K_EXPORT_PLUGIN(GenericScriptedConfigFactory())
|
||||
|
||||
} // namespace
|
||||
|
|
Loading…
Reference in a new issue