[pan] more files (gui/p*)
- From: Dominique Dumont <ddumont src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan] more files (gui/p*)
- Date: Mon, 3 Oct 2022 16:48:33 +0000 (UTC)
commit 19b783822a366c40cc086a17ddd7f407ad07a4cc
Author: Thomas Tanner <thosrtanner googlemail com>
Date: Thu Sep 29 18:26:47 2022 +0100
more files (gui/p*)
pan/gui/pan-tree.cc | 48 ++++++++++-----------
pan/gui/pan-tree.h | 18 ++++----
pan/gui/post-ui.cc | 104 ++++++++++++++++++++++-----------------------
pan/gui/post-ui.h | 2 +-
pan/gui/prefs-ui.cc | 32 +++++++-------
pan/gui/prefs.cc | 28 ++++++------
pan/gui/profiles-dialog.cc | 10 ++---
pan/gui/progress-view.cc | 8 ++--
8 files changed, 125 insertions(+), 125 deletions(-)
---
diff --git a/pan/gui/pan-tree.cc b/pan/gui/pan-tree.cc
index eaf0c07..919073c 100644
--- a/pan/gui/pan-tree.cc
+++ b/pan/gui/pan-tree.cc
@@ -118,8 +118,8 @@ PanTreeStore :: set_iter (GtkTreeIter * iter,
{
iter->stamp = stamp;
iter->user_data = (gpointer)row;
- iter->user_data2 = 0;
- iter->user_data3 = 0;
+ iter->user_data2 = nullptr;
+ iter->user_data3 = nullptr;
}
void
@@ -138,7 +138,7 @@ PanTreeStore :: set_or_invalidate (GtkTreeIter * iter, const Row * row)
set_iter (iter, row);
else
invalidate_iter (iter);
- return row != 0;
+ return row != nullptr;
}
@@ -202,7 +202,7 @@ PanTreeStore :: model_get_path (GtkTreeModel * model,
GtkTreeIter * iter)
{
PanTreeStore * store (PAN_TREE_STORE(model));
- g_return_val_if_fail (store, 0);
+ g_return_val_if_fail (store, nullptr);
return store->get_path (iter);
}
@@ -329,7 +329,7 @@ PanTreeStore :: get_parent (GtkTreeIter * iter,
g_return_val_if_fail (child->stamp == stamp, false);
const Row * row (get_row (child));
- return set_or_invalidate (iter, row->parent!=root ? row->parent : 0);
+ return set_or_invalidate (iter, row->parent!=root ? row->parent : nullptr);
}
bool
@@ -391,7 +391,7 @@ PanTreeStore :: sortable_has_sort_func (GtkTreeSortable *sortable, gint col)
PanTreeStore * store (PAN_TREE_STORE (sortable));
g_return_val_if_fail (store, false);
column_sort_info_t::const_iterator it (store->sort_info->find (col));
- return (it!=store->sort_info->end()) && (it->second.sort_func!=0);
+ return (it!=store->sort_info->end()) && (it->second.sort_func!=nullptr);
}
// SORTING
@@ -487,7 +487,7 @@ PanTreeStore :: sort_children (SortInfo & sort_info,
if (parent == root)
{
GtkTreePath * path (gtk_tree_path_new ());
- gtk_tree_model_rows_reordered (model, path, 0, new_order);
+ gtk_tree_model_rows_reordered (model, path, nullptr, new_order);
gtk_tree_path_free (path);
}
else
@@ -532,7 +532,7 @@ PanTreeStore :: sortable_set_sort_column_id (GtkTreeSortable * sortable,
// sanity checks...
if (sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) {
g_return_if_fail (tree->sort_info->count(sort_column_id) != 0);
- g_return_if_fail (tree->sort_info->find(sort_column_id)->second.sort_func != 0);
+ g_return_if_fail (tree->sort_info->find(sort_column_id)->second.sort_func != nullptr);
}
const bool flip (sort_column_id == tree->sort_column_id);
@@ -576,7 +576,7 @@ PanTreeStore :: sortable_set_default_sort_func (GtkTreeSortable * s,
namespace
{
- GObjectClass *parent_class (0);
+ GObjectClass *parent_class (nullptr);
typedef std::vector<GValue> values_t;
}
@@ -617,9 +617,9 @@ PanTreeStore :: pan_tree_finalize (GObject *object)
delete store->root;
delete store->column_types;
delete store->sort_info;
- store->root = 0;
- store->column_types = 0;
- store->sort_info = 0;
+ store->root = nullptr;
+ store->column_types = nullptr;
+ store->sort_info = nullptr;
(*parent_class->finalize) (object);
}
@@ -676,7 +676,7 @@ PanTreeStore :: pan_tree_init (PanTreeStore * tree)
tree->stamp = g_random_int();
tree->n_columns = 0;
tree->root = new RootRow ();
- tree->row_dispose = 0;
+ tree->row_dispose = nullptr;
tree->column_types = new std::vector<GType>();
tree->sort_paused = 0;
tree->sort_info = new column_sort_info_t;
@@ -705,17 +705,17 @@ PanTreeStore :: get_type ()
sizeof (PanTreeStore),
0, // n_preallocs
(GInstanceInitFunc) pan_tree_init,
- 0 // value_table
+ nullptr // value_table
};
pan_tree_type = g_type_register_static (
G_TYPE_OBJECT, "PanTreeStore", &pan_tree_info, (GTypeFlags)0);
static const GInterfaceInfo tree_model_info =
- { (GInterfaceInitFunc)pan_tree_model_init, 0, 0 };
+ { (GInterfaceInitFunc)pan_tree_model_init, nullptr, nullptr };
g_type_add_interface_static (
pan_tree_type, GTK_TYPE_TREE_MODEL, &tree_model_info);
static const GInterfaceInfo sortable_info =
- { (GInterfaceInitFunc)pan_tree_sortable_init, 0, 0 };
+ { (GInterfaceInitFunc)pan_tree_sortable_init, nullptr, nullptr };
g_type_add_interface_static (
pan_tree_type, GTK_TYPE_TREE_SORTABLE, &sortable_info);
return pan_tree_type;
@@ -724,7 +724,7 @@ PanTreeStore :: get_type ()
PanTreeStore*
PanTreeStore :: new_tree (int n_columns, ...)
{
- g_return_val_if_fail (n_columns>0, 0);
+ g_return_val_if_fail (n_columns>0, nullptr);
PanTreeStore* tree = (PanTreeStore*) g_object_new (PAN_TREE_STORE_TYPE, NULL);
va_list args;
@@ -823,7 +823,7 @@ PanTreeStore :: insert_sorted (const parent_to_children_t& new_parents)
// add the children to this parent...
// caller passes in NULL for the parent of top-level articles...
Row * parent (*it);
- Row * key (parent==root ? 0 : parent);
+ Row * key (parent==root ? nullptr : parent);
const rows_t& children (new_parents.find(key)->second);
insert_sorted (parent, children);
pool.erase (parent);
@@ -934,7 +934,7 @@ PanTreeStore :: insert_sorted (Row * parent,
n_it (children.begin()),
n_end (children.end());
for (size_t i=0; o_it!=o_end || n_it!=n_end; ++i) {
- Row * addme (0);
+ Row * addme (nullptr);
if ((n_it==n_end)) {
//std::cerr << LINE_ID << " n is empty ... adding another o at " << tmp.size() << std::endl;
addme = *o_it++;
@@ -1061,7 +1061,7 @@ PanTreeStore :: reparent (Row * new_parent,
Row * row,
int position)
{
- g_return_if_fail (row != 0);
+ g_return_if_fail (row != nullptr);
GtkTreeModel * model (GTK_TREE_MODEL(this));
@@ -1194,7 +1194,7 @@ PanTreeStore :: remove_siblings (const rows_t& siblings,
foreach_const (rows_t, siblings, nit) {
Row * row (*nit);
removed_indices.insert (row->child_index);
- row->parent = 0;
+ row->parent = nullptr;
row->child_index = -1;
}
@@ -1288,7 +1288,7 @@ PanTreeStore :: walk (int walk_mode,
GtkTreeIter * top,
bool need_path)
{
- GtkTreePath * path (0);
+ GtkTreePath * path (nullptr);
if (need_path)
path = top ? get_path(top) : gtk_tree_path_new();
@@ -1321,9 +1321,9 @@ PanTreeStore :: Row*
PanTreeStore :: get_prev (Row * row)
{
if (!row || row==root)
- return 0;
+ return nullptr;
if (row->child_index==0)
- return row->parent==root ? 0 : row->parent;
+ return row->parent==root ? nullptr : row->parent;
Row * sibling = row->parent->nth_child (row->child_index-1);
return sibling->get_last_descendant ();
}
diff --git a/pan/gui/pan-tree.h b/pan/gui/pan-tree.h
index 275e005..d7b54ce 100644
--- a/pan/gui/pan-tree.h
+++ b/pan/gui/pan-tree.h
@@ -140,7 +140,7 @@ struct PanTreeStore
void set_value_static_string (GValue * setme, const char *);
protected:
- Row (): parent(0), child_index(-1) {}
+ Row (): parent(nullptr), child_index(-1) {}
private:
friend class PanTreeStore;
@@ -162,7 +162,7 @@ struct PanTreeStore
return (int) children.size();
}
Row * nth_child (int n) {
- Row * ret (0);
+ Row * ret (nullptr);
if (0<=n && n<(int)children.size())
ret = children[n];
return ret;
@@ -256,14 +256,14 @@ struct PanTreeStore
*
* For more flexibility, use prefix_walk() or postfix_walk().
*/
- void walk (WalkFunctor& walk, bool need_path=false) { prefix_walk (walk, 0, need_path); }
+ void walk (WalkFunctor& walk, bool need_path=false) { prefix_walk (walk, nullptr, need_path); }
void prefix_walk (WalkFunctor & walk_functor,
- GtkTreeIter * top = 0,
+ GtkTreeIter * top = nullptr,
bool need_path = false);
void postfix_walk (WalkFunctor & walk_functor,
- GtkTreeIter * top = 0,
+ GtkTreeIter * top = nullptr,
bool need_path = false);
public:
@@ -307,14 +307,14 @@ struct PanTreeStore
gpointer user_data;
GDestroyNotify destroy_notify;
- SortInfo(): sort_func(0), user_data(0), destroy_notify(0) {}
+ SortInfo(): sort_func(nullptr), user_data(nullptr), destroy_notify(nullptr) {}
~SortInfo() { clear(); }
void clear () {
if (destroy_notify) destroy_notify (user_data);
- sort_func = 0;
- user_data = 0;
- destroy_notify = 0;
+ sort_func = nullptr;
+ user_data = nullptr;
+ destroy_notify = nullptr;
}
void assign (GtkTreeIterCompareFunc sort_func,
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index a476aec..1ca3302 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -269,7 +269,7 @@ PostUI :: set_spellcheck_enabled (bool enabled)
{
#ifdef HAVE_GTKSPELL
GtkTextView * view = GTK_TEXT_VIEW(_body_view);
- GError * err (0);
+ GError * err (nullptr);
#if GTKSPELL_VERSION == 3
gboolean spell_attach = TRUE;
@@ -449,24 +449,24 @@ namespace
GtkActionEntry entries[] =
{
- { "file-menu", 0, N_("_File"), 0, 0, 0 },
- { "edit-menu", 0, N_("_Edit"), 0, 0, 0 },
- { "profile-menu", 0, N_("_Profile"), 0, 0, 0 },
- { "editors-menu", 0, N_("Set Editor"), 0, 0, 0 },
- { "post-toolbar", 0, "post", 0, 0, 0 },
+ { "file-menu", nullptr, N_("_File"), nullptr, nullptr, nullptr },
+ { "edit-menu", nullptr, N_("_Edit"), nullptr, nullptr, nullptr },
+ { "profile-menu", nullptr, N_("_Profile"), nullptr, nullptr, nullptr },
+ { "editors-menu", nullptr, N_("Set Editor"), nullptr, nullptr, nullptr },
+ { "post-toolbar", nullptr, "post", nullptr, nullptr, nullptr },
{ "post-article", GTK_STOCK_EXECUTE, N_("_Send Article"), "<control>Return", N_("Send Article Now"),
G_CALLBACK(do_send) },
- { "post-and-save-articles", GTK_STOCK_FLOPPY, N_("_Send and Save Articles to NZB"), 0, N_("Send and Save
Articles to NZB"), G_CALLBACK(do_send_and_save) },
- { "set-charset", 0, N_("Set Character _Encoding..."), 0, 0, G_CALLBACK(do_charset) },
- { "set-encoding", 0, N_("Set Content _Transfer Encoding..."), 0, 0, G_CALLBACK(do_cte) },
+ { "post-and-save-articles", GTK_STOCK_FLOPPY, N_("_Send and Save Articles to NZB"), nullptr, N_("Send
and Save Articles to NZB"), G_CALLBACK(do_send_and_save) },
+ { "set-charset", nullptr, N_("Set Character _Encoding..."), nullptr, nullptr, G_CALLBACK(do_charset) },
+ { "set-encoding", nullptr, N_("Set Content _Transfer Encoding..."), nullptr, nullptr, G_CALLBACK(do_cte)
},
{ "save-draft", GTK_STOCK_SAVE, N_("Sa_ve Draft"), "<control>s", N_("Save as a Draft for Future
Posting"), G_CALLBACK(do_save) },
{ "open-draft", GTK_STOCK_OPEN, N_("_Open Draft..."), "<control>o", N_("Open an Article Draft"),
G_CALLBACK(do_open) },
- { "close", GTK_STOCK_CLOSE, 0, 0, 0, G_CALLBACK(do_close) },
- { "cut", GTK_STOCK_CUT, 0, 0, 0, G_CALLBACK(do_cut) },
- { "copy", GTK_STOCK_COPY, 0, 0, 0, G_CALLBACK(do_copy) },
- { "paste", GTK_STOCK_PASTE, 0, 0, 0, G_CALLBACK(do_paste) },
+ { "close", GTK_STOCK_CLOSE, nullptr, nullptr, nullptr, G_CALLBACK(do_close) },
+ { "cut", GTK_STOCK_CUT, nullptr, nullptr, nullptr, G_CALLBACK(do_cut) },
+ { "copy", GTK_STOCK_COPY, nullptr, nullptr, nullptr, G_CALLBACK(do_copy) },
+ { "paste", GTK_STOCK_PASTE, nullptr, nullptr, nullptr, G_CALLBACK(do_paste) },
{ "rot13", GTK_STOCK_REFRESH, N_("_Rot13"), "<control>r", N_("Rot13 Selected Text"),
G_CALLBACK(do_rot13) },
{ "run-editor", GTK_STOCK_JUMP_TO, N_("Run _Editor"), "<control>e", N_("Run Editor"),
G_CALLBACK(do_edit) },
- { "manage-profiles", GTK_STOCK_EDIT, N_("Edit P_osting Profiles"), 0, 0, G_CALLBACK(do_profiles) },
+ { "manage-profiles", GTK_STOCK_EDIT, N_("Edit P_osting Profiles"), nullptr, nullptr,
G_CALLBACK(do_profiles) },
{ "add-files", GTK_STOCK_ADD, N_("Add _Files to Queue"), "<control>O", N_("Add Files to Queue"),
G_CALLBACK(do_add_files) },
};
@@ -520,13 +520,13 @@ namespace
const GtkToggleActionEntry toggle_entries[] =
{
- { "wrap", GTK_STOCK_JUSTIFY_FILL, N_("_Wrap Text"), 0, N_("Wrap Text"), G_CALLBACK(do_wrap), true },
- { "always-run-editor", 0, N_("Always Run Editor"), 0, 0, G_CALLBACK(do_edit2), false },
- { "remember-charset", 0, N_("Remember Character Encoding for This Group"), 0, 0,
G_CALLBACK(on_remember_charset_toggled), true },
- { "master-reply", 0, N_("Thread Attached Replies"), 0, 0, G_CALLBACK(on_mr_toggled), true },
- { "gpg-encrypt", 0, N_("PGP-Encrypt the Article"), 0, 0, G_CALLBACK(on_enc_toggled), false },
- { "gpg-sign", 0, N_("PGP-Sign the Article"), 0, 0, G_CALLBACK(on_sign_toggled), false },
- { "spellcheck", 0, N_("Check _Spelling"), 0, 0, G_CALLBACK(on_spellcheck_toggled), true }
+ { "wrap", GTK_STOCK_JUSTIFY_FILL, N_("_Wrap Text"), nullptr, N_("Wrap Text"), G_CALLBACK(do_wrap), true
},
+ { "always-run-editor", nullptr, N_("Always Run Editor"), nullptr, nullptr, G_CALLBACK(do_edit2), false },
+ { "remember-charset", nullptr, N_("Remember Character Encoding for This Group"), nullptr, nullptr,
G_CALLBACK(on_remember_charset_toggled), true },
+ { "master-reply", nullptr, N_("Thread Attached Replies"), nullptr, nullptr, G_CALLBACK(on_mr_toggled),
true },
+ { "gpg-encrypt", nullptr, N_("PGP-Encrypt the Article"), nullptr, nullptr, G_CALLBACK(on_enc_toggled),
false },
+ { "gpg-sign", nullptr, N_("PGP-Sign the Article"), nullptr, nullptr, G_CALLBACK(on_sign_toggled), false
},
+ { "spellcheck", nullptr, N_("Check _Spelling"), nullptr, nullptr, G_CALLBACK(on_spellcheck_toggled),
true }
};
void add_widget (GtkUIManager*, GtkWidget* widget, gpointer vbox)
@@ -628,7 +628,7 @@ PostUI :: add_actions (GtkWidget * box)
// read the file...
char * filename = g_build_filename (file::get_pan_home().c_str(), "post.ui", NULL);
- GError * err (0);
+ GError * err (nullptr);
if (!gtk_ui_manager_add_ui_from_file (_uim, filename, &err)) {
g_clear_error (&err);
gtk_ui_manager_add_ui_from_string (_uim, fallback_post_ui, -1, &err);
@@ -1057,7 +1057,7 @@ PostUI :: save_message_in_local_folder(const Mode& mode, const std::string& fold
// pseudo mid to get data from cache
std::string message_id = pan_g_mime_message_set_message_id(msg, mid.c_str());
std::stringstream xref;
- time_t posted = time(0); // use posted as article number, this is unique anyway
+ time_t posted = time(nullptr); // use posted as article number, this is unique anyway
xref << folder << ":"<<posted;
const Article* article = _data.xover_add (p.posting_server, folder, subject, author, posted,
message_id, refs, sizeof(*msg), 3, xref.str(), true);
if (article)
@@ -1341,7 +1341,7 @@ PostUI :: spawn_editor ()
}
// open a new tmp file
- char * fname (0);
+ char * fname (nullptr);
{
GError * err = NULL;
@@ -1535,7 +1535,7 @@ GMimeMessage*
PostUI :: new_message_from_ui (Mode mode, bool copy_body)
{
- GMimeMessage * msg(0);
+ GMimeMessage * msg(nullptr);
msg = g_mime_message_new (true);
const char * charset_cstr = _charset.c_str();
@@ -1811,13 +1811,13 @@ PostUI :: create_body_widget (GtkTextBuffer*& buf, GtkWidget*& view, const Prefs
std::string s (WRAP_COLS, 'A');
pango_layout_set_text (layout, s.c_str(), s.size());
PangoRectangle r;
- pango_layout_get_extents (layout, &r, 0);
+ pango_layout_get_extents (layout, &r, nullptr);
_wrap_pixels = PANGO_PIXELS(r.width);
// figure out how wide we want to make the window
s.assign (VIEW_COLS, 'A');
pango_layout_set_text (layout, s.c_str(), s.size());
- pango_layout_get_extents (layout, &r, 0);
+ pango_layout_get_extents (layout, &r, nullptr);
gtk_widget_set_size_request (view, PANGO_PIXELS(r.width), -1 );
// set the rest of the text view's policy
@@ -1865,7 +1865,7 @@ PostUI :: update_profile_combobox ()
// tear out the old entries
GtkTreeModel * model (gtk_combo_box_get_model (GTK_COMBO_BOX(combo)));
- for (int i(0), qty(gtk_tree_model_iter_n_children(model,0)); i<qty; ++i)
+ for (int i(0), qty(gtk_tree_model_iter_n_children(model,nullptr)); i<qty; ++i)
gtk_combo_box_text_remove (combo, 0);
// add the new entries
@@ -1915,7 +1915,7 @@ namespace
else if (type == Profile::COMMAND)
{
int argc = 0;
- char ** argv = 0;
+ char ** argv = nullptr;
if (g_file_test (pch, G_FILE_TEST_EXISTS))
{
@@ -2210,7 +2210,7 @@ namespace
std::string
PostUI :: utf8ize (const StringView& in) const
{
- const char * local_charset = 0;
+ const char * local_charset = nullptr;
g_get_charset (&local_charset);
return content_to_utf8 (in, _charset.c_str(), local_charset);
}
@@ -2313,7 +2313,7 @@ PostUI :: set_message (GMimeMessage * message)
apply_profile ();
// set focus to the first non-populated widget
- GtkWidget * grab (0);
+ GtkWidget * grab (nullptr);
if (!grab) {
const char * cpch (gtk_entry_get_text (GTK_ENTRY(_subject_entry)));
if (!cpch || !*cpch)
@@ -2444,7 +2444,7 @@ namespace
std::string from;
std::string name;
- char * key (0);
+ char * key (nullptr);
gtk_tree_model_get (model, iter, 0, &key, -1);
if (key) {
name = key;
@@ -2487,7 +2487,7 @@ PostUI :: create_main_tab ()
gtk_cell_layout_clear (GTK_CELL_LAYOUT(w));
GtkCellRenderer * r = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT(w), r, true);
- gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT(w), r, render_from, &_profiles, 0);
+ gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT(w), r, render_from, &_profiles, nullptr);
gtk_label_set_mnemonic_widget (GTK_LABEL(l), w);
gtk_table_attach (GTK_TABLE(t), w, 1, 2, row, row+1, fill, fill, 0, 0);
@@ -2582,7 +2582,7 @@ namespace
gpointer)
{
- TaskUpload* fd(0);
+ TaskUpload* fd(nullptr);
gtk_tree_model_get (model, iter, 2, &fd, -1);
if (fd)
g_object_set (renderer, "text", fd->get_basename().c_str(), NULL);
@@ -2636,11 +2636,11 @@ PostUI :: create_filequeue_tab ()
// add columns
renderer = gtk_cell_renderer_text_new ();
GtkTreeView * t = GTK_TREE_VIEW(w);
- gtk_tree_view_insert_column_with_data_func(t, 0, (_("No.")), renderer, render_row_number, 0, 0);
+ gtk_tree_view_insert_column_with_data_func(t, 0, (_("No.")), renderer, render_row_number, nullptr,
nullptr);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (t, 1,(_("Subject")),renderer,"text", 1,NULL);
renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_data_func(t, 2, (_("Filename")), renderer, render_filename, 0, 0);
+ gtk_tree_view_insert_column_with_data_func(t, 2, (_("Filename")), renderer, render_filename, nullptr,
nullptr);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (t, 3, (_("Size (KB)")),renderer,"text", 3,NULL);
@@ -2882,7 +2882,7 @@ PostUI :: create_extras_tab ()
void
PostUI :: get_selected_files_foreach (GtkTreeModel *model, GtkTreePath *, GtkTreeIter *iter, gpointer list_g)
{
- TaskUpload* file(0);
+ TaskUpload* file(nullptr);
gtk_tree_model_get (model, iter, 2, &file, -1);
static_cast<PostUI::tasks_t*>(list_g)->push_back (file);
}
@@ -3100,18 +3100,18 @@ PostUI :: PostUI (GtkWindow * parent,
_group_prefs (group_prefs),
_root (),
_part_select(nullptr),
- _from_combo (0),
- _subject_entry (0),
- _groups_entry (0),
+ _from_combo (nullptr),
+ _subject_entry (nullptr),
+ _groups_entry (nullptr),
_filequeue_store(nullptr),
_parts_store(nullptr),
- _to_entry (0),
- _followupto_entry (0),
- _replyto_entry (0),
- _body_view (0),
+ _to_entry (nullptr),
+ _followupto_entry (nullptr),
+ _replyto_entry (nullptr),
+ _body_view (nullptr),
_user_agent_check(nullptr),
_message_id_check(nullptr),
- _body_buf (0),
+ _body_buf (nullptr),
_headers_buf(nullptr),
_message (message),
_charset (DEFAULT_CHARSET),
@@ -3120,14 +3120,14 @@ PostUI :: PostUI (GtkWindow * parent,
_wrap_pixels(0),
_enc(GMIME_CONTENT_ENCODING_8BIT),
_file_queue_empty(true),
- _upload_ptr(0),
+ _upload_ptr(nullptr),
_total_parts(0),
_uploads(0),
_realized(false),
- _agroup(0),
+ _agroup(nullptr),
//body_view_realized_handler is set up in the code below
- _filequeue_eventbox (0),
- _filequeue_label (0),
+ _filequeue_eventbox (nullptr),
+ _filequeue_label (nullptr),
_body_changed_id(0),
_body_changed_idle_tag(0),
_group_entry_changed_idle_tag (0),
@@ -3149,7 +3149,7 @@ PostUI :: PostUI (GtkWindow * parent,
// _draft_autosave_id = g_timeout_add_seconds( _draft_autosave_timeout * 60, draft_save_cb, this);
g_assert (profiles.has_profiles());
- g_return_if_fail (message != 0);
+ g_return_if_fail (message != nullptr);
ua_extra = prefs.get_flag(USER_AGENT_EXTRA_PREFS_KEY, false);
@@ -3238,10 +3238,10 @@ PostUI :: create_window (GtkWindow * parent,
}
gtk_widget_destroy (d.root());
if (!got_profile)
- return 0;
+ return nullptr;
}
- return new PostUI (0, data, queue, gs, profiles, message, prefs, group_prefs, cache);
+ return new PostUI (nullptr, data, queue, gs, profiles, message, prefs, group_prefs, cache);
}
void
diff --git a/pan/gui/post-ui.h b/pan/gui/post-ui.h
index c415f9c..bf027be 100644
--- a/pan/gui/post-ui.h
+++ b/pan/gui/post-ui.h
@@ -200,7 +200,7 @@ namespace pan
GtkWidget* create_filequeue_status_bar ();
GtkWidget * _filequeue_eventbox;
GtkWidget * _filequeue_label;
- void update_filequeue_label (GtkTreeSelection *selection=0);
+ void update_filequeue_label (GtkTreeSelection *selection=nullptr);
GtkWidget* create_parts_tab ();
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 5746d93..00154db 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -203,14 +203,14 @@ namespace pan
const char * value = gtk_entry_get_text(e);
gtk_entry_set_icon_activatable(e, GTK_ENTRY_ICON_PRIMARY, false);
- gtk_entry_set_icon_from_stock(e, GTK_ENTRY_ICON_PRIMARY, 0);
- gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, 0);
+ // gtk_entry_set_icon_from_stock(e, GTK_ENTRY_ICON_PRIMARY, nullptr);
+ gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, nullptr);
// empty text
if (!value || !*value)
{
- gtk_entry_set_icon_from_stock(e, GTK_ENTRY_ICON_PRIMARY, 0);
- gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, 0);
+ gtk_entry_set_icon_from_stock(e, GTK_ENTRY_ICON_PRIMARY, nullptr);
+ gtk_entry_set_icon_tooltip_text (e, GTK_ENTRY_ICON_PRIMARY, nullptr);
// reset in map and remove accelerator
GtkAccelKey tmp;
guint tmpkey;
@@ -366,10 +366,10 @@ namespace pan
GtkWidget* new_layout_radio (GtkWidget* prev, const guint8* line, const char* value, std::string& cur,
Prefs& prefs)
{
- GtkWidget * r = prev==0
+ GtkWidget * r = prev==nullptr
? gtk_radio_button_new (NULL)
: gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON(prev));
- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_inline (-1, line, false, 0);
+ GdkPixbuf * pixbuf = gdk_pixbuf_new_from_inline (-1, line, false, nullptr);
GtkWidget * image = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_container_add (GTK_CONTAINER(r), image);
@@ -399,8 +399,8 @@ namespace pan
GtkWidget* new_orient_radio (GtkWidget* prev, const char* label, const char* value, std::string& cur,
Prefs& prefs)
{
- GtkWidget * r = prev==0
- ? gtk_radio_button_new_with_label (0, label)
+ GtkWidget * r = prev==nullptr
+ ? gtk_radio_button_new_with_label (nullptr, label)
: gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON(prev), label);
g_object_set_data_full (G_OBJECT(r), PREFS_KEY, g_strdup("pane-orient"), g_free);
g_object_set_data_full (G_OBJECT(r), PREFS_VAL, g_strdup(value), g_free);
@@ -417,7 +417,7 @@ namespace pan
const bool both = "both" == what;
GtkWidget* hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_inline (-1, line, false, 0);
+ GdkPixbuf * pixbuf = gdk_pixbuf_new_from_inline (-1, line, false, nullptr);
GtkWidget * image = gtk_image_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
if (line && (icons || both)) gtk_box_pack_start (GTK_BOX(hbox), image, true, true, 0);
@@ -548,8 +548,8 @@ namespace pan
const int row (gtk_combo_box_get_active (c));
GtkTreeModel * m = gtk_combo_box_get_model (c);
GtkTreeIter i;
- if (gtk_tree_model_iter_nth_child (m, &i, 0, row)) {
- char * val (0);
+ if (gtk_tree_model_iter_nth_child (m, &i, nullptr, row)) {
+ char * val (nullptr);
gtk_tree_model_get (m, &i, column, &val, -1);
prefs->set_string (key, val);
g_free (val);
@@ -786,7 +786,7 @@ namespace
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (model, &iter)) do {
gboolean enabled;
- char * key (0);
+ char * key (nullptr);
gtk_tree_model_get (model, &iter, 0, &enabled, 1, &key, -1);
if (enabled)
s += std::string(key) + ",";
@@ -801,7 +801,7 @@ namespace
{
HeaderColInfo& info (*static_cast<HeaderColInfo*>(user_data));
GtkTreeIter sel_iter;
- gtk_tree_selection_get_selected (info.sel, 0, &sel_iter);
+ gtk_tree_selection_get_selected (info.sel, nullptr, &sel_iter);
GtkTreePath * path = gtk_tree_model_get_path (GTK_TREE_MODEL(info.store), &sel_iter);
if (gtk_tree_path_prev (path)) {
GtkTreeIter prev_iter;
@@ -816,7 +816,7 @@ namespace
{
HeaderColInfo& info (*static_cast<HeaderColInfo*>(user_data));
GtkTreeIter sel_iter;
- gtk_tree_selection_get_selected (info.sel, 0, &sel_iter);
+ gtk_tree_selection_get_selected (info.sel, nullptr, &sel_iter);
GtkTreeIter next_iter = sel_iter;
if (gtk_tree_model_iter_next (GTK_TREE_MODEL(info.store), &next_iter)) {
gtk_list_store_move_after (info.store, &sel_iter, &next_iter);
@@ -1079,7 +1079,7 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
std::string cur = _prefs.get_string ("pane-layout", "stacked-right");
HIG :: workarea_add_section_spacer (t, row, 1);
h = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, PAD);
- w = new_layout_radio (0, icon_layout_1, "stacked-top", cur, prefs);
+ w = new_layout_radio (nullptr, icon_layout_1, "stacked-top", cur, prefs);
gtk_box_pack_start (GTK_BOX(h), w, false, false, 0);
w = new_layout_radio (w, icon_layout_2, "stacked-bottom", cur, prefs);
gtk_box_pack_start (GTK_BOX(h), w, false, false, 0);
@@ -1094,7 +1094,7 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
HIG :: workarea_add_section_title (t, &row, _("Tasks"));
HIG :: workarea_add_section_spacer (t, row, 6);
cur = _prefs.get_string ("pane-orient", "groups,headers,body");
- w = new_orient_radio (0, _("1=Groups, 2=Headers, 3=Body"), "groups,headers,body", cur, prefs);
+ w = new_orient_radio (nullptr, _("1=Groups, 2=Headers, 3=Body"), "groups,headers,body", cur, prefs);
HIG :: workarea_add_wide_control (t, &row, w);
w = new_orient_radio (w, _("1=Groups, 2=Body, 3=Headers"), "groups,body,headers", cur, prefs);
HIG :: workarea_add_wide_control (t, &row, w);
diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc
index 546353f..006e4ba 100644
--- a/pan/gui/prefs.cc
+++ b/pan/gui/prefs.cc
@@ -55,7 +55,7 @@ Prefs :: start_element (GMarkupParseContext *,
Prefs& prefs (*static_cast<Prefs*>(prefs_gpointer));
if (s == "geometry") {
- const char * name(0);
+ const char * name(nullptr);
int x(0), y(0), w(0), h(0);
for (const char **k(attribute_names), **v(attribute_vals); *k; ++k, ++v)
if (!strcmp (*k,"name")) name = *v;
@@ -68,7 +68,7 @@ Prefs :: start_element (GMarkupParseContext *,
}
if (s == "flag") {
- const char * name (0);
+ const char * name (nullptr);
bool b (false);
for (const char **k(attribute_names), **v(attribute_vals); *k; ++k, ++v)
if (!strcmp (*k,"name")) name = *v;
@@ -78,8 +78,8 @@ Prefs :: start_element (GMarkupParseContext *,
}
if (s == "string") {
- const char * name (0);
- const char * value (0);
+ const char * name (nullptr);
+ const char * value (nullptr);
for (const char **k(attribute_names), **v(attribute_vals); *k; ++k, ++v)
if (!strcmp (*k,"name")) name = *v;
else if (!strcmp(*k,"value")) value = *v;
@@ -88,8 +88,8 @@ Prefs :: start_element (GMarkupParseContext *,
}
if (s == "int") {
- const char * name (0);
- const char * value (0);
+ const char * name (nullptr);
+ const char * value (nullptr);
for (const char **k(attribute_names), **v(attribute_vals); *k; ++k, ++v)
if (!strcmp (*k,"name")) name = *v;
else if (!strcmp(*k,"value")) value = *v;
@@ -98,8 +98,8 @@ Prefs :: start_element (GMarkupParseContext *,
}
if (s == "color") {
- const char * name (0);
- const char * value (0);
+ const char * name (nullptr);
+ const char * value (nullptr);
for (const char **k(attribute_names), **v(attribute_vals); *k; ++k, ++v)
if (!strcmp (*k,"name")) name = *v;
else if (!strcmp(*k,"value")) value = *v;
@@ -113,13 +113,13 @@ Prefs :: from_string (const StringView& xml)
{
GMarkupParser p;
p.start_element = start_element;
- p.end_element = 0;
- p.text = 0;
- p.passthrough = 0;
- p.error = 0;
+ p.end_element = nullptr;
+ p.text = nullptr;
+ p.passthrough = nullptr;
+ p.error = nullptr;
GMarkupParseContext* c (
- g_markup_parse_context_new (&p, (GMarkupParseFlags)0, this, 0));
- GError * gerr (0);
+ g_markup_parse_context_new (&p, (GMarkupParseFlags)0, this, nullptr));
+ GError * gerr (nullptr);
if (g_markup_parse_context_parse (c, xml.str, xml.len, &gerr)) {
// FIXME
}
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 82fe588..65695cd 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -136,7 +136,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
gtk_dialog_set_default_response (GTK_DIALOG(_root), GTK_RESPONSE_OK);
gtk_window_set_role (GTK_WINDOW(_root), "pan-edit-profile-dialog");
- GtkWidget* hbox(0), * l(0);
+ GtkWidget* hbox(nullptr), * l(nullptr);
int row (0);
GtkWidget *t = HIG :: workarea_create ();
@@ -264,7 +264,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
PangoLayout * layout = pango_layout_new (context);
pango_layout_set_text (layout, line.c_str(), line.size());
PangoRectangle r;
- pango_layout_get_extents (layout, &r, 0);
+ pango_layout_get_extents (layout, &r, nullptr);
g_object_unref (layout);
g_object_unref (context);
pango_font_description_free (pfd);
@@ -294,7 +294,7 @@ ProfileDialog :: ProfileDialog (const Data & data,
gtk_box_pack_start (GTK_BOX( gtk_dialog_get_content_area( GTK_DIALOG(_root))), t, true, true, 0);
gtk_widget_show_all (t);
- if (parent != 0) {
+ if (parent != nullptr) {
gtk_window_set_transient_for (GTK_WINDOW(_root), parent);
gtk_window_set_position (GTK_WINDOW(_root), GTK_WIN_POS_CENTER_ON_PARENT);
}
@@ -424,7 +424,7 @@ namespace
GtkTreeModel * model;
GtkTreeIter iter;
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- char * pch (0);
+ char * pch (nullptr);
gtk_tree_model_get (model, &iter, COL_NAME, &pch, -1);
if (pch) {
name = pch;
@@ -591,7 +591,7 @@ ProfilesDialog :: ProfilesDialog (const Data& data, Profiles &profiles, GtkWindo
gtk_widget_show_all (hbox);
- if (parent != 0) {
+ if (parent != nullptr) {
gtk_window_set_transient_for (GTK_WINDOW(_root), parent);
gtk_window_set_position (GTK_WINDOW(_root), GTK_WIN_POS_CENTER_ON_PARENT);
}
diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc
index 6ee3a3e..04760c0 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -31,7 +31,7 @@ ProgressView :: ProgressView ():
_root (gtk_event_box_new ()),
_progressbar (gtk_progress_bar_new ()),
_style (gtk_widget_get_style (_progressbar)),
- _progress (0)
+ _progress (nullptr)
{
gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(_progressbar), PANGO_ELLIPSIZE_MIDDLE);
gtk_container_add (GTK_CONTAINER(_root), _progressbar);
@@ -43,7 +43,7 @@ ProgressView :: ProgressView ():
ProgressView :: ~ProgressView ()
{
- set_progress(0);
+ set_progress(nullptr);
g_object_unref (_style);
}
@@ -55,7 +55,7 @@ ProgressView :: set_progress (Progress * progress)
if (_progress)
{
_progress->remove_listener (this);
- _progress = 0;
+ _progress = nullptr;
}
if (progress)
@@ -113,7 +113,7 @@ ProgressView :: on_progress_status_idle (gpointer self_gpointer)
else
gtk_progress_bar_set_show_text (GTK_PROGRESS_BAR(self->_progressbar), false);
#endif
- const char* tmp = iconv_inited ? __g_mime_iconv_strdup(conv,status.c_str()) : 0;
+ const char* tmp = iconv_inited ? __g_mime_iconv_strdup(conv,status.c_str()) : nullptr;
if (tmp) { status = tmp; g_free((char*)tmp); }
gtk_progress_bar_set_text (GTK_PROGRESS_BAR(self->_progressbar), status.c_str());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]