Update C++ source for Qt5.

swri-robotics · Jun 10, 2016 · 5b5e61c · 5b5e61c
1 parent 3255ab8
commit 5b5e61c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/include/swri_console/console_master.h b/include/swri_console/console_master.h
@@ -51,7 +51,7 @@ class ConsoleMaster : public QObject
   Q_OBJECT;
 
  public:  
-  ConsoleMaster();
+  ConsoleMaster(int argc, char** argv);
   virtual ~ConsoleMaster();
 
  public Q_SLOTS:

diff --git a/include/swri_console/console_window.h b/include/swri_console/console_window.h
@@ -31,7 +31,7 @@
 #ifndef SWRI_CONSOLE_CONSOLE_WINDOW_H_
 #define SWRI_CONSOLE_CONSOLE_WINDOW_H_
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 #include <QColor>
 #include <QPushButton>
 #include <QSettings>

diff --git a/include/swri_console/ros_thread.h b/include/swri_console/ros_thread.h
@@ -43,7 +43,7 @@ namespace swri_console
   {
     Q_OBJECT
   public:
-    RosThread();
+    RosThread(int argc, char** argv);
     /*
      * Shuts down ROS and causes the thread to exit.
      */

diff --git a/src/console_master.cpp b/src/console_master.cpp
@@ -37,8 +37,8 @@
 
 namespace swri_console
 {
-ConsoleMaster::ConsoleMaster()
-  :
+ConsoleMaster::ConsoleMaster(int argc, char** argv):
+  ros_thread_(argc, argv),
   connected_(false),
   window_font_(QFont("Ubuntu Mono", 9))
 {

diff --git a/src/main.cpp b/src/main.cpp
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
   QCoreApplication::setOrganizationDomain("swri.org");
   QCoreApplication::setApplicationName("SwRI Console");
 
-  swri_console::ConsoleMaster master;
+  swri_console::ConsoleMaster master(argc, argv);
   master.createNewWindow();
   app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
   int result = app.exec();

diff --git a/src/ros_thread.cpp b/src/ros_thread.cpp
@@ -33,12 +33,11 @@
 
 using namespace swri_console;
 
-RosThread::RosThread() :
+RosThread::RosThread(int argc, char** argv) :
   is_connected_(false),
   is_running_(true)
 {
-  int argc = QCoreApplication::argc();
-  ros::init(argc, QCoreApplication::argv(), "swri_console",
+  ros::init(argc, argv, "swri_console",
             ros::init_options::AnonymousName |
             ros::init_options::NoRosout);
 }