diff --git a/TranslationClass.cpp b/TranslationClass.cpp index 05e3b8c..fd1de31 100644 --- a/TranslationClass.cpp +++ b/TranslationClass.cpp @@ -63,7 +63,7 @@ void TranslationClass::loadTranslation(QApplication *app) { app->installTranslator(&inQtTranslator); } -#if QT_VERSION <= 0x060000 +#if QT_VERSION >= 0x060000 QLocale::setDefault(QLocale(currentLanguage)); #else QLocale::setDefault(currentLanguage); @@ -151,7 +151,7 @@ void TranslationClass::loadTranslation(QApplication *app) { app->installTranslator(&inQtTranslator); } -#if QT_VERSION <= 0x060000 +#if QT_VERSION >= 0x060000 QLocale::setDefault(QLocale(currentLanguage)); #else QLocale::setDefault(currentLanguage); @@ -184,7 +184,7 @@ void TranslationClass::loadTranslation(QApplication *app) { app->installTranslator(&inQtTranslator); } -#if QT_VERSION <= 0x060000 +#if QT_VERSION >= 0x060000 QLocale::setDefault(QLocale(currentLanguage)); #else QLocale::setDefault(currentLanguage); @@ -207,7 +207,7 @@ void TranslationClass::loadTranslation(QApplication *app) { app->installTranslator(&inQtTranslator); } -#if QT_VERSION <= 0x060000 +#if QT_VERSION >= 0x060000 QLocale::setDefault(QLocale(currentLanguage)); #else QLocale::setDefault(currentLanguage); @@ -235,7 +235,7 @@ void TranslationClass::loadTranslation(QApplication *app) { app->installTranslator(&inQtTranslator); } -#if QT_VERSION <= 0x060000 +#if QT_VERSION >= 0x060000 QLocale::setDefault(QLocale(currentLanguage)); #else QLocale::setDefault(currentLanguage); @@ -256,7 +256,7 @@ void TranslationClass::loadTranslation(QApplication *app) { app->installTranslator(&inQtTranslator); } -#if QT_VERSION <= 0x060000 +#if QT_VERSION >= 0x060000 QLocale::setDefault(QLocale(currentLanguage)); #else QLocale::setDefault(currentLanguage); diff --git a/uimod/UiModWidget.cpp b/uimod/UiModWidget.cpp index ff852fc..990ce7f 100644 --- a/uimod/UiModWidget.cpp +++ b/uimod/UiModWidget.cpp @@ -46,26 +46,21 @@ void UiModWidget::setImageDropEnabled(bool enabled) void UiModWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent) { - if (filesDropEnabled && dragEnterEvent->mimeData()->hasUrls()) - { - QStringList pathList; + if (filesDropEnabled && dragEnterEvent->mimeData()->hasUrls()) { + QVector pathList; const QList urlList = dragEnterEvent->mimeData()->urls(); - for (const QUrl ¤tUrl : urlList) - { - if (currentUrl.isLocalFile()) - { + for (const QUrl ¤tUrl : urlList) { + if (currentUrl.isLocalFile()) { pathList.append(currentUrl.toLocalFile()); } } - if (!pathList.isEmpty()) - { + if (!pathList.isEmpty()) { dragEnterEvent->acceptProposedAction(); } } - else if (imageDropEnabled && dragEnterEvent->mimeData()->hasImage()) - { + else if (imageDropEnabled && dragEnterEvent->mimeData()->hasImage()) { dragEnterEvent->acceptProposedAction(); } } @@ -80,11 +75,7 @@ void UiModWidget::paintEvent(QPaintEvent *paintEvent) { Q_UNUSED(paintEvent) QStyleOption opt; -#if QT_VERSION <= 0x060000 opt.initFrom(this); -#else - opt.init(this); -#endif QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); }