rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linting

Browse Source
This commit is contained in:
Max Sandholm 2017-10-30 15:14:08 +02:00
parent ee893c5adf
commit 8fa01e2cd6
13 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/RoomInfoListItem.h
View File

@ -38,15 +38,11 @@ struct DescInfo
class RoomInfoListItem : public QWidget class RoomInfoListItem : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QColor highlightedBackgroundColor Q_PROPERTY(QColor highlightedBackgroundColor READ highlightedBackgroundColor WRITE
READ highlightedBackgroundColor setHighlightedBackgroundColor)
WRITE setHighlightedBackgroundColor) Q_PROPERTY(
Q_PROPERTY(QColor hoverBackgroundColor QColor hoverBackgroundColor READ hoverBackgroundColor WRITE setHoverBackgroundColor)
READ hoverBackgroundColor Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
WRITE setHoverBackgroundColor)
Q_PROPERTY(QColor backgroundColor
READ backgroundColor
WRITE setBackgroundColor)
public: public:
RoomInfoListItem(QSharedPointer<RoomSettings> settings, RoomInfoListItem(QSharedPointer<RoomSettings> settings,
@ -71,7 +67,10 @@ public:
inline QColor hoverBackgroundColor() const { return hoverBackgroundColor_; } inline QColor hoverBackgroundColor() const { return hoverBackgroundColor_; }
inline QColor backgroundColor() const { return backgroundColor_; } inline QColor backgroundColor() const { return backgroundColor_; }
inline void setHighlightedBackgroundColor(QColor &color) { highlightedBackgroundColor_ = color; } inline void setHighlightedBackgroundColor(QColor &color)
{
highlightedBackgroundColor_ = color;
}
inline void setHoverBackgroundColor(QColor &color) { hoverBackgroundColor_ = color; } inline void setHoverBackgroundColor(QColor &color) { hoverBackgroundColor_ = color; }
inline void setBackgroundColor(QColor &color) { backgroundColor_ = color; } inline void setBackgroundColor(QColor &color) { backgroundColor_ = color; }

2
include/TimelineItem.h
View File

@ -19,9 +19,9 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QPainter>
#include <QStyle> #include <QStyle>
#include <QStyleOption> #include <QStyleOption>
#include <QPainter>
#include "Emote.h" #include "Emote.h"
#include "Image.h" #include "Image.h"

3
include/TimelineView.h
View File

@ -64,7 +64,8 @@ struct PendingMessage
, filename(filename) , filename(filename)
, event_id(event_id) , event_id(event_id)
, widget(widget) , widget(widget)
{} {
}
}; };
// In which place new TimelineItems should be inserted. // In which place new TimelineItems should be inserted.

6
src/EmojiPanel.cc
View File

@ -34,12 +34,12 @@ EmojiPanel::EmojiPanel(QWidget *parent)
{ {
// setStyleSheet( // setStyleSheet(
// "QWidget {background: #fff; color: #e8e8e8; border: none;}" // "QWidget {background: #fff; color: #e8e8e8; border: none;}"
// "QScrollBar:vertical { background-color: #fff; width: 8px; margin: 0px 2px 0 2px; }" // "QScrollBar:vertical { background-color: #fff; width: 8px; margin: 0px 2px 0
// 2px; }"
// "QScrollBar::handle:vertical { background-color: #d6dde3; min-height: 20px; }" // "QScrollBar::handle:vertical { background-color: #d6dde3; min-height: 20px; }"
// "QScrollBar::add-line:vertical { border: none; background: none; }" // "QScrollBar::add-line:vertical { border: none; background: none; }"
// "QScrollBar::sub-line:vertical { border: none; background: none; }"); // "QScrollBar::sub-line:vertical { border: none; background: none; }");
setStyleSheet( setStyleSheet("QWidget {border: none;}"
"QWidget {border: none;}"
"QScrollBar:vertical { width: 8px; margin: 0px 2px 0 2px; }" "QScrollBar:vertical { width: 8px; margin: 0px 2px 0 2px; }"
"QScrollBar::handle:vertical { min-height: 20px; }" "QScrollBar::handle:vertical { min-height: 20px; }"
"QScrollBar::add-line:vertical { border: none; background: none; }" "QScrollBar::add-line:vertical { border: none; background: none; }"

1
src/TimelineItem.cc
View File

@ -66,7 +66,6 @@ TimelineItem::init()
headerLayout_->setMargin(0); headerLayout_->setMargin(0);
headerLayout_->setSpacing(conf::timeline::headerSpacing); headerLayout_->setSpacing(conf::timeline::headerSpacing);
} }
/* /*

2
src/main.cc
View File

@ -17,12 +17,12 @@
#include <QApplication> #include <QApplication>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QFile>
#include <QFontDatabase> #include <QFontDatabase>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QNetworkProxy> #include <QNetworkProxy>
#include <QSettings> #include <QSettings>
#include <QTranslator> #include <QTranslator>
#include <QFile>
#include "MainWindow.h" #include "MainWindow.h"