From 20862139b6b4e2f0f0e97994bf9f460f680c80e6 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Thu, 23 May 2019 15:35:23 -1000
Subject: [PATCH] Alphabetical includes and UICommon usages

---
 src/Editor/ResourceBrowser/CResourceBrowser.cpp | 2 +-
 src/Editor/WorldEditor/CWorldEditor.cpp         | 2 +-
 src/Editor/main.cpp                             | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Editor/ResourceBrowser/CResourceBrowser.cpp b/src/Editor/ResourceBrowser/CResourceBrowser.cpp
index 4e252efc..852e7f94 100644
--- a/src/Editor/ResourceBrowser/CResourceBrowser.cpp
+++ b/src/Editor/ResourceBrowser/CResourceBrowser.cpp
@@ -14,12 +14,12 @@
 #include <Core/GameProject/AssetNameGeneration.h>
 #include <Core/GameProject/CAssetNameMap.h>
 
+#include <QButtonGroup>
 #include <QCheckBox>
 #include <QFileDialog>
 #include <QInputDialog>
 #include <QMenu>
 #include <QMessageBox>
-#include <QButtonGroup>
 #include <QtConcurrent/QtConcurrentRun>
 
 CResourceBrowser::CResourceBrowser(QWidget *pParent)
diff --git a/src/Editor/WorldEditor/CWorldEditor.cpp b/src/Editor/WorldEditor/CWorldEditor.cpp
index 344604a7..c456d1ac 100644
--- a/src/Editor/WorldEditor/CWorldEditor.cpp
+++ b/src/Editor/WorldEditor/CWorldEditor.cpp
@@ -27,13 +27,13 @@
 #include <Core/Resource/Script/NGameList.h>
 #include <Core/Scene/CSceneIterator.h>
 
+#include <QButtonGroup>
 #include <QClipboard>
 #include <QComboBox>
 #include <QFontMetrics>
 #include <QMessageBox>
 #include <QSettings>
 #include <QToolButton>
-#include <QButtonGroup>
 
 CWorldEditor::CWorldEditor(QWidget *parent)
     : INodeEditor(parent)
diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp
index 480f273b..53782b54 100644
--- a/src/Editor/main.cpp
+++ b/src/Editor/main.cpp
@@ -8,7 +8,6 @@
 
 #include <QApplication>
 #include <QIcon>
-#include <QMessageBox>
 #include <QStyleFactory>
 #include <QtGlobal>
 
@@ -48,7 +47,7 @@ public:
 
         // Init log
         bool Initialized = NLog::InitLog("primeworldeditor.log");
-        if (!Initialized) QMessageBox::warning(0, "Error", "Couldn't open log file. Logging will not work for this session.");
+        if (!Initialized) UICommon::ErrorMsg(0, "Couldn't open log file. Logging will not work for this session.");
         qInstallMessageHandler(QtLogRedirect);
 
         // Create editor resource store
@@ -56,9 +55,8 @@ public:
 
         if (!gpEditorStore->DatabasePathExists())
         {
-            QMessageBox::critical(0, "Error", "Unable to locate PWE resources directory; "
-                                              "PWE's executable must remain as deployed.",
-                                  QMessageBox::Close);
+            UICommon::ErrorMsg(0, "Unable to locate PWE resources directory; "
+                                  "PWE's executable must remain as deployed.");
             return 1;
         }