diff --git a/src/debug_clang.cc b/src/debug_clang.cc
index 80c6840..143cba4 100644
--- a/src/debug_clang.cc
+++ b/src/debug_clang.cc
@@ -98,7 +98,7 @@ void Debug::Clang::start(const std::string &command, const boost::filesystem::pa
   }
   
   lldb::SBError error;
-  process = std::unique_ptr<lldb::SBProcess>(new lldb::SBProcess(target.Launch(*listener, argv, (const char**)environ, nullptr, nullptr, nullptr, path.string().c_str(), lldb::eLaunchFlagNone, false, error)));
+  process = std::unique_ptr<lldb::SBProcess>(new lldb::SBProcess(target.Launch(*listener, argv, const_cast<const char**>(environ), nullptr, nullptr, nullptr, path.string().c_str(), lldb::eLaunchFlagNone, false, error)));
   if(error.Fail()) {
     Terminal::get().async_print(std::string("Error (debug): ")+error.GetCString()+'\n', true);
     if(callback)
diff --git a/src/directories.cc b/src/directories.cc
index 78534c9..c4eb949 100644
--- a/src/directories.cc
+++ b/src/directories.cc
@@ -365,7 +365,7 @@ Directories::Directories() : Gtk::TreeView(), stop_update_thread(false) {
   menu_item_delete.signal_activate().connect([this] {
     if(menu_popup_row_path.empty())
       return;
-    Gtk::MessageDialog dialog((Gtk::Window&)(*get_toplevel()), "Delete!", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
+    Gtk::MessageDialog dialog(*static_cast<Gtk::Window*>(get_toplevel()), "Delete!", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
     dialog.set_default_response(Gtk::RESPONSE_NO);
     dialog.set_secondary_text("Are you sure you want to delete "+menu_popup_row_path.string()+"?");
     int result = dialog.run();
diff --git a/src/notebook.cc b/src/notebook.cc
index 1f68c27..79e7419 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -308,7 +308,7 @@ boost::filesystem::path Notebook::get_current_folder() {
 }
 
 bool Notebook::save_modified_dialog(int page) {
-  Gtk::MessageDialog dialog((Gtk::Window&)(*get_toplevel()), "Save file!", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
+  Gtk::MessageDialog dialog(*static_cast<Gtk::Window*>(get_toplevel()), "Save file!", false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_YES_NO);
   dialog.set_default_response(Gtk::RESPONSE_YES);
   dialog.set_secondary_text("Do you want to save: " + get_view(page)->file_path.string()+" ?");
   int result = dialog.run();
diff --git a/src/selectiondialog.cc b/src/selectiondialog.cc
index 0e9aa21..5613c93 100644
--- a/src/selectiondialog.cc
+++ b/src/selectiondialog.cc
@@ -75,10 +75,10 @@ list_view_text(use_markup), start_mark(start_mark), show_search_entry(show_searc
   if(!show_search_entry)
     window->add(scrolled_window);
   else {
-    auto dialog=(Gtk::Dialog*)window.get();
+    auto dialog=static_cast<Gtk::Dialog*>(window.get());
     dialog->get_vbox()->pack_start(search_entry, false, false);
     dialog->get_vbox()->pack_start(scrolled_window, true, true);
-    dialog->set_transient_for((Gtk::Window&)(*text_view.get_toplevel()));
+    dialog->set_transient_for(*static_cast<Gtk::Window*>(text_view.get_toplevel()));
   }
 }
 
@@ -153,7 +153,7 @@ void SelectionDialogBase::resize() {
     else
       scrolled_window.set_policy(Gtk::PolicyType::POLICY_NEVER, Gtk::PolicyType::POLICY_AUTOMATIC);
 
-    int window_height=std::min(row_height*(int)list_view_text.get_model()->children().size(), row_height*10);
+    int window_height=std::min(row_height*static_cast<int>(list_view_text.get_model()->children().size()), row_height*10);
     if(show_search_entry)
       window_height+=search_entry.get_height();
     window->resize(row_width+1, window_height);
@@ -201,7 +201,7 @@ SelectionDialog::SelectionDialog(Gtk::TextView& text_view, Glib::RefPtr<Gtk::Tex
   
   search_entry.signal_event().connect([this](GdkEvent* event) {
     if(event->type==GDK_KEY_PRESS) {
-      auto key=(GdkEventKey*)event;
+      auto key=reinterpret_cast<GdkEventKey*>(event);
       if(key->keyval==GDK_KEY_Down && list_view_text.get_model()->children().size()>0) {
         auto it=list_view_text.get_selection()->get_selected();
         if(it) {
diff --git a/src/source.cc b/src/source.cc
index 97ba40b..5562dd2 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -561,7 +561,7 @@ void Source::View::set_tooltip_and_dialog_events() {
 }
 
 void Source::View::search_occurrences_updated(GtkWidget* widget, GParamSpec* property, gpointer data) {
-  auto view=(Source::View*)data;
+  auto view=static_cast<Source::View*>(data);
   if(view->update_search_occurrences)
     view->update_search_occurrences(gtk_source_search_context_get_occurrences_count(view->search_context));
 }
@@ -700,7 +700,7 @@ void Source::View::paste() {
         paste_line=false;
       }
     }
-    if(paste_line_tabs==(size_t)-1)
+    if(paste_line_tabs==static_cast<size_t>(-1))
       paste_line_tabs=0;
     start_line=0;
     end_line=0;
diff --git a/src/source_clang.cc b/src/source_clang.cc
index abb7802..db913f4 100644
--- a/src/source_clang.cc
+++ b/src/source_clang.cc
@@ -223,9 +223,9 @@ void Source::ClangViewParse::update_syntax() {
     if(token.get_kind()==1) // KeywordToken
       ranges.emplace_back(token.offsets, 702);
     else if(token.get_kind()==2) {// IdentifierToken 
-      auto kind=(int)token.get_cursor().get_kind();
+      auto kind=static_cast<int>(token.get_cursor().get_kind());
       if(kind==101 || kind==102)
-        kind=(int)token.get_cursor().get_referenced().get_kind();
+        kind=static_cast<int>(token.get_cursor().get_referenced().get_kind());
       if(kind!=500)
         ranges.emplace_back(token.offsets, kind);
     }
@@ -865,8 +865,8 @@ Source::ClangViewAutocomplete(file_path, language) {
       return Token();
     }
     auto iter=get_buffer()->get_insert()->get_iter();
-    auto line=(unsigned)iter.get_line();
-    auto index=(unsigned)iter.get_line_index();
+    auto line=static_cast<unsigned>(iter.get_line());
+    auto index=static_cast<unsigned>(iter.get_line_index());
     for(auto &token: *clang_tokens) {
       auto cursor=token.get_cursor();
       if(token.get_kind()==clang::Token_Identifier && cursor.has_type()) {
@@ -926,8 +926,8 @@ Source::ClangViewAutocomplete(file_path, language) {
       return location;
     }
     auto iter=get_buffer()->get_insert()->get_iter();
-    auto line=(unsigned)iter.get_line();
-    auto index=(unsigned)iter.get_line_index();
+    auto line=static_cast<unsigned>(iter.get_line());
+    auto index=static_cast<unsigned>(iter.get_line_index());
     for(auto &token: *clang_tokens) {
       auto cursor=token.get_cursor();
       if(token.get_kind()==clang::Token_Identifier && cursor.has_type()) {
@@ -1083,8 +1083,8 @@ Source::ClangViewAutocomplete(file_path, language) {
       return data;
     }
     auto iter=get_buffer()->get_insert()->get_iter();
-    auto line=(unsigned)iter.get_line();
-    auto index=(unsigned)iter.get_line_index();
+    auto line=static_cast<unsigned>(iter.get_line());
+    auto index=static_cast<unsigned>(iter.get_line_index());
     for(auto &token: *clang_tokens) {
       auto cursor=token.get_cursor();
       if(token.get_kind()==clang::Token_Identifier && cursor.has_type()) {
diff --git a/src/terminal.cc b/src/terminal.cc
index 5f15c69..c88f542 100644
--- a/src/terminal.cc
+++ b/src/terminal.cc
@@ -279,7 +279,7 @@ bool Terminal::on_key_press_event(GdkEventKey *event) {
   if(processes.size()>0 || debug_is_running) {
     get_buffer()->place_cursor(get_buffer()->end());
     auto unicode=gdk_keyval_to_unicode(event->keyval);
-    char chr=(char)unicode;
+    char chr=static_cast<char>(unicode);
     if(unicode>=32 && unicode<=126) {
       stdin_buffer+=chr;
       get_buffer()->insert_at_cursor(stdin_buffer.substr(stdin_buffer.size()-1));