Backport SVN commit 1077790 by ltoscano:

Q3MemArray -> QVector

svn path=/branches/KDE/4.4/kdegraphics/okular/; revision=1077816

generators/dvi/dviFile.cpp

@@ -71,14 +71,14 @@ dvifile::dvifile(const dvifile *old, fontPool *fp)
 {
   errorMsg.clear();
   errorCounter = 0;
-  page_offset  = 0;
+  page_offset.clear();
   suggestedPageSize = 0;
   numberOfExternalPSFiles = 0;
   numberOfExternalNONPSFiles = 0;
   sourceSpecialMarker = old->sourceSpecialMarker;
   have_complainedAboutMissingPDF2PS = false;
 
-  dviData = old->dviData.copy();
+  dviData = old->dviData;
 
   filename = old->filename;
   size_of_file = old->size_of_file;
@@ -238,7 +238,8 @@ void dvifile::prepare_pages()
   if (total_pages == 0)
     return;
 
-  if (page_offset.resize(total_pages+1) == false) {
+  page_offset.resize(total_pages+1);
+  if (page_offset.size() < (total_pages+1)) {
     kError(kvs::dvi) << "No memory for page list!" << endl;
     return;
   }
@@ -273,7 +274,7 @@ dvifile::dvifile(const QString& fname, fontPool* pool)
 
   errorMsg.clear();
   errorCounter = 0;
-  page_offset  = 0;
+  page_offset.clear();
   suggestedPageSize = 0;
   numberOfExternalPSFiles = 0;
   numberOfExternalNONPSFiles = 0;

generators/dvi/dviFile.h

@@ -14,9 +14,9 @@
 #include "bigEndianByteReader.h"
 
 #include <Q3IntDict>
-#include <Q3MemArray>
 #include <QIODevice>
 #include <QMap>
+#include <QVector>
 
 
 class fontPool;
@@ -37,7 +37,7 @@ class dvifile : public bigEndianByteReader
   QString        filename;
   QString        generatorString;
   quint16       total_pages;
-  Q3MemArray<quint32> page_offset;
+  QVector<quint32> page_offset;
 
   /** Saves the DVI file. Returns true on success. */
   bool           saveAs(const QString &filename);
@@ -90,7 +90,7 @@ class dvifile : public bigEndianByteReader
 
   /** Sets new DVI data; all old data is erased. EXPERIMENTAL, use
       with care. */
-  void           setNewData(const Q3MemArray<quint8>& newData) {dviData = newData;}
+  void           setNewData(const QVector<quint8>& newData) {dviData = newData;}
 
   /** Page numbers that appear in a DVI document need not be
       ordered. Worse, page numbers need not be unique. This method
@@ -135,7 +135,7 @@ class dvifile : public bigEndianByteReader
 
   double         cmPerDVIunit;
 
-  Q3MemArray<quint8>  dviData;
+  QVector<quint8>  dviData;
 
   /** Map of filenames for converted PDF files
 

generators/dvi/dviRenderer_prescan.cpp

@@ -21,7 +21,6 @@
 #include <kmimetype.h>
 #include <kprocess.h>
 
-#include <Q3MemArray>
 #include <QApplication>
 #include <QDir>
 #include <QFileInfo>
@@ -159,7 +158,7 @@ void dviRenderer::prescan_embedPS(char *cp, quint8 *beginningOfSpecialCommand)
   quint32 lengthOfOldSpecial = command_pointer - beginningOfSpecialCommand;
   quint32 lengthOfNewSpecial = PS.length()+5;
 
-  Q3MemArray<quint8> newDVI(dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial);
+  QVector<quint8> newDVI(dviFile->size_of_file + lengthOfNewSpecial-lengthOfOldSpecial);
 
   quint8 *commandPtrSav = command_pointer;
   quint8 *endPtrSav = end_pointer;