From cba1ca8d5bb059af0d128723c434de84afbc7f89 Mon Sep 17 00:00:00 2001 From: tooomm Date: Wed, 18 Jul 2018 02:08:42 +0200 Subject: [PATCH] remove Qt guards (#3328) * remove version guards * clangify * [skip ci] README wording * add cmake requirement to readme * remove return * remove min req from README --- cockatrice/src/filterbuilder.cpp | 2 -- cockatrice/src/logger.cpp | 9 +-------- cockatrice/src/tab_deck_editor.cpp | 4 ---- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/cockatrice/src/filterbuilder.cpp b/cockatrice/src/filterbuilder.cpp index 150cc63e..b3275b90 100644 --- a/cockatrice/src/filterbuilder.cpp +++ b/cockatrice/src/filterbuilder.cpp @@ -26,9 +26,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent) edit = new QLineEdit; edit->setObjectName("edit"); edit->setPlaceholderText(tr("Type your filter here")); -#if QT_VERSION >= 0x050200 edit->setClearButtonEnabled(true); -#endif edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); QGridLayout *layout = new QGridLayout; diff --git a/cockatrice/src/logger.cpp b/cockatrice/src/logger.cpp index 35168bd9..910bb522 100644 --- a/cockatrice/src/logger.cpp +++ b/cockatrice/src/logger.cpp @@ -2,15 +2,12 @@ #include "version_string.h" #include #include +#include #include #define LOGGER_MAX_ENTRIES 128 #define LOGGER_FILENAME "qdebug.txt" -#if QT_VERSION >= 0x050400 -#include -#endif - Logger::Logger() : logToFileEnabled(false) { logBuffer.append(getClientVersion()); @@ -104,11 +101,7 @@ QString Logger::getSystemArchitecture() QString Logger::getClientOperatingSystem() { -#if QT_VERSION >= 0x050400 return QSysInfo::prettyProductName(); -#endif - - return {}; } QString Logger::getSystemLocale() diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index bf199d85..226110e2 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -345,12 +345,8 @@ void TabDeckEditor::createCentralFrame() searchEdit = new SearchLineEdit; searchEdit->setObjectName("searchEdit"); searchEdit->setPlaceholderText(tr("Search by card name")); -#if QT_VERSION >= 0x050200 searchEdit->setClearButtonEnabled(true); -#endif -#if QT_VERSION >= 0x050300 searchEdit->addAction(QPixmap("theme:icons/search"), QLineEdit::LeadingPosition); -#endif searchEdit->installEventFilter(&searchKeySignals); setFocusProxy(searchEdit);