From kde-bindings Sun Jul 11 15:14:08 2010 From: Arno Rehn Date: Sun, 11 Jul 2010 15:14:08 +0000 To: kde-bindings Subject: [Kde-bindings] branches/KDE/4.5/kdebindings/csharp/qyoto Message-Id: <20100711151408.BA531AC85F () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-bindings&m=127886064321963 SVN commit 1148683 by arnorehn: Use unsigned char, not uchar. Fixes bug reported by Lorenz Cuno Klopfenstein. Thanks for reporting! CCMAIL: kde-bindings@kde.org M +3 -3 core/QAbstractFileEngine.cs M +1 -1 core/QFile.cs M +1 -1 core/QTranslator.cs M +3 -3 core/Qt.cs M +2 -2 gui/QBitmap.cs M +6 -6 gui/QImage.cs M +3 -3 gui/QPixmap.cs --- branches/KDE/4.5/kdebindings/csharp/qyoto/core/QAbstractFileEngine.cs #1148682:1148683 @@ -56,7 +56,7 @@ } public Pointer Address { get { return (Pointer) interceptor.Invoke("address", "address()", typeof(Pointer)); } - set { interceptor.Invoke("setAddress$", "setAddress(uchar*)", typeof(void), typeof(Pointer), value); } + set { interceptor.Invoke("setAddress$", "setAddress(unsigned char*)", typeof(void), typeof(Pointer), value); } } public MapExtensionReturn() : this((Type) null) { CreateProxy(); @@ -77,7 +77,7 @@ } public Pointer Address { get { return (Pointer) interceptor.Invoke("address", "address()", typeof(Pointer)); } - set { interceptor.Invoke("setAddress$", "setAddress(uchar*)", typeof(void), typeof(Pointer), value); } + set { interceptor.Invoke("setAddress$", "setAddress(unsigned char*)", typeof(void), typeof(Pointer), value); } } public UnMapExtensionOption() : this((Type) null) { CreateProxy(); @@ -264,7 +264,7 @@ return (Pointer) interceptor.Invoke("map$$$", "map(qint64, qint64, QFile::MemoryMapFlags)", typeof(Pointer), typeof(long), offset, typeof(long), size, typeof(QFile.MemoryMapFlags), flags); } public bool Unmap(Pointer ptr) { - return (bool) interceptor.Invoke("unmap$", "unmap(uchar*)", typeof(bool), typeof(Pointer), ptr); + return (bool) interceptor.Invoke("unmap$", "unmap(unsigned char*)", typeof(bool), typeof(Pointer), ptr); } [SmokeMethod("beginEntryList(QDir::Filters, const QStringList&)")] public virtual QAbstractFileEngineIterator BeginEntryList(uint filters, List filterNames) { --- branches/KDE/4.5/kdebindings/csharp/qyoto/core/QFile.cs #1148682:1148683 @@ -146,7 +146,7 @@ return (Pointer) interceptor.Invoke("map$$", "map(qint64, qint64)", typeof(Pointer), typeof(long), offset, typeof(long), size); } public bool Unmap(Pointer address) { - return (bool) interceptor.Invoke("unmap$", "unmap(uchar*)", typeof(bool), typeof(Pointer), address); + return (bool) interceptor.Invoke("unmap$", "unmap(unsigned char*)", typeof(bool), typeof(Pointer), address); } [SmokeMethod("fileEngine() const")] public virtual QAbstractFileEngine FileEngine() { --- branches/KDE/4.5/kdebindings/csharp/qyoto/core/QTranslator.cs #1148682:1148683 @@ -47,7 +47,7 @@ return (bool) interceptor.Invoke("load$", "load(const QString&)", typeof(bool), typeof(string), filename); } public bool Load(Pointer data, int len) { - return (bool) interceptor.Invoke("load$$", "load(const uchar*, int)", typeof(bool), typeof(Pointer), data, typeof(int), len); + return (bool) interceptor.Invoke("load$$", "load(const unsigned char*, int)", typeof(bool), typeof(Pointer), data, typeof(int), len); } ~QTranslator() { interceptor.Invoke("~QTranslator", "~QTranslator()", typeof(void)); --- branches/KDE/4.5/kdebindings/csharp/qyoto/core/Qt.cs #1148682:1148683 @@ -1163,13 +1163,13 @@ return (QDataStream) staticInterceptor.Invoke("operator>>##", "operator>>(QDataStream&, QByteArray&)", typeof(QDataStream), typeof(QDataStream), arg1, typeof(QByteArray), arg2); } public static QByteArray QCompress(Pointer data, int nbytes, int compressionLevel) { - return (QByteArray) staticInterceptor.Invoke("qCompress$$$", "qCompress(const uchar*, int, int)", typeof(QByteArray), typeof(Pointer), data, typeof(int), nbytes, typeof(int), compressionLevel); + return (QByteArray) staticInterceptor.Invoke("qCompress$$$", "qCompress(const unsigned char*, int, int)", typeof(QByteArray), typeof(Pointer), data, typeof(int), nbytes, typeof(int), compressionLevel); } public static QByteArray QCompress(Pointer data, int nbytes) { - return (QByteArray) staticInterceptor.Invoke("qCompress$$", "qCompress(const uchar*, int)", typeof(QByteArray), typeof(Pointer), data, typeof(int), nbytes); + return (QByteArray) staticInterceptor.Invoke("qCompress$$", "qCompress(const unsigned char*, int)", typeof(QByteArray), typeof(Pointer), data, typeof(int), nbytes); } public static QByteArray QUncompress(Pointer data, int nbytes) { - return (QByteArray) staticInterceptor.Invoke("qUncompress$$", "qUncompress(const uchar*, int)", typeof(QByteArray), typeof(Pointer), data, typeof(int), nbytes); + return (QByteArray) staticInterceptor.Invoke("qUncompress$$", "qUncompress(const unsigned char*, int)", typeof(QByteArray), typeof(Pointer), data, typeof(int), nbytes); } public static QByteArray QCompress(QByteArray data, int compressionLevel) { return (QByteArray) staticInterceptor.Invoke("qCompress#$", "qCompress(const QByteArray&, int)", typeof(QByteArray), typeof(QByteArray), data, typeof(int), compressionLevel); --- branches/KDE/4.5/kdebindings/csharp/qyoto/gui/QBitmap.cs #1148682:1148683 @@ -58,10 +58,10 @@ return (QBitmap) staticInterceptor.Invoke("fromImage#", "fromImage(const QImage&)", typeof(QBitmap), typeof(QImage), image); } public static QBitmap FromData(QSize size, Pointer bits, QImage.Format monoFormat) { - return (QBitmap) staticInterceptor.Invoke("fromData#$$", "fromData(const QSize&, const uchar*, QImage::Format)", typeof(QBitmap), typeof(QSize), size, typeof(Pointer), bits, typeof(QImage.Format), monoFormat); + return (QBitmap) staticInterceptor.Invoke("fromData#$$", "fromData(const QSize&, const unsigned char*, QImage::Format)", typeof(QBitmap), typeof(QSize), size, typeof(Pointer), bits, typeof(QImage.Format), monoFormat); } public static QBitmap FromData(QSize size, Pointer bits) { - return (QBitmap) staticInterceptor.Invoke("fromData#$", "fromData(const QSize&, const uchar*)", typeof(QBitmap), typeof(QSize), size, typeof(Pointer), bits); + return (QBitmap) staticInterceptor.Invoke("fromData#$", "fromData(const QSize&, const unsigned char*)", typeof(QBitmap), typeof(QSize), size, typeof(Pointer), bits); } } } --- branches/KDE/4.5/kdebindings/csharp/qyoto/gui/QImage.cs #1148682:1148683 @@ -54,11 +54,11 @@ } public QImage(Pointer data, int width, int height, QImage.Format format) : this((Type) null) { CreateProxy(); - interceptor.Invoke("QImage$$$$", "QImage(uchar*, int, int, QImage::Format)", typeof(void), typeof(Pointer), data, typeof(int), width, typeof(int), height, typeof(QImage.Format), format); + interceptor.Invoke("QImage$$$$", "QImage(unsigned char*, int, int, QImage::Format)", typeof(void), typeof(Pointer), data, typeof(int), width, typeof(int), height, typeof(QImage.Format), format); } public QImage(Pointer data, int width, int height, int bytesPerLine, QImage.Format format) : this((Type) null) { CreateProxy(); - interceptor.Invoke("QImage$$$$$", "QImage(uchar*, int, int, int, QImage::Format)", typeof(void), typeof(Pointer), data, typeof(int), width, typeof(int), height, typeof(int), bytesPerLine, typeof(QImage.Format), format); + interceptor.Invoke("QImage$$$$$", "QImage(unsigned char*, int, int, int, QImage::Format)", typeof(void), typeof(Pointer), data, typeof(int), width, typeof(int), height, typeof(int), bytesPerLine, typeof(QImage.Format), format); } public QImage(string fileName, string format) : this((Type) null) { CreateProxy(); @@ -291,10 +291,10 @@ return (bool) interceptor.Invoke("load$", "load(const QString&)", typeof(bool), typeof(string), fileName); } public bool LoadFromData(Pointer buf, int len, string format) { - return (bool) interceptor.Invoke("loadFromData$$$", "loadFromData(const uchar*, int, const char*)", typeof(bool), typeof(Pointer), buf, typeof(int), len, typeof(string), format); + return (bool) interceptor.Invoke("loadFromData$$$", "loadFromData(const unsigned char*, int, const char*)", typeof(bool), typeof(Pointer), buf, typeof(int), len, typeof(string), format); } public bool LoadFromData(Pointer buf, int len) { - return (bool) interceptor.Invoke("loadFromData$$", "loadFromData(const uchar*, int)", typeof(bool), typeof(Pointer), buf, typeof(int), len); + return (bool) interceptor.Invoke("loadFromData$$", "loadFromData(const unsigned char*, int)", typeof(bool), typeof(Pointer), buf, typeof(int), len); } public bool LoadFromData(QByteArray data, string aformat) { return (bool) interceptor.Invoke("loadFromData#$", "loadFromData(const QByteArray&, const char*)", typeof(bool), typeof(QByteArray), data, typeof(string), aformat); @@ -392,10 +392,10 @@ return (QTransform) staticInterceptor.Invoke("trueMatrix#$$", "trueMatrix(const QTransform&, int, int)", typeof(QTransform), typeof(QTransform), arg1, typeof(int), w, typeof(int), h); } public static QImage FromData(Pointer data, int size, string format) { - return (QImage) staticInterceptor.Invoke("fromData$$$", "fromData(const uchar*, int, const char*)", typeof(QImage), typeof(Pointer), data, typeof(int), size, typeof(string), format); + return (QImage) staticInterceptor.Invoke("fromData$$$", "fromData(const unsigned char*, int, const char*)", typeof(QImage), typeof(Pointer), data, typeof(int), size, typeof(string), format); } public static QImage FromData(Pointer data, int size) { - return (QImage) staticInterceptor.Invoke("fromData$$", "fromData(const uchar*, int)", typeof(QImage), typeof(Pointer), data, typeof(int), size); + return (QImage) staticInterceptor.Invoke("fromData$$", "fromData(const unsigned char*, int)", typeof(QImage), typeof(Pointer), data, typeof(int), size); } public static QImage FromData(QByteArray data, string format) { return (QImage) staticInterceptor.Invoke("fromData#$", "fromData(const QByteArray&, const char*)", typeof(QImage), typeof(QByteArray), data, typeof(string), format); --- branches/KDE/4.5/kdebindings/csharp/qyoto/gui/QPixmap.cs #1148682:1148683 @@ -163,13 +163,13 @@ return (bool) interceptor.Invoke("load$", "load(const QString&)", typeof(bool), typeof(string), fileName); } public bool LoadFromData(Pointer buf, uint len, string format, uint flags) { - return (bool) interceptor.Invoke("loadFromData$$$$", "loadFromData(const uchar*, uint, const char*, Qt::ImageConversionFlags)", typeof(bool), typeof(Pointer), buf, typeof(uint), len, typeof(string), format, typeof(uint), flags); + return (bool) interceptor.Invoke("loadFromData$$$$", "loadFromData(const unsigned char*, uint, const char*, Qt::ImageConversionFlags)", typeof(bool), typeof(Pointer), buf, typeof(uint), len, typeof(string), format, typeof(uint), flags); } public bool LoadFromData(Pointer buf, uint len, string format) { - return (bool) interceptor.Invoke("loadFromData$$$", "loadFromData(const uchar*, uint, const char*)", typeof(bool), typeof(Pointer), buf, typeof(uint), len, typeof(string), format); + return (bool) interceptor.Invoke("loadFromData$$$", "loadFromData(const unsigned char*, uint, const char*)", typeof(bool), typeof(Pointer), buf, typeof(uint), len, typeof(string), format); } public bool LoadFromData(Pointer buf, uint len) { - return (bool) interceptor.Invoke("loadFromData$$", "loadFromData(const uchar*, uint)", typeof(bool), typeof(Pointer), buf, typeof(uint), len); + return (bool) interceptor.Invoke("loadFromData$$", "loadFromData(const unsigned char*, uint)", typeof(bool), typeof(Pointer), buf, typeof(uint), len); } public bool LoadFromData(QByteArray data, string format, uint flags) { return (bool) interceptor.Invoke("loadFromData#$$", "loadFromData(const QByteArray&, const char*, Qt::ImageConversionFlags)", typeof(bool), typeof(QByteArray), data, typeof(string), format, typeof(uint), flags); _______________________________________________ Kde-bindings mailing list Kde-bindings@kde.org https://mail.kde.org/mailman/listinfo/kde-bindings