fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-04-07 16:17 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/qtcore/qth/QBitArray.qth
  * contrib/hbqt/qtcore/qth/QBuffer.qth
  * contrib/hbqt/qtcore/qth/QByteArray.qth
  * contrib/hbqt/qtcore/qth/QChar.qth
  * contrib/hbqt/qtcore/qth/QDataStream.qth
  * contrib/hbqt/qtcore/qth/QDate.qth
  * contrib/hbqt/qtcore/qth/QDateTime.qth
  * contrib/hbqt/qtcore/qth/QDir.qth
  * contrib/hbqt/qtcore/qth/QEvent.qth
  * contrib/hbqt/qtcore/qth/QEventLoop.qth
  * contrib/hbqt/qtcore/qth/QFile.qth
  * contrib/hbqt/qtcore/qth/QFileInfo.qth
  * contrib/hbqt/qtcore/qth/QGenericArgument.qth
  * contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth
  * contrib/hbqt/qtcore/qth/QLatin1Char.qth
  * contrib/hbqt/qtcore/qth/QLatin1String.qth
  * contrib/hbqt/qtcore/qth/QLineF.qth
  * contrib/hbqt/qtcore/qth/QList.qth
  * contrib/hbqt/qtcore/qth/QLocale.qth
  * contrib/hbqt/qtcore/qth/QMimeData.qth
  * contrib/hbqt/qtcore/qth/QModelIndex.qth
  * contrib/hbqt/qtcore/qth/QObject.qth
  * contrib/hbqt/qtcore/qth/QRect.qth
  * contrib/hbqt/qtcore/qth/QRectF.qth
  * contrib/hbqt/qtcore/qth/QRegExp.qth
  * contrib/hbqt/qtcore/qth/QResource.qth
  * contrib/hbqt/qtcore/qth/QSettings.qth
  * contrib/hbqt/qtcore/qth/QSignalMapper.qth
  * contrib/hbqt/qtcore/qth/QSizeF.qth
  * contrib/hbqt/qtcore/qth/QStringList.qth
  * contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth
  * contrib/hbqt/qtcore/qth/QTextCodec.qth
  * contrib/hbqt/qtcore/qth/QTextDecoder.qth
  * contrib/hbqt/qtcore/qth/QTextEncoder.qth
  * contrib/hbqt/qtcore/qth/QTextStream.qth
  * contrib/hbqt/qtcore/qth/QTime.qth
  * contrib/hbqt/qtcore/qth/QTimeLine.qth
  * contrib/hbqt/qtcore/qth/QTimer.qth
  * contrib/hbqt/qtcore/qth/QTranslator.qth
  * contrib/hbqt/qtcore/qth/QUrl.qth
  * contrib/hbqt/qtcore/qth/QVariant.qth
    ! Restructured: constructors.
      This achieves 99% compatibility of Qt's constructor methods.

  * contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
    ! Minor.

  * contrib/hbqt/qtcore/hbqt_pointer.cpp
    + Added: hbqt_getObjectType( iParam );
This commit is contained in:
Pritpal Bedi
2011-04-07 23:13:20 +00:00
parent 002adf85fb
commit 3a4fb005f8
44 changed files with 627 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
harbour/ChangeLog
View File

@@ -16,6 +16,57 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-04-07 16:17 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtcore/qth/QBitArray.qth
* contrib/hbqt/qtcore/qth/QBuffer.qth
* contrib/hbqt/qtcore/qth/QByteArray.qth
* contrib/hbqt/qtcore/qth/QChar.qth
* contrib/hbqt/qtcore/qth/QDataStream.qth
* contrib/hbqt/qtcore/qth/QDate.qth
* contrib/hbqt/qtcore/qth/QDateTime.qth
* contrib/hbqt/qtcore/qth/QDir.qth
* contrib/hbqt/qtcore/qth/QEvent.qth
* contrib/hbqt/qtcore/qth/QEventLoop.qth
* contrib/hbqt/qtcore/qth/QFile.qth
* contrib/hbqt/qtcore/qth/QFileInfo.qth
* contrib/hbqt/qtcore/qth/QGenericArgument.qth
* contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth
* contrib/hbqt/qtcore/qth/QLatin1Char.qth
* contrib/hbqt/qtcore/qth/QLatin1String.qth
* contrib/hbqt/qtcore/qth/QLineF.qth
* contrib/hbqt/qtcore/qth/QList.qth
* contrib/hbqt/qtcore/qth/QLocale.qth
* contrib/hbqt/qtcore/qth/QMimeData.qth
* contrib/hbqt/qtcore/qth/QModelIndex.qth
* contrib/hbqt/qtcore/qth/QObject.qth
* contrib/hbqt/qtcore/qth/QRect.qth
* contrib/hbqt/qtcore/qth/QRectF.qth
* contrib/hbqt/qtcore/qth/QRegExp.qth
* contrib/hbqt/qtcore/qth/QResource.qth
* contrib/hbqt/qtcore/qth/QSettings.qth
* contrib/hbqt/qtcore/qth/QSignalMapper.qth
* contrib/hbqt/qtcore/qth/QSizeF.qth
* contrib/hbqt/qtcore/qth/QStringList.qth
* contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth
* contrib/hbqt/qtcore/qth/QTextCodec.qth
* contrib/hbqt/qtcore/qth/QTextDecoder.qth
* contrib/hbqt/qtcore/qth/QTextEncoder.qth
* contrib/hbqt/qtcore/qth/QTextStream.qth
* contrib/hbqt/qtcore/qth/QTime.qth
* contrib/hbqt/qtcore/qth/QTimeLine.qth
* contrib/hbqt/qtcore/qth/QTimer.qth
* contrib/hbqt/qtcore/qth/QTranslator.qth
* contrib/hbqt/qtcore/qth/QUrl.qth
* contrib/hbqt/qtcore/qth/QVariant.qth
! Restructured: constructors.
This achieves 99% compatibility of Qt's constructor methods.
* contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
! Minor.
* contrib/hbqt/qtcore/hbqt_pointer.cpp
+ Added: hbqt_getObjectType( iParam );
2011-04-07 22:53 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/hbunix/hbposix.h
* harbour/contrib/hbunix/uidgid.c

27
harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
View File

@@ -343,6 +343,33 @@ int hbqt_isObjectType( int iParam, HB_U32 iType )
return HB_FALSE;
}
HB_U32 hbqt_getObjectType( int iParam )
{
PHB_ITEM pItem;
HB_TRACE( HB_TR_DEBUG, ( "hbqt_isObjectType( %d )", iParam ) );
if( ( pItem = hb_param( iParam, HB_IT_OBJECT ) ) != NULL )
{
hb_vmPushSymbol( hb_dynsymSymbol( hb_dynsymFindName( "PPTR" ) ) );
hb_vmPush( pItem );
hb_vmSend( 0 );
pItem = hb_param( -1, HB_IT_POINTER );
if( pItem )
{
HBQT_GC_T * p = ( HBQT_GC_T * ) hb_itemGetPtrGC( pItem, hbqt_gcFuncs() );
if( p && p->ph )
{
return p->type;
}
}
}
return 0;
}
HB_FUNC( HBQT_ISOBJECT )
{
PHB_ITEM pParam = hb_param( 1, HB_IT_OBJECT );

13
harbour/contrib/hbqt/qtcore/qth/QBitArray.qth
View File

@@ -28,7 +28,18 @@ New =
*/
HB_FUNC( QT_QBITARRAY )
{
__HB_RETPTRGC__( new QBitArray() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QBitArray( *hbqt_par_QBitArray( 1 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QBitArray( hb_parni( 1 ), HB_ISLOG( 2 ) ? hb_parl( 2 ) : false ) );
}
else
{
__HB_RETPTRGC__( new QBitArray() );
}
}
</CODE>

9
harbour/contrib/hbqt/qtcore/qth/QBuffer.qth
View File

@@ -35,7 +35,14 @@ New =
*/
HB_FUNC( QT_QBUFFER )
{
__HB_RETPTRGC__( new QBuffer() );
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QBuffer( hbqt_par_QByteArray( 1 ), HB_ISOBJECT( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) );
}
else
{
__HB_RETPTRGC__( new QBuffer( HB_ISOBJECT( 1 ) ? hbqt_par_QObject( 1 ) : 0 ) );
}
}
</CODE>

14
harbour/contrib/hbqt/qtcore/qth/QByteArray.qth
View File

@@ -32,10 +32,22 @@ ClubMethods = no
*/
HB_FUNC( QT_QBYTEARRAY )
{
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QByteArray( *hbqt_par_QByteArray( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QByteArray( hb_parc( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QByteArray( hb_parc( 1 ), hb_parni( 2 ) ) );
}
else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QByteArray( hb_parni( 1 ), hb_parni( 2 ) ) );
}
else
{
__HB_RETPTRGC__( new QByteArray() );

13
harbour/contrib/hbqt/qtcore/qth/QChar.qth
View File

@@ -43,7 +43,18 @@ Destructor = no
*/
HB_FUNC( QT_QCHAR )
{
__HB_RETPTRGC__( new QChar() );
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QChar( *hbqt_par_QLatin1Char( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QChar( hb_parni( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QChar() );
}
}
</CODE>

20
harbour/contrib/hbqt/qtcore/qth/QDataStream.qth
View File

@@ -31,7 +31,25 @@ Destructor =
*/
HB_FUNC( QT_QDATASTREAM )
{
__HB_RETPTRGC__( new QDataStream() );
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
if( hbqt_isObjectType( 1, HBQT_TYPE_QIODevice ) )
{
__HB_RETPTRGC__( new QDataStream( hbqt_par_QIODevice( 1 ) ) );
}
else if( hbqt_isObjectType( 1, HBQT_TYPE_QByteArray ) )
{
__HB_RETPTRGC__( new QDataStream( *hbqt_par_QByteArray( 1 ) ) );
}
}
if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QDataStream( hbqt_par_QByteArray( 1 ), ( QIODevice::OpenMode ) hb_parni( 2 ) ) );
}
else
{
__HB_RETPTRGC__( new QDataStream() );
}
}
</CODE>

17
harbour/contrib/hbqt/qtcore/qth/QDate.qth
View File

@@ -13,10 +13,10 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -28,7 +28,18 @@ Destructor =
*/
HB_FUNC( QT_QDATE )
{
__HB_RETPTRGC__( new QDate() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QDate( *hbqt_par_QDate( 1 ) ) );
}
else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ))
{
__HB_RETPTRGC__( new QDate( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ) ) );
}
else
{
__HB_RETPTRGC__( new QDate() );
}
}
</CODE>

24
harbour/contrib/hbqt/qtcore/qth/QDateTime.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -31,7 +31,25 @@ New =
*/
HB_FUNC( QT_QDATETIME )
{
__HB_RETPTRGC__( new QDateTime() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
if( hbqt_isObjectType( 1, HBQT_TYPE_QDate ) )
{
__HB_RETPTRGC__( new QDateTime( *hbqt_par_QDate( 1 ) ) );
}
else if( hbqt_isObjectType( 1, HBQT_TYPE_QDateTime ) )
{
__HB_RETPTRGC__( new QDateTime( *hbqt_par_QDateTime( 1 ) ) );
}
}
else if( hb_pcount() >= 2 && HB_ISOBJECT( 2 ) && HB_ISOBJECT( 3 ) )
{
__HB_RETPTRGC__( new QDateTime( *hbqt_par_QDate( 1 ), *hbqt_par_QTime( 2 ), HB_ISNUM( 3 ) ? ( Qt::TimeSpec ) hb_parni( 3 ) : Qt::LocalTime ) );
}
else
{
__HB_RETPTRGC__( new QDateTime() );
}
}
</CODE>

19
harbour/contrib/hbqt/qtcore/qth/QDir.qth
View File

@@ -31,7 +31,18 @@ New = pParent
*/
HB_FUNC( QT_QDIR )
{
__HB_RETPTRGC__( new QDir( hbqt_par_QString( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QDir( *hbqt_par_QDir( 1 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QDir( hbqt_par_QString( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QDir() );
}
}
</CODE>
@@ -51,8 +62,8 @@ bool cd ( const QString & dirName )
bool cdUp ()
uint count () const
QString dirName () const
// QFileInfoList entryInfoList ( const QStringList & nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort ) const
// QFileInfoList entryInfoList ( Filters filters = NoFilter, SortFlags sort = NoSort ) const
QList< QFileInfo > entryInfoList ( const QStringList & nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort ) const
QList< QFileInfo > entryInfoList ( Filters filters = NoFilter, SortFlags sort = NoSort ) const
QStringList entryList ( const QStringList & nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort ) const
QStringList entryList ( Filters filters = NoFilter, SortFlags sort = NoSort ) const
bool exists ( const QString & name ) const
@@ -85,7 +96,7 @@ void addSearchPath ( const QString & prefix, const QString & path )
QString cleanPath ( const QString & path )
QDir current ()
QString currentPath ()
// QFileInfoList drives ()
QList< QFileInfo > drives ()
QString fromNativeSeparators ( const QString & pathName )
QDir home ()
QString homePath ()

9
harbour/contrib/hbqt/qtcore/qth/QEvent.qth
View File

@@ -27,7 +27,14 @@ New = nType
*/
HB_FUNC( QT_QEVENT )
{
__HB_RETPTRGC__( new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QEvent( *hbqt_par_QEvent( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) );
}
}
</CODE>

5
harbour/contrib/hbqt/qtcore/qth/QEventLoop.qth
View File

@@ -27,7 +27,10 @@ New = pObject
*/
HB_FUNC( QT_QEVENTLOOP )
{
__HB_RETPTRGC__( new QEventLoop( hbqt_par_QObject( 1 ) ) );
if( hb_pcount() >= 0 )
{
__HB_RETPTRGC__( new QEventLoop( HB_ISOBJECT( 1 ) ? hbqt_par_QObject( 1 ) : 0 ) );
}
}
</CODE>

21
harbour/contrib/hbqt/qtcore/qth/QFile.qth
View File

@@ -30,10 +30,29 @@ Destructor =
*/
HB_FUNC( QT_QFILE )
{
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
if( hbqt_isObjectType( 1, HBQT_TYPE_QFile ) )
{
__HB_RETPTRGC__( new QFile( hbqt_par_QFile( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QFile( hbqt_par_QObject( 1 ) ) );
}
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QFile( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QFile( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) );
}
else
{
__HB_RETPTRGC__( new QFile() );
}
}
</CODE>

28
harbour/contrib/hbqt/qtcore/qth/QFileInfo.qth
View File

@@ -13,10 +13,10 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -34,7 +34,29 @@ Destructor =
*/
HB_FUNC( QT_QFILEINFO )
{
__HB_RETPTRGC__( new QFileInfo() );
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QFileInfo( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
if( hbqt_isObjectType( 1, HBQT_TYPE_QFile ) )
{
__HB_RETPTRGC__( new QFileInfo( *hbqt_par_QFile( 1 ) ) );
}
else if( hbqt_isObjectType( 1, HBQT_TYPE_QFileInfo ) )
{
__HB_RETPTRGC__( new QFileInfo( *hbqt_par_QFileInfo( 1 ) ) );
}
}
if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISCHAR( 2 ) )
{
__HB_RETPTRGC__( new QFileInfo( *hbqt_par_QDir( 1 ), hbqt_par_QString( 2 ) ) );
}
else
{
__HB_RETPTRGC__( new QFileInfo() );
}
}
</CODE>

12
harbour/contrib/hbqt/qtcore/qth/QGenericArgument.qth
View File

@@ -14,7 +14,7 @@
<CLASS>
QObject = NO
Inherits =
Type =
Type =
New =
</CLASS>
@@ -30,15 +30,19 @@ New =
/*
* QGenericArgument ( const char * name = 0, const void * data = 0 )
*
*
*/
HB_FUNC( QT_QGENERICARGUMENT )
{
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGenericArgument( *hbqt_par_QGenericArgument( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QGenericArgument( hb_parc( 1 ), 0 ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
{
__HB_RETPTRGC__( new QGenericArgument( hb_parc( 1 ), hb_parptr( 2 ) ) );
}

12
harbour/contrib/hbqt/qtcore/qth/QGenericReturnArgument.qth
View File

@@ -14,7 +14,7 @@
<CLASS>
QObject = no
Inherits = QGenericArgument
Type =
Type =
New =
</CLASS>
@@ -30,15 +30,19 @@ New =
/*
* QGenericArgument ( const char * name = 0, const void * data = 0 )
*
*
*/
HB_FUNC( QT_QGENERICRETURNARGUMENT )
{
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QGenericReturnArgument( *hbqt_par_QGenericReturnArgument( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QGenericReturnArgument( hb_parc( 1 ), 0 ) );
}
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISOBJECT( 2 ) )
else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) )
{
__HB_RETPTRGC__( new QGenericReturnArgument( hb_parc( 1 ), hb_parptr( 2 ) ) );
}

17
harbour/contrib/hbqt/qtcore/qth/QLatin1Char.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -27,7 +27,18 @@ New =
*/
HB_FUNC( QT_QLATIN1CHAR )
{
__HB_RETPTRGC__( new QLatin1Char( *hb_parcx( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QLatin1Char( *hbqt_par_QLatin1Char( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QLatin1Char( *hb_parcx( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QLatin1Char( ( char ) hb_parni( 1 ) ) );
}
}
</CODE>

13
harbour/contrib/hbqt/qtcore/qth/QLatin1String.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -27,7 +27,14 @@ New =
*/
HB_FUNC( QT_QLATIN1STRING )
{
__HB_RETPTRGC__( new QLatin1String( hb_parcx( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QLatin1String( *hbqt_par_QLatin1String( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QLatin1String( hb_parcx( 1 ) ) );
}
}
</CODE>

21
harbour/contrib/hbqt/qtcore/qth/QLineF.qth
View File

@@ -13,10 +13,10 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -30,7 +30,22 @@ Destructor =
*/
HB_FUNC( QT_QLINEF )
{
__HB_RETPTRGC__( new QLineF() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QLineF( *hbqt_par_QLineF( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QLineF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
}
else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{
__HB_RETPTRGC__( new QLineF( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) );
}
else
{
__HB_RETPTRGC__( new QLineF() );
}
}
</CODE>

11
harbour/contrib/hbqt/qtcore/qth/QList.qth
View File

@@ -30,8 +30,15 @@ List = yes
*/
HB_FUNC( QT_QLIST )
{
QList<void*>* list = NULL;
__HB_RETPTRGC__( ( QList<void*>* ) list );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QList< void * >( *hbqt_par_QList( 1 ) ) );
}
else
{
QList< void * >* list = NULL;
__HB_RETPTRGC__( ( QList< void * >* ) list );
}
}
</CODE>

21
harbour/contrib/hbqt/qtcore/qth/QLocale.qth
View File

@@ -13,10 +13,10 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -30,7 +30,22 @@ Destructor =
*/
HB_FUNC( QT_QLOCALE )
{
__HB_RETPTRGC__( new QLocale() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QLocale( *hbqt_par_QLocale( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QLocale( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QLocale( ( QLocale::Language ) hb_parni( 1 ), HB_ISNUM( 2 ) ? ( QLocale::Country ) hb_parni( 2 ) : QLocale::AnyCountry ) );
}
else
{
__HB_RETPTRGC__( new QLocale() );
}
}
</CODE>

11
harbour/contrib/hbqt/qtcore/qth/QMimeData.qth
View File

@@ -12,11 +12,11 @@
*/
<CLASS>
QObject =
QObject =
Inherits = QObject
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -29,7 +29,10 @@ Destructor =
*/
HB_FUNC( QT_QMIMEDATA )
{
__HB_RETPTRGC__( new QMimeData() );
if( hb_pcount() == 0 )
{
__HB_RETPTRGC__( new QMimeData() );
}
}
</CODE>
@@ -59,7 +62,7 @@ void setUrls ( const QList<QUrl> & urls )
QString text () const
QList<QUrl> urls () const
# Harbour Callable Function Till QList<QUrl> is not resolved
# Harbour Callable Function Till QList<QUrl> is not resolved
#
QStringList * hbUrlList() const{
QMimeData * _mimedata = ( QMimeData * ) hbqt_pPtrFromObj( 0 );

13
harbour/contrib/hbqt/qtcore/qth/QModelIndex.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -29,7 +29,14 @@ New =
*/
HB_FUNC( QT_QMODELINDEX )
{
__HB_RETPTRGC__( new QModelIndex() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QModelIndex( *hbqt_par_QModelIndex( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QModelIndex() );
}
}
</CODE>

9
harbour/contrib/hbqt/qtcore/qth/QObject.qth
View File

@@ -26,7 +26,14 @@ Calls = QT_Qbject
*/
HB_FUNC( QT_QOBJECT )
{
__HB_RETPTRGC__( new QObject( hbqt_par_QObject( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QObject( hbqt_par_QObject( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QObject( 0 ) );
}
}
</CODE>

13
harbour/contrib/hbqt/qtcore/qth/QRect.qth
View File

@@ -14,7 +14,7 @@
<CLASS>
QObject = no
Type = PlainObject
New =
New =
</CLASS>
@@ -37,7 +37,14 @@ HB_FUNC( QT_QRECT )
}
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
if( hbqt_isObjectType( 2, HBQT_TYPE_QPoint ) )
{
__HB_RETPTRGC__( new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
}
if( hbqt_isObjectType( 2, HBQT_TYPE_QSize ) )
{
__HB_RETPTRGC__( new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QSize( 2 ) ) );
}
}
else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{
@@ -112,7 +119,7 @@ QRect translated ( const QPoint & offset ) const
QRect united ( const QRect & rectangle ) const
int width () const
int x () const
int y () const
int y () const
</PROTOS>
<SLOTS>

11
harbour/contrib/hbqt/qtcore/qth/QRectF.qth
View File

@@ -14,7 +14,7 @@
<CLASS>
QObject = no
Type = PlainObject
New =
New =
</CLASS>
<CODE>
@@ -37,7 +37,14 @@ HB_FUNC( QT_QRECTF )
}
else if( hb_pcount() == 2 && HB_ISOBJECT( 1 ) && HB_ISOBJECT( 2 ) )
{
__HB_RETPTRGC__( new QRectF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) );
if( hbqt_isObjectType( 2, HBQT_TYPE_QPointF ) )
{
__HB_RETPTRGC__( new QRectF( *hbqt_par_QPointF( 1 ), *hbqt_par_QPointF( 2 ) ) );
}
if( hbqt_isObjectType( 2, HBQT_TYPE_QSizeF ) )
{
__HB_RETPTRGC__( new QRectF( *hbqt_par_QPointF( 1 ), *hbqt_par_QSizeF( 2 ) ) );
}
}
else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) )
{

17
harbour/contrib/hbqt/qtcore/qth/QRegExp.qth
View File

@@ -13,10 +13,10 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -30,7 +30,18 @@ Destructor =
*/
HB_FUNC( QT_QREGEXP )
{
__HB_RETPTRGC__( new QRegExp() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QRegExp( *hbqt_par_QRegExp( 1 ) ) );
}
else if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QRegExp( hbqt_par_QString( 1 ), HB_ISNUM( 2 ) ? ( Qt::CaseSensitivity ) hb_parni( 2 ) : Qt::CaseSensitive, HB_ISNUM( 3 ) ? ( QRegExp::PatternSyntax ) hb_parni( 3 ) : QRegExp::RegExp ) );
}
else
{
__HB_RETPTRGC__( new QRegExp() );
}
}
</CODE>

9
harbour/contrib/hbqt/qtcore/qth/QResource.qth
View File

@@ -30,7 +30,14 @@ ClubMethods = no
*/
HB_FUNC( QT_QRESOURCE )
{
__HB_RETPTRGC__( new QResource() );
if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QResource( hbqt_par_QString( 1 ), HB_ISOBJECT( 2 ) ? *hbqt_par_QLocale( 2 ) : QLocale() ) );
}
else
{
__HB_RETPTRGC__( new QResource() );
}
}
</CODE>

14
harbour/contrib/hbqt/qtcore/qth/QSettings.qth
View File

@@ -14,7 +14,7 @@
<CLASS>
Inherits = QObject
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -33,11 +33,19 @@ HB_FUNC( QT_QSETTINGS )
{
if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) )
{
__HB_RETPTRGC__( new QSettings( hbqt_par_QString( 1 ), hbqt_par_QString( 2 ), 0 ) );
__HB_RETPTRGC__( new QSettings( hbqt_par_QString( 1 ), hbqt_par_QString( 2 ), HB_ISOBJECT( 3 ) ? hbqt_par_QObject( 3 ) : 0 ) );
}
else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QSettings( hbqt_par_QString( 1 ), ( QSettings::Format ) hb_parni( 2 ) ) );
__HB_RETPTRGC__( new QSettings( hbqt_par_QString( 1 ), ( QSettings::Format ) hb_parni( 2 ), HB_ISOBJECT( 3 ) ? hbqt_par_QObject( 3 ) : 0 ) );
}
else if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) )
{
__HB_RETPTRGC__( new QSettings( ( QSettings::Scope ) hb_parni( 1 ), hbqt_par_QString( 2 ), HB_ISCHAR( 3 ) ? hbqt_par_QString( 3 ) : QString(), HB_ISOBJECT( 4 ) ? hbqt_par_QObject( 4 ) : 0 ) );
}
else if( hb_pcount() >= 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISCHAR( 3 ) )
{
__HB_RETPTRGC__( new QSettings( ( QSettings::Format ) hb_parni( 1 ), ( QSettings::Scope ) hb_parni( 2 ), hbqt_par_QString( 3 ), HB_ISCHAR( 4 ) ? hbqt_par_QString( 4 ) : QString(), HB_ISOBJECT( 5 ) ? hbqt_par_QObject( 5 ) : 0 ) );
}
else
{

8
harbour/contrib/hbqt/qtcore/qth/QSignalMapper.qth
View File

@@ -26,19 +26,19 @@ New = pParent
*/
HB_FUNC( QT_QSIGNALMAPPER )
{
__HB_RETPTRGC__( new QSignalMapper( hbqt_par_QObject( 1 ) ) );
__HB_RETPTRGC__( new QSignalMapper( HB_ISOBJECT( 1 ) ? hbqt_par_QObject( 1 ) : 0 ) );
}
</CODE>
<PROTOS>
QObject * mapping ( int id ) const
QObject * mapping ( const QString & id ) const
// QObject * mapping ( QWidget * widget ) const
QObject * mapping ( QWidget * widget ) const
QObject * mapping ( QObject * object ) const
void removeMappings ( QObject * sender )
void setMapping ( QObject * sender, int id )
void setMapping ( QObject * sender, const QString & text )
// void setMapping ( QObject * sender, QWidget * widget )
void setMapping ( QObject * sender, QWidget * widget )
void setMapping ( QObject * sender, QObject * object )
</PROTOS>
@@ -50,6 +50,6 @@ void map ( QObject * sender )
<SIGNALS>
void mapped ( int i )
void mapped ( const QString & text )
// void mapped ( QWidget * widget )
void mapped ( QWidget * widget )
void mapped ( QObject * object )
</SIGNALS>

6
harbour/contrib/hbqt/qtcore/qth/QSizeF.qth
View File

@@ -14,7 +14,7 @@
<CLASS>
QObject = no
Type = PlainObject
New =
New =
</CLASS>
<CODE>
@@ -33,6 +33,10 @@ HB_FUNC( QT_QSIZEF )
{
__HB_RETPTRGC__( new QSizeF( hb_parnd( 1 ), hb_parnd( 2 ) ) );
}
else if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QSizeF( *hbqt_par_QSizeF( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QSizeF() );

13
harbour/contrib/hbqt/qtcore/qth/QStringList.qth
View File

@@ -30,7 +30,18 @@ New =
*/
HB_FUNC( QT_QSTRINGLIST )
{
__HB_RETPTRGC__( new QStringList() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QStringList( *hbqt_par_QStringList( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QStringList( hbqt_par_QString( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QStringList() );
}
}
</CODE>

21
harbour/contrib/hbqt/qtcore/qth/QTextBoundaryFinder.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -31,7 +31,22 @@ New =
*/
HB_FUNC( QT_QTEXTBOUNDARYFINDER )
{
__HB_RETPTRGC__( new QTextBoundaryFinder() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QTextBoundaryFinder( *hbqt_par_QTextBoundaryFinder( 1 ) ) );
}
else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) )
{
__HB_RETPTRGC__( new QTextBoundaryFinder( ( QTextBoundaryFinder::BoundaryType ) hb_parni( 1 ), hbqt_par_QString( 2 ) ) );
}
else if( hb_pcount() >= 3 && HB_ISNUM( 1 ) && HB_ISOBJECT( 2 ) && HB_ISNUM( 3 ) )
{
__HB_RETPTRGC__( new QTextBoundaryFinder( ( QTextBoundaryFinder::BoundaryType ) hb_parni( 1 ), hbqt_par_QChar( 2 ), hb_parni( 3 ), HB_ISCHAR( 4 ) ? ( unsigned char * ) hb_parc( 4 ) : 0, hb_parni( 5 ) ) );
}
else
{
__HB_RETPTRGC__( new QTextBoundaryFinder() );
}
}
</CODE>

6
harbour/contrib/hbqt/qtcore/qth/QTextCodec.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
Destructor = no
Constructor = no
</CLASS>
@@ -51,7 +51,7 @@ virtual int mibEnum () const = 0
virtual QByteArray name () const = 0
QString toUnicode ( const QByteArray & a ) const
#
// QString toUnicode ( const char * input, int size, ConverterState * state = 0 ) const
//QString toUnicode ( const char * input, int size, ConverterState * state = 0 ) const
#
QString toUnicode ( const char * chars ) const

7
harbour/contrib/hbqt/qtcore/qth/QTextDecoder.qth
View File

@@ -13,7 +13,7 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New = pTextCodec
</CLASS>
@@ -28,7 +28,10 @@ New = pTextCodec
*/
HB_FUNC( QT_QTEXTDECODER )
{
__HB_RETPTRGC__( new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) );
}
}
</CODE>

9
harbour/contrib/hbqt/qtcore/qth/QTextEncoder.qth
View File

@@ -13,9 +13,9 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
New =
</CLASS>
<CODE>
@@ -28,7 +28,10 @@ New =
*/
HB_FUNC( QT_QTEXTENCODER )
{
__HB_RETPTRGC__( new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) );
}
}
</CODE>

20
harbour/contrib/hbqt/qtcore/qth/QTextStream.qth
View File

@@ -32,7 +32,25 @@ New = cText, nIOMode
*/
HB_FUNC( QT_QTEXTSTREAM )
{
__HB_RETPTRGC__( new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) );
if( hb_pcount() >= 1 && HB_ISOBJECT( 1 ) )
{
if( hbqt_isObjectType( 1, HBQT_TYPE_QIODevice ) )
{
__HB_RETPTRGC__( new QTextStream( hbqt_par_QIODevice( 1 ) ) );
}
else if( hbqt_isObjectType( 1, HBQT_TYPE_QByteArray ) )
{
__HB_RETPTRGC__( new QTextStream( hbqt_par_QByteArray( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) );
}
}
else if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) );
}
else
{
__HB_RETPTRGC__( new QTextStream() );
}
}
</CODE>

17
harbour/contrib/hbqt/qtcore/qth/QTime.qth
View File

@@ -13,10 +13,10 @@
<CLASS>
QObject = no
Inherits =
Inherits =
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -28,7 +28,18 @@ Destructor =
*/
HB_FUNC( QT_QTIME )
{
__HB_RETPTRGC__( new QTime() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QTime( *hbqt_par_QTime( 1 ) ) );
}
else if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QTime( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) );
}
else
{
__HB_RETPTRGC__( new QTime() );
}
}
</CODE>

15
harbour/contrib/hbqt/qtcore/qth/QTimeLine.qth
View File

@@ -12,10 +12,10 @@
*/
<CLASS>
QObject =
QObject =
Inherit = QObject
Type =
New =
Type =
New =
</CLASS>
<CODE>
@@ -28,7 +28,14 @@ New =
*/
HB_FUNC( QT_QTIMELINE )
{
__HB_RETPTRGC__( new QTimeLine() );
if( hb_pcount() >= 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QTimeLine( hb_parni( 1 ), HB_ISOBJECT( 2 ) ? hbqt_par_QObject( 2 ) : 0 ) );
}
else
{
__HB_RETPTRGC__( new QTimeLine() );
}
}
</CODE>

2
harbour/contrib/hbqt/qtcore/qth/QTimer.qth
View File

@@ -26,7 +26,7 @@ New = pParent
*/
HB_FUNC( QT_QTIMER )
{
__HB_RETPTRGC__( new QTimer( hbqt_par_QObject( 1 ) ) );
__HB_RETPTRGC__( new QTimer( HB_ISOBJECT( 1 ) ? hbqt_par_QObject( 1 ) : 0 ) );
}
</CODE>

13
harbour/contrib/hbqt/qtcore/qth/QTranslator.qth
View File

@@ -12,11 +12,11 @@
*/
<CLASS>
QObject =
QObject =
Inherits = QObject
Type = Core
New =
Destructor =
Destructor =
</CLASS>
<CODE>
@@ -28,7 +28,14 @@ Destructor =
*/
HB_FUNC( QT_QTRANSLATOR )
{
__HB_RETPTRGC__( new QTranslator() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
__HB_RETPTRGC__( new QTranslator( hbqt_par_QTranslator( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QTranslator( HB_ISOBJECT( 1 ) ? hbqt_par_QObject( 1 ) : 0 ) );
}
}
</CODE>

4
harbour/contrib/hbqt/qtcore/qth/QUrl.qth
View File

@@ -39,6 +39,10 @@ HB_FUNC( QT_QURL )
{
__HB_RETPTRGC__( new QUrl( *hbqt_par_QUrl( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) )
{
__HB_RETPTRGC__( new QUrl( hbqt_par_QString( 1 ), ( QUrl::ParsingMode ) hb_parni( 2 ) ) );
}
else
{
__HB_RETPTRGC__( new QUrl() );

102
harbour/contrib/hbqt/qtcore/qth/QVariant.qth
View File

@@ -69,7 +69,107 @@ QVariant ( const QRegExp & regExp )
*/
HB_FUNC( QT_QVARIANT )
{
__HB_RETPTRGC__( new QVariant() );
if( hb_pcount() == 1 && HB_ISOBJECT( 1 ) )
{
HB_U32 iType = hbqt_getObjectType( 1 );
if( iType == HBQT_TYPE_QVariant )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QVariant( 1 ) ) );
}
else if( iType == HBQT_TYPE_QByteArray )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QByteArray( 1 ) ) );
}
else if( iType == HBQT_TYPE_QBitArray )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QBitArray( 1 ) ) );
}
else if( iType == HBQT_TYPE_QLatin1String )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QLatin1String( 1 ) ) );
}
else if( iType == HBQT_TYPE_QStringList )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QStringList( 1 ) ) );
}
else if( iType == HBQT_TYPE_QDate )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QDate( 1 ) ) );
}
else if( iType == HBQT_TYPE_QTime )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QTime( 1 ) ) );
}
else if( iType == HBQT_TYPE_QDateTime )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QDateTime( 1 ) ) );
}
else if( iType == HBQT_TYPE_QChar )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QChar( 1 ) ) );
}
else if( iType == HBQT_TYPE_QSize )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QSize( 1 ) ) );
}
else if( iType == HBQT_TYPE_QSizeF )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QSizeF( 1 ) ) );
}
else if( iType == HBQT_TYPE_QRect )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QRect( 1 ) ) );
}
else if( iType == HBQT_TYPE_QRectF )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QRectF( 1 ) ) );
}
else if( iType == HBQT_TYPE_QPoint )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QPoint( 1 ) ) );
}
else if( iType == HBQT_TYPE_QPointF )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QPointF( 1 ) ) );
}
else if( iType == HBQT_TYPE_QLine )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QLine( 1 ) ) );
}
else if( iType == HBQT_TYPE_QLineF )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QLineF( 1 ) ) );
}
else if( iType == HBQT_TYPE_QUrl )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QUrl( 1 ) ) );
}
else if( iType == HBQT_TYPE_QLocale )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QLocale( 1 ) ) );
}
else if( iType == HBQT_TYPE_QRegExp )
{
__HB_RETPTRGC__( new QVariant( *hbqt_par_QRegExp( 1 ) ) );
}
}
else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
__HB_RETPTRGC__( new QVariant( hbqt_par_QString( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISNUM( 1 ) )
{
__HB_RETPTRGC__( new QVariant( hb_parni( 1 ) ) );
}
else if( hb_pcount() == 1 && HB_ISLOG( 1 ) )
{
__HB_RETPTRGC__( new QVariant( hb_parl( 1 ) ) );
}
else
{
__HB_RETPTRGC__( new QVariant() );
}
}
</CODE>

5
harbour/contrib/hbqt/qtgui/hbqt_hbqabstractitemmodel.cpp
View File

@@ -116,11 +116,11 @@ QVariant hbqt_fetchData( PHB_ITEM block, int type, int role, int par1, int par2
if( p->type == HBQT_TYPE_QBrush )
vv = * ( ( QBrush * ) ( p->ph ) );
else if( p->type == HBQT_TYPE_QColor )
vv = QColor( * ( ( QColor * ) ( p->ph ) ) );
vv = * ( ( QColor * ) ( p->ph ) ) );
else if( p->type == HBQT_TYPE_QSize )
vv = * ( ( QSize * ) ( p->ph ) );
else if( p->type == HBQT_TYPE_QIcon )
vv = QIcon( * ( ( QIcon * ) ( p->ph ) ) );
vv = * ( ( QIcon * ) ( p->ph ) ) );
else if( p->type == HBQT_TYPE_QPixmap )
vv = * ( ( QPixmap * ) ( p->ph ) );
else if( p->type == HBQT_TYPE_QFont )
@@ -211,3 +211,4 @@ void HBQAbstractItemModel::reset()
}
#endif