removed namespace

Libs/PluginFramework/EventBus/ctkEvent.cpp

@@ -1,7 +1,6 @@
 
 #include "ctkEvent.h"
 
-namespace ctk {
 
   class EventPrivate {
 
@@ -72,6 +71,5 @@ namespace ctk {
   {
     // TODO
     return true;
-  }
 
 }

Libs/PluginFramework/EventBus/ctkEvent.h

@@ -9,7 +9,6 @@
 
 #include <ctkLDAPSearchFilter.h>
 
-namespace ctk {
 
   class EventPrivate;
 
@@ -38,6 +37,5 @@ namespace ctk {
     EventPrivate * const d;
   };
 
-}
 
 #endif // CTKEVENT_H

Libs/PluginFramework/EventBus/ctkEventBus.h

@@ -3,7 +3,6 @@
 
 #include "ctkEvent.h"
 
-namespace ctk {
 
   class EventBus {
 
@@ -22,7 +21,6 @@ namespace ctk {
 
   };
 
-}
 
 Q_DECLARE_INTERFACE(ctk::EventBus, "org.commontk.core.EventBus")
 

Libs/PluginFramework/EventBus/ctkEventConstants.cpp

@@ -1,8 +1,6 @@
 #include "ctkEventConstants.h"
 
-namespace ctk {
 
   const QString EventConstants::EVENT_TOPIC = "event.topics";
   const QString EventConstants::EVENT_FILTER = "event.filter";
 
-}

Libs/PluginFramework/EventBus/ctkEventConstants.h

@@ -5,7 +5,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   struct CTK_PLUGINFW_EXPORT EventConstants {
 
@@ -14,6 +13,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKEVENTCONSTANTS_H

Libs/PluginFramework/ctkLDAPSearchFilter.cpp

@@ -21,7 +21,6 @@
 
 #include "ctkLDAPSearchFilter.h"
 
-namespace ctk {
 
   class LDAPSearchFilterPrivate {
   public:
@@ -80,7 +79,6 @@ namespace ctk {
     }
 
     return *this;
-  }
 
 
 }

Libs/PluginFramework/ctkLDAPSearchFilter.h

@@ -28,32 +28,30 @@
 #include <QString>
 #include <QVariant>
 
-namespace ctk {
+class LDAPSearchFilterPrivate;
 
-  class LDAPSearchFilterPrivate;
+class CTK_PLUGINFW_EXPORT LDAPSearchFilter {
 
-  class CTK_PLUGINFW_EXPORT LDAPSearchFilter {
+public:
 
-  public:
+  typedef QMap<QString, QVariant> Dictionary;
 
-    typedef QMap<QString, QVariant> Dictionary;
+  LDAPSearchFilter(const QString& filter = "");
+  LDAPSearchFilter(const LDAPSearchFilter& filter);
 
-    LDAPSearchFilter(const QString& filter = "");
-    LDAPSearchFilter(const LDAPSearchFilter& filter);
+  ~LDAPSearchFilter();
 
-    ~LDAPSearchFilter();
+  bool match(const Dictionary& dictionary) const;
+  bool matchCase(const Dictionary& dictionary) const;
 
-    bool match(const Dictionary& dictionary) const;
-    bool matchCase(const Dictionary& dictionary) const;
+  bool operator==(const LDAPSearchFilter& other) const;
+  LDAPSearchFilter& operator=(const LDAPSearchFilter& filter);
 
-    bool operator==(const LDAPSearchFilter& other) const;
-    LDAPSearchFilter& operator=(const LDAPSearchFilter& filter);
+protected:
 
-  protected:
+  LDAPSearchFilterPrivate * d;
 
-    LDAPSearchFilterPrivate * d;
-
-  };
+};
 
 }
 

Libs/PluginFramework/ctkPlugin.cpp

@@ -27,7 +27,6 @@
 
 #include <QStringList>
 
-namespace ctk {
 
   Plugin::Plugin(PluginFrameworkContext* fw,
                  PluginArchive* pa)
@@ -175,6 +174,5 @@ namespace ctk {
   {
     Q_D(const Plugin);
     return d->version;
-  }
 
 }

Libs/PluginFramework/ctkPlugin.h

@@ -26,7 +26,6 @@
 
 #include "ctkVersion.h"
 
-namespace ctk {
 
   class PluginArchive;
   class PluginFrameworkContext;
@@ -597,7 +596,6 @@ namespace ctk {
     Plugin(PluginPrivate& dd);
   };
 
-}
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(ctk::Plugin::States)
 

Libs/PluginFramework/ctkPluginActivator.h

@@ -24,93 +24,91 @@
 
 #include "ctkPluginContext.h"
 
-namespace ctk {
+/**
+ * Customizes the starting and stopping of a plugin.
+ * <p>
+ * <code>%PluginActivator</code> is an interface that must be implemented by
+ * every plugin in the Framework. The Framework can create instances of a
+ * plugin's <code>%PluginActivator</code> as required. If an instance's
+ * <code>PluginActivator::start</code> method executes successfully, it is
+ * guaranteed that the same instance's <code>PluginActivator::stop</code>
+ * method will be called when the plugin is to be stopped. The Framework must
+ * not concurrently call a <code>%PluginActivator</code> object.
+ *
+ * <p>
+ * <code>%PluginActivator</code> is a Qt interface which must be implemented
+ * using the standard Qt %Plugin facilities:
+ *
+ * <p>
+ * <pre>
+ * class MyPlugin : public QObject, public %ctk::PluginActivator
+ * {
+ *   Q_OBJECT
+ *   Q_INTERFACES(ctk::PluginActivator)
+ *
+ * public:
+ *   void %start(%ctk::PluginContext* context);
+ *   void %stop(%ctk::PluginContext* context);
+ * };
+ * </pre>
+ * And in your implementation file:
+ * <pre>
+ * Q_EXPORT_PLUGIN2(mypluginlib, MyPlugin)
+ * </pre>
+ * where <code>mypluginlib</code> is the basename of your shared plugin library.
+ *
+ * <p>
+ * See the Qt Documentation about <a href="http://doc.trolltech.com/4.6/plugins-howto.html">
+ * How to Create Qt Plugins</a> for details.
+ *
+ * The class implementing the <code>%PluginActivator</code> interface must have a public
+ * constructor that takes no parameters so that a <code>%PluginActivator</code>
+ * object can be created by <code>QPluginLoader::instance</code>.
+ *
+ */
+class PluginActivator
+{
+public:
+
+  virtual ~PluginActivator() {}
 
   /**
-   * Customizes the starting and stopping of a plugin.
-   * <p>
-   * <code>%PluginActivator</code> is an interface that must be implemented by
-   * every plugin in the Framework. The Framework can create instances of a
-   * plugin's <code>%PluginActivator</code> as required. If an instance's
-   * <code>PluginActivator::start</code> method executes successfully, it is
-   * guaranteed that the same instance's <code>PluginActivator::stop</code>
-   * method will be called when the plugin is to be stopped. The Framework must
-   * not concurrently call a <code>%PluginActivator</code> object.
-   *
-   * <p>
-   * <code>%PluginActivator</code> is a Qt interface which must be implemented
-   * using the standard Qt %Plugin facilities:
+   * Called when this plugin is started so the Framework can perform the
+   * plugin-specific activities necessary to start this plugin. This method
+   * can be used to register services or to allocate any resources that this
+   * plugin needs.
    *
    * <p>
-   * <pre>
-   * class MyPlugin : public QObject, public %ctk::PluginActivator
-   * {
-   *   Q_OBJECT
-   *   Q_INTERFACES(ctk::PluginActivator)
+   * This method must complete and return to its caller in a timely manner.
    *
-   * public:
-   *   void %start(%ctk::PluginContext* context);
-   *   void %stop(%ctk::PluginContext* context);
-   * };
-   * </pre>
-   * And in your implementation file:
-   * <pre>
-   * Q_EXPORT_PLUGIN2(mypluginlib, MyPlugin)
-   * </pre>
-   * where <code>mypluginlib</code> is the basename of your shared plugin library.
+   * @param context The execution context of the plugin being started.
+   * @throws std::exception If this method throws an exception, this
+   *         plugin is marked as stopped and the Framework will remove this
+   *         plugin's listeners, unregister all services registered by this
+   *         plugin, and release all services used by this plugin.
+   */
+  virtual void start(PluginContext* context) = 0;
+
+  /**
+   * Called when this plugin is stopped so the Framework can perform the
+   * plugin-specific activities necessary to stop the plugin. In general, this
+   * method should undo the work that the <code>PluginActivator::start</code>
+   * method started. There should be no active threads that were started by
+   * this plugin when this plugin returns. A stopped plugin must not call any
+   * Framework objects.
    *
    * <p>
-   * See the Qt Documentation about <a href="http://doc.trolltech.com/4.6/plugins-howto.html">
-   * How to Create Qt Plugins</a> for details.
-   *
-   * The class implementing the <code>%PluginActivator</code> interface must have a public
-   * constructor that takes no parameters so that a <code>%PluginActivator</code>
-   * object can be created by <code>QPluginLoader::instance</code>.
+   * This method must complete and return to its caller in a timely manner.
    *
+   * @param context The execution context of the plugin being stopped.
+   * @throws std::exception If this method throws an exception, the
+   *         plugin is still marked as stopped, and the Framework will remove
+   *         the plugin's listeners, unregister all services registered by the
+   *         plugin, and release all services used by the plugin.
    */
-  class PluginActivator
-  {
-  public:
-
-    virtual ~PluginActivator() {}
-
-    /**
-     * Called when this plugin is started so the Framework can perform the
-     * plugin-specific activities necessary to start this plugin. This method
-     * can be used to register services or to allocate any resources that this
-     * plugin needs.
-     *
-     * <p>
-     * This method must complete and return to its caller in a timely manner.
-     *
-     * @param context The execution context of the plugin being started.
-     * @throws std::exception If this method throws an exception, this
-     *         plugin is marked as stopped and the Framework will remove this
-     *         plugin's listeners, unregister all services registered by this
-     *         plugin, and release all services used by this plugin.
-     */
-    virtual void start(PluginContext* context) = 0;
-
-    /**
-     * Called when this plugin is stopped so the Framework can perform the
-     * plugin-specific activities necessary to stop the plugin. In general, this
-     * method should undo the work that the <code>PluginActivator::start</code>
-     * method started. There should be no active threads that were started by
-     * this plugin when this plugin returns. A stopped plugin must not call any
-     * Framework objects.
-     *
-     * <p>
-     * This method must complete and return to its caller in a timely manner.
-     *
-     * @param context The execution context of the plugin being stopped.
-     * @throws std::exception If this method throws an exception, the
-     *         plugin is still marked as stopped, and the Framework will remove
-     *         the plugin's listeners, unregister all services registered by the
-     *         plugin, and release all services used by the plugin.
-     */
-    virtual void stop(PluginContext* context) = 0;
-
-  };
+  virtual void stop(PluginContext* context) = 0;
+
+};
 
 }
 

Libs/PluginFramework/ctkPluginArchive.cpp

@@ -27,7 +27,6 @@
 #include <QStringList>
 #include <QFile>
 
-namespace ctk {
 
   const QString PluginArchive::AUTOSTART_SETTING_STOPPED("stopped");
   const QString PluginArchive::AUTOSTART_SETTING_EAGER("eager");
@@ -129,7 +128,6 @@ namespace ctk {
   void PluginArchive::purge()
   {
     storage->removeArchive(this);
-  }
 
 
 }

Libs/PluginFramework/ctkPluginArchive_p.h

@@ -31,184 +31,181 @@
 // Qt forward declarations
 class QIODevice;
 
-namespace ctk {
-
 typedef quint64 qtimestamp;
 
 // CTK foraward declarations
 class PluginStorage;
 
 /**
- * Class for managing plugin data.
- *
- */
+* Class for managing plugin data.
+*
+*/
 class PluginArchive {
 
 public:
 
-  /**
-   * Autostart setting stopped.
-   * @see PluginArchiveInterface#setAutostartSetting(const QString&)
-   */
-  static const QString AUTOSTART_SETTING_STOPPED; // = "stopped"
+/**
+ * Autostart setting stopped.
+ * @see PluginArchiveInterface#setAutostartSetting(const QString&)
+ */
+static const QString AUTOSTART_SETTING_STOPPED; // = "stopped"
 
-  /**
-   * Autostart setting eager.
-   * @see PluginArchiveInterface#setAutostartSetting(const QString&)
-   */
-  static const QString AUTOSTART_SETTING_EAGER; // = "eager"
+/**
+ * Autostart setting eager.
+ * @see PluginArchiveInterface#setAutostartSetting(const QString&)
+ */
+static const QString AUTOSTART_SETTING_EAGER; // = "eager"
 
-  /**
-   * Autostart setting declared activation policy.
-   * @see PluginArchiveInterface#setAutostartSetting(const QString&)
-   */
-  static const QString AUTOSTART_SETTING_ACTIVATION_POLICY; // = "activation_policy"
+/**
+ * Autostart setting declared activation policy.
+ * @see PluginArchiveInterface#setAutostartSetting(const QString&)
+ */
+static const QString AUTOSTART_SETTING_ACTIVATION_POLICY; // = "activation_policy"
 
 private:
 
-  int autostartSetting;
-  int id;
-  qtimestamp lastModified;
-  QUrl location;
-  QString localPluginPath;
-  PluginManifest manifest;
-  PluginStorage* storage;
+int autostartSetting;
+int id;
+qtimestamp lastModified;
+QUrl location;
+QString localPluginPath;
+PluginManifest manifest;
+PluginStorage* storage;
 
 public:
 
-  /**
-   * Construct new plugin archive.
-   *
-   */
-  PluginArchive(PluginStorage* pluginStorage, const QUrl& pluginLocation,
-                const QString& localPluginPath, int pluginId);
-
-  /**
-   * Get an attribute from the manifest of a plugin.
-   *
-   * Not localized
-   *
-   * @param key Name of attribute to get.
-   * @return A string with result or null if the entry doesn't exists.
-   */
-  QString getAttribute(const QString& key) const;
-
-  /**
-   * @returns the (raw/unlocalized) attributes
-   */
-  QHash<QString,QString> getUnlocalizedAttributes() const;
-
-
-  /**
-   * Get plugin identifier for this plugin archive.
-   *
-   * @return Plugin identifier.
-   */
-  int getPluginId() const;
-
-
-  /**
-   * Get plugin location for this plugin archive.
-   *
-   * @return Bundle location.
-   */
-  QUrl getPluginLocation() const;
-
-   /**
-    * Get the path to the plugin library on the local
-    * file system
-    *
-    * @return Path to the plugin library
-    */
-   QString getLibLocation() const;
-
-
-  /**
-   * Get a Qt resource as a byte array from a plugin. The resource
-   * is cached and may be aquired even if the plugin is not active.
-   *
-   * @param component Resource to get the byte array from.
-   * @return QByteArray to the entry (empty if it doesn't exist).
-   */
-  QByteArray getPluginResource(const QString& component) const;
-
-
-  /**
-   * Returns a QStringList of all the paths
-   * to entries within the plugin whose longest sub-path matches the supplied
-   * path argument.
-   *
-   * @param name
-   * @return
-   */
-  QStringList findResourcesPath(const QString& path) const;
-
-
-  /**
-   * Get stored plugin start level.
-   */
-  int getStartLevel() const;
-
-
-  /**
-   * Set stored plugin start level.
-   */
-  void setStartLevel(int level);
-
-
-  /**
-   * Get last modified timestamp.
-   */
-  qtimestamp getLastModified() const;
-
-
-  /**
-   * Set stored last modified timestamp.
-   */
-  void setLastModified(qtimestamp timemillisecs);
-
-
-  /**
-   * Get auto-start setting.
-   *
-   * @return the autostart setting. "-1" if the plugin is not started.
-   */
-  int getAutostartSetting() const;
-
-
-  /**
-   * Set the auto-start setting.
-   *
-   * @param setting the autostart setting to use.
-   */
-  void setAutostartSetting(int setting);
-
-
-  /**
-   * Get certificate chains associated with a plugin.
-   *
-   * @param onlyTrusted Only return trusted certificates.
-   * @return All certificates or null if bundle is unsigned.
-   */
-  //QList<> getCertificateChains(bool onlyTrusted) const;
+/**
+ * Construct new plugin archive.
+ *
+ */
+PluginArchive(PluginStorage* pluginStorage, const QUrl& pluginLocation,
+	      const QString& localPluginPath, int pluginId);
+
+/**
+ * Get an attribute from the manifest of a plugin.
+ *
+ * Not localized
+ *
+ * @param key Name of attribute to get.
+ * @return A string with result or null if the entry doesn't exists.
+ */
+QString getAttribute(const QString& key) const;
+
+/**
+ * @returns the (raw/unlocalized) attributes
+ */
+QHash<QString,QString> getUnlocalizedAttributes() const;
 
 
-  /**
-   * Mark certificate associated with the plugin as trusted.
-   *
-   */
-  //void trustCertificateChain(QList<> trustedChain);
+/**
+ * Get plugin identifier for this plugin archive.
+ *
+ * @return Plugin identifier.
+ */
+int getPluginId() const;
+
+
+/**
+ * Get plugin location for this plugin archive.
+ *
+ * @return Bundle location.
+ */
+QUrl getPluginLocation() const;
+
+ /**
+  * Get the path to the plugin library on the local
+  * file system
+  *
+  * @return Path to the plugin library
+  */
+ QString getLibLocation() const;
+
+
+/**
+ * Get a Qt resource as a byte array from a plugin. The resource
+ * is cached and may be aquired even if the plugin is not active.
+ *
+ * @param component Resource to get the byte array from.
+ * @return QByteArray to the entry (empty if it doesn't exist).
+ */
+QByteArray getPluginResource(const QString& component) const;
+
+
+/**
+ * Returns a QStringList of all the paths
+ * to entries within the plugin whose longest sub-path matches the supplied
+ * path argument.
+ *
+ * @param name
+ * @return
+ */
+QStringList findResourcesPath(const QString& path) const;
 
 
-  /**
-   * Remove plugin from persistent storage.
-   * This will delete the current PluginArchive instance.
-   */
-  void purge();
+/**
+ * Get stored plugin start level.
+ */
+int getStartLevel() const;
+
+
+/**
+ * Set stored plugin start level.
+ */
+void setStartLevel(int level);
+
+
+/**
+ * Get last modified timestamp.
+ */
+qtimestamp getLastModified() const;
+
+
+/**
+ * Set stored last modified timestamp.
+ */
+void setLastModified(qtimestamp timemillisecs);
+
+
+/**
+ * Get auto-start setting.
+ *
+ * @return the autostart setting. "-1" if the plugin is not started.
+ */
+int getAutostartSetting() const;
+
+
+/**
+ * Set the auto-start setting.
+ *
+ * @param setting the autostart setting to use.
+ */
+void setAutostartSetting(int setting);
+
+
+/**
+ * Get certificate chains associated with a plugin.
+ *
+ * @param onlyTrusted Only return trusted certificates.
+ * @return All certificates or null if bundle is unsigned.
+ */
+//QList<> getCertificateChains(bool onlyTrusted) const;
+
+
+/**
+ * Mark certificate associated with the plugin as trusted.
+ *
+ */
+//void trustCertificateChain(QList<> trustedChain);
+
+
+/**
+ * Remove plugin from persistent storage.
+ * This will delete the current PluginArchive instance.
+ */
+void purge();
 
 };
 
-}
 
 
 #endif // CTKPLUGINARCHIVE_P_H

Libs/PluginFramework/ctkPluginConstants.cpp

@@ -21,8 +21,6 @@
 
 #include "ctkPluginConstants.h"
 
-namespace ctk {
-
   const QString	PluginConstants::SYSTEM_PLUGIN_LOCATION = "System Plugin";
   const QString	PluginConstants::SYSTEM_PLUGIN_SYMBOLICNAME = "system.plugin";
 
@@ -50,4 +48,3 @@ namespace ctk {
   const QString PluginConstants::SERVICE_ID = "service.id";
   const QString PluginConstants::SERVICE_RANKING = "service.ranking";
 
-}

Libs/PluginFramework/ctkPluginConstants.h

@@ -26,7 +26,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   struct CTK_PLUGINFW_EXPORT PluginConstants {
 
@@ -303,6 +302,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINCONSTANTS_H

Libs/PluginFramework/ctkPluginContext.cpp

@@ -29,7 +29,6 @@
 
 #include <stdexcept>
 
-namespace ctk {
 
   class PluginContextPrivate
   {
@@ -142,7 +141,6 @@ namespace ctk {
   {
     Q_D(PluginContext);
     receiver->connect(&(d->plugin->fwCtx->listeners), SIGNAL(frameworkEvent(PluginFrameworkEvent)), method, type);
-  }
 
 
 }

Libs/PluginFramework/ctkPluginContext.h

@@ -34,7 +34,6 @@
 #include "CTKPluginFrameworkExport.h"
 
 
-namespace ctk {
 
   // CTK class forward declarations
   class Plugin;
@@ -356,6 +355,5 @@ namespace ctk {
     PluginContextPrivate * const d_ptr;
   };
 
-}
 
 #endif /* CTKPLUGINCONTEXT_H_ */

Libs/PluginFramework/ctkPluginDatabase.cpp

@@ -46,7 +46,6 @@
 #define PLUGINDATABASE_PATH_SEPARATOR "//"
 
 
-namespace ctk {
 
   enum TBindIndexes
   {
@@ -796,6 +795,5 @@ QList<PluginArchive*> PluginDatabase::getPluginArchives() const
   }
 
   return archives;
-}
 
 }

Libs/PluginFramework/ctkPluginDatabaseException.cpp

@@ -23,7 +23,6 @@
 
 #include <QDebug>
 
-namespace ctk {
 
   PluginDatabaseException::PluginDatabaseException(const QString& msg, const Type& type, const std::exception& cause)
     : std::runtime_error(msg.toStdString()),
@@ -81,5 +80,4 @@ QDebug operator<<(QDebug dbg, const ctk::PluginDatabaseException& exc)
   if (causeMsg) dbg << "  Caused by:" << causeMsg;
 
   return dbg.maybeSpace();
-}
 

Libs/PluginFramework/ctkPluginDatabaseException.h

@@ -28,7 +28,6 @@
 
 #include <QString>
 
-namespace ctk {
 
   class CTK_PLUGINFW_EXPORT PluginDatabaseException : public std::runtime_error
   {
@@ -64,7 +63,6 @@ namespace ctk {
     std::exception cause;
   };
 
-}
 
 CTK_PLUGINFW_EXPORT QDebug operator<<(QDebug dbg, const ctk::PluginDatabaseException& exc);
 

Libs/PluginFramework/ctkPluginDatabase_p.h

@@ -26,7 +26,6 @@
 #include <QList>
 
 
-namespace ctk {
 
 // CTK class forward declarations
 class PluginStorage;
@@ -204,6 +203,5 @@ class PluginDatabase {
     PluginStorage* m_PluginStorage;
 };
 
-}
 
 #endif // CTKPLUGINDATABASE_P_H

Libs/PluginFramework/ctkPluginEvent.cpp

@@ -22,7 +22,6 @@
 #include "ctkPluginEvent.h"
 
 
-namespace ctk {
 
   PluginEvent::PluginEvent(Type type, Plugin* plugin)
     : d(new PluginEventData(type, plugin))
@@ -44,6 +43,5 @@ namespace ctk {
   PluginEvent::Type PluginEvent::getType() const
   {
     return d->type;
-  }
 
 }

Libs/PluginFramework/ctkPluginEvent.h

@@ -27,7 +27,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class Plugin;
   class PluginEventData;
@@ -127,6 +126,5 @@ namespace ctk {
     Plugin* const plugin;
   };
 
-}
 
 #endif // CTKPLUGINEVENT_H

Libs/PluginFramework/ctkPluginException.cpp

@@ -21,7 +21,6 @@
 
 #include "ctkPluginException.h"
 
-namespace ctk {
 
   PluginException::PluginException(const QString& msg, const Type& type, const std::exception& cause)
     : std::runtime_error(msg.toStdString()),
@@ -68,7 +67,6 @@ namespace ctk {
     return type;
   }
 
-}
 
 QDebug operator<<(QDebug dbg, const ctk::PluginException& exc)
 {

Libs/PluginFramework/ctkPluginException.h

@@ -29,7 +29,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class CTK_PLUGINFW_EXPORT PluginException : public std::runtime_error
   {
@@ -95,7 +94,6 @@ namespace ctk {
 
   };
 
-}
 
 CTK_PLUGINFW_EXPORT QDebug operator<<(QDebug dbg, const ctk::PluginException& exc);
 

Libs/PluginFramework/ctkPluginFramework.cpp

@@ -28,7 +28,6 @@
 #include "ctkPluginArchive_p.h"
 
 
-namespace ctk {
 
   PluginFramework::PluginFramework(PluginFrameworkContext* fw)
     : Plugin(*new PluginFrameworkPrivate(*this, fw))
@@ -157,6 +156,5 @@ namespace ctk {
     //TODO security
     Q_D(PluginFramework);
     return d->systemHeaders;
-  }
 
 }

Libs/PluginFramework/ctkPluginFramework.h

@@ -27,7 +27,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class PluginFrameworkContext;
   class PluginFrameworkPrivate;
@@ -120,6 +119,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINFRAMEWORK_H

Libs/PluginFramework/ctkPluginFrameworkContext.cpp

@@ -25,7 +25,6 @@
 #include "ctkPluginArchive_p.h"
 #include "ctkPluginConstants.h"
 
-namespace ctk {
 
   QMutex PluginFrameworkContext::globalFwLock;
   int PluginFrameworkContext::globalId = 1;
@@ -178,7 +177,6 @@ namespace ctk {
         }
       }
     }
-  }
 
 
 }

Libs/PluginFramework/ctkPluginFrameworkContext_p.h

@@ -32,7 +32,6 @@
 #include "ctkPluginFrameworkListeners_p.h"
 #include "ctkServices_p.h"
 
-namespace ctk {
 
   class Plugin;
 
@@ -140,6 +139,5 @@ namespace ctk {
       void checkRequirePlugin(PluginPrivate* plugin);
   };
 
-}
 
 #endif // CTKPLUGINFRAMEWORKCONTEXT_P_H

Libs/PluginFramework/ctkPluginFrameworkEvent.cpp

@@ -21,7 +21,6 @@
 
 #include "ctkPluginFrameworkEvent.h"
 
-namespace ctk {
 
   PluginFrameworkEvent::PluginFrameworkEvent()
     : d(0)
@@ -60,6 +59,5 @@ namespace ctk {
   PluginFrameworkEvent::Type PluginFrameworkEvent::getType() const
   {
     return d->type;
-  }
 
 }

Libs/PluginFramework/ctkPluginFrameworkEvent.h

@@ -27,7 +27,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class Plugin;
   class PluginFrameworkEventData;
@@ -216,6 +215,5 @@ namespace ctk {
     const PluginFrameworkEvent::Type type;
   };
 
-}
 
 #endif // CTKPLUGINFRAMEWORKEVENT_H

Libs/PluginFramework/ctkPluginFrameworkFactory.cpp

@@ -23,7 +23,6 @@
 
 #include "ctkPluginFrameworkContext_p.h"
 
-namespace ctk {
 
   PluginFrameworkFactory::PluginFrameworkFactory(const Properties& initProps)
     : fwCtx(new PluginFrameworkContext(initProps))
@@ -39,6 +38,5 @@ namespace ctk {
   PluginFramework* PluginFrameworkFactory::getFramework()
   {
     return &(fwCtx->systemPlugin);
-  }
 
 }

Libs/PluginFramework/ctkPluginFrameworkFactory.h

@@ -28,7 +28,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class PluginFramework;
   class PluginFrameworkContext;
@@ -77,6 +76,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINFRAMEWORKFACTORY_H

Libs/PluginFramework/ctkPluginFrameworkListeners.cpp

@@ -21,7 +21,6 @@
 
 #include "ctkPluginFrameworkListeners_p.h"
 
-namespace ctk {
 
   void PluginFrameworkListeners::frameworkError(Plugin* p, const std::exception& e)
   {
@@ -36,6 +35,5 @@ namespace ctk {
   void PluginFrameworkListeners::emitPluginChanged(const PluginEvent& event)
   {
     emit pluginChanged(event);
-  }
 
 }

Libs/PluginFramework/ctkPluginFrameworkListeners_p.h

@@ -27,7 +27,6 @@
 #include <ctkPluginEvent.h>
 #include <ctkPluginFrameworkEvent.h>
 
-namespace ctk {
 
   class PluginFrameworkListeners : public QObject
   {
@@ -50,6 +49,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINFRAMEWORKLISTENERS_H

Libs/PluginFramework/ctkPluginFrameworkPrivate.cpp

@@ -26,7 +26,6 @@
 
 #include "ctkPluginFrameworkContext_p.h"
 
-namespace ctk {
 
   PluginFrameworkPrivate::PluginFrameworkPrivate(PluginFramework& qq, PluginFrameworkContext* fw)
     : PluginPrivate(qq, fw, 0, PluginConstants::SYSTEM_PLUGIN_LOCATION,
@@ -48,6 +47,5 @@ namespace ctk {
   void PluginFrameworkPrivate::initSystemPlugin()
   {
     this->pluginContext = new PluginContext(this);
-  }
 
 }

Libs/PluginFramework/ctkPluginFrameworkPrivate_p.h

@@ -27,7 +27,6 @@
 
 #include <QMutex>
 
-namespace ctk {
 
   class PluginFrameworkContext;
 
@@ -47,6 +46,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINFRAMEWORKPRIVATE_P_H

Libs/PluginFramework/ctkPluginFrameworkUtil.cpp

@@ -25,7 +25,6 @@
 
 #include <stdexcept>
 
-namespace ctk {
 
   /**
    * Class for tokenize an attribute string.
@@ -300,6 +299,5 @@ namespace ctk {
       } while (!at.getEnd());
     }
     return result;
-  }
 
 }

Libs/PluginFramework/ctkPluginFrameworkUtil_p.h

@@ -22,7 +22,6 @@
 #include <QMap>
 #include <QStringList>
 
-namespace ctk {
 
   class PluginFrameworkUtil
   {
@@ -46,6 +45,5 @@ namespace ctk {
        */
       static QList<QMap<QString, QStringList> > parseEntries(const QString& a, const QString& s,
                                                  bool single, bool unique, bool single_entry);
-  };
 
 }

Libs/PluginFramework/ctkPluginFramework_global.h

@@ -25,10 +25,8 @@
 
 #include <QHash>
 
-namespace ctk {
 
   typedef QHash<QString, QVariant> ServiceProperties;
 
-}
 
 #endif // CTKPLUGINFRAMEWORK_GLOBAL_H

Libs/PluginFramework/ctkPluginManager.cpp

@@ -27,7 +27,6 @@
 #include <QLibrary>
 #include <QApplication>
 
-namespace ctk {
 
 class PluginManagerPrivate
 {
@@ -121,6 +120,5 @@ void PluginManager::startAllPlugins()
        }
   }
 
-}
 
 }

Libs/PluginFramework/ctkPluginManager.h

@@ -27,7 +27,6 @@
 
 #include <CTKPluginFrameworkExport.h>
 
-namespace ctk {
 
   using namespace QtMobility;
 
@@ -54,7 +53,6 @@ namespace ctk {
 
   };
 
-}
 
 
 #endif /* CTKPLUGINMANAGER_H_ */

Libs/PluginFramework/ctkPluginManifest.cpp

@@ -27,7 +27,6 @@
 
 #include <stdexcept>
 
-namespace ctk {
 
   PluginManifest::PluginManifest()
   {
@@ -138,6 +137,5 @@ namespace ctk {
   QStringList PluginManifest::getSections() const
   {
     return sections.keys();
-  }
 
 }

Libs/PluginFramework/ctkPluginManifest_p.h

@@ -26,7 +26,6 @@
 
 class QIODevice;
 
-namespace ctk {
 
   class PluginManifest
   {
@@ -53,6 +52,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINMANIFEST_P_H

Libs/PluginFramework/ctkPluginPrivate.cpp

@@ -28,7 +28,6 @@
 #include "ctkPluginFrameworkUtil_p.h"
 #include "ctkPluginActivator.h"
 
-namespace ctk {
 
   const Plugin::States PluginPrivate::RESOLVED_FLAGS = Plugin::RESOLVED | Plugin::STARTING | Plugin::ACTIVE | Plugin::STOPPING;
 
@@ -265,6 +264,5 @@ namespace ctk {
 //    for (Iterator i = s.iterator(); i.hasNext(); ) {
 //      ((ServiceRegistrationImpl) i.next()).reference.ungetService(this, false);
 //    }
-  }
 
 }

Libs/PluginFramework/ctkPluginPrivate_p.h

@@ -29,7 +29,6 @@
 #include <QHash>
 #include <QPluginLoader>
 
-namespace ctk {
 
   class PluginActivator;
   class PluginArchive;
@@ -198,6 +197,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINPRIVATE_P_H

Libs/PluginFramework/ctkPluginStorage.cpp

@@ -31,7 +31,6 @@
 #include "ctkPluginFrameworkContext_p.h"
 #include "ctkPluginDatabaseException.h"
 
-namespace ctk {
 
   PluginStorage::PluginStorage(PluginFrameworkContext* framework)
     : framework(framework), pluginDatabase(this)
@@ -147,6 +146,5 @@ namespace ctk {
       qDebug() << QString("Getting plugin resource paths for %1 failed:").arg(path) << exc;
       return QStringList();
     }
-  }
 
 }

Libs/PluginFramework/ctkPluginStorage_p.h

@@ -30,7 +30,6 @@
 // Qt class forward declarations
 class QIODevice;
 
-namespace ctk {
 
   // CTK class forward declarations
   class PluginArchive;
@@ -142,6 +141,5 @@ namespace ctk {
 
 };
 
-}
 
 #endif // CTKPLUGINSTORAGE_P_H

Libs/PluginFramework/ctkPlugins.cpp

@@ -32,7 +32,6 @@
 
 #include <QUrl>
 
-namespace ctk {
 
   Plugins::Plugins(PluginFrameworkContext* fw) {
     fwCtx = fw;
@@ -338,6 +337,5 @@ namespace ctk {
         }
       }
     }
-  }
 
 }

Libs/PluginFramework/ctkPlugins_p.h

@@ -27,7 +27,6 @@
 #include <QReadWriteLock>
 
 
-namespace ctk {
 
   // CTK class forward declarations
   class Plugin;
@@ -174,6 +173,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKPLUGINS_H

Libs/PluginFramework/ctkQtServiceRegistration.cpp

@@ -24,7 +24,6 @@
 
 #include <QServiceInterfaceDescriptor>
 
-namespace ctk {
 
   QtServiceRegistration::QtServiceRegistration(PluginPrivate* plugin,
                                                QtMobility::QServiceInterfaceDescriptor serviceDescriptor,
@@ -34,5 +33,4 @@ namespace ctk {
 
   }
 
-}
 

Libs/PluginFramework/ctkQtServiceRegistrationPrivate.cpp

@@ -25,7 +25,6 @@
 #include "ctkPluginFrameworkContext_p.h"
 #include "ctkQtServiceRegistration_p.h"
 
-namespace ctk {
 
   QtServiceRegistrationPrivate::QtServiceRegistrationPrivate(QtServiceRegistration* sr,
                                PluginPrivate* plugin,
@@ -46,5 +45,4 @@ namespace ctk {
     return this->plugin->fwCtx->services.qServiceManager.loadInterface(serviceDescriptor);
   }
 
-}
 

Libs/PluginFramework/ctkQtServiceRegistrationPrivate.h

@@ -27,7 +27,6 @@
 
 #include "QServiceInterfaceDescriptor"
 
-namespace ctk {
 
   class QtServiceRegistration;
 
@@ -48,6 +47,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKQTSERVICEREGISTRATIONPRIVATE_H

Libs/PluginFramework/ctkQtServiceRegistration_p.h

@@ -27,7 +27,6 @@
 
 #include <QServiceInterfaceDescriptor>
 
-namespace ctk {
 
   class PluginPrivate;
 
@@ -41,6 +40,5 @@ namespace ctk {
                           const ServiceProperties& props);
   };
 
-}
 
 #endif // CTKQTSERVICEREGISTRATION_P_H

Libs/PluginFramework/ctkRequirePlugin.cpp

@@ -24,7 +24,6 @@
 #include "ctkPluginConstants.h"
 #include "ctkPluginPrivate_p.h"
 
-namespace ctk {
 
   RequirePlugin::RequirePlugin(PluginPrivate* requestor,
                 const QString& name, const QString& res,
@@ -60,6 +59,5 @@ namespace ctk {
       return false;
     }
     return pluginRange.withinRange(rp.pluginRange);
-  }
 
 }

Libs/PluginFramework/ctkRequirePlugin_p.h

@@ -24,7 +24,6 @@
 
 #include <ctkVersionRange_p.h>
 
-namespace ctk {
 
   class PluginPrivate;
 
@@ -45,6 +44,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKREQUIREPLUGIN_P_H

Libs/PluginFramework/ctkServiceException.cpp

@@ -23,7 +23,6 @@
 
 #include <QDebug>
 
-namespace ctk {
 
   ServiceException::ServiceException(const QString& msg, const Type& type, const std::exception& cause)
     : std::runtime_error(msg.toStdString()),
@@ -80,6 +79,5 @@ QDebug operator<<(QDebug dbg, const ctk::ServiceException& exc)
   if (causeMsg) dbg << "  Caused by:" << causeMsg;
 
   return dbg.maybeSpace();
-}
 
 

Libs/PluginFramework/ctkServiceException.h

@@ -29,7 +29,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class CTK_PLUGINFW_EXPORT ServiceException : public std::runtime_error
   {
@@ -83,7 +82,6 @@ namespace ctk {
 
   };
 
-}
 
 CTK_PLUGINFW_EXPORT QDebug operator<<(QDebug dbg, const ctk::ServiceException& exc);
 

Libs/PluginFramework/ctkServiceFactory.h

@@ -26,7 +26,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   /**
    * Allows services to provide customized service objects in the plugin
@@ -115,5 +114,4 @@ namespace ctk {
         QObject* service) = 0;
   };
 
-}
 

Libs/PluginFramework/ctkServiceReference.cpp

@@ -28,7 +28,6 @@
 #include <QStringList>
 #include <QMutexLocker>
 
-namespace ctk {
 
   ServiceReference::ServiceReference(ServiceRegistrationPrivate* reg)
     : d_ptr(new ServiceReferencePrivate(reg))
@@ -112,6 +111,5 @@ namespace ctk {
   bool ServiceReference::operator==(const ServiceReference& reference) const
   {
     return d_func()->registration == reference.d_func()->registration;
-  }
 
 }

Libs/PluginFramework/ctkServiceReference.h

@@ -28,7 +28,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class ServiceRegistrationPrivate;
   class ServiceReferencePrivate;
@@ -179,6 +178,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKSERVICEREFERENCE_H

Libs/PluginFramework/ctkServiceReferencePrivate.cpp

@@ -31,7 +31,6 @@
 #include "ctkServiceRegistrationPrivate.h"
 #include "ctkPluginFrameworkContext_p.h"
 
-namespace ctk {
 
   ServiceReferencePrivate::ServiceReferencePrivate(ServiceRegistrationPrivate* reg)
     : registration(reg)
@@ -173,5 +172,4 @@ namespace ctk {
   }
 
 
-}
 

Libs/PluginFramework/ctkServiceReferencePrivate.h

@@ -25,7 +25,6 @@
 
 class QObject;
 
-namespace ctk {
 
   class ServiceRegistrationPrivate;
   class Plugin;
@@ -62,5 +61,4 @@ namespace ctk {
     ServiceRegistrationPrivate* registration;
   };
 
-}
 #endif // CTKSERVICEREFERENCEPRIVATE_H

Libs/PluginFramework/ctkServiceRegistration.cpp

@@ -29,7 +29,6 @@
 
 #include <stdexcept>
 
-namespace ctk {
 
   ServiceRegistration::ServiceRegistration(PluginPrivate* plugin, QObject* service,
                       const ServiceProperties& props)
@@ -159,6 +158,5 @@ namespace ctk {
   {
     Q_D(const ServiceRegistration);
     return d->reference->operator <(*(o.d_func()->reference));
-  }
 
 }

Libs/PluginFramework/ctkServiceRegistration.h

@@ -28,7 +28,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   class ServiceRegistrationPrivate;
 
@@ -142,6 +141,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKSERVICEREGISTRATION_H

Libs/PluginFramework/ctkServiceRegistrationPrivate.cpp

@@ -21,7 +21,6 @@
 
 #include "ctkServiceRegistrationPrivate.h"
 
-namespace ctk {
 
   ServiceRegistrationPrivate::ServiceRegistrationPrivate(ServiceRegistration* sr,
                                                          PluginPrivate* plugin, QObject* service,
@@ -48,5 +47,4 @@ namespace ctk {
     return service;
   }
 
-}
 

Libs/PluginFramework/ctkServiceRegistrationPrivate.h

@@ -28,7 +28,6 @@
 
 #include "ctkServiceReference.h"
 
-namespace ctk {
 
   class PluginPrivate;
   class ServiceRegistration;
@@ -113,6 +112,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKSERVICEREGISTRATIONPRIVATE_H

Libs/PluginFramework/ctkServices.cpp

@@ -32,7 +32,6 @@
 #include "ctkServiceRegistrationPrivate.h"
 #include "ctkQtServiceRegistration_p.h"
 
-namespace ctk {
 
   using namespace QtMobility;
 
@@ -478,5 +477,4 @@ QList<ServiceRegistration*> Services::getUsedByPlugin(Plugin* p) const
   return res;
 }
 
-}
 

Libs/PluginFramework/ctkServices_p.h

@@ -32,7 +32,6 @@
 #include "ctkServiceRegistration.h"
 #include "ctkPluginPrivate_p.h"
 
-namespace ctk {
 
 /**
  * Here we handle all the services that are registered in the framework.
@@ -187,7 +186,6 @@ public:
 
 };
 
-}
 
 
 #endif // CTKSERVICES_P_H

Libs/PluginFramework/ctkVersion.cpp

@@ -26,7 +26,6 @@
 #include <QStringListIterator>
 #include <QDebug>
 
-namespace ctk {
 
   const QString Version::SEPARATOR = ".";
   const QRegExp Version::RegExp = QRegExp("[a-zA-Z0-9_\\-]*");
@@ -216,7 +215,6 @@ namespace ctk {
     return 1;
   }
 
-}
 
 QDebug operator<<(QDebug dbg, const ctk::Version& v)
 {

Libs/PluginFramework/ctkVersion.h

@@ -27,7 +27,6 @@
 
 #include "CTKPluginFrameworkExport.h"
 
-namespace ctk {
 
   /**
    * Version identifier for plug-ins and packages.
@@ -232,7 +231,6 @@ namespace ctk {
 
   };
 
-}
 
 CTK_PLUGINFW_EXPORT QDebug operator<<(QDebug dbg, const ctk::Version& v);
 

Libs/PluginFramework/ctkVersionRange.cpp

@@ -23,7 +23,6 @@
 
 #include <stdexcept>
 
-namespace ctk {
 
   const VersionRange& VersionRange::defaultVersionRange()
   {
@@ -172,6 +171,5 @@ namespace ctk {
       }
     }
     return false;
-  }
 
 }

Libs/PluginFramework/ctkVersionRange_p.h

@@ -24,7 +24,6 @@
 
 #include "ctkVersion.h"
 
-namespace ctk {
 
   /**
    * Class representing CTK version ranges.
@@ -119,6 +118,5 @@ namespace ctk {
 
   };
 
-}
 
 #endif // CTKVERSIONRANGE_H