summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/glyphs.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/ui/dialog/glyphs.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz
inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer.
Diffstat (limited to 'src/ui/dialog/glyphs.cpp')
-rw-r--r--src/ui/dialog/glyphs.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 193ff232d..4737913f6 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -511,7 +511,7 @@ void GlyphsPanel::setTargetDesktop(SPDesktop *desktop)
// Append selected glyphs to selected text
void GlyphsPanel::insertText()
{
- SPItem *textItem = 0;
+ SPItem *textItem = nullptr;
auto itemlist= targetDesktop->selection->items();
for(auto i=itemlist.begin(); itemlist.end() != i; ++i) {
if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i)) {
@@ -541,7 +541,7 @@ void GlyphsPanel::insertText()
if (str) {
combined = str;
g_free(str);
- str = 0;
+ str = nullptr;
}
combined += glyphs;
sp_te_set_repr_text_multiline(textItem, combined.c_str());
@@ -644,7 +644,7 @@ void GlyphsPanel::rebuild()
{
Glib::ustring fontspec = fontSelector->get_fontspec();
- font_instance* font = 0;
+ font_instance* font = nullptr;
if( !fontspec.empty() ) {
font = font_factory::Default()->FaceFromFontSpecification( fontspec.c_str() );
}