[niepce] Use nullptr instead of NULL
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Use nullptr instead of NULL
- Date: Sun, 30 Jun 2013 01:33:01 +0000 (UTC)
commit 82fe3c2c39aaff15da68c1009e25e1f38eddf0bf
Author: Hubert Figuière <hub figuiere net>
Date: Fri Jun 28 19:37:52 2013 -0400
Use nullptr instead of NULL
src/fwk/base/date.hpp | 6 +-
src/fwk/toolkit/application.cpp | 4 +-
src/fwk/toolkit/frame.cpp | 6 +-
src/fwk/toolkit/metadatawidget.cpp | 6 +-
src/fwk/toolkit/mimetype.cpp | 4 +-
src/fwk/toolkit/uicontroller.cpp | 4 +-
src/fwk/toolkit/widgets/addinstreemodel.cpp | 4 +-
src/fwk/toolkit/widgets/editablehscale.cpp | 4 +-
src/fwk/toolkit/widgets/imagegridview.cpp | 2 +-
src/fwk/utils/buffer.hpp | 2 +-
src/fwk/utils/exempi.cpp | 41 ++++++++---------
src/fwk/utils/exempi.hpp | 6 +-
src/libraryclient/clientimpl.cpp | 2 +-
src/ncr/image.cpp | 50 ++++++++++----------
src/ncr/init.cpp | 4 +-
src/ncr/ncr.cpp | 4 +-
src/niepce/main.cpp | 2 +-
src/niepce/modules/darkroom/toolboxcontroller.cpp | 6 +-
src/niepce/ui/dialogs/editlabels.cpp | 2 +-
src/niepce/ui/dialogs/importdialog.cpp | 14 +++---
src/niepce/ui/dialogs/preferencesdialog.cpp | 6 +-
src/niepce/ui/gridviewmodule.cpp | 8 ++--
src/niepce/ui/metadatapanecontroller.cpp | 16 +++---
src/niepce/ui/selectioncontroller.cpp | 2 +-
src/niepce/ui/thumbstripview.cpp | 10 ++--
src/niepce/ui/workspacecontroller.cpp | 2 +-
26 files changed, 108 insertions(+), 109 deletions(-)
---
diff --git a/src/fwk/base/date.hpp b/src/fwk/base/date.hpp
index add14f0..5435830 100644
--- a/src/fwk/base/date.hpp
+++ b/src/fwk/base/date.hpp
@@ -1,7 +1,7 @@
/*
* niepce - fwk/base/date.hpp
*
- * Copyright (C) 2012 Hubert Figuiere
+ * Copyright (C) 2012-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@ XmpDateTime& make_xmp_date_time(time_t t, XmpDateTime& xmp_dt);
class Date
{
public:
- Date(const XmpDateTime& dt, const Timezone* tz = NULL);
- Date(const time_t dt, const Timezone* tz = NULL);
+ Date(const XmpDateTime& dt, const Timezone* tz = nullptr);
+ Date(const time_t dt, const Timezone* tz = nullptr);
std::string to_string() const;
const XmpDateTime& xmp_date() const
diff --git a/src/fwk/toolkit/application.cpp b/src/fwk/toolkit/application.cpp
index 1c8c98d..4ea66d5 100644
--- a/src/fwk/toolkit/application.cpp
+++ b/src/fwk/toolkit/application.cpp
@@ -2,7 +2,7 @@
/*
* niepce - framework/application.cpp
*
- * Copyright (C) 2007-2009, 2013 Hubert Figuiere
+ * Copyright (C) 2007-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -141,7 +141,7 @@ void Application::_add(const Controller::Ptr & sub, bool attach)
UiController::Ptr uictrl = std::dynamic_pointer_cast<UiController>(sub);
if(uictrl) {
Gtk::Widget *w = uictrl->buildWidget(uiManager());
- Gtk::Window *win = NULL;
+ Gtk::Window *win = nullptr;
if(attach && m_gtkapp && (win = dynamic_cast<Gtk::Window*>(w))) {
m_gtkapp->add_window(*win);
}
diff --git a/src/fwk/toolkit/frame.cpp b/src/fwk/toolkit/frame.cpp
index bc240c3..819c3d7 100644
--- a/src/fwk/toolkit/frame.cpp
+++ b/src/fwk/toolkit/frame.cpp
@@ -1,7 +1,7 @@
/*
* niepce - fwk/toolkit/application.cpp
*
- * Copyright (C) 2007-2009 Hubert Figuiere
+ * Copyright (C) 2007-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ namespace fwk {
Frame::Frame(const std::string & layout_cfg_key)
: m_window(new Gtk::Window()),
- m_builder(NULL),
+ m_builder(nullptr),
m_layout_cfg_key(layout_cfg_key)
{
connectSignals();
@@ -47,7 +47,7 @@ Frame::Frame(const std::string & layout_cfg_key)
Frame::Frame(const std::string & gladeFile,
const Glib::ustring & widgetName,
const std::string & layout_cfg_key)
- : m_window(NULL),
+ : m_window(nullptr),
m_builder(Gtk::Builder::create_from_file(gladeFile)),
m_layout_cfg_key(layout_cfg_key)
{
diff --git a/src/fwk/toolkit/metadatawidget.cpp b/src/fwk/toolkit/metadatawidget.cpp
index ce8497f..f6d8552 100644
--- a/src/fwk/toolkit/metadatawidget.cpp
+++ b/src/fwk/toolkit/metadatawidget.cpp
@@ -51,7 +51,7 @@ namespace fwk {
MetaDataWidget::MetaDataWidget(const Glib::ustring & title)
: ToolboxItemWidget(title),
m_table(1, 2, false),
- m_fmt(NULL),
+ m_fmt(nullptr),
m_update(false)
{
add(m_table);
@@ -141,7 +141,7 @@ MetaDataWidget::create_date_widget(bool /*readonly*/, uint32_t id)
void
MetaDataWidget::create_widgets_for_format(const MetaDataSectionFormat * fmt)
{
- Gtk::Widget *w = NULL;
+ Gtk::Widget *w = nullptr;
const MetaDataFormat * current = fmt->formats;
int n_row = 0;
@@ -384,7 +384,7 @@ bool MetaDataWidget::set_date_data(Gtk::Widget* w, const PropertyValue & value)
void MetaDataWidget::add_data(const MetaDataFormat * current,
const PropertyValue & value)
{
- Gtk::Widget *w = NULL;
+ Gtk::Widget *w = nullptr;
auto iter = m_data_map.find(current->id);
if(iter == m_data_map.end()) {
ERR_OUT("no widget for property");
diff --git a/src/fwk/toolkit/mimetype.cpp b/src/fwk/toolkit/mimetype.cpp
index 457d917..6e072be 100644
--- a/src/fwk/toolkit/mimetype.cpp
+++ b/src/fwk/toolkit/mimetype.cpp
@@ -1,7 +1,7 @@
/*
* niepce - fwk/mimetype.cpp
*
- * Copyright (C) 2008-2009 Hubert Figuiere
+ * Copyright (C) 2008-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ MimeType::MimeType(const std::string & filename)
catch(const Glib::Exception &e) {
gboolean uncertainty = false;
gchar *content_type = g_content_type_guess(filename.c_str(),
- NULL, 0, &uncertainty);
+ nullptr, 0, &uncertainty);
m_type = content_type;
g_free(content_type);
diff --git a/src/fwk/toolkit/uicontroller.cpp b/src/fwk/toolkit/uicontroller.cpp
index 6c545cf..7a5f0f0 100644
--- a/src/fwk/toolkit/uicontroller.cpp
+++ b/src/fwk/toolkit/uicontroller.cpp
@@ -1,7 +1,7 @@
/*
* niepce - fwk/toolkit/uicontroller.hpp
*
- * Copyright (C) 2009 Hubert Figuiere
+ * Copyright (C) 2009-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
namespace fwk {
UiController::UiController()
- : m_widget(NULL)
+ : m_widget(nullptr)
, m_ui_merge_id(0)
{
}
diff --git a/src/fwk/toolkit/widgets/addinstreemodel.cpp b/src/fwk/toolkit/widgets/addinstreemodel.cpp
index 83eb17d..9fc0b4e 100644
--- a/src/fwk/toolkit/widgets/addinstreemodel.cpp
+++ b/src/fwk/toolkit/widgets/addinstreemodel.cpp
@@ -1,7 +1,7 @@
/*
* gnote
*
- * Copyright (C) 2009 Hubert Figuiere
+ * Copyright (C) 2009-2013 Hubert Figuiere
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -51,7 +51,7 @@ namespace fwk {
fwk::DynamicModule * AddinsTreeModel::get_module(const Gtk::TreeIter & iter)
{
- fwk::DynamicModule * module = NULL;
+ fwk::DynamicModule * module = nullptr;
if(iter) {
iter->get_value(2, module);
}
diff --git a/src/fwk/toolkit/widgets/editablehscale.cpp b/src/fwk/toolkit/widgets/editablehscale.cpp
index 1187ddf..b0b760f 100644
--- a/src/fwk/toolkit/widgets/editablehscale.cpp
+++ b/src/fwk/toolkit/widgets/editablehscale.cpp
@@ -1,7 +1,7 @@
/*
* niepce - fwk/widgets/editablehscale.cpp
*
- * Copyright (C) 2008 Hubert Figuiere
+ * Copyright (C) 2008-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
namespace fwk {
EditableHScale::EditableHScale(double min, double max, double step)
- : m_icon(NULL),
+ : m_icon(nullptr),
m_adj(Gtk::Adjustment::create(0, min, max, step)),
m_scale(m_adj), m_entry(m_adj),
m_dirty(false)
diff --git a/src/fwk/toolkit/widgets/imagegridview.cpp b/src/fwk/toolkit/widgets/imagegridview.cpp
index ee1ab53..fc5189d 100644
--- a/src/fwk/toolkit/widgets/imagegridview.cpp
+++ b/src/fwk/toolkit/widgets/imagegridview.cpp
@@ -43,7 +43,7 @@ bool ImageGridView::on_button_press_event(GdkEventButton *event)
{
bool ret = Gtk::IconView::on_button_press_event(event);
- Gtk::CellRenderer* cell = NULL;
+ Gtk::CellRenderer* cell = nullptr;
bool found = get_item_at_pos(event->x, event->y, cell);
if(found) {
ClickableCellRenderer* clickable_cell = dynamic_cast<ClickableCellRenderer*>(cell);
diff --git a/src/fwk/utils/buffer.hpp b/src/fwk/utils/buffer.hpp
index 1daf2b3..a0a187f 100644
--- a/src/fwk/utils/buffer.hpp
+++ b/src/fwk/utils/buffer.hpp
@@ -34,7 +34,7 @@ class Buffer {
public:
- Buffer (): m_data (NULL), m_len (0)
+ Buffer (): m_data (nullptr), m_len (0)
{}
Buffer (const char *a_buf, unsigned long a_len)
diff --git a/src/fwk/utils/exempi.cpp b/src/fwk/utils/exempi.cpp
index 0fcc847..724ca5c 100644
--- a/src/fwk/utils/exempi.cpp
+++ b/src/fwk/utils/exempi.cpp
@@ -1,7 +1,7 @@
/*
* niepce - utils/exempi.cpp
*
- * Copyright (C) 2007-2008,2012 Hubert Figuiere
+ * Copyright (C) 2007-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -50,17 +50,16 @@ ExempiManager::ExempiManager(const ns_defs_t* namespaces)
{
if(xmp_init()) {
xmp_register_namespace(xmp::UFRAW_INTEROP_NAMESPACE,
- xmp::UFRAW_INTEROP_NS_PREFIX, NULL);
+ xmp::UFRAW_INTEROP_NS_PREFIX, nullptr);
xmp_register_namespace(xmp::NIEPCE_XMP_NAMESPACE,
- xmp::NIEPCE_XMP_NS_PREFIX, NULL);
+ xmp::NIEPCE_XMP_NS_PREFIX, nullptr);
- if(namespaces != NULL) {
- const ns_defs_t* iter = namespaces;
- for( ; iter->ns != NULL; iter++)
+ if(namespaces != nullptr) {
+ for(auto iter = namespaces; iter->ns != nullptr; iter++)
{
// TODO check the return code
xmp_register_namespace(iter->ns,
- iter->prefix, NULL);
+ iter->prefix, nullptr);
}
}
}
@@ -86,24 +85,24 @@ XmpMeta::XmpMeta()
* It will locate the XMP sidecar for the file.
*/
XmpMeta::XmpMeta(const std::string & file, bool sidecar_only)
- : m_xmp(NULL),
+ : m_xmp(nullptr),
m_keyword_fetched(false)
{
if(!sidecar_only) {
DBG_OUT("trying to load the XMP from the file");
xmp::ScopedPtr<XmpFilePtr>
xmpfile(xmp_files_open_new(file.c_str(), XMP_OPEN_READ));
- if(xmpfile != NULL) {
+ if(xmpfile != nullptr) {
m_xmp = xmp_files_get_new_xmp(xmpfile);
- if(xmpfile == NULL) {
- ERR_OUT("xmpfile is NULL");
+ if(xmpfile == nullptr) {
+ ERR_OUT("xmpfile is nullptr");
}
}
}
- if(m_xmp == NULL) {
+ if(m_xmp == nullptr) {
gsize len = 0;
- char * buffer = NULL;
+ char * buffer = nullptr;
std::string sidecar = fwk::path_replace_extension(file, ".xmp");
try {
@@ -119,7 +118,7 @@ XmpMeta::XmpMeta(const std::string & file, bool sidecar_only)
m_xmp = xmp_new_empty();
if(!xmp_parse(m_xmp, buffer, len)) {
xmp_free(m_xmp);
- m_xmp = NULL;
+ m_xmp = nullptr;
}
g_free(buffer);
}
@@ -169,7 +168,7 @@ int32_t XmpMeta::orientation() const
{
int32_t _orientation = 0;
- if(!xmp_get_property_int32(m_xmp, NS_TIFF, "Orientation", &_orientation, NULL)) {
+ if(!xmp_get_property_int32(m_xmp, NS_TIFF, "Orientation", &_orientation, nullptr)) {
ERR_OUT("get \"Orientation\" property failed: %d", xmp_get_error());
}
return _orientation;
@@ -180,7 +179,7 @@ std::string XmpMeta::label() const
{
std::string _label;
xmp::ScopedPtr<XmpStringPtr> value(xmp_string_new());
- if(xmp_get_property(m_xmp, NS_XAP, "Label", value, NULL)) {
+ if(xmp_get_property(m_xmp, NS_XAP, "Label", value, nullptr)) {
_label = xmp_string_cstr(value);
}
return _label;
@@ -190,7 +189,7 @@ std::string XmpMeta::label() const
int32_t XmpMeta::rating() const
{
int32_t _rating = -1;
- if(!xmp_get_property_int32(m_xmp, NS_XAP, "Rating", &_rating, NULL)) {
+ if(!xmp_get_property_int32(m_xmp, NS_XAP, "Rating", &_rating, nullptr)) {
ERR_OUT("get \"Rating\" property failed: %d", xmp_get_error());
}
return _rating;
@@ -200,7 +199,7 @@ int32_t XmpMeta::flag() const
{
int32_t _flag = 0;
if(!xmp_get_property_int32(m_xmp, xmp::NIEPCE_XMP_NAMESPACE, "Flag",
- &_flag, NULL)) {
+ &_flag, nullptr)) {
ERR_OUT("get \"Flag\" property failed: %d", xmp_get_error());
}
return _flag;
@@ -210,7 +209,7 @@ fwk::Date XmpMeta::creation_date() const
{
XmpDateTime value;
if(xmp_get_property_date(m_xmp, NS_EXIF, "DateTimeOriginal",
- &value, NULL)) {
+ &value, nullptr)) {
return fwk::Date(value);
}
else {
@@ -224,7 +223,7 @@ std::string XmpMeta::creation_date_str() const
std::string s;
xmp::ScopedPtr<XmpStringPtr> value(xmp_string_new());
if(xmp_get_property(m_xmp, NS_EXIF, "DateTimeOriginal",
- value, NULL)) {
+ value, nullptr)) {
s = xmp_string_cstr(value);
}
return s;
@@ -237,7 +236,7 @@ const std::vector< std::string > & XmpMeta::keywords() const
xmp::ScopedPtr<XmpIteratorPtr> iter(xmp_iterator_new(m_xmp, NS_DC, "subject",
XMP_ITER_JUSTLEAFNODES));
xmp::ScopedPtr<XmpStringPtr> value(xmp_string_new());
- while(xmp_iterator_next(iter, NULL, NULL, value, NULL)) {
+ while(xmp_iterator_next(iter, nullptr, nullptr, value, nullptr)) {
m_keywords.push_back(xmp_string_cstr(value));
}
m_keyword_fetched = true;
diff --git a/src/fwk/utils/exempi.hpp b/src/fwk/utils/exempi.hpp
index 278f38e..a1061fa 100644
--- a/src/fwk/utils/exempi.hpp
+++ b/src/fwk/utils/exempi.hpp
@@ -4,7 +4,7 @@
/*
* niepce - utils/exempi.h
*
- * Copyright (C) 2007-2008,2012 Hubert Figuiere
+ * Copyright (C) 2007-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -108,8 +108,8 @@ public:
XmpMeta(const std::string & for_file, bool sidecar_only);
virtual ~XmpMeta();
- bool isOk() const
- { return m_xmp != NULL; }
+ bool isOk() const
+ { return m_xmp != nullptr; }
XmpPtr xmp() const
{ return m_xmp; }
/** serialize the XMP inline */
diff --git a/src/libraryclient/clientimpl.cpp b/src/libraryclient/clientimpl.cpp
index a707359..8a18aad 100644
--- a/src/libraryclient/clientimpl.cpp
+++ b/src/libraryclient/clientimpl.cpp
@@ -43,7 +43,7 @@ ClientImpl *ClientImpl::makeClientImpl(const fwk::Moniker & moniker,
ClientImpl::ClientImpl(const fwk::Moniker & moniker, const fwk::NotificationCenter::Ptr & nc)
: m_moniker(moniker),
- m_localLibrary(NULL)
+ m_localLibrary(nullptr)
{
DBG_OUT("creating implementation with moniker %s",
moniker.c_str());
diff --git a/src/ncr/image.cpp b/src/ncr/image.cpp
index a644f5e..02572d3 100644
--- a/src/ncr/image.cpp
+++ b/src/ncr/image.cpp
@@ -1,7 +1,7 @@
/*
* niepce - ncr/image.cpp
*
- * Copyright (C) 2008-2009 Hubert Figuiere
+ * Copyright (C) 2008-2013 Hubert Figuiere
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -40,9 +40,9 @@ struct Image::Private {
, m_orientation(0), m_vertical(false)
, m_flip(false)
, m_tilt(0.0)
- , m_graph(NULL), m_rgb(NULL), m_rotate_n(NULL)
- , m_scale(NULL)
- , m_sink_buffer(NULL)
+ , m_graph(nullptr), m_rgb(nullptr), m_rotate_n(nullptr)
+ , m_scale(nullptr)
+ , m_sink_buffer(nullptr)
{
}
~Private()
@@ -87,7 +87,7 @@ Image::~Image()
GeglNode* Image::Private::_rotate_node(int orientation)
{
-// GeglNode* rotateNode = gegl_node_new_child(m_graph, NULL, NULL);
+// GeglNode* rotateNode = gegl_node_new_child(m_graph, nullptr, nullptr);
DBG_OUT("rotation is %d", orientation);
switch(orientation) {
@@ -123,13 +123,13 @@ GeglNode* Image::Private::_rotate_node(int orientation)
// @todo find a test case.
// GeglNode* flipNode = gegl_node_new_child(rotateNode,
// "operation", "gegl:reflect",
-// "x", (m_flip ? -1.0 : 1.0), NULL);
+// "x", (m_flip ? -1.0 : 1.0), nullptr);
- GeglNode* rotationNode = NULL;
+ GeglNode* rotationNode = nullptr;
double rotate = m_orientation + m_tilt;
rotationNode = gegl_node_new_child(m_graph,
"operation", "gegl:rotate",
- "degrees", rotate, NULL);
+ "degrees", rotate, nullptr);
// gegl_node_link(flipNode, rotationNode);
return rotationNode;
@@ -140,32 +140,32 @@ GeglNode* Image::Private::_load_dcraw(const std::string &p)
{
return gegl_node_new_child(m_graph,
"operation", "gegl:raw-load",
- "path", p.c_str(), NULL);
+ "path", p.c_str(), nullptr);
}
/** create the RAW pipeline */
GeglNode* Image::Private::_load_raw(const std::string &p)
{
- GeglNode* rgb = NULL;
+ GeglNode* rgb = nullptr;
ORRawDataRef rawdata;
or_get_extract_rawdata(p.c_str(), 0, &rawdata);
GeglBuffer* buffer = ncr::load_rawdata(rawdata);
- // @todo can return a NULL buffer if load failed. Deal with that.
+ // @todo can return a nullptr buffer if load failed. Deal with that.
GeglNode* load_file = gegl_node_new_child(m_graph,
"operation", "gegl:buffer-source",
- "buffer", buffer, NULL);
+ "buffer", buffer, nullptr);
or_cfa_pattern pattern = or_rawdata_get_cfa_pattern(rawdata);
or_rawdata_release(rawdata);
GeglNode* stretch =
gegl_node_new_child(m_graph,
"operation", "gegl:stretch-contrast",
- NULL);
+ nullptr);
GeglNode* demosaic =
gegl_node_new_child(m_graph,
"operation", "gegl:demosaic-bimedian",
- NULL);
+ nullptr);
// @todo refactor somewhere.
int npattern = 0;
switch(pattern) {
@@ -184,9 +184,9 @@ GeglNode* Image::Private::_load_raw(const std::string &p)
default:
break;
}
- gegl_node_set(demosaic, "pattern", npattern, NULL);
+ gegl_node_set(demosaic, "pattern", npattern, nullptr);
- gegl_node_link_many(load_file, stretch, demosaic, NULL);
+ gegl_node_link_many(load_file, stretch, demosaic, nullptr);
rgb = demosaic;
return rgb;
@@ -194,7 +194,7 @@ GeglNode* Image::Private::_load_raw(const std::string &p)
GeglNode* Image::Private::_scale_node()
{
- return gegl_node_new_child(m_graph, "operation", "gegl:scale", NULL);
+ return gegl_node_new_child(m_graph, "operation", "gegl:scale", nullptr);
}
void Image::reload(const std::string & p, bool is_raw,
@@ -212,7 +212,7 @@ void Image::reload(const std::string & p, bool is_raw,
if(!is_raw) {
load_file = gegl_node_new_child(priv->m_graph,
"operation", "gegl:load",
- "path", p.c_str(), NULL);
+ "path", p.c_str(), nullptr);
}
else {
load_file = priv->_load_dcraw(p);
@@ -225,10 +225,10 @@ void Image::reload(const std::string & p, bool is_raw,
// gegl_node_new_child(priv->m_graph,
// "operation", "gegl:buffer-sink",
// "format", babl_format("RGB u8"),
-// "buffer", &(priv->m_sink_buffer), NULL);
+// "buffer", &(priv->m_sink_buffer), nullptr);
gegl_node_link_many(load_file, priv->m_rotate_n,
- priv->m_scale, priv->m_sink, NULL);
+ priv->m_scale, priv->m_sink, nullptr);
// gegl_node_process(priv->m_sink);
// DEBUG
@@ -236,11 +236,11 @@ void Image::reload(const std::string & p, bool is_raw,
GeglNode* debugsink;
GeglNode* graph =
gegl_graph (debugsink=gegl_node ("gegl:save",
- "path", "/tmp/gegl.png", NULL,
+ "path", "/tmp/gegl.png", nullptr,
gegl_node ("gegl:buffer-source",
"buffer",
priv->m_sink_buffer,
- NULL)
+ nullptr)
)
);
gegl_node_process (debugsink);
@@ -275,7 +275,7 @@ void Image::set_output_scale(double scale)
DBG_OUT("nothing loaded");
return;
}
- gegl_node_set(priv->m_scale, "x", scale, "y", scale, NULL);
+ gegl_node_set(priv->m_scale, "x", scale, "y", scale, nullptr);
signal_update();
}
@@ -290,7 +290,7 @@ void Image::set_tilt(double angle)
}
priv->m_tilt = angle;
gegl_node_set(priv->m_rotate_n, "degrees",
- priv->m_orientation + priv->m_tilt, NULL);
+ priv->m_orientation + priv->m_tilt, nullptr);
signal_update();
}
@@ -323,7 +323,7 @@ void Image::rotate_by(int degree)
// within 0..359 degrees anyway
priv->m_orientation %= 360;
}
- gegl_node_set(priv->m_rotate_n, "degrees", priv->m_orientation + priv->m_tilt, NULL);
+ gegl_node_set(priv->m_rotate_n, "degrees", priv->m_orientation + priv->m_tilt, nullptr);
signal_update();
}
diff --git a/src/ncr/init.cpp b/src/ncr/init.cpp
index f5a1a2f..89016bb 100644
--- a/src/ncr/init.cpp
+++ b/src/ncr/init.cpp
@@ -1,7 +1,7 @@
/*
* niepce - ncr/init.cpp
*
- * Copyright (C) 2011 Hub Figuiere
+ * Copyright (C) 2011-2013 Hub Figuiere
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@ namespace ncr {
void init()
{
- gegl_init(0, NULL);
+ gegl_init(0, nullptr);
}
}
diff --git a/src/ncr/ncr.cpp b/src/ncr/ncr.cpp
index c3f6854..33eb9af 100644
--- a/src/ncr/ncr.cpp
+++ b/src/ncr/ncr.cpp
@@ -1,7 +1,7 @@
/*
* niepce - ncr/ncr.cpp
*
- * Copyright (C) 2008,2011 Hubert Figuiere
+ * Copyright (C) 2008-2013 Hubert Figuiere
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,7 @@ GeglBuffer* load_rawdata(ORRawDataRef rawdata)
uint32_t x, y;
void *data;
if(or_rawdata_format(rawdata) != OR_DATA_TYPE_RAW) {
- return NULL;
+ return nullptr;
}
/* TODO take the dest_x and dest_y into account */
GeglRectangle rect = {0, 0, 0, 0};
diff --git a/src/niepce/main.cpp b/src/niepce/main.cpp
index de2bc87..663e6c6 100644
--- a/src/niepce/main.cpp
+++ b/src/niepce/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char ** argv)
fwk::utils::init();
- fwk::ExempiManager ex_manager(NULL);
+ fwk::ExempiManager ex_manager(nullptr);
fwk::Application::Ptr app = ui::NiepceApplication::create(argc, argv);
return fwk::Application::main(app,
diff --git a/src/niepce/modules/darkroom/toolboxcontroller.cpp
b/src/niepce/modules/darkroom/toolboxcontroller.cpp
index 70958ac..4cafd71 100644
--- a/src/niepce/modules/darkroom/toolboxcontroller.cpp
+++ b/src/niepce/modules/darkroom/toolboxcontroller.cpp
@@ -1,7 +1,7 @@
/*
* niepce - darkroom/toolboxcontroller.cpp
*
- * Copyright (C) 2008 Hubert Figuiere
+ * Copyright (C) 2008-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -47,8 +47,8 @@ ToolboxController::buildWidget(const Glib::RefPtr<Gtk::UIManager> & )
if(m_widget) {
return m_widget;
}
- DrItemWidget *item = NULL;
- fwk::EditableHScale *s = NULL;
+ DrItemWidget *item = nullptr;
+ fwk::EditableHScale *s = nullptr;
Gtk::VBox *toolbox = Dockable::build_vbox();
m_widget = toolbox;
diff --git a/src/niepce/ui/dialogs/editlabels.cpp b/src/niepce/ui/dialogs/editlabels.cpp
index bbff78a..cc0f756 100644
--- a/src/niepce/ui/dialogs/editlabels.cpp
+++ b/src/niepce/ui/dialogs/editlabels.cpp
@@ -96,7 +96,7 @@ void EditLabels::label_colour_changed(size_t idx)
void EditLabels::update_labels(int /*response*/)
{
- fwk::UndoTransaction *undo = NULL;
+ fwk::UndoTransaction *undo = nullptr;
for(size_t i = 0; i < 5; i++) {
if(m_status[i]) {
bool has_label = m_labels.size() > i;
diff --git a/src/niepce/ui/dialogs/importdialog.cpp b/src/niepce/ui/dialogs/importdialog.cpp
index b5d355f..4fe99e2 100644
--- a/src/niepce/ui/dialogs/importdialog.cpp
+++ b/src/niepce/ui/dialogs/importdialog.cpp
@@ -1,7 +1,7 @@
/*
* niepce - niepce/ui/importdialog.cpp
*
- * Copyright (C) 2008-2009 Hubert Figuiere
+ * Copyright (C) 2008-2013 Hubert Figuiere
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -44,11 +44,11 @@ namespace ui {
ImportDialog::ImportDialog()
: fwk::Dialog(GLADEDIR"importdialog.ui", "importDialog"),
- m_date_tz_combo(NULL),
- m_ufraw_import_check(NULL),
- m_rawstudio_import_check(NULL),
- m_directory_name(NULL),
- m_imagesList(NULL)
+ m_date_tz_combo(nullptr),
+ m_ufraw_import_check(nullptr),
+ m_rawstudio_import_check(nullptr),
+ m_directory_name(nullptr),
+ m_imagesList(nullptr)
{
}
@@ -62,7 +62,7 @@ void ImportDialog::setup_widget()
add_header(_("Import"));
Glib::RefPtr<Gtk::Builder> _builder = builder();
- Gtk::Button *select_directories = NULL;
+ Gtk::Button *select_directories = nullptr;
_builder->get_widget("select_directories", select_directories);
select_directories->signal_clicked().connect(
diff --git a/src/niepce/ui/dialogs/preferencesdialog.cpp b/src/niepce/ui/dialogs/preferencesdialog.cpp
index 0b4ade9..028bb03 100644
--- a/src/niepce/ui/dialogs/preferencesdialog.cpp
+++ b/src/niepce/ui/dialogs/preferencesdialog.cpp
@@ -41,9 +41,9 @@ void PreferencesDialog::setup_widget()
add_header(_("Preferences"));
- Gtk::CheckButton* theme_checkbutton = NULL;
- Gtk::CheckButton* reopen_checkbutton = NULL;
- Gtk::CheckButton* write_xmp_checkbutton = NULL;
+ Gtk::CheckButton* theme_checkbutton = nullptr;
+ Gtk::CheckButton* reopen_checkbutton = nullptr;
+ Gtk::CheckButton* write_xmp_checkbutton = nullptr;
fwk::DataBinderPool* binder_pool = new fwk::DataBinderPool();
gtkDialog().signal_hide().connect(std::bind(&fwk::DataBinderPool::destroy,
diff --git a/src/niepce/ui/gridviewmodule.cpp b/src/niepce/ui/gridviewmodule.cpp
index c714568..7be01fc 100644
--- a/src/niepce/ui/gridviewmodule.cpp
+++ b/src/niepce/ui/gridviewmodule.cpp
@@ -40,9 +40,9 @@ GridViewModule::GridViewModule(const IModuleShell & shell,
const Glib::RefPtr<ImageListStore> & store)
: m_shell(shell)
, m_model(store)
- , m_uidataprovider(NULL)
- , m_librarylistview(NULL)
- , m_dock(NULL)
+ , m_uidataprovider(nullptr)
+ , m_librarylistview(nullptr)
+ , m_dock(nullptr)
{
m_uidataprovider = m_shell.getLibraryClient()->getDataProvider();
DBG_ASSERT(m_uidataprovider, "provider is NULL");
@@ -212,7 +212,7 @@ bool GridViewModule::on_librarylistview_click(GdkEventButton *e)
x = e->x;
y = e->y;
Gtk::TreeModel::Path path;
- Gtk::CellRenderer * renderer = NULL;
+ Gtk::CellRenderer * renderer = nullptr;
DBG_OUT("click (%f, %f)", x, y);
m_librarylistview->convert_widget_to_bin_window_coords(x, y, bx, by);
if(m_librarylistview->get_item_at_pos(bx, by, path, renderer)){
diff --git a/src/niepce/ui/metadatapanecontroller.cpp b/src/niepce/ui/metadatapanecontroller.cpp
index 266d89e..160884e 100644
--- a/src/niepce/ui/metadatapanecontroller.cpp
+++ b/src/niepce/ui/metadatapanecontroller.cpp
@@ -30,15 +30,15 @@
#include "metadatapanecontroller.hpp"
namespace ui {
-
+
const fwk::MetaDataSectionFormat *
-MetaDataPaneController::get_format()
+MetaDataPaneController::get_format()
{
static const fwk::MetaDataFormat s_camerainfo_format[] = {
{ _("Make:"), eng::NpTiffMakeProp, fwk::META_DT_STRING, true },
{ _("Model:"), eng::NpTiffModelProp, fwk::META_DT_STRING, true },
{ _("Lens:"), eng::NpExifAuxLensProp, fwk::META_DT_STRING, true },
- { NULL, 0, fwk::META_DT_NONE, true }
+ { nullptr, 0, fwk::META_DT_NONE, true }
};
static const fwk::MetaDataFormat s_shootinginfo_format[] = {
{ _("Exposure Program:"), eng::NpExifExposureProgramProp, fwk::META_DT_STRING, true },
@@ -51,16 +51,16 @@ MetaDataPaneController::get_format()
{ _("Focal length:"), eng::NpExifFocalLengthProp, fwk::META_DT_FRAC_DEC, true },
{ _("White balance:"), eng::NpExifWbProp, fwk::META_DT_STRING, true },
{ _("Date:"), eng::NpExifDateTimeOriginalProp, fwk::META_DT_DATE, false },
- { NULL, 0, fwk::META_DT_NONE, true }
+ { nullptr, 0, fwk::META_DT_NONE, true }
};
static const fwk::MetaDataFormat s_iptc_format[] = {
{ _("Headline:"), eng::NpIptcHeadlineProp, fwk::META_DT_STRING, false },
{ _("Caption:"), eng::NpIptcDescriptionProp, fwk::META_DT_TEXT, false },
{ _("Rating:"), eng::NpXmpRatingProp, fwk::META_DT_STAR_RATING, false },
// FIXME change this type to the right one when there is a widget
- { _("Label:"), eng::NpXmpLabelProp, fwk::META_DT_STRING, true },
+ { _("Label:"), eng::NpXmpLabelProp, fwk::META_DT_STRING, true },
{ _("Keywords:"), eng::NpIptcKeywordsProp, fwk::META_DT_STRING_ARRAY, false },
- { NULL, 0, fwk::META_DT_NONE, true }
+ { nullptr, 0, fwk::META_DT_NONE, true }
};
static const fwk::MetaDataSectionFormat s_format[] = {
{ _("Camera Information"),
@@ -73,9 +73,9 @@ MetaDataPaneController::get_format()
s_iptc_format
},
{ _("Rights"),
- NULL
+ nullptr
},
- { NULL, NULL
+ { nullptr, nullptr
}
};
return s_format;
diff --git a/src/niepce/ui/selectioncontroller.cpp b/src/niepce/ui/selectioncontroller.cpp
index 8e0111b..585d1cc 100644
--- a/src/niepce/ui/selectioncontroller.cpp
+++ b/src/niepce/ui/selectioncontroller.cpp
@@ -244,7 +244,7 @@ void SelectionController::set_property(fwk::PropertyIndex idx, int value)
eng::LibFile::Ptr file = (*iter)[m_imageliststore->columns().m_libfile];
DBG_OUT("old property is %d", file->property(idx));
int old_value = file->property(idx);
- const char *action = NULL;
+ const char *action = nullptr;
switch(idx) {
case eng::NpNiepceFlagProp:
action = _("Set Flag");
diff --git a/src/niepce/ui/thumbstripview.cpp b/src/niepce/ui/thumbstripview.cpp
index 83af1f3..443770a 100644
--- a/src/niepce/ui/thumbstripview.cpp
+++ b/src/niepce/ui/thumbstripview.cpp
@@ -64,7 +64,7 @@ public:
ThumbStripCell::ThumbStripCell()
: Glib::ObjectBase(typeid(ThumbStripCell))
- , LibraryCellRenderer(NULL)
+ , LibraryCellRenderer(nullptr)
{
set_pad(0);
set_size(100);
@@ -302,21 +302,21 @@ void ThumbStripView::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&,
GList *node;
eng::LibFile *image;
const char *str;
- gchar *uris = NULL;
+ gchar *uris = nullptr;
gchar *tmp_str;
list = eog_thumb_view_get_selected_images (EOG_THUMB_VIEW (widget));
- for (node = list; node != NULL; node = node->next) {
+ for (node = list; node != nullptr; node = node->next) {
image = static_cast<eng::LibFile*>(node->data);
str = image->uri().c_str();
/* build the "text/uri-list" string */
if (uris) {
- tmp_str = g_strconcat (uris, str, "\r\n", NULL);
+ tmp_str = g_strconcat (uris, str, "\r\n", nullptr);
g_free (uris);
} else {
- tmp_str = g_strconcat (str, "\r\n", NULL);
+ tmp_str = g_strconcat (str, "\r\n", nullptr);
}
uris = tmp_str;
}
diff --git a/src/niepce/ui/workspacecontroller.cpp b/src/niepce/ui/workspacecontroller.cpp
index 8a86e10..9acb234 100644
--- a/src/niepce/ui/workspacecontroller.cpp
+++ b/src/niepce/ui/workspacecontroller.cpp
@@ -52,7 +52,7 @@ WorkspaceController::WorkspaceController()
{ ICON_ROLL, "emblem-photos" },
{ ICON_TRASH, "user-trash" },
{ ICON_KEYWORD, "application-certificate" },
- { 0, NULL }
+ { 0, nullptr }
};
Glib::RefPtr< Gtk::IconTheme > icon_theme(Application::app()->getIconTheme());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
