ソースを参照

Fix template parameter when refering to QFutureWatcher in ctkCmdLineModuleFutureWatcher

MattClarkson 12 年 前
コミット
097f525ed2
共有2 個のファイルを変更した5 個の追加5 個の削除を含む
  1. 4 4
      Libs/CommandLineModules/Core/ctkCmdLineModuleFutureWatcher.cpp
  2. 1 1
      Libs/CommandLineModules/Core/ctkCmdLineModuleFutureWatcher.h

+ 4 - 4
Libs/CommandLineModules/Core/ctkCmdLineModuleFutureWatcher.cpp

@@ -94,7 +94,7 @@ struct ctkCmdLineModuleFutureWatcherPrivate : public ctkCmdLineModuleFutureCallO
 
 //----------------------------------------------------------------------------
 ctkCmdLineModuleFutureWatcher::ctkCmdLineModuleFutureWatcher(QObject* parent)
-  : QFutureWatcher(parent)
+  : QFutureWatcher<ctkCmdLineModuleResult>(parent)
   , d(new ctkCmdLineModuleFutureWatcherPrivate(this))
 {
 }
@@ -115,7 +115,7 @@ void ctkCmdLineModuleFutureWatcher::setFuture(const ctkCmdLineModuleFuture& futu
 
   d->disconnectOutputInterface(true);
   d->Future = future;
-  QFutureWatcher::setFuture(future);
+  QFutureWatcher<ctkCmdLineModuleResult>::setFuture(future);
   d->connectOutputInterface();
 }
 
@@ -152,7 +152,7 @@ bool ctkCmdLineModuleFutureWatcher::event(QEvent *event)
   }
   else if (event->type() == QEvent::FutureCallOut)
   {
-    bool result = QFutureWatcher::event(event);
+    bool result = QFutureWatcher<ctkCmdLineModuleResult>::event(event);
 
     if (futureInterface().isRunning())
     {
@@ -172,7 +172,7 @@ bool ctkCmdLineModuleFutureWatcher::event(QEvent *event)
     }
     return result;
   }
-  return QFutureWatcher::event(event);
+  return QFutureWatcher<ctkCmdLineModuleResult>::event(event);
 }
 
 //----------------------------------------------------------------------------

+ 1 - 1
Libs/CommandLineModules/Core/ctkCmdLineModuleFutureWatcher.h

@@ -37,7 +37,7 @@ struct ctkCmdLineModuleFutureWatcherPrivate;
  *        ctkCmdLineModuleFuture using signals and slots.
  *
  * This class enhances the standard QFutureWatcher class by adding the two signals
- * outputDataReady() and errorDataReady(). These signals are fired whenver the watched
+ * outputDataReady() and errorDataReady(). These signals are fired whenever the watched
  * future reports new output data (usually text written to the standard output channel) or
  * new error data (usually text written to the standard error channel).
  *