Merge 7a42c92 into d4d59c3

opencor · Jul 20, 2018 · 1377aab · 1377aab
2 parents d4d59c3 + 7a42c92
commit 1377aab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/plugins/miscellaneous/Core/src/centralwidget.cpp b/src/plugins/miscellaneous/Core/src/centralwidget.cpp
@@ -1869,7 +1869,7 @@ void CentralWidget::updateGui()
     //       don't end up with several identical connections (something that
     //       might happen if we were to switch views and back)...
 
-    ViewWidget *newViewWidget = dynamic_cast<ViewWidget *>(newView);
+    ViewWidget *newViewWidget = qobject_cast<ViewWidget *>(newView);
 
     if (newViewWidget) {
         connect(newViewWidget, &ViewWidget::updateFileTabIcon,

diff --git a/src/plugins/miscellaneous/Core/src/coreguiutils.cpp b/src/plugins/miscellaneous/Core/src/coreguiutils.cpp
@@ -70,7 +70,7 @@ CentralWidget * centralWidget()
     if (firstTime) {
         foreach (QObject *object, mainWindow()->children()) {
             if (!strcmp(object->metaObject()->className(), "OpenCOR::Core::CentralWidget")) {
-                res = dynamic_cast<CentralWidget *>(object);
+                res = qobject_cast<CentralWidget *>(object);
 
                 break;
             }

diff --git a/src/plugins/miscellaneous/Core/src/filemanager.cpp b/src/plugins/miscellaneous/Core/src/filemanager.cpp
@@ -55,11 +55,8 @@ FileManager::FileManager() :
             this, &FileManager::checkFiles);
 
     // Keep track of when OpenCOR gets/loses the focus
-    // Note: the focusWindowChanged() signal comes from QGuiApplication, so we
-    //       need to check whether we are running the console version of OpenCOR
-    //       or its GUI version...
 
-    if (dynamic_cast<QGuiApplication *>(QCoreApplication::instance())) {
+    if (qobject_cast<QGuiApplication *>(QCoreApplication::instance())) {
         connect(qApp, &QApplication::focusWindowChanged,
                 this, &FileManager::focusWindowChanged);
     }