From 29b9f4f2bbbfb28ebb4f6ef0a3e280c864d2c9ee Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Fri, 21 Jul 2017 20:03:28 +0200
Subject: [PATCH] Temporary fix for the "Only <gtksourceview/gtksource.h> can
 be included directly" warnings, added -Werror on travis, and removed
 -Wno-reorder

---
 CMakeLists.txt          | 11 +++++++++--
 ci/compile.sh           |  4 ++--
 src/autocomplete.h      |  2 +-
 src/selection_dialog.cc |  2 +-
 src/tooltips.cc         |  5 ++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cd4bce..dd2fbfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,13 +16,20 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/cppit/jucipp")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 include(CPack)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJUCI_VERSION=\\\"${JUCI_VERSION}\\\" -std=c++1y -pthread -Wall -Wextra -Wno-unused-parameter -Wno-reorder")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJUCI_VERSION=\\\"${JUCI_VERSION}\\\" -std=c++1y -pthread -Wall -Wextra -Wno-unused-parameter")
 if(CMAKE_BUILD_TYPE STREQUAL "")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 endif()
 
+# temporarily disable these warnings: Only <gtksourceview/gtksource.h> can be included directly.
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-cpp")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-#warnings")
+endif()
+
 if(APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -undefined dynamic_lookup") #TODO: fix this
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -undefined dynamic_lookup -Wno-unused-command-line-argument") #TODO: fix this
   link_directories(/usr/local/lib /usr/local/opt/gettext/lib)
   include_directories(/usr/local/opt/gettext/include)
   set(CMAKE_MACOSX_RPATH 1)
diff --git a/ci/compile.sh b/ci/compile.sh
index 18ee1bc..59d86f2 100755
--- a/ci/compile.sh
+++ b/ci/compile.sh
@@ -7,10 +7,10 @@ if [ "${cmake_command}" == "" ]; then
     else
       mingw="mingw32"
     fi
-    cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 .."
+    cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
     make_command="make"
   else
-    cmake_command="cmake -DENABLE_TESTING=1 .."
+    cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
   fi
 fi
 
diff --git a/src/autocomplete.h b/src/autocomplete.h
index 7c56ea2..457f335 100644
--- a/src/autocomplete.h
+++ b/src/autocomplete.h
@@ -45,7 +45,7 @@ public:
 
   std::function<void()> setup_dialog = [] {};
 
-  Autocomplete(Gtk::TextView *view, bool &interactive_completion, guint &last_keyval, bool strip_word): view(view), state(State::IDLE), strip_word(strip_word) {
+  Autocomplete(Gtk::TextView *view, bool &interactive_completion, guint &last_keyval, bool strip_word): view(view), strip_word(strip_word), state(State::IDLE) {
     view->get_buffer()->signal_changed().connect([this, &interactive_completion, &last_keyval] {
       if(CompletionDialog::get() && CompletionDialog::get()->is_visible()) {
         cancel_reparse();
diff --git a/src/selection_dialog.cc b/src/selection_dialog.cc
index 116068d..7a2435f 100644
--- a/src/selection_dialog.cc
+++ b/src/selection_dialog.cc
@@ -30,7 +30,7 @@ void SelectionDialogBase::ListViewText::clear() {
 }
 
 SelectionDialogBase::SelectionDialogBase(Gtk::TextView *text_view, Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, bool show_search_entry, bool use_markup):
-    text_view(text_view), window(Gtk::WindowType::WINDOW_POPUP), vbox(Gtk::Orientation::ORIENTATION_VERTICAL), list_view_text(use_markup), start_mark(start_mark), show_search_entry(show_search_entry) {
+    start_mark(start_mark), text_view(text_view), window(Gtk::WindowType::WINDOW_POPUP), vbox(Gtk::Orientation::ORIENTATION_VERTICAL), list_view_text(use_markup), show_search_entry(show_search_entry) {
   auto g_application=g_application_get_default();
   auto gio_application=Glib::wrap(g_application, true);
   auto application=Glib::RefPtr<Gtk::Application>::cast_static(gio_application);
diff --git a/src/tooltips.cc b/src/tooltips.cc
index e73d5d7..97ac3d8 100644
--- a/src/tooltips.cc
+++ b/src/tooltips.cc
@@ -4,9 +4,8 @@
 Gdk::Rectangle Tooltips::drawn_tooltips_rectangle=Gdk::Rectangle();
 
 Tooltip::Tooltip(std::function<Glib::RefPtr<Gtk::TextBuffer>()> create_tooltip_buffer, Gtk::TextView *text_view, 
-Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, Glib::RefPtr<Gtk::TextBuffer::Mark> end_mark):
-create_tooltip_buffer(create_tooltip_buffer), text_view(text_view), 
-start_mark(start_mark), end_mark(end_mark) {}
+Glib::RefPtr<Gtk::TextBuffer::Mark> start_mark, Glib::RefPtr<Gtk::TextBuffer::Mark> end_mark)
+    : start_mark(start_mark), end_mark(end_mark), create_tooltip_buffer(create_tooltip_buffer), text_view(text_view) {}
 
 Tooltip::~Tooltip() {
   if(text_view) {