aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove Qt guards (#3328)

Browse source 
* remove version guards

* clangify

* [skip ci] README wording

* add cmake requirement to readme

* remove return

* remove min req from README
This commit is contained in:
tooomm 2018-07-18 02:08:42 +02:00 committed by Zach H
parent c12c3c071f
commit cba1ca8d5b
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/filterbuilder.cpp
View file

@ -26,9 +26,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent)
edit = new QLineEdit; edit = new QLineEdit;
edit->setObjectName("edit"); edit->setObjectName("edit");
edit->setPlaceholderText(tr("Type your filter here")); edit->setPlaceholderText(tr("Type your filter here"));
#if QT_VERSION >= 0x050200
edit->setClearButtonEnabled(true); edit->setClearButtonEnabled(true);
#endif
edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); edit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
QGridLayout *layout = new QGridLayout; QGridLayout *layout = new QGridLayout;

9
cockatrice/src/logger.cpp
View file

@ -2,15 +2,12 @@
#include "version_string.h" #include "version_string.h"
#include <QDateTime> #include <QDateTime>
#include <QLocale> #include <QLocale>
#include <QSysInfo>
#include <iostream> #include <iostream>
#define LOGGER_MAX_ENTRIES 128 #define LOGGER_MAX_ENTRIES 128
#define LOGGER_FILENAME "qdebug.txt" #define LOGGER_FILENAME "qdebug.txt"
#if QT_VERSION >= 0x050400
#include <QSysInfo>
#endif
Logger::Logger() : logToFileEnabled(false) Logger::Logger() : logToFileEnabled(false)
{ {
logBuffer.append(getClientVersion()); logBuffer.append(getClientVersion());
@ -104,11 +101,7 @@ QString Logger::getSystemArchitecture()
QString Logger::getClientOperatingSystem() QString Logger::getClientOperatingSystem()
{ {
#if QT_VERSION >= 0x050400
return QSysInfo::prettyProductName(); return QSysInfo::prettyProductName();
#endif
return {};
} }
QString Logger::getSystemLocale() QString Logger::getSystemLocale()

4
cockatrice/src/tab_deck_editor.cpp
View file

@ -345,12 +345,8 @@ void TabDeckEditor::createCentralFrame()
searchEdit = new SearchLineEdit; searchEdit = new SearchLineEdit;
searchEdit->setObjectName("searchEdit"); searchEdit->setObjectName("searchEdit");
searchEdit->setPlaceholderText(tr("Search by card name")); searchEdit->setPlaceholderText(tr("Search by card name"));
#if QT_VERSION >= 0x050200
searchEdit->setClearButtonEnabled(true); searchEdit->setClearButtonEnabled(true);
#endif
#if QT_VERSION >= 0x050300
searchEdit->addAction(QPixmap("theme:icons/search"), QLineEdit::LeadingPosition); searchEdit->addAction(QPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
#endif
searchEdit->installEventFilter(&searchKeySignals); searchEdit->installEventFilter(&searchKeySignals);
setFocusProxy(searchEdit); setFocusProxy(searchEdit);