Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

1 files changed, 14 insertions, 13 deletions

diff --git a/logic/NagUtils.cpp b/logic/NagUtils.cpp
index ccabf71f..6f81b3c7 100644
--- a/logic/NagUtils.cpp
+++ b/logic/NagUtils.cpp
@@ -13,25 +13,26 @@
  * limitations under the License.
  */
 
-#include "NagUtils.h"
-#include "gui/CustomMessageBox.h"
+#include "logic/NagUtils.h"
+#include "gui/dialogs/CustomMessageBox.h"
 
 namespace NagUtils
 {
 void checkJVMArgs(QString jvmargs, QWidget *parent)
 {
-	if(jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]")))
+	if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]")))
 	{
-		CustomMessageBox::selectable(parent, parent->tr("JVM arguments warning"),
-									 parent->tr("You tried to manually set a JVM memory option (using "
-										" \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there"
-										" are dedicated boxes for these in the settings (Java"
-										" tab, in the Memory group at the top).\n"
-										"Your manual settings will be overridden by the"
-										" dedicated options.\n"
-										"This message will be displayed until you remove them"
-										" from the JVM arguments."),
-									 QMessageBox::Warning)->exec();
+		CustomMessageBox::selectable(
+			parent, parent->tr("JVM arguments warning"),
+			parent->tr("You tried to manually set a JVM memory option (using "
+					   " \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there"
+					   " are dedicated boxes for these in the settings (Java"
+					   " tab, in the Memory group at the top).\n"
+					   "Your manual settings will be overridden by the"
+					   " dedicated options.\n"
+					   "This message will be displayed until you remove them"
+					   " from the JVM arguments."),
+			QMessageBox::Warning)->exec();
 	}
 }
 }