Renamed enum types to avoid an ERROR type.

ERROR could clash with a define in windows.h

Libs/PluginFramework/Testing/Cpp/ctkPluginFrameworkTestRunner.cpp

@@ -79,7 +79,7 @@ public:
     // wait for 30 secs
     ctkPluginFrameworkEvent event = fw->waitForStop(30000);
 
-    if (result == 0 && event.getType() == ctkPluginFrameworkEvent::WAIT_TIMEDOUT)
+    if (result == 0 && event.getType() == ctkPluginFrameworkEvent::FRAMEWORK_WAIT_TIMEDOUT)
     {
       qWarning() << "Framework shutdown wait timed out";
       result = 1;

Libs/PluginFramework/Testing/FrameworkTest/ctkPluginFrameworkTestSuite.cpp

@@ -231,7 +231,7 @@ void ctkPluginFrameworkTestSuite::frame020a()
 
   // check the listeners for events, expect only a plugin event,
   // of type installation
-  bool lStat = checkListenerEvents(false, ctkPluginFrameworkEvent::INFO, true , ctkPluginEvent::INSTALLED,
+  bool lStat = checkListenerEvents(false, ctkPluginFrameworkEvent::PLUGIN_INFO, true , ctkPluginEvent::INSTALLED,
                                    false, ctkServiceEvent::MODIFIED, pA, 0);
 
   QVERIFY(pA->getState() == ctkPlugin::INSTALLED && lStat == true);
@@ -399,7 +399,7 @@ void ctkPluginFrameworkTestSuite::frame040a()
   }
 
   // check the listeners for events, expect no events
-  bool lStat = checkListenerEvents(false, ctkPluginFrameworkEvent::STARTED,
+  bool lStat = checkListenerEvents(false, ctkPluginFrameworkEvent::FRAMEWORK_STARTED,
                                    false , ctkPluginEvent::INSTALLED,
                                    false, ctkServiceEvent::MODIFIED,
                                    pD, 0);
@@ -425,7 +425,7 @@ void ctkPluginFrameworkTestSuite::frame042a()
   }
 
   // check the listeners for events, expect no events
-  bool lStat = checkListenerEvents(false, ctkPluginFrameworkEvent::STARTED,
+  bool lStat = checkListenerEvents(false, ctkPluginFrameworkEvent::FRAMEWORK_STARTED,
                                    false , ctkPluginEvent::INSTALLED,
                                    false, ctkServiceEvent::MODIFIED,
                                    QSharedPointer<ctkPlugin>(), 0);

Libs/PluginFramework/ctkPlugin.h

@@ -456,7 +456,7 @@ public:
    * <li>If this plugin's state is <code>ACTIVE</code>, <code>STARTING</code>
    * or <code>STOPPING</code>, this plugin is stopped as described in the
    * <code>ctkPlugin::stop</code> method. If <code>ctkPlugin::stop</code> throws an
-   * exception, a Framework event of type ctkFrameworkEvent::ERROR is
+   * exception, a Framework event of type ctkPluginFrameworkEvent::PLUGIN_ERROR is
    * fired containing the exception.
    *
    * <li>This plugin's state is set to <code>UNINSTALLED</code>.

Libs/PluginFramework/ctkPluginContext.h

@@ -417,7 +417,7 @@ public:
    * is not an instance of all the classes named when the service
    * was registered or the <code>ctkServiceFactory</code> object throws an
    * exception, <code>0</code> is returned and a Framework event of type
-   * {@link ctkPluginFrameworkEvent::ERROR} containing a {@link ctkServiceException}
+   * {@link ctkPluginFrameworkEvent::PLUGIN_ERROR} containing a {@link ctkServiceException}
    * describing the error is fired.
    * <li>The service object for the service is returned.
    * </ol>

Libs/PluginFramework/ctkPluginFramework.cpp

@@ -75,13 +75,13 @@ ctkPluginFrameworkEvent ctkPluginFramework::waitForStop(unsigned long timeout)
 
     if (d->stopEvent.isNull())
     {
-      return ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::WAIT_TIMEDOUT, this->d_func()->q_func());
+      return ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::FRAMEWORK_WAIT_TIMEDOUT, this->d_func()->q_func());
     }
   }
   else if (d->stopEvent.isNull())
   {
     // Return this if stop or update have not been called and framework is stopped.
-    d->stopEvent = ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::STOPPED, this->d_func()->q_func());
+    d->stopEvent = ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::FRAMEWORK_STOPPED, this->d_func()->q_func());
   }
   return d->stopEvent;
 }
@@ -142,7 +142,7 @@ void ctkPluginFramework::start(const ctkPlugin::StartOptions& options)
     d->operation = ctkPluginPrivate::IDLE;
     d->lock.wakeAll();
     d->fwCtx->listeners.emitFrameworkEvent(
-        ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::STARTED, this->d_func()->q_func()));
+        ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::FRAMEWORK_STARTED, this->d_func()->q_func()));
   }
 }
 

Libs/PluginFramework/ctkPluginFramework.h

@@ -89,21 +89,21 @@ public:
    *        Framework has completely stopped. A value of zero will wait
    *        indefinitely.
    * @return A Framework Event indicating the reason this method returned. The
-   *         following <code>ctkFrameworkEvent</code> types may be returned by
+   *         following <code>ctkPluginFrameworkEvent</code> types may be returned by
    *         this method.
    *         <ul>
-   *         <li>{@link ctkFrameworkEvent#STOPPED STOPPED} - This Framework has
+   *         <li>{@link ctkPluginFrameworkEvent#STOPPED STOPPED} - This Framework has
    *         been stopped. </li>
    *
-   *         <li>{@link ctkFrameworkEvent#STOPPED_UPDATE STOPPED_UPDATE} - This
+   *         <li>{@link ctkPluginFrameworkEvent#STOPPED_UPDATE STOPPED_UPDATE} - This
    *         Framework has been updated which has shutdown and will now
    *         restart.</li>
    *
-   *         <li>{@link ctkFrameworkEvent#ERROR ERROR} - The Framework
+   *         <li>{@link ctkPluginFrameworkEvent#ERROR ERROR} - The Framework
    *         encountered an error while shutting down or an error has occurred
    *         which forced the framework to shutdown. </li>
    *
-   *         <li> {@link ctkFrameworkEvent#WAIT_TIMEDOUT WAIT_TIMEDOUT} - This
+   *         <li> {@link ctkPluginFrameworkEvent#WAIT_TIMEDOUT WAIT_TIMEDOUT} - This
    *         method has timed out and returned before this Framework has
    *         stopped.</li>
    *         </ul>
@@ -124,9 +124,9 @@ public:
    * and some will be started with their <i>declared activation</i> policy.
    * Any exceptions that occur during plugin starting must be wrapped in a
    * {@link ctkPluginException} and then published as a plugin framework event of type
-   * {@link ctkPluginFrameworkEvent::ERROR}</li>
+   * {@link ctkPluginFrameworkEvent::PLUGIN_ERROR}</li>
    * <li>This %PluinFramework's state is set to {@link #ACTIVE}.</li>
-   * <li>A plugin framework event of type {@link ctkPluginFrameworkEvent::STARTED} is fired</li>
+   * <li>A plugin framework event of type {@link ctkPluginFrameworkEvent::FRAMEWORK_STARTED} is fired</li>
    * </ol>
    *
    * @param options Ignored. There are no start options for the %ctkPluginFramework.

Libs/PluginFramework/ctkPluginFrameworkEvent.cpp

@@ -129,13 +129,13 @@ QDebug operator<<(QDebug dbg, ctkPluginFrameworkEvent::Type type)
 {
   switch (type)
   {
-  case ctkPluginFrameworkEvent::STARTED:        return dbg << "STARTED";
-  case ctkPluginFrameworkEvent::ERROR:          return dbg << "ERROR";
-  case ctkPluginFrameworkEvent::WARNING:        return dbg << "WARNING";
-  case ctkPluginFrameworkEvent::INFO:           return dbg << "INFO";
-  case ctkPluginFrameworkEvent::STOPPED:        return dbg << "STOPPED";
-  case ctkPluginFrameworkEvent::STOPPED_UPDATE: return dbg << "STOPPED_UPDATE";
-  case ctkPluginFrameworkEvent::WAIT_TIMEDOUT:  return dbg << "WATI_TIMEDOUT";
+  case ctkPluginFrameworkEvent::FRAMEWORK_STARTED:        return dbg << "FRAMEWORK_STARTED";
+  case ctkPluginFrameworkEvent::PLUGIN_ERROR:          return dbg << "PLUGIN_ERROR";
+  case ctkPluginFrameworkEvent::PLUGIN_WARNING:        return dbg << "PLUGIN_WARNING";
+  case ctkPluginFrameworkEvent::PLUGIN_INFO:           return dbg << "PLUGIN_INFO";
+  case ctkPluginFrameworkEvent::FRAMEWORK_STOPPED:        return dbg << "FRAMEWORK_STOPPED";
+  case ctkPluginFrameworkEvent::FRAMEWORK_STOPPED_UPDATE: return dbg << "FRAMEWORK_STOPPED_UPDATE";
+  case ctkPluginFrameworkEvent::FRAMEWORK_WAIT_TIMEDOUT:  return dbg << "FRAMEWORK_WATI_TIMEDOUT";
 
   default: return dbg << "unknown plugin framework event type (" << static_cast<int>(type) << ")";
   }

Libs/PluginFramework/ctkPluginFrameworkEvent.h

@@ -64,7 +64,7 @@ public:
      * has reached the initial start level. The source of this event is the
      * System Plugin.
      */
-    STARTED,
+    FRAMEWORK_STARTED,
 
     /**
      * An error has occurred.
@@ -72,7 +72,7 @@ public:
      * <p>
      * There was an error associated with a plugin.
      */
-    ERROR,
+    PLUGIN_ERROR,
 
     /**
      * A warning has occurred.
@@ -80,7 +80,7 @@ public:
      * <p>
      * There was a warning associated with a plugin.
      */
-    WARNING,
+    PLUGIN_WARNING,
 
     /**
      * An informational event has occurred.
@@ -88,7 +88,7 @@ public:
      * <p>
      * There was an informational event associated with a plugin.
      */
-    INFO,
+    PLUGIN_INFO,
 
     /**
      * The Framework has stopped.
@@ -98,7 +98,7 @@ public:
      * operation on the system plugin. The source of this event is the System
      * Plugin.
      */
-    STOPPED,
+    FRAMEWORK_STOPPED,
 
     /**
      * The Framework has stopped during update.
@@ -108,7 +108,7 @@ public:
      * update operation on the system plugin. The Framework will be restarted
      * after this event is fired. The source of this event is the System Plugin.
      */
-    STOPPED_UPDATE,
+    FRAMEWORK_STOPPED_UPDATE,
 
     /**
      * The Framework did not stop before the wait timeout expired.
@@ -117,7 +117,7 @@ public:
      * This event is fired when the Framework did not stop before the wait
      * timeout expired. The source of this event is the System Plugin.
      */
-    WAIT_TIMEDOUT
+    FRAMEWORK_WAIT_TIMEDOUT
 
   };
 

Libs/PluginFramework/ctkPluginFrameworkLauncher.cpp

@@ -209,7 +209,7 @@ bool ctkPluginFrameworkLauncher::stop(const QString& symbolicName,
     {
       fw->stop();
       ctkPluginFrameworkEvent fe = fw->waitForStop(5000);
-      if (fe.getType() == ctkPluginFrameworkEvent::WAIT_TIMEDOUT)
+      if (fe.getType() == ctkPluginFrameworkEvent::FRAMEWORK_WAIT_TIMEDOUT)
       {
         qWarning() << "Stopping the plugin framework timed out";
         return false;

Libs/PluginFramework/ctkPluginFrameworkListeners.cpp

@@ -155,7 +155,7 @@ QSet<ctkServiceSlotEntry> ctkPluginFrameworkListeners::getMatchingServiceSlots(
 //----------------------------------------------------------------------------
 void ctkPluginFrameworkListeners::frameworkError(QSharedPointer<ctkPlugin> p, const std::exception& e)
 {
-  emit frameworkEvent(ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::ERROR, p, e));
+  emit frameworkEvent(ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::PLUGIN_ERROR, p, e));
 }
 
 //----------------------------------------------------------------------------

Libs/PluginFramework/ctkPluginFrameworkPrivate.cpp

@@ -88,7 +88,7 @@ void ctkPluginFrameworkPrivate::shutdown(bool restart)
       }
       catch (const std::exception& e)
       {
-        systemShuttingdownDone(ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::ERROR, this->q_func(), e));
+        systemShuttingdownDone(ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::PLUGIN_ERROR, this->q_func(), e));
       }
     }
     break;
@@ -140,14 +140,14 @@ void ctkPluginFrameworkPrivate::shutdown0(bool restart, bool wasActive)
   catch (const std::exception& e)
   {
     shuttingDown.fetchAndStoreOrdered(0);
-    systemShuttingdownDone(ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::ERROR, this->q_func(), e));
+    systemShuttingdownDone(ctkPluginFrameworkEvent(ctkPluginFrameworkEvent::PLUGIN_ERROR, this->q_func(), e));
   }
 }
 
 //----------------------------------------------------------------------------
 void ctkPluginFrameworkPrivate::shutdownDone_unlocked(bool restart)
 {
-  ctkPluginFrameworkEvent::Type t = restart ? ctkPluginFrameworkEvent::STOPPED_UPDATE : ctkPluginFrameworkEvent::STOPPED;
+  ctkPluginFrameworkEvent::Type t = restart ? ctkPluginFrameworkEvent::FRAMEWORK_STOPPED_UPDATE : ctkPluginFrameworkEvent::FRAMEWORK_STOPPED;
   systemShuttingdownDone_unlocked(ctkPluginFrameworkEvent(t, this->q_func()));
 }
 

Libs/PluginFramework/ctkServiceRegistration.cpp

@@ -193,7 +193,7 @@ void ctkServiceRegistration::unregister()
           }
           catch (const std::exception& ue)
           {
-            ctkPluginFrameworkEvent pfwEvent(ctkPluginFrameworkEvent::ERROR, d->plugin->q_func(), ue);
+            ctkPluginFrameworkEvent pfwEvent(ctkPluginFrameworkEvent::PLUGIN_ERROR, d->plugin->q_func(), ue);
             d->plugin->fwCtx->listeners
                 .emitFrameworkEvent(pfwEvent);
           }

Plugins/org.commontk.eventadmin/adapter/ctkEAFrameworkEventAdapter.cpp

@@ -79,19 +79,19 @@ void ctkEAFrameworkEventAdapter::frameworkEvent(const ctkPluginFrameworkEvent& e
 
   switch (event.getType())
   {
-  case ctkPluginFrameworkEvent::STARTED:
+  case ctkPluginFrameworkEvent::FRAMEWORK_STARTED:
     topic.append("STARTED");
     break;
-  case ctkPluginFrameworkEvent::ERROR:
+  case ctkPluginFrameworkEvent::PLUGIN_ERROR:
     topic.append("ERROR");
     break;
 //  case ctkPluginFrameworkEvent::STARTLEVEL_CHANGED:
 //    topic.append("STARTLEVEL_CHANGED");
 //    break;
-  case ctkPluginFrameworkEvent::WARNING:
+  case ctkPluginFrameworkEvent::PLUGIN_WARNING:
     topic.append("WARNING");
     break;
-  case ctkPluginFrameworkEvent::INFO:
+  case ctkPluginFrameworkEvent::PLUGIN_INFO:
     topic.append("INFO");
     break;
   default: