hid QCoreApplication from API

Josh Klontz
1 parent 2a792b66
Showing 4 changed files with 9 additions and 9 deletions
sdk/openbr_plugin.cpp
sdk/openbr_plugin.h
sdk/plugins/gallery.cpp
sdk/plugins/youtube.cpp
@@ -797,16 +797,17 @@ bool br::Context::checkSDKPath(const QString &amp;sdkPath)
 void br::Context::initialize(int argc, char *argv[], const QString &sdkPath)
 {
     if (Globals == NULL) {
-        Globals = new Context();
-        Globals->init(File());
-    }
-
+        // QApplication should be initialzed before anything else
 #ifndef BR_EMBEDDED
-    Globals->coreApplication = QSharedPointer<QCoreApplication>(new QApplication(argc, argv));
+        static QApplication application(argc, argv);
 #else
-    Globals->coreApplication = QSharedPointer<QCoreApplication>(new QCoreApplication(argc, argv));
+        static QCoreApplication coreApplication(argc, argv);
 #endif
  
+        Globals = new Context();
+        Globals->init(File());
+    }
+
     initializeQt(sdkPath);
  
 #ifdef BR_DISTRIBUTED
@@ -17,7 +17,6 @@
 #ifndef __OPENBR_PLUGIN_H
 #define __OPENBR_PLUGIN_H
  
-#include <QCoreApplication>
 #include <QDataStream>
 #include <QDebug>
 #include <QDir>
@@ -466,7 +465,6 @@ private:
 class BR_EXPORT Context : public Object
 {
     Q_OBJECT
-    QSharedPointer<QCoreApplication> coreApplication;
     QFile logFile;
  
 public:
@@ -677,7 +677,7 @@ class googleGallery : public Gallery
             QNetworkReply *reply = networkAccessManager.get(request);
  
             while (!reply->isFinished())
-                QCoreApplication::processEvents();
+                QThread::yieldCurrentThread();
  
             QString data(reply->readAll());
             delete reply;
+#include <QCoreApplication>
 #include <QProcess>
 #include <openbr_plugin.h>