diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8b5d5b2ba2..1261315625 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-23 18:52 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/qth/HBQString.qth + * contrib/hbqt/qtcore/qth/QBuffer.qth + * contrib/hbqt/qtcore/qth/QByteArray.qth + * contrib/hbqt/qtcore/qth/QChar.qth + * contrib/hbqt/qtcore/qth/QList.qth + * contrib/hbqt/qtcore/qth/QStringList.qth + * contrib/hbqt/qtgui/qth/QImage.qth + * contrib/hbqt/qtgui/qth/QPrintDialog.qth + ! Commented out duplicate ( Harbour's type ) methods. + Preparatory work for next commit. + 2010-09-24 01:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmzip/hbmzip.c ! Fixed potential GPF in HB_ZIPDELETEFILE() and HB_UNZIPFILEINFO() diff --git a/harbour/contrib/hbqt/qtcore/qth/HBQString.qth b/harbour/contrib/hbqt/qtcore/qth/HBQString.qth index 5d3cc379c4..df1c0cca61 100644 --- a/harbour/contrib/hbqt/qtcore/qth/HBQString.qth +++ b/harbour/contrib/hbqt/qtcore/qth/HBQString.qth @@ -56,9 +56,10 @@ QObject = no -Inherit = -Type = -New = +Inherit = +Type = +New = +ClubMethods = no diff --git a/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth b/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth index 2c384ddb89..fd7bd61f4e 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QBuffer.qth @@ -55,9 +55,9 @@ ; -QObject = +QObject = Inherits = QIODevice -Type = +Type = New = @@ -87,7 +87,7 @@ HB_FUNC( QT_QBUFFER ) QByteArray & buffer () -const QByteArray & buffer () const +//const QByteArray & buffer () const const QByteArray & data () const void setBuffer ( QByteArray * byteArray ) void setData ( const char * data, int size ) diff --git a/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth b/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth index 79af129fed..3734359fb6 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QByteArray.qth @@ -56,9 +56,10 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = +ClubMethods = no diff --git a/harbour/contrib/hbqt/qtcore/qth/QChar.qth b/harbour/contrib/hbqt/qtcore/qth/QChar.qth index 823c36ec31..6568c82ad6 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QChar.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QChar.qth @@ -57,7 +57,7 @@ QObject = no Inherits = -Type = +Type = New = Destructor = no @@ -133,7 +133,7 @@ QChar toLower () const QChar toTitleCase () const QChar toUpper () const ushort & unicode () -ushort unicode () const +//ushort unicode () const UnicodeVersion unicodeVersion () const diff --git a/harbour/contrib/hbqt/qtcore/qth/QList.qth b/harbour/contrib/hbqt/qtcore/qth/QList.qth index bb0345d9e1..d4c78dc33a 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QList.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QList.qth @@ -56,9 +56,9 @@ QObject = no -Inherits = +Inherits = Type = Core -New = +New = List = yes @@ -85,7 +85,7 @@ HB_FUNC( QT_QLIST ) void append ( const T & value ) void append ( const QList & value ) const T & at ( int i ) const -T & back () +//T & back () const T & back () const //iterator begin () //const_iterator begin () const @@ -101,15 +101,15 @@ bool empty () const bool endsWith ( const T & value ) const //iterator erase ( iterator pos ) //iterator erase ( iterator begin, iterator end ) -T & first () +//T & first () const T & first () const -T & front () +//T & front () const T & front () const int indexOf ( const T & value, int from = 0 ) const void insert ( int i, const T & value ) //iterator insert ( iterator before, const T & value ) bool isEmpty () const -T & last () +//T & last () const T & last () const int lastIndexOf ( const T & value, int from = -1 ) const int length () const diff --git a/harbour/contrib/hbqt/qtcore/qth/QStringList.qth b/harbour/contrib/hbqt/qtcore/qth/QStringList.qth index 3149e8f940..4d8fcbe84f 100644 --- a/harbour/contrib/hbqt/qtcore/qth/QStringList.qth +++ b/harbour/contrib/hbqt/qtcore/qth/QStringList.qth @@ -58,7 +58,7 @@ QObject = no Inherits = QList Type = Core -New = +New = @@ -106,15 +106,15 @@ int count ( const QString & value ) const bool endsWith ( const QString & value ) const -QString & first () +//QString & first () const QString & first () const -QString & front () +//QString & front () const QString & front () const void insert ( int i, const QString & value ) -QString & last () +//QString & last () const QString & last () const QList mid ( int pos, int length = -1 ) const diff --git a/harbour/contrib/hbqt/qtgui/qth/QImage.qth b/harbour/contrib/hbqt/qtgui/qth/QImage.qth index df297ad57d..f8763a2e5a 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QImage.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QImage.qth @@ -138,7 +138,7 @@ enum InvertMode { InvertRgb, InvertRgba } bool allGray () const QImage alphaChannel () const -uchar * bits () +//uchar * bits () const uchar * bits () const int bytesPerLine () const qint64 cacheKey () const @@ -284,7 +284,7 @@ QImage scaled ( ... ){ QImage scaledToHeight ( int height, Qt::TransformationMode mode = Qt::FastTransformation ) const QImage scaledToWidth ( int width, Qt::TransformationMode mode = Qt::FastTransformation ) const -uchar * scanLine ( int i ) +//uchar * scanLine ( int i ) const uchar * scanLine ( int i ) const void setColor ( int index, QRgb colorValue ) void setColorTable ( const QVector colors ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth index 349e46ea47..a0710333f7 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPrintDialog.qth @@ -84,7 +84,7 @@ flags PrintDialogOptions virtual void done ( int result ) void open ( QObject * receiver, const char * member ) PrintDialogOptions options () const -QPrinter * printer () const +//QPrinter * printer () const QPrinter * printer () void setOption ( PrintDialogOption option, bool on = true ) void setOptions ( PrintDialogOptions options )