[pan] another bunch of nullptrs
- From: Dominique Dumont <ddumont src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan] another bunch of nullptrs
- Date: Mon, 3 Oct 2022 16:48:33 +0000 (UTC)
commit 38324ba817fc725ba0df1f8d3b37cecb693a6ef8
Author: Thomas Tanner <thosrtanner58 yahoo com>
Date: Wed Sep 28 21:05:28 2022 +0100
another bunch of nullptrs
pan/data/cert-store.h | 4 ++--
pan/data/data.h | 8 ++++----
pan/data/encode-cache.h | 2 +-
pan/data/parts.h | 2 +-
pan/general/worker-pool.h | 2 +-
pan/gui/hig.h | 2 +-
pan/gui/server-ui.cc | 22 ++++++++++-----------
pan/gui/task-pane.cc | 46 +++++++++++++++++++++----------------------
pan/gui/url.cc | 6 +++---
pan/tasks/nntp.h | 2 +-
pan/tasks/socket-impl-main.h | 4 ++--
pan/tasks/task-article.h | 8 ++++----
pan/tasks/task-upload.h | 10 +++++-----
pan/usenet-utils/mime-utils.h | 2 +-
14 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/pan/data/cert-store.h b/pan/data/cert-store.h
index d4dc4ef..ab906d8 100644
--- a/pan/data/cert-store.h
+++ b/pan/data/cert-store.h
@@ -64,7 +64,7 @@ namespace pan
public:
int get_all_certs_from_disk();
- bool import_from_file (const Quark& server, const char* fn = 0);
+ bool import_from_file (const Quark& server, const char* fn = nullptr);
bool in_blacklist (const Quark& s)
{
@@ -85,7 +85,7 @@ namespace pan
{
if (_cert_to_server.count(s) > 0)
return _cert_to_server[s];
- return 0;
+ return nullptr;
}
private:
diff --git a/pan/data/data.h b/pan/data/data.h
index 8c250a6..53d8da8 100644
--- a/pan/data/data.h
+++ b/pan/data/data.h
@@ -564,10 +564,10 @@ namespace pan
virtual const Article* get_article (const Quark& mid) const=0;
virtual void set_filter (const ShowType show_type = SHOW_ARTICLES,
- const FilterInfo * filter_or_null_to_reset = 0) = 0;
+ const FilterInfo * filter_or_null_to_reset = nullptr) = 0;
virtual void set_rules (const ShowType show_type = SHOW_ARTICLES,
- const RulesInfo * filter_or_null_to_reset = 0) = 0;
+ const RulesInfo * filter_or_null_to_reset = nullptr) = 0;
};
/**
@@ -576,8 +576,8 @@ namespace pan
virtual ArticleTree* group_get_articles (const Quark & group,
const Quark & save_path, // for auto-download
const ShowType show_type = SHOW_ARTICLES,
- const FilterInfo * criteria = 0,
- const RulesInfo * rules = 0) const=0;
+ const FilterInfo * criteria = nullptr,
+ const RulesInfo * rules = nullptr) const=0;
virtual void group_clear_articles (const Quark& group) = 0;
diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h
index 1affc0c..0249744 100644
--- a/pan/data/encode-cache.h
+++ b/pan/data/encode-cache.h
@@ -88,7 +88,7 @@ namespace pan
size_t _size;
time_t _date;
FILE * _fp;
- MsgInfo(): _size(0), _date(0), _fp(0) {}
+ MsgInfo(): _size(0), _date(0), _fp(nullptr) {}
};
typedef std::map<Quark,MsgInfo> mid_to_info_t;
diff --git a/pan/data/parts.h b/pan/data/parts.h
index 289c57e..cdfbddd 100644
--- a/pan/data/parts.h
+++ b/pan/data/parts.h
@@ -143,7 +143,7 @@ namespace pan
size_t len_used;
char * packed_mid;
Part(): number(0), bytes(0),
- len_used(0), packed_mid(0) {}
+ len_used(0), packed_mid(nullptr) {}
Part(number_t n, bytes_t b, size_t l);
~Part() { delete [] packed_mid; }
Part (const Part&);
diff --git a/pan/general/worker-pool.h b/pan/general/worker-pool.h
index f107a30..32bc5b4 100644
--- a/pan/general/worker-pool.h
+++ b/pan/general/worker-pool.h
@@ -60,7 +60,7 @@ namespace pan
{
public:
- Worker(): pool(0), listener(0),
+ Worker(): pool(nullptr), listener(nullptr),
cancelled(false), silent(false),
delete_worker(false) {}
diff --git a/pan/gui/hig.h b/pan/gui/hig.h
index ebab4ad..eb863f2 100644
--- a/pan/gui/hig.h
+++ b/pan/gui/hig.h
@@ -70,7 +70,7 @@ namespace pan
int * row,
const char * mnemonic_string,
GtkWidget * control,
- GtkWidget * mnemonic_or_null_if_control_is_mnemonic=0);
+ GtkWidget * mnemonic_or_null_if_control_is_mnemonic= nullptr);
static void message_dialog_set_text (GtkMessageDialog * dialog,
const char * primary,
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 3f2b6ee..737f469 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -149,7 +149,7 @@ namespace
edit_dialog_populate (Data&, Prefs& prefs, const Quark& server, ServerEditDialog * d)
{
// sanity clause
- g_return_if_fail (d!=0);
+ g_return_if_fail (d!=nullptr );
g_return_if_fail (GTK_IS_WIDGET(d->dialog));
d->server = server;
@@ -285,7 +285,7 @@ namespace
if (gtk_combo_box_get_active_iter (combo, &iter))
gtk_tree_model_get (gtk_combo_box_get_model(combo), &iter, 1, &header_comp, -1);
- const char * err_msg (0);
+ const char * err_msg (nullptr);
if (addr.empty())
err_msg = _("Please specify the server's address.");
@@ -553,8 +553,8 @@ namespace
const guint8 * pixbuf_txt;
GdkPixbuf * pixbuf;
} _icons[ICON_QTY] = {
- { icon_plain, 0 },
- { icon_cert, 0 }
+ { icon_plain, nullptr },
+ { icon_cert, nullptr }
};
}
@@ -599,7 +599,7 @@ namespace
Quark
get_selected_server (ServerListDialog * d)
{
- g_assert (d != 0);
+ g_assert (d != nullptr);
Quark server;
@@ -607,7 +607,7 @@ namespace
GtkTreeModel * model;
GtkTreeIter iter;
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- char * host (0);
+ char * host (nullptr);
gtk_tree_model_get (model, &iter, COL_DATA, &host, -1);
if (host) {
server = host;
@@ -622,7 +622,7 @@ namespace
Quark
get_selected_server_name (ServerListDialog * d)
{
- g_assert (d != 0);
+ g_assert (d != nullptr);
Quark server;
@@ -630,7 +630,7 @@ namespace
GtkTreeModel * model;
GtkTreeIter iter;
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- char * host (0);
+ char * host (nullptr);
gtk_tree_model_get (model, &iter, COL_HOST, &host, -1);
if (host) {
server = host;
@@ -805,7 +805,7 @@ namespace
if (!buf) g_snprintf(buf,sizeof(buf), "%s", _("No information available.")) ;
GtkWidget * w = gtk_message_dialog_new (
- 0,
+ nullptr,
GtkDialogFlags(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE, NULL);
@@ -1028,7 +1028,7 @@ sec_dialog_new (Data& data, Queue& queue, Prefs& prefs, GtkWindow* parent)
ServerListDialog * d = new ServerListDialog (data, queue, prefs);
for (guint i=0; i<ICON_QTY; ++i)
- _icons[i].pixbuf = gdk_pixbuf_new_from_inline (-1, _icons[i].pixbuf_txt, FALSE, 0);
+ _icons[i].pixbuf = gdk_pixbuf_new_from_inline (-1, _icons[i].pixbuf_txt, FALSE, nullptr);
// dialog
char * title = g_strdup_printf ("Pan: %s", _("SSL Certificates"));
@@ -1053,7 +1053,7 @@ sec_dialog_new (Data& data, Queue& queue, Prefs& prefs, GtkWindow* parent)
GtkCellRenderer * r = GTK_CELL_RENDERER (g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF, "xpad", 2,"ypad",
0,NULL));
GtkTreeViewColumn * column = gtk_tree_view_column_new_with_attributes (_("Certificates"), r, NULL);
- gtk_tree_view_column_set_cell_data_func (column, r, render_cert_flag, 0, 0);
+ gtk_tree_view_column_set_cell_data_func (column, r, render_cert_flag, nullptr, nullptr);
gtk_tree_view_append_column (GTK_TREE_VIEW(w), column);
r = gtk_cell_renderer_text_new ();
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index ed696ed..bceb1aa 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -55,7 +55,7 @@ void
TaskPane :: get_selected_tasks_foreach (GtkTreeModel *model, GtkTreePath *, GtkTreeIter *iter, gpointer
list_g)
{
- Task * task (0);
+ Task * task (nullptr);
gtk_tree_model_get (model, iter, COL_TASK_POINTER, &task, -1);
static_cast<tasks_t*>(list_g)->push_back (task);
}
@@ -114,7 +114,7 @@ namespace
{
EvolutionDateMaker date_maker;
- char * date(0);
+ char * date(nullptr);
TaskUpload * tu (dynamic_cast<TaskUpload*>(task));
if (tu)
@@ -186,12 +186,12 @@ TaskPane:: on_tooltip_query(GtkWidget *widget,
GtkTreeIter iter;
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
- GtkTreePath *path(0);
+ GtkTreePath *path(nullptr);
if (!gtk_tree_view_get_tooltip_context (tree_view, &x, &y, keyboard_tip, &model, &path, &iter))
return false;
- Task * task(0);
+ Task * task(nullptr);
gtk_tree_model_get (model, &iter, COL_TASK_POINTER, &task, -1);
char buffer[4096];
@@ -540,7 +540,7 @@ namespace
GtkTreeIter *iter,
Queue * queue)
{
- Task * task (0);
+ Task * task (nullptr);
int state;
gtk_tree_model_get (model, iter, COL_TASK_POINTER, &task,
COL_TASK_STATE, &state,
@@ -549,7 +549,7 @@ namespace
if (!task) return;
// build the state string
- const char * state_str (0);
+ const char * state_str (nullptr);
switch (state) {
case Queue::RUNNING: state_str = _("Running"); break;
case Queue::DECODING: state_str = _("Decoding"); break;
@@ -614,7 +614,7 @@ namespace
status.insert (0, buf);
}
- char * str (0);
+ char * str (nullptr);
if (state == Queue::RUNNING || state == Queue::DECODING
|| state == Queue::ENCODING)
str = g_markup_printf_escaped ("<b>%s</b>\n<small>%s</small>", descr, status.c_str());
@@ -664,15 +664,15 @@ namespace
namespace
{
- void do_move_up (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->up_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_move_down (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->down_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_move_top (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->top_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_move_bottom (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->bottom_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_show_info (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->show_info_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_stop (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->stop_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_delete (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->delete_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_restart (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->restart_clicked_cb(0,
static_cast<TaskPane*>(p)); }
- void do_change_dest (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->change_dest_clicked_cb(0,
static_cast<TaskPane*>(p)); }
+ void do_move_up (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->up_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_move_down (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->down_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_move_top (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->top_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_move_bottom (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->bottom_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_show_info (GtkAction*, gpointer p) {
static_cast<TaskPane*>(p)->show_info_clicked_cb(nullptr, static_cast<TaskPane*>(p)); }
+ void do_stop (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->stop_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_delete (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->delete_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_restart (GtkAction*, gpointer p) { static_cast<TaskPane*>(p)->restart_clicked_cb(nullptr,
static_cast<TaskPane*>(p)); }
+ void do_change_dest (GtkAction*, gpointer p) {
static_cast<TaskPane*>(p)->change_dest_clicked_cb(nullptr, static_cast<TaskPane*>(p)); }
GtkActionEntry taskpane_popup_entries[] =
{
@@ -732,7 +732,7 @@ TaskPane :: add_actions (GtkWidget * box)
_uim = gtk_ui_manager_new ();
// read the file...
char * filename = g_build_filename (file::get_pan_home().c_str(), "taskpane.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_taskpane_ui, -1, &err);
@@ -899,7 +899,7 @@ namespace
void entry_icon_release (GtkEntry*, GtkEntryIconPosition icon_pos, GdkEventButton*, gpointer menu)
{
if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
- gtk_menu_popup (GTK_MENU(menu), 0, 0, 0, 0, 0, gtk_get_current_event_time());
+ gtk_menu_popup (GTK_MENU(menu), nullptr, nullptr, nullptr, nullptr, 0, gtk_get_current_event_time());
}
void entry_icon_release_2 (GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEventButton*, gpointer
pane_gpointer)
@@ -917,7 +917,7 @@ namespace
if (search_text.empty()) return true;
- Task *task(0);
+ Task *task(nullptr);
/* Get value from column */
gtk_tree_model_get( GTK_TREE_MODEL(model), iter, COL_TASK_POINTER, &task, -1 );
@@ -997,7 +997,7 @@ TaskPane :: create_filter_entry ()
search_mode = 1;
else
search_mode = 0;
- GSList * l = 0;
+ GSList * l = nullptr;
for (int i=0, qty=G_N_ELEMENTS(mode_strings); i<qty; ++i) {
GtkWidget * w = gtk_radio_menu_item_new_with_label (l, _(mode_strings[i]));
l = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM(w));
@@ -1052,7 +1052,7 @@ TaskPane :: TaskPane (Queue& queue, Prefs& prefs): _queue(queue), _prefs(prefs)
w = add_button (buttons, GTK_STOCK_DELETE, G_CALLBACK(delete_clicked_cb), this);
gtk_widget_set_tooltip_text( w, _("Delete Tasks"));
gtk_box_pack_start (GTK_BOX(buttons), gtk_separator_new(GTK_ORIENTATION_VERTICAL), 0, 0, 0);
- w = add_button (buttons, GTK_STOCK_CLOSE, 0, 0);
+ w = add_button (buttons, GTK_STOCK_CLOSE, nullptr, nullptr);
g_signal_connect_swapped (w, "clicked", G_CALLBACK(gtk_widget_destroy), _root);
w = _popup_toggle = gtk_check_button_new ();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), _prefs.get_flag("show-taskpane-popups", true));
@@ -1069,7 +1069,7 @@ TaskPane :: TaskPane (Queue& queue, Prefs& prefs): _queue(queue), _prefs(prefs)
// statusbar
GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, PAD);
- w = _status_label = gtk_label_new (0);
+ w = _status_label = gtk_label_new (nullptr);
gtk_box_pack_start (GTK_BOX(hbox), w, false, false, PAD_SMALL);
_store = gtk_list_store_new (NUM_COLS, G_TYPE_POINTER, G_TYPE_INT);
@@ -1078,7 +1078,7 @@ TaskPane :: TaskPane (Queue& queue, Prefs& prefs): _queue(queue), _prefs(prefs)
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(_view), true);
GtkCellRenderer * renderer = gtk_cell_renderer_text_new ();
GtkTreeViewColumn * col = gtk_tree_view_column_new_with_attributes (_("State"), renderer, NULL);
- gtk_tree_view_column_set_cell_data_func (col, renderer, (GtkTreeCellDataFunc)render_state, &_queue, 0);
+ gtk_tree_view_column_set_cell_data_func (col, renderer, (GtkTreeCellDataFunc)render_state, &_queue,
nullptr);
gtk_tree_view_append_column (GTK_TREE_VIEW(_view), col);
GtkTreeSelection * selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (_view));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
diff --git a/pan/gui/url.cc b/pan/gui/url.cc
index 94ffb52..534aa57 100644
--- a/pan/gui/url.cc
+++ b/pan/gui/url.cc
@@ -89,9 +89,9 @@ URL :: open (const Prefs& prefs, const char * url, Mode mode)
else if (strstr(url,"http") || strstr(url,"://"))
mode = WEB;
else // ...
- mode = WEB;
+ mode = WEB;
}
-
+
if ((mode==AUTO || mode==WEB) && !strstr (url, "://") && strstr (url, "www")) {
mode = WEB;
tmp = std::string("http://") + url;
@@ -115,7 +115,7 @@ URL :: open (const Prefs& prefs, const char * url, Mode mode)
cmd += std::string(" \"") + tmp + '"';
// std::cerr << __FILE__ << ':' << __LINE__ << " cmd [" << cmd << ']' << std::endl;
- GError * err (0);
+ GError * err (nullptr);
g_spawn_command_line_async (cmd.c_str(), &err);
if (err != NULL) {
Log::add_err_va (_("Error starting URL: %s (Command was: %s)"), err->message, cmd.c_str());
diff --git a/pan/tasks/nntp.h b/pan/tasks/nntp.h
index 04d89e0..6f6c4f6 100644
--- a/pan/tasks/nntp.h
+++ b/pan/tasks/nntp.h
@@ -154,7 +154,7 @@ namespace pan {
_server_info(info),
_socket(socket),
_socket_error(false),
- _listener(0),
+ _listener(nullptr),
_username(username),
_password(password),
_nntp_response_text(false),
diff --git a/pan/tasks/socket-impl-main.h b/pan/tasks/socket-impl-main.h
index 2cd5895..8eacfe4 100644
--- a/pan/tasks/socket-impl-main.h
+++ b/pan/tasks/socket-impl-main.h
@@ -56,8 +56,8 @@ namespace
namespace
{
- static t_getaddrinfo p_getaddrinfo (0);
- static t_freeaddrinfo p_freeaddrinfo (0);
+ static t_getaddrinfo p_getaddrinfo (nullptr);
+ static t_freeaddrinfo p_freeaddrinfo (nullptr);
static void ensure_module_init (void)
{
diff --git a/pan/tasks/task-article.h b/pan/tasks/task-article.h
index 407cb20..df858e9 100644
--- a/pan/tasks/task-article.h
+++ b/pan/tasks/task-article.h
@@ -71,10 +71,10 @@ namespace pan
ArticleCache & cache,
ArticleRead & read,
const ArticleActionType& mark_read_action,
- Progress::Listener* l=0,
+ Progress::Listener* l=nullptr,
SaveMode save_mode = NONE,
const Quark & save_path = Quark(),
- const char * filename=0,
+ const char * filename=nullptr,
const SaveOptions & options=SAVE_ALL);
virtual ~TaskArticle ();
time_t get_time_posted () const { return _time_posted; }
@@ -144,13 +144,13 @@ namespace pan
void reset() {
buf_t tmp;
buf.swap (tmp); // deallocates space
- nntp = 0;
+ nntp = nullptr;
}
};
typedef std::vector<Needed> needed_t;
needed_t _needed;
- void update_work (NNTP* checkin_pending=0);
+ void update_work (NNTP* checkin_pending=nullptr);
};
}
diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h
index f680316..c953b5a 100644
--- a/pan/tasks/task-upload.h
+++ b/pan/tasks/task-upload.h
@@ -80,8 +80,8 @@ namespace pan
std::string mid; // for rng
std::string cachename;
Xref xref;
- Needed (): nntp(0), bytes(0) , partno(1) {}
- void reset() { nntp = 0; }
+ Needed (): nntp(nullptr), bytes(0) , partno(1) {}
+ void reset() { nntp = nullptr; }
};
typedef std::map<int, Needed> needed_t;
@@ -92,8 +92,8 @@ namespace pan
EncodeCache & cache,
Article article,
UploadInfo format,
- GMimeMessage * msg=0,
- Progress::Listener * listener= 0);
+ GMimeMessage * msg=nullptr,
+ Progress::Listener * listener= nullptr);
virtual ~TaskUpload ();
@@ -156,7 +156,7 @@ namespace pan
bool _first;
std::string _groups;
- void update_work (NNTP * checkin_pending = 0);
+ void update_work (NNTP * checkin_pending = nullptr);
public:
void set_encoder_done (bool setme) { _encoder_has_run = setme; }
diff --git a/pan/usenet-utils/mime-utils.h b/pan/usenet-utils/mime-utils.h
index d7b4e16..ed93c10 100644
--- a/pan/usenet-utils/mime-utils.h
+++ b/pan/usenet-utils/mime-utils.h
@@ -115,7 +115,7 @@ namespace pan
extern iconv_t conv;
extern bool iconv_inited;
- static char * __g_mime_iconv_strdup (iconv_t cd, const char *str, const char* charset=0)
+ static char * __g_mime_iconv_strdup (iconv_t cd, const char *str, const char* charset=nullptr)
{
return g_mime_iconv_strndup(cd, str, strlen(str));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]