Renamed files and classes from *ModuleInstance* to *Module*.

Applications/ctkCommandLineModuleExplorer/ctkCLModuleExplorerMainWindow.cpp

@@ -24,8 +24,8 @@
 
 #include <ctkCmdLineModuleXmlValidator.h>
 #include <ctkCmdLineModuleManager.h>
-#include <ctkCmdLineModuleInstance.h>
-#include <ctkCmdLineModuleInstanceFactoryQtGui.h>
+#include <ctkCmdLineModule.h>
+#include <ctkCmdLineModuleFactoryQtGui.h>
 #include <ctkException.h>
 
 #include <QFuture>
@@ -34,7 +34,7 @@
 ctkCLModuleExplorerMainWindow::ctkCLModuleExplorerMainWindow(QWidget *parent) :
   QMainWindow(parent),
   ui(new Ui::ctkCLModuleExplorerMainWindow),
-  moduleManager(new ctkCmdLineModuleInstanceFactoryQtGui())
+  moduleManager(new ctkCmdLineModuleFactoryQtGui())
 {
   ui->setupUi(this);
 }
@@ -46,14 +46,14 @@ ctkCLModuleExplorerMainWindow::~ctkCLModuleExplorerMainWindow()
 
 void ctkCLModuleExplorerMainWindow::addModuleTab(const ctkCmdLineModuleReference& moduleRef)
 {
-  ctkCmdLineModuleInstance* moduleInstance = moduleManager.createModuleInstance(moduleRef);
-  if (!moduleInstance) return;
+  ctkCmdLineModule* module = moduleManager.createModule(moduleRef);
+  if (!module) return;
 
-  QObject* guiHandle = moduleInstance->guiHandle();
+  QObject* guiHandle = module->guiHandle();
 
   QWidget* widget = qobject_cast<QWidget*>(guiHandle);
   int tabIndex = ui->mainTabWidget->addTab(widget, widget->objectName());
-  mapTabToModuleRef[tabIndex] = moduleInstance;
+  mapTabToModuleRef[tabIndex] = module;
 }
 
 void ctkCLModuleExplorerMainWindow::addModule(const QString &location)
@@ -67,17 +67,17 @@ void ctkCLModuleExplorerMainWindow::addModule(const QString &location)
 
 void ctkCLModuleExplorerMainWindow::on_actionRun_triggered()
 {
-  ctkCmdLineModuleInstance* moduleInstance = mapTabToModuleRef[ui->mainTabWidget->currentIndex()];
-  if (!moduleInstance)
+  ctkCmdLineModule* module = mapTabToModuleRef[ui->mainTabWidget->currentIndex()];
+  if (!module)
   {
     qWarning() << "Invalid module instance";
     return;
   }
 
-  QStringList cmdLineArgs = moduleInstance->commandLineArguments();
+  QStringList cmdLineArgs = module->commandLineArguments();
   qDebug() << cmdLineArgs;
 
-  QFuture<QString> future = moduleInstance->run();
+  QFuture<QString> future = module->run();
   try
   {
     future.waitForFinished();

Applications/ctkCommandLineModuleExplorer/ctkCLModuleExplorerMainWindow.h

@@ -63,7 +63,7 @@ private:
 
   ctkCmdLineModuleManager moduleManager;
 
-  QHash<int, ctkCmdLineModuleInstance*> mapTabToModuleRef;
+  QHash<int, ctkCmdLineModule*> mapTabToModuleRef;
 
   //ctkCmdLineModuleProcessFutureWatcher futureWatcher;
 };

Libs/CommandLineModules/Core/CMakeLists.txt

@@ -19,8 +19,8 @@ set(KIT_SRCS
   ctkCmdLineModuleDescription_p.h
   ctkCmdLineModuleDirectoryWatcher.cpp
   ctkCmdLineModuleDirectoryWatcher_p.h
-  ctkCmdLineModuleInstance.cpp
-  ctkCmdLineModuleInstanceFactory.cpp
+  ctkCmdLineModule.cpp
+  ctkCmdLineModuleFactory.cpp
   ctkCmdLineModuleManager.cpp
   ctkCmdLineModuleParameter.cpp
   ctkCmdLineModuleParameterGroup.cpp
@@ -45,7 +45,7 @@ set(KIT_MOC_SRCS
   ctkCmdLineModuleDirectoryWatcher.h
   ctkCmdLineModuleDirectoryWatcher_p.h
   ctkCmdLineModuleManager.h
-  ctkCmdLineModuleInstance.h
+  ctkCmdLineModule.h
   ctkCmdLineModuleProcessTask.h
 )
 

Libs/CommandLineModules/Core/Testing/Cpp/ctkCmdLineModuleFutureTest.cpp

@@ -20,8 +20,8 @@
 =============================================================================*/
 
 #include <ctkCmdLineModuleManager.h>
-#include <ctkCmdLineModuleInstanceFactory.h>
-#include <ctkCmdLineModuleInstance.h>
+#include <ctkCmdLineModuleFactory.h>
+#include <ctkCmdLineModule.h>
 #include <ctkCmdLineModuleReference.h>
 #include <ctkCmdLineModuleDescription.h>
 #include <ctkCmdLineModuleParameter.h>
@@ -40,15 +40,15 @@
 #include <cstdlib>
 
 
-class ctkCmdLineModuleTestInstanceFactory : public ctkCmdLineModuleInstanceFactory
+class ctkCmdLineModuleTestInstanceFactory : public ctkCmdLineModuleFactory
 {
 public:
 
-  virtual ctkCmdLineModuleInstance* create(const ctkCmdLineModuleReference& moduleRef)
+  virtual ctkCmdLineModule* create(const ctkCmdLineModuleReference& moduleRef)
   {
-    struct ModuleTestInstance : public ctkCmdLineModuleInstance
+    struct ModuleTestInstance : public ctkCmdLineModule
     {
-      ModuleTestInstance(const ctkCmdLineModuleReference& moduleRef) : ctkCmdLineModuleInstance(moduleRef) {}
+      ModuleTestInstance(const ctkCmdLineModuleReference& moduleRef) : ctkCmdLineModule(moduleRef) {}
 
       virtual QObject* guiHandle() const { return NULL; }
 
@@ -82,7 +82,7 @@ int ctkCmdLineModuleFutureTest(int argc, char* argv[])
     qCritical() << "Module at" << moduleFilename << "could not be registered";
   }
 
-  ctkCmdLineModuleInstance* moduleInstance = manager.createModuleInstance(moduleRef);
+  ctkCmdLineModule* module = manager.createModule(moduleRef);
 
   QList<QString> expectedSignals;
   expectedSignals.push_back("module.started");
@@ -94,7 +94,7 @@ int ctkCmdLineModuleFutureTest(int argc, char* argv[])
   QObject::connect(&watcher, SIGNAL(started()), &signalTester, SLOT(moduleStarted()));
   QObject::connect(&watcher, SIGNAL(finished()), &signalTester, SLOT(moduleFinished()));
 
-  QFuture<QString> future = moduleInstance->run();
+  QFuture<QString> future = module->run();
   watcher.setFuture(future);
 
   future.waitForFinished();
@@ -102,7 +102,7 @@ int ctkCmdLineModuleFutureTest(int argc, char* argv[])
   // process pending events
   QCoreApplication::processEvents();
 
-  delete moduleInstance;
+  delete module;
 
   if (!signalTester.checkSignals(expectedSignals))
   {

Libs/CommandLineModules/Core/ctkCmdLineModuleInstance.cpp

@@ -19,7 +19,7 @@
   
 =============================================================================*/
 
-#include "ctkCmdLineModuleInstance.h"
+#include "ctkCmdLineModule.h"
 #include "ctkCmdLineModuleDescription.h"
 #include "ctkCmdLineModuleParameter.h"
 #include "ctkCmdLineModuleParameterGroup.h"
@@ -33,9 +33,9 @@
 #include <QFuture>
 #include <QVariant>
 
-struct ctkCmdLineModuleInstancePrivate
+struct ctkCmdLineModulePrivate
 {
-  ctkCmdLineModuleInstancePrivate(ctkCmdLineModuleInstance* qq,
+  ctkCmdLineModulePrivate(ctkCmdLineModule* qq,
                                   const ctkCmdLineModuleReference& moduleRef)
     : ModuleReference(moduleRef), q(qq)
   {
@@ -53,21 +53,21 @@ struct ctkCmdLineModuleInstancePrivate
 
 private:
 
-  ctkCmdLineModuleInstance* q;
+  ctkCmdLineModule* q;
 
 };
 
 
-ctkCmdLineModuleInstance::ctkCmdLineModuleInstance(const ctkCmdLineModuleReference& moduleRef)
-  : d(new ctkCmdLineModuleInstancePrivate(this, moduleRef))
+ctkCmdLineModule::ctkCmdLineModule(const ctkCmdLineModuleReference& moduleRef)
+  : d(new ctkCmdLineModulePrivate(this, moduleRef))
 {
 }
 
-ctkCmdLineModuleInstance::~ctkCmdLineModuleInstance()
+ctkCmdLineModule::~ctkCmdLineModule()
 {
 }
 
-QList<QString> ctkCmdLineModuleInstance::parameterNames() const
+QList<QString> ctkCmdLineModule::parameterNames() const
 {
   if (!d->ParameterNames.isEmpty()) return d->ParameterNames;
 
@@ -82,17 +82,17 @@ QList<QString> ctkCmdLineModuleInstance::parameterNames() const
   return d->ParameterNames;
 }
 
-ctkCmdLineModuleReference ctkCmdLineModuleInstance::moduleReference() const
+ctkCmdLineModuleReference ctkCmdLineModule::moduleReference() const
 {
   return d->ModuleReference;
 }
 
-QString ctkCmdLineModuleInstance::location() const
+QString ctkCmdLineModule::location() const
 {
   return d->ModuleReference.location();
 }
 
-QStringList ctkCmdLineModuleInstance::commandLineArguments() const
+QStringList ctkCmdLineModule::commandLineArguments() const
 {
   QStringList cmdLineArgs;
   QHash<int, QString> indexedArgs;
@@ -147,7 +147,7 @@ QStringList ctkCmdLineModuleInstance::commandLineArguments() const
   return cmdLineArgs;
 }
 
-QFuture<QString> ctkCmdLineModuleInstance::run() const
+QFuture<QString> ctkCmdLineModule::run() const
 {
   QStringList args = commandLineArguments();
 
@@ -159,7 +159,7 @@ QFuture<QString> ctkCmdLineModuleInstance::run() const
 }
 
 
-QHash<QString, QVariant> ctkCmdLineModuleInstance::values() const
+QHash<QString, QVariant> ctkCmdLineModule::values() const
 {
   QHash<QString,QVariant> result;
   foreach(QString parameterName, parameterNames())
@@ -169,7 +169,7 @@ QHash<QString, QVariant> ctkCmdLineModuleInstance::values() const
   return result;
 }
 
-void ctkCmdLineModuleInstance::setValues(const QHash<QString, QVariant> &values)
+void ctkCmdLineModule::setValues(const QHash<QString, QVariant> &values)
 {
   QHashIterator<QString,QVariant> iter(values);
   while(iter.hasNext())

Libs/CommandLineModules/Core/ctkCmdLineModuleInstance.h

@@ -19,8 +19,8 @@
   
 =============================================================================*/
 
-#ifndef CTKCMDLINEMODULEINSTANCE_H
-#define CTKCMDLINEMODULEINSTANCE_H
+#ifndef CTKCMDLINEMODULE_H
+#define CTKCMDLINEMODULE_H
 
 #include "ctkCommandLineModulesCoreExport.h"
 
@@ -30,18 +30,18 @@ template<class K, class V> class QHash;
 template<class T> class QFuture;
 
 class ctkCmdLineModuleReference;
-class ctkCmdLineModuleInstancePrivate;
+class ctkCmdLineModulePrivate;
 
 /**
  * \ingroup CommandLineModulesCore
  */
-class CTK_CMDLINEMODULECORE_EXPORT ctkCmdLineModuleInstance : public QObject
+class CTK_CMDLINEMODULECORE_EXPORT ctkCmdLineModule : public QObject
 {
   Q_OBJECT
 
 public:
 
-  ~ctkCmdLineModuleInstance();
+  ~ctkCmdLineModule();
 
   virtual QObject* guiHandle() const = 0;
 
@@ -65,14 +65,14 @@ public:
 
 protected:
 
-  ctkCmdLineModuleInstance(const ctkCmdLineModuleReference& moduleRef);
+  ctkCmdLineModule(const ctkCmdLineModuleReference& moduleRef);
 
 private:
 
-  friend class ctkCmdLineModuleInstancePrivate;
+  friend class ctkCmdLineModulePrivate;
 
-  QScopedPointer<ctkCmdLineModuleInstancePrivate> d;
+  QScopedPointer<ctkCmdLineModulePrivate> d;
 
 };
 
-#endif // CTKCMDLINEMODULEINSTANCE_H
+#endif // CTKCMDLINEMODULE_H

Libs/CommandLineModules/Core/ctkCmdLineModuleInstanceFactory.cpp

@@ -19,8 +19,8 @@
   
 =============================================================================*/
 
-#include "ctkCmdLineModuleInstanceFactory.h"
+#include "ctkCmdLineModuleFactory.h"
 
-ctkCmdLineModuleInstanceFactory::~ctkCmdLineModuleInstanceFactory()
+ctkCmdLineModuleFactory::~ctkCmdLineModuleFactory()
 {
 }

Libs/CommandLineModules/Core/ctkCmdLineModuleInstanceFactory.h

@@ -19,22 +19,22 @@
   
 =============================================================================*/
 
-#ifndef CTKCMDLINEMODULEINSTANCEFACTORY_H
-#define CTKCMDLINEMODULEINSTANCEFACTORY_H
+#ifndef CTKCMDLINEMODULEFACTORY_H
+#define CTKCMDLINEMODULEFACTORY_H
 
 #include "ctkCommandLineModulesCoreExport.h"
 
-class ctkCmdLineModuleInstance;
+class ctkCmdLineModule;
 class ctkCmdLineModuleReference;
 
 /**
  * \ingroup CommandLineModulesCore
  */
-struct CTK_CMDLINEMODULECORE_EXPORT ctkCmdLineModuleInstanceFactory
+struct CTK_CMDLINEMODULECORE_EXPORT ctkCmdLineModuleFactory
 {
-  virtual ~ctkCmdLineModuleInstanceFactory();
+  virtual ~ctkCmdLineModuleFactory();
 
-  virtual ctkCmdLineModuleInstance* create(const ctkCmdLineModuleReference& moduleInstance) = 0;
+  virtual ctkCmdLineModule* create(const ctkCmdLineModuleReference& module) = 0;
 };
 
-#endif // CTKCMDLINEMODULEINSTANCEFACTORY_H
+#endif // CTKCMDLINEMODULEFACTORY_H

Libs/CommandLineModules/Core/ctkCmdLineModuleManager.cpp

@@ -24,7 +24,7 @@
 #include "ctkCmdLineModuleXmlValidator.h"
 #include "ctkCmdLineModuleReference.h"
 #include "ctkCmdLineModuleReference_p.h"
-#include "ctkCmdLineModuleInstanceFactory.h"
+#include "ctkCmdLineModuleFactory.h"
 
 #include <ctkException.h>
 
@@ -40,13 +40,13 @@ struct ctkCmdLineModuleManagerPrivate
     : Verbose(false)
   {}
 
-  ctkCmdLineModuleInstanceFactory* InstanceFactory;
+  ctkCmdLineModuleFactory* InstanceFactory;
 
   QHash<QString, ctkCmdLineModuleReference> Cache;
   bool Verbose;
 };
 
-ctkCmdLineModuleManager::ctkCmdLineModuleManager(ctkCmdLineModuleInstanceFactory *instanceFactory,
+ctkCmdLineModuleManager::ctkCmdLineModuleManager(ctkCmdLineModuleFactory *instanceFactory,
                                                  ValidationMode validationMode)
   : d(new ctkCmdLineModuleManagerPrivate)
 {
@@ -127,14 +127,14 @@ QList<ctkCmdLineModuleReference> ctkCmdLineModuleManager::moduleReferences() con
   return d->Cache.values();
 }
 
-ctkCmdLineModuleInstance*
-ctkCmdLineModuleManager::createModuleInstance(const ctkCmdLineModuleReference& moduleRef)
+ctkCmdLineModule*
+ctkCmdLineModuleManager::createModule(const ctkCmdLineModuleReference& moduleRef)
 {
   return d->InstanceFactory->create(moduleRef);
 }
 
-QList<ctkCmdLineModuleInstance*>
-ctkCmdLineModuleManager::moduleInstances(const ctkCmdLineModuleReference& moduleRef) const
+QList<ctkCmdLineModule*>
+ctkCmdLineModuleManager::modules(const ctkCmdLineModuleReference& moduleRef) const
 {
   throw ctkException("not implemented yet");
 }

Libs/CommandLineModules/Core/ctkCmdLineModuleManager.h

@@ -28,9 +28,9 @@
 #include <QString>
 #include "ctkCmdLineModuleReference.h"
 
-struct ctkCmdLineModuleInstanceFactory;
+struct ctkCmdLineModuleFactory;
 
-class ctkCmdLineModuleInstance;
+class ctkCmdLineModule;
 class ctkCmdLineModuleManagerPrivate;
 
 /**
@@ -54,7 +54,7 @@ public:
     WEAK_VALIDATION
   };
 
-  ctkCmdLineModuleManager(ctkCmdLineModuleInstanceFactory* descriptionFactory,
+  ctkCmdLineModuleManager(ctkCmdLineModuleFactory* descriptionFactory,
                           ValidationMode = STRICT_VALIDATION);
 
   ~ctkCmdLineModuleManager();
@@ -68,9 +68,9 @@ public:
   ctkCmdLineModuleReference moduleReference(const QString& location) const;
   QList<ctkCmdLineModuleReference> moduleReferences() const;
 
-  ctkCmdLineModuleInstance* createModuleInstance(const ctkCmdLineModuleReference& moduleRef);
+  ctkCmdLineModule* createModule(const ctkCmdLineModuleReference& moduleRef);
 
-  QList<ctkCmdLineModuleInstance*> moduleInstances(const ctkCmdLineModuleReference& moduleRef) const;
+  QList<ctkCmdLineModule*> modules(const ctkCmdLineModuleReference& moduleRef) const;
 
 Q_SIGNALS:
 

Libs/CommandLineModules/QtGui/CMakeLists.txt

@@ -14,9 +14,9 @@ set(KIT_export_directive "CTK_CMDLINEMODULEQTGUI_EXPORT")
 
 # Source files
 set(KIT_SRCS
-  ctkCmdLineModuleInstanceFactoryQtGui.cpp
-  ctkCmdLineModuleInstanceQtGui_p.h
-  ctkCmdLineModuleInstanceQtGui.cpp
+  ctkCmdLineModuleFactoryQtGui.cpp
+  ctkCmdLineModuleQtGui_p.h
+  ctkCmdLineModuleQtGui.cpp
   ctkCmdLineModuleMenuFactoryQtGui.cpp
   ctkCmdLineModuleObjectTreeWalker_p.h
   ctkCmdLineModuleObjectTreeWalker.cpp

Libs/CommandLineModules/QtGui/ctkCmdLineModuleInstanceFactoryQtGui.cpp

@@ -19,11 +19,11 @@
 
 =============================================================================*/
 
-#include "ctkCmdLineModuleInstanceFactoryQtGui.h"
-#include "ctkCmdLineModuleInstanceQtGui_p.h"
+#include "ctkCmdLineModuleFactoryQtGui.h"
+#include "ctkCmdLineModuleQtGui_p.h"
 
-ctkCmdLineModuleInstance*
-ctkCmdLineModuleInstanceFactoryQtGui::create(const ctkCmdLineModuleReference& moduleRef)
+ctkCmdLineModule*
+ctkCmdLineModuleFactoryQtGui::create(const ctkCmdLineModuleReference& moduleRef)
 {
-  return new ctkCmdLineModuleInstanceQtGui(moduleRef);
+  return new ctkCmdLineModuleQtGui(moduleRef);
 }

Libs/CommandLineModules/QtGui/ctkCmdLineModuleInstanceFactoryQtGui.h

@@ -19,20 +19,20 @@
   
 =============================================================================*/
 
-#ifndef CTKCMDLINEMODULEINSTANCEFACTORYQTGUI_H
-#define CTKCMDLINEMODULEINSTANCEFACTORYQTGUI_H
+#ifndef CTKCMDLINEMODULEFACTORYQTGUI_H
+#define CTKCMDLINEMODULEFACTORYQTGUI_H
 
-#include "ctkCmdLineModuleInstanceFactory.h"
+#include "ctkCmdLineModuleFactory.h"
 
 #include "ctkCommandLineModulesQtGuiExport.h"
 
-class CTK_CMDLINEMODULEQTGUI_EXPORT ctkCmdLineModuleInstanceFactoryQtGui
-    : public ctkCmdLineModuleInstanceFactory
+class CTK_CMDLINEMODULEQTGUI_EXPORT ctkCmdLineModuleFactoryQtGui
+    : public ctkCmdLineModuleFactory
 {
 public:
 
-  ctkCmdLineModuleInstance* create(const ctkCmdLineModuleReference& moduleRef);
+  ctkCmdLineModule* create(const ctkCmdLineModuleReference& moduleRef);
 
 };
 
-#endif // CTKCMDLINEMODULEINSTANCEFACTORYQTGUI_H
+#endif // CTKCMDLINEMODULEFACTORYQTGUI_H

Libs/CommandLineModules/QtGui/ctkCmdLineModuleMenuFactoryQtGui.h

@@ -46,4 +46,4 @@ public:
   QMenu* create(const QList<ctkCmdLineModuleReference>& list);
 };
 
-#endif // CTKCMDLINEMODULEINSTANCEFACTORYQTGUI_H
+#endif // CTKCMDLINEMODULEFACTORYQTGUI_H

Libs/CommandLineModules/QtGui/ctkCmdLineModuleInstanceQtGui.cpp

@@ -19,7 +19,7 @@
   
 =============================================================================*/
 
-#include "ctkCmdLineModuleInstanceQtGui_p.h"
+#include "ctkCmdLineModuleQtGui_p.h"
 #include "ctkCmdLineModuleReference.h"
 #include "ctkCmdLineModuleXslTransform.h"
 #include "ctkCmdLineModuleObjectTreeWalker_p.h"
@@ -31,13 +31,13 @@
 
 #include <QDebug>
 
-ctkCmdLineModuleInstanceQtGui::ctkCmdLineModuleInstanceQtGui(const ctkCmdLineModuleReference& moduleRef)
-  : ctkCmdLineModuleInstance(moduleRef),
+ctkCmdLineModuleQtGui::ctkCmdLineModuleQtGui(const ctkCmdLineModuleReference& moduleRef)
+  : ctkCmdLineModule(moduleRef),
     WidgetTree(NULL)
 {
 }
 
-QObject* ctkCmdLineModuleInstanceQtGui::guiHandle() const
+QObject* ctkCmdLineModuleQtGui::guiHandle() const
 {
   if (WidgetTree) return WidgetTree;
 
@@ -59,7 +59,7 @@ QObject* ctkCmdLineModuleInstanceQtGui::guiHandle() const
   return WidgetTree;
 }
 
-QVariant ctkCmdLineModuleInstanceQtGui::value(const QString &parameter) const
+QVariant ctkCmdLineModuleQtGui::value(const QString &parameter) const
 {
   if (!WidgetTree) return QVariant();
 
@@ -74,7 +74,7 @@ QVariant ctkCmdLineModuleInstanceQtGui::value(const QString &parameter) const
   return QVariant();
 }
 
-void ctkCmdLineModuleInstanceQtGui::setValue(const QString &parameter, const QVariant &value)
+void ctkCmdLineModuleQtGui::setValue(const QString &parameter, const QVariant &value)
 {
   if (!WidgetTree) return;
 
@@ -89,7 +89,7 @@ void ctkCmdLineModuleInstanceQtGui::setValue(const QString &parameter, const QVa
   }
 }
 
-QList<QString> ctkCmdLineModuleInstanceQtGui::parameterNames() const
+QList<QString> ctkCmdLineModuleQtGui::parameterNames() const
 {
   if (!ParameterNames.empty()) return ParameterNames;
 
@@ -97,7 +97,7 @@ QList<QString> ctkCmdLineModuleInstanceQtGui::parameterNames() const
   // if it has already created (otherwise fall back to the superclass
   // implementation.
   // This avoids creating a ctkCmdLineModuleDescription instance.
-  if (WidgetTree == 0) return ctkCmdLineModuleInstance::parameterNames();
+  if (WidgetTree == 0) return ctkCmdLineModule::parameterNames();
 
   ctkCmdLineModuleObjectTreeWalker walker(WidgetTree);
   while(walker.readNextParameter())

Libs/CommandLineModules/QtGui/ctkCmdLineModuleInstanceQtGui_p.h

@@ -19,21 +19,21 @@
   
 =============================================================================*/
 
-#ifndef CTKCMDLINEMODULEINSTANCEQTGUI_H
-#define CTKCMDLINEMODULEINSTANCEQTGUI_H
+#ifndef CTKCMDLINEMODULEQTGUI_H
+#define CTKCMDLINEMODULEQTGUI_H
 
-#include <ctkCmdLineModuleInstance.h>
+#include <ctkCmdLineModule.h>
 
 class ctkCmdLineModuleReference;
 
-class ctkCmdLineModuleInstanceQtGui : public ctkCmdLineModuleInstance
+class ctkCmdLineModuleQtGui : public ctkCmdLineModule
 {
 
 public:
 
-  ctkCmdLineModuleInstanceQtGui(const ctkCmdLineModuleReference& moduleRef);
+  ctkCmdLineModuleQtGui(const ctkCmdLineModuleReference& moduleRef);
 
-  // ctkCmdLineModuleInstance overrides
+  // ctkCmdLineModule overrides
 
   virtual QObject* guiHandle() const;
 
@@ -50,4 +50,4 @@ private:
   mutable QList<QString> ParameterNames;
 };
 
-#endif // CTKCMDLINEMODULEINSTANCEQTGUI_H
+#endif // CTKCMDLINEMODULEQTGUI_H