Do not use "#ifdef" + "#endif" in parameter to preprocessor macro call (MSVC fails on that)

157b438f · Friedrich W. H. Kossebau · f335ea11 · 157b438f
Commit 157b438f authored Feb 09, 2013 by Friedrich W. H. Kossebau
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

plugins/textshape/TextPlugin.cpp plugins/textshape/TextPlugin.cpp +6 -2

No files found.
--- a/plugins/textshape/TextPlugin.cpp
+++ b/plugins/textshape/TextPlugin.cpp
@@ -31,12 +31,16 @@

 #include <kpluginfactory.h>

+#ifdef CREATE_TEXTDOCUMENT_INSPECTOR
 K_PLUGIN_FACTORY(TextPluginFactory,
                 registerPlugin<TextPlugin>();
-#ifdef CREATE_TEXTDOCUMENT_INSPECTOR
                 registerPlugin<TextDocumentInspectionPlugin>(QLatin1String("TextDocumentInspection"));
-#endif
 )
+#else
+K_PLUGIN_FACTORY(TextPluginFactory,
+                 registerPlugin<TextPlugin>();
+)
+#endif
 K_EXPORT_PLUGIN(TextPluginFactory("TextShape"))

 TextPlugin::TextPlugin(QObject * parent, const QVariantList &)