From 77f4a2b34f52392d6a4dfd45bdbef176f3ce3488 Mon Sep 17 00:00:00 2001
From: IceN9ne
Date: Fri, 4 Jan 2019 15:50:19 -0500
Subject: KviToolBar: Adjust std::array style for Travis + clang issue

---
 src/kvirc/ui/KviToolBar.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp
index 812c525e2..e7f2a12dd 100644
--- a/src/kvirc/ui/KviToolBar.cpp
+++ b/src/kvirc/ui/KviToolBar.cpp
@@ -76,18 +76,18 @@ KviToolBar::~KviToolBar()
 	}
 }
 
-static const auto valid_iconsizes = std::array{
-	KviToolBar::IconSize{ 16, "Small (16x16)" },
-	KviToolBar::IconSize{ 32, "Large (32x32)" },
-};
-
-static const auto valid_buttonstyles = std::array{
-	KviToolBar::ButtonStyle{ Qt::ToolButtonIconOnly, "Icon Only" },
-	KviToolBar::ButtonStyle{ Qt::ToolButtonTextOnly, "Text Only" },
-	KviToolBar::ButtonStyle{ Qt::ToolButtonTextBesideIcon, "Text Beside Icon" },
-	KviToolBar::ButtonStyle{ Qt::ToolButtonTextUnderIcon, "Text Under Icon" },
-	KviToolBar::ButtonStyle{ Qt::ToolButtonFollowStyle, "Use System Style" },
-};
+static const std::array<KviToolBar::IconSize, 2> valid_iconsizes = {{
+	{ 16, "Small (16x16)" },
+	{ 32, "Large (32x32)" },
+}};
+
+static const std::array<KviToolBar::ButtonStyle, 5> valid_buttonstyles = {{
+	{ Qt::ToolButtonIconOnly, "Icon Only" },
+	{ Qt::ToolButtonTextOnly, "Text Only" },
+	{ Qt::ToolButtonTextBesideIcon, "Text Beside Icon" },
+	{ Qt::ToolButtonTextUnderIcon, "Text Under Icon" },
+	{ Qt::ToolButtonFollowStyle, "Use System Style" },
+}};
 
 void KviToolBar::mousePressEvent(QMouseEvent * e)
 {
-- 
cgit v1.3.1-10-gc9f91