less qt3_support:

Q3CString -> QByteArray
Q3ValueList -> QList

svn path=/trunk/playground/graphics/okular/; revision=551904
This commit is contained in:
Pino Toscano 2006-06-15 22:53:55 +00:00
parent 8333023023
commit d93299960c
3 changed files with 10 additions and 11 deletions

View file

@ -78,7 +78,7 @@ ostream& operator << ( ostream& os, const KDSCBBOX& source )
/*-- KDSCError implementation ----------------------------------------------*/
KDSCError::KDSCError( Type type, Severity severity, const Q3CString& line,
KDSCError::KDSCError( Type type, Severity severity, const QByteArray& line,
unsigned int lineNumber ) :
_type( type ),
_severity( severity ),
@ -96,7 +96,7 @@ KDSCError::Severity KDSCError::severity() const
return _severity;
}
Q3CString KDSCError::line() const
QByteArray KDSCError::line() const
{
return _line;
}
@ -383,7 +383,7 @@ int KDSC::errorFunction( void* caller_data, CDSC* dsc,
KDSCError error(
static_cast< KDSCError::Type >( explanation ),
static_cast< KDSCError::Severity >( dsc->severity[explanation] ),
Q3CString( line, line_len + 1 ),
QByteArray( line, line_len + 1 ),
dsc->line_count
);

View file

@ -23,10 +23,9 @@
#include <map>
#include <memory>
#include <qbytearray.h>
#include <qsize.h>
#include <qstring.h>
//Added by qt3to4:
#include <Q3CString>
#include "dscparse.h"
#undef min
@ -137,18 +136,18 @@ public:
Error = CDSC_ERROR_ERROR
};
KDSCError( Type, Severity, const Q3CString& line,
KDSCError( Type, Severity, const QByteArray& line,
unsigned int lineNumber );
Type type() const;
Severity severity() const;
Q3CString line() const;
QByteArray line() const;
unsigned int lineNumber() const;
private:
Type _type;
Severity _severity;
Q3CString _line;
QByteArray _line;
unsigned int _lineNumber;
};

View file

@ -14,10 +14,10 @@
#define _KPDF_GSINTERNALDOC_H_
#include <errno.h>
#include <qlist.h>
#include <qmap.h>
#include <qprinter.h>
//Added by qt3to4:
#include <Q3ValueList>
#include "interpreter.h"
#include "dscparse_adapter.h"
@ -28,7 +28,7 @@ class KDSC;
class QString;
class QStringList;
typedef Q3ValueList<int> PageList;
typedef QList<int> PageList;
class GSInternalDocument
{