From bcabf2fb73b9ad7825f4ea03a5ce27e38a2273e5 Mon Sep 17 00:00:00 2001
From: redsky17 <joedonofry@gmail.com>
Date: Sun, 13 Jan 2019 03:48:07 +0000
Subject: [PATCH] Update travis ci config to point to redsky17 config and try
 to fix lint errors

---
 .travis.yml            | 8 ++++----
 src/RoomInfoListItem.h | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb988425..265bdeef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,7 +72,7 @@ script:
 
 deploy:
     - provider: bintray
-      user: "mujx"
+      user: "redsky17"
       key:
           secure: "CAVzWZPxYSOTollo9bpD4tvEbfxXjqelc32aApV48GKyJrMQljQ+mvSe25BuUtnDehxnw8affgGX23AYXmvG8P7w4hM2d7//8Lgan1zCmusV8JE432jknev6X641B4cvrywqSe0Dj3l0kS9Xgirq4BGavlI0y2vUjeJfQEv0y8GYoI72LwgyH0i82v/1Qi92Fh8429IJIb0eKmC1wGWXCmo2kd8StZRL5mSlc4TmyWI0SHpA5GrLMiQwLAuD7DjDl5mpaK2yQx+H4vBcI2SUMvmlHGgVjXikJG5gURlHbnIaaBFvO67INc1/65KtMokWuMP12zxqJiaMPtsAskOpQv4FLAYDfnigH3NxufyOIGp2cxS5RhJDQhbNsxHEDnUo1kHcO23ZYNWCuC1yUdn0RXzKhWcUsz8mKF8KJs22Ty4VjfUMZ+vqK/AbHyq4rkl8DizVRZqKF1KjSWrSv/2sT4itnHk9pmcgxAYfGuALcjrJJveI4MTwDhzXB62CKnMOqLq3sAMqvE0+BdA0BykQr7qrKtptuyP2/OFx6RDbfHQl5Klkb6cSOjxm0oUzh/8iaxgsVdCrhfE67eqkhFZ+a8lJkB/rZ4zSK1Q2Cp4nLtnxenUCW+Ptk2l7zZN6kXM1/+tcgqVROChYJ6asMUpsjFOOAVQ8SZ4TcxX1rq+pxlA="
       skip_cleanup: true
@@ -80,7 +80,7 @@ deploy:
       file: "bintray-release.json"
       on:
           condition: $DEPLOYMENT == 1
-          repo: mujx/nheko
+          repo: redsky17/nheko
           tags: true
           deploy:
     - skip_cleanup: true
@@ -93,7 +93,7 @@ deploy:
           - nheko-${TRAVIS_TAG}-x86_64.AppImage
       on:
           condition: $TRAVIS_OS_NAME == linux && $DEPLOYMENT == 1
-          repo: mujx/nheko
+          repo: redsky17/nheko
           tags: true
     - skip_cleanup: true
       overwrite: true
@@ -103,5 +103,5 @@ deploy:
       file: nheko-${TRAVIS_TAG}.dmg
       on:
           condition: $TRAVIS_OS_NAME == osx && $DEPLOYMENT == 1
-          repo: mujx/nheko
+          repo: redsky17/nheko
           tags: true
diff --git a/src/RoomInfoListItem.h b/src/RoomInfoListItem.h
index f613e321..770f68f3 100644
--- a/src/RoomInfoListItem.h
+++ b/src/RoomInfoListItem.h
@@ -47,10 +47,8 @@ class RoomInfoListItem : public QWidget
         Q_PROPERTY(QColor subtitleColor READ subtitleColor WRITE setSubtitleColor)
 
         Q_PROPERTY(QColor timestampColor READ timestampColor WRITE setTimestampColor)
-        Q_PROPERTY(QColor highlightedTimestampColor READ highlightedTimestampColor WRITE
-                     setHighlightedTimestampColor)
-        Q_PROPERTY(QColor hoverTimestampColor READ hoverTimestampColor WRITE
-                     setHoverTimestampColor)
+        Q_PROPERTY(QColor highlightedTimestampColor READ highlightedTimestampColor WRITE setHighlightedTimestampColor)
+        Q_PROPERTY(QColor hoverTimestampColor READ hoverTimestampColor WRITE setHoverTimestampColor)
 
         Q_PROPERTY(
           QColor highlightedTitleColor READ highlightedTitleColor WRITE setHighlightedTitleColor)