From 528f539fca4c40fb63479a98cf434d0502da9327 Mon Sep 17 00:00:00 2001 From: fourtf Date: Wed, 18 Jan 2017 04:52:47 +0100 Subject: [PATCH] fixed notation pt. 2 --- account.h | 2 +- asyncexec.h | 5 +++-- chatwidgetinput.cpp | 3 ++- chatwidgetinput.h | 4 ++-- colorscheme.cpp | 3 ++- emojis.h | 6 +++--- emotes.h | 5 +++-- lambdaqrunnable.h | 4 ++-- mainwindow.cpp | 3 ++- mainwindow.h | 3 ++- notebook.cpp | 9 +++++---- notebook.h | 5 +++-- notebookbutton.cpp | 7 ++++--- notebookpage.cpp | 11 ++++++----- notebookpage.h | 13 +++++++------ notebookpagedroppreview.cpp | 3 ++- resources.cpp | 3 ++- resources.h | 2 +- scrollbar.cpp | 3 ++- scrollbar.h | 7 ++++--- settingsdialogtab.h | 2 +- word.h | 3 +-- 22 files changed, 60 insertions(+), 46 deletions(-) diff --git a/account.h b/account.h index 025c6c08..b81a0996 100644 --- a/account.h +++ b/account.h @@ -6,7 +6,7 @@ class Account { public: - Account(QString getUsername, QString getOauthToken, QString getOauthClient); + Account(QString username, QString oauthToken, QString oauthClient); static const Account * getAnon() diff --git a/asyncexec.h b/asyncexec.h index c2befaba..dabd53df 100644 --- a/asyncexec.h +++ b/asyncexec.h @@ -1,11 +1,12 @@ #ifndef ASYNCEXEC_H #define ASYNCEXEC_H -#include "QRunnable" -#include "QThreadPool" #include "lambdaqrunnable.h" #include "qcoreapplication.h" +#include +#include + #define async_exec(a) \ QThreadPool::globalInstance()->start(new LambdaQRunnable(a)); diff --git a/chatwidgetinput.cpp b/chatwidgetinput.cpp index f4c5d15b..a2ee5d0b 100644 --- a/chatwidgetinput.cpp +++ b/chatwidgetinput.cpp @@ -1,7 +1,8 @@ #include "chatwidgetinput.h" -#include "QPainter" #include "colorscheme.h" +#include + ChatWidgetInput::ChatWidgetInput() { setFixedHeight(38); diff --git a/chatwidgetinput.h b/chatwidgetinput.h index 4b436109..fcc31bf2 100644 --- a/chatwidgetinput.h +++ b/chatwidgetinput.h @@ -1,8 +1,8 @@ #ifndef CHATWIDGETINPUT_H #define CHATWIDGETINPUT_H -#include "QPaintEvent" -#include "QWidget" +#include +#include class ChatWidgetInput : public QWidget { diff --git a/colorscheme.cpp b/colorscheme.cpp index c727baba..82310831 100644 --- a/colorscheme.cpp +++ b/colorscheme.cpp @@ -1,7 +1,8 @@ #define LOOKUP_COLOR_COUNT 360 #include "colorscheme.h" -#include "QColor" + +#include // hue: theme color (0 - 1) // multiplyer: 1 = white, 0.8 = light, -0.8 dark, -1 black diff --git a/emojis.h b/emojis.h index 7c274d66..67a171cd 100644 --- a/emojis.h +++ b/emojis.h @@ -1,14 +1,14 @@ #ifndef EMOJIS_H #define EMOJIS_H +#include "concurrentmap.h" +#include "lazyloadedimage.h" + #include #include #include #include -#include "concurrentmap.h" -#include "lazyloadedimage.h" - class Emojis { public: diff --git a/emotes.h b/emotes.h index 45ee077c..1194cd3c 100644 --- a/emotes.h +++ b/emotes.h @@ -1,12 +1,13 @@ #ifndef EMOTES_H #define EMOTES_H -#include "QMap" -#include "QMutex" #include "concurrentmap.h" #include "lazyloadedimage.h" #include "twitchemotevalue.h" +#include +#include + class Emotes { public: diff --git a/lambdaqrunnable.h b/lambdaqrunnable.h index d96b1ee0..7d2255d3 100644 --- a/lambdaqrunnable.h +++ b/lambdaqrunnable.h @@ -1,8 +1,8 @@ #ifndef LAMBDAQRUNNABLE_H #define LAMBDAQRUNNABLE_H -#include "QRunnable" -#include "functional" +#include +#include class LambdaQRunnable : public QRunnable { diff --git a/mainwindow.cpp b/mainwindow.cpp index 3888422c..2524f1fa 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,9 +1,10 @@ #include "mainwindow.h" -#include #include "chatwidget.h" #include "colorscheme.h" #include "notebook.h" +#include + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , notebook(this) diff --git a/mainwindow.h b/mainwindow.h index 1730ce00..b49d1372 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,9 +1,10 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include #include "notebook.h" +#include + class MainWindow : public QMainWindow { Q_OBJECT diff --git a/notebook.cpp b/notebook.cpp index 92e44542..0624f0a3 100644 --- a/notebook.cpp +++ b/notebook.cpp @@ -1,8 +1,4 @@ #include "notebook.h" -#include "QFormLayout" -#include "QLayout" -#include "QList" -#include "QWidget" #include "colorscheme.h" #include "dialog.h" #include "notebookbutton.h" @@ -10,6 +6,11 @@ #include "notebooktab.h" #include "settingsdialog.h" +#include +#include +#include +#include + Notebook::Notebook(QWidget *parent) : QWidget(parent) , addButton(this) diff --git a/notebook.h b/notebook.h index a89bcd97..525b8009 100644 --- a/notebook.h +++ b/notebook.h @@ -1,12 +1,13 @@ #ifndef NOTEBOOK_H #define NOTEBOOK_H -#include -#include #include "notebookbutton.h" #include "notebookpage.h" #include "notebooktab.h" +#include +#include + class Notebook : public QWidget { Q_OBJECT diff --git a/notebookbutton.cpp b/notebookbutton.cpp index e72c0e8c..823496a1 100644 --- a/notebookbutton.cpp +++ b/notebookbutton.cpp @@ -1,9 +1,10 @@ #include "notebookbutton.h" -#include "QMouseEvent" -#include "QPainter" -#include "QPainterPath" #include "colorscheme.h" +#include +#include +#include + NotebookButton::NotebookButton(QWidget *parent) : QWidget(parent) { diff --git a/notebookpage.cpp b/notebookpage.cpp index aa0bc88a..6e676227 100644 --- a/notebookpage.cpp +++ b/notebookpage.cpp @@ -1,13 +1,14 @@ #include "notebookpage.h" -#include "QHBoxLayout" -#include "QMimeData" -#include "QPainter" -#include "QVBoxLayout" -#include "QWidget" #include "chatwidget.h" #include "colorscheme.h" #include "notebooktab.h" +#include +#include +#include +#include +#include + bool NotebookPage::isDraggingSplit = false; ChatWidget *NotebookPage::draggingSplit = NULL; std::pair NotebookPage::dropPosition = std::pair(-1, -1); diff --git a/notebookpage.h b/notebookpage.h index 76fef604..68da3c91 100644 --- a/notebookpage.h +++ b/notebookpage.h @@ -1,17 +1,18 @@ #ifndef NOTEBOOKPAGE_H #define NOTEBOOKPAGE_H -#include "QDragEnterEvent" -#include "QHBoxLayout" -#include "QRect" -#include "QVBoxLayout" -#include "QVector" -#include "QWidget" #include "chatwidget.h" #include "notebookpage.h" #include "notebookpagedroppreview.h" #include "notebooktab.h" +#include +#include +#include +#include +#include +#include + class NotebookPage : public QWidget { Q_OBJECT diff --git a/notebookpagedroppreview.cpp b/notebookpagedroppreview.cpp index 898ab572..30bdd1fb 100644 --- a/notebookpagedroppreview.cpp +++ b/notebookpagedroppreview.cpp @@ -1,7 +1,8 @@ #include "notebookpagedroppreview.h" -#include "QPainter" #include "colorscheme.h" +#include + NotebookPageDropPreview::NotebookPageDropPreview(QWidget *parent) : QWidget(parent) , positionAnimation(this, "geometry") diff --git a/resources.cpp b/resources.cpp index 70cd6907..e7991423 100644 --- a/resources.cpp +++ b/resources.cpp @@ -1,5 +1,6 @@ #include "resources.h" -#include "QPixmap" + +#include LazyLoadedImage *Resources::badgeStaff(NULL); LazyLoadedImage *Resources::badgeAdmin(NULL); diff --git a/resources.h b/resources.h index fdfa725f..b861e91f 100644 --- a/resources.h +++ b/resources.h @@ -1,7 +1,7 @@ #ifndef RESOURCES_H #define RESOURCES_H -#include +#include "lazyloadedimage.h" class Resources { diff --git a/scrollbar.cpp b/scrollbar.cpp index 1ef9183d..6285de1b 100644 --- a/scrollbar.cpp +++ b/scrollbar.cpp @@ -1,7 +1,8 @@ #include "scrollbar.h" -#include "QPainter" #include "colorscheme.h" +#include + #define MIN_THUMB_HEIGHT 10 ScrollBar::ScrollBar(QWidget *widget) diff --git a/scrollbar.h b/scrollbar.h index 45e28d75..3a9a8803 100644 --- a/scrollbar.h +++ b/scrollbar.h @@ -1,11 +1,12 @@ #ifndef SCROLLBAR_H #define SCROLLBAR_H -#include -#include "QMutex" -#include "QWidget" #include "scrollbarhighlight.h" +#include +#include +#include + class ScrollBar : public QWidget { Q_OBJECT diff --git a/settingsdialogtab.h b/settingsdialogtab.h index 6778292b..2ee58999 100644 --- a/settingsdialogtab.h +++ b/settingsdialogtab.h @@ -1,8 +1,8 @@ #ifndef SETTINGSNOTEBOOKTAB_H #define SETTINGSNOTEBOOKTAB_H +#include #include -#include "QPaintEvent" class SettingsDialog; diff --git a/word.h b/word.h index 8f108cc2..570aaa86 100644 --- a/word.h +++ b/word.h @@ -5,11 +5,10 @@ #include "lazyloadedimage.h" #include "link.h" +#include #include #include -#include - class Word { public: