fixed notation pt. 2

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()

asyncexec.h

@@ -1,11 +1,12 @@
 #ifndef ASYNCEXEC_H
 #define ASYNCEXEC_H
 
-#include "QRunnable"
-#include "QThreadPool"
 #include "lambdaqrunnable.h"
 #include "qcoreapplication.h"
 
+#include <QRunnable>
+#include <QThreadPool>
+
 #define async_exec(a) \
     QThreadPool::globalInstance()->start(new LambdaQRunnable(a));
 

chatwidgetinput.cpp

@@ -1,7 +1,8 @@
 #include "chatwidgetinput.h"
-#include "QPainter"
 #include "colorscheme.h"
 
+#include <QPainter>
+
 ChatWidgetInput::ChatWidgetInput()
 {
     setFixedHeight(38);

chatwidgetinput.h

@@ -1,8 +1,8 @@
 #ifndef CHATWIDGETINPUT_H
 #define CHATWIDGETINPUT_H
 
-#include "QPaintEvent"
-#include "QWidget"
+#include <QPaintEvent>
+#include <QWidget>
 
 class ChatWidgetInput : public QWidget
 {

colorscheme.cpp

@@ -1,7 +1,8 @@
 #define LOOKUP_COLOR_COUNT 360
 
 #include "colorscheme.h"
-#include "QColor"
+
+#include <QColor>
 
 // hue: theme color (0 - 1)
 // multiplyer: 1 = white, 0.8 = light, -0.8 dark, -1 black

emojis.h

@@ -1,14 +1,14 @@
 #ifndef EMOJIS_H
 #define EMOJIS_H
 
+#include "concurrentmap.h"
+#include "lazyloadedimage.h"
+
 #include <QObject>
 #include <QRegularExpression>
 #include <QString>
 #include <unordered_map>
 
-#include "concurrentmap.h"
-#include "lazyloadedimage.h"
-
 class Emojis
 {
 public:

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 <QMap>
+#include <QMutex>
+
 class Emotes
 {
 public:

lambdaqrunnable.h

@@ -1,8 +1,8 @@
 #ifndef LAMBDAQRUNNABLE_H
 #define LAMBDAQRUNNABLE_H
 
-#include "QRunnable"
-#include "functional"
+#include <QRunnable>
+#include <functional>
 
 class LambdaQRunnable : public QRunnable
 {

mainwindow.cpp

@@ -1,9 +1,10 @@
 #include "mainwindow.h"
-#include <QPalette>
 #include "chatwidget.h"
 #include "colorscheme.h"
 #include "notebook.h"
 
+#include <QPalette>
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , notebook(this)

mainwindow.h

@@ -1,9 +1,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
 #include "notebook.h"
 
+#include <QMainWindow>
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT

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 <QFormLayout>
+#include <QLayout>
+#include <QList>
+#include <QWidget>
+
 Notebook::Notebook(QWidget *parent)
     : QWidget(parent)
     , addButton(this)

notebook.h

@@ -1,12 +1,13 @@
 #ifndef NOTEBOOK_H
 #define NOTEBOOK_H
 
-#include <QList>
-#include <QWidget>
 #include "notebookbutton.h"
 #include "notebookpage.h"
 #include "notebooktab.h"
 
+#include <QList>
+#include <QWidget>
+
 class Notebook : public QWidget
 {
     Q_OBJECT

notebookbutton.cpp

@@ -1,9 +1,10 @@
 #include "notebookbutton.h"
-#include "QMouseEvent"
-#include "QPainter"
-#include "QPainterPath"
 #include "colorscheme.h"
 
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPainterPath>
+
 NotebookButton::NotebookButton(QWidget *parent)
     : QWidget(parent)
 {

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 <QHBoxLayout>
+#include <QMimeData>
+#include <QPainter>
+#include <QVBoxLayout>
+#include <QWidget>
+
 bool NotebookPage::isDraggingSplit = false;
 ChatWidget *NotebookPage::draggingSplit = NULL;
 std::pair<int, int> NotebookPage::dropPosition = std::pair<int, int>(-1, -1);

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 <QDragEnterEvent>
+#include <QHBoxLayout>
+#include <QRect>
+#include <QVBoxLayout>
+#include <QVector>
+#include <QWidget>
+
 class NotebookPage : public QWidget
 {
     Q_OBJECT

notebookpagedroppreview.cpp

@@ -1,7 +1,8 @@
 #include "notebookpagedroppreview.h"
-#include "QPainter"
 #include "colorscheme.h"
 
+#include <QPainter>
+
 NotebookPageDropPreview::NotebookPageDropPreview(QWidget *parent)
     : QWidget(parent)
     , positionAnimation(this, "geometry")

resources.cpp

@@ -1,5 +1,6 @@
 #include "resources.h"
-#include "QPixmap"
+
+#include <QPixmap>
 
 LazyLoadedImage *Resources::badgeStaff(NULL);
 LazyLoadedImage *Resources::badgeAdmin(NULL);

resources.h

@@ -1,7 +1,7 @@
 #ifndef RESOURCES_H
 #define RESOURCES_H
 
-#include <lazyloadedimage.h>
+#include "lazyloadedimage.h"
 
 class Resources
 {

scrollbar.cpp

@@ -1,7 +1,8 @@
 #include "scrollbar.h"
-#include "QPainter"
 #include "colorscheme.h"
 
+#include <QPainter>
+
 #define MIN_THUMB_HEIGHT 10
 
 ScrollBar::ScrollBar(QWidget *widget)

scrollbar.h

@@ -1,11 +1,12 @@
 #ifndef SCROLLBAR_H
 #define SCROLLBAR_H
 
-#include <functional>
-#include "QMutex"
-#include "QWidget"
 #include "scrollbarhighlight.h"
 
+#include <QMutex>
+#include <QWidget>
+#include <functional>
+
 class ScrollBar : public QWidget
 {
     Q_OBJECT

settingsdialogtab.h

@@ -1,8 +1,8 @@
 #ifndef SETTINGSNOTEBOOKTAB_H
 #define SETTINGSNOTEBOOKTAB_H
 
+#include <QPaintEvent>
 #include <QWidget>
-#include "QPaintEvent"
 
 class SettingsDialog;
 

word.h

@@ -5,11 +5,10 @@
 #include "lazyloadedimage.h"
 #include "link.h"
 
+#include <stdint.h>
 #include <QRect>
 #include <QString>
 
-#include <stdint.h>
-
 class Word
 {
 public: