merged fxrestructure

main.cpp

@@ -18,16 +18,14 @@
 
 ***/
 
-#include "mainwindow.h"
 #include <QApplication>
 
-#include "debug.h"
-
-#include "oliveglobal.h"
-#include "ui/mediaiconservice.h"
+#include "global/debug.h"
+#include "global/config.h"
+#include "global/global.h"
 #include "panels/timeline.h"
-
-#include "io/config.h"
+#include "ui/mediaiconservice.h"
+#include "ui/mainwindow.h"
 
 extern "C" {
 #include <libavformat/avformat.h>
@@ -118,7 +116,7 @@ int main(int argc, char *argv[]) {
   a.setWindowIcon(QIcon(":/icons/olive64.png"));
 
   // start media icon service (uses QPixmaps which require a QGuiApplication to have been created)
-  olive::media_icon_service = std::unique_ptr<MediaIconService>(new MediaIconService());
+  olive::media_icon_service = std::make_unique<MediaIconService>();
 
   // set app name data
   QCoreApplication::setOrganizationName("olivevideoeditor.org");