1 files changed, 33 insertions, 46 deletions

diff --git a/launcher/minecraft/launch/PrintInstanceInfo.cpp b/launcher/minecraft/launch/PrintInstanceInfo.cpp
index e8fbcb9b..e3a45b03 100644
--- a/launcher/minecraft/launch/PrintInstanceInfo.cpp
+++ b/launcher/minecraft/launch/PrintInstanceInfo.cpp
@@ -16,50 +16,44 @@
 #include <fstream>
 #include <string>
 
-#include "PrintInstanceInfo.h"
 #include <launch/LaunchTask.h>
+#include "PrintInstanceInfo.h"
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 namespace {
 #if defined(Q_OS_LINUX)
-void probeProcCpuinfo(QStringList &log)
+void probeProcCpuinfo(QStringList& log)
 {
     std::ifstream cpuin("/proc/cpuinfo");
-    for (std::string line; std::getline(cpuin, line);)
-    {
-        if (strncmp(line.c_str(), "model name", 10) == 0)
-        {
+    for (std::string line; std::getline(cpuin, line);) {
+        if (strncmp(line.c_str(), "model name", 10) == 0) {
             log << QString::fromStdString(line.substr(13, std::string::npos));
             break;
         }
     }
 }
 
-void runLspci(QStringList &log)
+void runLspci(QStringList& log)
 {
     // FIXME: fixed size buffers...
     char buff[512];
     int gpuline = -1;
     int cline = 0;
-    FILE * lspci = popen("lspci -k", "r");
+    FILE* lspci = popen("lspci -k", "r");
 
     if (!lspci)
         return;
 
-    while (fgets(buff, 512, lspci) != NULL)
-    {
+    while (fgets(buff, 512, lspci) != NULL) {
         std::string str(buff);
         if (str.length() < 9)
             continue;
-        if (str.substr(8, 3) == "VGA")
-        {
+        if (str.substr(8, 3) == "VGA") {
             gpuline = cline;
             log << QString::fromStdString(str.substr(35, std::string::npos));
         }
-        if (gpuline > -1 && gpuline != cline)
-        {
-            if (cline - gpuline < 3)
-            {
+        if (gpuline > -1 && gpuline != cline) {
+            if (cline - gpuline < 3) {
                 log << QString::fromStdString(str.substr(1, std::string::npos));
             }
         }
@@ -68,54 +62,47 @@ void runLspci(QStringList &log)
     pclose(lspci);
 }
 #elif defined(Q_OS_FREEBSD)
-void runSysctlHwModel(QStringList &log)
+void runSysctlHwModel(QStringList& log)
 {
     char buff[512];
-    FILE *hwmodel = popen("sysctl hw.model", "r");
-    while (fgets(buff, 512, hwmodel) != NULL)
-    {
-	log << QString::fromUtf8(buff);
-	break;
+    FILE* hwmodel = popen("sysctl hw.model", "r");
+    while (fgets(buff, 512, hwmodel) != NULL) {
+        log << QString::fromUtf8(buff);
+        break;
     }
     pclose(hwmodel);
 }
 
-void runPciconf(QStringList &log)
+void runPciconf(QStringList& log)
 {
     char buff[512];
     std::string strcard;
-    FILE *pciconf = popen("pciconf -lv -a vgapci0", "r");
-    while (fgets(buff, 512, pciconf) != NULL)
-    {
-	if (strncmp(buff, "    vendor", 10) == 0)
-	{
-	    std::string str(buff);
-	    strcard.append(str.substr(str.find_first_of("'") + 1, str.find_last_not_of("'") - (str.find_first_of("'") + 2)));
-	    strcard.append(" ");
-	}
-	else if (strncmp(buff, "    device", 10) == 0)
-	{
-	    std::string str2(buff);
-	    strcard.append(str2.substr(str2.find_first_of("'") + 1, str2.find_last_not_of("'") - (str2.find_first_of("'") + 2)));
-	}
-	log << QString::fromStdString(strcard);
-	break;
+    FILE* pciconf = popen("pciconf -lv -a vgapci0", "r");
+    while (fgets(buff, 512, pciconf) != NULL) {
+        if (strncmp(buff, "    vendor", 10) == 0) {
+            std::string str(buff);
+            strcard.append(str.substr(str.find_first_of("'") + 1, str.find_last_not_of("'") - (str.find_first_of("'") + 2)));
+            strcard.append(" ");
+        } else if (strncmp(buff, "    device", 10) == 0) {
+            std::string str2(buff);
+            strcard.append(str2.substr(str2.find_first_of("'") + 1, str2.find_last_not_of("'") - (str2.find_first_of("'") + 2)));
+        }
+        log << QString::fromStdString(strcard);
+        break;
     }
     pclose(pciconf);
 }
 #endif
-void runGlxinfo(QStringList & log)
+void runGlxinfo(QStringList& log)
 {
     // FIXME: fixed size buffers...
     char buff[512];
-    FILE *glxinfo = popen("glxinfo", "r");
+    FILE* glxinfo = popen("glxinfo", "r");
     if (!glxinfo)
         return;
 
-    while (fgets(buff, 512, glxinfo) != NULL)
-    {
-        if (strncmp(buff, "OpenGL version string:", 22) == 0)
-        {
+    while (fgets(buff, 512, glxinfo) != NULL) {
+        if (strncmp(buff, "OpenGL version string:", 22) == 0) {
             log << QString::fromUtf8(buff);
             break;
         }
@@ -123,7 +110,7 @@ void runGlxinfo(QStringList & log)
     pclose(glxinfo);
 }
 
-}
+}  // namespace
 #endif
 
 void PrintInstanceInfo::executeTask()