From 168698fae4792e186de4e3aa24364f0f29b5d315 Mon Sep 17 00:00:00 2001
From: "Akshay Shekhervoldyman666@gmail.com" <voldyman666@gmail.com>
Date: Tue, 15 Dec 2015 17:02:41 +0530
Subject: [PATCH 1/2] Removed  and  as per the TODO's

---
 src/cmake.cc        | 3 ---
 src/config.cc       | 2 --
 src/juci.cc         | 2 --
 src/menu.cc         | 2 --
 src/notebook.cc     | 3 ---
 src/source_clang.cc | 3 ---
 src/terminal.cc     | 3 ---
 src/window.cc       | 5 +----
 8 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/cmake.cc b/src/cmake.cc
index e7df7ee..2281ae5 100644
--- a/src/cmake.cc
+++ b/src/cmake.cc
@@ -5,9 +5,6 @@
 #include "terminal.h"
 #include <boost/regex.hpp>
 
-#include <iostream> //TODO: remove
-using namespace std; //TODO: remove
-
 CMake::CMake(const boost::filesystem::path &path) {
   const auto find_cmake_project=[this](const boost::filesystem::path &cmake_path) {
     for(auto &line: filesystem::read_lines(cmake_path)) {
diff --git a/src/config.cc b/src/config.cc
index 36cbe4d..8663e64 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -6,8 +6,6 @@
 #include "filesystem.h"
 #include "terminal.h"
 
-using namespace std; //TODO: remove
-
 Config::Config() {
   std::vector<std::string> environment_variables = {"JUCI_HOME", "HOME", "AppData"};
   char *ptr = nullptr;
diff --git a/src/juci.cc b/src/juci.cc
index d09c93b..250afab 100644
--- a/src/juci.cc
+++ b/src/juci.cc
@@ -5,8 +5,6 @@
 #include "config.h"
 #include "logging.h"
 
-using namespace std; //TODO: remove
-
 int Application::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd) {
   Glib::set_prgname("juci");
   Glib::OptionContext ctx("[PATH ...]");
diff --git a/src/menu.cc b/src/menu.cc
index 683ac71..36e23a7 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -3,8 +3,6 @@
 #include <string>
 #include <iostream>
 
-using namespace std; //TODO: remove
-
 //TODO: if Ubuntu ever gets fixed, cleanup the Ubuntu specific code
 Menu::Menu() {
   auto accels=Config::get().menu.keys;
diff --git a/src/notebook.cc b/src/notebook.cc
index 3ce0936..2c62395 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -11,9 +11,6 @@
 #include "gtksourceview-3.0/gtksourceview/gtksourcemap.h"
 #endif
 
-#include <iostream> //TODO: remove
-using namespace std; //TODO: remove
-
 namespace sigc {
 #ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
diff --git a/src/source_clang.cc b/src/source_clang.cc
index 7fd0271..f51a9a8 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -2,9 +2,6 @@
 #include "config.h"
 #include "terminal.h"
 
-#include <iostream> //TODO: remove
-using namespace std; //TODO: remove
-
 namespace sigc {
 #ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
diff --git a/src/terminal.cc b/src/terminal.cc
index 1544bf8..d1236f8 100644
--- a/src/terminal.cc
+++ b/src/terminal.cc
@@ -3,9 +3,6 @@
 #include "logging.h"
 #include "config.h"
 
-#include <iostream> //TODO: remove
-using namespace std; //TODO: remove
-
 Terminal::InProgress::InProgress(const std::string& start_msg): stop(false) {
   waiting_print.connect([this](){
     Terminal::get().async_print(line_nr-1, ".");
diff --git a/src/window.cc b/src/window.cc
index 8849d2b..f7fad76 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -8,9 +8,6 @@
 #include "dialogs.h"
 #include "filesystem.h"
 
-#include <iostream> //TODO: remove
-using namespace std; //TODO: remove
-
 namespace sigc {
 #ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
   template <typename Functor>
@@ -813,7 +810,7 @@ void Window::set_tab_entry() {
         char tab_char=0;
         unsigned tab_size=0;
         try {
-          tab_size = static_cast<unsigned>(stoul(entry_tab_size_it->get_text()));
+          tab_size = static_cast<unsigned>(std::stoul(entry_tab_size_it->get_text()));
           std::string tab_char_string=entry_tab_char_it->get_text();
           std::transform(tab_char_string.begin(), tab_char_string.end(), tab_char_string.begin(), ::tolower);
           if(tab_char_string=="space")

From 7925b38684f4c758c290fb9d19114ac8b35f6e62 Mon Sep 17 00:00:00 2001
From: Ole Christian Eidheim <eidheim@gmail.com>
Date: Tue, 15 Dec 2015 19:31:22 +0100
Subject: [PATCH 2/2] Added Boost::Regex under dependencies

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index be5c9d3..ef2e0f8 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ See [enhancements](https://github.com/cppit/jucipp/labels/enhancement) for plann
 * boost-log
 * boost-thread
 * boost-system
+* boost-regex
 * gtkmm-3.0
 * gtksourceviewmm-3.0
 * aspell