Diffstat (limited to 'noncore/apps/opie-console/screen.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/apps/opie-console/screen.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/noncore/apps/opie-console/screen.cpp b/noncore/apps/opie-console/screen.cpp index 8ebc47d..a796ba1 100644 --- a/noncore/apps/opie-console/screen.cpp +++ b/noncore/apps/opie-console/screen.cpp @@ -70,3 +70,3 @@ Screen::Screen(int lines, int columns) - image = (Character*) malloc(lines*columns*sizeof(Character)); + image = QArray<Character>( lines*columns ); tabstops = NULL; initTabStops(); @@ -84,3 +84,3 @@ Screen::~Screen() { - free(image); + delete image; if (tabstops) free(tabstops); @@ -396,3 +396,3 @@ void Screen::resizeImage(int new_lines, int new_columns) // make new image - Character* newimg = (Character*) malloc(new_lines*new_columns*sizeof(Character)); + QArray<Character> newimg = QArray<Character>( new_lines * new_columns ); @@ -420,3 +420,3 @@ void Screen::resizeImage(int new_lines, int new_columns) } - free(image); + delete image; image = newimg; @@ -468,3 +468,3 @@ void Screen::resizeImage(int new_lines, int new_columns) -void Screen::reverseRendition(Character* p) +void Screen::reverseRendition(Character *p) { UINT8 f = p->f; UINT8 b = p->b; @@ -506,5 +506,5 @@ void Screen::effectiveRendition() -Character* Screen::getCookedImage() +QArray<Character> Screen::getCookedImage() { int x,y; - Character* merged = (Character*) malloc(lines*columns*sizeof(Character)); + Character* merged = (Character*) malloc( lines * columns * sizeof( Character ) ); Character dft(' ',DEFAULT_FORE_COLOR,DEFAULT_BACK_COLOR,DEFAULT_RENDITION); @@ -517,3 +517,3 @@ Character* Screen::getCookedImage() - hist.getCells(y+histCursor,0,len,merged+yp); + hist.getCells( y+histCursor, 0, len, merged+yp ); for (x = len; x < columns; x++) merged[yp+x] = dft; @@ -549,3 +549,5 @@ Character* Screen::getCookedImage() reverseRendition(&merged[loc(cuX,cuY+(hist.getLines()-histCursor))]); - return merged; + QArray<Character> res( sizeof( merged ) / sizeof( Character ) ); + res.assign( merged, sizeof( merged ) / sizeof( Character ) ); + return res; } @@ -1161,3 +1163,3 @@ void Screen::addHistLine() - hist.addCells(image,end+1); + hist.addCells(image.data(), end+1); hist.addLine(); |