← Back to branch summary

~l3on/ubuntu/precise/rkward/rebuild1

« back to all changes in this revision

Viewing changes to rkward/core/rkvariable.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-05-11 21:58:23 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20090511215823-m2f3gehcvapwrzgp
Tags: 0.5.0d-0ubuntu1
https://launchpad.net/bugs/375213
* New upstream release (LP: #375213)
* Bump Standards-Version to 3.8.1
* Drop cmake, libphon-dev from build-deps
* Update maintainer field

Show diffs side-by-side

added added

removed removed

Lines of Context:
rkward/core/rkvariable.cpp
420
420
                RK_ASSERT (data->cell_doubles == 0);
421
421
                QString *new_data = new QString[target];
422
422
                if (data->allocated_length) {           // if not yet allocated, don't mem-move
423
 
                        memmove (new_data, data->cell_strings, data->allocated_length * sizeof (QString));
 
423
                        memMoveQStrings (new_data, data->cell_strings, data->allocated_length);
424
424
                }
425
425
                delete [] (data->cell_strings);
426
426
                data->cell_strings = new_data;
729
729
 
730
730
        if (to_row < (data->allocated_length - 1)) {    // not the last rows
731
731
                if (data->cell_strings) {
732
 
                        memmove (&(data->cell_strings[from_row]), &(data->cell_strings[to_row+1]), (data->allocated_length - to_row - 1) * sizeof (QString));
 
732
                        memMoveQStrings (&(data->cell_strings[from_row]), &(data->cell_strings[to_row+1]), (data->allocated_length - to_row - 1));
733
733
                } else {
734
734
                        memmove (&(data->cell_doubles[from_row]), &(data->cell_doubles[to_row+1]), (data->allocated_length - to_row - 1) * sizeof (double));
735
735
                }
777
777
                if (data->cell_doubles) data->cell_doubles[row+count] = 0.0;
778
778
                data->cell_states[row+count] = RKVarEditData::NA;
779
779
        } else {
780
 
                if (data->cell_strings) memmove (&(data->cell_strings[row+count]), &(data->cell_strings[row]), (data->allocated_length - (row + count) - 1) * sizeof (QString));
 
780
                if (data->cell_strings) {
 
781
                        memMoveQStrings (&(data->cell_strings[row+count]), &(data->cell_strings[row]), (data->allocated_length - (row + count) - 1));
 
782
                }
781
783
                if (data->cell_doubles) memmove (&(data->cell_doubles[row+count]), &(data->cell_doubles[row]), (data->allocated_length - (row + count) - 1) * sizeof (double));
782
784
                memmove (&(data->cell_states[row+count]), &(data->cell_states[row]), (data->allocated_length - (row + count) - 1) * sizeof (int));
783
785
        }