← Back to branch summary

~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/object-hierarchy.cpp

  • Committer: JazzyNico
  • Date: 2011-08-29 20:25:30 UTC
  • Revision ID: nicoduf@yahoo.fr-20110829202530-6deuoz11q90usldv
Code refactoring and merging with trunk (revision 10599).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/object-hierarchy.cpp
70
70
    g_assert(junior != NULL);
71
71
    g_assert(senior != NULL);
72
72
 
73
 
    SPObject *object=SP_OBJECT_PARENT(junior);
 
73
    SPObject *object = junior->parent;
74
74
    do {
75
75
        _addTop(object);
76
 
        object = SP_OBJECT_PARENT(object);
 
76
        object = object->parent;
77
77
    } while ( object != senior );
78
78
}
79
79
 
160
160
    g_assert(senior != NULL);
161
161
 
162
162
    if ( junior != senior ) {
163
 
        _addBottom(senior, SP_OBJECT_PARENT(junior));
 
163
        _addBottom(senior, junior->parent);
164
164
        _addBottom(junior);
165
165
    }
166
166
}
214
214
  fill-column:99
215
215
  End:
216
216
*/
217
 
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
 
217
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :