Fixed some Windows warnings and compiler errors.

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerProgressWidget.h

@@ -22,13 +22,13 @@
 #ifndef CTKCMDLINEMODULEEXPLORERPROGRESSWIDGET_H
 #define CTKCMDLINEMODULEEXPLORERPROGRESSWIDGET_H
 
+#include "ctkCmdLineModuleResult.h"
 
 #include <QWidget>
 #include <QFutureWatcher>
 #include <QTimer>
 
 class ctkCmdLineModuleFuture;
-class ctkCmdLineModuleResult;
 
 namespace Ui {
 class ctkCmdLineModuleExplorerProgressWidget;

Applications/ctkCommandLineModuleExplorer/ctkCmdLineModuleExplorerTreeWidget.h

@@ -27,7 +27,7 @@
 #include <QTreeWidget>
 
 class ctkCmdLineModuleFrontend;
-class ctkCmdLineModuleFrontendFactory;
+struct ctkCmdLineModuleFrontendFactory;
 
 class ctkCmdLineModuleExplorerTreeWidget : public QTreeWidget
 {

Libs/CommandLineModules/Core/ctkCmdLineModuleCache_p.h

@@ -24,7 +24,7 @@
 
 #include <QScopedPointer>
 
-class ctkCmdLineModuleCachePrivate;
+struct ctkCmdLineModuleCachePrivate;
 
 class QUrl;
 

Libs/CommandLineModules/Core/ctkCmdLineModuleDescription.h

@@ -84,7 +84,7 @@ public:
 private:
 
   friend class ctkCmdLineModuleXmlParser;
-  friend class ctkCmdLineModuleReferencePrivate;
+  friend struct ctkCmdLineModuleReferencePrivate;
 
   ctkCmdLineModuleDescription();
 

Libs/CommandLineModules/Core/ctkCmdLineModuleFrontend.h

@@ -32,7 +32,7 @@ class QUrl;
 class ctkCmdLineModuleFuture;
 class ctkCmdLineModuleReference;
 class ctkCmdLineModuleParameter;
-class ctkCmdLineModuleFrontendPrivate;
+struct ctkCmdLineModuleFrontendPrivate;
 
 /**
  * \ingroup CommandLineModulesCore

Libs/CommandLineModules/Core/ctkCmdLineModuleManager.h

@@ -33,7 +33,7 @@ struct ctkCmdLineModuleFrontendFactory;
 class ctkCmdLineModuleFrontend;
 class ctkCmdLineModuleFuture;
 
-class ctkCmdLineModuleManagerPrivate;
+struct ctkCmdLineModuleManagerPrivate;
 
 /**
  * \ingroup CommandLineModulesCore

Libs/CommandLineModules/Core/ctkCmdLineModuleParameter.h

@@ -28,7 +28,7 @@
 class QTextStream;
 class QStringList;
 
-class ctkCmdLineModuleParameterPrivate;
+struct ctkCmdLineModuleParameterPrivate;
 
 /** 
  *  \ingroup CommandLineModulesCore
@@ -125,7 +125,7 @@ public:
 
 private:
 
-  friend class ctkCmdLineModuleParameterParser;
+  friend struct ctkCmdLineModuleParameterParser;
   friend class ctkCmdLineModuleXmlParser;
 
   ctkCmdLineModuleParameter();

Libs/CommandLineModules/Core/ctkCmdLineModuleParameterGroup.h

@@ -29,7 +29,7 @@
 class QTextStream;
 
 class ctkCmdLineModuleParameter;
-class ctkCmdLineModuleParameterGroupPrivate;
+struct ctkCmdLineModuleParameterGroupPrivate;
 
 /** 
  *  \ingroup CommandLineModulesCore

Libs/CommandLineModules/Core/ctkCmdLineModuleReference.h

@@ -29,7 +29,7 @@
 
 struct ctkCmdLineModuleBackend;
 class ctkCmdLineModuleDescription;
-class ctkCmdLineModuleReferencePrivate;
+struct ctkCmdLineModuleReferencePrivate;
 
 /**
  * \ingroup CommandLineModulesCore

Libs/CommandLineModules/Core/ctkCmdLineModuleXmlParser_p.h

@@ -27,7 +27,7 @@
 
 class ctkCmdLineModuleDescription;
 class ctkCmdLineModuleParameter;
-class ctkCmdLineModuleParameterParser;
+struct ctkCmdLineModuleParameterParser;
 
 class QIODevice;
 

Libs/CommandLineModules/Frontend/QtGui/ctkCmdLineModuleFrontendQtGui.cpp

@@ -132,7 +132,7 @@ QObject* ctkCmdLineModuleFrontendQtGui::guiHandle() const
   QString appPath = QCoreApplication::applicationDirPath();
   if (appPath.endsWith(CMAKE_INTDIR))
   {
-    uiLoader.addPluginPath(appPath + "/../designer");
+    uiLoader->addPluginPath(appPath + "/../designer");
   }
 #endif
   d->Widget = uiLoader->load(&uiForm);

Libs/CommandLineModules/Frontend/QtWebKit/ctkCmdLineModuleFrontendQtWebKit.cpp

@@ -68,8 +68,9 @@ QObject* ctkCmdLineModuleFrontendQtWebKit::guiHandle() const
 }
 
 //----------------------------------------------------------------------------
-QVariant ctkCmdLineModuleFrontendQtWebKit::value(const QString &parameter) const
+QVariant ctkCmdLineModuleFrontendQtWebKit::value(const QString &parameter, int role) const
 {
+  Q_UNUSED(role)
   QWebElement webElement = this->WebView->page()->currentFrame()->findFirstElement("input[name=" + parameter + "]");
   if (webElement.isNull()) return QVariant();
   // Work around bug https://bugs.webkit.org/show_bug.cgi?id=32865 for input elements

Libs/CommandLineModules/Frontend/QtWebKit/ctkCmdLineModuleFrontendQtWebKit_p.h

@@ -37,7 +37,7 @@ public:
 
   virtual QObject* guiHandle() const;
 
-  virtual QVariant value(const QString& parameter) const;
+  virtual QVariant value(const QString& parameter, int role = LocalResourceRole) const;
   virtual void setValue(const QString& parameter, const QVariant& value);
 
   //virtual QList<QString> parameterNames() const;

Libs/CommandLineModules/Testing/Cpp/ctkCmdLineModuleQtCustomizationTest.cpp

@@ -242,7 +242,7 @@ void ctkCmdLineModuleQtCustomizationTester::testCustomization()
 
   // run the module (function pointer) and check that is gets the tmp path
   ctkCmdLineModuleFuture future = moduleManager.run(fpFrontend);
-  sleep(1);
+  QTest::qSleep(500);
   QApplication::processEvents();
   future.waitForFinished();