Commit 27e2d4eb authored by Murray Cumming's avatar Murray Cumming
Browse files

Adapt to gtksourceviewmm API changes.

The classes no longer have the Source prefix.
parent 618ff2fb
......@@ -160,7 +160,7 @@ public:
FileBuffer::FileBuffer()
:
Gsv::SourceBuffer(Glib::RefPtr<Gtk::TextTagTable>(RegexxerTags::instance())),
Gsv::Buffer(Glib::RefPtr<Gtk::TextTagTable>(RegexxerTags::instance())),
match_set_ (),
current_match_ (match_set_.end()),
user_action_stack_ (),
......
......@@ -25,7 +25,7 @@
#include "signalutils.h"
#include "undostack.h"
#include <gtksourceviewmm/sourcebuffer.h>
#include <gtksourceviewmm/buffer.h>
#include <set>
#include <stack>
......@@ -36,7 +36,7 @@ namespace Regexxer
class FileBufferActionRemoveMatch;
class FileBuffer : public Gsv::SourceBuffer
class FileBuffer : public Gsv::Buffer
{
public:
static Glib::RefPtr<FileBuffer> create();
......
......@@ -157,7 +157,7 @@ void load_file(const FileInfoPtr& fileinfo, const std::string& fallback_encoding
if (!buffer)
throw ErrorBinaryFile();
Glib::RefPtr<Gsv::SourceLanguageManager> language_manager = Gsv::SourceLanguageManager::create();
Glib::RefPtr<Gsv::LanguageManager> language_manager = Gsv::LanguageManager::create();
bool uncertain = false;
std::string content_type = Gio::content_type_guess(fileinfo->fullname, buffer->get_text(), uncertain);
......
......@@ -195,7 +195,7 @@ MainWindow::MainWindow()
filetree_ (Gtk::manage(new FileTree())),
scrollwin_filetree_ (0),
scrollwin_textview_ (0),
textview_ (Gtk::manage(new Gsv::SourceView())),
textview_ (Gtk::manage(new Gsv::View())),
entry_preview_ (0),
statusline_ (Gtk::manage(new StatusLine())),
busy_action_running_ (false),
......@@ -247,7 +247,7 @@ void MainWindow::initialize(const InitState& init)
textview_->set_show_line_numbers(settings->get_boolean(conf_key_show_line_numbers));
textview_->set_highlight_current_line(settings->get_boolean(conf_key_highlight_current_line));
textview_->set_auto_indent(settings->get_boolean(conf_key_auto_indentation));
textview_->set_draw_spaces(static_cast<Gsv::SourceDrawSpacesFlags>
textview_->set_draw_spaces(static_cast<Gsv::DrawSpacesFlags>
(settings->get_flags(conf_key_draw_spaces)));
std::string folder;
......
......@@ -52,7 +52,7 @@ class EntryCompletion;
namespace Gsv
{
class SourceView;
class View;
}
namespace Regexxer
......@@ -123,7 +123,7 @@ private:
FileTree* filetree_;
Gtk::ScrolledWindow* scrollwin_filetree_;
Gtk::ScrolledWindow* scrollwin_textview_;
Gsv::SourceView* textview_;
Gsv::View* textview_;
Gtk::Entry* entry_preview_;
StatusLine* statusline_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment