Updated the QAssistant launching code for Qt 4.5 (At least on windows; needs testing...

[mussa.git] / qui / MussaWindow.hpp

diff --git a/qui/MussaWindow.hpp b/qui/MussaWindow.hpp
index b538cc0faf353a9f51e7f4d426f784cd7ce18f99..bba3106191748925ffb57bc83c77b2ee7878ff3c 100644 (file)
--- a/qui/MussaWindow.hpp
+++ b/qui/MussaWindow.hpp
@@ -11,6 +11,7 @@
 #include <QProgressDialog>
 #include <QSpinBox>
 #include <QToolBar>
+#include <QProcess>
 
 #include "qui/MussaAlignedWindow.hpp"
 #include "qui/motif_editor/MotifEditor.hpp"
@@ -26,6 +27,9 @@ class QLabel;
 class QStringList;
 class Mussa;
 class QAssistantClient;
+class MussaWindow;
+
+typedef boost::shared_ptr<MussaWindow> MussaWindowRef;
 
 class MussaWindow : public QMainWindow
 {
@@ -34,6 +38,7 @@ class MussaWindow : public QMainWindow
 public: 
   MussaWindow(MussaRef analysis, QWidget *parent=0);
 
+public:
   //! reset any attached window
   void clear();
 
@@ -80,7 +85,7 @@ public slots:
   //! set the soft threshold used by the Nway_Path algorithm
   void setSoftThreshold(int thres);
   //! update progress bar
-  void updateProgress(const std::string& description, int cur, int max);
+  void updateProgress(const QString& description, int cur, int max);
 
   //! open a new mussa window so one can compare analyses
   void newMussaWindow();
@@ -138,7 +143,8 @@ protected:
   QAction *whatsThisAction;
   QAction *viewMussaAlignmentAction;
 
-  QAssistantClient *manualAssistant;
+  //QAssistantClient *manualAssistant;
+  QProcess *assistantProcess;
 
   //! initialze the actions
   void setupActions();
@@ -146,6 +152,8 @@ protected:
   void closeEvent(QCloseEvent *event);
   //! initialize this windows menu object
   void setupMainMenu();
+  //! initialize all of our widgets
+  void setupWidgets();
   //! initialize assistant client
   void setupAssistant();
   //! stub function to fill in QActions
@@ -159,4 +167,5 @@ protected slots:
   //! update annotations?
   void updateAnnotations();
 };
+
 #endif