diff options
| author | luz.paz <luzpaz@users.noreply.github.com> | 2018-09-30 18:39:25 +0000 |
|---|---|---|
| committer | luz paz <luzpaz@users.noreply.github.com> | 2018-10-06 02:05:25 +0000 |
| commit | 33780c0f28bcda586b1e14de93525a6ab426e4df (patch) | |
| tree | 341c90061fed79841ea4161b2088d5baa40fe1fa /src | |
| parent | Add new style register style property for stop color and opacity (diff) | |
| download | inkscape-33780c0f28bcda586b1e14de93525a6ab426e4df.tar.gz inkscape-33780c0f28bcda586b1e14de93525a6ab426e4df.zip | |
Misc. typos
Found via `codespell`
Diffstat (limited to 'src')
27 files changed, 90 insertions, 90 deletions
diff --git a/src/document.cpp b/src/document.cpp index 6f4706ebc..54b7071c0 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1753,7 +1753,7 @@ static unsigned int count_objects_recursive(SPObject *obj, unsigned int count) * Count the number of objects in a given document recursively using the count_objects_recursive helper function * * @param[in] document Pointer to the document for counting objects - * @return Numer of objects in the document + * @return Number of objects in the document */ static unsigned int objects_in_document(SPDocument *document) { diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index 845ed8202..fde6ee86f 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -114,7 +114,7 @@ Dependency::~Dependency () If the \c _location is \c LOCATION_EXTENSIONS then the \c INKSCAPE_EXTENSIONDIR is put on the front of the string with \c build_filename. Then the - appopriate filetest is run. + appropriate filetest is run. If the \c _location is \c LOCATION_ABSOLUTE then the file test is run directly on the string. diff --git a/src/extension/dependency.h b/src/extension/dependency.h index e97965cc5..1cba8aff9 100644 --- a/src/extension/dependency.h +++ b/src/extension/dependency.h @@ -47,10 +47,10 @@ class Dependency { /** \brief The location to look for this particular dependency. */ location_t _location; - /** \brief Strings to reperesent the different enum values in + /** \brief Strings to represent the different enum values in \c type_t in the XML */ static gchar const * _type_str[TYPE_CNT]; - /** \brief Strings to reperesent the different enum values in + /** \brief Strings to represent the different enum values in \c location_t in the XML */ static gchar const * _location_str[LOCATION_CNT]; diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index 4a11e40f6..c7d4a5bde 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -488,7 +488,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx) // Calculate the matrix that will be applied to the image so that it exactly overlaps the source objects - // Matix to put bitmap in correct place on document + // Matrix to put bitmap in correct place on document Geom::Affine t_on_document = (Geom::Affine)(Geom::Scale (scale_x, scale_y)) * (Geom::Affine)(Geom::Translate (shift_x, shift_y)); diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index 7baf84306..44625ac5d 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -582,7 +582,7 @@ uint32_t Emf::add_image(PEMF_CALLBACK_DATA d, void *pEmr, uint32_t cbBits, uint So the rotated name is EMFrotimage###_XXXXXX, where ### is the number of the referred to image, and XXXX is the rotation in radians x 1000000 and truncated. That is then stored in BASE64 as the "image". The corresponding SVG generated though is not for an image, but a reference to an image. - The name of the pattern MUST stil be EMFimage###_ref or output_style() will not be able to use it. + The name of the pattern MUST still be EMFimage###_ref or output_style() will not be able to use it. */ if(current_rotation(d) >= 0.00001 || current_rotation(d) <= -0.00001){ /* some rotation, allow a little rounding error around 0 degrees */ int tangle = round(current_rotation(d)*1000000.0); @@ -1456,7 +1456,7 @@ Emf::delete_object(PEMF_CALLBACK_DATA d, int index) d->emf_obj[index].type = 0; // We are keeping a copy of the EMR rather than just a structure. Currently that is not necessary as the entire // EMF is read in at once and is stored in a big malloc. However, in past versions it was handled -// reord by record, and we might need to do that again at some point in the future if we start running into EMF +// record by record, and we might need to do that again at some point in the future if we start running into EMF // files too big to fit into memory. if (d->emf_obj[index].lpEMFR) free(d->emf_obj[index].lpEMFR); diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index e1ef985bc..c7d0814b4 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -268,7 +268,7 @@ private: * The singular values, sigma[k] = S[k][k], are ordered so that * sigma[0] >= sigma[1] >= ... >= sigma[n-1]. * <P> - * The singular value decompostion always exists, so the constructor will + * The singular value decomposition always exists, so the constructor will * never fail. The matrix condition number and the effective numerical * rank can be computed from this decomposition. */ diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index 746089893..1487ec47f 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -69,7 +69,7 @@ static void pruneExtendedNamespaces( Inkscape::XML::Node *repr ) attrsRemoved.push_back(attrName); } } - // Can't change the set we're interating over while we are iterating. + // Can't change the set we're iterating over while we are iterating. for ( std::vector<gchar const*>::iterator it = attrsRemoved.begin(); it != attrsRemoved.end(); ++it ) { repr->setAttribute(*it, nullptr); } diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index 3783eaa1a..2e4b39299 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -1261,7 +1261,7 @@ Wmf::delete_object(PWMF_CALLBACK_DATA d, int index) d->wmf_obj[index].type = 0; // We are keeping a copy of the WMR rather than just a structure. Currently that is not necessary as the entire // WMF is read in at once and is stored in a big malloc. However, in past versions it was handled -// reord by record, and we might need to do that again at some point in the future if we start running into WMF +// record by record, and we might need to do that again at some point in the future if we start running into WMF // files too big to fit into memory. if (d->wmf_obj[index].record) free(d->wmf_obj[index].record); diff --git a/src/extension/system.h b/src/extension/system.h index 170c44346..6b405b5d0 100644 --- a/src/extension/system.h +++ b/src/extension/system.h @@ -75,7 +75,7 @@ Glib::ustring get_file_save_path (SPDocument *doc, FileSaveMethod method); * Write the given file extension back to prefs so that it can be used later on. * * @param extension the file extension which should be written to prefs - * @param method the file save mathod of the dialog + * @param method the file save method of the dialog */ void store_file_extension_in_prefs (Glib::ustring extension, FileSaveMethod method); @@ -83,7 +83,7 @@ void store_file_extension_in_prefs (Glib::ustring extension, FileSaveMethod meth * Write the given path back to prefs so that it can be used later on. * * @param path the path which should be written to prefs - * @param method the file save mathod of the dialog + * @param method the file save method of the dialog */ void store_save_path_in_prefs (Glib::ustring path, FileSaveMethod method); diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 59e7959f7..516c14f4e 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -8,7 +8,7 @@ * Liam P. White <inkscapebrony@gmail.com> * * Copyright (C) 1999-2014 authors - * c++ port Copyright (C) 2003 Nathan Hurst + * c++ port Copyright (C) 2003 Nathan Hurst * c++ification Copyright (C) 2014 Liam P. White * * Released under GNU GPL, read the file 'COPYING' for more information @@ -80,7 +80,7 @@ typedef int uid_t; #endif /** C++ification TODO list - * - _S_inst should NOT need to be assigned inside the constructor, but if it isn't the Filters+Extensions menus break. + * - _S_inst should NOT need to be assigned inside the constructor, but if it isn't the Filters+Extensions menus break. * - Application::_deskops has to be a pointer because of a signal bug somewhere else. Basically, it will attempt to access a deleted object in sp_ui_close_all(), * but if it's a pointer we can stop and return NULL in Application::active_desktop() * - These functions are calling Application::create for no good reason I can determine: @@ -129,7 +129,7 @@ void inkscape_unref(Inkscape::Application & in) delete Inkscape::Application::_S_inst; } } else { - g_error("Attempt to unref an Application (=%p) not the current instance (=%p) (maybe it's already been destroyed?)", + g_error("Attempt to unref an Application (=%p) not the current instance (=%p) (maybe it's already been destroyed?)", &in, Inkscape::Application::_S_inst); } } @@ -263,7 +263,7 @@ int Application::autosave() while( (filename = g_dir_read_name(autosave_dir_ptr)) != nullptr ){ if ( strncmp(filename, baseName, strlen(baseName)) == 0 ){ gchar* full_path = g_build_filename( autosave_dir.c_str(), filename, NULL ); - if (g_file_test (full_path, G_FILE_TEST_EXISTS)){ + if (g_file_test (full_path, G_FILE_TEST_EXISTS)){ if ( g_stat(full_path, &sb) != -1 ) { if ( difftime(sb.st_ctime, min_time) < 0 || min_time == 0 ){ min_time = sb.st_ctime; @@ -398,8 +398,8 @@ Application::add_style_sheet() #endif Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - // we want a tiny file with 3 or 4 lines, so we can loada witout removing context - // is more undertable than record previously applyed + // we want a tiny file with 3 or 4 lines, so we can load without removing context + // is more understandable than record previously applied Glib::ustring style = get_filename(UIS, "style.css"); if (!style.empty()) { auto provider = Gtk::CssProvider::create(); @@ -537,7 +537,7 @@ Application::Application(const char* argv, bool use_gui) : Inkscape::Extension::init(); autosave_init(); - + /* Initialize font factory */ font_factory *factory = font_factory::Default(); if (prefs->getBool("/options/font/use_fontsdir_system", true)) { @@ -825,7 +825,7 @@ void Application::selection_changed (Inkscape::Selection * selection) { g_return_if_fail (selection != nullptr); - + if (DESKTOP_IS_ACTIVE (selection->desktop())) { signal_selection_changed.emit(selection); } @@ -905,7 +905,7 @@ Application::remove_desktop (SPDesktop * desktop) SPDesktop * new_desktop = *(++_desktops->begin()); _desktops->erase(std::find(_desktops->begin(), _desktops->end(), new_desktop)); _desktops->insert(_desktops->begin(), new_desktop); - + signal_activate_desktop.emit(new_desktop); signal_eventcontext_set.emit(new_desktop->getEventContext()); signal_selection_set.emit(new_desktop->getSelection()); @@ -939,7 +939,7 @@ Application::activate_desktop (SPDesktop * desktop) } std::vector<SPDesktop*>::iterator i; - + if ((i = std::find (_desktops->begin(), _desktops->end(), desktop)) == _desktops->end()) { g_error("Tried to activate desktop not added to list."); } diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h index 82476fbae..085410169 100644 --- a/src/libnrtype/FontFactory.h +++ b/src/libnrtype/FontFactory.h @@ -130,7 +130,7 @@ public: int weight=PANGO_WEIGHT_NORMAL, int stretch=PANGO_STRETCH_NORMAL, int size=10, int spacing=0); - /// Semi-private: tells the font_factory taht the font_instance 'who' has died and should be removed from loadedFaces + /// Semi-private: tells the font_factory that the font_instance 'who' has died and should be removed from loadedFaces void UnrefFace(font_instance* who); // internal diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 235840bb0..88339a60e 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -700,7 +700,7 @@ void font_instance::FindFontMetrics() { // On Windows, the typographic ascender and descender are taken from the otmMacAscent and // otmMacDescent values: // http://microsoft.public.win32.programmer.gdi.narkive.com/LV6k4BDh/msdn-documentation-outlinetextmetrics-clarification - // The otmAscent and otmDescent values are the maxiumum ascent and maxiumum descent of all the + // The otmAscent and otmDescent values are the maximum ascent and maximum descent of all the // glyphs in a font. if ( theFace ) { diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index c9f140872..81710b471 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -206,7 +206,7 @@ void Layout::show(DrawingGroup *in_arena, Geom::OptRect const &paintbox) const } // Save the starting coordinates for the line - these are needed for figuring out // dot/dash/wave phase. - // Use maximum ascent and descent to ensure glpyhs that extend outside the embox + // Use maximum ascent and descent to ensure glyphs that extend outside the embox // are fully drawn. (void) nr_text->addComponent(_spans[span_index].font, _glyphs[glyph_index].glyph, glyph_matrix, _glyphs[glyph_index].width, @@ -373,7 +373,7 @@ std:: cout << "DEBUG Layout::print in while " ++text_iter; if(doUTN)newtarget=SingleUnicodeToNon(*text_iter); // this should only ever be with a 1:1 glyph:character situation if(newtarget != oldtarget)break; // change in unicode to nonunicode translation status - // MUST exit on any major span change, but not on some little events, like a font substitution event irrelvant for the file save + // MUST exit on any major span change, but not on some little events, like a font substitution event irrelevant for the file save unsigned next_span_index = _characters[lc_index].in_span; if(span_index != next_span_index){ /* on major changes break out of loop. diff --git a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp index f95846279..78b805003 100644 --- a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp +++ b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp @@ -130,7 +130,7 @@ std::vector<Layout::ScanlineMaker::ScanRun> Layout::ShapeScanlineMaker::makeScan // I think what's going on here is that we're moving the top of the scanline to the given position... _rotated_shape->Scan(_rasterizer_y, _current_rasterization_point, _y, line_text_height); - // ...then actually retreiving the scanline (which alters the first two parameters) + // ...then actually retrieving the scanline (which alters the first two parameters) _rotated_shape->Scan(_rasterizer_y, _current_rasterization_point, _y + line_text_height , &line_rasterization, true, line_text_height); // sanitise the raw rasterisation, which could have weird overlaps line_rasterization.Flatten(); diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index 879bef24b..6c68ae913 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -972,7 +972,7 @@ public: /* mustn't compare _glyph_index in these operators because for characters that don't have glyphs (line breaks, elided soft hyphens, etc), the glyph - index is -1 which makes them not well-ordered. To be honest, interating by + index is -1 which makes them not well-ordered. To be honest, iterating by glyphs is not very useful and should be avoided. */ bool operator< (iterator const &other) const {return _char_index < other._char_index;} diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h index 725d5d2d2..0834ace04 100644 --- a/src/libnrtype/font-instance.h +++ b/src/libnrtype/font-instance.h @@ -105,8 +105,8 @@ private: double _ascent; // Typographic ascent. double _descent; // Typographic descent. double _xheight; // x-height of font. - double _ascent_max; // Maxiumum ascent of all glyphs in font. - double _descent_max; // Maxiumum descent of all glyphs in font. + double _ascent_max; // Maximum ascent of all glyphs in font. + double _descent_max; // Maximum descent of all glyphs in font. // Baselines double _baselines[SP_CSS_BASELINE_SIZE]; diff --git a/src/live_effects/lpe-measure-segments.cpp b/src/live_effects/lpe-measure-segments.cpp index f008f0ad0..473eaa9d1 100644 --- a/src/live_effects/lpe-measure-segments.cpp +++ b/src/live_effects/lpe-measure-segments.cpp @@ -189,7 +189,7 @@ LPEMeasureSegments::LPEMeasureSegments(LivePathEffectObject *lpeobject) : "<b><i>Style Dialog</i></b> Styling using XML editor to find appropriate classes or ID's\n" "<b><i>Blacklists</i></b> This allow to hide some segments or projection steps to measure\n" "<b><i>Multiple Measures</i></b> In the same object, in conjunction of blacklists, " - "allow measures with diferent orientations or a extra projection \n" + "allow measures with different orientations or a extra projection \n" "<b><i>Set Defaults</i></b> Remember all LPE has it in the bottom")); } diff --git a/src/live_effects/lpe-powerclip.h b/src/live_effects/lpe-powerclip.h index c79932b84..2e67cbcd9 100644 --- a/src/live_effects/lpe-powerclip.h +++ b/src/live_effects/lpe-powerclip.h @@ -37,7 +37,7 @@ private: MessageParam message; Geom::Path clip_box; Geom::Affine base; - Geom::Affine lastapplyed; + Geom::Affine lastapplied; }; void sp_remove_powerclip(Inkscape::Selection *sel); diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp index d11249d1f..47ba3417a 100755 --- a/src/object/sp-lpe-item.cpp +++ b/src/object/sp-lpe-item.cpp @@ -74,7 +74,7 @@ void SPLPEItem::build(SPDocument *document, Inkscape::XML::Node *repr) { void SPLPEItem::release() { // disconnect all modified listeners: - + for (std::list<sigc::connection>::iterator mod_it = this->lpe_modified_connection_list->begin(); mod_it != this->lpe_modified_connection_list->end(); ++mod_it) { @@ -239,7 +239,7 @@ bool SPLPEItem::performOnePathEffect(SPCurve *curve, SPShape *current, Inkscape: return false; } //if is not clip or mask or LPE apply to clip and mask - if (!(is_clip_or_mask && !lpe->apply_to_clippath_and_mask)) { + if (!(is_clip_or_mask && !lpe->apply_to_clippath_and_mask)) { lpe->setCurrentShape(current); if (!SP_IS_GROUP(this)) { lpe->pathvector_before_effect = curve->get_pathvector(); @@ -263,8 +263,8 @@ bool SPLPEItem::performOnePathEffect(SPCurve *curve, SPShape *current, Inkscape: } return false; } - - + + if (!SP_IS_GROUP(this)) { // To have processed the shape to doAfterEffect lpe->pathvector_after_effect = curve->get_pathvector(); @@ -422,7 +422,7 @@ sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem, bool keep_paths, if (repr->attribute("inkscape:original-d") && !lpeitem->hasPathEffectRecursive() && (!is_clip_mask || - ( is_clip_mask && force))) + ( is_clip_mask && force))) { if (!keep_paths) { repr->setAttribute("d", repr->attribute("inkscape:original-d")); @@ -445,7 +445,7 @@ sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem, bool keep_paths, if (d_str) { if (!lpeitem->hasPathEffectRecursive() && (!is_clip_mask || - ( is_clip_mask && force))) + ( is_clip_mask && force))) { if (!keep_paths) { repr->setAttribute("d", nullptr); @@ -458,7 +458,7 @@ sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem, bool keep_paths, // remember parent Inkscape::XML::Node *parent = shape->getRepr()->parent(); // remember class - char const *class_attr = shape->getRepr()->attribute("class"); + char const *class_attr = shape->getRepr()->attribute("class"); // remember title gchar *title = shape->title(); // remember description @@ -555,7 +555,7 @@ void SPLPEItem::addPathEffect(std::string value, bool reset) if( SP_IS_GENERICELLIPSE(this)) { SP_GENERICELLIPSE(this)->write( this->getRepr()->document(), this->getRepr(), SP_OBJECT_WRITE_EXT ); } - + LivePathEffectObject *lpeobj = this->path_effect_list->back()->lpeobject; if (lpeobj && lpeobj->get_lpe()) { @@ -565,8 +565,8 @@ void SPLPEItem::addPathEffect(std::string value, bool reset) // has to be called when all the subitems have their lpes applied lpe->resetDefaults(this); } - // Moved here to fix #1299461, we can call previious function twice after - // if anyone find necesary + // Moved here to fix #1299461, we can call previous function twice after + // if anyone find necessary // make sure there is an original-d for paths!!! sp_lpe_item_create_original_path_recursive(this); // perform this once when the effect is applied @@ -747,7 +747,7 @@ bool SPLPEItem::hasPathEffectOnClipOrMask(SPLPEItem * shape) const if (!path_effect_list || path_effect_list->empty()) { return false; } - + for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); ++it) { LivePathEffectObject *lpeobj = (*it)->lpeobject; diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index ebb577529..b93c5843f 100755 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -267,13 +267,13 @@ void SelectionHelper::selectPrev(SPDesktop *dt) /* * Fixes the current selection, removing locked objects from it */ -void SelectionHelper::fixSelection(SPDesktop *dt) +void SelectionHelper::fixSelection(SPDesktop *dt) { if(!dt) return; Inkscape::Selection *selection = dt->getSelection(); - + std::vector<SPItem*> items ; auto selList = selection->items(); @@ -392,17 +392,17 @@ void ObjectSet::deleteItems() return; } } - + if (isEmpty()) { selection_display_message(desktop(),Inkscape::WARNING_MESSAGE, _("<b>Nothing</b> was deleted.")); return; } std::vector<SPItem*> selected(items().begin(), items().end()); - clear(); + clear(); sp_selection_delete_impl(selected); if(SPDesktop *d = desktop()){ d->currentLayer()->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - + /* a tool may have set up private information in it's selection context * that depends on desktop items. I think the only sane way to deal with * this currently is to reset the current tool, which will reset it's @@ -438,12 +438,12 @@ void ObjectSet::duplicate(bool suppressDone, bool duplicateLayer) //TODO: understand why layer management is tied to desktop and not to document. return; } - + SPDocument *doc = document(); - + if(!doc) return; - + Inkscape::XML::Document* xml_doc = doc->getReprDoc(); // check if something is selected @@ -820,11 +820,11 @@ void ObjectSet::popFromGroup(){ } parent_group->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - + if(document()) DocumentUndo::done(document(), SP_VERB_SELECTION_UNGROUP_POP_SELECTION, _("Pop selection from group")); - + } static void ungroup_impl(ObjectSet *set) @@ -983,7 +983,7 @@ bool sp_item_repr_compare_position_bool(SPObject const *first, SPObject const *s } void ObjectSet::raise(bool skip_undo){ - + if(isEmpty()){ selection_display_message(desktop(), Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to raise.")); return; @@ -1047,7 +1047,7 @@ void ObjectSet::raiseToTop(bool skip_undo) { return; } - + std::vector<Inkscape::XML::Node*> rl(xmlNodes().begin(), xmlNodes().end()); sort(rl.begin(),rl.end(),sp_repr_compare_position_bool); @@ -1406,7 +1406,7 @@ void ObjectSet::toNextLayer(bool skip_undo) if(!desktop()) return; SPDesktop *dt=desktop(); //TODO make it desktop-independent - + // check if something is selected if (isEmpty()) { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to move to the layer above.")); @@ -2375,7 +2375,7 @@ struct ListReverse { return *(i->begin()); } static Iterator next(Iterator i) { i->pop_front(); return i; } - + static bool isNull(Iterator i) {return i->empty();} private: @@ -2966,7 +2966,7 @@ void ObjectSet::cloneOriginalPathLPE(bool allow_transforms) void ObjectSet::toMarker(bool apply) { // sp_selection_tile has similar code - if (desktop() == nullptr) { // TODO: We should not need desktop for that. + if (desktop() == nullptr) { // TODO: We should not need desktop for that. // Someone get rid of the dt2doc() call. return; } @@ -3087,7 +3087,7 @@ void ObjectSet::toGuides() /* * Convert objects to <symbol>. How that happens depends on what is selected: - * + * * 1) A random selection of objects will be embedded into a single <symbol> element. * * 2) Except, a single <g> will have its content directly embedded into a <symbol>; the 'id' and @@ -3164,14 +3164,14 @@ void ObjectSet::toSymbol() Inkscape::XML::Node *defsrepr = doc->getDefs()->getRepr(); Inkscape::XML::Node *symbol_repr = xml_doc->createElement("svg:symbol"); Inkscape::XML::Node *title_repr = xml_doc->createElement("svg:title"); - + defsrepr->appendChild(symbol_repr); bool settitle = false; // For a single group, copy relevant attributes. if( single_group ) { Glib::ustring id = the_group->getAttribute("id"); symbol_repr->setAttribute("style", the_group->getAttribute("style")); - + gchar * title = the_group->title(); if (title) { symbol_repr->appendChild(title_repr); @@ -3180,7 +3180,7 @@ void ObjectSet::toSymbol() Inkscape::GC::release(title_repr); } g_free(title); - + gchar * desc = the_group->desc(); if (desc) { Inkscape::XML::Node *desc_repr = xml_doc->createElement("svg:desc"); @@ -3274,7 +3274,7 @@ void ObjectSet::unSymbol() } SPObject* symbol = single(); - + // Make sure we have only one object in selection. // Require that we really have a <symbol>. if( symbol == nullptr || !dynamic_cast<SPSymbol *>( symbol )) { @@ -3310,7 +3310,7 @@ void ObjectSet::unSymbol() } } } - + for (std::vector<SPObject*>::const_reverse_iterator i=children.rbegin();i!=children.rend();++i){ Inkscape::XML::Node *repr = (*i)->getRepr(); repr->parent()->removeChild(repr); @@ -3371,7 +3371,7 @@ void ObjectSet::tile(bool apply) // bottommost object, after sorting SPObject *parent = items_[0]->parent; - + Geom::Affine parent_transform; { @@ -3820,9 +3820,9 @@ void ObjectSet::setClipGroup() desktop()->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select <b>object(s)</b> to create clippath or mask from.")); return; } - + std::vector<Inkscape::XML::Node*> p(xmlNodes().begin(), xmlNodes().end()); - + sort(p.begin(),p.end(),sp_repr_compare_position_bool); clear(); @@ -3832,7 +3832,7 @@ void ObjectSet::setClipGroup() Inkscape::XML::Node *inner = xml_doc->createElement("svg:g"); inner->setAttribute("inkscape:label", "Clip"); - + for(std::vector<Inkscape::XML::Node*>::const_iterator i=p.begin();i!=p.end();++i){ Inkscape::XML::Node *current = *i; @@ -3877,12 +3877,12 @@ void ObjectSet::setClipGroup() } } } - + Inkscape::XML::Node *outer = xml_doc->createElement("svg:g"); outer->appendChild(inner); topmost_parent->appendChild(outer); outer->setPosition(topmost + 1); - + Inkscape::XML::Node *clone = xml_doc->createElement("svg:use"); clone->setAttribute("x", "0", false); clone->setAttribute("y", "0", false); @@ -3895,12 +3895,12 @@ void ObjectSet::setClipGroup() templist.push_back(clone); // add the new clone to the top of the original's parent gchar const *mask_id = SPClipPath::create(templist, doc); - - + + outer->setAttribute("clip-path", g_strdup_printf("url(#%s)", mask_id)); Inkscape::GC::release(clone); - + set(outer); DocumentUndo::done(doc, SP_VERB_OBJECT_SET_CLIPPATH, _("Create Clip Group")); } @@ -3943,12 +3943,12 @@ void ObjectSet::setClipGroup() // /END FIXME doc->ensureUpToDate(); - - // Coment this section because we dont need it I think. - // Also updated comment code to work correctly if finaly is needed - // To active again remove next line and uncoment the section +is + // Comment out this section because we don't need it, I think. + // Also updated comment code to work correctly if indeed it's needed. + // To reactivate, remove the next line and uncomment the section. std::vector<SPItem*> items_(items().begin(), items().end()); - /* + /* std::vector<SPItem*> items_prerect_(items().begin(), items().end()); std::vector<SPItem*> items_; @@ -3963,10 +3963,10 @@ void ObjectSet::setClipGroup() items_.push_back(*i); } } - clear(); + clear(); */ sort(items_.begin(),items_.end(),sp_object_compare_position_bool); - + // See lp bug #542004 clear(); @@ -4275,7 +4275,7 @@ void ObjectSet::swapFillStroke() auto list= items(); for (auto itemlist=list.begin();itemlist!=list.end();++itemlist) { SPItem *item = *itemlist; - + SPCSSAttr *css = sp_repr_css_attr_new (); _paintserver_id.clear(); diff --git a/src/svg-profile.h b/src/svg-profile.h index d735ae46e..ac0f56d65 100644 --- a/src/svg-profile.h +++ b/src/svg-profile.h @@ -38,11 +38,11 @@ namespace Inkscape { bitfield. The entire class has been optimized for inlining and compiler reduction - of code. All entires should allow being put in a structure or other + of code. All entries should allow being put in a structure or other static allocation. For most operations, simple and/or instructions in the processor is required after optimization. - Adding additional profiles to the class is as easy as adding entires + Adding additional profiles to the class is as easy as adding entries into the enum. Adding additional aggregates requires adding to the enum, and adding the aggregate into the constructor for the class. */ @@ -74,7 +74,7 @@ public: SVG_PRINT_1_1, /**< */ - PROFILE_UNIQUE_CNT, /**< A marker to separate between the entires + PROFILE_UNIQUE_CNT, /**< A marker to separate between the entries that are unique, and those which are aggregates of them. */ diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index f11fcac71..df7be6253 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -190,7 +190,7 @@ Geom::Point calcAngleDisplayAnchor(SPDesktop *desktop, double angle, double base * Create a measure item in current document. * * @param pathv the path to create. - * @param markers if the path resuts get markers. + * @param markers if the path results get markers. * @param color of the stroke. * @param measure_repr container element. */ diff --git a/src/ui/view/view.h b/src/ui/view/view.h index 532bf36a8..31b43d12c 100644 --- a/src/ui/view/view.h +++ b/src/ui/view/view.h @@ -116,7 +116,7 @@ protected: * Disconnects the view from the document signals, connects the view * to a new one, and emits the _document_set_signal on the view. * - * This is code comon to all subclasses and called from their + * This is code common to all subclasses and called from their * setDocument() methods after they are done. * * @param doc The new document to connect the view to. diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp index bb9425b29..2d562f468 100644 --- a/src/ui/widget/unit-tracker.cpp +++ b/src/ui/widget/unit-tracker.cpp @@ -114,7 +114,7 @@ void UnitTracker::addAdjustment(GtkAdjustment *adj) g_object_weak_ref(G_OBJECT(adj), _adjustmentFinalizedCB, this); _adjList.push_back(adj); } else { - std::cerr << "UnitTracker::addAjustment: Ajustment already added!" << std::endl; + std::cerr << "UnitTracker::addAjustment: Adjustment already added!" << std::endl; } } diff --git a/src/verbs.cpp b/src/verbs.cpp index 83875e292..47c532a3f 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -577,7 +577,7 @@ SPAction *TextVerb::make_action(Inkscape::ActionContext const & context) * it allocates and creates the action. When it does this it * translates the \c _name and \c _tip variables. This allows them * to be statically allocated easily, and get translated in the end. Then, - * if the action gets crated, a listener is added to the action with + * if the action gets created, a listener is added to the action with * the vector that is passed in. * * @param context Which context the action should be created for. diff --git a/src/xml/document.h b/src/xml/document.h index efbc9bff7..f9a1d8533 100644 --- a/src/xml/document.h +++ b/src/xml/document.h @@ -36,7 +36,7 @@ namespace XML { * all changes made to the document are stored in an internal event log. At any time * after starting the transaction, you can call the rollback() method, which restores * the document to the state it was before starting the transaction. Calling the commit() - * method causes the internal event log to be discarded, and you can estabilish a new + * method causes the internal event log to be discarded, and you can establish a new * "restore point" by calling beginTransaction() again. There can be only one active * transaction at a time for a given document. */ diff --git a/src/xml/helper-observer.cpp b/src/xml/helper-observer.cpp index 048d878a2..9ba1d7da3 100644 --- a/src/xml/helper-observer.cpp +++ b/src/xml/helper-observer.cpp @@ -19,7 +19,7 @@ SignalObserver::~SignalObserver() // Add this observer to the SPObject and remove it from any previous object void SignalObserver::set(SPObject* o) { - // XML Tree being used direcly in this function in the following code + // XML Tree being used directly in this function in the following code // while it shouldn't be // Pointer to object is stored, so refcounting should be increased/decreased if(_oldsel) { |
