From 75ffe88773009efa180581b3243d9817800dd796 Mon Sep 17 00:00:00 2001 From: WiseLord Date: Tue, 13 Mar 2018 00:22:31 +0300 Subject: [PATCH] editor: Code restyle --- editor/editor.pro | 26 +++++++++++++------------- editor/main.cpp | 13 ------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/editor/editor.pro b/editor/editor.pro index eb1c08c..ce5e308 100644 --- a/editor/editor.pro +++ b/editor/editor.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -14,24 +14,24 @@ TARGET = matrixclockeditor TEMPLATE = app SOURCES += main.cpp\ - mainwindow.cpp \ - lcdconverter.cpp \ - aboutdialog.cpp \ - fontpixel.cpp + mainwindow.cpp \ + lcdconverter.cpp \ + aboutdialog.cpp \ + fontpixel.cpp HEADERS += mainwindow.h \ - lcdconverter.h \ - aboutdialog.h \ - fontpixel.h \ - timespinbox.h -# defines.h + lcdconverter.h \ + aboutdialog.h \ + fontpixel.h \ + timespinbox.h \ + defines.h FORMS += mainwindow.ui \ - aboutdialog.ui + aboutdialog.ui RESOURCES += \ - res.qrc \ - ts.qrc + res.qrc \ + ts.qrc TRANSLATIONS += \ ts/editor_ru.ts \ diff --git a/editor/main.cpp b/editor/main.cpp index 723aa79..1c2bc9d 100644 --- a/editor/main.cpp +++ b/editor/main.cpp @@ -12,19 +12,6 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName(APPLICATION_NAME); QApplication a(argc, argv); - - QSettings settings(ORGANIZATION_NAME, APPLICATION_NAME); - - QString lang = settings.value(SETTINGS_GENERAL_LANGUAGE, "auto").toString(); - - if (lang.compare("auto") == 0) { - lang = QLocale::system().bcp47Name().remove(QRegExp("-.*")); - } -/* - QTranslator translator; - translator.load(":/ts/editor_" + lang); - a.installTranslator(&translator); -*/ MainWindow w; w.show();