New upstream version 2.9

[minitube] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index b462138da9382eaa86cb38336696e3d9af672b9a..3a0873f03a94e6eb7c2695a961db47e9b8e56cd2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,10 +18,9 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 
 $END_LICENSE */
 
-#include <QtGui>
-#if QT_VERSION >= 0x050000
 #include <QtWidgets>
-#endif
+#include <QtNetwork>
+
 #include <qtsingleapplication.h>
 #include "constants.h"
 #include "mainwindow.h"
@@ -62,10 +61,15 @@ void showWindow(QtSingleApplication &app, const QString &dataDir) {
 }
 
 int main(int argc, char **argv) {
+#ifndef Q_NO_DEBUG_OUTPUT
+    qSetMessagePattern("[%{function}] %{message}");
+#endif
+
+    // Seed random number generator
+    qsrand(QDateTime::currentDateTime().toTime_t());
 
 #ifdef Q_OS_MAC
     mac::MacMain();
-    // QFont::insertSubstitution(".Helvetica Neue DeskInterface", "Helvetica Neue");
 #endif
 
     QtSingleApplication app(argc, argv);
@@ -96,7 +100,7 @@ int main(int argc, char **argv) {
 
     // qt translations
     QTranslator qtTranslator;
-    qtTranslator.load("qt_" + QLocale::system().name(),
+    qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(),
                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     app.installTranslator(&qtTranslator);
 
@@ -107,26 +111,19 @@ int main(int argc, char **argv) {
     QString dataDir = "";
 #endif
 #ifdef APP_MAC
-    QString localeDir = qApp->applicationDirPath() + "/../Resources/locale";
+    QString localeDir = qApp->applicationDirPath() + QLatin1String("/../Resources/locale");
 #else
-    QString localeDir = qApp->applicationDirPath() + "/locale";
+    QString localeDir = qApp->applicationDirPath() + QLatin1String("/locale");
 #endif
     if (!QDir(localeDir).exists()) {
-        localeDir = dataDir + "/locale";
+        localeDir = dataDir + QLatin1String("/locale");
     }
     // qDebug() << "Using locale dir" << localeDir << locale;
     QTranslator translator;
     translator.load(QLocale::system(), QString(), QString(), localeDir);
     app.installTranslator(&translator);
-#if QT_VERSION < 0x050000
-    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
-#endif
-
-    // Seed random number generator
-    qsrand(QDateTime::currentDateTime().toTime_t());
 
-    // all string literals are UTF-8
-    // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
 
     showWindow(app, dataDir);