noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused QDesktopWidget includes

Browse source 
Also made the overlooked deprecation fixes (which is now a necessary fix because deprecation warning became a compilation error now), Extends #2647
This commit is contained in:
zneix 2021-07-31 18:50:35 +02:00
parent 0ea7db094e
commit c99f12e8fe
No known key found for this signature in database
GPG key ID: 911916E0523B22F6
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/singletons/WindowManager.cpp
View file

@ -1,7 +1,6 @@
#include "singletons/WindowManager.hpp" #include "singletons/WindowManager.hpp"
#include <QDebug> #include <QDebug>
#include <QDesktopWidget>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>

5
src/widgets/BaseWindow.cpp
View file

@ -13,7 +13,6 @@
#include <QApplication> #include <QApplication>
#include <QDebug> #include <QDebug>
#include <QDesktopWidget>
#include <QFont> #include <QFont>
#include <QIcon> #include <QIcon>
#include <functional> #include <functional>
@ -349,14 +348,14 @@ bool BaseWindow::event(QEvent *event)
void BaseWindow::wheelEvent(QWheelEvent *event) void BaseWindow::wheelEvent(QWheelEvent *event)
{ {
if (event->orientation() != Qt::Vertical) if (!event->angleDelta().y())
{ {
return; return;
} }
if (event->modifiers() & Qt::ControlModifier) if (event->modifiers() & Qt::ControlModifier)
{ {
if (event->delta() > 0) if (event->angleDelta().y() > 0)
{ {
getSettings()->setClampedUiScale( getSettings()->setClampedUiScale(
getSettings()->getClampedUiScale() + 0.1); getSettings()->getClampedUiScale() + 0.1);

1
src/widgets/TooltipWidget.cpp
View file

@ -4,7 +4,6 @@
#include "singletons/Fonts.hpp" #include "singletons/Fonts.hpp"
#include <QDebug> #include <QDebug>
#include <QDesktopWidget>
#include <QStyle> #include <QStyle>
#include <QVBoxLayout> #include <QVBoxLayout>