Merge pull request #517 from SINTEFMedisinskTeknologi/master

Fix broken doxygen generation of Plugin Framework

Documentation/Doxyfile.txt.in

@@ -1608,7 +1608,10 @@ EXPAND_AS_DEFINED      =
 # that are alone on a line, have an all uppercase name, and do not end with a
 # semicolon, because these will confuse the parser if not removed.
 
-SKIP_FUNCTION_MACROS   = NO
+# CTK Note: Changed this back to the default YES,
+# in order to avoid trouble using f.ex. Q_DECLARE_PRIVATE(classname),
+# which hides later method declarations.
+SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references

Libs/PluginFramework/ctkPlugin.h

@@ -82,9 +82,6 @@ class ctkPluginPrivate;
  */
 class CTK_PLUGINFW_EXPORT ctkPlugin {
 
-  Q_DECLARE_PRIVATE(ctkPlugin)
-  Q_DISABLE_COPY(ctkPlugin)
-
 public:
 
   enum State {
@@ -812,6 +809,10 @@ protected:
   ctkPlugin();
   void init(ctkPluginPrivate* dd);
   void init(const QWeakPointer<ctkPlugin>& self, ctkPluginFrameworkContext* fw, QSharedPointer<ctkPluginArchive> ba);
+
+private:
+  Q_DECLARE_PRIVATE(ctkPlugin)
+  Q_DISABLE_COPY(ctkPlugin)
 };
 
 /**

Libs/PluginFramework/ctkPluginContext.h

@@ -97,7 +97,6 @@ class ctkPluginContextPrivate;
  */
 class CTK_PLUGINFW_EXPORT ctkPluginContext
 {
-  Q_DECLARE_PRIVATE(ctkPluginContext)
 
 public:
 
@@ -733,6 +732,9 @@ protected:
   ctkPluginContext(ctkPluginPrivate* plugin);
 
   ctkPluginContextPrivate * const d_ptr;
+
+private:
+  Q_DECLARE_PRIVATE(ctkPluginContext)
 };
 
 

Libs/PluginFramework/ctkPluginFramework.h

@@ -45,9 +45,6 @@ class ctkPluginFrameworkPrivate;
 class CTK_PLUGINFW_EXPORT ctkPluginFramework : public ctkPlugin
 {
 
-  Q_DECLARE_PRIVATE(ctkPluginFramework)
-  Q_DISABLE_COPY(ctkPluginFramework)
-
 public:
 
   /**
@@ -199,6 +196,9 @@ protected:
 
   ctkPluginFramework();
 
+private:
+  Q_DECLARE_PRIVATE(ctkPluginFramework)
+  Q_DISABLE_COPY(ctkPluginFramework)
 };
 
 

Libs/PluginFramework/ctkServiceReference.h

@@ -67,8 +67,6 @@ class ctkServiceEvent;
  */
 class CTK_PLUGINFW_EXPORT ctkServiceReference {
 
-  Q_DECLARE_PRIVATE(ctkServiceReference)
-
 public:
 
   /**
@@ -213,6 +211,8 @@ protected:
 
   ctkServiceReferencePrivate * d_ptr;
 
+private:
+  Q_DECLARE_PRIVATE(ctkServiceReference)
 };
 
 /**

Libs/PluginFramework/ctkServiceRegistration.h

@@ -49,8 +49,6 @@ class ctkServiceRegistrationPrivate;
  */
 class CTK_PLUGINFW_EXPORT ctkServiceRegistration {
 
-  Q_DECLARE_PRIVATE(ctkServiceRegistration)
-
 public:
 
   /**
@@ -167,6 +165,8 @@ protected:
 
   ctkServiceRegistrationPrivate* d_ptr;
 
+private:
+  Q_DECLARE_PRIVATE(ctkServiceRegistration)
 };
 
 /**