Commit df504afc authored by Dominique Leuenberger's avatar Dominique Leuenberger Committed by Aurimas Černius

Fix build

has_buffer and is_loaded both expect to return a bool, so returning
plain m_buffer won't cut it

Fixes build error

[   89s] In file included from ../../../src/noteaddin.hpp:38:0,
[   89s]                  from backlinksnoteaddin.hpp:27,
[   89s]                  from backlinksnoteaddin.cpp:25:
[   89s] ../../../src/note.hpp: In member function 'bool gnote::Note::has_buffer() const':
[   89s] ../../../src/note.hpp:127:14: error: cannot convert 'const Glib::RefPtr<gnote::NoteBuffer>' to 'bool' in return
[   89s]        return m_buffer;
[   89s]               ^~~~~~~~
[   89s] ../../../src/note.hpp: In member function 'bool gnote::Note::is_loaded() const':
[   89s] ../../../src/note.hpp:142:23: error: cannot convert 'const Glib::RefPtr<gnote::NoteBuffer>' to 'bool' in return
[   89s]        return (m_buffer);

https://bugzilla.gnome.org/show_bug.cgi?id=770541
parent f8ef414b
...@@ -144,17 +144,17 @@ namespace gnote { ...@@ -144,17 +144,17 @@ namespace gnote {
int pos = 0; int pos = 0;
Glib::RefPtr<Gio::Menu> section = make_app_menu_section(APP_ACTION_NEW); Glib::RefPtr<Gio::Menu> section = make_app_menu_section(APP_ACTION_NEW);
if(section != 0) { if(section) {
menu->insert_section(pos++, section); menu->insert_section(pos++, section);
} }
section = make_app_menu_section(APP_ACTION_MANAGE); section = make_app_menu_section(APP_ACTION_MANAGE);
if(section != 0) { if(section) {
menu->insert_section(pos++, section); menu->insert_section(pos++, section);
} }
section = make_app_menu_section(APP_ACTION_LAST); section = make_app_menu_section(APP_ACTION_LAST);
if(section != 0) { if(section) {
menu->insert_section(pos++, section); menu->insert_section(pos++, section);
} }
......
...@@ -84,10 +84,10 @@ std::map<int, Gtk::Widget*> ExportToGTGNoteAddin::get_actions_popover_widgets() ...@@ -84,10 +84,10 @@ std::map<int, Gtk::Widget*> ExportToGTGNoteAddin::get_actions_popover_widgets()
void ExportToGTGNoteAddin::export_button_clicked(const Glib::VariantBase&) void ExportToGTGNoteAddin::export_button_clicked(const Glib::VariantBase&)
{ {
try { try {
if (s_gtg_interface == 0) { if (!s_gtg_interface) {
Glib::RefPtr<Gio::DBus::NodeInfo> node_info = Gio::DBus::NodeInfo::create_for_xml(GTG_INTERFACE); Glib::RefPtr<Gio::DBus::NodeInfo> node_info = Gio::DBus::NodeInfo::create_for_xml(GTG_INTERFACE);
s_gtg_interface = node_info->lookup_interface("org.gnome.GTG"); s_gtg_interface = node_info->lookup_interface("org.gnome.GTG");
if(s_gtg_interface == 0) { if(!s_gtg_interface) {
ERR_OUT(_("GTG XML loaded, but interface not found")); ERR_OUT(_("GTG XML loaded, but interface not found"));
return; return;
} }
...@@ -101,7 +101,7 @@ void ExportToGTGNoteAddin::export_button_clicked(const Glib::VariantBase&) ...@@ -101,7 +101,7 @@ void ExportToGTGNoteAddin::export_button_clicked(const Glib::VariantBase&)
try { try {
Glib::RefPtr<Gio::DBus::Proxy> proxy = Gio::DBus::Proxy::create_for_bus_sync( Glib::RefPtr<Gio::DBus::Proxy> proxy = Gio::DBus::Proxy::create_for_bus_sync(
Gio::DBus::BUS_TYPE_SESSION, "org.gnome.GTG", "/org/gnome/GTG", "org.gnome.GTG", s_gtg_interface); Gio::DBus::BUS_TYPE_SESSION, "org.gnome.GTG", "/org/gnome/GTG", "org.gnome.GTG", s_gtg_interface);
if(proxy == 0) { if(!proxy) {
ERR_OUT(_("Failed to create D-Bus proxy for GTG")); ERR_OUT(_("Failed to create D-Bus proxy for GTG"));
return; return;
} }
......
...@@ -254,7 +254,7 @@ namespace printnotes { ...@@ -254,7 +254,7 @@ namespace printnotes {
} }
gnote::DepthNoteTag::Ptr depth = get_buffer()->find_depth_tag(p_start); gnote::DepthNoteTag::Ptr depth = get_buffer()->find_depth_tag(p_start);
if(depth != 0) { if(depth) {
indentation += ((int) (dpiX / 3)) * depth->get_depth(); indentation += ((int) (dpiX / 3)) * depth->get_depth();
} }
layout->set_width(pango_units_from_double((int)context->get_width() - layout->set_width(pango_units_from_double((int)context->get_width() -
......
...@@ -42,7 +42,7 @@ TodoModule::TodoModule() ...@@ -42,7 +42,7 @@ TodoModule::TodoModule()
void Todo::initialize() void Todo::initialize()
{ {
FOREACH(const std::string & s, s_todo_patterns) { FOREACH(const std::string & s, s_todo_patterns) {
if(get_note()->get_tag_table()->lookup(s) == 0) { if(!get_note()->get_tag_table()->lookup(s)) {
Glib::RefPtr<Gtk::TextTag> tag = Gtk::TextTag::create(s); Glib::RefPtr<Gtk::TextTag> tag = Gtk::TextTag::create(s);
tag->property_foreground() = "#0080f0"; tag->property_foreground() = "#0080f0";
tag->property_weight() = PANGO_WEIGHT_BOLD; tag->property_weight() = PANGO_WEIGHT_BOLD;
......
...@@ -228,7 +228,7 @@ Glib::VariantContainerBase SearchProvider::LaunchSearch_stub(const Glib::Variant ...@@ -228,7 +228,7 @@ Glib::VariantContainerBase SearchProvider::LaunchSearch_stub(const Glib::Variant
gchar *SearchProvider::get_icon() gchar *SearchProvider::get_icon()
{ {
if(m_note_icon == 0) { if(!m_note_icon) {
Gtk::IconInfo info = gnote::IconManager::obj().lookup_icon(gnote::IconManager::NOTE, 48); Gtk::IconInfo info = gnote::IconManager::obj().lookup_icon(gnote::IconManager::NOTE, 48);
m_note_icon = Gio::Icon::create(info.get_filename()); m_note_icon = Gio::Icon::create(info.get_filename());
} }
......
...@@ -124,7 +124,7 @@ public: ...@@ -124,7 +124,7 @@ public:
const Glib::RefPtr<NoteTagTable> & get_tag_table(); const Glib::RefPtr<NoteTagTable> & get_tag_table();
bool has_buffer() const bool has_buffer() const
{ {
return m_buffer; return (bool)m_buffer;
} }
const Glib::RefPtr<NoteBuffer> & get_buffer(); const Glib::RefPtr<NoteBuffer> & get_buffer();
bool has_window() const bool has_window() const
...@@ -139,7 +139,7 @@ public: ...@@ -139,7 +139,7 @@ public:
bool is_special() const; bool is_special() const;
bool is_loaded() const bool is_loaded() const
{ {
return (m_buffer); return (bool)m_buffer;
} }
bool is_opened() const bool is_opened() const
{ {
......
...@@ -265,7 +265,7 @@ namespace gnote { ...@@ -265,7 +265,7 @@ namespace gnote {
Glib::RefPtr<Gtk::TextTag> depth = find_depth_tag(iter); Glib::RefPtr<Gtk::TextTag> depth = find_depth_tag(iter);
return depth; return (bool)depth;
} }
...@@ -1358,7 +1358,7 @@ namespace gnote { ...@@ -1358,7 +1358,7 @@ namespace gnote {
if (iter.get_line() < buffer->get_line_count() - 1) { if (iter.get_line() < buffer->get_line_count() - 1) {
Gtk::TextIter next_line = buffer->get_iter_at_line(iter.get_line()+1); Gtk::TextIter next_line = buffer->get_iter_at_line(iter.get_line()+1);
next_line_has_depth = next_line_has_depth =
NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_line); (bool)NoteBuffer::Ptr::cast_static(buffer)->find_depth_tag (next_line);
} }
bool at_empty_line = iter.ends_line () && iter.starts_line (); bool at_empty_line = iter.ends_line () && iter.starts_line ();
...@@ -1593,7 +1593,7 @@ namespace gnote { ...@@ -1593,7 +1593,7 @@ namespace gnote {
NoteBuffer::Ptr note_buffer = NoteBuffer::Ptr::cast_dynamic(buffer); NoteBuffer::Ptr note_buffer = NoteBuffer::Ptr::cast_dynamic(buffer);
// Do not insert bullet if it's already there // Do not insert bullet if it's already there
// this happens when using double identation in bullet list // this happens when using double identation in bullet list
if(note_buffer->find_depth_tag(apply_start) == 0) { if(!note_buffer->find_depth_tag(apply_start)) {
note_buffer->insert_bullet (apply_start, depth_tag->get_depth(), depth_tag->get_direction()); note_buffer->insert_bullet (apply_start, depth_tag->get_depth(), depth_tag->get_direction());
buffer->remove_all_tags (apply_start, apply_start); buffer->remove_all_tags (apply_start, apply_start);
offset += 2; offset += 2;
......
...@@ -523,7 +523,7 @@ namespace gnote { ...@@ -523,7 +523,7 @@ namespace gnote {
bool NoteTagTable::tag_has_depth(const Glib::RefPtr<Gtk::TextBuffer::Tag> & tag) bool NoteTagTable::tag_has_depth(const Glib::RefPtr<Gtk::TextBuffer::Tag> & tag)
{ {
return DepthNoteTag::Ptr::cast_dynamic(tag); return (bool)DepthNoteTag::Ptr::cast_dynamic(tag);
} }
......
...@@ -204,7 +204,7 @@ namespace gnote { ...@@ -204,7 +204,7 @@ namespace gnote {
return; return;
} }
remove_accel_group(*parent); remove_accel_group(*parent);
if(parent->get_window() != 0 if(parent->get_window()
&& (parent->get_window()->get_state() & Gdk::WINDOW_STATE_MAXIMIZED) == 0) { && (parent->get_window()->get_state() & Gdk::WINDOW_STATE_MAXIMIZED) == 0) {
int cur_width, cur_height; int cur_width, cur_height;
parent->get_size(cur_width, cur_height); parent->get_size(cur_width, cur_height);
...@@ -607,7 +607,7 @@ namespace gnote { ...@@ -607,7 +607,7 @@ namespace gnote {
m_global_keys->enabled(m_enabled); m_global_keys->enabled(m_enabled);
FOREACH(const MainWindowAction::Ptr & action, get_widget_actions()) { FOREACH(const MainWindowAction::Ptr & action, get_widget_actions()) {
// A list includes empty actions to mark separators, non-modifying actions are always enabled // A list includes empty actions to mark separators, non-modifying actions are always enabled
if(action != 0 && Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action) == 0) { if(action && !Glib::RefPtr<NonModifyingNoteAction>::cast_dynamic(action)) {
action->set_enabled(enable); action->set_enabled(enable);
} }
} }
......
...@@ -35,7 +35,7 @@ namespace { ...@@ -35,7 +35,7 @@ namespace {
void load_interface_from_file(const char *filename, const char *interface_name, void load_interface_from_file(const char *filename, const char *interface_name,
Glib::RefPtr<Gio::DBus::InterfaceInfo> & interface) Glib::RefPtr<Gio::DBus::InterfaceInfo> & interface)
{ {
if(interface != 0) { if(interface) {
return; return;
} }
std::ifstream fin(filename); std::ifstream fin(filename);
......
...@@ -1536,7 +1536,7 @@ void SearchNotesWidget::parse_sorting_setting(const Glib::ustring & sorting) ...@@ -1536,7 +1536,7 @@ void SearchNotesWidget::parse_sorting_setting(const Glib::ustring & sorting)
void SearchNotesWidget::on_rename_notebook() void SearchNotesWidget::on_rename_notebook()
{ {
Glib::RefPtr<Gtk::TreeSelection> selection = m_notebooksTree->get_selection(); Glib::RefPtr<Gtk::TreeSelection> selection = m_notebooksTree->get_selection();
if(selection == 0) { if(!selection) {
return; return;
} }
std::vector<Gtk::TreeModel::Path> selected_row = selection->get_selected_rows(); std::vector<Gtk::TreeModel::Path> selected_row = selection->get_selected_rows();
......
...@@ -54,7 +54,7 @@ namespace sync { ...@@ -54,7 +54,7 @@ namespace sync {
{ {
m_local_manifest_file_path = Glib::build_filename(IGnote::conf_dir(), LOCAL_MANIFEST_FILE_NAME); m_local_manifest_file_path = Glib::build_filename(IGnote::conf_dir(), LOCAL_MANIFEST_FILE_NAME);
Glib::RefPtr<Gio::File> manifest = Gio::File::create_for_path(m_local_manifest_file_path); Glib::RefPtr<Gio::File> manifest = Gio::File::create_for_path(m_local_manifest_file_path);
if(manifest != 0) { if(manifest) {
m_file_watcher = manifest->monitor_file(); m_file_watcher = manifest->monitor_file();
m_file_watcher->signal_changed() m_file_watcher->signal_changed()
.connect(sigc::mem_fun(*this, &GnoteSyncClient::on_changed)); .connect(sigc::mem_fun(*this, &GnoteSyncClient::on_changed));
......
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