From 375224703f5f0ab9ffac5fefe75bc0576325bf41 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 21 Oct 2010 19:49:42 +0000 Subject: [PATCH] 2010-10-21 12:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtcore/hbqt_hbqslots.cpp + Added: "QModelIndex,QModelIndex" constant. * contrib/hbqt/tests/testbrow.prg - Replaced: BREAK => EXIT. Under such context, BREAK ( break; ) is a C statement not Harbour. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp | 6 +++++- harbour/contrib/hbqt/tests/testbrow.prg | 10 ++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f55ae96e38..2c806c45bc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2010-10-21 12:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtcore/hbqt_hbqslots.cpp + + Added: "QModelIndex,QModelIndex" constant. + + * contrib/hbqt/tests/testbrow.prg + - Replaced: BREAK => EXIT. + Under such context, BREAK ( break; ) is a C statement not Harbour. + 2010-10-21 22:12 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/contrib/sddodbc/sddodbc.c + added support for SQL_NUMERIC data type diff --git a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp index 5091cc770e..44c74012d7 100644 --- a/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp +++ b/harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp @@ -1907,7 +1907,8 @@ static void hbqt_SlotsProxy( HBQSlots * t_slots, int id, QObject * object, void "QPoint" << "QRectF" << "QTime" << - "QUrl" ; + "QUrl" << + "QModelIndex$QModelIndex" ; } const QMetaMethod meta = object->metaObject()->method( id ); @@ -2032,6 +2033,9 @@ static void hbqt_SlotsProxy( HBQSlots * t_slots, int id, QObject * object, void case 22: // if( paramString == "QUrl" ) hbqt_SlotsExecQUrl( ( PHB_ITEM * ) t_slots->listBlock.at( i - 1 ), arguments ) ; break; + case 23: // if( paramString == "QModel$QModel" ) + hbqt_SlotsExecModelModel( ( PHB_ITEM * ) t_slots->listBlock.at( i - 1 ), arguments ) ; + break; } } hb_vmRequestRestore(); diff --git a/harbour/contrib/hbqt/tests/testbrow.prg b/harbour/contrib/hbqt/tests/testbrow.prg index 0917c6eaf4..413b110512 100644 --- a/harbour/contrib/hbqt/tests/testbrow.prg +++ b/harbour/contrib/hbqt/tests/testbrow.prg @@ -11,9 +11,7 @@ */ #include "hbqtgui.ch" - #include "hbtrace.ch" - #include "common.ch" STATIC qApp @@ -108,16 +106,16 @@ STATIC PROCEDURE my_save( pWidget, nArea, aStru, nCX, nCY ) SWITCH aStru[ nCX + 1, 2 ] CASE "C" FieldPut( nCX + 1, AllTrim( cData ) ) - BREAK + EXIT CASE "N" FieldPut( nCX + 1, Val( cData ) ) - BREAK + EXIT CASE "L" FieldPut( nCX + 1, Left( cData, 1 ) $ "YyTt" ) - BREAK + EXIT CASE "D" FieldPut( nCX + 1, CToD( cData ) ) - BREAK + EXIT ENDSWITCH RETURN