Browse Source

Merge topic 'ctkfactory_test'

* ctkfactory_test:
  Fix indent and add missing function separator
  Clear KIT_PYTHONQT_SRCS variable before invoking ctkMacroWrapPythonQt
Jean-Christophe Fillion-Robin 14 years ago
parent
commit
db18164fa1

+ 1 - 0
CMake/ctkMacroBuildLib.cmake

@@ -167,6 +167,7 @@ MACRO(ctkMacroBuildLib)
     )
 
   IF(CTK_WRAP_PYTHONQT_LIGHT OR CTK_WRAP_PYTHONQT_FULL)
+    set(KIT_PYTHONQT_SRCS) # Clear variable
     ctkMacroWrapPythonQt("org.commontk" ${lib_name}
       KIT_PYTHONQT_SRCS "${MY_SRCS}" ${CTK_WRAP_PYTHONQT_FULL})
     ADD_LIBRARY(${lib_name}PythonQt STATIC ${KIT_PYTHONQT_SRCS})

+ 1 - 1
Libs/Core/Testing/Cpp/ctkAbstractLibraryFactoryTest1.cpp

@@ -73,7 +73,7 @@ protected:
 };
 
 //-----------------------------------------------------------------------------
-int ctkAbstractLibraryFactoryTest1(int argc, char * argv [] )
+int ctkAbstractLibraryFactoryTest1(int argc, char * argv [])
 {
   QApplication app(argc, argv);
 

+ 1 - 1
Libs/Core/Testing/Cpp/ctkAbstractPluginFactoryTest1.cpp

@@ -31,7 +31,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-int ctkAbstractPluginFactoryTest1(int argc, char * argv [] )
+int ctkAbstractPluginFactoryTest1(int argc, char * argv [])
 {
   QApplication app(argc, argv);
 

+ 2 - 0
Libs/Core/Testing/Cpp/ctkDummyPlugin.cpp

@@ -26,11 +26,13 @@
 
 Q_EXPORT_PLUGIN2( ctkDummyPlugin , ctkDummyPlugin)
 
+//-----------------------------------------------------------------------------
 ctkDummyPlugin::ctkDummyPlugin(QObject* parent)
   :QObject(parent)
 {
 }
 
+//-----------------------------------------------------------------------------
 void ctkDummyPlugin::dummyInterface()
 {
 }