summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/clipboard.cpp24
-rw-r--r--src/ui/dialog/aboutbox.cpp2
-rw-r--r--src/ui/dialog/align-and-distribute.cpp2
-rw-r--r--src/ui/dialog/filedialogimpl-gtkmm.cpp4
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp6
-rw-r--r--src/ui/dialog/find.cpp4
-rw-r--r--src/ui/dialog/glyphs.cpp302
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp8
-rw-r--r--src/ui/dialog/object-attributes.cpp4
-rw-r--r--src/ui/dialog/object-properties.cpp38
-rw-r--r--src/ui/dialog/swatches.cpp2
-rw-r--r--src/ui/dialog/symbols.cpp2
-rw-r--r--src/ui/dialog/transformation.cpp4
-rw-r--r--src/ui/tool/control-point-selection.cpp2
-rw-r--r--src/ui/tool/node.cpp16
-rw-r--r--src/ui/tool/path-manipulator.cpp4
-rw-r--r--src/ui/tool/transform-handle-set.cpp4
-rw-r--r--src/ui/tools/flood-tool.cpp2
-rw-r--r--src/ui/tools/freehand-base.cpp2
-rw-r--r--src/ui/tools/pencil-tool.cpp2
-rw-r--r--src/ui/widget/color-icc-selector.cpp4
-rw-r--r--src/ui/widget/page-sizer.cpp14
22 files changed, 226 insertions, 226 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 500da4147..66f9be7a1 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -177,14 +177,14 @@ ClipboardManagerImpl::ClipboardManagerImpl()
// Presenting "image/x-emf" as CF_ENHMETAFILE must be done by Inkscape ?
// push supported clipboard targets, in order of preference
- _preferred_targets.push_back("image/x-inkscape-svg");
- _preferred_targets.push_back("image/svg+xml");
- _preferred_targets.push_back("image/svg+xml-compressed");
- _preferred_targets.push_back("image/x-emf");
- _preferred_targets.push_back("CF_ENHMETAFILE");
- _preferred_targets.push_back("WCF_ENHMETAFILE"); // seen on Wine
- _preferred_targets.push_back("application/pdf");
- _preferred_targets.push_back("image/x-adobe-illustrator");
+ _preferred_targets.emplace_back("image/x-inkscape-svg");
+ _preferred_targets.emplace_back("image/svg+xml");
+ _preferred_targets.emplace_back("image/svg+xml-compressed");
+ _preferred_targets.emplace_back("image/x-emf");
+ _preferred_targets.emplace_back("CF_ENHMETAFILE");
+ _preferred_targets.emplace_back("WCF_ENHMETAFILE"); // seen on Wine
+ _preferred_targets.emplace_back("application/pdf");
+ _preferred_targets.emplace_back("image/x-adobe-illustrator");
}
@@ -695,7 +695,7 @@ std::vector<Glib::ustring> ClipboardManagerImpl::getElementsOfType(SPDesktop *de
}
for (auto i=reprs.begin();i!=reprs.end();++i) {
Inkscape::XML::Node const * node = *i;
- result.push_back(node->attribute("id"));
+ result.emplace_back(node->attribute("id"));
}
if ( result.empty() ) {
_userWarn(desktop, ((Glib::ustring)_("Clipboard does not contain any.") + (Glib::ustring)type).c_str());
@@ -1446,17 +1446,17 @@ void ClipboardManagerImpl::_setClipboardTargets()
Glib::ustring mime = (*out)->get_mimetype();
if (mime != CLIPBOARD_TEXT_TARGET) {
if ( !plaintextSet && (mime.find("svg") == Glib::ustring::npos) ) {
- target_list.push_back(Gtk::TargetEntry(CLIPBOARD_TEXT_TARGET));
+ target_list.emplace_back(CLIPBOARD_TEXT_TARGET);
plaintextSet = true;
}
- target_list.push_back(Gtk::TargetEntry(mime));
+ target_list.emplace_back(mime);
}
}
}
// Add PNG export explicitly since there is no extension for this...
// On Windows, GTK will also present this as a CF_DIB/CF_BITMAP
- target_list.push_back(Gtk::TargetEntry( "image/png" ));
+ target_list.emplace_back( "image/png" );
_clipboard->set(target_list,
sigc::mem_fun(*this, &ClipboardManagerImpl::_onGet),
diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index fb2b86b68..6cee2e10e 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -163,7 +163,7 @@ void AboutBox::initStrings() {
std::string author_line;
while (std::getline(authors_filestream, author_line)) {
- authors.push_back(author_line);
+ authors.emplace_back(author_line);
}
}
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 8e6b5e0e5..3d9a53951 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -311,7 +311,7 @@ private :
SPItem *item = *it;
Geom::OptRect bbox = !prefs_bbox ? (item)->desktopVisualBounds() : (item)->desktopGeometricBounds();
if (bbox) {
- sorted.push_back(BBoxSort(item, *bbox, _orientation, _kBegin, _kEnd));
+ sorted.emplace_back(item, *bbox, _orientation, _kBegin, _kEnd);
}
}
//sort bbox by anchors
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 72cca76d3..4d3a1fb62 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -915,7 +915,7 @@ std::vector<Glib::ustring> FileOpenDialogImplGtk::getFilenames()
std::vector<Glib::ustring> result;
for (auto it : result_tmp)
- result.push_back(it);
+ result.emplace_back(it);
if (result.empty()) {
result = get_uris();
@@ -1067,7 +1067,7 @@ void FileSaveDialogImplGtk::fileNameEntryChangedCallback()
// try appending to the current path
// not this way: fileName = get_current_folder() + "/" + fileName;
std::vector<Glib::ustring> pathSegments;
- pathSegments.push_back(get_current_folder());
+ pathSegments.emplace_back(get_current_folder());
pathSegments.push_back(fileName);
fileName = Glib::build_filename(pathSegments);
}
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 20ce89115..80bda9138 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -2233,9 +2233,9 @@ bool FilterEffectsDialog::PrimitiveList::do_connection_node(const Gtk::TreeIter&
const int con_w = (int)(fheight * 0.35f);
const int con_y = (int)(rct.get_y() + (h / 2) - con_w + (input * h));
points.clear();
- points.push_back(Gdk::Point(x, con_y));
- points.push_back(Gdk::Point(x, con_y + con_w * 2));
- points.push_back(Gdk::Point(x - con_w, con_y + con_w));
+ points.emplace_back(x, con_y);
+ points.emplace_back(x, con_y + con_w * 2);
+ points.emplace_back(x - con_w, con_y + con_w);
return ix >= x - h && iy >= con_y && ix <= x && iy <= points[1].get_y();
}
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index d9a43d21b..64045f252 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -502,8 +502,8 @@ bool Find::item_font_match(SPItem *item, const gchar *text, bool exact, bool cas
}
std::vector<Glib::ustring> vFontTokenNames;
- vFontTokenNames.push_back("font-family:");
- vFontTokenNames.push_back("-inkscape-font-specification:");
+ vFontTokenNames.emplace_back("font-family:");
+ vFontTokenNames.emplace_back("-inkscape-font-specification:");
std::vector<Glib::ustring> vStyleTokens = Glib::Regex::split_simple(";", item_style);
for(size_t i=0; i<vStyleTokens.size(); i++) {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 4737913f6..a41eb41e5 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -142,157 +142,157 @@ static std::vector<NamedRange> & getRanges()
static std::vector<NamedRange> ranges;
if (!init) {
init = true;
- ranges.push_back(std::make_pair(std::make_pair(0x0000, 0xFFFD), _("all")));
- ranges.push_back(std::make_pair(std::make_pair(0x0000, 0x007F), _("Basic Latin")));
- ranges.push_back(std::make_pair(std::make_pair(0x0080, 0x00FF), _("Latin-1 Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x0100, 0x017F), _("Latin Extended-A")));
- ranges.push_back(std::make_pair(std::make_pair(0x0180, 0x024F), _("Latin Extended-B")));
- ranges.push_back(std::make_pair(std::make_pair(0x0250, 0x02AF), _("IPA Extensions")));
- ranges.push_back(std::make_pair(std::make_pair(0x02B0, 0x02FF), _("Spacing Modifier Letters")));
- ranges.push_back(std::make_pair(std::make_pair(0x0300, 0x036F), _("Combining Diacritical Marks")));
- ranges.push_back(std::make_pair(std::make_pair(0x0370, 0x03FF), _("Greek and Coptic")));
- ranges.push_back(std::make_pair(std::make_pair(0x0400, 0x04FF), _("Cyrillic")));
- ranges.push_back(std::make_pair(std::make_pair(0x0500, 0x052F), _("Cyrillic Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x0530, 0x058F), _("Armenian")));
- ranges.push_back(std::make_pair(std::make_pair(0x0590, 0x05FF), _("Hebrew")));
- ranges.push_back(std::make_pair(std::make_pair(0x0600, 0x06FF), _("Arabic")));
- ranges.push_back(std::make_pair(std::make_pair(0x0700, 0x074F), _("Syriac")));
- ranges.push_back(std::make_pair(std::make_pair(0x0750, 0x077F), _("Arabic Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x0780, 0x07BF), _("Thaana")));
- ranges.push_back(std::make_pair(std::make_pair(0x07C0, 0x07FF), _("NKo")));
- ranges.push_back(std::make_pair(std::make_pair(0x0800, 0x083F), _("Samaritan")));
- ranges.push_back(std::make_pair(std::make_pair(0x0900, 0x097F), _("Devanagari")));
- ranges.push_back(std::make_pair(std::make_pair(0x0980, 0x09FF), _("Bengali")));
- ranges.push_back(std::make_pair(std::make_pair(0x0A00, 0x0A7F), _("Gurmukhi")));
- ranges.push_back(std::make_pair(std::make_pair(0x0A80, 0x0AFF), _("Gujarati")));
- ranges.push_back(std::make_pair(std::make_pair(0x0B00, 0x0B7F), _("Oriya")));
- ranges.push_back(std::make_pair(std::make_pair(0x0B80, 0x0BFF), _("Tamil")));
- ranges.push_back(std::make_pair(std::make_pair(0x0C00, 0x0C7F), _("Telugu")));
- ranges.push_back(std::make_pair(std::make_pair(0x0C80, 0x0CFF), _("Kannada")));
- ranges.push_back(std::make_pair(std::make_pair(0x0D00, 0x0D7F), _("Malayalam")));
- ranges.push_back(std::make_pair(std::make_pair(0x0D80, 0x0DFF), _("Sinhala")));
- ranges.push_back(std::make_pair(std::make_pair(0x0E00, 0x0E7F), _("Thai")));
- ranges.push_back(std::make_pair(std::make_pair(0x0E80, 0x0EFF), _("Lao")));
- ranges.push_back(std::make_pair(std::make_pair(0x0F00, 0x0FFF), _("Tibetan")));
- ranges.push_back(std::make_pair(std::make_pair(0x1000, 0x109F), _("Myanmar")));
- ranges.push_back(std::make_pair(std::make_pair(0x10A0, 0x10FF), _("Georgian")));
- ranges.push_back(std::make_pair(std::make_pair(0x1100, 0x11FF), _("Hangul Jamo")));
- ranges.push_back(std::make_pair(std::make_pair(0x1200, 0x137F), _("Ethiopic")));
- ranges.push_back(std::make_pair(std::make_pair(0x1380, 0x139F), _("Ethiopic Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x13A0, 0x13FF), _("Cherokee")));
- ranges.push_back(std::make_pair(std::make_pair(0x1400, 0x167F), _("Unified Canadian Aboriginal Syllabics")));
- ranges.push_back(std::make_pair(std::make_pair(0x1680, 0x169F), _("Ogham")));
- ranges.push_back(std::make_pair(std::make_pair(0x16A0, 0x16FF), _("Runic")));
- ranges.push_back(std::make_pair(std::make_pair(0x1700, 0x171F), _("Tagalog")));
- ranges.push_back(std::make_pair(std::make_pair(0x1720, 0x173F), _("Hanunoo")));
- ranges.push_back(std::make_pair(std::make_pair(0x1740, 0x175F), _("Buhid")));
- ranges.push_back(std::make_pair(std::make_pair(0x1760, 0x177F), _("Tagbanwa")));
- ranges.push_back(std::make_pair(std::make_pair(0x1780, 0x17FF), _("Khmer")));
- ranges.push_back(std::make_pair(std::make_pair(0x1800, 0x18AF), _("Mongolian")));
- ranges.push_back(std::make_pair(std::make_pair(0x18B0, 0x18FF), _("Unified Canadian Aboriginal Syllabics Extended")));
- ranges.push_back(std::make_pair(std::make_pair(0x1900, 0x194F), _("Limbu")));
- ranges.push_back(std::make_pair(std::make_pair(0x1950, 0x197F), _("Tai Le")));
- ranges.push_back(std::make_pair(std::make_pair(0x1980, 0x19DF), _("New Tai Lue")));
- ranges.push_back(std::make_pair(std::make_pair(0x19E0, 0x19FF), _("Khmer Symbols")));
- ranges.push_back(std::make_pair(std::make_pair(0x1A00, 0x1A1F), _("Buginese")));
- ranges.push_back(std::make_pair(std::make_pair(0x1A20, 0x1AAF), _("Tai Tham")));
- ranges.push_back(std::make_pair(std::make_pair(0x1B00, 0x1B7F), _("Balinese")));
- ranges.push_back(std::make_pair(std::make_pair(0x1B80, 0x1BBF), _("Sundanese")));
- ranges.push_back(std::make_pair(std::make_pair(0x1C00, 0x1C4F), _("Lepcha")));
- ranges.push_back(std::make_pair(std::make_pair(0x1C50, 0x1C7F), _("Ol Chiki")));
- ranges.push_back(std::make_pair(std::make_pair(0x1CD0, 0x1CFF), _("Vedic Extensions")));
- ranges.push_back(std::make_pair(std::make_pair(0x1D00, 0x1D7F), _("Phonetic Extensions")));
- ranges.push_back(std::make_pair(std::make_pair(0x1D80, 0x1DBF), _("Phonetic Extensions Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x1DC0, 0x1DFF), _("Combining Diacritical Marks Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x1E00, 0x1EFF), _("Latin Extended Additional")));
- ranges.push_back(std::make_pair(std::make_pair(0x1F00, 0x1FFF), _("Greek Extended")));
- ranges.push_back(std::make_pair(std::make_pair(0x2000, 0x206F), _("General Punctuation")));
- ranges.push_back(std::make_pair(std::make_pair(0x2070, 0x209F), _("Superscripts and Subscripts")));
- ranges.push_back(std::make_pair(std::make_pair(0x20A0, 0x20CF), _("Currency Symbols")));
- ranges.push_back(std::make_pair(std::make_pair(0x20D0, 0x20FF), _("Combining Diacritical Marks for Symbols")));
- ranges.push_back(std::make_pair(std::make_pair(0x2100, 0x214F), _("Letterlike Symbols")));
- ranges.push_back(std::make_pair(std::make_pair(0x2150, 0x218F), _("Number Forms")));
- ranges.push_back(std::make_pair(std::make_pair(0x2190, 0x21FF), _("Arrows")));
- ranges.push_back(std::make_pair(std::make_pair(0x2200, 0x22FF), _("Mathematical Operators")));
- ranges.push_back(std::make_pair(std::make_pair(0x2300, 0x23FF), _("Miscellaneous Technical")));
- ranges.push_back(std::make_pair(std::make_pair(0x2400, 0x243F), _("Control Pictures")));
- ranges.push_back(std::make_pair(std::make_pair(0x2440, 0x245F), _("Optical Character Recognition")));
- ranges.push_back(std::make_pair(std::make_pair(0x2460, 0x24FF), _("Enclosed Alphanumerics")));
- ranges.push_back(std::make_pair(std::make_pair(0x2500, 0x257F), _("Box Drawing")));
- ranges.push_back(std::make_pair(std::make_pair(0x2580, 0x259F), _("Block Elements")));
- ranges.push_back(std::make_pair(std::make_pair(0x25A0, 0x25FF), _("Geometric Shapes")));
- ranges.push_back(std::make_pair(std::make_pair(0x2600, 0x26FF), _("Miscellaneous Symbols")));
- ranges.push_back(std::make_pair(std::make_pair(0x2700, 0x27BF), _("Dingbats")));
- ranges.push_back(std::make_pair(std::make_pair(0x27C0, 0x27EF), _("Miscellaneous Mathematical Symbols-A")));
- ranges.push_back(std::make_pair(std::make_pair(0x27F0, 0x27FF), _("Supplemental Arrows-A")));
- ranges.push_back(std::make_pair(std::make_pair(0x2800, 0x28FF), _("Braille Patterns")));
- ranges.push_back(std::make_pair(std::make_pair(0x2900, 0x297F), _("Supplemental Arrows-B")));
- ranges.push_back(std::make_pair(std::make_pair(0x2980, 0x29FF), _("Miscellaneous Mathematical Symbols-B")));
- ranges.push_back(std::make_pair(std::make_pair(0x2A00, 0x2AFF), _("Supplemental Mathematical Operators")));
- ranges.push_back(std::make_pair(std::make_pair(0x2B00, 0x2BFF), _("Miscellaneous Symbols and Arrows")));
- ranges.push_back(std::make_pair(std::make_pair(0x2C00, 0x2C5F), _("Glagolitic")));
- ranges.push_back(std::make_pair(std::make_pair(0x2C60, 0x2C7F), _("Latin Extended-C")));
- ranges.push_back(std::make_pair(std::make_pair(0x2C80, 0x2CFF), _("Coptic")));
- ranges.push_back(std::make_pair(std::make_pair(0x2D00, 0x2D2F), _("Georgian Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x2D30, 0x2D7F), _("Tifinagh")));
- ranges.push_back(std::make_pair(std::make_pair(0x2D80, 0x2DDF), _("Ethiopic Extended")));
- ranges.push_back(std::make_pair(std::make_pair(0x2DE0, 0x2DFF), _("Cyrillic Extended-A")));
- ranges.push_back(std::make_pair(std::make_pair(0x2E00, 0x2E7F), _("Supplemental Punctuation")));
- ranges.push_back(std::make_pair(std::make_pair(0x2E80, 0x2EFF), _("CJK Radicals Supplement")));
- ranges.push_back(std::make_pair(std::make_pair(0x2F00, 0x2FDF), _("Kangxi Radicals")));
- ranges.push_back(std::make_pair(std::make_pair(0x2FF0, 0x2FFF), _("Ideographic Description Characters")));
- ranges.push_back(std::make_pair(std::make_pair(0x3000, 0x303F), _("CJK Symbols and Punctuation")));
- ranges.push_back(std::make_pair(std::make_pair(0x3040, 0x309F), _("Hiragana")));
- ranges.push_back(std::make_pair(std::make_pair(0x30A0, 0x30FF), _("Katakana")));
- ranges.push_back(std::make_pair(std::make_pair(0x3100, 0x312F), _("Bopomofo")));
- ranges.push_back(std::make_pair(std::make_pair(0x3130, 0x318F), _("Hangul Compatibility Jamo")));
- ranges.push_back(std::make_pair(std::make_pair(0x3190, 0x319F), _("Kanbun")));
- ranges.push_back(std::make_pair(std::make_pair(0x31A0, 0x31BF), _("Bopomofo Extended")));
- ranges.push_back(std::make_pair(std::make_pair(0x31C0, 0x31EF), _("CJK Strokes")));
- ranges.push_back(std::make_pair(std::make_pair(0x31F0, 0x31FF), _("Katakana Phonetic Extensions")));
- ranges.push_back(std::make_pair(std::make_pair(0x3200, 0x32FF), _("Enclosed CJK Letters and Months")));
- ranges.push_back(std::make_pair(std::make_pair(0x3300, 0x33FF), _("CJK Compatibility")));
- ranges.push_back(std::make_pair(std::make_pair(0x3400, 0x4DBF), _("CJK Unified Ideographs Extension A")));
- ranges.push_back(std::make_pair(std::make_pair(0x4DC0, 0x4DFF), _("Yijing Hexagram Symbols")));
- ranges.push_back(std::make_pair(std::make_pair(0x4E00, 0x9FFF), _("CJK Unified Ideographs")));
- ranges.push_back(std::make_pair(std::make_pair(0xA000, 0xA48F), _("Yi Syllables")));
- ranges.push_back(std::make_pair(std::make_pair(0xA490, 0xA4CF), _("Yi Radicals")));
- ranges.push_back(std::make_pair(std::make_pair(0xA4D0, 0xA4FF), _("Lisu")));
- ranges.push_back(std::make_pair(std::make_pair(0xA500, 0xA63F), _("Vai")));
- ranges.push_back(std::make_pair(std::make_pair(0xA640, 0xA69F), _("Cyrillic Extended-B")));
- ranges.push_back(std::make_pair(std::make_pair(0xA6A0, 0xA6FF), _("Bamum")));
- ranges.push_back(std::make_pair(std::make_pair(0xA700, 0xA71F), _("Modifier Tone Letters")));
- ranges.push_back(std::make_pair(std::make_pair(0xA720, 0xA7FF), _("Latin Extended-D")));
- ranges.push_back(std::make_pair(std::make_pair(0xA800, 0xA82F), _("Syloti Nagri")));
- ranges.push_back(std::make_pair(std::make_pair(0xA830, 0xA83F), _("Common Indic Number Forms")));
- ranges.push_back(std::make_pair(std::make_pair(0xA840, 0xA87F), _("Phags-pa")));
- ranges.push_back(std::make_pair(std::make_pair(0xA880, 0xA8DF), _("Saurashtra")));
- ranges.push_back(std::make_pair(std::make_pair(0xA8E0, 0xA8FF), _("Devanagari Extended")));
- ranges.push_back(std::make_pair(std::make_pair(0xA900, 0xA92F), _("Kayah Li")));
- ranges.push_back(std::make_pair(std::make_pair(0xA930, 0xA95F), _("Rejang")));
- ranges.push_back(std::make_pair(std::make_pair(0xA960, 0xA97F), _("Hangul Jamo Extended-A")));
- ranges.push_back(std::make_pair(std::make_pair(0xA980, 0xA9DF), _("Javanese")));
- ranges.push_back(std::make_pair(std::make_pair(0xAA00, 0xAA5F), _("Cham")));
- ranges.push_back(std::make_pair(std::make_pair(0xAA60, 0xAA7F), _("Myanmar Extended-A")));
- ranges.push_back(std::make_pair(std::make_pair(0xAA80, 0xAADF), _("Tai Viet")));
- ranges.push_back(std::make_pair(std::make_pair(0xABC0, 0xABFF), _("Meetei Mayek")));
- ranges.push_back(std::make_pair(std::make_pair(0xAC00, 0xD7AF), _("Hangul Syllables")));
- ranges.push_back(std::make_pair(std::make_pair(0xD7B0, 0xD7FF), _("Hangul Jamo Extended-B")));
- ranges.push_back(std::make_pair(std::make_pair(0xD800, 0xDB7F), _("High Surrogates")));
- ranges.push_back(std::make_pair(std::make_pair(0xDB80, 0xDBFF), _("High Private Use Surrogates")));
- ranges.push_back(std::make_pair(std::make_pair(0xDC00, 0xDFFF), _("Low Surrogates")));
- ranges.push_back(std::make_pair(std::make_pair(0xE000, 0xF8FF), _("Private Use Area")));
- ranges.push_back(std::make_pair(std::make_pair(0xF900, 0xFAFF), _("CJK Compatibility Ideographs")));
- ranges.push_back(std::make_pair(std::make_pair(0xFB00, 0xFB4F), _("Alphabetic Presentation Forms")));
- ranges.push_back(std::make_pair(std::make_pair(0xFB50, 0xFDFF), _("Arabic Presentation Forms-A")));
- ranges.push_back(std::make_pair(std::make_pair(0xFE00, 0xFE0F), _("Variation Selectors")));
- ranges.push_back(std::make_pair(std::make_pair(0xFE10, 0xFE1F), _("Vertical Forms")));
- ranges.push_back(std::make_pair(std::make_pair(0xFE20, 0xFE2F), _("Combining Half Marks")));
- ranges.push_back(std::make_pair(std::make_pair(0xFE30, 0xFE4F), _("CJK Compatibility Forms")));
- ranges.push_back(std::make_pair(std::make_pair(0xFE50, 0xFE6F), _("Small Form Variants")));
- ranges.push_back(std::make_pair(std::make_pair(0xFE70, 0xFEFF), _("Arabic Presentation Forms-B")));
- ranges.push_back(std::make_pair(std::make_pair(0xFF00, 0xFFEF), _("Halfwidth and Fullwidth Forms")));
- ranges.push_back(std::make_pair(std::make_pair(0xFFF0, 0xFFFF), _("Specials")));
+ ranges.emplace_back(std::make_pair(0x0000, 0xFFFD), _("all"));
+ ranges.emplace_back(std::make_pair(0x0000, 0x007F), _("Basic Latin"));
+ ranges.emplace_back(std::make_pair(0x0080, 0x00FF), _("Latin-1 Supplement"));
+ ranges.emplace_back(std::make_pair(0x0100, 0x017F), _("Latin Extended-A"));
+ ranges.emplace_back(std::make_pair(0x0180, 0x024F), _("Latin Extended-B"));
+ ranges.emplace_back(std::make_pair(0x0250, 0x02AF), _("IPA Extensions"));
+ ranges.emplace_back(std::make_pair(0x02B0, 0x02FF), _("Spacing Modifier Letters"));
+ ranges.emplace_back(std::make_pair(0x0300, 0x036F), _("Combining Diacritical Marks"));
+ ranges.emplace_back(std::make_pair(0x0370, 0x03FF), _("Greek and Coptic"));
+ ranges.emplace_back(std::make_pair(0x0400, 0x04FF), _("Cyrillic"));
+ ranges.emplace_back(std::make_pair(0x0500, 0x052F), _("Cyrillic Supplement"));
+ ranges.emplace_back(std::make_pair(0x0530, 0x058F), _("Armenian"));
+ ranges.emplace_back(std::make_pair(0x0590, 0x05FF), _("Hebrew"));
+ ranges.emplace_back(std::make_pair(0x0600, 0x06FF), _("Arabic"));
+ ranges.emplace_back(std::make_pair(0x0700, 0x074F), _("Syriac"));
+ ranges.emplace_back(std::make_pair(0x0750, 0x077F), _("Arabic Supplement"));
+ ranges.emplace_back(std::make_pair(0x0780, 0x07BF), _("Thaana"));
+ ranges.emplace_back(std::make_pair(0x07C0, 0x07FF), _("NKo"));
+ ranges.emplace_back(std::make_pair(0x0800, 0x083F), _("Samaritan"));
+ ranges.emplace_back(std::make_pair(0x0900, 0x097F), _("Devanagari"));
+ ranges.emplace_back(std::make_pair(0x0980, 0x09FF), _("Bengali"));
+ ranges.emplace_back(std::make_pair(0x0A00, 0x0A7F), _("Gurmukhi"));
+ ranges.emplace_back(std::make_pair(0x0A80, 0x0AFF), _("Gujarati"));
+ ranges.emplace_back(std::make_pair(0x0B00, 0x0B7F), _("Oriya"));
+ ranges.emplace_back(std::make_pair(0x0B80, 0x0BFF), _("Tamil"));
+ ranges.emplace_back(std::make_pair(0x0C00, 0x0C7F), _("Telugu"));
+ ranges.emplace_back(std::make_pair(0x0C80, 0x0CFF), _("Kannada"));
+ ranges.emplace_back(std::make_pair(0x0D00, 0x0D7F), _("Malayalam"));
+ ranges.emplace_back(std::make_pair(0x0D80, 0x0DFF), _("Sinhala"));
+ ranges.emplace_back(std::make_pair(0x0E00, 0x0E7F), _("Thai"));
+ ranges.emplace_back(std::make_pair(0x0E80, 0x0EFF), _("Lao"));
+ ranges.emplace_back(std::make_pair(0x0F00, 0x0FFF), _("Tibetan"));
+ ranges.emplace_back(std::make_pair(0x1000, 0x109F), _("Myanmar"));
+ ranges.emplace_back(std::make_pair(0x10A0, 0x10FF), _("Georgian"));
+ ranges.emplace_back(std::make_pair(0x1100, 0x11FF), _("Hangul Jamo"));
+ ranges.emplace_back(std::make_pair(0x1200, 0x137F), _("Ethiopic"));
+ ranges.emplace_back(std::make_pair(0x1380, 0x139F), _("Ethiopic Supplement"));
+ ranges.emplace_back(std::make_pair(0x13A0, 0x13FF), _("Cherokee"));
+ ranges.emplace_back(std::make_pair(0x1400, 0x167F), _("Unified Canadian Aboriginal Syllabics"));
+ ranges.emplace_back(std::make_pair(0x1680, 0x169F), _("Ogham"));
+ ranges.emplace_back(std::make_pair(0x16A0, 0x16FF), _("Runic"));
+ ranges.emplace_back(std::make_pair(0x1700, 0x171F), _("Tagalog"));
+ ranges.emplace_back(std::make_pair(0x1720, 0x173F), _("Hanunoo"));
+ ranges.emplace_back(std::make_pair(0x1740, 0x175F), _("Buhid"));
+ ranges.emplace_back(std::make_pair(0x1760, 0x177F), _("Tagbanwa"));
+ ranges.emplace_back(std::make_pair(0x1780, 0x17FF), _("Khmer"));
+ ranges.emplace_back(std::make_pair(0x1800, 0x18AF), _("Mongolian"));
+ ranges.emplace_back(std::make_pair(0x18B0, 0x18FF), _("Unified Canadian Aboriginal Syllabics Extended"));
+ ranges.emplace_back(std::make_pair(0x1900, 0x194F), _("Limbu"));
+ ranges.emplace_back(std::make_pair(0x1950, 0x197F), _("Tai Le"));
+ ranges.emplace_back(std::make_pair(0x1980, 0x19DF), _("New Tai Lue"));
+ ranges.emplace_back(std::make_pair(0x19E0, 0x19FF), _("Khmer Symbols"));
+ ranges.emplace_back(std::make_pair(0x1A00, 0x1A1F), _("Buginese"));
+ ranges.emplace_back(std::make_pair(0x1A20, 0x1AAF), _("Tai Tham"));
+ ranges.emplace_back(std::make_pair(0x1B00, 0x1B7F), _("Balinese"));
+ ranges.emplace_back(std::make_pair(0x1B80, 0x1BBF), _("Sundanese"));
+ ranges.emplace_back(std::make_pair(0x1C00, 0x1C4F), _("Lepcha"));
+ ranges.emplace_back(std::make_pair(0x1C50, 0x1C7F), _("Ol Chiki"));
+ ranges.emplace_back(std::make_pair(0x1CD0, 0x1CFF), _("Vedic Extensions"));
+ ranges.emplace_back(std::make_pair(0x1D00, 0x1D7F), _("Phonetic Extensions"));
+ ranges.emplace_back(std::make_pair(0x1D80, 0x1DBF), _("Phonetic Extensions Supplement"));
+ ranges.emplace_back(std::make_pair(0x1DC0, 0x1DFF), _("Combining Diacritical Marks Supplement"));
+ ranges.emplace_back(std::make_pair(0x1E00, 0x1EFF), _("Latin Extended Additional"));
+ ranges.emplace_back(std::make_pair(0x1F00, 0x1FFF), _("Greek Extended"));
+ ranges.emplace_back(std::make_pair(0x2000, 0x206F), _("General Punctuation"));
+ ranges.emplace_back(std::make_pair(0x2070, 0x209F), _("Superscripts and Subscripts"));
+ ranges.emplace_back(std::make_pair(0x20A0, 0x20CF), _("Currency Symbols"));
+ ranges.emplace_back(std::make_pair(0x20D0, 0x20FF), _("Combining Diacritical Marks for Symbols"));
+ ranges.emplace_back(std::make_pair(0x2100, 0x214F), _("Letterlike Symbols"));
+ ranges.emplace_back(std::make_pair(0x2150, 0x218F), _("Number Forms"));
+ ranges.emplace_back(std::make_pair(0x2190, 0x21FF), _("Arrows"));
+ ranges.emplace_back(std::make_pair(0x2200, 0x22FF), _("Mathematical Operators"));
+ ranges.emplace_back(std::make_pair(0x2300, 0x23FF), _("Miscellaneous Technical"));
+ ranges.emplace_back(std::make_pair(0x2400, 0x243F), _("Control Pictures"));
+ ranges.emplace_back(std::make_pair(0x2440, 0x245F), _("Optical Character Recognition"));
+ ranges.emplace_back(std::make_pair(0x2460, 0x24FF), _("Enclosed Alphanumerics"));
+ ranges.emplace_back(std::make_pair(0x2500, 0x257F), _("Box Drawing"));
+ ranges.emplace_back(std::make_pair(0x2580, 0x259F), _("Block Elements"));
+ ranges.emplace_back(std::make_pair(0x25A0, 0x25FF), _("Geometric Shapes"));
+ ranges.emplace_back(std::make_pair(0x2600, 0x26FF), _("Miscellaneous Symbols"));
+ ranges.emplace_back(std::make_pair(0x2700, 0x27BF), _("Dingbats"));
+ ranges.emplace_back(std::make_pair(0x27C0, 0x27EF), _("Miscellaneous Mathematical Symbols-A"));
+ ranges.emplace_back(std::make_pair(0x27F0, 0x27FF), _("Supplemental Arrows-A"));
+ ranges.emplace_back(std::make_pair(0x2800, 0x28FF), _("Braille Patterns"));
+ ranges.emplace_back(std::make_pair(0x2900, 0x297F), _("Supplemental Arrows-B"));
+ ranges.emplace_back(std::make_pair(0x2980, 0x29FF), _("Miscellaneous Mathematical Symbols-B"));
+ ranges.emplace_back(std::make_pair(0x2A00, 0x2AFF), _("Supplemental Mathematical Operators"));
+ ranges.emplace_back(std::make_pair(0x2B00, 0x2BFF), _("Miscellaneous Symbols and Arrows"));
+ ranges.emplace_back(std::make_pair(0x2C00, 0x2C5F), _("Glagolitic"));
+ ranges.emplace_back(std::make_pair(0x2C60, 0x2C7F), _("Latin Extended-C"));
+ ranges.emplace_back(std::make_pair(0x2C80, 0x2CFF), _("Coptic"));
+ ranges.emplace_back(std::make_pair(0x2D00, 0x2D2F), _("Georgian Supplement"));
+ ranges.emplace_back(std::make_pair(0x2D30, 0x2D7F), _("Tifinagh"));
+ ranges.emplace_back(std::make_pair(0x2D80, 0x2DDF), _("Ethiopic Extended"));
+ ranges.emplace_back(std::make_pair(0x2DE0, 0x2DFF), _("Cyrillic Extended-A"));
+ ranges.emplace_back(std::make_pair(0x2E00, 0x2E7F), _("Supplemental Punctuation"));
+ ranges.emplace_back(std::make_pair(0x2E80, 0x2EFF), _("CJK Radicals Supplement"));
+ ranges.emplace_back(std::make_pair(0x2F00, 0x2FDF), _("Kangxi Radicals"));
+ ranges.emplace_back(std::make_pair(0x2FF0, 0x2FFF), _("Ideographic Description Characters"));
+ ranges.emplace_back(std::make_pair(0x3000, 0x303F), _("CJK Symbols and Punctuation"));
+ ranges.emplace_back(std::make_pair(0x3040, 0x309F), _("Hiragana"));
+ ranges.emplace_back(std::make_pair(0x30A0, 0x30FF), _("Katakana"));
+ ranges.emplace_back(std::make_pair(0x3100, 0x312F), _("Bopomofo"));
+ ranges.emplace_back(std::make_pair(0x3130, 0x318F), _("Hangul Compatibility Jamo"));
+ ranges.emplace_back(std::make_pair(0x3190, 0x319F), _("Kanbun"));
+ ranges.emplace_back(std::make_pair(0x31A0, 0x31BF), _("Bopomofo Extended"));
+ ranges.emplace_back(std::make_pair(0x31C0, 0x31EF), _("CJK Strokes"));
+ ranges.emplace_back(std::make_pair(0x31F0, 0x31FF), _("Katakana Phonetic Extensions"));
+ ranges.emplace_back(std::make_pair(0x3200, 0x32FF), _("Enclosed CJK Letters and Months"));
+ ranges.emplace_back(std::make_pair(0x3300, 0x33FF), _("CJK Compatibility"));
+ ranges.emplace_back(std::make_pair(0x3400, 0x4DBF), _("CJK Unified Ideographs Extension A"));
+ ranges.emplace_back(std::make_pair(0x4DC0, 0x4DFF), _("Yijing Hexagram Symbols"));
+ ranges.emplace_back(std::make_pair(0x4E00, 0x9FFF), _("CJK Unified Ideographs"));
+ ranges.emplace_back(std::make_pair(0xA000, 0xA48F), _("Yi Syllables"));
+ ranges.emplace_back(std::make_pair(0xA490, 0xA4CF), _("Yi Radicals"));
+ ranges.emplace_back(std::make_pair(0xA4D0, 0xA4FF), _("Lisu"));
+ ranges.emplace_back(std::make_pair(0xA500, 0xA63F), _("Vai"));
+ ranges.emplace_back(std::make_pair(0xA640, 0xA69F), _("Cyrillic Extended-B"));
+ ranges.emplace_back(std::make_pair(0xA6A0, 0xA6FF), _("Bamum"));
+ ranges.emplace_back(std::make_pair(0xA700, 0xA71F), _("Modifier Tone Letters"));
+ ranges.emplace_back(std::make_pair(0xA720, 0xA7FF), _("Latin Extended-D"));
+ ranges.emplace_back(std::make_pair(0xA800, 0xA82F), _("Syloti Nagri"));
+ ranges.emplace_back(std::make_pair(0xA830, 0xA83F), _("Common Indic Number Forms"));
+ ranges.emplace_back(std::make_pair(0xA840, 0xA87F), _("Phags-pa"));
+ ranges.emplace_back(std::make_pair(0xA880, 0xA8DF), _("Saurashtra"));
+ ranges.emplace_back(std::make_pair(0xA8E0, 0xA8FF), _("Devanagari Extended"));
+ ranges.emplace_back(std::make_pair(0xA900, 0xA92F), _("Kayah Li"));
+ ranges.emplace_back(std::make_pair(0xA930, 0xA95F), _("Rejang"));
+ ranges.emplace_back(std::make_pair(0xA960, 0xA97F), _("Hangul Jamo Extended-A"));
+ ranges.emplace_back(std::make_pair(0xA980, 0xA9DF), _("Javanese"));
+ ranges.emplace_back(std::make_pair(0xAA00, 0xAA5F), _("Cham"));
+ ranges.emplace_back(std::make_pair(0xAA60, 0xAA7F), _("Myanmar Extended-A"));
+ ranges.emplace_back(std::make_pair(0xAA80, 0xAADF), _("Tai Viet"));
+ ranges.emplace_back(std::make_pair(0xABC0, 0xABFF), _("Meetei Mayek"));
+ ranges.emplace_back(std::make_pair(0xAC00, 0xD7AF), _("Hangul Syllables"));
+ ranges.emplace_back(std::make_pair(0xD7B0, 0xD7FF), _("Hangul Jamo Extended-B"));
+ ranges.emplace_back(std::make_pair(0xD800, 0xDB7F), _("High Surrogates"));
+ ranges.emplace_back(std::make_pair(0xDB80, 0xDBFF), _("High Private Use Surrogates"));
+ ranges.emplace_back(std::make_pair(0xDC00, 0xDFFF), _("Low Surrogates"));
+ ranges.emplace_back(std::make_pair(0xE000, 0xF8FF), _("Private Use Area"));
+ ranges.emplace_back(std::make_pair(0xF900, 0xFAFF), _("CJK Compatibility Ideographs"));
+ ranges.emplace_back(std::make_pair(0xFB00, 0xFB4F), _("Alphabetic Presentation Forms"));
+ ranges.emplace_back(std::make_pair(0xFB50, 0xFDFF), _("Arabic Presentation Forms-A"));
+ ranges.emplace_back(std::make_pair(0xFE00, 0xFE0F), _("Variation Selectors"));
+ ranges.emplace_back(std::make_pair(0xFE10, 0xFE1F), _("Vertical Forms"));
+ ranges.emplace_back(std::make_pair(0xFE20, 0xFE2F), _("Combining Half Marks"));
+ ranges.emplace_back(std::make_pair(0xFE30, 0xFE4F), _("CJK Compatibility Forms"));
+ ranges.emplace_back(std::make_pair(0xFE50, 0xFE6F), _("Small Form Variants"));
+ ranges.emplace_back(std::make_pair(0xFE70, 0xFEFF), _("Arabic Presentation Forms-B"));
+ ranges.emplace_back(std::make_pair(0xFF00, 0xFFEF), _("Halfwidth and Fullwidth Forms"));
+ ranges.emplace_back(std::make_pair(0xFFF0, 0xFFFF), _("Specials"));
}
return ranges;
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 6092c26d3..03c3587d9 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1948,16 +1948,16 @@ void InkscapePreferences::initPageSpellcheck()
AspellDictInfoEnumeration *dels = aspell_dict_info_list_elements(dlist);
- languages.push_back(Glib::ustring(C_("Spellchecker language", "None")));
- langValues.push_back(Glib::ustring(""));
+ languages.emplace_back(C_("Spellchecker language", "None"));
+ langValues.emplace_back("");
const AspellDictInfo *entry;
int en_index = 0;
int i = 0;
while ( (entry = aspell_dict_info_enumeration_next(dels)) != nullptr)
{
- languages.push_back(Glib::ustring(entry->name));
- langValues.push_back(Glib::ustring(entry->name));
+ languages.emplace_back(entry->name);
+ langValues.emplace_back(entry->name);
if (!strcmp (entry->name, "en"))
{
en_index = i;
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index 9e4339113..629f8c1c8 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -165,8 +165,8 @@ void ObjectAttributes::widget_setup (void)
int len = 0;
while (desc[len].label)
{
- labels.push_back(desc[len].label);
- attrs.push_back (desc[len].attribute);
+ labels.emplace_back(desc[len].label);
+ attrs.emplace_back(desc[len].attribute);
len += 1;
}
attrTable->set_object(obj, labels, attrs, (GtkWidget*)gobj());
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 8f92050f5..8daa83e9c 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -60,25 +60,25 @@ ObjectProperties::ObjectProperties()
, _desktop(nullptr)
{
//initialize labels for the table at the bottom of the dialog
- _int_attrs.push_back("onclick");
- _int_attrs.push_back("onmouseover");
- _int_attrs.push_back("onmouseout");
- _int_attrs.push_back("onmousedown");
- _int_attrs.push_back("onmouseup");
- _int_attrs.push_back("onmousemove");
- _int_attrs.push_back("onfocusin");
- _int_attrs.push_back("onfocusout");
- _int_attrs.push_back("onload");
-
- _int_labels.push_back("onclick:");
- _int_labels.push_back("onmouseover:");
- _int_labels.push_back("onmouseout:");
- _int_labels.push_back("onmousedown:");
- _int_labels.push_back("onmouseup:");
- _int_labels.push_back("onmousemove:");
- _int_labels.push_back("onfocusin:");
- _int_labels.push_back("onfocusout:");
- _int_labels.push_back("onload:");
+ _int_attrs.emplace_back("onclick");
+ _int_attrs.emplace_back("onmouseover");
+ _int_attrs.emplace_back("onmouseout");
+ _int_attrs.emplace_back("onmousedown");
+ _int_attrs.emplace_back("onmouseup");
+ _int_attrs.emplace_back("onmousemove");
+ _int_attrs.emplace_back("onfocusin");
+ _int_attrs.emplace_back("onfocusout");
+ _int_attrs.emplace_back("onload");
+
+ _int_labels.emplace_back("onclick:");
+ _int_labels.emplace_back("onmouseover:");
+ _int_labels.emplace_back("onmouseout:");
+ _int_labels.emplace_back("onmousedown:");
+ _int_labels.emplace_back("onmouseup:");
+ _int_labels.emplace_back("onmousemove:");
+ _int_labels.emplace_back("onfocusin:");
+ _int_labels.emplace_back("onfocusout:");
+ _int_labels.emplace_back("onload:");
_desktop_changed_connection = _desktop_tracker.connectDesktopChanged(
sigc::mem_fun(*this, &ObjectProperties::_setTargetDesktop)
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index dbb170025..8dc982b82 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -344,7 +344,7 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g
GtkWidget *child = gtk_menu_item_new_with_label(grad->getId());
gtk_menu_shell_append(GTK_MENU_SHELL(popupSub), child);
- popupItems.push_back(grad->getId());
+ popupItems.emplace_back(grad->getId());
g_signal_connect( G_OBJECT(child),
"activate",
G_CALLBACK(SwatchesPanelHook::convertGradient),
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index a4d067acd..578562a79 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -193,7 +193,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
icon_view->set_size_request( 100, 250 );
std::vector< Gtk::TargetEntry > targets;
- targets.push_back(Gtk::TargetEntry( "application/x-inkscape-paste"));
+ targets.emplace_back( "application/x-inkscape-paste");
icon_view->enable_model_drag_source (targets, Gdk::BUTTON1_MASK, Gdk::ACTION_COPY);
icon_view->signal_drag_data_get().connect(
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 561a88a92..e4dfe58a1 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -645,7 +645,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
SPItem* item = *it;
Geom::OptRect bbox = item->desktopPreferredBounds();
if (bbox) {
- sorted.push_back(BBoxSort(item, *bbox, Geom::X, x > 0? 1. : 0., x > 0? 0. : 1.));
+ sorted.emplace_back(item, *bbox, Geom::X, x > 0? 1. : 0., x > 0? 0. : 1.);
}
}
//sort bbox by anchors
@@ -670,7 +670,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
SPItem* item = *it;
Geom::OptRect bbox = item->desktopPreferredBounds();
if (bbox) {
- sorted.push_back(BBoxSort(item, *bbox, Geom::Y, y > 0? 1. : 0., y > 0? 0. : 1.));
+ sorted.emplace_back(item, *bbox, Geom::Y, y > 0? 1. : 0., y > 0? 0. : 1.);
}
}
//sort bbox by anchors
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index f886c0145..8f7a1761b 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -719,7 +719,7 @@ void ControlPointSelection::getOriginalPoints(std::vector<Inkscape::SnapCandidat
{
pts.clear();
for (iterator i = _points.begin(); i != _points.end(); ++i) {
- pts.push_back(Inkscape::SnapCandidatePoint(_original_positions[*i], SNAPSOURCE_NODE_HANDLE));
+ pts.emplace_back(_original_positions[*i], SNAPSOURCE_NODE_HANDLE);
}
}
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index f64ee7827..9223b44de 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -1285,11 +1285,11 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
boost::optional<Geom::Point> fperp_point, bperp_point;
if (front_point) {
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, *front_point));
+ constraints.emplace_back(origin, *front_point);
fperp_point = Geom::rot90(*front_point);
}
if (back_point) {
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, *back_point));
+ constraints.emplace_back(origin, *back_point);
bperp_point = Geom::rot90(*back_point);
}
// perpendiculars only snap when they are further than snap increment away
@@ -1298,20 +1298,20 @@ void Node::dragged(Geom::Point &new_pos, GdkEventMotion *event)
(fabs(Geom::angle_between(*fperp_point, *back_point)) > min_angle &&
fabs(Geom::angle_between(*fperp_point, *back_point)) < M_PI - min_angle)))
{
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, *fperp_point));
+ constraints.emplace_back(origin, *fperp_point);
}
if (bperp_point && (!front_point ||
(fabs(Geom::angle_between(*bperp_point, *front_point)) > min_angle &&
fabs(Geom::angle_between(*bperp_point, *front_point)) < M_PI - min_angle)))
{
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, *bperp_point));
+ constraints.emplace_back(origin, *bperp_point);
}
sp = sm.multipleConstrainedSnaps(Inkscape::SnapCandidatePoint(new_pos, _snapSourceType()), constraints, held_shift(*event));
} else {
// with Ctrl, constrain to axes
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, Geom::Point(1, 0)));
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, Geom::Point(0, 1)));
+ constraints.emplace_back(origin, Geom::Point(1, 0));
+ constraints.emplace_back(origin, Geom::Point(0, 1));
sp = sm.multipleConstrainedSnaps(Inkscape::SnapCandidatePoint(new_pos, _snapSourceType()), constraints, held_shift(*event));
}
new_pos = sp.getPoint();
@@ -1621,14 +1621,14 @@ void NodeList::clear()
to_clear.push_back(&rm->_selection);
++in;
}
- nodes.push_back(std::make_pair(rm, in));
+ nodes.emplace_back(rm, in);
}
for (size_t i = 0, e = nodes.size(); i != e; ++i) {
to_clear[nodes[i].second]->erase(nodes[i].first, false);
}
std::vector<std::vector<SelectableControlPoint *> > emission;
for (long i = 0, e = to_clear.size(); i != e; ++i) {
- emission.push_back(std::vector<SelectableControlPoint *>());
+ emission.emplace_back();
for (size_t j = 0, f = nodes.size(); j != f; ++j) {
if (nodes[j].second != i)
break;
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index ce4a02a2b..2369a75d4 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -295,11 +295,11 @@ add_or_replace_if_extremum(std::vector< std::pair<NodeList::iterator, double> >
if (testvalue > extrvalue) {
// replace all extreme nodes with the new one
vec.clear();
- vec.push_back( std::pair<NodeList::iterator, double>( node, t ) );
+ vec.emplace_back( node, t );
extrvalue = testvalue;
} else if ( Geom::are_near(testvalue, extrvalue) ) {
// very rare but: extremum node at the same extreme value!!! so add it to the list
- vec.push_back( std::pair<NodeList::iterator, double>( node, t ) );
+ vec.emplace_back( node, t );
}
}
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index de91e10e4..382654dad 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -658,8 +658,8 @@ protected:
// constrain to axes
Geom::Point origin = _last_drag_origin();
std::vector<Inkscape::Snapper::SnapConstraint> constraints;
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, Geom::Point(1, 0)));
- constraints.push_back(Inkscape::Snapper::SnapConstraint(origin, Geom::Point(0, 1)));
+ constraints.emplace_back(origin, Geom::Point(1, 0));
+ constraints.emplace_back(origin, Geom::Point(0, 1));
new_pos = sm.multipleConstrainedSnaps(Inkscape::SnapCandidatePoint(new_pos,
SNAPSOURCE_ROTATION_CENTER), constraints, held_shift(*event)).getPoint();
} else if (snap) {
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index aaa5f1d9a..a6fc54f1f 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -869,7 +869,7 @@ static void sp_flood_do_flood_fill(ToolBase *event_context, GdkEvent *event, boo
bci.current_step = 0;
if (is_point_fill) {
- fill_points.push_back(Geom::Point(event->button.x, event->button.y));
+ fill_points.emplace_back(event->button.x, event->button.y);
} else {
Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
fill_points = r->getPoints();
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index ba2609975..6c8a3f2c3 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -274,7 +274,7 @@ static void spdc_apply_powerstroke_shape(std::vector<Geom::Point> points, Freeha
if (!swidth) {
swidth = swidth/2;
}
- points.push_back(Geom::Point(0, swidth));
+ points.emplace_back(0, swidth);
}
Effect::createAndApply(POWERSTROKE, dc->desktop->doc(), item);
lpe = SP_LPE_ITEM(item)->getCurrentLPE();
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 842a84f74..f0d6639ab 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -809,7 +809,7 @@ PencilTool::addPowerStrokePencil()
(_previous_pressure > step && pressure_shrunk < step))
{
_previous_pressure = pressure_shrunk;
- this->points.push_back(Geom::Point(0, pressure_computed));
+ this->points.emplace_back(0, pressure_computed);
this->_points_pos.push_back(this->_last_point);
}
if (this->_curve && this->ps.size() > 1) {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 9e1a0c05b..bddbb60e8 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -397,10 +397,10 @@ void ColorICCSelector::init()
for (size_t i = 0; i < maxColorspaceComponentCount; i++) {
#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
if (i < things.size()) {
- _impl->_compUI.push_back(ComponentUI(things[i]));
+ _impl->_compUI.emplace_back(things[i]);
}
else {
- _impl->_compUI.push_back(ComponentUI());
+ _impl->_compUI.emplace_back();
}
std::string labelStr = (i < things.size()) ? things[i].name.c_str() : "";
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index b8eeca00d..58af30fc9 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -86,13 +86,13 @@ static std::vector<std::string> lscape_papers;
static void
fill_landscape_papers() {
- lscape_papers.push_back("US #10 Envelope");
- lscape_papers.push_back("DL Envelope");
- lscape_papers.push_back("Banner 468x60");
- lscape_papers.push_back("Business Card (ISO 7810)");
- lscape_papers.push_back("Business Card (US)");
- lscape_papers.push_back("Business Card (Europe)");
- lscape_papers.push_back("Business Card (Aus/NZ)");
+ lscape_papers.emplace_back("US #10 Envelope");
+ lscape_papers.emplace_back("DL Envelope");
+ lscape_papers.emplace_back("Banner 468x60");
+ lscape_papers.emplace_back("Business Card (ISO 7810)");
+ lscape_papers.emplace_back("Business Card (US)");
+ lscape_papers.emplace_back("Business Card (Europe)");
+ lscape_papers.emplace_back("Business Card (Aus/NZ)");
}
static PaperSizeRec const inkscape_papers[] = {
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 02:32:56 +0000