Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LinkFilterDiag: Rename member function to avoid conflict with parent member #1263

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/linkfilterpref.cpp
Expand Up @@ -235,7 +235,7 @@ void LinkFilterPref::slot_row_activated( const Gtk::TreeModel::Path& path, Gtk::

LinkFilterDiag diag( this, row[ m_columns.m_col_url ], row[ m_columns.m_col_cmd ] );
if( diag.run() == Gtk::RESPONSE_OK ){
row[ m_columns.m_col_url ] = diag.get_url();
row[ m_columns.m_col_url ] = diag.get_entry_url();
row[ m_columns.m_col_cmd ] = diag.get_cmd();
static_cast<void>( row ); // cppcheck: unreadVariable
}
Expand Down Expand Up @@ -352,5 +352,5 @@ void LinkFilterPref::slot_delete()
void LinkFilterPref::slot_add()
{
LinkFilterDiag diag( this, "", "" );
if( diag.run() == Gtk::RESPONSE_OK ) append_row( diag.get_url(), diag.get_cmd() );
if( diag.run() == Gtk::RESPONSE_OK ) append_row( diag.get_entry_url(), diag.get_cmd() );
}
2 changes: 1 addition & 1 deletion src/linkfilterpref.h
Expand Up @@ -26,7 +26,7 @@ namespace CORE

LinkFilterDiag( Gtk::Window* parent, const std::string& url, const std::string& cmd );

Glib::ustring get_url() const { return m_entry_url.get_text(); }
Glib::ustring get_entry_url() const { return m_entry_url.get_text(); }
Glib::ustring get_cmd() const { return m_entry_cmd.get_text(); }

private:
Expand Down