ソースを参照

Fixed doxygen <code> tags.

Sascha Zelzer 14 年 前
コミット
4f512819aa

+ 3 - 3
Libs/PluginFramework/ctkLDAPSearchFilter.h

@@ -36,8 +36,8 @@ class ctkLDAPSearchFilterData;
  * An <a href="http://www.ietf.org/rfc/rfc1960.txt">RFC 1960</a>-based Filter.
  *
  * <p>
- * A {@code ctkLDAPSearchFilter} can be used numerous times to determine if the match
- * argument matches the filter string that was used to create the {@code ctkLDAPSearchFilter}.
+ * A <code>ctkLDAPSearchFilter</code> can be used numerous times to determine if the match
+ * argument matches the filter string that was used to create the <code>ctkLDAPSearchFilter</code>.
  * <p>
  * Some examples of LDAP filters are:
  *
@@ -91,7 +91,7 @@ public:
   /**
    * Filter using a service's properties.
    * <p>
-   * This {@code ctkLDAPSearchFilter} is executed using the keys and values of the
+   * This <code>ctkLDAPSearchFilter</code> is executed using the keys and values of the
    * referenced service's properties. The keys are looked up in a case
    * insensitive manner.
    *

+ 5 - 5
Libs/PluginFramework/ctkPluginException.h

@@ -29,9 +29,9 @@
  * problem occurred.
  *
  * <p>
- * A {@code ctkPluginException} object is created by the Framework to denote
+ * A <code>ctkPluginException</code> object is created by the Framework to denote
  * an exception condition in the lifecycle of a plugin.
- * {@code ctkPluginException}s should not be created by plugin developers.
+ * <code>ctkPluginException</code>s should not be created by plugin developers.
  * An enum type is used to identify the exception type for future extendability.
  *
  * <p>
@@ -91,7 +91,7 @@ public:
   };
 
   /**
-   * Creates a {@code ctkPluginException} with the specified message, type
+   * Creates a <code>ctkPluginException</code> with the specified message, type
    * and exception cause.
    *
    * @param msg The associated message.
@@ -101,7 +101,7 @@ public:
   ctkPluginException(const QString& msg, const Type& type = UNSPECIFIED, const std::exception* cause = 0);
 
   /**
-   * Creates a {@code ctkPluginException} with the specified message and
+   * Creates a <code>ctkPluginException</code> with the specified message and
    * exception cause.
    *
    * @param msg The associated message.
@@ -113,7 +113,7 @@ public:
   ctkPluginException& operator=(const ctkPluginException& o);
 
   /**
-   * Returns the type for this exception or {@code UNSPECIFIED} if the
+   * Returns the type for this exception or <code>UNSPECIFIED</code> if the
    * type was unspecified or unknown.
    *
    * @return The type of this exception.

+ 4 - 4
Libs/PluginFramework/ctkServiceException.h

@@ -29,7 +29,7 @@
  * A service exception used to indicate that a service problem occurred.
  *
  * <p>
- * A {@code ctkServiceException} object is created by the Framework or
+ * A <code>ctkServiceException</code> object is created by the Framework or
  * to denote an exception condition in the service. An enum
  * type is used to identify the exception type for future extendability.
  *
@@ -69,7 +69,7 @@ public:
   };
 
   /**
-   * Creates a {@code ctkServiceException} with the specified message,
+   * Creates a <code>ctkServiceException</code> with the specified message,
    * type and exception cause.
    *
    * @param msg The associated message.
@@ -79,7 +79,7 @@ public:
   ctkServiceException(const QString& msg, const Type& type = UNSPECIFIED, const std::exception* cause = 0);
 
   /**
-   * Creates a {@code ctkServiceException} with the specified message and
+   * Creates a <code>ctkServiceException</code> with the specified message and
    * exception cause.
    *
    * @param msg The associated message.
@@ -93,7 +93,7 @@ public:
   ~ctkServiceException() throw() { }
 
   /**
-   * Returns the type for this exception or {@code UNSPECIFIED} if the
+   * Returns the type for this exception or <code>UNSPECIFIED</code> if the
    * type was unspecified or unknown.
    *
    * @return The type of this exception.

+ 51 - 51
Libs/PluginFramework/service/cm/ctkConfiguration.h

@@ -29,42 +29,42 @@
 
 
 /**
- * The configuration information for a {@code ctkManagedService} or
- * {@code ctkManagedServiceFactory} object.
+ * The configuration information for a <code>ctkManagedService</code> or
+ * <code>ctkManagedServiceFactory</code> object.
  *
  * The Configuration Admin service uses this interface to represent the
- * configuration information for a {@code ctkManagedService} or for a
- * service instance of a {@code ctkManagedServiceFactory}.
+ * configuration information for a <code>ctkManagedService</code> or for a
+ * service instance of a <code>ctkManagedServiceFactory</code>.
  *
  * <p>
- * A {@code ctkConfiguration} object contains a configuration dictionary and
+ * A <code>ctkConfiguration</code> object contains a configuration dictionary and
  * allows the properties to be updated via this object. Plugins wishing to
  * receive configuration dictionaries do not need to use this class - they
- * register a {@code ctkManagedService} or
- * {@code ctkManagedServiceFactory}. Only administrative plugins, and
+ * register a <code>ctkManagedService</code> or
+ * <code>ctkManagedServiceFactory</code>. Only administrative plugins, and
  * plugins wishing to update their own configurations need to use this class.
  *
  * <p>
  * The properties handled in this configuration have case insensitive
- * {@code QString} objects as keys. However, case is preserved from the
+ * <code>QString</code> objects as keys. However, case is preserved from the
  * last set key/value.
  * <p>
  * A configuration can be <i>bound </i> to a plugin location (
- * {@code ctkPlugin#getLocation()}). The purpose of binding a
- * {@code ctkConfiguration} object to a location is to make it impossible
+ * <code>ctkPlugin#getLocation()</code>). The purpose of binding a
+ * <code>ctkConfiguration</code> object to a location is to make it impossible
  * for another plugin to forge a PID that would match this configuration. When a
  * configuration is bound to a specific location, and a plugin with a different
- * location registers a corresponding {@code ctkManagedService} object or
- * {@code ctkManagedServiceFactory} object, then the configuration is not
+ * location registers a corresponding <code>ctkManagedService</code> object or
+ * <code>ctkManagedServiceFactory</code> object, then the configuration is not
  * passed to the updated method of that object.
  *
  * <p>
  * If a configuration's location is empty, it is not yet bound to
  * a location. It will become bound to the location of the first plugin that
- * registers a {@code ctkManagedService} or
- * {@code ctkManagedServiceFactory} object with the corresponding PID.
+ * registers a <code>ctkManagedService</code> or
+ * <code>ctkManagedServiceFactory</code> object with the corresponding PID.
  * <p>
- * The same {@code ctkConfiguration} object is used for configuring both a
+ * The same <code>ctkConfiguration</code> object is used for configuring both a
  * Managed Service Factory and a Managed Service. When it is important to
  * differentiate between these two the term "factory configuration" is used.
  *
@@ -77,35 +77,35 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
   virtual ~ctkConfiguration();
 
   /**
-   * Get the PID for this {@code ctkConfiguration} object.
+   * Get the PID for this <code>ctkConfiguration</code> object.
    *
-   * @return the PID for this {@code ctkConfiguration} object.
+   * @return the PID for this <code>ctkConfiguration</code> object.
    * @throws std::logic_error if this configuration has been deleted
    */
   virtual QString getPid() const = 0;
 
   /**
-   * Return the properties of this {@code ctkConfiguration} object.
+   * Return the properties of this <code>ctkConfiguration</code> object.
    *
-   * The {@code Dictionary} object returned is a private copy for the
+   * The <code>Dictionary</code> object returned is a private copy for the
    * caller and may be changed without influencing the stored configuration.
    * The keys in the returned dictionary are case insensitive and are always
-   * of type {@code String}.
+   * of type <code>String</code>.
    *
    * <p>
    * If called just after the configuration is created and before update has
-   * been called, this method returns {@code null}.
+   * been called, this method returns <code>null</code>.
    *
    * @return A private copy of the properties for the caller or
-   *         {@code null}. These properties must not contain the
+   *         <code>null</code>. These properties must not contain the
    *         "service.bundleLocation" property. The value of this property may
-   *         be obtained from the {@code getBundleLocation} method.
+   *         be obtained from the <code>getBundleLocation</code> method.
    * @throws IllegalStateException if this configuration has been deleted
    */
   virtual ctkDictionary getProperties() const = 0;
 
   /**
-   * Update the properties of this {@code ctkConfiguration} object.
+   * Update the properties of this <code>ctkConfiguration</code> object.
    *
    * Stores the properties in persistent storage after adding or overwriting
    * the following properties:
@@ -114,7 +114,7 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
    * <li>"service.factoryPid" : if this is a factory configuration it is set
    * to the factory PID else it is not set.</li>
    * </ul>
-   * These system properties are all of type {@code QString}.
+   * These system properties are all of type <code>QString</code>.
    *
    * <p>
    * If the corresponding Managed Service/Managed Service Factory is
@@ -123,12 +123,12 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
    *
    * <p>
    * Also initiates an asynchronous call to all
-   * {@code ctkConfigurationListener}s with a
-   * {@code ctkConfigurationEvent::CM_UPDATED} event.
+   * <code>ctkConfigurationListener</code>s with a
+   * <code>ctkConfigurationEvent::CM_UPDATED</code> event.
    *
    * @param properties the new set of properties for this configuration
    * @throws ctkIOException if update cannot be made persistent
-   * @throws std::invalid_argument if the {@code ctkDictionary} object
+   * @throws std::invalid_argument if the <code>ctkDictionary</code> object
    *         contains invalid configuration types or contains case variants of
    *         the same key name.
    * @throws std::logic_error if this configuration has been deleted
@@ -136,19 +136,19 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
   virtual void update(const ctkDictionary& properties) = 0;
 
   /**
-   * Delete this {@code ctkConfiguration} object.
+   * Delete this <code>ctkConfiguration</code> object.
    *
    * Removes this configuration object from the persistent store. Notify
    * asynchronously the corresponding Managed Service or Managed Service
-   * Factory. A {@code ctkManagedService} object is notified by a call to
-   * its {@code updated} method with a {@code null} properties
-   * argument. A {@code ctkManagedServiceFactory} object is notified by a
-   * call to its {@code deleted} method.
+   * Factory. A <code>ctkManagedService</code> object is notified by a call to
+   * its <code>updated</code> method with a <code>null</code> properties
+   * argument. A <code>ctkManagedServiceFactory</code> object is notified by a
+   * call to its <code>deleted</code> method.
    *
    * <p>
    * Also initiates an asynchronous call to all
-   * {@code ctkConfigurationListener}s with a
-   * {@code ctkConfigurationEvent::CM_DELETED} event.
+   * <code>ctkConfigurationListener</code>s with a
+   * <code>ctkConfigurationEvent::CM_DELETED</code> event.
    *
    * @throws ctkIOException If delete fails
    * @throws std::logic_error if this configuration has been deleted
@@ -159,23 +159,23 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
    * For a factory configuration return the PID of the corresponding Managed
    * Service Factory, else return a null QString.
    *
-   * @return factory PID or {@code null}
+   * @return factory PID or <code>null</code>
    * @throws std::logic_error if this configuration has been deleted
    */
   virtual QString getFactoryPid() const = 0;
 
   /**
-   * Update the {@code ctkConfiguration} object with the current
+   * Update the <code>ctkConfiguration</code> object with the current
    * properties.
    *
-   * Initiate the {@code updated} callback to the Managed Service or
+   * Initiate the <code>updated</code> callback to the Managed Service or
    * Managed Service Factory with the current properties asynchronously.
    *
    * <p>
    * This is the only way for a plugin that uses a Configuration Plugin
    * service to initiate a callback. For example, when that plugin detects a
    * change that requires an update of the Managed Service or Managed Service
-   * Factory via its {@code ctkConfigurationPlugin} object.
+   * Factory via its <code>ctkConfigurationPlugin</code> object.
    *
    * @see ctkConfigurationPlugin
    * @throws ctkIOException if update cannot access the properties in persistent
@@ -185,20 +185,20 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
   virtual void update() = 0;
 
   /**
-   * Bind this {@code ctkConfiguration} object to the specified plugin
+   * Bind this <code>ctkConfiguration</code> object to the specified plugin
    * location.
    *
-   * If the pluginLocation parameter is {@code null} then the
-   * {@code ctkConfiguration} object will not be bound to a location. It
+   * If the pluginLocation parameter is <code>null</code> then the
+   * <code>ctkConfiguration</code> object will not be bound to a location. It
    * will be set to the plugin's location before the first time a Managed
-   * Service/Managed Service Factory receives this {@code ctkConfiguration}
+   * Service/Managed Service Factory receives this <code>ctkConfiguration</code>
    * object via the updated method and before any plugins are called. The
    * plugin location will be set persistently.
    *
-   * @param pluginLocation a plugin location or {@code null}.
+   * @param pluginLocation a plugin location or <code>null</code>.
    * @throws std::logic_error If this configuration has been deleted.
    * @throws ctkSecurityException If the caller does not have
-   *         {@code ctkConfigurationPermission[*,CONFIGURE]}.
+   *         <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
    */
   virtual void setPluginLocation(const QString& pluginLocation) = 0;
 
@@ -206,14 +206,14 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
    * Get the plugin location.
    *
    * Returns the plugin location to which this configuration is bound, or
-   * {@code null} if it is not yet bound to a plugin location.
+   * <code>null</code> if it is not yet bound to a plugin location.
    *
    * @return location to which this configuration is bound, or
-   *         {@code null}.
-   * @throws std::logic_error If this {@code Configuration} object
+   *         <code>null</code>.
+   * @throws std::logic_error If this <code>Configuration</code> object
    *         has been deleted.
    * @throws ctkSecurityException If the caller does not have
-   *         {@code ctkConfigurationPermission[*,CONFIGURE]}.
+   *         <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
    */
   virtual QString getPluginLocation() const = 0;
 
@@ -222,8 +222,8 @@ struct CTK_PLUGINFW_EXPORT ctkConfiguration
    *
    * Two Configuration objects are equal when their PIDs are equal.
    *
-   * @param other {@code ctkConfiguration} object to compare against
-   * @return {@code true} if equal, {@code false} if the PID's differ.
+   * @param other <code>ctkConfiguration</code> object to compare against
+   * @return <code>true} if equal, {@code false</code> if the PID's differ.
    */
   bool operator==(const ctkConfiguration& other) const;
 

+ 72 - 72
Libs/PluginFramework/service/cm/ctkConfigurationAdmin.h

@@ -30,9 +30,9 @@
  *
  * <p>
  * The main purpose of this interface is to store plugin configuration data
- * persistently. This information is represented in {@code ctkConfiguration}
- * objects. The actual configuration data is a {@code Dictionary} of
- * properties inside a {@code ctkConfiguration} object.
+ * persistently. This information is represented in <code>ctkConfiguration</code>
+ * objects. The actual configuration data is a <code>Dictionary</code> of
+ * properties inside a <code>ctkConfiguration</code> object.
  *
  * <p>
  * There are two principally different ways to manage configurations. First
@@ -41,7 +41,7 @@
  *
  * <p>
  * Next, there is the concept of a factory where the Configuration Admin service
- * will maintain 0 or more {@code ctkConfiguration} objects for a Managed
+ * will maintain 0 or more <code>ctkConfiguration</code> objects for a Managed
  * Service Factory that is registered with the Framework.
  *
  * <p>
@@ -53,15 +53,15 @@
  * <p>
  * Plugins that require configuration should register a Managed Service or a
  * Managed Service Factory in the service registry. A registration property
- * named {@code service.pid} (persistent identifier or PID) must be used to
+ * named <code>service.pid</code> (persistent identifier or PID) must be used to
  * identify this Managed Service or Managed Service Factory to the Configuration
  * Admin service.
  *
  * <p>
  * When the ConfigurationAdmin detects the registration of a Managed Service, it
  * checks its persistent storage for a configuration object whose
- * {@code service.pid} property matches the PID service property (
- * {@code service.pid}) of the Managed Service. If found, it calls
+ * <code>service.pid</code> property matches the PID service property (
+ * <code>service.pid</code>) of the Managed Service. If found, it calls
  * {@link ctkManagedService#updated} method with the new properties. The
  * implementation of a Configuration Admin service must run these call-backs
  * asynchronously to allow proper synchronization.
@@ -69,39 +69,39 @@
  * <p>
  * When the Configuration Admin service detects a Managed Service Factory
  * registration, it checks its storage for configuration objects whose
- * {@code service.factoryPid} property matches the PID service property of
- * the Managed Service Factory. For each such {@code ctkConfiguration}
- * objects, it calls the {@code ctkManagedServiceFactory#updated} method
- * asynchronously with the new properties. The calls to the {@code updated}
- * method of a {@code ctkManagedServiceFactory} must be executed sequentially
+ * <code>service.factoryPid</code> property matches the PID service property of
+ * the Managed Service Factory. For each such <code>ctkConfiguration</code>
+ * objects, it calls the <code>ctkManagedServiceFactory#updated</code> method
+ * asynchronously with the new properties. The calls to the <code>updated</code>
+ * method of a <code>ctkManagedServiceFactory</code> must be executed sequentially
  * and not overlap in time.
  *
  * <p>
  * In general, plugins having permission to use the Configuration Admin service
  * can only access and modify their own configuration information. Accessing or
  * modifying the configuration of another bundle requires
- * {@code ctkConfigurationPermission[*,CONFIGURE]}.
+ * <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
  *
  * <p>
- * {@code ctkConfiguration} objects can be <i>bound </i> to a specified plugin
+ * <code>ctkConfiguration</code> objects can be <i>bound </i> to a specified plugin
  * location. In this case, if a matching Managed Service or Managed Service
  * Factory is registered by a plugin with a different location, then the
  * Configuration Admin service must not do the normal callback, and it should
- * log an error. In the case where a {@code ctkConfiguration} object is not
- * bound, its location field is {@code null}, the Configuration Admin
+ * log an error. In the case where a <code>ctkConfiguration</code> object is not
+ * bound, its location field is <code>null</code>, the Configuration Admin
  * service will bind it to the location of the plugin that registers the first
  * Managed Service or Managed Service Factory that has a corresponding PID
- * property. When a {@code ctkConfiguration} object is bound to a plugin
+ * property. When a <code>ctkConfiguration</code> object is bound to a plugin
  * location in this manner, the Configuration Admin service must detect if the
  * plugin corresponding to the location is uninstalled. If this occurs, the
- * {@code ctkConfiguration} object is unbound, that is its location field is
- * set back to {@code null}.
+ * <code>ctkConfiguration</code> object is unbound, that is its location field is
+ * set back to <code>null</code>.
  *
  * <p>
  * The method descriptions of this class refer to a concept of "the calling
  * plugin". This is a loose way of referring to the plugin which obtained the
  * Configuration Admin service from the service registry. Implementations of
- * {@code ctkConfigurationAdmin} must use a
+ * <code>ctkConfigurationAdmin</code> must use a
  * {@link ctkServiceFactory} to support this concept.
  *
  */
@@ -110,146 +110,146 @@ struct CTK_PLUGINFW_EXPORT ctkConfigurationAdmin
 
   /**
    * Configuration property naming the Factory PID in the configuration
-   * dictionary. The property's value is of type {@code QString}.
+   * dictionary. The property's value is of type <code>QString</code>.
    */
   static const QString SERVICE_FACTORYPID; // = "service.factoryPid";
 
   /**
    * Configuration property naming the location of the plugin that is
-   * associated with a a {@code ctkConfiguration} object. This property can
+   * associated with a a <code>ctkConfiguration</code> object. This property can
    * be searched for but must not appear in the configuration dictionary for
-   * security reason. The property's value is of type {@code QString}.
+   * security reason. The property's value is of type <code>QString</code>.
    */
   static const QString SERVICE_PLUGINLOCATION; // = "service.pluginLocation";
 
   /**
-   * Create a new factory {@code ctkConfiguration} object with a new PID.
+   * Create a new factory <code>ctkConfiguration</code> object with a new PID.
    *
-   * The properties of the new {@code ctkConfiguration} object are
-   * {@code null} until the first time that its
+   * The properties of the new <code>ctkConfiguration</code> object are
+   * <code>null</code> until the first time that its
    * {@link ctkConfiguration#update(const ctkDictionary&)} method is called.
    *
    * <p>
-   * It is not required that the {@code factoryPid} maps to a
+   * It is not required that the <code>factoryPid</code> maps to a
    * registered Managed Service Factory.
    * <p>
-   * The {@code ctkConfiguration} object is bound to the location of the
+   * The <code>ctkConfiguration</code> object is bound to the location of the
    * calling plugin.
    *
-   * @param factoryPid PID of factory (not {@code null}).
-   * @return A new {@code ctkConfiguration} object.
+   * @param factoryPid PID of factory (not <code>null</code>).
+   * @return A new <code>ctkConfiguration</code> object.
    * @throws ctkIOException if access to persistent storage fails.
    * @throws ctkSecurityException if caller does not have
-   *         {@code ctkConfigurationPermission[*,CONFIGURE]} and
-   *         {@code factoryPid} is bound to another plugin.
+   *         <code>ctkConfigurationPermission[*,CONFIGURE]</code> and
+   *         <code>factoryPid</code> is bound to another plugin.
    */
   virtual ctkConfigurationPtr createFactoryConfiguration(const QString& factoryPid) = 0;
 
   /**
-   * Create a new factory {@code ctkConfiguration} object with a new PID.
+   * Create a new factory <code>ctkConfiguration</code> object with a new PID.
    *
-   * The properties of the new {@code ctkConfiguration} object are
-   * {@code null} until the first time that its
+   * The properties of the new <code>ctkConfiguration</code> object are
+   * <code>null</code> until the first time that its
    * {@link ctkConfiguration#update(Dictionary)} method is called.
    *
    * <p>
-   * It is not required that the {@code factoryPid} maps to a
+   * It is not required that the <code>factoryPid</code> maps to a
    * registered Managed Service Factory.
    *
    * <p>
-   * The {@code ctkConfiguration} is bound to the location specified. If
-   * this location is {@code null} it will be bound to the location of
+   * The <code>ctkConfiguration</code> is bound to the location specified. If
+   * this location is <code>null</code> it will be bound to the location of
    * the first plugin that registers a Managed Service Factory with a
    * corresponding PID.
    *
-   * @param factoryPid PID of factory (not {@code null}).
-   * @param location A plugin location string, or {@code null}.
-   * @return a new {@code ctkConfiguration} object.
+   * @param factoryPid PID of factory (not <code>null</code>).
+   * @param location A plugin location string, or <code>null</code>.
+   * @return a new <code>ctkConfiguration</code> object.
    * @throws ctkIOException if access to persistent storage fails.
-   * @throws ctkSecurityException if caller does not have {@code ctkConfigurationPermission[*,CONFIGURE]}.
+   * @throws ctkSecurityException if caller does not have <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
    */
  virtual ctkConfigurationPtr createFactoryConfiguration(const QString& factoryPid, const QString& location) = 0;
 
   /**
-   * Get an existing {@code ctkConfiguration} object from the persistent
-   * store, or create a new {@code ctkConfiguration} object.
+   * Get an existing <code>ctkConfiguration</code> object from the persistent
+   * store, or create a new <code>ctkConfiguration</code> object.
    *
    * <p>
-   * If a {@code ctkConfiguration} with this PID already exists in
+   * If a <code>ctkConfiguration</code> with this PID already exists in
    * Configuration Admin service return it. The location parameter is ignored
    * in this case.
    *
    * <p>
-   * Else, return a new {@code ctkConfiguration} object. This new object
-   * is bound to the location and the properties are set to {@code null}.
-   * If the location parameter is {@code null}, it will be set when a
+   * Else, return a new <code>ctkConfiguration</code> object. This new object
+   * is bound to the location and the properties are set to <code>null</code>.
+   * If the location parameter is <code>null</code>, it will be set when a
    * Managed Service with the corresponding PID is registered for the first
    * time.
    *
    * @param pid Persistent identifier.
-   * @param location The plugin location string, or {@code null}.
-   * @return An existing or new {@code ctkConfiguration} object.
+   * @param location The plugin location string, or <code>null</code>.
+   * @return An existing or new <code>ctkConfiguration</code> object.
    * @throws ctkIOException if access to persistent storage fails.
-   * @throws ctkSecurityException if the caller does not have {@code ctkConfigurationPermission[*,CONFIGURE]}.
+   * @throws ctkSecurityException if the caller does not have <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
    */
  virtual ctkConfigurationPtr getConfiguration(const QString& pid, const QString& location) = 0;
 
   /**
-   * Get an existing or new {@code ctkConfiguration} object from the
+   * Get an existing or new <code>ctkConfiguration</code> object from the
    * persistent store.
    *
-   * If the {@code ctkConfiguration} object for this PID does not exist,
-   * create a new {@code ctkConfiguration} object for that PID, where
-   * properties are {@code null}. Bind its location to the calling
+   * If the <code>ctkConfiguration</code> object for this PID does not exist,
+   * create a new <code>ctkConfiguration</code> object for that PID, where
+   * properties are <code>null</code>. Bind its location to the calling
    * plugin's location.
    *
    * <p>
-   * Otherwise, if the location of the existing {@code ctkConfiguration} object
-   * is {@code null}, set it to the calling plugin's location.
+   * Otherwise, if the location of the existing <code>ctkConfiguration</code> object
+   * is <code>null</code>, set it to the calling plugin's location.
    *
    * @param pid persistent identifier.
-   * @return an existing or new {@code ctkConfiguration} matching the PID.
+   * @return an existing or new <code>ctkConfiguration</code> matching the PID.
    * @throws ctkIOException if access to persistent storage fails.
-   * @throws ctkSecurityException if the {@code ctkConfiguration} object is
+   * @throws ctkSecurityException if the <code>ctkConfiguration</code> object is
    *         bound to a location different from that of the calling plugin and it
-   *         has no {@code ctkConfigurationPermission[*,CONFIGURE]}.
+   *         has no <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
    */
  virtual ctkConfigurationPtr getConfiguration(const QString& pid) = 0;
 
   /**
-   * List the current {@code ctkConfiguration} objects which match the
+   * List the current <code>ctkConfiguration</code> objects which match the
    * filter.
    *
    * <p>
-   * Only {@code ctkConfiguration} objects with non- {@code null}
+   * Only <code>ctkConfiguration</code> objects with non- <code>null</code>
    * properties are considered current. That is,
-   * {@code ctkConfiguration#getProperties()} is guaranteed not to return
-   * an empty list for each of the returned {@code ctkConfiguration}
+   * <code>ctkConfiguration#getProperties()</code> is guaranteed not to return
+   * an empty list for each of the returned <code>ctkConfiguration</code>
    * objects.
    *
    * <p>
-   * Normally only {@code ctkConfiguration} objects that are bound to the
+   * Normally only <code>ctkConfiguration</code> objects that are bound to the
    * location of the calling plugin are returned, or all if the caller has
-   * {@code ctkConfigurationPermission[*,CONFIGURE]}.
+   * <code>ctkConfigurationPermission[*,CONFIGURE]</code>.
    *
    * <p>
    * The syntax of the filter string is as defined in the
    * {@link ctkLDAPSearchFilter} class. The filter can test any
    * configuration properties including the following:
    * <ul>
-   * <li>{@code service.pid}-{@code QString}- the PID under which
+   * <li><code>service.pid</code>-<code>QString</code>- the PID under which
    * this is registered</li>
-   * <li>{@code service.factoryPid}-{@code QString}- the factory if
+   * <li><code>service.factoryPid</code>-<code>QString</code>- the factory if
    * applicable</li>
-   * <li>{@code service.pluginLocation}-{@code QString}- the plugin
+   * <li><code>service.pluginLocation</code>-<code>QString</code>- the plugin
    * location</li>
    * </ul>
    * The filter can also be empty, meaning that all
-   * {@code ctkConfiguration} objects should be returned.
+   * <code>ctkConfiguration</code> objects should be returned.
    *
    * @param filter A filter string, or an empty string to retrieve all
-   *        {@code ctkConfiguration} objects.
-   * @return All matching {@code ctkConfiguration} objects, or
+   *        <code>ctkConfiguration</code> objects.
+   * @return All matching <code>ctkConfiguration</code> objects, or
    *         an empty list if there aren't any.
    * @throws ctkIOException if access to persistent storage fails
    * @throws std::invalid_argument if the filter string is invalid

+ 20 - 20
Libs/PluginFramework/service/cm/ctkConfigurationEvent.h

@@ -34,8 +34,8 @@ class ctkConfigurationEventData;
  * A Configuration Event.
  *
  * <p>
- * {@code ctkConfigurationEvent} objects are delivered to all registered
- * {@code ctkConfigurationListener} service objects. ctkConfigurationEvents
+ * <code>ctkConfigurationEvent</code> objects are delivered to all registered
+ * <code>ctkConfigurationListener</code> service objects. ctkConfigurationEvents
  * must be asynchronously delivered in chronological order with respect to each
  * listener.
  *
@@ -49,11 +49,11 @@ class ctkConfigurationEventData;
  * Additional event types may be defined in the future.
  *
  * <p>
- * Security Considerations. {@code ctkConfigurationEvent} objects do not
- * provide {@code ctkConfiguration} objects, so no sensitive configuration
+ * Security Considerations. <code>ctkConfigurationEvent</code> objects do not
+ * provide <code>ctkConfiguration</code> objects, so no sensitive configuration
  * information is available from the event. If the listener wants to locate the
- * {@code ctkConfiguration} object for the specified pid, it must use
- * {@code ctkConfigurationAdmin}.
+ * <code>ctkConfiguration</code> object for the specified pid, it must use
+ * <code>ctkConfigurationAdmin</code>.
  *
  * @see ctkConfigurationListener
  */
@@ -67,32 +67,32 @@ public:
   enum Type {
 
     /**
-     * A {@code ctkConfiguration} has been updated.
+     * A <code>ctkConfiguration</code> has been updated.
      *
      * <p>
-     * This {@code ctkConfigurationEvent} type indicates that a
-      {@code ctkConfiguration} object has been updated with new properties.
+     * This <code>ctkConfigurationEvent</code> type indicates that a
+      <code>ctkConfiguration</code> object has been updated with new properties.
      *
      * An event is fired when a call to {@link ctkConfiguration#update(const ctkDictionary&)}
      * successfully changes a configuration.
      *
      * <p>
-     * The value of {@code CM_UPDATED} is 1.
+     * The value of <code>CM_UPDATED</code> is 1.
      */
     CM_UPDATED  = 0x00000001,
 
     /**
-     * A {@code ctkConfiguration} has been deleted.
+     * A <code>ctkConfiguration</code> has been deleted.
      *
      * <p>
-     * This {@code ctkConfigurationEvent} type indicates that a
-     * {@code ctkConfiguration} object has been deleted.
+     * This <code>ctkConfigurationEvent</code> type indicates that a
+     * <code>ctkConfiguration</code> object has been deleted.
      *
      * An event is fired when a call to {@link ctkConfiguration#remove()}
      * successfully deletes a configuration.
      *
      * <p>
-     * The value of {@code CM_DELETED} is 2.
+     * The value of <code>CM_DELETED</code> is 2.
      */
     CM_DELETED  = 0x00000002
 
@@ -115,15 +115,15 @@ public:
   bool isNull() const;
 
   /**
-   * Constructs a {@code ConfigurationEvent} object from the given
-   * {@code ServiceReference} object, event type, and pids.
+   * Constructs a <code>ConfigurationEvent</code> object from the given
+   * <code>ServiceReference</code> object, event type, and pids.
    *
-   * @param reference The {@code ServiceReference} object of the
+   * @param reference The <code>ServiceReference</code> object of the
    *        Configuration Admin service that created this event.
    * @param type The event type. See {@link #getType}.
    * @param factoryPid The factory pid of the associated configuration if the
    *        target of the configuration is a ManagedServiceFactory. Otherwise
-   *        {@code null} if the target of the configuration is a
+   *        <code>null</code> if the target of the configuration is a
    *        ManagedService.
    * @param pid The pid of the associated configuration.
    */
@@ -166,10 +166,10 @@ public:
   int getType() const;
 
   /**
-   * Return the {@code ctkServiceReference} object of the Configuration
+   * Return the <code>ctkServiceReference</code> object of the Configuration
    * Admin service that created this event.
    *
-   * @return The {@code ctkServiceReference} object for the Configuration
+   * @return The <code>ctkServiceReference</code> object for the Configuration
    *         Admin service that created this event.
    */
   ctkServiceReference getReference() const;

+ 2 - 2
Libs/PluginFramework/service/cm/ctkConfigurationException.h

@@ -35,10 +35,10 @@ class Q_DECL_EXPORT ctkConfigurationException : public ctkRuntimeException
 public:
 
   /**
-   * Create a {@code ctkConfigurationException} object.
+   * Create a <code>ctkConfigurationException</code> object.
    *
    * @param property name of the property that caused the problem,
-   *        {@code null} if no specific property was the cause
+   *        <code>null</code> if no specific property was the cause
    * @param reason reason for failure
    * @param cause The cause of this exception.
    */

+ 10 - 10
Libs/PluginFramework/service/cm/ctkConfigurationListener.h

@@ -26,24 +26,24 @@
 #include "ctkConfigurationEvent.h"
 
 /**
- * Listener for Configuration Events. When a {@code ctkConfigurationEvent}
+ * Listener for Configuration Events. When a <code>ctkConfigurationEvent</code>
  * is fired, it is asynchronously delivered to a
- * {@code ctkConfigurationListener}.
+ * <code>ctkConfigurationListener</code>.
  *
  * <p>
- * {@code ctkConfigurationListener} objects are registered with the
+ * <code>ctkConfigurationListener</code> objects are registered with the
  * Framework service registry and are notified with a
- * {@code ctkConfigurationEvent} object when an event is fired.
+ * <code>ctkConfigurationEvent</code> object when an event is fired.
  * <p>
- * {@code ctkConfigurationListener} objects can inspect the received
- * {@code ctkConfigurationEvent} object to determine its type, the pid of
- * the {@code ctkConfiguration} object with which it is associated, and the
+ * <code>ctkConfigurationListener</code> objects can inspect the received
+ * <code>ctkConfigurationEvent</code> object to determine its type, the pid of
+ * the <code>ctkConfiguration</code> object with which it is associated, and the
  * Configuration Admin service that fired the event.
  *
  * <p>
  * Security Considerations. Plugins wishing to monitor configuration events will
- * require {@code ctkServicePermission[ctkConfigurationListener,REGISTER]} to
- * register a {@code ctkConfigurationListener} service.
+ * require <code>ctkServicePermission[ctkConfigurationListener,REGISTER]</code> to
+ * register a <code>ctkConfigurationListener</code> service.
  */
 struct ctkConfigurationListener
 {
@@ -52,7 +52,7 @@ struct ctkConfigurationListener
   /**
    * Receives notification of a ctkConfiguration that has changed.
    *
-   * @param event The {@code ctkConfigurationEvent}.
+   * @param event The <code>ctkConfigurationEvent</code>.
    */
   virtual void configurationEvent(const ctkConfigurationEvent& event) = 0;
 };

+ 17 - 17
Libs/PluginFramework/service/cm/ctkConfigurationPlugin.h

@@ -31,13 +31,13 @@
  * update.
  *
  * <p>
- * A plugin registers a {@code ctkConfigurationPlugin} object in order to
+ * A plugin registers a <code>ctkConfigurationPlugin</code> object in order to
  * process configuration updates before they reach the Managed Service or
  * Managed Service Factory. The Configuration Admin service will detect
  * registrations of Configuration Plugin services and must call these services
- * every time before it calls the {@code ctkManagedService} or
- * {@code ctkManagedServiceFactory}
- * {@code updated} method. The
+ * every time before it calls the <code>ctkManagedService</code> or
+ * <code>ctkManagedServiceFactory</code>
+ * <code>updated</code> method. The
  * Configuration Plugin service thus has the opportunity to view and modify the
  * properties before they are passed to the Managed Service or Managed Service
  * Factory.
@@ -46,24 +46,24 @@
  * Configuration Plugin (plugin) services have full read/write access to all
  * configuration information. Therefore, plugins using this facility should be
  * trusted. Access to this facility should be limited with
- * {@code ctkServicePermission[ctkConfigurationPlugin,REGISTER]}.
+ * <code>ctkServicePermission[ctkConfigurationPlugin,REGISTER]</code>.
  * Implementations of a Configuration Plugin service should assure that they
  * only act on appropriate configurations.
  *
  * <p>
- * The integer {@code service.cmRanking} registration
+ * The integer <code>service.cmRanking</code> registration
  * property may be specified. Not specifying this registration property, or
  * setting it to something other than an integer, is the same as
  * setting it to the integer zero. The
- * {@code service.cmRanking} property determines the order in which
+ * <code>service.cmRanking</code> property determines the order in which
  * plugins are invoked. Lower ranked plugins are called before higher ranked
  * ones. In the event of more than one plugin having the same value of
- * {@code service.cmRanking}, then the Configuration Admin service
+ * <code>service.cmRanking</code>, then the Configuration Admin service
  * arbitrarily chooses the order in which they are called.
  *
  * <p>
- * By convention, plugins with {@code service.cmRanking&lt; 0} or
- * {@code service.cmRanking &gt; 1000} should not make modifications to
+ * By convention, plugins with <code>service.cmRanking&lt; 0</code> or
+ * <code>service.cmRanking &gt; 1000</code> should not make modifications to
  * the properties.
  *
  * <p>
@@ -73,12 +73,12 @@
  * defined.
  *
  * <p>
- * A plugin may optionally specify a {@code cm.target} registration
+ * A plugin may optionally specify a <code>cm.target</code> registration
  * property whose value is the PID of the Managed Service or Managed Service
  * Factory whose configuration updates the plugin is intended to intercept. The
  * plugin will then only be called with configuration updates that are targeted
  * at the Managed Service or Managed Service Factory with the specified PID.
- * Omitting the {@code cm.target} registration property means that the
+ * Omitting the <code>cm.target</code> registration property means that the
  * plugin is called for all configuration updates.
  *
  */
@@ -91,7 +91,7 @@ struct CTK_PLUGINFW_EXPORT ctkConfigurationPlugin
    * Factory configuration dictionaries a Configuration Plugin service
    * receives.
    *
-   * This property contains a {@code QStringList} of PIDs. A Configuration
+   * This property contains a <code>QStringList</code> of PIDs. A Configuration
    * Admin service must call a Configuration Plugin service only when this
    * property is not set, or the target service's PID is listed in this
    * property.
@@ -114,13 +114,13 @@ struct CTK_PLUGINFW_EXPORT ctkConfigurationPlugin
    * View and possibly modify a set of configuration properties before
    * they are sent to the Managed Service or the Managed Service Factory. The
    * Configuration Plugin services are called in increasing order of their
-   * {@code service.cmRanking} property. If this property is undefined
+   * <code>service.cmRanking</code> property. If this property is undefined
    * or is a non-integer type, 0 is used.
    *
    * <p>
    * This method should not modify the properties unless the
-   * {@code service.cmRanking} of this plugin is in the range
-   * {@code 0 &lt;= service.cmRanking &lt;= 1000}.
+   * <code>service.cmRanking</code> of this plugin is in the range
+   * <code>0 &lt;= service.cmRanking &lt;= 1000</code>.
    * <p>
    * If this method throws any exception, the Configuration
    * Admin service must catch it and should log it.
@@ -130,7 +130,7 @@ struct CTK_PLUGINFW_EXPORT ctkConfigurationPlugin
    * @param properties The configuration properties. This argument must not
    *        contain the "service.pluginLocation" property. The value of this
    *        property may be obtained from the
-   *        {@code ctkConfiguration#getPluginLocation} method.
+   *        <code>ctkConfiguration#getPluginLocation</code> method.
    */
   virtual void modifyConfiguration(const ctkServiceReference& reference,
                                    ctkDictionary& properties) = 0;

+ 16 - 16
Libs/PluginFramework/service/cm/ctkManagedService.h

@@ -33,28 +33,28 @@
  * <p>
  * A Managed Service is a service that needs configuration data. Such an object
  * should be registered with the Framework registry with the
- * {@code service.pid} property set to some unique identifier called a
+ * <code>service.pid</code> property set to some unique identifier called a
  * PID.
  *
  * <p>
- * If the Configuration Admin service has a {@code ctkConfiguration} object
- * corresponding to this PID, it will callback the {@code updated()}
- * method of the {@code ctkManagedService} object, passing the properties of
- * that {@code ctkConfiguration} object.
+ * If the Configuration Admin service has a <code>ctkConfiguration</code> object
+ * corresponding to this PID, it will callback the <code>updated()</code>
+ * method of the <code>ctkManagedService</code> object, passing the properties of
+ * that <code>ctkConfiguration</code> object.
  *
  * <p>
- * If it has no such {@code ctkConfiguration} object, then it calls back
+ * If it has no such <code>ctkConfiguration</code> object, then it calls back
  * with an empty properties argument. Registering a Managed Service
- * will always result in a callback to the {@code updated()} method
+ * will always result in a callback to the <code>updated()</code> method
  * provided the Configuration Admin service is, or becomes active. This callback
  * must always be done asynchronously.
  *
  * <p>
- * Else, every time that either of the {@code updated()} methods is
- * called on that {@code ctkConfiguration} object, the
- * {@code ctkManagedService#updated()} method with the new properties is
- * called. If the {@code remove()} method is called on that
- * {@code ctkConfiguration} object, {@code ctkManagedService#updated()}
+ * Else, every time that either of the <code>updated()</code> methods is
+ * called on that <code>ctkConfiguration</code> object, the
+ * <code>ctkManagedService#updated()</code> method with the new properties is
+ * called. If the <code>remove()</code> method is called on that
+ * <code>ctkConfiguration</code> object, <code>ctkManagedService#updated()</code>
  * is called with an empty map for the properties parameter. All these
  * callbacks must be done asynchronously.
  *
@@ -125,14 +125,14 @@ struct ctkManagedService
    * Update the configuration for a Managed Service.
    *
    * <p>
-   * When the implementation of {@code updated(const ctkDictionary&)} detects any
+   * When the implementation of <code>updated(const ctkDictionary&)</code> detects any
    * kind of error in the configuration properties, it should create a new
-   * {@code ctkConfigurationException} which describes the problem. This
+   * <code>ctkConfigurationException</code> which describes the problem. This
    * can allow a management system to provide useful information to a human
    * administrator.
    *
    * <p>
-   * If this method throws any other {@code exception}, the
+   * If this method throws any other <code>exception</code>, the
    * Configuration Admin service must catch it and should log it.
    * <p>
    * The Configuration Admin service must call this method asynchronously
@@ -143,7 +143,7 @@ struct ctkManagedService
    * @param properties A copy of the ctkConfiguration properties.
    *        This argument must not contain the
    *        "service.pluginLocation" property. The value of this property may
-   *        be obtained from the {@code ctkConfiguration#getPluginLocation()}
+   *        be obtained from the <code>ctkConfiguration#getPluginLocation()</code>
    *        method.
    * @throws ctkConfigurationException when the update fails
    */

+ 13 - 13
Libs/PluginFramework/service/cm/ctkManagedServiceFactory.h

@@ -37,10 +37,10 @@
  * <p>
  * Each of these <i>service instances </i> is represented, in the persistent
  * storage of the Configuration Admin service, by a factory
- * {@code ctkConfiguration} object that has a PID. When such a
- * {@code ctkConfiguration} is updated, the Configuration Admin service
- * calls the {@code ctkManagedServiceFactory} updated method with the new
- * properties. When {@code updated} is called with a new PID, the Managed
+ * <code>ctkConfiguration</code> object that has a PID. When such a
+ * <code>ctkConfiguration</code> is updated, the Configuration Admin service
+ * calls the <code>ctkManagedServiceFactory</code> updated method with the new
+ * properties. When <code>updated</code> is called with a new PID, the Managed
  * Service Factory should create a new factory instance based on these
  * configuration properties. When called with a PID that it has seen before, it
  * should update that existing service instance with the new configuration
@@ -52,7 +52,7 @@
  * created. The semantics of a factory instance are defined by the Managed
  * Service Factory. However, if the factory instance is registered as a service
  * object with the service registry, its PID should match the PID of the
- * corresponding {@code ctkConfiguration} object (but it should <b>not</b>
+ * corresponding <code>ctkConfiguration</code> object (but it should <b>not</b>
  * be registered as a Managed Service!).
  *
  * <p>
@@ -119,19 +119,19 @@ struct ctkManagedServiceFactory
    * Create a new instance, or update the configuration of an existing
    * instance.
    *
-   * If the PID of the {@code ctkConfiguration} object is new for the
+   * If the PID of the <code>ctkConfiguration</code> object is new for the
    * Managed Service Factory, then create a new factory instance, using the
-   * configuration {@code properties} provided. Else, update the
-   * service instance with the provided {@code properties}.
+   * configuration <code>properties</code> provided. Else, update the
+   * service instance with the provided <code>properties</code>.
    *
    * <p>
    * If the factory instance is registered with the Framework, then the
-   * configuration {@code properties} should be copied to its registry
+   * configuration <code>properties</code> should be copied to its registry
    * properties. This is not mandatory and security sensitive properties
    * should obviously not be copied.
    *
    * <p>
-   * If this method throws any {@code exception}, the Configuration
+   * If this method throws any <code>exception</code>, the Configuration
    * Admin service must catch it and should log it.
    *
    * <p>
@@ -141,7 +141,7 @@ struct ctkManagedServiceFactory
    *
    * <p>
    * The Configuration Admin service must call this method asynchronously.
-   * This implies that implementors of the {@code ctkManagedServiceFactory}
+   * This implies that implementors of the <code>ctkManagedServiceFactory</code>
    * class can be assured that the callback will not take place during
    * registration when they execute the registration in a synchronized method.
    *
@@ -149,7 +149,7 @@ struct ctkManagedServiceFactory
    * @param properties A copy of the configuration properties. This argument
    *        must not contain the service.pluginLocation" property. The value
    *        of this property may be obtained from the
-   *        {@code ctkConfiguration#getPluginLocation} method.
+   *        <code>ctkConfiguration#getPluginLocation</code> method.
    * @throws ctkConfigurationException when the configuration properties are
    *         invalid.
    */
@@ -161,7 +161,7 @@ struct ctkManagedServiceFactory
    * Remove the factory instance associated with the PID. If the instance was
    * registered with the service registry, it should be unregistered.
    * <p>
-   * If this method throws any {@code exception}, the Configuration
+   * If this method throws any <code>exception</code>, the Configuration
    * Admin service must catch it and should log it.
    * <p>
    * The Configuration Admin service must call this method asynchronously.

+ 14 - 14
Libs/PluginFramework/service/metatype/ctkAttributeDefinition.h

@@ -34,7 +34,7 @@
  * An interface to describe an attribute.
  *
  * <p>
- * An {@code ctkAttributeDefinition} object defines a description of the data type
+ * An <code>ctkAttributeDefinition</code> object defines a description of the data type
  * of a property/attribute.
  */
 struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
@@ -44,11 +44,11 @@ struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
   static const int PASSWORD;
 
   /**
-   * The {@code Password} type.
+   * The <code>Password</code> type.
    *
-   * Attributes of this type must be stored as {@code QString}
-   * or {@code QStringList} objects depending on
-   * getCardinality(). A {@code Password} must be treated as a string but the type
+   * Attributes of this type must be stored as <code>QString</code>
+   * or <code>QStringList</code> objects depending on
+   * getCardinality(). A <code>Password</code> must be treated as a string but the type
    * can be used to disguise the information when displayed to a user to
    * prevent others from seeing it.
    */
@@ -71,7 +71,7 @@ struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
    * Unique identity for this attribute.
    *
    * Attributes share a global namespace in the registry. E.g. an attribute
-   * {@code cn} or {@code commonName} must always be a {@code QString} and the
+   * <code>cn</code> or <code>commonName</code> must always be a <code>QString</code> and the
    * semantics are always a name of some object. They share this aspect with
    * LDAP/X.500 attributes. In these standards the OSI Object Identifier (OID)
    * is used to uniquely identify an attribute. If such an OID exists, (which
@@ -139,12 +139,12 @@ struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
    *
    * <p>
    * Each value must be acceptable to validate() (return "") and must be a
-   * {@code QString} object that can be converted to the data type defined by
+   * <code>QString</code> object that can be converted to the data type defined by
    * getType() for this attribute.
    *
    * <p>
-   * This list must be in the same sequence as {@code getOptionLabels()}. I.e.
-   * for each index i in {@code getOptionValues}, i in {@code
+   * This list must be in the same sequence as <code>getOptionLabels()</code>. I.e.
+   * for each index i in <code>getOptionValues</code>, i in {@code
    * getOptionLabels()} should be the label.
    *
    * @return A list values
@@ -156,15 +156,15 @@ struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
    *
    * <p>
    * The purpose of this method is to allow menus with localized labels. It is
-   * associated with {@code getOptionValues}. The labels returned here are
+   * associated with <code>getOptionValues</code>. The labels returned here are
    * ordered in the same way as the values in that method.
    *
    * <p>
    * If the function returns an empty list, there are no option labels
    * available.
    * <p>
-   * This list must be in the same sequence as the {@code getOptionValues()}
-   * method. I.e. for each index i in {@code getOptionLabels}, i in {@code
+   * This list must be in the same sequence as the <code>getOptionValues()</code>
+   * method. I.e. for each index i in <code>getOptionLabels</code>, i in {@code
    * getOptionValues()} should be the associated value.
    *
    * @return A list values
@@ -172,7 +172,7 @@ struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
   virtual QStringList getOptionLabels() const = 0;
 
   /**
-   * Validate an attribute in {@code QString} form.
+   * Validate an attribute in <code>QString</code> form.
    *
    * An attribute might be further constrained in value. This method will
    * attempt to validate the attribute according to these constraints. It can
@@ -193,7 +193,7 @@ struct CTK_PLUGINFW_EXPORT ctkAttributeDefinition
    * Return a default for this attribute.
    *
    * The object must be of the appropriate type as defined by the cardinality
-   * and {@code getType()}. The return type is a QStringList
+   * and <code>getType()</code>. The return type is a QStringList
    * object whose entries can be converted to the appropriate type. The cardinality of
    * the return list must follow the absolute cardinality of this type. E.g.
    * if the cardinality = 0, the list must contain 1 element. If the

+ 3 - 3
Libs/PluginFramework/service/metatype/ctkMetaTypeProvider.h

@@ -42,14 +42,14 @@ struct CTK_PLUGINFW_EXPORT ctkMetaTypeProvider
   /**
    * Service property to signal that this service has
    * {@link ctkObjectClassDefinition} objects for the given PIDs. The type of
-   * this service property is {@code QString}.
+   * this service property is <code>QString</code>.
    */
   static const QString METATYPE_PID; // = "metatype.pid"
 
   /**
    * Service property to signal that this service has
    * {@link ctkObjectClassDefinition} objects for the given factory PIDs. The
-   * type of this service property is {@code QString}.
+   * type of this service property is <code>QString</code>.
    */
   static const QString METATYPE_FACTORY_PID; // = "metatype.factory.pid"
 
@@ -63,7 +63,7 @@ struct CTK_PLUGINFW_EXPORT ctkMetaTypeProvider
    * @param id The ID of the requested object class. This can be a pid or
    *        factory pid returned by getPids or getFactoryPids.
    * @param locale The locale of the definition
-   * @return A {@code ctkObjectClassDefinition} object.
+   * @return A <code>ctkObjectClassDefinition</code> object.
    */
   virtual ctkObjectClassDefinitionPtr getObjectClassDefinition(
     const QString& id, const QLocale& locale = QLocale()) = 0;

+ 5 - 5
Libs/PluginFramework/service/metatype/ctkMetaTypeService.h

@@ -28,16 +28,16 @@
 /**
  * The MetaType Service can be used to obtain meta type information for a
  * plugin. The MetaType Service will examine the specified plugin for meta type
- * documents to create the returned {@code ctkMetaTypeInformation} object.
+ * documents to create the returned <code>ctkMetaTypeInformation</code> object.
  *
  * <p>
  * If the specified plugin does not contain any meta type documents, then a
- * {@code ctkMetaTypeInformation} object will be returned that wraps any
- * {@code ctkManagedService} or {@code ctkManagedServiceFactory}
+ * <code>ctkMetaTypeInformation</code> object will be returned that wraps any
+ * <code>ctkManagedService</code> or <code>ctkManagedServiceFactory</code>
  * services registered by the specified plugin that implement
- * {@code ctkMetaTypeProvider}. Thus the MetaType Service can be used to
+ * <code>ctkMetaTypeProvider</code>. Thus the MetaType Service can be used to
  * retrieve meta type information for plugins which contain meta type
- * documents or which provide their own {@code ctkMetaTypeProvider} objects.
+ * documents or which provide their own <code>ctkMetaTypeProvider</code> objects.
  */
 struct CTK_PLUGINFW_EXPORT ctkMetaTypeService
 {

+ 9 - 9
Libs/PluginFramework/service/metatype/ctkObjectClassDefinition.h

@@ -33,23 +33,23 @@ struct ctkObjectClassDefinition
 
   enum Filter {
     /**
-     * Argument for {@code getAttributeDefinitions()}.
+     * Argument for <code>getAttributeDefinitions()</code>.
      * <p>
-     * {@code REQUIRED} indicates that only the required definitions are
+     * <code>REQUIRED</code> indicates that only the required definitions are
      * returned.
      */
     REQUIRED,
     /**
-     * Argument for {@code getAttributeDefinitions()}.
+     * Argument for <code>getAttributeDefinitions()</code>.
      * <p>
-     * {@code OPTIONAL} indicates that only the optional definitions are
+     * <code>OPTIONAL</code> indicates that only the optional definitions are
      * returned.
      */
     OPTIONAL,
     /**
-     * Argument for {@code getAttributeDefinitions()}.
+     * Argument for <code>getAttributeDefinitions()</code>.
      * <p>
-     * {@code ALL} indicates that all the definitions are returned.
+     * <code>ALL</code> indicates that all the definitions are returned.
      */
     ALL
   };
@@ -69,7 +69,7 @@ struct ctkObjectClassDefinition
   * Return the id of this object class.
   *
   * <p>
-  * {@code ctkObjectClassDefintion} objects share a global namespace in the
+  * <code>ctkObjectClassDefintion</code> objects share a global namespace in the
   * registry. They share this aspect with LDAP/X.500 attributes. In these
   * standards the OSI Object Identifier (OID) is used to uniquely identify
   * object classes. If such an OID exists, (which can be requested at several
@@ -99,10 +99,10 @@ struct ctkObjectClassDefinition
   *
   * <p>
   * Return a set of attributes. The filter parameter can distinguish between
-  * {@code ALL},{@code REQUIRED} or the {@code OPTIONAL}
+  * <code>ALL</code>,<code>REQUIRED</code> or the <code>OPTIONAL</code>
   * attributes.
   *
-  * @param filter {@code ALL},{@code REQUIRED},{@code OPTIONAL}
+  * @param filter <code>ALL</code>,<code>REQUIRED</code>,<code>OPTIONAL</code>
   * @return A list of attribute definitions, which is empty if no
   *         attributes are selected
   */

+ 1 - 1
Plugins/org.commontk.metatype/ctkMTProviderTracker_p.h

@@ -47,7 +47,7 @@ public:
    * registered by the specified plugin.
    * @param context The ctkPluginContext of the ctkMetaTypeService implementation
    * @param plugin The plugin to track all ctkMetaTypeProviders for.
-   * @param log The {@code ctkLogService} to use for logging messages.
+   * @param log The <code>ctkLogService</code> to use for logging messages.
    */
   ctkMTProviderTracker(const QSharedPointer<ctkPlugin>& plugin, ctkLogService* log, ctkServiceTracker<>* tracker);