Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / widgets / paint-selector.cpp

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index aadda9e2005d2071f9c22e9f569f61846c28b1d4..1d8acb40a63b426c9c86f426d7838e86a8a438a4 100644 (file)
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -8,6 +8,7 @@
  *   bulia byak <buliabyak@users.sf.net>
  *   John Cliff <simarilius@yahoo.com>
  *   Jon A. Cruz <jon@joncruz.org>
+ *   Abhishek Sharma
  *
  * Copyright (C) Lauris Kaplinski 2002
  * Copyright (C) 2010 Authors
@@ -784,7 +785,7 @@ ink_pattern_list_get (SPDocument *source)
         return NULL;
 
     GSList *pl = NULL;
-    GSList const *patterns = source->get_resource_list("pattern");
+    GSList const *patterns = source->getResourceList("pattern");
     for (GSList *l = (GSList *) patterns; l != NULL; l = l->next) {
         if (SP_PATTERN(l->data) == pattern_getroot(SP_PATTERN(l->data))) {  // only if this is a root pattern
             pl = g_slist_prepend(pl, l->data);
@@ -894,7 +895,7 @@ ink_pattern_menu_populate_menu(GtkWidget *m, SPDocument *doc)
 
     // suck in from patterns.svg
     if (patterns_doc) {
-        doc->ensure_up_to_date();
+        doc->ensureUpToDate();
         sp_pattern_list_from_doc ( m, doc, patterns_doc, NULL );
     }
 
@@ -1082,11 +1083,10 @@ static void sp_paint_selector_set_mode_swatch(SPPaintSelector *psel, SPPaintSele
     SwatchSelector *swatchsel = 0;
 
     if (psel->mode == SPPaintSelector::MODE_SWATCH){
-        /* Already have pattern menu */
         swatchsel = static_cast<SwatchSelector*>(g_object_get_data(G_OBJECT(psel->selector), "swatch-selector"));
     } else {
         sp_paint_selector_clear_frame(psel);
-        /* Create new gradient selector */
+        // Create new gradient selector
         SwatchSelector *swatchsel = new SwatchSelector();
         swatchsel->show();
 
@@ -1102,6 +1102,7 @@ static void sp_paint_selector_set_mode_swatch(SPPaintSelector *psel, SPPaintSele
 
         gtk_frame_set_label(GTK_FRAME(psel->frame), _("Swatch fill"));
     }
+
 #ifdef SP_PS_VERBOSE
     g_print("Swatch req\n");
 #endif
@@ -1186,4 +1187,4 @@ SPPaintSelector::Mode SPPaintSelector::getModeForStyle(SPStyle const & style, Fi
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :