Merge branch 'VadimGit-little_fixes'

src/cmake.cc

@@ -1,9 +1,10 @@
 #include "cmake.h"
 #include "singletons.h"
 #include "filesystem.h"
-#include <boost/regex.hpp>
 #include "dialogs.h"
 
+#include <boost/regex.hpp>
+
 #include <iostream> //TODO: remove
 using namespace std; //TODO: remove
 
@@ -267,7 +268,7 @@ std::vector<std::pair<boost::filesystem::path, std::vector<std::string> > > CMak
         const boost::regex function_regex("^ *"+name+" *\\( *(.*)\\) *$");
         boost::smatch sm;
         if(boost::regex_match(line, sm, function_regex)) {
-          auto data=sm[1].str();
+          auto data=sm[1].str();         
           while(data.size()>0 && data.back()==' ')
             data.pop_back();
           auto parameters=get_function_parameters(data);

src/directories.cc

@@ -216,7 +216,7 @@ void Directories::add_path(const boost::filesystem::path& dir_path, const Gtk::T
     bool already_added=false;
     if(*children) {
       for(auto &child: *children) {
-        if(child.get_value(column_record.name)==filename) {
+        if(child->get_value(column_record.name)==filename) {
           not_deleted.emplace(filename);
           already_added=true;
           break;

src/files.h

@@ -1,3 +1,5 @@
+#ifndef JUCI_FILES_H_
+#define JUCI_FILES_H_
 #include <string>
 
 #define JUCI_VERSION "0.9.6"
@@ -373,4 +375,4 @@ const std::string snippetpy =
 "    output=getSnippet(theWord) \n"
 "    juci.replaceWord(output) \n";
 
-
+#endif  // JUCI_FILES_H_

src/juci.h

@@ -8,9 +8,9 @@
 class Application : public Gtk::Application {
 public:
   Application();
-  int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd);
+  int on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine> &cmd) override;
-  void on_activate();
+  void on_activate() override;
-  void on_startup();
+  void on_startup() override;
   std::unique_ptr<Window> window;
 private:
   std::vector<boost::filesystem::path> directories;