From 02f905dcd51a24c219399913fc42370a19da01af Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 4 Jun 2012 22:19:27 +0000 Subject: [PATCH] 2012-06-04 15:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/hbmk2_qt.hb ! Tweaked: ( QString * ) casted argument to be compilable. * contrib/hbqt/qtgui/qth/QFileDialog.qth + Enabled: getOpenFileName() etc. methods which we commented out because of lack of knowledge how those should been handelled. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/hbqt/hbmk2_qt.hb | 6 +++++- harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth | 6 +++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8f8135ed77..d1d77d0ce1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-04 15:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/hbmk2_qt.hb + ! Tweaked: ( QString * ) casted argument to be compilable. + + * contrib/hbqt/qtgui/qth/QFileDialog.qth + + Enabled: getOpenFileName() etc. methods which we commented out because + of lack of knowledge how those should been handelled. + 2012-06-04 23:24 UTC+0200 Viktor Szakats (harbour syenar.net) * contrib\gtwvg\wvgwing.c ! fixed 64-bit warning (do not use NULL for numeric parameters) diff --git a/harbour/contrib/hbqt/hbmk2_qt.hb b/harbour/contrib/hbqt/hbmk2_qt.hb index 0e6a6eca6c..3ee352f173 100644 --- a/harbour/contrib/hbqt/hbmk2_qt.hb +++ b/harbour/contrib/hbqt/hbmk2_qt.hb @@ -2782,7 +2782,11 @@ METHOD HbQtSource:parseProto( cProto, fBody_ ) oArg:cTypeHB := "L" CASE oArg:cCast == "QString" - oArg:cBody := "hb_parstr_utf8( " + cHBIdx + ", &pText%%%, NULL )" + IF oArg:lFar + oArg:cBody := "( QString * ) hb_parstr_utf8( " + cHBIdx + ", &pText%%%, NULL )" + ELSE + oArg:cBody := "hb_parstr_utf8( " + cHBIdx + ", &pText%%%, NULL )" + ENDIF oArg:cDoc := "c" + oMtd:cDocNM // oArg:cCast - W R O N G oArg:cTypeHB := "C" #if 0 diff --git a/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth b/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth index f6e9049b66..9837855c3c 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QFileDialog.qth @@ -106,9 +106,9 @@ ViewMode viewMode () const QString getExistingDirectory ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), Options options = ShowDirsOnly ) -//QString getOpenFileName ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) -//QStringList getOpenFileNames ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) -//QString getSaveFileName ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) +QString getOpenFileName ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) +QStringList getOpenFileNames ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) +QString getSaveFileName ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 )