All of the files included have instances where an array is new'ed but

the corresponding delete does not have the corresponding [] argument.

9 files changed, 14 insertions, 14 deletions

diff --git a/core/apps/embeddedkonsole/TEScreen.cpp b/core/apps/embeddedkonsole/TEScreen.cpp
index 8e69a88..1db34d2 100644
--- a/core/apps/embeddedkonsole/TEScreen.cpp
+++ b/core/apps/embeddedkonsole/TEScreen.cpp
@@ -1093,98 +1093,98 @@ QString TEScreen::getSelText(const BOOL preserve_line_breaks)
     {
       while ((eol > s) &&
        isspace(image[eol - hist_BR].c))
         {
     eol--;
         }
     }
   else
     {
       eol = sel_BR;
     }
 
   while (s <= eol)
     {
       m[d++] = image[s++ - hist_BR].c;
     }
 
   if (eol < sel_BR)
     {
         // eol processing see below ...
       if ((eol + 1) % columns == 0)
         {
     if (image[eol - hist_BR].c == ' ')
       {
         m[d++] = ' ';
       }
         }
       else
         {
     m[d++] = ((preserve_line_breaks ||
          ((eol % columns) == 0)) ?
         '\n' : ' ');
         }
     }
 
   s = (eol / columns + 1) * columns;
       }
     }
 
   QChar* qc = new QChar[d];
 
   for (int i = 0; i < d; i++)
     {
       qc[i] = m[i];
     }
   
   QString res(qc, d);
 
-  delete m;
-  delete qc;
+  delete [] m;
+  delete [] qc;
 
   return res;
 }
 /* above ... end of line processing for selection -- psilva
 cases:
 
 1)    (eol+1)%columns == 0 --> the whole line is filled.
    If the last char is a space, insert (preserve) space. otherwise
    leave the text alone, so that words that are broken by linewrap
    are preserved.
 
 FIXME:
   * this suppresses \n for command output that is
     sized to the exact column width of the screen.
 
 2)    eol%columns == 0     --> blank line.
    insert a \n unconditionally.
    Do it either you would because you are in preserve_line_break mode,
    or because it's an ASCII paragraph delimiter, so even when
    not preserving line_breaks, you want to preserve paragraph breaks.
 
 3)    else     --> partially filled line
    insert a \n in preserve line break mode, else a space
    The space prevents concatenation of the last word of one
    line with the first of the next.
 
 */
 
 void TEScreen::addHistLine()
 {
   assert(hasScroll() || histCursor == 0);
 
   // add to hist buffer
   // we have to take care about scrolling, too...
 
   if (hasScroll()){
       ca dft;
 
     int end = columns - 1;
     while (end >= 0 && image[end] == dft)
       end -= 1;
 
     hist.addCells( image, end + 1);
     hist.addLine();
 
     // adjust history cursor
     histCursor += ( hist.getLines() - 1 == histCursor);
   }
diff --git a/noncore/apps/checkbook/listedit.cpp b/noncore/apps/checkbook/listedit.cpp
index e40377b..b297d69 100644
--- a/noncore/apps/checkbook/listedit.cpp
+++ b/noncore/apps/checkbook/listedit.cpp
@@ -191,97 +191,97 @@ void ListEdit::fixTypes(int iColumn)
         cur=cur->nextSibling();
     }
 
     // fix empty entries
     int i=0;
     for(QString *ptr=lst.first(); ptr; ptr=lst.next()) {
         *ptr=ptr->stripWhiteSpace();
         if( ptr->isEmpty() ) {
             i++;
             if( i==1 ) *ptr=pDef->getNewValue();
             else ptr->sprintf("%s %d", (const char *)pDef->getNewValue(), i);
         }
     }
 
     // fix dups
     lst.sort();
     QString repl;
     for(uint iCur=0; iCur<lst.count()-1; iCur++) {
         QString *current=lst.at(iCur);
         for(uint iNext=iCur+1; iNext<lst.count(); iNext++ ) {
             if( *current!=*lst.at(iNext) ) continue;
             for(int i=2; ; i++) {
                 repl.sprintf("%s %d", (const char *)*current, i);
                 bool bDup=false;
                 uint iChk=iNext+1;
                 while( iChk<lst.count() ) {
                     QString *chk=lst.at(iChk);
                     if( !chk->startsWith(*current) ) break;
                     if( *chk==repl ) {
                         bDup=true;
                         break;
                     }
                     iChk++;
                 }
                 if( !bDup ) {
                     *lst.at(iNext)=repl;
                     break;
                 }
             }
         }
     }
     lst.sort();
 
     // copy back clean up col map
     for(int i=0; i<_typeTable->childCount(); i++) {
         colMap[i]->getItem()->setText(iColumn, colMap[i]->getValue());
         delete colMap[i];
     }
-    delete colMap;
+    delete [] colMap;
 }
 
 void ListEdit::fixTypes()
 {
     int i;
     ColumnDef *pDef;
     for(pDef=this->first(), i=0; pDef; pDef=this->next(), i++) {
         if( pDef->hasFlag(ColumnDef::typeUnique) )
             fixTypes(i);
     }
     _typeTable->sort();
 }
 
 
 // --- storeInList ------------------------------------------------------------
 void ListEdit::storeInList(QStringList &lst)
 {
     // delete old content
     lst.clear();
 
     // add new one
     fixTypes();
     QListViewItem *itm=_typeTable->firstChild();
     while( itm ) {
         int i=0;
         QString sAdd;
         ColumnDef *pDef;
         for(pDef=this->first(), i=0; pDef; pDef=this->next(), i++) {
             if( i>=1 ) sAdd+=";";
             sAdd += itm->text(i);
         }
         lst.append( sAdd );
         itm=itm->nextSibling();
     }
 }
 
 
 // --- slotClicked ------------------------------------------------------------
 void ListEdit::slotClick(QListViewItem *itm, const QPoint &pnt, int col)
 {
     (void)pnt; // get rid of unused warning;
 
     // save values
     _currentItem=itm;
     _currentColumn=col;
     if( itm==NULL ) {
         _typeEdit->setText("");
         _stack->raiseWidget(_typeEdit);
diff --git a/noncore/apps/opie-console/TEScreen.cpp b/noncore/apps/opie-console/TEScreen.cpp
index 2675d31..8e91532 100644
--- a/noncore/apps/opie-console/TEScreen.cpp
+++ b/noncore/apps/opie-console/TEScreen.cpp
@@ -1070,98 +1070,98 @@ QString TEScreen::getSelText(const BOOL preserve_line_breaks)
           {
             while ((eol > s) &&
                    isspace(image[eol - hist_BR].c))
               {
                 eol--;
               }
           }
         else
           {
             eol = sel_BR;
           }
 
         while (s <= eol)
           {
             m[d++] = image[s++ - hist_BR].c;
           }
 
         if (eol < sel_BR)
           {
                                 // eol processing see below ...
             if ((eol + 1) % columns == 0)
               {
                 if (image[eol - hist_BR].c == ' ')
                   {
                     m[d++] = ' ';
                   }
               }
             else
               {
                 m[d++] = ((preserve_line_breaks ||
                            ((eol % columns) == 0)) ?
                           '\n' : ' ');
               }
           }
 
         s = (eol / columns + 1) * columns;
       }
     }
 
   QChar* qc = new QChar[d];
 
   for (int i = 0; i < d; i++)
     {
       qc[i] = m[i];
     }
 
   QString res(qc, d);
 
-  delete m;
-  delete qc;
+  delete [] m;
+  delete [] qc;
 
   return res;
 }
 QString TEScreen::getHistory() {
     sel_begin = 0;
     sel_BR = sel_begin;
     sel_TL = sel_begin;
     setSelExtentXY(columns-1,lines-1);
     QString tmp=getSelText(true);
     while (tmp.at(tmp.length()-2).unicode()==10 && tmp.at(tmp.length()-1).unicode()==10)
         tmp.truncate(tmp.length()-1);
 
     return tmp;
 }
 /* above ... end of line processing for selection -- psilva
 cases:
 
 1)    (eol+1)%columns == 0 --> the whole line is filled.
    If the last char is a space, insert (preserve) space. otherwise
    leave the text alone, so that words that are broken by linewrap
    are preserved.
 
 FIXME:
         * this suppresses \n for command output that is
           sized to the exact column width of the screen.
 
 2)    eol%columns == 0     --> blank line.
    insert a \n unconditionally.
    Do it either you would because you are in preserve_line_break mode,
    or because it's an ASCII paragraph delimiter, so even when
    not preserving line_breaks, you want to preserve paragraph breaks.
 
         3)    else       --> partially filled line
    insert a \n in preserve line break mode, else a space
    The space prevents concatenation of the last word of one
    line with the first of the next.
 
 */
 
 void TEScreen::addHistLine()
 {
   assert(hasScroll() || histCursor == 0);
 
   // add to hist buffer
   // we have to take care about scrolling, too...
 
   if (hasScroll())
   { ca dft;
diff --git a/noncore/apps/opie-sheet/Excel.cpp b/noncore/apps/opie-sheet/Excel.cpp
index 338bc30..51fe707 100644
--- a/noncore/apps/opie-sheet/Excel.cpp
+++ b/noncore/apps/opie-sheet/Excel.cpp
@@ -293,97 +293,97 @@ char* ExcelBook::Read(int pos, int length)
     for(i=0; i<length; i++)
     {
         if(!feof(File)) data[i]=fgetc(File);
     };
     Position= Position+length;
     return data;
 };
 
 QString ExcelBook::ReadUnicodeChar(int pos, int length)
 {
     int i;
     QString data;
     int i1=' ',i2=' ',ii;
     SeekPosition(pos);
     for(i=0; i<length; i++)
     {
         if(!feof(File)) i1=fgetc(File);
         if(!feof(File)) i2=fgetc(File);
         ii=Integer2Byte(i1,i2);
         data.append(ii);
         Position+=2;
     };
     return data;
 };
 
 QString* ExcelBook::GetString(int num)
 {
     if(num>=0 && num<(int)SharedStrings.count())
     {
         return SharedStrings[num];
     };
     return new QString("");
 };
 
 int ExcelBook::SeekBOF(void)
 {
     int opcode,version,streamtype,length,ret=0;
     char *data;
     while(!feof(File))
     {
         opcode=Get2Bytes();
         if(opcode==XL_BOF)
         {
             length=Get2Bytes();
             data=Read(Position,length);
             version=Integer2Byte(data[0], data[1]);
             streamtype=Integer2Byte(data[2], data[3]);
             printf("SEEKBOF:opcode=XLBOF, %d ,version %d\r\n",Position,version);
-            delete data; data=NULL;
+            delete [] data; data=NULL;
             if (version==BIFF8) ret=8;
             else if(version==BIFF7) ret=7;
             printf("SEEKBOF:versionBIFF%d\r\n",ret);
             if(streamtype==WBKGLOBAL) return ret *2;
             else if(streamtype==WRKSHEET) return ret *1;
             return 1;
         };
     };
     return 0;
 };
 
 ExcelBREC* ExcelBook::GetBREC(void)
 {
     ExcelBREC* rec;
     rec= new ExcelBREC;
     if(FileEOF()) return NULL;
     rec->data=NULL;
     rec->code=Get2Bytes();
     rec->length=Get2Bytes();
     rec->position=Position;
     SeekSkip(rec->length);
     return rec;
 };
 
 ExcelBREC* ExcelBook::PeekBREC(void)
 {
     int oldpos;
     ExcelBREC* NextRec;
     oldpos=Position;
     NextRec=GetBREC();
     SeekPosition(oldpos);
     return NextRec;
 };
 
 char* ExcelBook::GetDataOfBREC(ExcelBREC* record)
 {
     if(record->data==NULL)
     {
         ConvertCharToArray(record,Read(record->position,record->length),record->length);
     };
     return record->data;//new?
 };
 
 void ExcelBook::ConvertCharToArray(ExcelBREC* record, char* chars, int length)
 {
     record->data=new char[length];
     for(int w1=0;w1<=length-1;w1++)
         record->data[w1]=chars[w1];
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 6dc4fd2..a70f3aa 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -2174,158 +2174,158 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
      paint.setFont(myFontBI);
     else if (a->bold)
       paint.setFont(myFontBold);
     else if (a->italic)
       paint.setFont(myFontItalic);
     else
       paint.setFont(myFont);
       }
     }
     z++;
   }
   if (z > zc) {
     QConstString str((QChar *) &s[zc], z - zc /*+1*/);
     paint.drawText(x - xStart, y, str.string());
   }
 }
 
 // Applies the search context, and returns whether a match was found. If one is,
 // the length of the string matched is also returned.
 bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
   int line, col;
   int searchEnd;
   int bufLen, tlen;
   QChar *t;
   TextLine::Ptr textLine;
   int pos, newPos;
 
   if (searchFor.isEmpty()) return false;
 
   bufLen = 0;
   t = 0L;
 
   line = sc.cursor.y;
   col = sc.cursor.x;
   if (!(sc.flags & KateView::sfBackward)) {
     //forward search
     if (sc.flags & KateView::sfSelected) {
       if (line < selectStart) {
         line = selectStart;
         col = 0;
       }
       searchEnd = selectEnd;
     } else searchEnd = lastLine();
 
     while (line <= searchEnd) {
       textLine = getTextLine(line);
       tlen = textLine->length();
       if (tlen > bufLen) {
-        delete t;
+        delete [] t;
         bufLen = (tlen + 255) & (~255);
         t = new QChar[bufLen];
       }
       memcpy(t, textLine->getText(), tlen*sizeof(QChar));
       if (sc.flags & KateView::sfSelected) {
         pos = 0;
         do {
           pos = textLine->findSelected(pos);
           newPos = textLine->findUnselected(pos);
           memset(&t[pos], 0, (newPos - pos)*sizeof(QChar));
           pos = newPos;
         } while (pos < tlen);
       }
 
       QString text(t, tlen);
       if (sc.flags & KateView::sfWholeWords) {
         // Until the end of the line...
         while (col < tlen) {
           // ...find the next match.
           col = sc.search(text, col);
           if (col != -1) {
             // Is the match delimited correctly?
             if (((col == 0) || (!m_highlight->isInWord(t[col]))) &&
               ((col + sc.matchedLength == tlen) || (!m_highlight->isInWord(t[col + sc.matchedLength])))) {
               goto found;
             }
             else {
               // Start again from the next character.
               col++;
             }
           }
           else {
             // No match.
             break;
           }
         }
       }
       else {
         // Non-whole-word search.
         col = sc.search(text, col);
         if (col != -1)
           goto found;
       }
       col = 0;
       line++;
     }
   } else {
     // backward search
     if (sc.flags & KateView::sfSelected) {
       if (line > selectEnd) {
         line = selectEnd;
         col = -1;
       }
       searchEnd = selectStart;
     } else searchEnd = 0;
 
     while (line >= searchEnd) {
       textLine = getTextLine(line);
       tlen = textLine->length();
       if (tlen > bufLen) {
-        delete t;
+        delete [] t;
         bufLen = (tlen + 255) & (~255);
         t = new QChar[bufLen];
       }
       memcpy(t, textLine->getText(), tlen*sizeof(QChar));
       if (sc.flags & KateView::sfSelected) {
         pos = 0;
         do {
           pos = textLine->findSelected(pos);
           newPos = textLine->findUnselected(pos);
           memset(&t[pos], 0, (newPos - pos)*sizeof(QChar));
           pos = newPos;
         } while (pos < tlen);
       }
 
       if (col < 0 || col > tlen) col = tlen;
 
       QString text(t, tlen);
       if (sc.flags & KateView::sfWholeWords) {
         // Until the beginning of the line...
         while (col >= 0) {
           // ...find the next match.
           col = sc.search(text, col);
           if (col != -1) {
             // Is the match delimited correctly?
             if (((col == 0) || (!m_highlight->isInWord(t[col]))) &&
               ((col + sc.matchedLength == tlen) || (!m_highlight->isInWord(t[col + sc.matchedLength])))) {
               goto found;
             }
             else {
               // Start again from the previous character.
               col--;
             }
           }
           else {
             // No match.
             break;
           }
         }
       }
       else {
         // Non-whole-word search.
         col = sc.search(text, col);
         if (col != -1)
           goto found;
       }
       col = -1;
       line--;
     }
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 837fcc5..27ae101 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -180,97 +180,97 @@ void KRFBDecoder::gotServerInit()
   con->read( &(info->redShift), 1 );
   con->read( &(info->greenShift), 1 );
   con->read( &(info->blueShift), 1 );
 
   con->read( info->padding, 3 );
 
   con->read( &(info->nameLength), 4 );
   info->nameLength = Swap32IfLE( info->nameLength );
 
   owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl;
   owarn << "Bpp = " << info->bpp << ", Depth = " << info->depth << ", Big = " << info->bigEndian
         << ", True = " << info->trueColor << oendl;
   owarn << "RedMax = " << info->redMax << ", GreenMax = " << info->greenMax << ", BlueMax = " << info->blueMax << oendl;
   owarn << "RedShift = " << info->redShift << ", GreenShift = " << info->greenShift
         << ", BlueShift = " << info-> blueShift << oendl;
 
   buf->resize( info->width/con->options()->scaleFactor, info->height /con->options()->scaleFactor);
 
   // Wait for desktop name
   owarn << "Waiting for desktop name" << oendl;
 
   static QString statusMsg = tr( "Waiting for desktop name..." );
   emit status( statusMsg );
 
   currentState = AwaitingDesktopName;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotDesktopName() ) );
   con->waitForData( info->nameLength );
 }
 
 void KRFBDecoder::gotDesktopName()
 {
   assert( info );
   assert( currentState == AwaitingDesktopName );
 
   owarn << "Got desktop name" << oendl;
 
   disconnect( con, SIGNAL( gotEnoughData() ),
           this, SLOT( gotDesktopName() ) );
 
   char *buf = new char[ info->nameLength + 1 ];
   CHECK_PTR( buf );
 
   con->read( buf, info->nameLength );
   buf[ info->nameLength ] = '\0';
   info->name = buf;
 
   owarn << "Desktop: " << info->name.latin1() << "" << oendl;
 
-  delete buf;
+  delete [] buf;
 
   // Get the format we'll really use and tell the server
   decidePixelFormat();
   sendPixelFormat();
   sendAllowedEncodings();
   currentState = Idle;
 
   QString msg;
   msg = tr( "Connected to %1" );
   msg = msg.arg( info->name );
   emit status( msg );
 
   sendUpdateRequest( false );
 }
 
 void KRFBDecoder::decidePixelFormat()
 {
   assert( info );
 
   if ( format )
     delete format;
   format = new KRFBPixelFormat;
   CHECK_PTR( format );
 
   // What depth do we want?
   //
   // We'll use the minimum of the remote and local depths, UNLESS an
   // eight bit session has been specifically requested by the user.
   int screenDepth = QPixmap::defaultDepth();
   int bestDepth = ( screenDepth > info->depth ) ? info->depth : screenDepth;
   int chosenDepth;
 
   if ( con->options()->colors256 )
     chosenDepth = 8;
   else
     chosenDepth = bestDepth;
 
   owarn << "Screen depth=" << screenDepth << ", server depth=" << info->depth
         << ", best depth=" << bestDepth << "eight bit " << con->options()->colors256
         << ", chosenDepth=" << chosenDepth << oendl;
 
   format->depth = chosenDepth;
 
   // If we're using the servers native depth
   if ( chosenDepth == info->depth ) {
     // Use the servers native format
     format->bpp = info->bpp;
     //    format->bigEndian = info->bigEndian;
@@ -490,97 +490,97 @@ void KRFBDecoder::handleRawRect()
     //  owarn << "Handling a raw rect chunk" << oendl;
 
     //  CARD32 lineCount = w * format->bpp / 8;
 
   if ( h > RectChunkSize ) {
     //    if ( con->sock->size() / lineCount ) {
     //      getRawRectChunk( con->sock->size() / lineCount );
     //    }
     //    else {
       getRawRectChunk( RectChunkSize );
       //   }
   }
   else {
     getRawRectChunk( h );
   }
 }
 
 void KRFBDecoder::getRawRectChunk( int lines )
 {
   this->lines = lines;
   CARD32 count = lines * w * format->bpp / 8;
 
   // Wait for server init
   //  owarn << "Waiting for raw rect chunk, " << count << "" << oendl;
 
   currentState = AwaitingRawRectChunk;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRawRectChunk() ) );
   con->waitForData( count );
 }
 
 void KRFBDecoder::gotRawRectChunk()
 {
   assert( currentState == AwaitingRawRectChunk );
 
   disconnect( con, SIGNAL( gotEnoughData() ),
               this, SLOT( gotRawRectChunk() ) );
 
   //  owarn << "Got raw rect chunk" << oendl;
 
   //
   // Read the rect data and copy it to the buffer.
   //
 
   // TODO: Replace this!
   int count = lines * w * format->bpp / 8;
   char *hack = new char[ count ];
   con->read( hack, count );
   buf->drawRawRectChunk( hack, x, y, w, lines );
-  delete hack;
+  delete [] hack;
   // /TODO:
 
   h = h - lines;
   y = y + lines;
 
   if ( h > 0 ) {
     handleRawRect();
   }
   else {
     noRects--;
 
     //    owarn << "There are " << noRects << " rects left" << oendl;
 
     if ( noRects ) {
       currentState = AwaitingRectHeader;
       connect( con, SIGNAL( gotEnoughData() ), SLOT( gotRectHeader() ) );
       con->waitForData( RectHeaderLength );
     }
     else {
       // we are now ready for the next update - no need to wait for the timer
       currentState = Idle;
       sendUpdateRequest (1);
     }
   }
 }
 
 //
 // Copy Rectangle Encoding
 //
 
 void KRFBDecoder::handleCopyRect()
 {
   currentState = AwaitingCopyRectPos;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotCopyRectPos() ) );
   con->waitForData( CopyRectPosLength );
 }
 
 void KRFBDecoder::gotCopyRectPos()
 {
   disconnect( con, SIGNAL( gotEnoughData() ),
               this, SLOT( gotCopyRectPos() ) );
 
   CARD16 srcX;
   CARD16 srcY;
 
   con->read( &srcX, 2 );
   con->read( &srcY, 2 );
 
@@ -683,97 +683,97 @@ void KRFBDecoder::gotServerCut()
 
 void KRFBDecoder::gotServerCutLength()
 {
   assert( currentState = AwaitingServerCutLength );
   disconnect( con, SIGNAL( gotEnoughData() ),
               this, SLOT( gotServerCutLength() ) );
 
   CARD8 padding[3];
   con->read( padding, 3 );
 
   con->read( &serverCutTextLen, 4 );
   serverCutTextLen = Swap32IfLE( serverCutTextLen );
 
   currentState = AwaitingServerCutText;
   connect( con, SIGNAL( gotEnoughData() ), SLOT( gotServerCutText() ) );
   con->waitForData( serverCutTextLen );
 }
 
 void KRFBDecoder::gotServerCutText()
 {
   assert( currentState = AwaitingServerCutText );
 
   disconnect( con, SIGNAL( gotEnoughData() ),
               this, SLOT( gotServerCutText() ) );
 
 
   //
   // Warning: There is a bug in the RFB protocol because there is no way to find
   // out the codepage in use on the remote machine. This could be fixed by requiring
   // the remote server to use utf8 etc. but for now we have to assume they're the
   // same. I've reported this problem to the ORL guys, but they apparantly have no
   // immediate plans to fix the issue. :-( (rich)
   //
 
   char *cutbuf = new char[ serverCutTextLen + 1 ];
   CHECK_PTR( cutbuf );
 
   con->read( cutbuf, serverCutTextLen );
   cutbuf[ serverCutTextLen ] = '\0';
 
   /* For some reason QApplication::clipboard()->setText() segfaults when called
    * from within keypebble's mass of signals and slots
   owarn << "Server cut: " << cutbuf << "" << oendl;
 
   QString cutText( cutbuf ); // DANGER!!
   qApp->clipboard()->setText( cutText );
   */
 
-  delete cutbuf;
+  delete [] cutbuf;
   // Now wait for the update (again)
   if ( oldState == AwaitingUpdate ) {
     currentState = AwaitingUpdate;
     connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) );
     con->waitForData( UpdateHeaderLength );
   }
   else if ( oldState == Idle ) {
     currentState = Idle;
   }
   else {
     owarn << "Async handled in weird state" << oendl;
     currentState = oldState;
   };
 }
 
 void KRFBDecoder::gotBell()
 {
   owarn << "Got server bell" << oendl;
   buf->soundBell();
 
   // Now wait for the update (again)
   if ( oldState == AwaitingUpdate ) {
     currentState = AwaitingUpdate;
     connect( con, SIGNAL( gotEnoughData() ), SLOT( gotUpdateHeader() ) );
     con->waitForData( UpdateHeaderLength );
   }
   else if ( oldState == Idle ) {
     currentState = Idle;
   }
   else {
     owarn << "Async handled in weird state" << oendl;
     currentState = oldState;
   };
 }
 
 void KRFBDecoder::sendKeyPressEvent( QKeyEvent *event )
 {
   int key;
   key = toKeySym( event );
   if ( key ) {
     key = Swap32IfLE( key );
 
     CARD8 mask = true;
 
     CARD16 padding = 0;
     con->write( &KeyEventId, 1 );
     con->write( &mask, 1 );
     con->write( &padding, 2 );
diff --git a/noncore/games/sfcave/sfcave.cpp b/noncore/games/sfcave/sfcave.cpp
index a6c92a0..516dc93 100644
--- a/noncore/games/sfcave/sfcave.cpp
+++ b/noncore/games/sfcave/sfcave.cpp
@@ -953,97 +953,97 @@ void SFCave :: saveReplay()
     fwrite( (const char *)val, 1, val.length(), out );
    
     fclose( out );
 
     printf( "Replay saved to %s\n", QFile::encodeName(replayFile).data() );
 
 }
 
 void SFCave :: loadReplay()
 {
     FILE *in = fopen( QFile::encodeName(replayFile).data() , "r" );
 
     if ( in == 0 )
     {
         printf( "Couldn't load replay file!\n" );
         return;
     }   
 
     // Read next line - contains the size of the options
     char line[10+1];
     fgets( line, 10, in );
 
     int length = -1;
     sscanf( line, "%d", &length );
     char *data = new char[length+1];
 
     fread( data, 1, length, in );
 //    printf( "data - %s", data );
 
     QString sep  = " ";
     QStringList list = QStringList::split( sep, QString( data ) );
     
     // print it out
     QStringList::Iterator it = list.begin();
     currentSeed = (*it).toInt();
     ++it;
     currentGameType = (*it).toInt();
     ++it;
     currentGameDifficulty = (*it).toInt();
     ++it;
 
     replayList.clear();
     for ( ; it != list.end(); ++it )
     {
         int v = (*it).toInt();
         replayList.append( new int( v ) );
     }
 
-    delete data;
+    delete [] data;
 
     fclose( in );
     
     printf( "Replay loaded from %s\n", QFile::encodeName(replayFile).data() );
 }
 
 
 //--------------- MENU CODE ---------------------
 void SFCave :: handleMenuKeys( QKeyEvent *e )
 {
     switch( e->key() )
     {
         case Qt::Key_Down:
             currentMenuOption[currentMenuNr] ++;
             if ( menuOptions[currentMenuNr][currentMenuOption[currentMenuNr]] == "" )
                 currentMenuOption[currentMenuNr] = 0;
             break;
         case Qt::Key_Up:
             currentMenuOption[currentMenuNr] --;
             if ( currentMenuOption[currentMenuNr] < 0 )
                 currentMenuOption[currentMenuNr] = nrMenuOptions[currentMenuNr]-1;
             break;
 
         case Qt::Key_Left:
             if ( currentMenuNr == MENU_OPTIONS_MENU )
             {
                 if ( currentMenuOption[currentMenuNr] == MENU_GAME_TYPE )
                 {
                     currentGameType --;
                     if ( currentGameType < 0 )
                         currentGameType = NR_GAME_TYPES - 1;
                 }
                 else if ( currentMenuOption[currentMenuNr] == MENU_GAME_DIFFICULTY )
                 {
                     currentGameDifficulty --;
                     if ( currentGameDifficulty < 0 )
                         currentGameDifficulty = NR_GAME_DIFFICULTIES - 1;
                 }
             }
             break;
 
         case Qt::Key_Right:
             if ( currentMenuNr == MENU_OPTIONS_MENU )
             {
                 if ( currentMenuOption[currentMenuNr] == MENU_GAME_TYPE )
                 {
                     currentGameType ++;
                     if ( currentGameType == NR_GAME_TYPES )
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 7ffa1d6..0886e69 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -302,97 +302,97 @@ void SettingsImpl :: editServer( int sel )
     }
     else
     {
         serverName = "";
         servername->setText( "" );
         serverurl->setText( "" );
         active->setChecked( false );
     }
 }
 
 void SettingsImpl :: newServer()
 {
     newserver = true;
     servername->setText( "" );
     serverurl->setText( "" );
     servername->setFocus();
     active->setChecked( true );
 }
 
 void SettingsImpl :: removeServer()
 {
     changed = true;
     Server *s = dataMgr->getServer( servers->currentText() );
     if ( s )
     {
         dataMgr->getServerList().removeRef( s );
         servers->removeItem( currentSelectedServer );
     }
 }
 
 void SettingsImpl :: changeServerDetails()
 {
     changed = true;
 
     QString newName = servername->text();
 
     // Convert any spaces to underscores
     char *tmpStr = new char[newName.length() + 1];
     for ( unsigned int i = 0 ; i < newName.length() ; ++i )
     {
         if ( newName[i] == ' ' )
             tmpStr[i] = '_';
         else
             tmpStr[i] = newName[i].latin1();
     }
     tmpStr[newName.length()] = '\0';
 
     newName = tmpStr;
-    delete tmpStr;
+    delete [] tmpStr;
 
     if ( !newserver )
     {
         Server *s = dataMgr->getServer( servers->currentText() );
         if ( s )
         {
             // Update url
             s->setServerUrl( serverurl->text() );
             s->setActive( active->isChecked() );
 
             // Check if server name has changed, if it has then we need to replace the key in the map
             if ( serverName != newName )
             {
                 // Update server name
                 s->setServerName( newName );
             }
 
             // Update list box
             servers->changeItem( newName, currentSelectedServer );
         }
     }
     else
     {
         Server s( newName, serverurl->text() );
         dataMgr->getServerList().append( new Server( newName, serverurl->text() ) );
         dataMgr->getServerList().last()->setActive( active->isChecked() );
         servers->insertItem( newName );
         servers->setCurrentItem( servers->count() );
         newserver = false;
     }
 }
 
 //------------------ Destinations tab ----------------------
 
 void SettingsImpl :: editDestination( int sel )
 {
     currentSelectedDestination = sel;
     Destination *d = dataMgr->getDestination( destinations->currentText() );
     if ( d )
     {
         destinationName = d->getDestinationName();
         destinationname->setText( d->getDestinationName() );
         destinationurl->setText( d->getDestinationPath() );
         linkToRoot->setChecked( d->linkToRoot() );
     }
     else
     {
         destinationName = "";
diff --git a/noncore/settings/aqpkg/version.cpp b/noncore/settings/aqpkg/version.cpp
index 59e6f3f..ce2de7b 100644
--- a/noncore/settings/aqpkg/version.cpp
+++ b/noncore/settings/aqpkg/version.cpp
@@ -1,89 +1,89 @@
 /*
  * libdpkg - Debian packaging suite library routines
  * vercmp.c - comparison of version numbers
  *
  * Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2,
  * or (at your option) any later version.
  *
  * This is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with dpkg; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 
 #include <qobject.h>
 
 //# define _(Text) Text
 
 class versionrevision
 {
 public:
     versionrevision()
     {
         version = 0;
     }
 
     ~versionrevision()
     {
         if ( version )
-            delete version;
+            delete [] version;
     }
 
     void setVersion( const char *str )
     {
         version = new char[(strlen(str)+1)];
         strcpy( version, str );
     }
 
   unsigned long epoch;
   char *version;
   const char *revision;
   const char *familiar_revision;
 };
 
 static int verrevcmp(const char *val, const char *ref)
 {
   int vc, rc;
   long vl, rl;
   const char *vp, *rp;
 
   if (!val) val= "";
   if (!ref) ref= "";
   for (;;) {
     vp= val;  while (*vp && !isdigit(*vp)) vp++;
     rp= ref;  while (*rp && !isdigit(*rp)) rp++;
     for (;;) {
       vc= val == vp ? 0 : *val++;
       rc= ref == rp ? 0 : *ref++;
       if (!rc && !vc) break;
       if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */
       if (rc && !isalpha(rc)) rc += 256;
       if (vc != rc) return vc - rc;
     }
     val= vp;
     ref= rp;
     vl=0;  if (isdigit(*vp)) vl= strtol(val,(char**)&val,10);
     rl=0;  if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10);
     if (vl != rl) return vl - rl;
     if (!*val && !*ref) return 0;
     if (!*val) return -1;
     if (!*ref) return +1;
   }
 }
 
 int versioncompare(const struct versionrevision *version,
                    const struct versionrevision *refversion)
 {
   int r;