Merge branch 'voldyman-master'

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)) {

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;

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 ...]");

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;

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>

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>

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, ".");

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")