CTH16289

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 4726b53a340fd9b28bafaf3aa6fcb1b75d7709e8..ca99cc1d642dcd1aa3debef3c148b3f620b1f610 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -125,7 +125,6 @@
 #include <qapplication.h>
 #include <qmap.h>
 #include <qstatusbar.h>
-#include <qthread.h>
 #include <qobjectlist.h>
 #include <qcombobox.h>
 #include <qinputdialog.h>
@@ -916,82 +915,52 @@ void LightApp_Application::updateCommandsStatus()
 }
 
 /*!
-  \class RunBrowser
-  Runs system command in separate thread
+\class LightApp_RunBrowser
+Runs system command in separate thread
 */
-class RunBrowser: public QThread {
-public:
-
-  RunBrowser( LightApp_Application* app, QString theApp, QString theParams, QString theHelpFile, QString theContext=NULL):
-    myApp(theApp), myParams(theParams), 
+LightApp_RunBrowser::LightApp_RunBrowser( LightApp_Application* app,
+                                          QString theApp,
+                                          QString theParams,
+                                          QString theHelpFile,
+                                          QString theContext ):
+  myApp(theApp), myParams(theParams), 
 #ifdef WIN32
-      myHelpFile("file://" + theHelpFile + theContext), 
+  myHelpFile("file://" + theHelpFile + theContext), 
 #else
-      myHelpFile("file:" + theHelpFile + theContext),
+  myHelpFile("file:" + theHelpFile + theContext),
 #endif
-      myStatus(0),
-      myLApp( app )
-{
-};
-
- // virtual void run()
- // {
- //   QString aCommand;
-
- //   if ( !myApp.isEmpty())
- //     {
-       //aCommand.sprintf("%s %s %s",myApp.latin1(),myParams.latin1(),myHelpFile.latin1());
-
-       //QProcess* proc = new QProcess();
- // proc->addArgument( aCommand );
-       ////myStatus = system(aCommand);
-
-       ////if(myStatus != 0)
-       //if(!proc->start())
-       //  {
-       //    QCustomEvent* ce2000 = new QCustomEvent( 2000 );
-       //    QString* msg = new QString( QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").arg(myApp).arg(myHelpFile) );
-       //    ce2000->setData( msg );
-       //    postEvent( myLApp, ce2000 );
-       //  }
- //     }
- // }
-
-    virtual void run()
-  {
-    QString aCommand;
+  myStatus(0),
+  myLApp( app )
+{
+}
 
-    if ( !myApp.isEmpty())
-      {
-       aCommand.sprintf("%s %s %s",myApp.latin1(),myParams.latin1(),myHelpFile.latin1());
-       myStatus = system(aCommand);
-       if(myStatus != 0)
-         {
-           QCustomEvent* ce2000 = new QCustomEvent (2000);
-           postEvent (qApp, ce2000);
-         }
-      }
+void LightApp_RunBrowser::run()
+{
+  QString aCommand;
 
-    if( myStatus != 0 || myApp.isEmpty())
-      {
-       myParams = "";
-       aCommand.sprintf("%s %s %s", QString(DEFAULT_BROWSER).latin1(),myParams.latin1(), myHelpFile.latin1());
-       myStatus = system(aCommand);
-       if(myStatus != 0)
-         {
-           QCustomEvent* ce2001 = new QCustomEvent (2001);
-           postEvent (qApp, ce2001);
-         }
-      }
+  if ( !myApp.isEmpty())
+  {
+    aCommand.sprintf("%s %s %s",myApp.latin1(),myParams.latin1(),myHelpFile.latin1());
+    myStatus = system(aCommand);
+    if(myStatus != 0)
+    {
+      QCustomEvent* ce2000 = new QCustomEvent (2000);
+      postEvent (qApp, ce2000);
+    }
   }
 
-private:
-  QString myApp;
-  QString myParams;
-  QString myHelpFile;
-  int myStatus;
-  LightApp_Application* myLApp;
-};
+  if( myStatus != 0 || myApp.isEmpty())
+  {
+    myParams = "";
+    aCommand.sprintf("%s %s %s", QString(DEFAULT_BROWSER).latin1(),myParams.latin1(), myHelpFile.latin1());
+    myStatus = system(aCommand);
+    if(myStatus != 0)
+    {
+      QCustomEvent* ce2001 = new QCustomEvent (2001);
+      postEvent (qApp, ce2001);
+    }
+  }
+}
 
 /*!
   SLOT: Displays help contents for choosen module
@@ -1031,7 +1000,7 @@ void LightApp_Application::onHelpContentsModule()
   QString aParams = resMgr->stringValue("ExternalBrowser", "parameters");
 
   if (!anApp.isEmpty()) {
-    RunBrowser* rs = new RunBrowser( this, anApp, aParams, helpFile );
+    LightApp_RunBrowser* rs = new LightApp_RunBrowser( this, anApp, aParams, helpFile );
     rs->start();
   }
   else {
@@ -1067,7 +1036,7 @@ void LightApp_Application::onHelpContextModule(const QString& theComponentName,
   QString aParams = resMgr->stringValue("ExternalBrowser", "parameters");
 
   if (!anApp.isEmpty()) {
-    RunBrowser* rs = new RunBrowser( this, anApp, aParams, helpFile );
+    LightApp_RunBrowser* rs = new LightApp_RunBrowser( this, anApp, aParams, helpFile );
     rs->start();
   }
   else {

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 8f81e404f2dbd011aa066561c65e6d2e7ada749e..f70724b03683aa36909f041fa715f1b77f6d646b 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -49,6 +49,8 @@ class QWidget;
 class QStringList;
 class QPixmap;
 
+#include <qthread.h>
+
 #ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
@@ -252,6 +254,25 @@ protected:
   static int                          lastStudyId;
 };
 
+/*!
+  \class LightApp_RunBrowser
+  Runs system command in separate thread
+*/
+class LIGHTAPP_EXPORT LightApp_RunBrowser: public QThread {
+public:
+  LightApp_RunBrowser( LightApp_Application*, QString, QString, QString, QString = NULL );
+
+public:
+  virtual void run();
+
+private:
+  QString myApp;
+  QString myParams;
+  QString myHelpFile;
+  int myStatus;
+  LightApp_Application* myLApp;
+};
+
 #ifdef WIN32
 #pragma warning( default:4251 )
 #endif