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

2009-03-25 14:09 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* INSTALL
    + Added HB_INC_SQLITE3

  * include/hbapi.h
    + Added HB_IS*() flavour of classic Clipper compatibility IS*()
      macros. I'd recommend everyone to start using these new ones,
      as the old ones might be deprecated in future versions.

  * Makefile
    + Added new 'external' dir to host foreign, non-Harbour code.

  + external
  + external/sqlite3
  + external/sqlite3/_sqlite3.c
  + external/sqlite3/sqlite3.c
  + external/sqlite3/sqlite3.h
  + external/sqlite3/Makefile
  - contrib/hbsqlit3/sqlite3
    + Moved sqlite3 code into its dedicated place.

  * contrib/hbsqlit3/tests/hbsqlit3.hbp
    + Added sqlite3 to liblist.

  * contrib/hbsqlit3/hbsqlit3.c
  * contrib/hbsqlit3/Makefile
    + Changed to use external headers just like other external
      dependent libs. The only difference here is that it will
      pickup the locally hosted sqlite3 source from
      external/sqlite3 if not specified by user.
    * Changed to no embed sqlite3 code anymore.
      ATTENTION: This also means that hbsqlit3 users will now
                 have to add sqlite3 lib to their liblist, since
                 this code isn't anymore embedded into hbsqlit3.

  * contrib/hbqt/hbqt_qfontcombobox.cpp
  * contrib/hbqt/hbqt_qgroupbox.cpp
  * contrib/hbqt/hbqt_qcombobox.cpp
  * contrib/hbqt/hbqt_qtoolbutton.cpp
  * contrib/hbqt/slots.h
  * contrib/hbqt/hbqt_qpushbutton.cpp
  * contrib/hbqt/hbqt_qpagesetupdialog.cpp
  * contrib/hbqt/hbqt_qprintpreviewdialog.cpp
  * contrib/hbqt/hbqt_qlabel.cpp
  * contrib/hbqt/hbqt_qinputdialog.cpp
  * contrib/hbqt/hbqt_qprogressdialog.cpp
  * contrib/hbqt/hbqt_qtoolbox.cpp
  * contrib/hbqt/hbqt_qcommandlinkbutton.cpp
  * contrib/hbqt/hbqt_qmenubar.cpp
  * contrib/hbqt/hbqt_qhboxlayout.cpp
  * contrib/hbqt/hbqt_qabstractbutton.cpp
  * contrib/hbqt/hbqt_qabstractprintdialog.cpp
  * contrib/hbqt/hbqt_qwizard.cpp
  * contrib/hbqt/hbqt_qabstractspinbox.cpp
  * contrib/hbqt/hbqt_qfont.cpp
  * contrib/hbqt/hbqt_qdial.cpp
  * contrib/hbqt/hbqt_qtablewidgetitem.cpp
  * contrib/hbqt/hbqt_qlcdnumber.cpp
  * contrib/hbqt/hbqt_qmainwindow.cpp
  * contrib/hbqt/hbqt_qprintdialog.cpp
  * contrib/hbqt/hbqt_qcalendarwidget.cpp
  * contrib/hbqt/hbqt_qabstractitemview.cpp
  * contrib/hbqt/hbqt_qaction.cpp
  * contrib/hbqt/hbqt_qspinbox.cpp
  * contrib/hbqt/hbqt_qwidget.cpp
  * contrib/hbqt/hbqt_slots.cpp
  * contrib/hbqt/hbqt_qdateedit.cpp
  * contrib/hbqt/hbqt_qcheckbox.cpp
  * contrib/hbqt/hbqt_qprogressbar.cpp
  * contrib/hbqt/hbqt_qframe.cpp
  * contrib/hbqt/hbqt_qfocusframe.cpp
  * contrib/hbqt/hbqt_qtabbar.cpp
  * contrib/hbqt/hbqt_qcqlendarwidget.cpp
  * contrib/hbqt/hbqt_qerrormessage.cpp
  * contrib/hbqt/hbqt_qfiledialog.cpp
  * contrib/hbqt/hbqt_qformlayout.cpp
  * contrib/hbqt/hbqt_qtoolbar.cpp
  * contrib/hbqt/hbqt_qdatetimeedit.cpp
  * contrib/hbqt/hbqt_qmenu.cpp
  * contrib/hbqt/hbqt_qabstractslider.cpp
  * contrib/hbqt/hbqt_qwebview.cpp
  * contrib/hbqt/hbqt_qlayout.cpp
  * contrib/hbqt/hbqt_qslider.cpp
  * contrib/hbqt/hbqt_qtableview.cpp
  * contrib/hbqt/hbqt_qfontdialog.cpp
  * contrib/hbqt/hbqt_qboxlayout.cpp
  * contrib/hbqt/hbqt_qtreeview.cpp
  * contrib/hbqt/hbqt_qtextedit.cpp
  * contrib/hbqt/hbqt_qradiobutton.cpp
  * contrib/hbqt/hbqt_qcolordialog.cpp
  * contrib/hbqt/hbqt_qapplication.cpp
  * contrib/hbqt/hbqt_qtimeedit.cpp
  * contrib/hbqt/hbqt_qsplitter.cpp
  * contrib/hbqt/hbqt_qlistview.cpp
  * contrib/hbqt/hbqt_qtabwidget.cpp
  * contrib/hbqt/hbqt_qabstractscrollarea.cpp
  * contrib/hbqt/hbqt_qvboxlayout.cpp
  * contrib/hbqt/hbqt_qdoublespinbox.cpp
  * contrib/hbqt/hbqt_qscrollbar.cpp
  * contrib/hbqt/hbqt_qscrollarea.cpp
  * contrib/hbqt/hbqt_qtablewidget.cpp
  * contrib/hbqt/hbqt_qsizegrip.cpp
  * contrib/hbqt/hbqt_qlayoutitem.cpp
  * contrib/hbqt/hbqt_qmessagebox.cpp
  * contrib/hbqt/hbqt_qlineedit.cpp
    * Formatting, indenting.
    ! ISNIL() usage removed.

  * contrib/hbwin/wapi_commctrl.c
  * contrib/hbwin/wapi_winuser.c
    ! ISNIL() usage removed.

  * contrib/hbfbird/tfirebrd.prg
  * contrib/hbpgsql/tests/simple.prg
  * contrib/hbpgsql/tests/test.prg
  * contrib/hbpgsql/tests/cache.prg
  * contrib/hbpgsql/tests/stress.prg
  * contrib/hbpgsql/tests/dbf2pg.prg
  * contrib/hbpgsql/tpostgre.prg
  * contrib/examples/uhttpd/uhttpd.prg
  * contrib/examples/uhttpd/uhttpdc.c
  * contrib/examples/terminal/trm_server.prg
    * ISNIL() usage and other code cleanup, formatting.
This commit is contained in:
Viktor Szakats
2009-03-25 13:22:38 +00:00
parent 7f9b899571
commit b937df971b
93 changed files with 2274 additions and 2052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
harbour/ChangeLog
View File

@@ -8,14 +8,138 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-25 14:09 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* INSTALL
+ Added HB_INC_SQLITE3
* include/hbapi.h
+ Added HB_IS*() flavour of classic Clipper compatibility IS*()
macros. I'd recommend everyone to start using these new ones,
as the old ones might be deprecated in future versions.
* Makefile
+ Added new 'external' dir to host foreign, non-Harbour code.
+ external
+ external/sqlite3
+ external/sqlite3/_sqlite3.c
+ external/sqlite3/sqlite3.c
+ external/sqlite3/sqlite3.h
+ external/sqlite3/Makefile
- contrib/hbsqlit3/sqlite3
+ Moved sqlite3 code into its dedicated place.
* contrib/hbsqlit3/tests/hbsqlit3.hbp
+ Added sqlite3 to liblist.
* contrib/hbsqlit3/hbsqlit3.c
* contrib/hbsqlit3/Makefile
+ Changed to use external headers just like other external
dependent libs. The only difference here is that it will
pickup the locally hosted sqlite3 source from
external/sqlite3 if not specified by user.
* Changed to no embed sqlite3 code anymore.
ATTENTION: This also means that hbsqlit3 users will now
have to add sqlite3 lib to their liblist, since
this code isn't anymore embedded into hbsqlit3.
* contrib/hbqt/hbqt_qfontcombobox.cpp
* contrib/hbqt/hbqt_qgroupbox.cpp
* contrib/hbqt/hbqt_qcombobox.cpp
* contrib/hbqt/hbqt_qtoolbutton.cpp
* contrib/hbqt/slots.h
* contrib/hbqt/hbqt_qpushbutton.cpp
* contrib/hbqt/hbqt_qpagesetupdialog.cpp
* contrib/hbqt/hbqt_qprintpreviewdialog.cpp
* contrib/hbqt/hbqt_qlabel.cpp
* contrib/hbqt/hbqt_qinputdialog.cpp
* contrib/hbqt/hbqt_qprogressdialog.cpp
* contrib/hbqt/hbqt_qtoolbox.cpp
* contrib/hbqt/hbqt_qcommandlinkbutton.cpp
* contrib/hbqt/hbqt_qmenubar.cpp
* contrib/hbqt/hbqt_qhboxlayout.cpp
* contrib/hbqt/hbqt_qabstractbutton.cpp
* contrib/hbqt/hbqt_qabstractprintdialog.cpp
* contrib/hbqt/hbqt_qwizard.cpp
* contrib/hbqt/hbqt_qabstractspinbox.cpp
* contrib/hbqt/hbqt_qfont.cpp
* contrib/hbqt/hbqt_qdial.cpp
* contrib/hbqt/hbqt_qtablewidgetitem.cpp
* contrib/hbqt/hbqt_qlcdnumber.cpp
* contrib/hbqt/hbqt_qmainwindow.cpp
* contrib/hbqt/hbqt_qprintdialog.cpp
* contrib/hbqt/hbqt_qcalendarwidget.cpp
* contrib/hbqt/hbqt_qabstractitemview.cpp
* contrib/hbqt/hbqt_qaction.cpp
* contrib/hbqt/hbqt_qspinbox.cpp
* contrib/hbqt/hbqt_qwidget.cpp
* contrib/hbqt/hbqt_slots.cpp
* contrib/hbqt/hbqt_qdateedit.cpp
* contrib/hbqt/hbqt_qcheckbox.cpp
* contrib/hbqt/hbqt_qprogressbar.cpp
* contrib/hbqt/hbqt_qframe.cpp
* contrib/hbqt/hbqt_qfocusframe.cpp
* contrib/hbqt/hbqt_qtabbar.cpp
* contrib/hbqt/hbqt_qcqlendarwidget.cpp
* contrib/hbqt/hbqt_qerrormessage.cpp
* contrib/hbqt/hbqt_qfiledialog.cpp
* contrib/hbqt/hbqt_qformlayout.cpp
* contrib/hbqt/hbqt_qtoolbar.cpp
* contrib/hbqt/hbqt_qdatetimeedit.cpp
* contrib/hbqt/hbqt_qmenu.cpp
* contrib/hbqt/hbqt_qabstractslider.cpp
* contrib/hbqt/hbqt_qwebview.cpp
* contrib/hbqt/hbqt_qlayout.cpp
* contrib/hbqt/hbqt_qslider.cpp
* contrib/hbqt/hbqt_qtableview.cpp
* contrib/hbqt/hbqt_qfontdialog.cpp
* contrib/hbqt/hbqt_qboxlayout.cpp
* contrib/hbqt/hbqt_qtreeview.cpp
* contrib/hbqt/hbqt_qtextedit.cpp
* contrib/hbqt/hbqt_qradiobutton.cpp
* contrib/hbqt/hbqt_qcolordialog.cpp
* contrib/hbqt/hbqt_qapplication.cpp
* contrib/hbqt/hbqt_qtimeedit.cpp
* contrib/hbqt/hbqt_qsplitter.cpp
* contrib/hbqt/hbqt_qlistview.cpp
* contrib/hbqt/hbqt_qtabwidget.cpp
* contrib/hbqt/hbqt_qabstractscrollarea.cpp
* contrib/hbqt/hbqt_qvboxlayout.cpp
* contrib/hbqt/hbqt_qdoublespinbox.cpp
* contrib/hbqt/hbqt_qscrollbar.cpp
* contrib/hbqt/hbqt_qscrollarea.cpp
* contrib/hbqt/hbqt_qtablewidget.cpp
* contrib/hbqt/hbqt_qsizegrip.cpp
* contrib/hbqt/hbqt_qlayoutitem.cpp
* contrib/hbqt/hbqt_qmessagebox.cpp
* contrib/hbqt/hbqt_qlineedit.cpp
* Formatting, indenting.
! ISNIL() usage removed.
* contrib/hbwin/wapi_commctrl.c
* contrib/hbwin/wapi_winuser.c
! ISNIL() usage removed.
* contrib/hbfbird/tfirebrd.prg
* contrib/hbpgsql/tests/simple.prg
* contrib/hbpgsql/tests/test.prg
* contrib/hbpgsql/tests/cache.prg
* contrib/hbpgsql/tests/stress.prg
* contrib/hbpgsql/tests/dbf2pg.prg
* contrib/hbpgsql/tpostgre.prg
* contrib/examples/uhttpd/uhttpd.prg
* contrib/examples/uhttpd/uhttpdc.c
* contrib/examples/terminal/trm_server.prg
* ISNIL() usage and other code cleanup, formatting.
2009-03-25 13:35 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
- harbour/contrib/hbole/ole2.c
* harbour/contrib/hbole/oleauto.prg
+ harbour/contrib/hbole/oleinit.c
+ harbour/contrib/hbole/olecore.c
+ added my own implementation of OLE library. It is bases on old
+ added my own implementation of OLE library. It is bases on old
code written by Jose F. Gimenez. Code is changed to be reentrant,
more clean, but only basic features are implemented.
more clean, but only basic features are implemented.
2009-03-25 12:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbstack.h
@@ -843,7 +967,7 @@
* contrib/hbwin/wapi_winbase.c
! mingw64 reported (64-bit) problem fixed.
! ISNIL() -> ISCHAR(). It appear many times, but using ISNIL()
! ISNIL() -> ISCHAR(). It appears many times, but using ISNIL()
has the same cost IS<ACTUAL_TYPE>(), yet only covers one
case, so it's very dangerous and leave potential GPFs when
passing wrong type. So, when there is no strong special reason

1
harbour/INSTALL
View File

@@ -148,6 +148,7 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
HB_INC_OPENSSL=C:\openssl\inc32
HB_INC_PGSQL=C:\pgsql\include
HB_INC_QT=C:\Qt\2009.01\qt\include
HB_INC_SQLITE3=C:\sqlite3 (defaults to locally hosted version)
NOTES: - For mingw and cygwin you have to use forward slashes
and also cygwin drive notation for cygwin.

1
harbour/Makefile
View File

@@ -23,6 +23,7 @@ DIRS=\
source \
$(HB_UTIL_DIR) \
contrib{source} \
external \
endif

7
harbour/contrib/examples/terminal/trm_server.prg
View File

@@ -475,7 +475,7 @@ HB_FUNC( CREATEPROCESS )
LPPROCESS_INFORMATION lpProcessInformation; // process information
lpApplicationName = NULL;//hb_parc( 1 );
lpCommandLine = hb_parc( 1 );//NULL;//ISNIL( 2 ) ? NULL : hb_parc( 2 );
lpCommandLine = hb_parc( 1 );
lpProcessAttributes = NULL;
lpThreadAttributes = NULL;
bInheritHandles = TRUE;
@@ -503,8 +503,8 @@ HB_FUNC( SHELLEXECUTE )
ShellExecute( NULL,
"OPEN",
hb_parc( 1 ),
ISNIL( 2 ) ? NULL : hb_parc( 2 ),
ISNIL( 3 ) ? NULL : hb_parc( 3 ),
hb_parc( 2 ),
hb_parc( 3 ),
SW_SHOWNORMAL );
}
@@ -515,4 +515,3 @@ HB_FUNC( OUTPUTDEBUGSTRING )
#pragma ENDDUMP
//----------------------------------------------------------------------//

4
harbour/contrib/examples/uhttpd/uhttpd.prg
View File

@@ -2170,7 +2170,7 @@ STATIC FUNCTION uhttpd_DefError( oError )
nChoice := 0
DO WHILE nChoice == 0
IF ISNIL( cDOSError )
IF cDOSError == NIL
nChoice := Alert( cMessage + " " + cCallstack, aOptions )
ELSE
nChoice := Alert( cMessage + ";" + cDOSError + " " + cCallstack, aOptions )
@@ -2191,7 +2191,7 @@ STATIC FUNCTION uhttpd_DefError( oError )
// "Quit" selected
IF ! ISNIL( cDOSError )
IF cDOSError != NIL
cMessage += " " + cDOSError
ENDIF

2
harbour/contrib/examples/uhttpd/uhttpdc.c
View File

@@ -123,7 +123,7 @@ stopLoop:
HB_FUNC( WIN_SYSREFRESH )
{
hb_retl( win_SysRefresh( ( ISNIL( 1 ) ? 0 : hb_parni( 1 ) ) ) );
hb_retl( win_SysRefresh( hb_parni( 1 ) ) );
}
#else

215
harbour/contrib/hbfbird/tfirebrd.prg
View File

@@ -72,13 +72,13 @@
#define SQL_DATE SQL_TIMESTAMP
CLASS TFbServer
DATA db
DATA trans
DATA StartedTrans
DATA nError
DATA lError
DATA dialect
CREATE CLASS TFbServer
VAR db
VAR trans
VAR StartedTrans
VAR nError
VAR lError
VAR dialect
METHOD New( cServer, cUser, cPassword, nDialect )
METHOD Destroy() INLINE FBClose(::db)
@@ -119,7 +119,7 @@ METHOD New( cServer, cUser, cPassword, nDialect ) CLASS TFbServer
if ISNUMBER(::db)
::lError := .T.
::nError := ::db
end
endif
RETURN self
@@ -136,7 +136,7 @@ METHOD StartTransaction() CLASS TFbServer
::lError := .F.
::lnError := 0
::StartedTrans := .T.
end
endif
RETURN result
@@ -152,8 +152,8 @@ METHOD Rollback() CLASS TFbServer
::nError := 0
result := .T.
::StartedTrans := .F.
end
end
endif
endif
RETURN result
@@ -169,8 +169,8 @@ METHOD Commit() CLASS TFbServer
::nError := 0
result := .T.
::StartedTrans := .F.
end
end
endif
endif
RETURN result
@@ -183,7 +183,7 @@ METHOD Execute( cQuery ) CLASS TFbServer
n := FBExecute( ::db, cQuery, ::dialect, ::trans )
else
n := FBExecute( ::db, cQuery, ::dialect )
end
endif
if n < 0
::lError := .T.
@@ -193,7 +193,7 @@ METHOD Execute( cQuery ) CLASS TFbServer
::lError := .F.
::nError := 0
result := .T.
end
endif
RETURN result
@@ -215,7 +215,7 @@ METHOD TableExists( cTable ) CLASS TFbServer
result := (FBFetch(qry) == 0)
FBFree(qry)
end
endif
RETURN result
@@ -234,10 +234,10 @@ METHOD ListTables() CLASS TFbServer
if ISARRAY(qry)
do while (FBFetch(qry)) == 0
aadd( result, FBGetdata(qry, 1) )
end
enddo
FBFree(qry)
end
endif
RETURN result
@@ -279,7 +279,7 @@ METHOD TableStruct( cTable ) CLASS TFbServer
else
cType := 'N'
nSize := 5
end
endif
exit
@@ -337,14 +337,14 @@ METHOD TableStruct( cTable ) CLASS TFbServer
otherwise
cType := 'C'
nDec := 0
end
endswitch
aadd( result, { cField, cType, nSize, nDec } )
end
enddo
FBFree(qry)
end
endif
RETURN result
@@ -356,7 +356,7 @@ METHOD Delete( oRow, cWhere ) CLASS TFbServer
if ! ISNUMBER(::db) .and. len(aTables) == 1
// Cannot delete joined tables
if ISNIL(cWhere)
if cWhere == NIL
aKeys := oRow:GetKeyField()
cWhere := ''
@@ -368,16 +368,16 @@ METHOD Delete( oRow, cWhere ) CLASS TFbServer
if i != len(aKeys)
cWhere += ','
end
endif
Next
end
endif
if ! (cWhere == '')
cQuery := 'DELETE FROM ' + aTables[1] + ' WHERE ' + cWhere
result := ::Execute(cQuery)
end
end
endif
endif
RETURN result
@@ -394,7 +394,7 @@ METHOD Append( oRow ) CLASS TFbServer
if oRow:Changed(i)
// Send only changed field
cQuery += oRow:Fieldname(i) + ','
end
endif
Next
cQuery := Left( cQuery, len(cQuery) - 1 ) + ') VALUES ('
@@ -402,13 +402,13 @@ METHOD Append( oRow ) CLASS TFbServer
For i := 1 to oRow:FCount()
if oRow:Changed(i)
cQuery += DataToSql(oRow:FieldGet(i)) + ','
end
endif
Next
cQuery := Left( cQuery, len(cQuery) - 1 ) + ')'
result := ::Execute(cQuery)
end
endif
RETURN result
@@ -420,7 +420,7 @@ METHOD Update( oRow, cWhere ) CLASS TFbServer
if ! ISNUMBER(::db) .and. len(aTables) == 1
// Can't insert joined tables
if ISNIL(cWhere)
if cWhere == NIL
aKeys := oRow:GetKeyField()
cWhere := ''
@@ -432,41 +432,41 @@ METHOD Update( oRow, cWhere ) CLASS TFbServer
if i != len(aKeys)
cWhere += ', '
end
endif
Next
end
endif
cQuery := 'UPDATE ' + aTables[1] + ' SET '
For i := 1 to oRow:FCount()
if oRow:Changed(i)
cQuery += oRow:Fieldname(i) + ' = ' + DataToSql(oRow:FieldGet(i)) + ','
end
endif
Next
if ! (cWhere == '')
cQuery := Left( cQuery, len(cQuery) - 1 ) + ' WHERE ' + cWhere
result := ::Execute(cQuery)
end
end
endif
endif
RETURN result
CLASS TFbQuery
DATA nError
DATA lError
DATA Dialect
DATA lBof
DATA lEof
DATA nRecno
DATA qry
DATA aStruct
DATA numcols
DATA closed
DATA db
DATA query
DATA aKeys
DATA aTables
CREATE CLASS TFbQuery
VAR nError
VAR lError
VAR Dialect
VAR lBof
VAR lEof
VAR nRecno
VAR qry
VAR aStruct
VAR numcols
VAR closed
VAR db
VAR query
VAR aKeys
VAR aTables
METHOD New( db, cQuery, nDialect )
METHOD Destroy()
@@ -518,7 +518,7 @@ METHOD Refresh() CLASS TFbQuery
if ! ::closed
::Destroy()
end
endif
::lBof := .T.
::lEof := .F.
@@ -546,7 +546,7 @@ METHOD Refresh() CLASS TFbQuery
For i := 1 To len(::aStruct)
if (ASCAN(aTable, ::aStruct[i,5]) == 0)
aadd( aTable, ::aStruct[i,5])
end
endif
Next
::aTables := aTable
@@ -554,7 +554,7 @@ METHOD Refresh() CLASS TFbQuery
else
::lError := .T.
::nError := qry
end
endif
RETURN result
@@ -565,7 +565,7 @@ METHOD Destroy() CLASS TFbQuery
if (! ::lError) .and. ((n := FBFree(::qry)) < 0)
::lError := .T.
::nError := n
end
endif
::closed := .T.
@@ -589,9 +589,9 @@ METHOD Fetch() CLASS TFbQuery
else
::lEof := .T.
end
end
end
endif
endif
endif
RETURN result
@@ -602,7 +602,7 @@ METHOD Struct() CLASS TFbQuery
for i := 1 to Len(::aStruct)
aadd( result, { ::aStruct[i,1], ::aStruct[i,2], ::aStruct[i,3], ::aStruct[i,4] } )
next
end
endif
RETURN result
@@ -612,7 +612,7 @@ METHOD FieldPos( cField ) CLASS TFbQuery
if ! ::lError
result := AScan( ::aStruct, {|x| x[1] == trim(Upper(cField)) })
end
endif
RETURN result
@@ -622,7 +622,7 @@ METHOD FieldName( nField ) CLASS TFbQuery
if ! ::lError .and. nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 1]
end
endif
RETURN result
@@ -632,7 +632,7 @@ METHOD FieldType( nField ) CLASS TFbQuery
if ! ::lError .and. nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 2]
end
endif
RETURN result
@@ -642,7 +642,7 @@ METHOD FieldLen( nField ) CLASS TFbQuery
if ! ::lError .and. nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 3]
end
endif
RETURN result
@@ -651,7 +651,7 @@ METHOD FieldDec( nField ) CLASS TFbQuery
if ! ::lError .and. nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 4]
end
endif
RETURN result
@@ -668,7 +668,7 @@ METHOD FieldGet( nField ) CLASS TFbQuery
if cType == "M"
/* Blob */
if ! ISNIL(result)
if result != NIL
aBlob := FBGetBlob( ::db, result)
result := ''
@@ -679,30 +679,30 @@ METHOD FieldGet( nField ) CLASS TFbQuery
//result := FBGetBlob( ::db, result)
else
result := ''
end
endif
elseif cType == "N"
if ! ISNIL(result)
if result != NIL
result := val(result)
else
result := 0
end
endif
elseif cType == "D"
if ! ISNIL(result)
if result != NIL
result := StoD(left(result,4) + substr(result, 5, 2) + substr(result, 7, 2))
else
result := CtoD('')
end
endif
elseif cType == "L"
if ! ISNIL(result)
if result != NIL
result := (val(result) == 1)
else
result := .F.
end
end
end
endif
endif
endif
RETURN result
@@ -717,7 +717,7 @@ METHOD Getrow() CLASS TFbQuery
Next
result := TFbRow():New( aRow, ::aStruct, ::db, ::dialect, ::aTables )
end
endif
RETURN result
@@ -738,30 +738,31 @@ METHOD GetBlankRow() CLASS TFbQuery
aRow[i] := CtoD('')
elseif ::aStruct[i, 2] == 'M'
aRow[i] := ''
end
endif
Next
result := TFbRow():New( aRow, ::aStruct, ::db, ::dialect, ::aTables )
end
endif
RETURN result
METHOD GetKeyField() CLASS TFbQuery
if ISNIL(::aKeys)
if ::aKeys == NIL
::aKeys := KeyField( ::aTables, ::db, ::dialect )
end
endif
RETURN ::aKeys
CLASS TFbRow
DATA aRow
DATA aStruct
DATA aChanged
DATA aKeys
DATA db
DATA dialect
DATA aTables
CREATE CLASS TFbRow
VAR aRow
VAR aStruct
VAR aChanged
VAR aKeys
VAR db
VAR dialect
VAR aTables
METHOD New( row, struct, db, dialect )
METHOD Changed(nField)
@@ -792,8 +793,8 @@ METHOD Changed( nField ) CLASS TFbRow
Local result
if nField >= 1 .and. nField <= len(::aRow)
result := ! ISNIL(::aChanged[nField])
end
result := ::aChanged[nField] != NIL
endif
RETURN result
@@ -803,7 +804,7 @@ METHOD FieldGet( nField ) CLASS TFbRow
if nField >= 1 .and. nField <= len(::aRow)
result := ::aRow[nField]
end
endif
RETURN result
@@ -814,7 +815,7 @@ METHOD FieldPut( nField, Value ) CLASS TFbRow
if nField >= 1 .and. nField <= len(::aRow)
::aChanged[nField] := .T.
result := ::aRow[nField] := Value
end
endif
RETURN result
@@ -824,7 +825,7 @@ METHOD FieldName( nField ) CLASS TFbRow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 1]
end
endif
RETURN result
@@ -842,7 +843,7 @@ METHOD FieldType( nField ) CLASS TFbRow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 2]
end
endif
RETURN result
@@ -852,7 +853,7 @@ METHOD FieldLen( nField ) CLASS TFbRow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 3]
end
endif
RETURN result
@@ -861,15 +862,15 @@ METHOD FieldDec( nField ) CLASS TFbRow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 4]
end
endif
RETURN result
METHOD GetKeyField() CLASS TFbRow
if ISNIL(::aKeys)
if ::aKeys == NIL
::aKeys := KeyField( ::aTables, ::db, ::dialect )
end
endif
RETURN ::aKeys
@@ -902,11 +903,11 @@ Static Function KeyField( aTables, db, dialect )
if ISARRAY(qry)
do while (FBFetch(qry)) == 0
aadd(aKeys, trim(FBGetdata(qry, 1)))
end
enddo
FBFree(qry)
end
end
endif
endif
RETURN aKeys
@@ -924,7 +925,7 @@ Static Function DataToSql(xField)
result := str(xField)
elseif cType == "L"
result := iif( xField, '1', '0' )
end
endif
return result
@@ -956,7 +957,7 @@ Static Function StructConvert( aStru, db, dialect)
if i != len(aStru)
xtables += ','
xfields += ','
end
endif
Next
/* Look for domains */
@@ -989,7 +990,7 @@ Static Function StructConvert( aStru, db, dialect)
cDomain := aDomains[ nVal, 3 ]
else
cDomain := ''
end
endif
switch nType
case SQL_TEXT
@@ -1046,16 +1047,16 @@ Static Function StructConvert( aStru, db, dialect)
otherwise
cType := "C"
nDec := 0
end
endswitch
aadd( aNew, { cField, cType, nSize, nDec, cTable, cDomain } )
Next
End
next
endif
return aNew
Static Function RemoveSpaces( cQuery )
Do While AT(" ", cQuery) != 0
cQuery := Strtran(cQuery, " ", " ")
end
enddo
Return cQuery

409
harbour/contrib/hbpgsql/tests/cache.prg
View File

@@ -1,8 +1,9 @@
/*
* $Id$
*
*/
/*
* This samples show how to use dbf to cache postgres records.
*
*/
#include "common.ch"
@@ -47,48 +48,48 @@ Function Main( cServer, cDatabase, cUser, cPass )
Local i
Local cQuery
Local conn, res
SetMode( 25, 80 )
if SQLConnect( cServer, cDatabase, cUser, cPass )
if SQLConnect( cServer, cDatabase, cUser, cPass )
QuickQuery('DROP TABLE test')
cQuery := 'CREATE TABLE test ( '
cQuery += ' codigo integer primary key, '
cQuery += ' descri char(50), '
cQuery += ' email varchar(50) ) '
cQuery += ' email varchar(50) ) '
SQLQuery(cQuery)
SQLOpen( 'nomes', 'SELECT * FROM test')
for i := 1 to 50
append blank
replace codigo with i
replace descri with 'test ' + str(i)
replace descri with 'test ' + str(i)
next
SQLApplyUpdates()
cQuery := 'SELECT * FROM test WHERE codigo >= :1 ORDER BY codigo'
cQuery := SQLPrepare( cQuery, 1 )
SQLOpen( 'nomes', cQuery)
Do while ! Eof()
? recno(), nomes->Codigo, nomes->descri, nomes->email
if recno() == 10
delete
endif
if recno() == 20
if recno() == 20
REPLACE email WITH 'teste'
endif
SQLFetch()
enddo
SQLApplyUpdates()
endif
SQLApplyUpdates()
endif
Return SQLGarbageCollector()
@@ -105,10 +106,10 @@ Function SQLApplyUpdates()
Local oRow
Local lUpdate
Local lError := .F.
Local cError
i := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
Local cError
i := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
IF i != 0
oQuery := aTableTemp[i, 3]
@@ -117,11 +118,11 @@ Function SQLApplyUpdates()
FOR i := 1 TO Lastrec()
DBGoto(i)
IF i > oQuery:Lastrec()
@@ -138,22 +139,22 @@ Function SQLApplyUpdates()
oRow:FieldPut(Fieldname(x), Fieldget(x))
endif
endif
NEXT
oQuery:Append(oRow)
oQuery:Append(oRow)
cError := oQuery:ErrorMsg()
lError := oQuery:NetErr()
endif
endif
ELSE
oRow := oQuery:GetRow(i)
@@ -163,13 +164,13 @@ Function SQLApplyUpdates()
IF Deleted()
oQuery:Delete(oRow)
oQuery:Delete(oRow)
cError := oQuery:ErrorMsg()
lError := oQuery:NetErr()
ELSE
@@ -187,98 +188,93 @@ Function SQLApplyUpdates()
endif
endif
endif
NEXT
IF lUpdate
oQuery:Update(oRow)
oQuery:Update(oRow)
cError := oQuery:ErrorMsg()
lError := oQuery:NetErr()
END
ENDIF
ENDIF
ENDIF
END
END
if lError
exit
end
endif
NEXT
END
ENDIF
IF lError
Alert(cError)
END
ENDIF
Return ! lError
Procedure SQLCloseTemp( cAlias )
Local x
IF ! Empty(Select(cAlias))
CLOSE &calias
END
x := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
ENDIF
x := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
IF ! Empty(x)
ADel( aTableTemp, x )
//ASize( aTableTemp, Len(aTableTemp) - 1 )
END
Return
ENDIF
Return
Procedure SQLGarbageCollector()
Local i
Local oQuery
DBCloseAll()
FOR i := 1 TO Len(aTableTemp)
/* Apaga arquivos dbfs criados */
FErase(aTableTemp[i, DB_FILE])
/* Apaga arquivos dbfs criados */
FErase(aTableTemp[i, DB_FILE])
oQuery := aTableTemp[i, DB_QUERY]
IF ! ISNIL(oQuery)
IF oQuery != NIL
oQuery:Destroy()
END
ENDIF
NEXT
FOR i := 1 TO Len(aTempDBF)
IF File(aTempDBF[i])
FErase(aTempDBF[i])
END
FErase(aTempDBF[i])
ENDIF
IF File(strtran(aTempDBF[i], '.tmp', '.dbf'))
FErase(strtran(aTempDBF[i], '.tmp', '.dbf'))
END
ENDIF
IF File(strtran(aTempDBF[i], '.tmp', '.dbt'))
FErase(strtran(aTempDBF[i], '.tmp', '.dbt'))
END
ENDIF
NEXT
aTableTemp := {}
aTempDBF := {}
Return
aTableTemp := {}
aTempDBF := {}
Return
Function SQLFetch( fetchall )
Local oQuery
Local oRow
@@ -286,56 +282,56 @@ Function SQLFetch( fetchall )
Local i, x, y
Local nPos := 0
Local lEof := .F.
Local cString := ""
Local aStruct
Default Fetchall TO .f.
/* Procura pela tabela no array */
i := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
i := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
IF i != 0
/* Traz registros da base de dados */
oQuery := aTableTemp[i, DB_QUERY]
nPos := aTableTemp[i, DB_ROW] + 1
if Fetchall
aTableTemp[i, DB_FETCH] := .t.
end
endif
IF oQuery:Lastrec() >= nPos
y := nPos
while nPos <= IIF( FetchAll, oQuery:Lastrec(), y )
do while nPos <= IIF( FetchAll, oQuery:Lastrec(), y )
oRow := oQuery:GetRow(nPos)
DBAppend()
FOR x := 1 TO oRow:FCount()
FieldPut( FieldPos( oRow:FieldName(x) ), oRow:FieldGet(x) )
NEXT
aTableTemp[i, DB_ROW] := nPos
nPos++
end
enddo
ELSE
// Posiciona registro no eof
DBSkip()
END
ENDIF
lEof := nPos > oQuery:Lastrec()
END
ENDIF
return lEof
Procedure SQLFetchAll()
SQLFetch(.t.); DBGotop()
Return
Function SQLOpen( cAlias, cQuery, xFetch )
Local cFile
@@ -346,108 +342,108 @@ Function SQLOpen( cAlias, cQuery, xFetch )
Local aStrudbf
Local lFetch
Local cOrder
oServer := SQLCurrentServer()
cAlias := Upper(cAlias)
/* Procura por query na area temporaria */
x := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
x := ASCAN(aTableTemp, {|aVal| aVal[DB_ALIAS] == cAlias})
IF ! Empty(x)
oQuery := aTableTemp[x, 3]
oQuery:Destroy()
END
IF ISNIL(cQuery)
ENDIF
IF cQuery == NIL
cQuery := 'SELECT * FROM ' + cAlias + ' ORDER BY ' + cOrder
END
ENDIF
cQuery := cQuery
oQuery := oServer:Query(cQuery)
IF oQuery:NetErr()
IF oQuery:NetErr()
Alert(oQuery:ErrorMsg())
RETURN .F.
END
ENDIF
IF Empty(Select(cAlias))
/* Pega estrutura da base de dados */
aStrudbf := oQuery:Struct()
/* Pega estrutura da base de dados */
aStrudbf := oQuery:Struct()
/* Cria tabela */
cFile := TempFile()
DBCreate( cFile, aStrudbf )
/* Abre Tabela */
DBUseArea(.T., NIL, cFile, cAlias, .F.)
DBUseArea(.T., NIL, cFile, cAlias, .F.)
ELSE
SELECT &cAlias
Zap
END
IF ! ISNIL(xFetch)
ENDIF
IF xFetch != NIL
lFetch := xFetch
ELSE
lFetch := .F.
END
ELSE
lFetch := .F.
ENDIF
/* Se nao houver query na area temporaria entao adiciona, caso contrario, apenas atualiza */
IF Empty(x)
IF Empty(x)
AADD( aTableTemp, { cAlias,; // Table Name
cFile,; // Temporary File Name
oQuery,; // Object Query
0,; // Current Row
lFetch } ) // Fetch Status
lFetch } ) // Fetch Status
ELSE
aTableTemp[ x, DB_QUERY ] := oQuery
aTableTemp[ x, DB_ROW ] := 0
aTableTemp[ x, DB_FETCH ] := lFetch
END
aTableTemp[ x, DB_FETCH ] := lFetch
ENDIF
/* Traz registros da base de dados */
SQLFetch(lFetch)
SQLFetch(lFetch)
IF lFetch
DBGotop()
END
ENDIF
Return result
Function SQLConnect( cServer, cDatabase, cUser, cPassword, cSchema )
Local lRetval := .t.
oServer := TPQServer():New(cServer, cDatabase, cUser, cPassWord, 5432, cSchema)
if oServer:NetErr()
oServer := TPQServer():New(cServer, cDatabase, cUser, cPassWord, 5432, cSchema)
if oServer:NetErr()
Alert(oServer:ErrorMsg())
lRetval := .f.
end
oServer:lAllCols := .F.
lRetval := .f.
endif
oServer:lAllCols := .F.
Return lRetval
Procedure SQLDestroy()
if ! ISNIL(oServer)
if oServer != NIL
oServer:Destroy()
end
endif
return
Function SQLCurrentServer
Return oServer
Function SQLQuery( cQuery )
Local oQuery
oQuery := oServer:Query(cQuery)
IF oQuery:NetErr()
IF oQuery:NetErr()
Alert(cQuery + ':' + oQuery:ErrorMsg())
END
ENDIF
Return oQuery
@@ -456,27 +452,27 @@ Function SQLExecQuery( cQuery )
Local result := .T.
oQuery := oServer:Query(cQuery)
IF oQuery:NetErr()
IF oQuery:NetErr()
Alert('Nao foi possível executar ' + cQuery + ':' + oQuery:ErrorMsg())
result := .F.
ELSE
ELSE
oQuery:Destroy()
END
ENDIF
Return result
Function SQLPrepare( cQuery, x01, x02, x03, x04, x05, x06, x07, x08, x09, x10,;
x11, x12, x13, x14, x15, x16, x17, x18, x19, x20,;
x21, x22, x23, x24, x25, x26, x27, x28, x29, x30,;
x31, x32, x33, x34, x35, x36, x37, x38, x39, x40,;
x41, x42, x43, x44, x45, x46, x47, x48, x49, x50,;
x51, x52, x53, x54, x55, x56, x57, x58, x59, x60,;
x61, x62, x63, x64, x65, x66, x67, x68, x69, x70,;
x71, x72, x73, x74, x75, x76, x77, x78, x79, x80,;
x81, x82, x83, x84, x85, x86, x87, x88, x89, x90,;
Function SQLPrepare( cQuery, x01, x02, x03, x04, x05, x06, x07, x08, x09, x10,;
x11, x12, x13, x14, x15, x16, x17, x18, x19, x20,;
x21, x22, x23, x24, x25, x26, x27, x28, x29, x30,;
x31, x32, x33, x34, x35, x36, x37, x38, x39, x40,;
x41, x42, x43, x44, x45, x46, x47, x48, x49, x50,;
x51, x52, x53, x54, x55, x56, x57, x58, x59, x60,;
x61, x62, x63, x64, x65, x66, x67, x68, x69, x70,;
x71, x72, x73, x74, x75, x76, x77, x78, x79, x80,;
x81, x82, x83, x84, x85, x86, x87, x88, x89, x90,;
x91, x92, x93, x94, x95, x96, x97, x98, x99, x100)
Local i, x
@@ -485,86 +481,86 @@ Function SQLPrepare( cQuery, x01, x02, x03, x04, x05, x06, x07, x08, x09, x10,;
do while at( Space(2), cQuery ) != 0
cQuery := strtran( cQuery, Space(2), Space(1) )
enddo
/* Coloca {} nos parametros */
/* Coloca {} nos parametros */
for i := 1 to Pcount() - 1
if ! empty(x := at( ':' + ltrim(str(i)), cQuery))
cQuery := stuff( cQuery, x, 0, '{' )
cQuery := stuff( cQuery, x + len(ltrim(str(i))) + 2, 0, '}' )
endif
next
next
/* Substitui parametros por valores passados */
for i := 2 to PCount()
x := hb_PValue(i)
if ! ISNIL(x) .and. Empty(x)
if x != NIL .and. Empty(x)
x := 'null'
elseif valtype(x) == 'N'
x := ltrim(str(x))
elseif valtype(x) == 'D'
x := DtoQ(x)
x := DtoQ(x)
elseif valtype(x) == 'L'
x := IIF( x, "'t'", "'f'" )
elseif valtype(x) == "C" .or. valtype(x) == 'M'
x := StoQ(Trim(x))
else
x := 'null'
end
x := 'null'
endif
cQuery := strtran(cQuery, '{:' + ltrim(str(i-1)) + '}', x)
next
end
next
endif
cQuery := strtran(cQuery, '==', '=')
cQuery := strtran(cQuery, '!=', '<>')
cQuery := strtran(cQuery, '.and.', 'and')
cQuery := strtran(cQuery, '.or.', 'or')
cQuery := strtran(cQuery, '.not.', 'not')
cQuery := strtran(cQuery, '.not.', 'not')
Return cQuery
/* Pega resultado de uma sequence */
/* Pega resultado de uma sequence */
Function SQLSequence( Sequence_name )
Local nValue
nValue := Val(QuickQuery("SELECT nextval(" + StoQ(sequence_name) + ")" ))
Return nValue
Function SQLStartTrans()
if PQtransactionstatus(oServer:pDB) != PQTRANS_INTRANS
oServer:StartTransaction()
endif
endif
Return nil
Function SQLInTrans( lStart )
Local result
result := (PQtransactionstatus(oServer:pDB) == PQTRANS_INTRANS)
Return result
result := (PQtransactionstatus(oServer:pDB) == PQTRANS_INTRANS)
Return result
Function SQLCommitTrans()
oServer:Commit()
Return nil
Return nil
Function SQLRollbackTrans()
oServer:rollback()
Return nil
Return nil
/* Faz querie que retorna apenas 1 valor de coluna */
Function QuickQuery( cQuery )
Local pQuery
Local result := ""
Local temp, aTemp
Local x, y
Local x, y
pQuery := PQexec( oServer:pDB, cQuery )
@@ -573,28 +569,28 @@ Function QuickQuery( cQuery )
if PQFcount(pQuery) == 1 .and. PQLastrec(pQuery) == 1
temp := PQGetValue( pQuery, 1, 1 )
result := iif( temp == NIL, "", temp )
else
else
result := {}
for x := 1 to PQLastrec(pQuery)
aTemp := {}
for y := 1 to PQfcount(pQuery)
temp := PQGetValue( pQuery, x, y )
aadd( aTemp, iif( temp == NIL, "", temp ) )
aadd( aTemp, iif( temp == NIL, "", temp ) )
next
aadd(result, aTemp)
next
endif
next
endif
endif
endif
PQclear(pQuery)
Return result
endif
PQclear(pQuery)
Return result
Procedure MakeDBF( cAlias, aStructure, aIndex )
Local cFile, i, cIndex, cKey
Default aIndex TO {}
cFile := TempFile()
DBCreate( cFile, aStructure )
@@ -606,43 +602,44 @@ Procedure MakeDBF( cAlias, aStructure, aIndex )
cIndex := TempFile()
Index On &cKey To &cIndex
aadd( aTempDBF, cIndex)
aadd( aTempDBF, cIndex)
Next
AADD( aTempDBF, cFile )
return
Function DirTmp()
Local xDirectory
xDirectory := IIF(Empty(Getenv("TMP")), Getenv("TEMP"), Getenv("TMP"))
IF Empty(xDirectory); xDirectory := ''; END
IF Empty(xDirectory)
xDirectory := ''
ENDIF
IF ';' $ xDirectory
xDirectory := LEFT( xDirectory, AT( ';', xDirectory ) - 1 )
END
xDirectory := LEFT( xDirectory, AT( ';', xDirectory ) - 1 )
ENDIF
RETURN xDirectory + IIF( Right(xDirectory, 1) != '\' .and. ! Empty(xDirectory), '\', '' )
Function TempFile( cPath, cExt )
Local cString
Default cPath to DirTmp(),;
cExt to 'tmp'
cString := cPath + strzero(int(hb_random(val(strtran(time(), ":", "")))), 8) + '.' + cExt
DO WHILE File( cString )
cString := cPath + strzero(int(hb_random(val(strtran(time(), ":", "")))), 8) + '.' + cExt
END
ENDDO
Return cString
Function DtoQ(cData)
Return "'" + Str(Year(cData),4) + "-" + StrZero(Month(cData), 2) + "-" + StrZero(Day(cData), 2) + "'"
Function StoQ(cData)
Return "'" + cData + "'"

97
harbour/contrib/hbpgsql/tests/dbf2pg.prg
View File

@@ -1,7 +1,8 @@
/*
*
* $Id$
*
*/
/*
* Harbour Project source code:
* dbf2pg.prg - converts a .dbf file into a Postgres table
*
@@ -93,7 +94,7 @@ procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15,
i := 1
// Scan parameters and setup workings
while (i <= PCount())
cTok := hb_PValue(i++)
do case
@@ -123,7 +124,7 @@ procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15,
case cTok == "-s"
lUseTrans := .T.
case cTok == "-m"
nCommit := val(hb_PValue(i++))
@@ -143,7 +144,7 @@ procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15,
if (nHandle := FCreate(Trim(cTable) + '.log')) == -1
? 'Cannot create log file'
quit
endif
endif
USE (cFile) SHARED
aDbfStruct := DBStruct()
@@ -153,7 +154,7 @@ procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15,
? oServer:ErrorMsg()
quit
endif
oServer:lallCols := .F.
if lCreateTable
@@ -175,15 +176,15 @@ procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15,
quit
endif
endif
if lTruncate
oServer:Execute('truncate table ' + cTable)
oServer:Execute('truncate table ' + cTable)
if oServer:NetErr()
? oServer:ErrorMsg()
FWrite( nHandle, "Error: " + oServer:ErrorMsg() + CRLF )
FClose( nHandle )
quit
endif
endif
endif
oTable := oServer:Query("SELECT * FROM " + cTable + " LIMIT 1")
@@ -196,105 +197,105 @@ procedure main(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15,
if lUseTrans
oServer:StartTransaction()
endif
endif
FWrite( nHandle, "Start: " + time() + CRLF )
? "Start: ", time()
?
?
if ! Empty(nRecno)
dbgoto(nRecno)
endif
endif
while ! eof() .and. Inkey() != K_ESC .and. (empty(nRecno) .or. nRecno == recno())
do while ! eof() .and. Inkey() != K_ESC .and. (empty(nRecno) .or. nRecno == recno())
oRecord := oTable:GetBlankRow()
for i := 1 to oTable:FCount()
cField := lower(oTable:FieldName(i))
sType := fieldtype(fieldpos(cField))
dType := oRecord:Fieldtype(i)
cValue := fieldget(fieldpos(cField))
if ! ISNIL(cValue)
if dType != sType
if cValue != NIL
if dType != sType
if dType == 'C' .and. sType == 'N'
cValue := Str(cValue)
elseif dType == 'C' .and. sType == 'D'
cValue := DtoC(cValue)
elseif dType == 'C' .and. sType == 'L'
cValue := IIF( cValue, "S", "N" )
elseif dType == 'N' .and. sType == 'C'
cValue := val(cValue)
elseif dType == 'N' .and. sType == 'D'
cValue := Val(DtoS(cValue))
elseif dType == 'N' .and. sType == 'L'
cValue := IIF( cValue, 1, 0 )
elseif dType == 'D' .and. sType == 'C'
cValue := CtoD(cValue)
elseif dType == 'D' .and. sType == 'N'
cValue := StoD(Str(cValue))
elseif dType == 'L' .and. sType == 'N'
cValue := ! Empty(cValue)
elseif dType == 'L' .and. sType == 'C'
cValue := IIF( alltrim(cValue) $ "YySs1", .T., .F. )
end
end
if ! ISNIL(cValue)
if oRecord:Fieldtype(i) == 'C' .or. oRecord:Fieldtype(i) == 'M'
cValue := IIF( alltrim(cValue) $ "YySs1", .T., .F. )
endif
endif
if cValue != NIL
if oRecord:Fieldtype(i) == 'C' .or. oRecord:Fieldtype(i) == 'M'
oRecord:FieldPut(i, hb_oemtoansi(cValue))
else
else
oRecord:FieldPut(i, cValue)
endif
endif
endif
endif
next
oTable:Append(oRecord)
if oTable:NetErr()
?
? "Error Record: ", recno(), left(oTable:ErrorMsg(),70)
?
FWrite( nHandle, "Error at record: " + Str(recno()) + " Description: " + oTable:ErrorMsg() + CRLF )
?
FWrite( nHandle, "Error at record: " + Str(recno()) + " Description: " + oTable:ErrorMsg() + CRLF )
else
nCount++
nCount++
endif
dbSkip()
if (nCount % nCommit) == 0
DevPos(Row(), 1)
DevOut("imported recs: " + Str(nCount))
DevOut("imported recs: " + Str(nCount))
if lUseTrans
oServer:commit()
oServer:StartTransaction()
endif
endif
endif
enddo
if (nCount % nCommit) != 0
if lUseTrans
oServer:commit()
endif
endif
endif
endif
FWrite( nHandle, "End: " + time() + ", records in dbf: " + ltrim(str(recno())) + ", imported recs: " + ltrim(str(nCount)) + CRLF )
? "End: ", time()
?
?
FClose( nHandle )
@@ -319,7 +320,7 @@ procedure Help()
? "-m commit interval"
? "-r insert only record number"
? "-e search path"
? ""
return

107
harbour/contrib/hbpgsql/tests/simple.prg
View File

@@ -1,7 +1,5 @@
/*
*
* $Id$
*
*/
#include "common.ch"
@@ -10,32 +8,32 @@ Function main( cHost, cDatabase, cUser, cPass )
Local oServer, oQuery, oRow, i, x, aTables, aStruct
Local cQuery
oServer := TPQServer():New(cHost, cDatabase, cUser, cPass)
if oServer:NetErr()
? oServer:Error()
quit
end
endif
oServer:SetVerbosity(2)
oServer:traceon('lixo.log')
? 'Tables...'
For x := 1 to 1
aTables := oServer:ListTables()
For i := 1 to Len(aTables)
? aTables[i]
next
Next
Next
if oServer:TableExists('TEST')
? oQuery := oServer:Execute('DROP TABLE Test')
oQuery:Destroy()
end
endif
? 'Creating test table...'
cQuery := 'CREATE TABLE test('
@@ -49,56 +47,56 @@ Function main( cHost, cDatabase, cUser, cPass )
cQuery += ' Discount Numeric (5,2), '
cQuery += ' Creation Date, '
cQuery += ' Description text ) '
oQuery := oServer:Query(cQuery)
if oQuery:neterr()
? oQuery:Error()
end
endif
oQuery:Destroy()
? 'Structure of test table'
aStruct := oServer:TableStruct('test')
For i := 1 to Len(aStruct)
?
For x := 1 to Len(aStruct[i])
?
For x := 1 to Len(aStruct[i])
?? aStruct[i,x], " "
Next
next
Next
next
? 'Inserting, declared transaction control '
oServer:StartTransaction()
For i := 1 to 10
cQuery := "INSERT INTO test(code, dept, name, sales, tax, salary, budget, Discount, Creation, Description) "
cQuery += "VALUES( " + str(i) + ", 2, 'TEST', 'y', 5, 3000, 1500.2, 7.5, '12-22-2003', 'Short Description about what ? ')"
oQuery := oServer:Query(cQuery)
oQuery := oServer:Query(cQuery)
if oQuery:neterr()
? oQuery:error()
end
endif
oQuery:destroy()
Next
Next
oServer:Commit()
oQuery := oServer:Query('SELECT code, name, description, sales FROM test')
aStruct := oQuery:Struct()
For i := 1 to Len(aStruct)
? aStruct[i,1], aStruct[i,2], aStruct[i,3], aStruct[i,4]
Next
? "Fields: ", oQuery:Fcount()
oRow := oQuery:Blank()
? oRow:FCount(), ;
oRow:Fieldpos('sales'), ;
oRow:Fieldget(1), ;
@@ -109,15 +107,15 @@ Function main( cHost, cDatabase, cUser, cPass )
oRow:Fieldput(1, 150)
oRow:Fieldput(2, 'MY TEST')
? oRow:Fieldget(1), oRow:Fieldget(2)
? oRow:aRow[1], oRow:aRow[2], oRow:aOld[1], oRow:aOld[2]
? oQuery:Append(oRow)
? oQuery:ErrorMsg()
DO WHILE ! oQuery:Eof()
? oQuery:Recno(),;
oQuery:Fieldpos('code'),;
@@ -129,28 +127,28 @@ Function main( cHost, cDatabase, cUser, cPass )
oQuery:Fielddec(1), ;
oQuery:Fieldlen(1),;
oQuery:Fieldget(3)
if oQuery:Recno() == 50
oRow := oQuery:getrow()
oRow:Fieldput(2, 'My Second test')
? 'Update: ', oQuery:Update(oRow)
end
endif
if oQuery:Recno() == 60
oRow := oQuery:getrow()
? 'Delete: ', oQuery:Delete(oRow)
end
endif
oQuery:Skip()
END
ENDDO
oQuery:Refresh()
For i := 1 to oQuery:Lastrec()
oRow := oQuery:getrow(i)
? i, oRow:Fieldget(oRow:Fieldpos('code')), ;
oRow:Fieldget(4), ;
oRow:Fieldget(2), ;
@@ -159,16 +157,13 @@ Function main( cHost, cDatabase, cUser, cPass )
oRow:Fielddec(1), ;
oRow:Fieldlen(1),;
oRow:Fieldget(i, 3)
END
NEXT
oQuery:Destroy()
oServer:Destroy()
? "Closing..."
return nil
oServer:Destroy()
? "Closing..."
return nil

76
harbour/contrib/hbpgsql/tests/stress.prg
View File

@@ -1,9 +1,9 @@
/*
*
* $Id$
*
* VERY IMPORTANT: Don't use this querys as sample, they are used for stress tests !!!
*
*/
/*
* VERY IMPORTANT: Don't use this querys as sample, they are used for stress tests !!!
*/
#include "common.ch"
@@ -16,18 +16,18 @@ Function Main( cServer, cDatabase, cUser, cPass )
CLEAR SCREEN
? 'Connecting....'
? 'Connecting....'
conn := PQconnect(cDatabase, cServer, cUser, cPass, 5432)
? PQstatus(conn), PQerrormessage(conn)
if PQstatus(conn) != CONNECTION_OK
quit
endif
? 'Dropping table...'
res := PQexec(conn, 'DROP TABLE test')
res := PQexec(conn, 'DROP TABLE test')
PQclear(res)
? 'Creating test table...'
@@ -49,79 +49,79 @@ Function Main( cServer, cDatabase, cUser, cPass )
res := PQexec(conn, 'SELECT code, dept, name, sales, salary, creation FROM test')
PQclear(res)
res := PQexec(conn, 'BEGIN')
res := PQexec(conn, 'BEGIN')
PQclear(res)
For i := 1 to 10000
@ 15,0 say 'Inserting values....' + str(i)
cQuery := 'INSERT INTO test(code, dept, name, sales, salary, creation) '
cQuery += 'VALUES( ' + str(i) + ',' + str(i+1) + ", 'DEPARTMENT NAME " + strzero(i) + "', 'y', " + str(300.49+i) + ", '2003-12-28' )"
res := PQexec(conn, cQuery)
PQclear(res)
if mod(i,100) == 0
? res := PQexec(conn, 'COMMIT')
? res := PQexec(conn, 'COMMIT')
? PQclear(res)
? res := PQexec(conn, 'BEGIN')
? res := PQexec(conn, 'BEGIN')
? PQclear(res)
end
endif
Next
For i := 5000 to 7000
@ 16,0 say 'Deleting values....' + str(i)
cQuery := 'DELETE FROM test WHERE code = ' + str(i)
res := PQexec(conn, cQuery)
res := PQexec(conn, cQuery)
PQclear(res)
if mod(i,100) == 0
res := PQexec(conn, 'COMMIT')
res := PQexec(conn, 'COMMIT')
PQclear(res)
res := PQexec(conn, 'BEGIN')
res := PQexec(conn, 'BEGIN')
PQclear(res)
end
endif
Next
For i := 2000 to 3000
@ 17,0 say 'Updating values....' + str(i)
cQuery := 'UPDATE FROM test SET salary = 400 WHERE code = ' + str(i)
res := PQexec(conn, cQuery)
PQclear(res)
PQclear(res)
if mod(i,100) == 0
res := PQexec(conn, 'COMMIT')
res := PQexec(conn, 'COMMIT')
PQclear(res)
res := PQexec(conn, 'BEGIN')
res := PQexec(conn, 'BEGIN')
PQclear(res)
end
endif
Next
res := PQexec(conn, 'SELECT sum(salary) as sum_salary FROM test WHERE code between 1 and 4000')
if PQresultStatus(res) == PGRES_TUPLES_OK
@ 18,0 say 'Sum values....' + PQgetvalue(res, 1, 1)
end
@ 18,0 say 'Sum values....' + PQgetvalue(res, 1, 1)
endif
PQclear(res)
x := 0
For i := 1 to 4000
res := PQexec(conn, 'SELECT salary FROM test WHERE code = ' + str(i))
if PQresultStatus(res) == PGRES_TUPLES_OK
x += val(PQgetvalue(res, 1, 1))
x += val(PQgetvalue(res, 1, 1))
@ 19,0 say 'Sum values....' + str(x)
end
Next
endif
Next
? "Closing..."
PQclose(conn)
return nil

53
harbour/contrib/hbpgsql/tests/test.prg
View File

@@ -1,7 +1,5 @@
/*
*
* $Id$
*
*/
#include "../postgres.ch"
@@ -11,28 +9,28 @@ Function main()
Local cDb := 'test'
Local cUser := 'user'
Local cPass := 'pass'
CLEAR SCREEN
conn := PQsetdbLogin( 'localhost', "5432", NIL, NIL, cDb, cUser, cPass)
? PQdb(conn), PQuser(conn), PQpass(conn), PQhost(conn), PQport(conn), PQtty(conn), PQoptions(conn)
? PQClose(conn)
conn := PQConnect(cDb, 'localhost', cuser, cpass, 5432)
? PQstatus(conn), PQerrormessage(conn)
if PQstatus(conn) != CONNECTION_OK
quit
endif
? "Blocking: ", PQisnonblocking(conn), PQsetnonblocking(conn, .t.), PQisnonblocking(conn)
pFile := PQcreatetrace( 'trace.log' )
PQtrace( conn, pFile )
? "Verbose: ", PQsetErrorVerbosity(conn, 2)
? "Protocol: ", PQprotocolVersion(conn), ;
" Server Version: ", PQserverVersion(conn), ;
" Client Encoding: ", PQsetClientEncoding(conn, "ASCII"), ;
@@ -43,21 +41,21 @@ Function main()
res := PQexec('drop table products')
? PQresultStatus(res), PQresultErrorMessage(res)
PQclear(res)
res := PQexec('create table products ( product_no numeric(10), name varchar(20), price numeric(10,2) )')
? PQresultStatus(res), PQresultErrorMessage(res)
PQclear(res)
res := PQexecParams(conn, 'insert into products(product_no, name, price) values ($1, $2, $3)', {'2', 'bread', '10.95'})
res := PQexecParams(conn, 'insert into products(product_no, name, price) values ($1, $2, $3)', {'2', 'bread', '10.95'})
? "Oid Row: ", PQoidValue(res), PQoidStatus(res)
if PQresultStatus(res) != PGRES_COMMAND_OK
? PQresultStatus(res), PQresultErrorMessage(res)
endif
PQclear(res)
res := PQexec(conn, 'select price, name, product_no as "produto" from products')
if PQresultStatus(res) != PGRES_TUPLES_OK
? PQresultStatus(res), PQresultErrorMessage(res)
endif
@@ -65,38 +63,37 @@ Function main()
? "Binary: ", PQbinaryTuples(res)
? "Rows: ", PQntuples(res), "Cols: ", PQnfields(res)
? PQfname(res, 1), PQftable(res, 1), PQftype(res, 1), PQfnumber(res, "name"), PQfmod(res, 1), PQfsize(res, 1), PQgetisnull(res,1,1)
aTemp := PQmetadata(res)
for x := 1 to len(aTemp)
? "Linha 1: "
for y := 1 to 6
?? aTemp[x,y], ", "
next
next
? PQFcount(res)
? PQlastrec(res)
? PQGetvalue(res,1, 2)
? PQclear(res)
? PQclear(res)
? "Large Objects, always should be in a transaction..."
res := PQexec(conn, 'begin')
PQclear(res)
PQclear(res)
? (x := lo_Import( conn, 'test.prg' ))
? lo_Export( conn, x, 'test.new' )
? lo_Unlink( conn, x )
res := PQexec(conn, 'commit')
PQclear(res)
PQclear(res)
PQuntrace( conn )
PQclosetrace( pFile )
PQclosetrace( pFile )
PQClose(conn)
return nil

437
harbour/contrib/hbpgsql/tpostgre.prg
View File

@@ -56,15 +56,15 @@
#include "hbclass.ch"
#include "postgres.ch"
CLASS TPQServer
DATA pDb
DATA lTrans
DATA lallCols INIT .T.
DATA Schema INIT 'public'
DATA lError INIT .F.
DATA cError INIT ''
DATA lTrace INIT .F.
DATA pTrace
CREATE CLASS TPQServer
VAR pDb
VAR lTrans
VAR lallCols INIT .T.
VAR Schema INIT "public"
VAR lError INIT .F.
VAR cError INIT ""
VAR lTrace INIT .F.
VAR pTrace
METHOD New( cHost, cDatabase, cUser, cPass, nPort, Schema )
METHOD Destroy()
@@ -109,7 +109,7 @@ METHOD New( cHost, cDatabase, cUser, cPass, nPort, Schema ) CLASS TPQserver
if ! Empty(Schema)
::SetSchema(Schema)
else
res := PQexec( ::pDB, 'SELECT current_schema()' )
res := PQexec( ::pDB, "SELECT current_schema()" )
if PQresultStatus(res) == PGRES_TUPLES_OK
::Schema := PQgetvalue( res, 1, 1 )
endif
@@ -132,7 +132,7 @@ METHOD SetSchema( cSchema ) CLASS TPQserver
if PQstatus(::pDb) == CONNECTION_OK
::Schema := cSchema
res := PQexec( ::pDB, 'SET search_path TO ' + cSchema )
res := PQexec( ::pDB, "SET search_path TO " + cSchema )
result := (PQresultStatus(res) == PGRES_COMMAND_OK)
PQclear(res)
endif
@@ -142,7 +142,7 @@ RETURN result
METHOD StartTransaction() CLASS TPQserver
Local res, lError
res := PQexec( ::pDB, 'BEGIN' )
res := PQexec( ::pDB, "BEGIN" )
lError := PQresultstatus(res) != PGRES_COMMAND_OK
if lError
@@ -150,7 +150,7 @@ METHOD StartTransaction() CLASS TPQserver
::cError := PQresultErrormessage(res)
else
::lError := .F.
::cError := ''
::cError := ""
endif
PQclear(res)
RETURN lError
@@ -159,7 +159,7 @@ RETURN lError
METHOD Commit() CLASS TPQserver
Local res, lError
res := PQexec( ::pDB, 'COMMIT' )
res := PQexec( ::pDB, "COMMIT" )
lError := PQresultstatus(res) != PGRES_COMMAND_OK
if lError
@@ -167,7 +167,7 @@ METHOD Commit() CLASS TPQserver
::cError := PQresultErrormessage(res)
else
::lError := .F.
::cError := ''
::cError := ""
endif
PQclear(res)
RETURN lError
@@ -176,7 +176,7 @@ RETURN lError
METHOD Rollback() CLASS TPQserver
Local res, lError
res := PQexec( ::pDB, 'ROLLBACK' )
res := PQexec( ::pDB, "ROLLBACK" )
lError := PQresultstatus(res) != PGRES_COMMAND_OK
if lError
@@ -184,7 +184,7 @@ METHOD Rollback() CLASS TPQserver
::cError := PQresultErrormessage(res)
else
::lError := .F.
::cError := ''
::cError := ""
endif
PQclear(res)
RETURN lError
@@ -211,7 +211,7 @@ METHOD TableExists( cTable ) CLASS TPQserver
if PQresultstatus(res) == PGRES_TUPLES_OK
result := (PQlastrec(res) != 0)
::lError := .F.
::cError := ''
::cError := ""
else
::lError := .T.
::cError := PQresultErrormessage(res)
@@ -238,7 +238,7 @@ METHOD ListTables() CLASS TPQserver
aadd( result, PQgetvalue( res, i, 1 ) )
Next
::lError := .F.
::cError := ''
::cError := ""
else
::lError := .T.
::cError := PQresultErrormessage(res)
@@ -271,38 +271,38 @@ METHOD TableStruct( cTable ) CLASS TPQserver
nSize := PQgetvalue(res, i, 4)
nDec := PQgetvalue(res, i, 5)
if 'char' $ cType
cType := 'C'
if "char" $ cType
cType := "C"
nSize := Val(PQgetvalue(res, i, 3))
nDec := 0
elseif 'text' $ cType
cType := 'M'
elseif "text" $ cType
cType := "M"
nSize := 10
nDec := 0
elseif 'boolean' $ cType
cType := 'L'
elseif "boolean" $ cType
cType := "L"
nSize := 1
nDec := 0
elseif 'smallint' $ cType
cType := 'N'
elseif "smallint" $ cType
cType := "N"
nSize := 5
nDec := 0
elseif 'integer' $ cType .or. 'serial' $ cType
cType := 'N'
elseif "integer" $ cType .or. "serial" $ cType
cType := "N"
nSize := 9
nDec := 0
elseif 'bigint' $ cType .or. 'bigserial' $ cType
cType := 'N'
elseif "bigint" $ cType .or. "bigserial" $ cType
cType := "N"
nSize := 19
nDec := 0
elseif 'decimal' $ cType .or. 'numeric' $ cType
cType := 'N'
elseif "decimal" $ cType .or. "numeric" $ cType
cType := "N"
nDec := val(nDec)
// Postgres don't store ".", but .dbf does, it can cause data width problem
nSize := val(nSize) + iif( nDec > 0, 1, 0 )
@@ -317,51 +317,51 @@ METHOD TableStruct( cTable ) CLASS TPQserver
nSize := 15
endif
elseif 'real' $ cType .or. 'float4' $ cType
cType := 'N'
elseif "real" $ cType .or. "float4" $ cType
cType := "N"
nSize := 15
nDec := 4
elseif 'double precision' $ cType .or. 'float8' $ cType
cType := 'N'
elseif "double precision" $ cType .or. "float8" $ cType
cType := "N"
nSize := 19
nDec := 9
elseif 'money' $ cType
cType := 'N'
elseif "money" $ cType
cType := "N"
nSize := 9
nDec := 2
elseif 'timestamp' $ cType
cType := 'C'
elseif "timestamp" $ cType
cType := "C"
nSize := 20
nDec := 0
elseif 'date' $ cType
cType := 'D'
elseif "date" $ cType
cType := "D"
nSize := 8
nDec := 0
elseif 'time' $ cType
cType := 'C'
elseif "time" $ cType
cType := "C"
nSize := 10
nDec := 0
else
// Unsuported
cType := 'U'
cType := "U"
nSize := 0
nDec := -1
end
endif
if !( cType == 'U' )
if !( cType == "U" )
aadd( result, { cField, cType, nSize, nDec } )
end
endif
Next
::lError := .F.
::cError := ''
::cError := ""
else
::lError := .T.
::cError := PQresultErrormessage(res)
@@ -376,33 +376,33 @@ METHOD CreateTable( cTable, aStruct ) CLASS TPQserver
Local res
Local i
cQuery := 'CREATE TABLE ' + ::Schema + '.' + cTable + '( '
cQuery := "CREATE TABLE " + ::Schema + "." + cTable + "( "
For i := 1 to Len(aStruct)
cQuery += aStruct[i, 1]
if aStruct[ i, 2 ] == "C"
cQuery += ' Char(' + hb_NToS(aStruct[i, 3]) + ')'
cQuery += " Char(" + hb_NToS(aStruct[i, 3]) + ")"
elseif aStruct[ i, 2 ] == "D"
cQuery += ' Date '
cQuery += " Date "
elseif aStruct[ i, 2 ] == "N"
cQuery += ' Numeric(' + hb_NToS(aStruct[i, 3]) + ',' + hb_NToS(aStruct[i,4]) + ')'
cQuery += " Numeric(" + hb_NToS(aStruct[i, 3]) + "," + hb_NToS(aStruct[i,4]) + ")"
elseif aStruct[ i, 2 ] == "L"
cQuery += ' boolean '
cQuery += " boolean "
elseif aStruct[ i, 2 ] == "M"
cQuery += ' text '
end
cQuery += " text "
endif
if i == Len(aStruct)
cQuery += ')'
cQuery += ")"
else
cQuery += ','
end
cQuery += ","
endif
Next
res := PQexec( ::pDB, cQuery )
@@ -413,8 +413,8 @@ METHOD CreateTable( cTable, aStruct ) CLASS TPQserver
::cError := PQresultErrormessage(res)
else
::lError := .F.
::cError := ''
end
::cError := ""
endif
PQclear(res)
RETURN result
@@ -424,7 +424,7 @@ METHOD DeleteTable( cTable ) CLASS TPQserver
Local result := .T.
Local res
res := PQexec( ::pDB, 'DROP TABLE ' + ::Schema + '.' + cTable )
res := PQexec( ::pDB, "DROP TABLE " + ::Schema + "." + cTable )
if PQresultstatus(res) != PGRES_COMMAND_OK
result := .F.
@@ -432,8 +432,8 @@ METHOD DeleteTable( cTable ) CLASS TPQserver
::cError := PQresultErrormessage(res)
else
::lError := .F.
::cError := ''
end
::cError := ""
endif
PQclear(res)
RETURN result
@@ -460,30 +460,30 @@ RETURN nil
CLASS TPQQuery
DATA pQuery
DATA pDB
CREATE CLASS TPQQuery
VAR pQuery
VAR pDB
DATA nResultStatus
VAR nResultStatus
DATA lBof
DATA lEof
DATA lRead
DATA lAllCols INIT .T.
VAR lBof
VAR lEof
VAR lRead
VAR lAllCols INIT .T.
DATA lError INIT .F.
DATA cError INIT ''
VAR lError INIT .F.
VAR cError INIT ""
DATA cQuery
DATA nRecno
DATA nFields
DATA nLastrec
VAR cQuery
VAR nRecno
VAR nFields
VAR nLastrec
DATA aStruct
DATA aKeys
DATA TableName
DATA Schema
DATA rows INIT 0
VAR aStruct
VAR aKeys
VAR TableName
VAR Schema
VAR rows INIT 0
METHOD New( pDB, cQuery, lallCols, cSchema, res )
METHOD Destroy()
@@ -534,11 +534,11 @@ METHOD New( pDB, cQuery, lallCols, cSchema, res ) CLASS TPQquery
::lallCols := lallCols
::Schema := cSchema
if ! ISNIL(res)
if res != NIL
::pQuery := res
endif
::Refresh(ISNIL(res))
::Refresh( res == NIL )
RETURN self
@@ -553,7 +553,7 @@ RETURN .T.
METHOD Refresh(lQuery,lMeta) CLASS TPQquery
Local res
Local aStruct := {}
Local aTemp
Local aTemp
Local i
Local cType, nDec, nSize
@@ -590,11 +590,11 @@ METHOD Refresh(lQuery,lMeta) CLASS TPQquery
nSize := aTemp[ i, 3 ]
nDec := aTemp[ i, 4 ]
if 'char' $ cType
cType := 'C'
if "char" $ cType
cType := "C"
elseif 'numeric' $ cType .or. 'decimal' $ cType
cType := 'N'
elseif "numeric" $ cType .or. "decimal" $ cType
cType := "N"
// Postgres don't store ".", but .dbf does, it can cause data width problem
if nDec > 0
@@ -609,55 +609,55 @@ METHOD Refresh(lQuery,lMeta) CLASS TPQquery
nSize := 15
endif
elseif 'date' $ cType
cType := 'D'
elseif "date" $ cType
cType := "D"
nSize := 8
elseif 'text' $ cType
cType := 'M'
elseif "text" $ cType
cType := "M"
elseif 'boolean' $ cType
cType := 'L'
elseif "boolean" $ cType
cType := "L"
nSize := 1
elseif 'smallint' $ cType
cType := 'N'
elseif "smallint" $ cType
cType := "N"
nSize := 5
elseif 'integer' $ cType .or. 'serial' $ cType
cType := 'N'
elseif "integer" $ cType .or. "serial" $ cType
cType := "N"
nSize := 9
elseif 'bigint' $ cType .or. 'bigserial' $ cType
cType := 'N'
elseif "bigint" $ cType .or. "bigserial" $ cType
cType := "N"
nSize := 19
elseif 'real' $ cType .or. 'float4' $ cType
cType := 'N'
elseif "real" $ cType .or. "float4" $ cType
cType := "N"
nSize := 15
nDec := 4
elseif 'double precision' $ cType .or. 'float8' $ cType
cType := 'N'
elseif "double precision" $ cType .or. "float8" $ cType
cType := "N"
nSize := 19
nDec := 9
elseif 'money' $ cType
cType := 'N'
elseif "money" $ cType
cType := "N"
nSize := 10
nDec := 2
elseif 'timestamp' $ cType
cType := 'C'
elseif "timestamp" $ cType
cType := "C"
nSize := 20
elseif 'time' $ cType
cType := 'C'
elseif "time" $ cType
cType := "C"
nSize := 10
else
// Unsuported
cType := 'K'
cType := "K"
endif
aadd( aStruct, {aTemp[ i, 1 ], cType, nSize, nDec, aTemp[i, 5], aTemp[i, 6]} )
@@ -672,7 +672,7 @@ METHOD Refresh(lQuery,lMeta) CLASS TPQquery
::nLastrec := PQlastrec(res)
::lError := .F.
::cError := ''
::cError := ""
if ::nLastrec != 0
::nRecno := 1
@@ -682,7 +682,7 @@ METHOD Refresh(lQuery,lMeta) CLASS TPQquery
elseif ::nResultStatus == PGRES_COMMAND_OK
::lError := .F.
::cError := ''
::cError := ""
::rows := val(PQcmdTuples(res))
else
@@ -728,13 +728,13 @@ METHOD Skip( nrecno ) CLASS TPQquery
if ::nRecno + nRecno > ::nLastRec
::nRecno := ::nLastRec + 1
::lEof := .T.
end
endif
if ::nRecno + nRecno < 1
::nRecno := 1
::lBof := .T.
end
end
endif
endif
RETURN .T.
@@ -742,7 +742,7 @@ METHOD Goto( nRecno ) CLASS TPQquery
if nRecno > 0 .and. nRecno <= ::nLastrec
::nRecno := nRecno
::lEof := .F.
end
endif
RETURN .T.
@@ -778,7 +778,7 @@ METHOD FieldType( nField ) CLASS TPQquery
if nField > 0
result := ::aStruct[nField, 2]
end
endif
RETURN result
@@ -793,7 +793,7 @@ METHOD FieldLen( nField ) CLASS TPQquery
if nField > 0
result := ::aStruct[nField, 3]
end
endif
RETURN result
@@ -808,7 +808,7 @@ METHOD FieldDec( nField ) CLASS TPQquery
if nField > 0
result := ::aStruct[nField, 4]
end
endif
RETURN result
@@ -818,7 +818,7 @@ METHOD Delete(oRow) CLASS TPQquery
Local nField
Local xField
Local cQuery
Local cWhere := ''
Local cWhere := ""
Local aParams := {}
::SetKey()
@@ -828,17 +828,17 @@ METHOD Delete(oRow) CLASS TPQquery
nField := oRow:Fieldpos(::aKeys[i])
xField := oRow:FieldGetOld(nField)
cWhere += ::aKeys[i] + ' = $' + hb_NToS(i)
cWhere += ::aKeys[i] + " = $" + hb_NToS(i)
AADD( aParams, ValueToString(xField) )
if i != len(::aKeys)
cWhere += ' and '
cWhere += " and "
endif
Next
if ! (cWhere == '')
cQuery := 'DELETE FROM ' + ::Schema + '.' + ::Tablename + ' WHERE ' + cWhere
if ! (cWhere == "")
cQuery := "DELETE FROM " + ::Schema + "." + ::Tablename + " WHERE " + cWhere
res := PQexecParams( ::pDB, cQuery, aParams)
if PQresultstatus(res) != PGRES_COMMAND_OK
@@ -847,14 +847,14 @@ METHOD Delete(oRow) CLASS TPQquery
::rows := 0
else
::lError := .F.
::cError := ''
::cError := ""
::rows := val(PQcmdTuples(res))
endif
PQclear(res)
end
endif
else
::lError := .T.
::cError := 'There is no primary keys or query is a joined table'
::cError := "There is no primary keys or query is a joined table"
endif
RETURN ! ::lError
@@ -870,25 +870,25 @@ METHOD Append( oRow ) CLASS TPQquery
::SetKey()
if ! Empty(::Tablename)
cQuery := 'INSERT INTO ' + ::Schema + '.' + ::Tablename + '('
cQuery := "INSERT INTO " + ::Schema + "." + ::Tablename + "("
For i := 1 to oRow:FCount()
if ::lallCols .or. oRow:changed(i)
lChanged := .t.
cQuery += oRow:Fieldname(i) + ','
cQuery += oRow:Fieldname(i) + ","
endif
Next
cQuery := Left( cQuery, len(cQuery) - 1 ) + ') VALUES ('
cQuery := Left( cQuery, len(cQuery) - 1 ) + ") VALUES ("
For i := 1 to oRow:FCount()
if ::lallCols .or. oRow:Changed(i)
nParams++
cQuery += '$' + hb_NToS(nParams) + ','
cQuery += "$" + hb_NToS(nParams) + ","
aadd( aParams, ValueToString(oRow:FieldGet(i)) )
endif
Next
cQuery := Left( cQuery, len(cQuery) - 1 ) + ')'
cQuery := Left( cQuery, len(cQuery) - 1 ) + ")"
if lChanged
res := PQexecParams( ::pDB, cQuery, aParams)
@@ -899,7 +899,7 @@ METHOD Append( oRow ) CLASS TPQquery
::rows := 0
else
::lError := .F.
::cError := ''
::cError := ""
::rows := val(PQcmdTuples(res))
endif
@@ -907,7 +907,7 @@ METHOD Append( oRow ) CLASS TPQquery
endif
else
::lError := .T.
::cError := 'Cannot insert in a joined table, or unknown error'
::cError := "Cannot insert in a joined table, or unknown error"
endif
RETURN ! ::lError
@@ -926,32 +926,32 @@ METHOD Update(oRow) CLASS TPQquery
::SetKey()
if ! Empty(::Tablename) .and. ! Empty(::aKeys)
cWhere := ''
cWhere := ""
For i := 1 to len(::aKeys)
nField := oRow:Fieldpos(::aKeys[i])
xField := oRow:FieldGetOld(nField)
cWhere += ::aKeys[i] + '=' + DataToSql(xField)
cWhere += ::aKeys[i] + "=" + DataToSql(xField)
if i != len(::aKeys)
cWhere += ' and '
end
cWhere += " and "
endif
Next
cQuery := 'UPDATE ' + ::Schema + '.' + ::Tablename + ' SET '
cQuery := "UPDATE " + ::Schema + "." + ::Tablename + " SET "
For i := 1 to oRow:FCount()
if ::lallcols .or. oRow:Changed(i)
lChanged := .t.
nParams++
cQuery += oRow:Fieldname(i) + ' = $' + hb_NToS(nParams) + ','
cQuery += oRow:Fieldname(i) + " = $" + hb_NToS(nParams) + ","
aadd( aParams, ValueToString(oRow:FieldGet(i)) )
end
endif
Next
if ! (cWhere == '') .and. lChanged
if ! (cWhere == "") .and. lChanged
cQuery := Left( cQuery, len(cQuery) - 1 ) + ' WHERE ' + cWhere
cQuery := Left( cQuery, len(cQuery) - 1 ) + " WHERE " + cWhere
res := PQexecParams( ::pDB, cQuery, aParams)
@@ -961,15 +961,15 @@ METHOD Update(oRow) CLASS TPQquery
::rows := 0
else
::lError := .F.
::cError := ''
::cError := ""
::rows := val(PQcmdTuples(res))
endif
PQclear(res)
end
endif
else
::lError := .T.
::cError := 'Cannot insert in a joined table, or unknown error'
::cError := "Cannot insert in a joined table, or unknown error"
endif
RETURN ! ::lError
@@ -986,7 +986,7 @@ METHOD FieldGet( nField, nRow ) CLASS TPQquery
if nField > 0 .and. ::nResultStatus == PGRES_TUPLES_OK
if ISNIL(nRow)
if nRow == NIL
nRow := ::nRecno
endif
@@ -995,42 +995,42 @@ METHOD FieldGet( nField, nRow ) CLASS TPQquery
//nSize := ::aStruct[ nField, 3 ]
if cType == "C"
if ISNIL(result)
if result == NIL
result := ""
else
result := result
end
endif
elseif cType == "N"
if ! ISNIL(result)
if result != NIL
result := val(result)
else
result := 0
end
endif
elseif cType == "D"
if ! ISNIL(result)
result := StoD( strtran( result, "-", "" ) )
if result != NIL
result := hb_SToD( strtran( result, "-", "" ) )
else
result := CtoD('')
end
result := hb_SToD("")
endif
elseif cType == "L"
if ! ISNIL(result)
result := (result == 't')
if result != NIL
result := (result == "t")
else
result := .F.
end
endif
elseif cType == "M"
if ISNIL(result)
if result == NIL
result := ""
else
result := result
end
endif
end
end
endif
endif
RETURN result
@@ -1055,8 +1055,8 @@ METHOD Getrow( nRow ) CLASS TPQquery
elseif nRow > ::nLastrec
result := ::GetBlankRow()
end
end
endif
endif
RETURN result
@@ -1067,22 +1067,22 @@ METHOD GetBlankRow() CLASS TPQquery
ASize(aOld, ::nFields)
For i := 1 to ::nFields
if ::aStruct[i, 2] == 'C'
aRow[i] := ''
aOld[i] := ''
elseif ::aStruct[i, 2] == 'N'
if ::aStruct[i, 2] == "C"
aRow[i] := ""
aOld[i] := ""
elseif ::aStruct[i, 2] == "N"
aRow[i] := 0
aOld[i] := 0
elseif ::aStruct[i, 2] == 'L'
elseif ::aStruct[i, 2] == "L"
aRow[i] := .F.
aOld[i] := .F.
elseif ::aStruct[i, 2] == 'D'
aRow[i] := CtoD('')
aOld[i] := CtoD('')
elseif ::aStruct[i, 2] == 'M'
aRow[i] := ''
aOld[i] := ''
end
elseif ::aStruct[i, 2] == "D"
aRow[i] := hb_StoD("")
aOld[i] := hb_StoD("")
elseif ::aStruct[i, 2] == "M"
aRow[i] := ""
aOld[i] := ""
endif
Next
result := TPQRow():New( aRow, aOld, ::aStruct )
@@ -1098,7 +1098,7 @@ METHOD SetKey() CLASS TPQquery
Local nPos
if ::nResultStatus == PGRES_TUPLES_OK
if ISNIL(::Tablename)
if ::Tablename == NIL
/* set the table name looking for table oid */
for i := 1 to len(::aStruct)
/* Store table codes oid */
@@ -1112,15 +1112,15 @@ METHOD SetKey() CLASS TPQquery
if nCount == 1
/* first, try get the table name from select, else get from pg_catalog */
if (npos := at('FROM ', Upper(::cQuery))) != 0
if (npos := at("FROM ", Upper(::cQuery))) != 0
cQuery := lower(ltrim(substr( ::cQuery, nPos + 5 )))
if (npos := at('.', cQuery)) != 0
if (npos := at(".", cQuery)) != 0
::Schema := alltrim(left(cQuery,npos-1))
cQuery := substr(cQuery, nPos + 1)
endif
if (npos := at(' ', cQuery)) != 0
if (npos := at(" ", cQuery)) != 0
::Tablename := trim(Left(cQuery, npos))
else
::Tablename := cQuery
@@ -1128,7 +1128,7 @@ METHOD SetKey() CLASS TPQquery
endif
if empty(::Tablename)
cQuery := 'select relname from pg_class where oid = ' + str(xTableId)
cQuery := "select relname from pg_class where oid = " + str(xTableId)
res := PQexec(::pDB, cQuery)
@@ -1141,7 +1141,7 @@ METHOD SetKey() CLASS TPQquery
endif
endif
if ISNIL(::aKeys) .and. ! empty(::Tablename)
if ::aKeys == NIL .and. ! empty(::Tablename)
/* Set the table primary keys */
cQuery := "SELECT c.attname "
cQuery += " FROM pg_class a, pg_class b, pg_attribute c, pg_index d, pg_namespace e "
@@ -1169,10 +1169,10 @@ METHOD SetKey() CLASS TPQquery
RETURN nil
CLASS TPQRow
DATA aRow
DATA aOld
DATA aStruct
CREATE CLASS TPQRow
VAR aRow
VAR aOld
VAR aStruct
METHOD New( row, old, struct )
@@ -1205,7 +1205,7 @@ METHOD FieldGet( nField ) CLASS TPQrow
if nField >= 1 .and. nField <= len(::aRow)
result := ::aRow[nField]
end
endif
RETURN result
@@ -1219,7 +1219,7 @@ METHOD FieldPut( nField, Value ) CLASS TPQrow
if nField >= 1 .and. nField <= len(::aRow)
result := ::aRow[nField] := Value
end
endif
RETURN result
@@ -1232,7 +1232,7 @@ METHOD FieldName( nField ) CLASS TPQrow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 1]
end
endif
RETURN result
@@ -1254,7 +1254,7 @@ METHOD FieldType( nField ) CLASS TPQrow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 2]
end
endif
RETURN result
@@ -1268,7 +1268,7 @@ METHOD FieldLen( nField ) CLASS TPQrow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 3]
end
endif
RETURN result
@@ -1281,39 +1281,38 @@ METHOD FieldDec( nField ) CLASS TPQrow
if nField >= 1 .and. nField <= len(::aStruct)
result := ::aStruct[nField, 4]
end
endif
RETURN result
Static Function DataToSql(xField)
Local cType, result := 'NULL'
Local cType, result := "NULL"
cType := ValType(xField)
cType := ValType(xField)
if cType == "C" .or. cType == "M"
result := "'"+ strtran(xField, "'", ' ') + "'"
elseif cType == "D"
result := dtos( xField)
elseif cType == "N"
result := str(xField)
elseif cType == "L"
result := iif( xField, "'t'", "'f'" )
end
if cType == "C" .or. cType == "M"
result := "'"+ strtran(xField, "'", " ") + "'"
elseif cType == "D"
result := dtos( xField)
elseif cType == "N"
result := str(xField)
elseif cType == "L"
result := iif( xField, "'t'", "'f'" )
endif
return result
Static Function ValueToString(xField)
Local cType, result := nil
Local cType, result := nil
cType := ValType(xField)
cType := ValType(xField)
if cType == "D"
result := dtos( xField )
elseif cType == "N"
result := str(xField)
elseif cType == "L"
result := iif( xField, "t", "f" )
elseif cType == "C" .or. cType == "M"
result := xField
end
if cType == "D"
result := dtos( xField )
elseif cType == "N"
result := str(xField)
elseif cType == "L"
result := iif( xField, "t", "f" )
elseif cType == "C" .or. cType == "M"
result := xField
endif
return result

10
harbour/contrib/hbqt/hbqt_qabstractbutton.cpp
View File

@@ -129,7 +129,7 @@ void setAutoExclusive ( bool )
*/
HB_FUNC( QT_QABSTRACTBUTTON_SETAUTOEXCLUSIVE )
{
hbqt_par_QAbstractButton( 1 )->setAutoExclusive( hb_parl( 2 ) );
hbqt_par_QAbstractButton( 1 )->setAutoExclusive( hb_parl( 2 ) );
}
/*
@@ -137,7 +137,7 @@ void setAutoRepeat ( bool )
*/
HB_FUNC( QT_QABSTRACTBUTTON_SETAUTOREPEAT )
{
hbqt_par_QAbstractButton( 1 )->setAutoRepeat( hb_parl( 2 ) );
hbqt_par_QAbstractButton( 1 )->setAutoRepeat( hb_parl( 2 ) );
}
/*
@@ -169,7 +169,7 @@ void setDown ( bool )
*/
HB_FUNC( QT_QABSTRACTBUTTON_SETDOWN )
{
hbqt_par_QAbstractButton( 1 )->setDown( hb_parl( 2 ) );
hbqt_par_QAbstractButton( 1 )->setDown( hb_parl( 2 ) );
}
/*
@@ -177,7 +177,7 @@ void setIcon ( const QIcon & icon )
*/
HB_FUNC( QT_QABSTRACTBUTTON_SETICON )
{
hbqt_par_QAbstractButton( 1 )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
hbqt_par_QAbstractButton( 1 )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
}
/*
@@ -185,7 +185,7 @@ void setText ( const QString & text )
*/
HB_FUNC( QT_QABSTRACTBUTTON_SETTEXT )
{
hbqt_par_QAbstractButton( 1 )->setText( hbqt_par_QString( 2 ) );
hbqt_par_QAbstractButton( 1 )->setText( hbqt_par_QString( 2 ) );
}
/*

80
harbour/contrib/hbqt/hbqt_qabstractitemview.cpp
View File

@@ -65,7 +65,7 @@ bool alternatingRowColors () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_ALTERNATINGROWCOLORS )
{
hb_retl( hbqt_par_QAbstractItemView( 1 )->alternatingRowColors() );
hb_retl( hbqt_par_QAbstractItemView( 1 )->alternatingRowColors() );
}
/*
@@ -73,7 +73,7 @@ int autoScrollMargin () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_AUTOSCROLLMARGIN )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->autoScrollMargin() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->autoScrollMargin() );
}
/*
@@ -81,7 +81,7 @@ DragDropMode dragDropMode () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_DRAGDROPMODE )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->dragDropMode() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->dragDropMode() );
}
/*
@@ -89,7 +89,7 @@ bool dragDropOverwriteMode () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_DRAGDROPOVERWRITEMODE )
{
hb_retl( hbqt_par_QAbstractItemView( 1 )->dragDropOverwriteMode() );
hb_retl( hbqt_par_QAbstractItemView( 1 )->dragDropOverwriteMode() );
}
/*
@@ -97,7 +97,7 @@ bool dragEnabled () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_DRAGENABLED )
{
hb_retl( hbqt_par_QAbstractItemView( 1 )->dragEnabled() );
hb_retl( hbqt_par_QAbstractItemView( 1 )->dragEnabled() );
}
/*
@@ -105,7 +105,7 @@ EditTriggers editTriggers () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_EDITTRIGGERS )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->editTriggers() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->editTriggers() );
}
/*
@@ -113,7 +113,7 @@ bool hasAutoScroll () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_HASAUTOSCROLL )
{
hb_retl( hbqt_par_QAbstractItemView( 1 )->hasAutoScroll() );
hb_retl( hbqt_par_QAbstractItemView( 1 )->hasAutoScroll() );
}
/*
@@ -121,7 +121,7 @@ ScrollMode horizontalScrollMode () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_HORIZONTALSCROLLMODE )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->horizontalScrollMode() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->horizontalScrollMode() );
}
/*
@@ -129,7 +129,7 @@ QAbstractItemDelegate * itemDelegate () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_ITEMDELEGATE )
{
hbqt_ret_QAbstractItemDelegate( hbqt_par_QAbstractItemView( 1 )->itemDelegate() );
hbqt_ret_QAbstractItemDelegate( hbqt_par_QAbstractItemView( 1 )->itemDelegate() );
}
/*
@@ -137,7 +137,7 @@ QAbstractItemDelegate * itemDelegateForColumn ( int column ) const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_ITEMDELEGATEFORCOLUMN )
{
hbqt_ret_QAbstractItemDelegate( hbqt_par_QAbstractItemView( 1 )->itemDelegateForColumn( hb_parni( 2 ) ) );
hbqt_ret_QAbstractItemDelegate( hbqt_par_QAbstractItemView( 1 )->itemDelegateForColumn( hb_parni( 2 ) ) );
}
/*
@@ -145,7 +145,7 @@ QAbstractItemDelegate * itemDelegateForRow ( int row ) const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_ITEMDELEGATEFORROW )
{
hbqt_ret_QAbstractItemDelegate( hbqt_par_QAbstractItemView( 1 )->itemDelegateForRow( hb_parni( 2 ) ) );
hbqt_ret_QAbstractItemDelegate( hbqt_par_QAbstractItemView( 1 )->itemDelegateForRow( hb_parni( 2 ) ) );
}
/*
@@ -153,7 +153,7 @@ QAbstractItemModel * model () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_MODEL )
{
hbqt_ret_QAbstractItemModel( hbqt_par_QAbstractItemView( 1 )->model() );
hbqt_ret_QAbstractItemModel( hbqt_par_QAbstractItemView( 1 )->model() );
}
/*
@@ -161,7 +161,7 @@ QAbstractItemView::SelectionBehavior selectionBehavior () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SELECTIONBEHAVIOR )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->selectionBehavior() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->selectionBehavior() );
}
/*
@@ -169,7 +169,7 @@ QAbstractItemView::SelectionMode selectionMode () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SELECTIONMODE )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->selectionMode() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->selectionMode() );
}
/*
@@ -177,7 +177,7 @@ QItemSelectionModel * selectionModel () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SELECTIONMODEL )
{
hb_retptr( ( QItemSelectionModel* ) hbqt_par_QAbstractItemView( 1 )->selectionModel() );
hb_retptr( ( QItemSelectionModel* ) hbqt_par_QAbstractItemView( 1 )->selectionModel() );
}
/*
@@ -185,7 +185,7 @@ void setAlternatingRowColors ( bool enable )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETALTERNATINGROWCOLORS )
{
hbqt_par_QAbstractItemView( 1 )->setAlternatingRowColors( hb_parl( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setAlternatingRowColors( hb_parl( 2 ) );
}
/*
@@ -193,7 +193,7 @@ void setAutoScroll ( bool enable )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETAUTOSCROLL )
{
hbqt_par_QAbstractItemView( 1 )->setAutoScroll( hb_parl( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setAutoScroll( hb_parl( 2 ) );
}
/*
@@ -201,7 +201,7 @@ void setAutoScrollMargin ( int margin )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETAUTOSCROLLMARGIN )
{
hbqt_par_QAbstractItemView( 1 )->setAutoScrollMargin( hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setAutoScrollMargin( hb_parni( 2 ) );
}
/*
@@ -209,7 +209,7 @@ void setDragDropMode ( DragDropMode behavior )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETDRAGDROPMODE )
{
hbqt_par_QAbstractItemView( 1 )->setDragDropMode( ( QAbstractItemView::DragDropMode ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setDragDropMode( ( QAbstractItemView::DragDropMode ) hb_parni( 2 ) );
}
/*
@@ -217,7 +217,7 @@ void setDragDropOverwriteMode ( bool overwrite )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETDRAGDROPOVERWRITEMODE )
{
hbqt_par_QAbstractItemView( 1 )->setDragDropOverwriteMode( hb_parl( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setDragDropOverwriteMode( hb_parl( 2 ) );
}
/*
@@ -225,7 +225,7 @@ void setDragEnabled ( bool enable )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETDRAGENABLED )
{
hbqt_par_QAbstractItemView( 1 )->setDragEnabled( hb_parl( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setDragEnabled( hb_parl( 2 ) );
}
/*
@@ -233,7 +233,7 @@ void setDropIndicatorShown ( bool enable )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETDROPINDICATORSHOWN )
{
hbqt_par_QAbstractItemView( 1 )->setDropIndicatorShown( hb_parl( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setDropIndicatorShown( hb_parl( 2 ) );
}
/*
@@ -241,7 +241,7 @@ void setEditTriggers ( EditTriggers triggers )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETEDITTRIGGERS )
{
hbqt_par_QAbstractItemView( 1 )->setEditTriggers( ( QAbstractItemView::EditTrigger ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setEditTriggers( ( QAbstractItemView::EditTrigger ) hb_parni( 2 ) );
}
/*
@@ -249,7 +249,7 @@ void setHorizontalScrollMode ( ScrollMode mode )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETHORIZONTALSCROLLMODE )
{
hbqt_par_QAbstractItemView( 1 )->setHorizontalScrollMode( ( QAbstractItemView::ScrollMode ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setHorizontalScrollMode( ( QAbstractItemView::ScrollMode ) hb_parni( 2 ) );
}
/*
@@ -257,7 +257,7 @@ void setItemDelegate ( QAbstractItemDelegate * delegate )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETITEMDELEGATE )
{
hbqt_par_QAbstractItemView( 1 )->setItemDelegate( hbqt_par_QAbstractItemDelegate( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setItemDelegate( hbqt_par_QAbstractItemDelegate( 2 ) );
}
/*
@@ -265,7 +265,7 @@ void setItemDelegateForColumn ( int column, QAbstractItemDelegate * delegate )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETITEMDELEGATEFORCOLUMN )
{
hbqt_par_QAbstractItemView( 1 )->setItemDelegateForColumn( hb_parni( 2 ), hbqt_par_QAbstractItemDelegate( 3 ) );
hbqt_par_QAbstractItemView( 1 )->setItemDelegateForColumn( hb_parni( 2 ), hbqt_par_QAbstractItemDelegate( 3 ) );
}
/*
@@ -273,7 +273,7 @@ void setItemDelegateForRow ( int row, QAbstractItemDelegate * delegate )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETITEMDELEGATEFORROW )
{
hbqt_par_QAbstractItemView( 1 )->setItemDelegateForRow( hb_parni(2), hbqt_par_QAbstractItemDelegate( 3 ) );
hbqt_par_QAbstractItemView( 1 )->setItemDelegateForRow( hb_parni(2), hbqt_par_QAbstractItemDelegate( 3 ) );
}
/*
@@ -281,7 +281,7 @@ void setSelectionBehavior ( QAbstractItemView::SelectionBehavior behavior )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETSELECTIONBEHAVIOR )
{
hbqt_par_QAbstractItemView( 1 )->setSelectionBehavior( ( QAbstractItemView::SelectionBehavior ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setSelectionBehavior( ( QAbstractItemView::SelectionBehavior ) hb_parni( 2 ) );
}
/*
@@ -289,7 +289,7 @@ void setSelectionMode ( QAbstractItemView::SelectionMode mode )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETSELECTIONMODE )
{
hbqt_par_QAbstractItemView( 1 )->setSelectionMode( ( QAbstractItemView::SelectionMode ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setSelectionMode( ( QAbstractItemView::SelectionMode ) hb_parni( 2 ) );
}
/*
@@ -297,7 +297,7 @@ void setTabKeyNavigation ( bool enable )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETTABKEYNAVIGATION )
{
hbqt_par_QAbstractItemView( 1 )->setTabKeyNavigation( hb_parl( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setTabKeyNavigation( hb_parl( 2 ) );
}
/*
@@ -305,7 +305,7 @@ void setTextElideMode ( Qt::TextElideMode mode )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETTEXTELIDEMODE )
{
hbqt_par_QAbstractItemView( 1 )->setTextElideMode( ( Qt::TextElideMode ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setTextElideMode( ( Qt::TextElideMode ) hb_parni( 2 ) );
}
/*
@@ -313,7 +313,7 @@ void setVerticalScrollMode ( ScrollMode mode )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SETVERTICALSCROLLMODE )
{
hbqt_par_QAbstractItemView( 1 )->setVerticalScrollMode( ( QAbstractItemView::ScrollMode ) hb_parni( 2 ) );
hbqt_par_QAbstractItemView( 1 )->setVerticalScrollMode( ( QAbstractItemView::ScrollMode ) hb_parni( 2 ) );
}
/*
@@ -321,7 +321,7 @@ bool showDropIndicator () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SHOWDROPINDICATOR )
{
hb_retl( hbqt_par_QAbstractItemView( 1 )->showDropIndicator() );
hb_retl( hbqt_par_QAbstractItemView( 1 )->showDropIndicator() );
}
/*
@@ -329,7 +329,7 @@ bool tabKeyNavigation () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_TABKEYNAVIGATION )
{
hb_retl( hbqt_par_QAbstractItemView( 1 )->tabKeyNavigation() );
hb_retl( hbqt_par_QAbstractItemView( 1 )->tabKeyNavigation() );
}
/*
@@ -337,7 +337,7 @@ Qt::TextElideMode textElideMode () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_TEXTELIDEMODE )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->textElideMode() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->textElideMode() );
}
/*
@@ -345,7 +345,7 @@ ScrollMode verticalScrollMode () const
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_VERTICALSCROLLMODE )
{
hb_retni( hbqt_par_QAbstractItemView( 1 )->verticalScrollMode() );
hb_retni( hbqt_par_QAbstractItemView( 1 )->verticalScrollMode() );
}
/*
@@ -353,7 +353,7 @@ void clearSelection ()
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_CLEARSELECTION )
{
hbqt_par_QAbstractItemView( 1 )->clearSelection();
hbqt_par_QAbstractItemView( 1 )->clearSelection();
}
/*
@@ -361,7 +361,7 @@ void scrollToBottom ()
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SCROLLTOBOTTOM )
{
hbqt_par_QAbstractItemView( 1 )->scrollToBottom();
hbqt_par_QAbstractItemView( 1 )->scrollToBottom();
}
/*
@@ -369,10 +369,8 @@ void scrollToTop ()
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SCROLLTOTOP )
{
hbqt_par_QAbstractItemView( 1 )->scrollToTop();
hbqt_par_QAbstractItemView( 1 )->scrollToTop();
}
/*----------------------------------------------------------------------*/
#endif

18
harbour/contrib/hbqt/hbqt_qabstractprintdialog.cpp
View File

@@ -65,7 +65,7 @@ int fromPage () const
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_FROMPAGE )
{
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->fromPage() );
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->fromPage() );
}
/*
@@ -73,7 +73,7 @@ int maxPage () const
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_MAXPAGE )
{
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->maxPage() );
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->maxPage() );
}
/*
@@ -81,7 +81,7 @@ int minPage () const
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_MINPAGE )
{
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->minPage() );
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->minPage() );
}
/*
@@ -89,7 +89,7 @@ PrintRange printRange () const
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_PRINTRANGE )
{
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->printRange() );
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->printRange() );
}
/*
@@ -97,7 +97,7 @@ QPrinter * printer () const
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_PRINTER )
{
hbqt_ret_QPrinter( hbqt_par_QAbstractPrintDialog( 1 )->printer() );
hbqt_ret_QPrinter( hbqt_par_QAbstractPrintDialog( 1 )->printer() );
}
/*
@@ -105,7 +105,7 @@ void setFromTo ( int from, int to )
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_SETFROMTO )
{
hbqt_par_QAbstractPrintDialog( 1 )->setFromTo( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QAbstractPrintDialog( 1 )->setFromTo( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -113,7 +113,7 @@ void setMinMax ( int min, int max )
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_SETMINMAX )
{
hbqt_par_QAbstractPrintDialog( 1 )->setMinMax( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QAbstractPrintDialog( 1 )->setMinMax( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -121,7 +121,7 @@ void setPrintRange ( PrintRange range )
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_SETPRINTRANGE )
{
hbqt_par_QAbstractPrintDialog( 1 )->setPrintRange( ( QAbstractPrintDialog::PrintRange ) hb_parni( 2 ) );
hbqt_par_QAbstractPrintDialog( 1 )->setPrintRange( ( QAbstractPrintDialog::PrintRange ) hb_parni( 2 ) );
}
/*
@@ -129,7 +129,7 @@ int toPage () const
*/
HB_FUNC( QT_QABSTRACTPRINTDIALOG_TOPAGE )
{
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->toPage() );
hb_retni( hbqt_par_QAbstractPrintDialog( 1 )->toPage() );
}
/*----------------------------------------------------------------------*/

30
harbour/contrib/hbqt/hbqt_qabstractscrollarea.cpp
View File

@@ -66,9 +66,9 @@ void addScrollBarWidget ( QWidget * widget, Qt::Alignment alignment )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_ADDSCROLLBARWIDGET )
{
QWidget * par2 = (QWidget *) hb_parptr(2);
int par3 = hb_parni(3);
hbqt_par_QAbstractScrollArea( 1 )->addScrollBarWidget ( par2, (Qt::Alignment) par3 );
QWidget * par2 = ( QWidget * ) hb_parptr( 2 );
int par3 = hb_parni( 3 );
hbqt_par_QAbstractScrollArea( 1 )->addScrollBarWidget ( par2, ( Qt::Alignment ) par3 );
}
/*
@@ -76,7 +76,7 @@ QWidget * cornerWidget () const
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_CORNERWIDGET )
{
hb_retptr( ( QWidget* ) hbqt_par_QAbstractScrollArea( 1 )->cornerWidget() );
hb_retptr( ( QWidget* ) hbqt_par_QAbstractScrollArea( 1 )->cornerWidget() );
}
/*
@@ -84,7 +84,7 @@ QScrollBar * horizontalScrollBar () const
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_HORIZONTALSCROLLBAR )
{
hb_retptr( ( QScrollBar* ) hbqt_par_QAbstractScrollArea( 1 )->horizontalScrollBar() );
hb_retptr( ( QScrollBar* ) hbqt_par_QAbstractScrollArea( 1 )->horizontalScrollBar() );
}
/*
@@ -92,7 +92,7 @@ Qt::ScrollBarPolicy horizontalScrollBarPolicy () const
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_HORIZONTALSCROLLBARPOLICY )
{
hb_retni( hbqt_par_QAbstractScrollArea( 1 )->horizontalScrollBarPolicy() );
hb_retni( hbqt_par_QAbstractScrollArea( 1 )->horizontalScrollBarPolicy() );
}
/*
@@ -100,7 +100,7 @@ void setCornerWidget ( QWidget * widget )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_SETCORNERWIDGET )
{
hbqt_par_QAbstractScrollArea( 1 )->setCornerWidget( hbqt_par_QWidget( 2 ) );
hbqt_par_QAbstractScrollArea( 1 )->setCornerWidget( hbqt_par_QWidget( 2 ) );
}
/*
@@ -108,7 +108,7 @@ void setHorizontalScrollBar ( QScrollBar * scrollBar )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_SETHORIZONTALSCROLLBAR )
{
hbqt_par_QAbstractScrollArea( 1 )->setHorizontalScrollBar( hbqt_par_QScrollBar( 2 ) );
hbqt_par_QAbstractScrollArea( 1 )->setHorizontalScrollBar( hbqt_par_QScrollBar( 2 ) );
}
/*
@@ -116,7 +116,7 @@ void setHorizontalScrollBarPolicy ( Qt::ScrollBarPolicy )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_SETHORIZONTALSCROLLBARPOLICY )
{
hbqt_par_QAbstractScrollArea( 1 )->setHorizontalScrollBarPolicy( ( Qt::ScrollBarPolicy ) hb_parni( 2 ) );
hbqt_par_QAbstractScrollArea( 1 )->setHorizontalScrollBarPolicy( ( Qt::ScrollBarPolicy ) hb_parni( 2 ) );
}
/*
@@ -124,7 +124,7 @@ void setVerticalScrollBar ( QScrollBar * scrollBar )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_SETVERTICALSCROLLBAR )
{
hbqt_par_QAbstractScrollArea( 1 )->setVerticalScrollBar( hbqt_par_QScrollBar( 2 ) );
hbqt_par_QAbstractScrollArea( 1 )->setVerticalScrollBar( hbqt_par_QScrollBar( 2 ) );
}
/*
@@ -132,7 +132,7 @@ void setVerticalScrollBarPolicy ( Qt::ScrollBarPolicy )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_SETVERTICALSCROLLBARPOLICY )
{
hbqt_par_QAbstractScrollArea( 1 )->setVerticalScrollBarPolicy( ( Qt::ScrollBarPolicy ) hb_parni( 2 ) );
hbqt_par_QAbstractScrollArea( 1 )->setVerticalScrollBarPolicy( ( Qt::ScrollBarPolicy ) hb_parni( 2 ) );
}
/*
@@ -140,7 +140,7 @@ void setViewport ( QWidget * widget )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_SETVIEWPORT )
{
hbqt_par_QAbstractScrollArea( 1 )->setViewport( hbqt_par_QWidget( 2 ) );
hbqt_par_QAbstractScrollArea( 1 )->setViewport( hbqt_par_QWidget( 2 ) );
}
/*
@@ -148,7 +148,7 @@ QScrollBar * verticalScrollBar () const
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_VERTICALSCROLLBAR )
{
hb_retptr( ( QScrollBar* ) hbqt_par_QAbstractScrollArea( 1 )->verticalScrollBar() );
hb_retptr( ( QScrollBar* ) hbqt_par_QAbstractScrollArea( 1 )->verticalScrollBar() );
}
/*
@@ -156,7 +156,7 @@ Qt::ScrollBarPolicy verticalScrollBarPolicy () const
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_VERTICALSCROLLBARPOLICY )
{
hb_retni( hbqt_par_QAbstractScrollArea( 1 )->verticalScrollBarPolicy() );
hb_retni( hbqt_par_QAbstractScrollArea( 1 )->verticalScrollBarPolicy() );
}
/*
@@ -164,7 +164,7 @@ QWidget * viewport () const
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_VIEWPORT )
{
hb_retptr( ( QWidget* ) hbqt_par_QAbstractScrollArea( 1 )->viewport() );
hb_retptr( ( QWidget* ) hbqt_par_QAbstractScrollArea( 1 )->viewport() );
}
/*----------------------------------------------------------------------*/

48
harbour/contrib/hbqt/hbqt_qabstractslider.cpp
View File

@@ -66,7 +66,7 @@ bool hasTracking () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_HASTRACKING )
{
hb_retl( hbqt_par_QAbstractSlider( 1 )->hasTracking() );
hb_retl( hbqt_par_QAbstractSlider( 1 )->hasTracking() );
}
/*
@@ -74,7 +74,7 @@ bool invertedAppearance () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_INVERTEDAPPEARANCE )
{
hb_retl( hbqt_par_QAbstractSlider( 1 )->invertedAppearance() );
hb_retl( hbqt_par_QAbstractSlider( 1 )->invertedAppearance() );
}
/*
@@ -82,7 +82,7 @@ bool invertedControls () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_INVERTEDCONTROLS )
{
hb_retl( hbqt_par_QAbstractSlider( 1 )->invertedControls() );
hb_retl( hbqt_par_QAbstractSlider( 1 )->invertedControls() );
}
/*
@@ -90,7 +90,7 @@ bool isSliderDown () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_ISSLIDERDOWN )
{
hb_retl( hbqt_par_QAbstractSlider( 1 )->isSliderDown() );
hb_retl( hbqt_par_QAbstractSlider( 1 )->isSliderDown() );
}
/*
@@ -98,7 +98,7 @@ int maximum () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_MAXIMUM )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->maximum() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->maximum() );
}
/*
@@ -106,7 +106,7 @@ int minimum () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_MINIMUM )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->minimum() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->minimum() );
}
/*
@@ -114,7 +114,7 @@ Qt::Orientation orientation () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_ORIENTATION )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->orientation() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->orientation() );
}
/*
@@ -122,7 +122,7 @@ int pageStep () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_PAGESTEP )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->pageStep() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->pageStep() );
}
/*
@@ -130,7 +130,7 @@ void setInvertedAppearance ( bool )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETINVERTEDAPPEARANCE )
{
hbqt_par_QAbstractSlider( 1 )->setInvertedAppearance( hb_parl( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setInvertedAppearance( hb_parl( 2 ) );
}
/*
@@ -138,7 +138,7 @@ void setInvertedControls ( bool )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETINVERTEDCONTROLS )
{
hbqt_par_QAbstractSlider( 1 )->setInvertedControls( hb_parl( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setInvertedControls( hb_parl( 2 ) );
}
/*
@@ -146,7 +146,7 @@ void setMaximum ( int )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETMAXIMUM )
{
hbqt_par_QAbstractSlider( 1 )->setMaximum( hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setMaximum( hb_parni( 2 ) );
}
/*
@@ -154,7 +154,7 @@ void setMinimum ( int )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETMINIMUM )
{
hbqt_par_QAbstractSlider( 1 )->setMinimum( hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setMinimum( hb_parni( 2 ) );
}
/*
@@ -162,7 +162,7 @@ void setPageStep ( int )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETPAGESTEP )
{
hbqt_par_QAbstractSlider( 1 )->setPageStep( hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setPageStep( hb_parni( 2 ) );
}
/*
@@ -170,7 +170,7 @@ void setRange ( int min, int max )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETRANGE )
{
hbqt_par_QAbstractSlider( 1 )->setRange( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QAbstractSlider( 1 )->setRange( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -178,7 +178,7 @@ void setSingleStep ( int )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETSINGLESTEP )
{
hbqt_par_QAbstractSlider( 1 )->setSingleStep( hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setSingleStep( hb_parni( 2 ) );
}
/*
@@ -186,7 +186,7 @@ void setSliderDown ( bool )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETSLIDERDOWN )
{
hbqt_par_QAbstractSlider( 1 )->setSliderDown( hb_parl( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setSliderDown( hb_parl( 2 ) );
}
/*
@@ -194,7 +194,7 @@ void setSliderPosition ( int )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETSLIDERPOSITION )
{
hbqt_par_QAbstractSlider( 1 )->setSliderPosition( hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setSliderPosition( hb_parni( 2 ) );
}
/*
@@ -202,7 +202,7 @@ void setTracking ( bool enable )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETTRACKING )
{
hbqt_par_QAbstractSlider( 1 )->setTracking( hb_parl( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setTracking( hb_parl( 2 ) );
}
/*
@@ -210,7 +210,7 @@ int singleStep () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_SINGLESTEP )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->singleStep() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->singleStep() );
}
/*
@@ -218,7 +218,7 @@ int sliderPosition () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_SLIDERPOSITION )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->sliderPosition() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->sliderPosition() );
}
/*
@@ -226,7 +226,7 @@ void triggerAction ( SliderAction action )
*/
HB_FUNC( QT_QABSTRACTSLIDER_TRIGGERACTION )
{
hbqt_par_QAbstractSlider( 1 )->triggerAction( ( QAbstractSlider::SliderAction ) hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->triggerAction( ( QAbstractSlider::SliderAction ) hb_parni( 2 ) );
}
/*
@@ -234,7 +234,7 @@ int value () const
*/
HB_FUNC( QT_QABSTRACTSLIDER_VALUE )
{
hb_retni( hbqt_par_QAbstractSlider( 1 )->value() );
hb_retni( hbqt_par_QAbstractSlider( 1 )->value() );
}
/*
@@ -242,7 +242,7 @@ void setOrientation ( Qt::Orientation )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETORIENTATION )
{
hbqt_par_QAbstractSlider( 1 )->setOrientation( ( Qt::Orientation ) hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setOrientation( ( Qt::Orientation ) hb_parni( 2 ) );
}
/*
@@ -250,7 +250,7 @@ void setValue ( int )
*/
HB_FUNC( QT_QABSTRACTSLIDER_SETVALUE )
{
hbqt_par_QAbstractSlider( 1 )->setValue( hb_parni( 2 ) );
hbqt_par_QAbstractSlider( 1 )->setValue( hb_parni( 2 ) );
}
/*----------------------------------------------------------------------*/

69
harbour/contrib/hbqt/hbqt_qabstractspinbox.cpp
View File

@@ -65,7 +65,7 @@ Qt::Alignment alignment () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_ALIGNMENT )
{
hb_retni( hbqt_par_QAbstractSpinBox( 1 )->alignment() );
hb_retni( hbqt_par_QAbstractSpinBox( 1 )->alignment() );
}
/*
@@ -73,7 +73,7 @@ ButtonSymbols buttonSymbols () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_BUTTONSYMBOLS )
{
hb_retni( hbqt_par_QAbstractSpinBox( 1 )->buttonSymbols() );
hb_retni( hbqt_par_QAbstractSpinBox( 1 )->buttonSymbols() );
}
/*
@@ -81,7 +81,7 @@ CorrectionMode correctionMode () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_CORRECTIONMODE )
{
hb_retni( hbqt_par_QAbstractSpinBox( 1 )->correctionMode() );
hb_retni( hbqt_par_QAbstractSpinBox( 1 )->correctionMode() );
}
/*
@@ -89,8 +89,8 @@ virtual void fixup ( QString & input ) const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_FIXUP )
{
QString par2 = hb_parc( 2 );
hbqt_par_QAbstractSpinBox( 1 )->fixup( par2 );
QString par2 = hb_parc( 2 );
hbqt_par_QAbstractSpinBox( 1 )->fixup( par2 );
}
/*
@@ -98,7 +98,7 @@ bool hasAcceptableInput () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_HASACCEPTABLEINPUT )
{
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->hasAcceptableInput() );
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->hasAcceptableInput() );
}
/*
@@ -106,7 +106,7 @@ bool hasFrame () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_HASFRAME )
{
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->hasFrame() );
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->hasFrame() );
}
/*
@@ -114,7 +114,7 @@ void interpretText ()
*/
HB_FUNC( QT_QABSTRACTSPINBOX_INTERPRETTEXT )
{
hbqt_par_QAbstractSpinBox( 1 )->interpretText();
hbqt_par_QAbstractSpinBox( 1 )->interpretText();
}
/*
@@ -122,7 +122,7 @@ bool isAccelerated () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_ISACCELERATED )
{
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->isAccelerated() );
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->isAccelerated() );
}
/*
@@ -130,7 +130,7 @@ bool isReadOnly () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_ISREADONLY )
{
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->isReadOnly() );
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->isReadOnly() );
}
/*
@@ -138,7 +138,7 @@ bool keyboardTracking () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_KEYBOARDTRACKING )
{
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->keyboardTracking() );
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->keyboardTracking() );
}
/*
@@ -146,7 +146,7 @@ void setAccelerated ( bool on )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETACCELERATED )
{
hbqt_par_QAbstractSpinBox( 1 )->setAccelerated( hb_parl( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setAccelerated( hb_parl( 2 ) );
}
/*
@@ -154,7 +154,7 @@ void setAlignment ( Qt::Alignment flag )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETALIGNMENT )
{
hbqt_par_QAbstractSpinBox( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
}
/*
@@ -162,7 +162,7 @@ void setButtonSymbols ( ButtonSymbols bs )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETBUTTONSYMBOLS )
{
hbqt_par_QAbstractSpinBox( 1 )->setButtonSymbols( ( QAbstractSpinBox::ButtonSymbols ) hb_parni( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setButtonSymbols( ( QAbstractSpinBox::ButtonSymbols ) hb_parni( 2 ) );
}
/*
@@ -170,7 +170,7 @@ void setCorrectionMode ( CorrectionMode cm )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETCORRECTIONMODE )
{
hbqt_par_QAbstractSpinBox( 1 )->setCorrectionMode( ( QAbstractSpinBox::CorrectionMode ) hb_parni( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setCorrectionMode( ( QAbstractSpinBox::CorrectionMode ) hb_parni( 2 ) );
}
/*
@@ -178,7 +178,7 @@ void setFrame ( bool )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETFRAME )
{
hbqt_par_QAbstractSpinBox( 1 )->setFrame( hb_parl( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setFrame( hb_parl( 2 ) );
}
/*
@@ -186,7 +186,7 @@ void setKeyboardTracking ( bool kt )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETKEYBOARDTRACKING )
{
hbqt_par_QAbstractSpinBox( 1 )->setKeyboardTracking( hb_parl( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setKeyboardTracking( hb_parl( 2 ) );
}
/*
@@ -194,7 +194,7 @@ void setReadOnly ( bool r )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETREADONLY )
{
hbqt_par_QAbstractSpinBox( 1 )->setReadOnly( hb_parl( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setReadOnly( hb_parl( 2 ) );
}
/*
@@ -202,8 +202,8 @@ void setSpecialValueText ( const QString & txt )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETSPECIALVALUETEXT )
{
QString par2 = hb_parc(2);
hbqt_par_QAbstractSpinBox( 1 )->setSpecialValueText( par2 );
QString par2 = hb_parc( 2 );
hbqt_par_QAbstractSpinBox( 1 )->setSpecialValueText( par2 );
}
/*
@@ -211,7 +211,7 @@ void setWrapping ( bool w )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SETWRAPPING )
{
hbqt_par_QAbstractSpinBox( 1 )->setWrapping( hb_parl( 2 ) );
hbqt_par_QAbstractSpinBox( 1 )->setWrapping( hb_parl( 2 ) );
}
/*
@@ -219,7 +219,7 @@ QString specialValueText () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SPECIALVALUETEXT )
{
hb_retc( hbqt_par_QAbstractSpinBox( 1 )->specialValueText().toLatin1().data() );
hb_retc( hbqt_par_QAbstractSpinBox( 1 )->specialValueText().toLatin1().data() );
}
/*
@@ -227,7 +227,7 @@ virtual void stepBy ( int steps )
*/
HB_FUNC( QT_QABSTRACTSPINBOX_STEPBY )
{
hbqt_par_QAbstractSpinBox( 1 )->stepBy( hb_parni(2) );
hbqt_par_QAbstractSpinBox( 1 )->stepBy( hb_parni(2) );
}
/*
@@ -235,7 +235,7 @@ QString text () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_TEXT )
{
hb_retc( hbqt_par_QAbstractSpinBox( 1 )->text().toLatin1().data() );
hb_retc( hbqt_par_QAbstractSpinBox( 1 )->text().toLatin1().data() );
}
/*
@@ -243,12 +243,11 @@ virtual QValidator::State validate ( QString & input, int & pos ) const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_VALIDATE )
{
//hb_retni( hbqt_par_QAbstractSpinBox( 1 )->validate( hbqt_par_QString( 2 ), hb_parni( 3 ) ) );
QAbstractSpinBox * par1 = (QAbstractSpinBox *) hb_parptr(1);
QString par2 = hb_parc(2);
int par3 = hb_parni(3);
int i = par1->validate( par2, par3 );
hb_retni( i );
QAbstractSpinBox * par1 = ( QAbstractSpinBox * ) hb_parptr( 1 );
QString par2 = hb_parc( 2 );
int par3 = hb_parni( 3 );
int i = par1->validate( par2, par3 );
hb_retni( i );
}
/*
@@ -256,7 +255,7 @@ bool wrapping () const
*/
HB_FUNC( QT_QABSTRACTSPINBOX_WRAPPING )
{
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->wrapping() );
hb_retl( hbqt_par_QAbstractSpinBox( 1 )->wrapping() );
}
/*
@@ -264,7 +263,7 @@ virtual void clear ()
*/
HB_FUNC( QT_QABSTRACTSPINBOX_CLEAR )
{
hbqt_par_QAbstractSpinBox( 1 )->clear();
hbqt_par_QAbstractSpinBox( 1 )->clear();
}
/*
@@ -272,7 +271,7 @@ void selectAll ()
*/
HB_FUNC( QT_QABSTRACTSPINBOX_SELECTALL )
{
hbqt_par_QAbstractSpinBox( 1 )->selectAll();
hbqt_par_QAbstractSpinBox( 1 )->selectAll();
}
/*
@@ -280,7 +279,7 @@ void stepDown ()
*/
HB_FUNC( QT_QABSTRACTSPINBOX_STEPDOWN )
{
hbqt_par_QAbstractSpinBox( 1 )->stepDown();
hbqt_par_QAbstractSpinBox( 1 )->stepDown();
}
/*
@@ -288,7 +287,7 @@ void stepUp ()
*/
HB_FUNC( QT_QABSTRACTSPINBOX_STEPUP )
{
hbqt_par_QAbstractSpinBox( 1 )->stepUp();
hbqt_par_QAbstractSpinBox( 1 )->stepUp();
}
/*----------------------------------------------------------------------*/

120
harbour/contrib/hbqt/hbqt_qaction.cpp
View File

@@ -67,18 +67,12 @@ QAction ( const QIcon & icon, const QString & text, QObject * parent ) [3]
*/
HB_FUNC( QT_QACTION )
{
if( hb_param( 1, HB_IT_POINTER ) )
{
hb_retptr( new QAction( hbqt_par_QObject( 1 ) ) );
}
else if( hb_param( 2, HB_IT_POINTER ) )
{
hb_retptr( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) );
}
else if( hb_param( 3, HB_IT_POINTER ) )
{
hb_retptr( new QAction( hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) );
}
if( hb_param( 1, HB_IT_POINTER ) )
hb_retptr( new QAction( hbqt_par_QObject( 1 ) ) );
else if( hb_param( 2, HB_IT_POINTER ) )
hb_retptr( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) );
else if( hb_param( 3, HB_IT_POINTER ) )
hb_retptr( new QAction( hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) );
}
#if 0
@@ -88,20 +82,20 @@ HB_FUNC( QT_QACTION_1 )
}
HB_FUNC( QT_QACTION_2 )
{
QAction * action = NULL;
QString text = hb_parc(1);
QObject * parent = (QObject *) hb_parptr(2);
action = new QAction ( text, parent );
hb_retptr( (QAction *) action );
QAction * action = NULL;
QString text = hb_parc( 1 );
QObject * parent = ( QObject * ) hb_parptr( 2 );
action = new QAction ( text, parent );
hb_retptr( ( QAction * ) action );
}
HB_FUNC( QT_QACTION_3 )
{
QAction * action = NULL;
QString icon = hb_parc(1);
QString text = hb_parc(2);
QObject * parent = (QObject *) hb_parptr(3);
action = new QAction ( QIcon( icon ), text, parent );
hb_retptr( (QAction *) action );
QAction * action = NULL;
QString icon = hb_parc( 1 );
QString text = hb_parc( 2 );
QObject * parent = ( QObject * ) hb_parptr( 3 );
action = new QAction ( QIcon( icon ), text, parent );
hb_retptr( ( QAction * ) action );
}
#endif
@@ -110,7 +104,7 @@ QActionGroup * actionGroup () const
*/
HB_FUNC( QT_QACTION_ACTIONGROUP )
{
hb_retptr( ( QActionGroup* ) hbqt_par_QAction( 1 )->actionGroup() );
hb_retptr( ( QActionGroup* ) hbqt_par_QAction( 1 )->actionGroup() );
}
/*
@@ -118,7 +112,7 @@ void activate ( ActionEvent event )
*/
HB_FUNC( QT_QACTION_ACTIVATE )
{
hbqt_par_QAction( 1 )->activate( ( QAction::ActionEvent ) hb_parni( 2 ) );
hbqt_par_QAction( 1 )->activate( ( QAction::ActionEvent ) hb_parni( 2 ) );
}
/*
@@ -126,7 +120,7 @@ bool autoRepeat () const
*/
HB_FUNC( QT_QACTION_AUTOREPEAT )
{
hb_retl( hbqt_par_QAction( 1 )->autoRepeat() );
hb_retl( hbqt_par_QAction( 1 )->autoRepeat() );
}
/*
@@ -134,7 +128,7 @@ QString iconText () const
*/
HB_FUNC( QT_QACTION_ICONTEXT )
{
hb_retc( hbqt_par_QAction( 1 )->iconText().toLatin1().data() );
hb_retc( hbqt_par_QAction( 1 )->iconText().toLatin1().data() );
}
/*
@@ -142,7 +136,7 @@ bool isCheckable () const
*/
HB_FUNC( QT_QACTION_ISCHECKABLE )
{
hb_retl( hbqt_par_QAction( 1 )->isCheckable() );
hb_retl( hbqt_par_QAction( 1 )->isCheckable() );
}
/*
@@ -150,7 +144,7 @@ bool isChecked () const
*/
HB_FUNC( QT_QACTION_ISCHECKED )
{
hb_retl( hbqt_par_QAction( 1 )->isChecked() );
hb_retl( hbqt_par_QAction( 1 )->isChecked() );
}
/*
@@ -158,7 +152,7 @@ bool isEnabled () const
*/
HB_FUNC( QT_QACTION_ISENABLED )
{
hb_retl( hbqt_par_QAction( 1 )->isEnabled() );
hb_retl( hbqt_par_QAction( 1 )->isEnabled() );
}
/*
@@ -166,7 +160,7 @@ bool isIconVisibleInMenu () const
*/
HB_FUNC( QT_QACTION_ISICONVISIBLEINMENU )
{
hb_retl( hbqt_par_QAction( 1 )->isIconVisibleInMenu() );
hb_retl( hbqt_par_QAction( 1 )->isIconVisibleInMenu() );
}
/*
@@ -174,7 +168,7 @@ bool isSeparator () const
*/
HB_FUNC( QT_QACTION_ISSEPARATOR )
{
hb_retl( hbqt_par_QAction( 1 )->isSeparator() );
hb_retl( hbqt_par_QAction( 1 )->isSeparator() );
}
/*
@@ -182,7 +176,7 @@ bool isVisible () const
*/
HB_FUNC( QT_QACTION_ISVISIBLE )
{
hb_retl( hbqt_par_QAction( 1 )->isVisible() );
hb_retl( hbqt_par_QAction( 1 )->isVisible() );
}
/*
@@ -190,7 +184,7 @@ QMenu * menu () const
*/
HB_FUNC( QT_QACTION_MENU )
{
hb_retptr( ( QMenu* ) hbqt_par_QAction( 1 )->menu() );
hb_retptr( ( QMenu* ) hbqt_par_QAction( 1 )->menu() );
}
/*
@@ -198,7 +192,7 @@ MenuRole menuRole () const
*/
HB_FUNC( QT_QACTION_MENUROLE )
{
hb_retni( hbqt_par_QAction( 1 )->menuRole() );
hb_retni( hbqt_par_QAction( 1 )->menuRole() );
}
/*
@@ -206,7 +200,7 @@ QWidget * parentWidget () const
*/
HB_FUNC( QT_QACTION_PARENTWIDGET )
{
hb_retptr( ( QWidget* ) hbqt_par_QAction( 1 )->parentWidget() );
hb_retptr( ( QWidget* ) hbqt_par_QAction( 1 )->parentWidget() );
}
/*
@@ -214,7 +208,7 @@ void setActionGroup ( QActionGroup * group )
*/
HB_FUNC( QT_QACTION_SETACTIONGROUP )
{
hbqt_par_QAction( 1 )->setActionGroup( hbqt_par_QActionGroup( 2 ) );
hbqt_par_QAction( 1 )->setActionGroup( hbqt_par_QActionGroup( 2 ) );
}
/*
@@ -222,7 +216,7 @@ void setAutoRepeat ( bool )
*/
HB_FUNC( QT_QACTION_SETAUTOREPEAT )
{
hbqt_par_QAction( 1 )->setAutoRepeat( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setAutoRepeat( hb_parl( 2 ) );
}
/*
@@ -230,7 +224,7 @@ void setCheckable ( bool )
*/
HB_FUNC( QT_QACTION_SETCHECKABLE )
{
hbqt_par_QAction( 1 )->setCheckable( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setCheckable( hb_parl( 2 ) );
}
/*
@@ -238,7 +232,7 @@ void setIconText ( const QString & text )
*/
HB_FUNC( QT_QACTION_SETICONTEXT )
{
hbqt_par_QAction( 1 )->setIconText( hbqt_par_QString( 2 ) );
hbqt_par_QAction( 1 )->setIconText( hbqt_par_QString( 2 ) );
}
/*
@@ -246,7 +240,7 @@ void setIconVisibleInMenu ( bool visible )
*/
HB_FUNC( QT_QACTION_SETICONVISIBLEINMENU )
{
hbqt_par_QAction( 1 )->setIconVisibleInMenu( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setIconVisibleInMenu( hb_parl( 2 ) );
}
/*
@@ -254,7 +248,7 @@ void setMenu ( QMenu * menu )
*/
HB_FUNC( QT_QACTION_SETMENU )
{
hbqt_par_QAction( 1 )->setMenu( hbqt_par_QMenu( 2 ) );
hbqt_par_QAction( 1 )->setMenu( hbqt_par_QMenu( 2 ) );
}
/*
@@ -262,7 +256,7 @@ void setMenuRole ( MenuRole menuRole )
*/
HB_FUNC( QT_QACTION_SETMENUROLE )
{
hbqt_par_QAction( 1 )->setMenuRole( ( QAction::MenuRole ) hb_parni( 2 ) );
hbqt_par_QAction( 1 )->setMenuRole( ( QAction::MenuRole ) hb_parni( 2 ) );
}
/*
@@ -270,7 +264,7 @@ void setSeparator ( bool b )
*/
HB_FUNC( QT_QACTION_SETSEPARATOR )
{
hbqt_par_QAction( 1 )->setSeparator( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setSeparator( hb_parl( 2 ) );
}
/*
@@ -278,7 +272,7 @@ void setShortcutContext ( Qt::ShortcutContext context )
*/
HB_FUNC( QT_QACTION_SETSHORTCUTCONTEXT )
{
hbqt_par_QAction( 1 )->setShortcutContext( ( Qt::ShortcutContext ) hb_parni( 2 ) );
hbqt_par_QAction( 1 )->setShortcutContext( ( Qt::ShortcutContext ) hb_parni( 2 ) );
}
/*
@@ -286,7 +280,7 @@ void setShortcuts ( QKeySequence::StandardKey key )
*/
HB_FUNC( QT_QACTION_SETSHORTCUTS )
{
hbqt_par_QAction( 1 )->setShortcuts( ( QKeySequence::StandardKey ) hb_parni( 2 ) );
hbqt_par_QAction( 1 )->setShortcuts( ( QKeySequence::StandardKey ) hb_parni( 2 ) );
}
/*
@@ -294,7 +288,7 @@ void setStatusTip ( const QString & statusTip )
*/
HB_FUNC( QT_QACTION_SETSTATUSTIP )
{
hbqt_par_QAction( 1 )->setStatusTip( hbqt_par_QString( 2 ) );
hbqt_par_QAction( 1 )->setStatusTip( hbqt_par_QString( 2 ) );
}
/*
@@ -302,7 +296,7 @@ void setText ( const QString & text )
*/
HB_FUNC( QT_QACTION_SETTEXT )
{
hbqt_par_QAction( 1 )->setText( hbqt_par_QString( 2 ) );
hbqt_par_QAction( 1 )->setText( hbqt_par_QString( 2 ) );
}
/*
@@ -310,7 +304,7 @@ void setToolTip ( const QString & tip )
*/
HB_FUNC( QT_QACTION_SETTOOLTIP )
{
hbqt_par_QAction( 1 )->setToolTip( hbqt_par_QString( 2 ) );
hbqt_par_QAction( 1 )->setToolTip( hbqt_par_QString( 2 ) );
}
/*
@@ -318,7 +312,7 @@ void setWhatsThis ( const QString & what )
*/
HB_FUNC( QT_QACTION_SETWHATSTHIS )
{
hbqt_par_QAction( 1 )->setWhatsThis( hbqt_par_QString( 2 ) );
hbqt_par_QAction( 1 )->setWhatsThis( hbqt_par_QString( 2 ) );
}
/*
@@ -326,7 +320,7 @@ Qt::ShortcutContext shortcutContext () const
*/
HB_FUNC( QT_QACTION_SHORTCUTCONTEXT )
{
hb_retni( hbqt_par_QAction( 1 )->shortcutContext() );
hb_retni( hbqt_par_QAction( 1 )->shortcutContext() );
}
/*
@@ -334,7 +328,7 @@ bool showStatusText ( QWidget * widget = 0 )
*/
HB_FUNC( QT_QACTION_SHOWSTATUSTEXT )
{
hb_retl( hbqt_par_QAction( 1 )->showStatusText( hbqt_par_QWidget( 2 ) ) );
hb_retl( hbqt_par_QAction( 1 )->showStatusText( hbqt_par_QWidget( 2 ) ) );
}
/*
@@ -342,7 +336,7 @@ QString statusTip () const
*/
HB_FUNC( QT_QACTION_STATUSTIP )
{
hb_retc( hbqt_par_QAction( 1 )->statusTip().toLatin1().data() );
hb_retc( hbqt_par_QAction( 1 )->statusTip().toLatin1().data() );
}
/*
@@ -350,7 +344,7 @@ QString text () const
*/
HB_FUNC( QT_QACTION_TEXT )
{
hb_retc( hbqt_par_QAction( 1 )->text().toLatin1().data() );
hb_retc( hbqt_par_QAction( 1 )->text().toLatin1().data() );
}
/*
@@ -358,7 +352,7 @@ QString toolTip () const
*/
HB_FUNC( QT_QACTION_TOOLTIP )
{
hb_retc( hbqt_par_QAction( 1 )->toolTip().toLatin1().data() );
hb_retc( hbqt_par_QAction( 1 )->toolTip().toLatin1().data() );
}
/*
@@ -366,7 +360,7 @@ QString whatsThis () const
*/
HB_FUNC( QT_QACTION_WHATSTHIS )
{
hb_retc( hbqt_par_QAction( 1 )->whatsThis().toLatin1().data() );
hb_retc( hbqt_par_QAction( 1 )->whatsThis().toLatin1().data() );
}
/*
@@ -374,7 +368,7 @@ void hover ()
*/
HB_FUNC( QT_QACTION_HOVER )
{
hbqt_par_QAction( 1 )->hover();
hbqt_par_QAction( 1 )->hover();
}
/*
@@ -382,7 +376,7 @@ void setChecked ( bool )
*/
HB_FUNC( QT_QACTION_SETCHECKED )
{
hbqt_par_QAction( 1 )->setChecked( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setChecked( hb_parl( 2 ) );
}
/*
@@ -390,7 +384,7 @@ void setDisabled ( bool b )
*/
HB_FUNC( QT_QACTION_SETDISABLED )
{
hbqt_par_QAction( 1 )->setDisabled( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setDisabled( hb_parl( 2 ) );
}
/*
@@ -398,7 +392,7 @@ void setEnabled ( bool )
*/
HB_FUNC( QT_QACTION_SETENABLED )
{
hbqt_par_QAction( 1 )->setEnabled( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setEnabled( hb_parl( 2 ) );
}
/*
@@ -406,7 +400,7 @@ void setVisible ( bool )
*/
HB_FUNC( QT_QACTION_SETVISIBLE )
{
hbqt_par_QAction( 1 )->setVisible( hb_parl( 2 ) );
hbqt_par_QAction( 1 )->setVisible( hb_parl( 2 ) );
}
/*
@@ -414,7 +408,7 @@ void toggle ()
*/
HB_FUNC( QT_QACTION_TOGGLE )
{
hbqt_par_QAction( 1 )->toggle();
hbqt_par_QAction( 1 )->toggle();
}
/*
@@ -422,7 +416,7 @@ void trigger ()
*/
HB_FUNC( QT_QACTION_TRIGGER )
{
hbqt_par_QAction( 1 )->trigger();
hbqt_par_QAction( 1 )->trigger();
}
/*----------------------------------------------------------------------*/

43
harbour/contrib/hbqt/hbqt_qapplication.cpp
View File

@@ -76,33 +76,36 @@ void release_codeblocks();
static QApplication * app = NULL;
static bool hbqtinit = false;
// HB_FUNC( QT_QAPPLICATION )
// {
// int i_argc = 0;
// char** c_argv = NULL;
// app = new QApplication(i_argc, c_argv);
// hb_retptr((QApplication*) app);
// }
#if 0
HB_FUNC( QT_QAPPLICATION )
{
//int i_argc;
//char ** c_argv;
//i_argc = hb_cmdargARGC();
//c_argv = hb_cmdargARGV();
//app = new QApplication(i_argc, c_argv);
hb_retptr( (QApplication *) app );
int i_argc = 0;
char** c_argv = NULL;
app = new QApplication( i_argc, c_argv );
hb_retptr( ( QApplication* ) app);
}
#endif
HB_FUNC( QT_QAPPLICATION )
{
#if 0
int i_argc;
char ** c_argv;
i_argc = hb_cmdargARGC();
c_argv = hb_cmdargARGV();
app = new QApplication( i_argc, c_argv );
#endif
hb_retptr( ( QApplication * ) app );
}
HB_FUNC( QT_QAPPLICATION_EXEC )
{
int i;
i = app->exec();
hb_retni( i );
hb_retni( app->exec() );
}
HB_FUNC( QT_QAPPLICATION_SETSTYLE )
{
app->setStyle( hb_parc(2) );
app->setStyle( hb_parc( 2 ) );
}
HB_FUNC( QT_QAPPLICATION_QUIT )
@@ -135,12 +138,10 @@ static void hbqt_Init( void * cargo )
argc = hb_cmdargARGC();
argv = hb_cmdargARGV();
app = new QApplication(argc, argv);
app = new QApplication( argc, argv );
if( app )
{
hbqtinit = true;
}
hbqtinit = true;
if( ! hbqtinit )
hb_errInternal( 11001, "hbqt_Init(): QT Initilization Error.", NULL, NULL );

38
harbour/contrib/hbqt/hbqt_qboxlayout.cpp
View File

@@ -65,7 +65,7 @@ QBoxLayout ( Direction dir, QWidget * parent = 0 )
*/
HB_FUNC( QT_QBOXLAYOUT )
{
hb_retptr( ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
}
/*
@@ -73,7 +73,7 @@ void addLayout ( QLayout * layout, int stretch = 0 )
*/
HB_FUNC( QT_QBOXLAYOUT_ADDLAYOUT )
{
hbqt_par_QBoxLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ) );
hbqt_par_QBoxLayout( 1 )->addLayout( hbqt_par_QLayout( 2 ), hb_parni( 3 ) );
}
/*
@@ -81,7 +81,7 @@ void addSpacerItem ( QSpacerItem * spacerItem )
*/
HB_FUNC( QT_QBOXLAYOUT_ADDSPACERITEM )
{
hbqt_par_QBoxLayout( 1 )->addSpacerItem( hbqt_par_QSpacerItem( 2 ) );
hbqt_par_QBoxLayout( 1 )->addSpacerItem( hbqt_par_QSpacerItem( 2 ) );
}
/*
@@ -89,7 +89,7 @@ void addSpacing ( int size )
*/
HB_FUNC( QT_QBOXLAYOUT_ADDSPACING )
{
hbqt_par_QBoxLayout( 1 )->addSpacing( hb_parni( 2 ) );
hbqt_par_QBoxLayout( 1 )->addSpacing( hb_parni( 2 ) );
}
/*
@@ -97,7 +97,7 @@ void addStretch ( int stretch = 0 )
*/
HB_FUNC( QT_QBOXLAYOUT_ADDSTRETCH )
{
hbqt_par_QBoxLayout( 1 )->addStretch( hb_parni( 2 ) );
hbqt_par_QBoxLayout( 1 )->addStretch( hb_parni( 2 ) );
}
/*
@@ -105,7 +105,7 @@ void addStrut ( int size )
*/
HB_FUNC( QT_QBOXLAYOUT_ADDSTRUT )
{
hbqt_par_QBoxLayout( 1 )->addStrut( hb_parni( 2 ) );
hbqt_par_QBoxLayout( 1 )->addStrut( hb_parni( 2 ) );
}
/*
@@ -113,7 +113,7 @@ void addWidget ( QWidget * widget, int stretch = 0, Qt::Alignment alignment = 0
*/
HB_FUNC( QT_QBOXLAYOUT_ADDWIDGET )
{
hbqt_par_QBoxLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), ( Qt::Alignment ) hb_parni( 4 ) );
hbqt_par_QBoxLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), ( Qt::Alignment ) hb_parni( 4 ) );
}
/*
@@ -121,7 +121,7 @@ Direction direction () const
*/
HB_FUNC( QT_QBOXLAYOUT_DIRECTION )
{
hb_retni( hbqt_par_QBoxLayout( 1 )->direction() );
hb_retni( hbqt_par_QBoxLayout( 1 )->direction() );
}
/*
@@ -129,7 +129,7 @@ void insertLayout ( int index, QLayout * layout, int stretch = 0 )
*/
HB_FUNC( QT_QBOXLAYOUT_INSERTLAYOUT )
{
hbqt_par_QBoxLayout( 1 )->insertLayout( hb_parni( 2 ), hbqt_par_QLayout( 3 ), hb_parni( 4 ) );
hbqt_par_QBoxLayout( 1 )->insertLayout( hb_parni( 2 ), hbqt_par_QLayout( 3 ), hb_parni( 4 ) );
}
/*
@@ -137,7 +137,7 @@ void insertSpacerItem ( int index, QSpacerItem * spacerItem )
*/
HB_FUNC( QT_QBOXLAYOUT_INSERTSPACERITEM )
{
hbqt_par_QBoxLayout( 1 )->insertSpacerItem( hb_parni( 2 ), hbqt_par_QSpacerItem( 3 ) );
hbqt_par_QBoxLayout( 1 )->insertSpacerItem( hb_parni( 2 ), hbqt_par_QSpacerItem( 3 ) );
}
/*
@@ -145,7 +145,7 @@ void insertSpacing ( int index, int size )
*/
HB_FUNC( QT_QBOXLAYOUT_INSERTSPACING )
{
hbqt_par_QBoxLayout( 1 )->insertSpacing( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QBoxLayout( 1 )->insertSpacing( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -153,7 +153,7 @@ void insertStretch ( int index, int stretch = 0 )
*/
HB_FUNC( QT_QBOXLAYOUT_INSERTSTRETCH )
{
hbqt_par_QBoxLayout( 1 )->insertStretch( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QBoxLayout( 1 )->insertStretch( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -161,7 +161,7 @@ void insertWidget ( int index, QWidget * widget, int stretch = 0, Qt::Alignment
*/
HB_FUNC( QT_QBOXLAYOUT_INSERTWIDGET )
{
hbqt_par_QBoxLayout( 1 )->insertWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hb_parni( 5 ), ( Qt::Alignment ) hb_parni( 6 ) );
hbqt_par_QBoxLayout( 1 )->insertWidget( hb_parni( 2 ), hbqt_par_QWidget( 3 ), hb_parni( 5 ), ( Qt::Alignment ) hb_parni( 6 ) );
}
/*
@@ -169,7 +169,7 @@ void setDirection ( Direction direction )
*/
HB_FUNC( QT_QBOXLAYOUT_SETDIRECTION )
{
hbqt_par_QBoxLayout( 1 )->setDirection( ( QBoxLayout::Direction ) hb_parni( 2 ) );
hbqt_par_QBoxLayout( 1 )->setDirection( ( QBoxLayout::Direction ) hb_parni( 2 ) );
}
/*
@@ -177,7 +177,7 @@ void setSpacing ( int spacing )
*/
HB_FUNC( QT_QBOXLAYOUT_SETSPACING )
{
hbqt_par_QBoxLayout( 1 )->setSpacing( hb_parni( 2 ) );
hbqt_par_QBoxLayout( 1 )->setSpacing( hb_parni( 2 ) );
}
/*
@@ -185,7 +185,7 @@ void setStretch ( int index, int stretch )
*/
HB_FUNC( QT_QBOXLAYOUT_SETSTRETCH )
{
hbqt_par_QBoxLayout( 1 )->setStretch( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QBoxLayout( 1 )->setStretch( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -193,7 +193,7 @@ bool setStretchFactor ( QWidget * widget, int stretch )
*/
HB_FUNC( QT_QBOXLAYOUT_SETSTRETCHFACTOR )
{
hb_retl( hbqt_par_QBoxLayout( 1 )->setStretchFactor( hbqt_par_QWidget( 2 ), hb_parni( 3 ) ) );
hb_retl( hbqt_par_QBoxLayout( 1 )->setStretchFactor( hbqt_par_QWidget( 2 ), hb_parni( 3 ) ) );
}
/*
@@ -201,7 +201,7 @@ int spacing () const
*/
HB_FUNC( QT_QBOXLAYOUT_SPACING )
{
hb_retni( hbqt_par_QBoxLayout( 1 )->spacing() );
hb_retni( hbqt_par_QBoxLayout( 1 )->spacing() );
}
/*
@@ -209,7 +209,7 @@ int stretch ( int index ) const
*/
HB_FUNC( QT_QBOXLAYOUT_STRETCH )
{
hb_retni( hbqt_par_QBoxLayout( 1 )->stretch( hb_parni( 2 ) ) );
hb_retni( hbqt_par_QBoxLayout( 1 )->stretch( hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

52
harbour/contrib/hbqt/hbqt_qcalendarwidget.cpp
View File

@@ -65,7 +65,7 @@ QCalendarWidget( QWidget * parent = 0 )
*/
HB_FUNC( QT_QCALENDARWIDGET )
{
hb_retptr( ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -73,7 +73,7 @@ int dateEditAcceptDelay () const
*/
HB_FUNC( QT_QCALENDARWIDGET_DATEEDITACCEPTDELAY )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->dateEditAcceptDelay() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->dateEditAcceptDelay() );
}
/*
@@ -81,7 +81,7 @@ Qt::DayOfWeek firstDayOfWeek () const
*/
HB_FUNC( QT_QCALENDARWIDGET_FIRSTDAYOFWEEK )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->firstDayOfWeek() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->firstDayOfWeek() );
}
/*
@@ -89,7 +89,7 @@ HorizontalHeaderFormat horizontalHeaderFormat () const
*/
HB_FUNC( QT_QCALENDARWIDGET_HORIZONTALHEADERFORMAT )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->horizontalHeaderFormat() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->horizontalHeaderFormat() );
}
/*
@@ -97,7 +97,7 @@ bool isDateEditEnabled () const
*/
HB_FUNC( QT_QCALENDARWIDGET_ISDATEEDITENABLED )
{
hb_retl( hbqt_par_QCalendarWidget( 1 )->isDateEditEnabled() );
hb_retl( hbqt_par_QCalendarWidget( 1 )->isDateEditEnabled() );
}
/*
@@ -105,7 +105,7 @@ bool isGridVisible () const
*/
HB_FUNC( QT_QCALENDARWIDGET_ISGRIDVISIBLE )
{
hb_retl( hbqt_par_QCalendarWidget( 1 )->isGridVisible() );
hb_retl( hbqt_par_QCalendarWidget( 1 )->isGridVisible() );
}
/*
@@ -113,7 +113,7 @@ bool isNavigationBarVisible () const
*/
HB_FUNC( QT_QCALENDARWIDGET_ISNAVIGATIONBARVISIBLE )
{
hb_retl( hbqt_par_QCalendarWidget( 1 )->isNavigationBarVisible() );
hb_retl( hbqt_par_QCalendarWidget( 1 )->isNavigationBarVisible() );
}
/*
@@ -121,7 +121,7 @@ int monthShown () const
*/
HB_FUNC( QT_QCALENDARWIDGET_MONTHSHOWN )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->monthShown() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->monthShown() );
}
/*
@@ -129,7 +129,7 @@ SelectionMode selectionMode () const
*/
HB_FUNC( QT_QCALENDARWIDGET_SELECTIONMODE )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->selectionMode() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->selectionMode() );
}
/*
@@ -137,7 +137,7 @@ void setDateEditAcceptDelay( int delay )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETDATEEDITACCEPTDELAY )
{
hbqt_par_QCalendarWidget( 1 )->setDateEditAcceptDelay( hb_parni( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setDateEditAcceptDelay( hb_parni( 2 ) );
}
/*
@@ -145,7 +145,7 @@ void setDateEditEnabled( bool enable )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETDATEEDITENABLED )
{
hbqt_par_QCalendarWidget( 1 )->setDateEditEnabled( hb_parl( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setDateEditEnabled( hb_parl( 2 ) );
}
/*
@@ -153,7 +153,7 @@ void setFirstDayOfWeek( Qt::DayOfWeek dayOfWeek )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETFIRSTDAYOFWEEK )
{
hbqt_par_QCalendarWidget( 1 )->setFirstDayOfWeek( (Qt::DayOfWeek) hb_parni( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setFirstDayOfWeek( (Qt::DayOfWeek) hb_parni( 2 ) );
}
/*
@@ -161,7 +161,7 @@ void setHorizontalHeaderFormat( HorizontalHeaderFormat format )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETHORIZONTALHEADERFORMAT )
{
hbqt_par_QCalendarWidget( 1 )->setHorizontalHeaderFormat( ( QCalendarWidget::HorizontalHeaderFormat ) hb_parni( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setHorizontalHeaderFormat( ( QCalendarWidget::HorizontalHeaderFormat ) hb_parni( 2 ) );
}
/*
@@ -169,7 +169,7 @@ void setSelectionMode( SelectionMode mode )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETSELECTIONMODE )
{
hbqt_par_QCalendarWidget( 1 )->setSelectionMode( (QCalendarWidget::SelectionMode) hb_parni( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setSelectionMode( (QCalendarWidget::SelectionMode) hb_parni( 2 ) );
}
/*
@@ -177,7 +177,7 @@ void setVerticalHeaderFormat( VerticalHeaderFormat format )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETVERTICALHEADERFORMAT )
{
hbqt_par_QCalendarWidget( 1 )->setVerticalHeaderFormat( ( QCalendarWidget::VerticalHeaderFormat ) hb_parni( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setVerticalHeaderFormat( ( QCalendarWidget::VerticalHeaderFormat ) hb_parni( 2 ) );
}
/*
@@ -185,7 +185,7 @@ VerticalHeaderFormat verticalHeaderFormat () const
*/
HB_FUNC( QT_QCALENDARWIDGET_VERTICALHEADERFORMAT )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->verticalHeaderFormat() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->verticalHeaderFormat() );
}
/*
@@ -193,7 +193,7 @@ int yearShown () const
*/
HB_FUNC( QT_QCALENDARWIDGET_YEARSHOWN )
{
hb_retni( hbqt_par_QCalendarWidget( 1 )->yearShown() );
hb_retni( hbqt_par_QCalendarWidget( 1 )->yearShown() );
}
/*
@@ -201,7 +201,7 @@ void setCurrentPage( int year, int month )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETCURRENTPAGE )
{
hbqt_par_QCalendarWidget( 1 )->setCurrentPage( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QCalendarWidget( 1 )->setCurrentPage( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -209,7 +209,7 @@ void setGridVisible( bool show )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETGRIDVISIBLE )
{
hbqt_par_QCalendarWidget( 1 )->setGridVisible( hb_parl( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setGridVisible( hb_parl( 2 ) );
}
/*
@@ -217,7 +217,7 @@ void setNavigationBarVisible( bool visible )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETNAVIGATIONBARVISIBLE )
{
hbqt_par_QCalendarWidget( 1 )->setNavigationBarVisible( hb_parl( 2 ) );
hbqt_par_QCalendarWidget( 1 )->setNavigationBarVisible( hb_parl( 2 ) );
}
/*
@@ -225,7 +225,7 @@ void showNextMonth ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWNEXTMONTH )
{
hbqt_par_QCalendarWidget( 1 )->showNextMonth();
hbqt_par_QCalendarWidget( 1 )->showNextMonth();
}
/*
@@ -233,7 +233,7 @@ void showNextYear ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWNEXTYEAR )
{
hbqt_par_QCalendarWidget( 1 )->showNextYear();
hbqt_par_QCalendarWidget( 1 )->showNextYear();
}
/*
@@ -241,7 +241,7 @@ void showPreviousMonth ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWPREVIOUSMONTH )
{
hbqt_par_QCalendarWidget( 1 )->showPreviousMonth();
hbqt_par_QCalendarWidget( 1 )->showPreviousMonth();
}
/*
@@ -249,7 +249,7 @@ void showPreviousYear ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWPREVIOUSYEAR )
{
hbqt_par_QCalendarWidget( 1 )->showPreviousYear();
hbqt_par_QCalendarWidget( 1 )->showPreviousYear();
}
/*
@@ -257,7 +257,7 @@ void showSelectedDate ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWSELECTEDDATE )
{
hbqt_par_QCalendarWidget( 1 )->showSelectedDate();
hbqt_par_QCalendarWidget( 1 )->showSelectedDate();
}
/*
@@ -265,7 +265,7 @@ void showToday ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWTODAY )
{
hbqt_par_QCalendarWidget( 1 )->showToday();
hbqt_par_QCalendarWidget( 1 )->showToday();
}
/*----------------------------------------------------------------------*/

10
harbour/contrib/hbqt/hbqt_qcheckbox.cpp
View File

@@ -66,7 +66,7 @@ QCheckBox ( const QString & text, QWidget * parent = 0 )
*/
HB_FUNC( QT_QCHECKBOX )
{
hb_retptr( ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -74,7 +74,7 @@ Qt::CheckState checkState () const
*/
HB_FUNC( QT_QCHECKBOX_CHECKSTATE )
{
hb_retni( hbqt_par_QCheckBox( 1 )->checkState() );
hb_retni( hbqt_par_QCheckBox( 1 )->checkState() );
}
/*
@@ -82,7 +82,7 @@ bool isTristate () const
*/
HB_FUNC( QT_QCHECKBOX_ISTRISTATE )
{
hb_retl( hbqt_par_QCheckBox( 1 )->isTristate() );
hb_retl( hbqt_par_QCheckBox( 1 )->isTristate() );
}
/*
@@ -90,7 +90,7 @@ void setCheckState ( Qt::CheckState state )
*/
HB_FUNC( QT_QCHECKBOX_SETCHECKSTATE )
{
hbqt_par_QCheckBox( 1 )->setCheckState( ( Qt::CheckState ) hb_parni( 2 ) );
hbqt_par_QCheckBox( 1 )->setCheckState( ( Qt::CheckState ) hb_parni( 2 ) );
}
/*
@@ -98,7 +98,7 @@ void setTristate ( bool y = true )
*/
HB_FUNC( QT_QCHECKBOX_SETTRISTATE )
{
hbqt_par_QCheckBox( 1 )->setTristate( hb_parl( 2 ) );
hbqt_par_QCheckBox( 1 )->setTristate( hb_parl( 2 ) );
}
/*----------------------------------------------------------------------*/

12
harbour/contrib/hbqt/hbqt_qcolordialog.cpp
View File

@@ -66,7 +66,7 @@ QColorDialog ( const QColor & initial, QWidget * parent = 0 )
*/
HB_FUNC( QT_QCOLORDIALOG )
{
hb_retptr( ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -74,7 +74,7 @@ void open ()
*/
HB_FUNC( QT_QCOLORDIALOG_OPEN )
{
hbqt_par_QColorDialog( 1 )->open ( );
hbqt_par_QColorDialog( 1 )->open ( );
}
/*
@@ -82,7 +82,7 @@ ColorDialogOptions options () const
*/
HB_FUNC( QT_QCOLORDIALOG_OPTIONS )
{
hb_retni( hbqt_par_QColorDialog( 1 )->options() );
hb_retni( hbqt_par_QColorDialog( 1 )->options() );
}
/*
@@ -90,7 +90,7 @@ void setOption ( ColorDialogOption option, bool on = true )
*/
HB_FUNC( QT_QCOLORDIALOG_SETOPTION )
{
hbqt_par_QColorDialog( 1 )->setOption( ( QColorDialog::ColorDialogOption ) hb_parni( 2 ), hb_parl( 3 ) );
hbqt_par_QColorDialog( 1 )->setOption( ( QColorDialog::ColorDialogOption ) hb_parni( 2 ), hb_parl( 3 ) );
}
/*
@@ -98,7 +98,7 @@ void setOptions ( ColorDialogOptions options )
*/
HB_FUNC( QT_QCOLORDIALOG_SETOPTIONS )
{
hbqt_par_QColorDialog( 1 )->setOptions( ( QColorDialog::ColorDialogOptions ) hb_parni( 2 ) );
hbqt_par_QColorDialog( 1 )->setOptions( ( QColorDialog::ColorDialogOptions ) hb_parni( 2 ) );
}
/*
@@ -106,7 +106,7 @@ bool testOption ( ColorDialogOption option ) const
*/
HB_FUNC( QT_QCOLORDIALOG_TESTOPTION )
{
hb_retl( hbqt_par_QColorDialog( 1 )->testOption( ( QColorDialog::ColorDialogOption ) hb_parni( 2 ) ) );
hb_retl( hbqt_par_QColorDialog( 1 )->testOption( ( QColorDialog::ColorDialogOption ) hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

78
harbour/contrib/hbqt/hbqt_qcombobox.cpp
View File

@@ -65,7 +65,7 @@ QComboBox( QWidget * parent = 0 )
*/
HB_FUNC( QT_QCOMBOBOX )
{
hb_retptr( ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -74,7 +74,7 @@ void addItem( const QIcon & icon, const QString & text, const QVariant & userDat
*/
HB_FUNC( QT_QCOMBOBOX_ADDITEM )
{
hbqt_par_QComboBox( 1 )->addItem( hbqt_par_QString( 2 ) );
hbqt_par_QComboBox( 1 )->addItem( hbqt_par_QString( 2 ) );
}
/*
@@ -82,7 +82,7 @@ int count () const
*/
HB_FUNC( QT_QCOMBOBOX_COUNT )
{
hb_retni( hbqt_par_QComboBox( 1 )->count() );
hb_retni( hbqt_par_QComboBox( 1 )->count() );
}
/*
@@ -90,7 +90,7 @@ int currentIndex () const
*/
HB_FUNC( QT_QCOMBOBOX_CURRENTINDEX )
{
hb_retni( hbqt_par_QComboBox( 1 )->currentIndex() );
hb_retni( hbqt_par_QComboBox( 1 )->currentIndex() );
}
/*
@@ -98,7 +98,7 @@ QString currentText () const
*/
HB_FUNC( QT_QCOMBOBOX_CURRENTTEXT )
{
hb_retc( hbqt_par_QComboBox( 1 )->currentText().toLatin1().data() );
hb_retc( hbqt_par_QComboBox( 1 )->currentText().toLatin1().data() );
}
/*
@@ -106,7 +106,7 @@ bool duplicatesEnabled () const
*/
HB_FUNC( QT_QCOMBOBOX_DUPLICATESENABLED )
{
hb_retl( hbqt_par_QComboBox( 1 )->duplicatesEnabled() );
hb_retl( hbqt_par_QComboBox( 1 )->duplicatesEnabled() );
}
/*
@@ -114,7 +114,7 @@ bool hasFrame () const
*/
HB_FUNC( QT_QCOMBOBOX_HASFRAME )
{
hb_retl( hbqt_par_QComboBox( 1 )->hasFrame() );
hb_retl( hbqt_par_QComboBox( 1 )->hasFrame() );
}
/*
@@ -122,7 +122,7 @@ InsertPolicy insertPolicy () const
*/
HB_FUNC( QT_QCOMBOBOX_INSERTPOLICY )
{
hb_retni( hbqt_par_QComboBox( 1 )->insertPolicy() );
hb_retni( hbqt_par_QComboBox( 1 )->insertPolicy() );
}
/*
@@ -130,7 +130,7 @@ void insertSeparator( int index )
*/
HB_FUNC( QT_QCOMBOBOX_INSERTSEPARATOR )
{
hbqt_par_QComboBox( 1 )->insertSeparator( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->insertSeparator( hb_parni( 2 ) );
}
/*
@@ -138,7 +138,7 @@ bool isEditable () const
*/
HB_FUNC( QT_QCOMBOBOX_ISEDITABLE )
{
hb_retl( hbqt_par_QComboBox( 1 )->isEditable() );
hb_retl( hbqt_par_QComboBox( 1 )->isEditable() );
}
/*
@@ -146,7 +146,7 @@ QAbstractItemDelegate * itemDelegate () const
*/
HB_FUNC( QT_QCOMBOBOX_ITEMDELEGATE )
{
hb_retptr( ( QAbstractItemDelegate * ) hbqt_par_QComboBox( 1 )->itemDelegate() );
hb_retptr( ( QAbstractItemDelegate * ) hbqt_par_QComboBox( 1 )->itemDelegate() );
}
/*
@@ -154,7 +154,7 @@ QString itemText( int index ) const
*/
HB_FUNC( QT_QCOMBOBOX_ITEMTEXT )
{
hb_retc( hbqt_par_QComboBox( 1 )->itemText( hb_parni( 2 ) ).toLatin1().data() );
hb_retc( hbqt_par_QComboBox( 1 )->itemText( hb_parni( 2 ) ).toLatin1().data() );
}
/*
@@ -162,7 +162,7 @@ QLineEdit * lineEdit () const
*/
HB_FUNC( QT_QCOMBOBOX_LINEEDIT )
{
hb_retptr( ( QLineEdit* ) hbqt_par_QComboBox( 1 )->lineEdit() );
hb_retptr( ( QLineEdit* ) hbqt_par_QComboBox( 1 )->lineEdit() );
}
/*
@@ -170,7 +170,7 @@ int maxCount () const
*/
HB_FUNC( QT_QCOMBOBOX_MAXCOUNT )
{
hb_retni( hbqt_par_QComboBox( 1 )->maxCount() );
hb_retni( hbqt_par_QComboBox( 1 )->maxCount() );
}
/*
@@ -178,7 +178,7 @@ int maxVisibleItems () const
*/
HB_FUNC( QT_QCOMBOBOX_MAXVISIBLEITEMS )
{
hb_retni( hbqt_par_QComboBox( 1 )->maxVisibleItems() );
hb_retni( hbqt_par_QComboBox( 1 )->maxVisibleItems() );
}
/*
@@ -186,7 +186,7 @@ int minimumContentsLength () const
*/
HB_FUNC( QT_QCOMBOBOX_MINIMUMCONTENTSLENGTH )
{
hb_retni( hbqt_par_QComboBox( 1 )->minimumContentsLength() );
hb_retni( hbqt_par_QComboBox( 1 )->minimumContentsLength() );
}
/*
@@ -194,7 +194,7 @@ QAbstractItemModel * model () const
*/
HB_FUNC( QT_QCOMBOBOX_MODEL )
{
hb_retptr( ( QAbstractItemModel* ) hbqt_par_QComboBox( 1 )->model() );
hb_retptr( ( QAbstractItemModel* ) hbqt_par_QComboBox( 1 )->model() );
}
/*
@@ -202,7 +202,7 @@ int modelColumn () const
*/
HB_FUNC( QT_QCOMBOBOX_MODELCOLUMN )
{
hb_retni( hbqt_par_QComboBox( 1 )->modelColumn() );
hb_retni( hbqt_par_QComboBox( 1 )->modelColumn() );
}
/*
@@ -210,7 +210,7 @@ void removeItem( int index )
*/
HB_FUNC( QT_QCOMBOBOX_REMOVEITEM )
{
hbqt_par_QComboBox( 1 )->removeItem ( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->removeItem ( hb_parni( 2 ) );
}
/*
@@ -218,7 +218,7 @@ void setDuplicatesEnabled( bool enable )
*/
HB_FUNC( QT_QCOMBOBOX_SETDUPLICATESENABLED )
{
hbqt_par_QComboBox( 1 )->setDuplicatesEnabled( hb_parl( 2 ) );
hbqt_par_QComboBox( 1 )->setDuplicatesEnabled( hb_parl( 2 ) );
}
/*
@@ -226,7 +226,7 @@ void setEditable( bool editable )
*/
HB_FUNC( QT_QCOMBOBOX_SETEDITABLE )
{
hbqt_par_QComboBox( 1 )->setEditable( hb_parl( 2 ) );
hbqt_par_QComboBox( 1 )->setEditable( hb_parl( 2 ) );
}
/*
@@ -234,7 +234,7 @@ void setFrame( bool )
*/
HB_FUNC( QT_QCOMBOBOX_SETFRAME )
{
hbqt_par_QComboBox( 1 )->setFrame( hb_parl( 2 ) );
hbqt_par_QComboBox( 1 )->setFrame( hb_parl( 2 ) );
}
/*
@@ -242,7 +242,7 @@ void setInsertPolicy( InsertPolicy policy )
*/
HB_FUNC( QT_QCOMBOBOX_SETINSERTPOLICY )
{
hbqt_par_QComboBox( 1 )->setInsertPolicy( ( QComboBox::InsertPolicy ) hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setInsertPolicy( ( QComboBox::InsertPolicy ) hb_parni( 2 ) );
}
/*
@@ -250,7 +250,7 @@ void setItemDelegate( QAbstractItemDelegate * delegate )
*/
HB_FUNC( QT_QCOMBOBOX_SETITEMDELEGATE )
{
hbqt_par_QComboBox( 1 )->setItemDelegate( hbqt_par_QAbstractItemDelegate( 2 ) );
hbqt_par_QComboBox( 1 )->setItemDelegate( hbqt_par_QAbstractItemDelegate( 2 ) );
}
/*
@@ -258,7 +258,7 @@ void setItemText( int index, const QString & text )
*/
HB_FUNC( QT_QCOMBOBOX_SETITEMTEXT )
{
hbqt_par_QComboBox( 1 )->setItemText( hb_parni( 2 ), hbqt_par_QString( 3 ) );
hbqt_par_QComboBox( 1 )->setItemText( hb_parni( 2 ), hbqt_par_QString( 3 ) );
}
/*
@@ -266,7 +266,7 @@ void setLineEdit( QLineEdit * edit )
*/
HB_FUNC( QT_QCOMBOBOX_SETLINEEDIT )
{
hbqt_par_QComboBox( 1 )->setLineEdit( hbqt_par_QLineEdit( 2 ) );
hbqt_par_QComboBox( 1 )->setLineEdit( hbqt_par_QLineEdit( 2 ) );
}
/*
@@ -274,7 +274,7 @@ void setMaxCount( int max )
*/
HB_FUNC( QT_QCOMBOBOX_SETMAXCOUNT )
{
hbqt_par_QComboBox( 1 )->setMaxCount( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setMaxCount( hb_parni( 2 ) );
}
/*
@@ -282,7 +282,7 @@ void setMaxVisibleItems( int maxItems )
*/
HB_FUNC( QT_QCOMBOBOX_SETMAXVISIBLEITEMS )
{
hbqt_par_QComboBox( 1 )->setMaxVisibleItems( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setMaxVisibleItems( hb_parni( 2 ) );
}
/*
@@ -290,7 +290,7 @@ void setMinimumContentsLength( int characters )
*/
HB_FUNC( QT_QCOMBOBOX_SETMINIMUMCONTENTSLENGTH )
{
hbqt_par_QComboBox( 1 )->setMinimumContentsLength( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setMinimumContentsLength( hb_parni( 2 ) );
}
/*
@@ -298,7 +298,7 @@ void setModel( QAbstractItemModel * model )
*/
HB_FUNC( QT_QCOMBOBOX_SETMODEL )
{
hbqt_par_QComboBox( 1 )->setModel( hbqt_par_QAbstractItemModel( 2 ) );
hbqt_par_QComboBox( 1 )->setModel( hbqt_par_QAbstractItemModel( 2 ) );
}
/*
@@ -306,7 +306,7 @@ void setModelColumn( int visibleColumn )
*/
HB_FUNC( QT_QCOMBOBOX_SETMODELCOLUMN )
{
hbqt_par_QComboBox( 1 )->setModelColumn( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setModelColumn( hb_parni( 2 ) );
}
/*
@@ -314,7 +314,7 @@ void setSizeAdjustPolicy( SizeAdjustPolicy policy )
*/
HB_FUNC( QT_QCOMBOBOX_SETSIZEADJUSTPOLICY )
{
hbqt_par_QComboBox( 1 )->setSizeAdjustPolicy( ( QComboBox::SizeAdjustPolicy ) hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setSizeAdjustPolicy( ( QComboBox::SizeAdjustPolicy ) hb_parni( 2 ) );
}
/*
@@ -322,7 +322,7 @@ void setView( QAbstractItemView * itemView )
*/
HB_FUNC( QT_QCOMBOBOX_SETVIEW )
{
hbqt_par_QComboBox( 1 )->setView( hbqt_par_QAbstractItemView( 2 ) );
hbqt_par_QComboBox( 1 )->setView( hbqt_par_QAbstractItemView( 2 ) );
}
/*
@@ -330,7 +330,7 @@ SizeAdjustPolicy sizeAdjustPolicy () const
*/
HB_FUNC( QT_QCOMBOBOX_SIZEADJUSTPOLICY )
{
hb_retni( hbqt_par_QComboBox( 1 )->sizeAdjustPolicy() );
hb_retni( hbqt_par_QComboBox( 1 )->sizeAdjustPolicy() );
}
/*
@@ -338,7 +338,7 @@ QAbstractItemView * view () const
*/
HB_FUNC( QT_QCOMBOBOX_VIEW )
{
hb_retptr( ( QAbstractItemView* ) hbqt_par_QComboBox( 1 )->view() );
hb_retptr( ( QAbstractItemView* ) hbqt_par_QComboBox( 1 )->view() );
}
/*
@@ -346,7 +346,7 @@ void clear ()
*/
HB_FUNC( QT_QCOMBOBOX_CLEAR )
{
hbqt_par_QComboBox( 1 )->clear();
hbqt_par_QComboBox( 1 )->clear();
}
/*
@@ -354,7 +354,7 @@ void clearEditText ()
*/
HB_FUNC( QT_QCOMBOBOX_CLEAREDITTEXT )
{
hbqt_par_QComboBox( 1 )->clearEditText();
hbqt_par_QComboBox( 1 )->clearEditText();
}
/*
@@ -362,7 +362,7 @@ void setCurrentIndex( int index )
*/
HB_FUNC( QT_QCOMBOBOX_SETCURRENTINDEX )
{
hbqt_par_QComboBox( 1 )->setCurrentIndex( hb_parni( 2 ) );
hbqt_par_QComboBox( 1 )->setCurrentIndex( hb_parni( 2 ) );
}
/*
@@ -370,7 +370,7 @@ void setEditText( const QString & text )
*/
HB_FUNC( QT_QCOMBOBOX_SETEDITTEXT )
{
hbqt_par_QComboBox( 1 )->setEditText( hbqt_par_QString( 2 ) );
hbqt_par_QComboBox( 1 )->setEditText( hbqt_par_QString( 2 ) );
}
/*----------------------------------------------------------------------*/

10
harbour/contrib/hbqt/hbqt_qcommandlinkbutton.cpp
View File

@@ -67,7 +67,7 @@ QCommandLinkButton ( const QString & text, const QString & description, QWidget
*/
HB_FUNC( QT_QCOMMANDLINKBUTTON )
{
hb_retptr( ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,7 +75,7 @@ QString description () const
*/
HB_FUNC( QT_QCOMMANDLINKBUTTON_DESCRIPTION )
{
hb_retc( hbqt_par_QCommandLinkButton( 1 )->description().toLatin1().data() );
hb_retc( hbqt_par_QCommandLinkButton( 1 )->description().toLatin1().data() );
}
/*
@@ -83,7 +83,7 @@ void setDescription ( const QString & description )
*/
HB_FUNC( QT_QCOMMANDLINKBUTTON_SETDESCRIPTION )
{
hbqt_par_QCommandLinkButton( 1 )->setDescription( hbqt_par_QString( 2 ) );
hbqt_par_QCommandLinkButton( 1 )->setDescription( hbqt_par_QString( 2 ) );
}
/*
@@ -91,7 +91,7 @@ bool isFlat () const
*/
HB_FUNC( QT_QCOMMANDLINKBUTTON_ISFLAT )
{
hb_retl( hbqt_par_QCommandLinkButton( 1 )->isFlat() );
hb_retl( hbqt_par_QCommandLinkButton( 1 )->isFlat() );
}
/*
@@ -99,7 +99,7 @@ void setFlat ( bool )
*/
HB_FUNC( QT_QCOMMANDLINKBUTTON_SETFLAT )
{
hbqt_par_QCommandLinkButton( 1 )->setFlat( hb_parl( 2 ) );
hbqt_par_QCommandLinkButton( 1 )->setFlat( hb_parl( 2 ) );
}
/*----------------------------------------------------------------------*/

168
harbour/contrib/hbqt/hbqt_qcqlendarwidget.cpp
View File

@@ -61,14 +61,14 @@
/*----------------------------------------------------------------------*/
/*
QCalendarWidget ( QWidget * parent = 0 )
QCalendarWidget( QWidget * parent = 0 )
*/
HB_FUNC( QT_QCALENDARWIDGET )
{
QCalendarWidget *cal = NULL;
QWidget *parent = ISNIL(1)? 0 : (QWidget*) hb_parptr(1);
cal = new QCalendarWidget( parent );
hb_retptr( (QCalendarWidget*) cal );
QCalendarWidget * cal = NULL;
QWidget * parent = ( QWidget* ) hb_parptr( 1 );
cal = new QCalendarWidget( parent );
hb_retptr( ( QCalendarWidget* ) cal );
}
/*
@@ -76,9 +76,9 @@ int dateEditAcceptDelay () const
*/
HB_FUNC( QT_QCALENDARWIDGET_DATEEDITACCEPTDELAY )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->dateEditAcceptDelay ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->dateEditAcceptDelay();
hb_retni( i );
}
/*
@@ -86,9 +86,9 @@ Qt::DayOfWeek firstDayOfWeek () const
*/
HB_FUNC( QT_QCALENDARWIDGET_FIRSTDAYOFWEEK )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->firstDayOfWeek ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->firstDayOfWeek();
hb_retni( i );
}
/*
@@ -96,9 +96,9 @@ HorizontalHeaderFormat horizontalHeaderFormat () const
*/
HB_FUNC( QT_QCALENDARWIDGET_HORIZONTALHEADERFORMAT )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->horizontalHeaderFormat ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->horizontalHeaderFormat();
hb_retni( i );
}
/*
@@ -106,9 +106,9 @@ bool isDateEditEnabled () const
*/
HB_FUNC( QT_QCALENDARWIDGET_ISDATEEDITENABLED )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
bool b = par1->isDateEditEnabled ( );
hb_retl( b );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
bool b = par1->isDateEditEnabled();
hb_retl( b );
}
/*
@@ -116,9 +116,9 @@ bool isGridVisible () const
*/
HB_FUNC( QT_QCALENDARWIDGET_ISGRIDVISIBLE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
bool b = par1->isGridVisible ( );
hb_retl( b );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
bool b = par1->isGridVisible();
hb_retl( b );
}
/*
@@ -126,9 +126,9 @@ bool isNavigationBarVisible () const
*/
HB_FUNC( QT_QCALENDARWIDGET_ISNAVIGATIONBARVISIBLE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
bool b = par1->isNavigationBarVisible ( );
hb_retl( b );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
bool b = par1->isNavigationBarVisible();
hb_retl( b );
}
/*
@@ -136,9 +136,9 @@ int monthShown () const
*/
HB_FUNC( QT_QCALENDARWIDGET_MONTHSHOWN )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->monthShown ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->monthShown();
hb_retni( i );
}
/*
@@ -146,69 +146,69 @@ SelectionMode selectionMode () const
*/
HB_FUNC( QT_QCALENDARWIDGET_SELECTIONMODE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->selectionMode ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->selectionMode();
hb_retni( i );
}
/*
void setDateEditAcceptDelay ( int delay )
void setDateEditAcceptDelay( int delay )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETDATEEDITACCEPTDELAY )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setDateEditAcceptDelay ( par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setDateEditAcceptDelay( par2 );
}
/*
void setDateEditEnabled ( bool enable )
void setDateEditEnabled( bool enable )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETDATEEDITENABLED )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
bool par2 = hb_parl(2);
par1->setDateEditEnabled ( par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
bool par2 = hb_parl( 2 );
par1->setDateEditEnabled( par2 );
}
/*
void setFirstDayOfWeek ( Qt::DayOfWeek dayOfWeek )
void setFirstDayOfWeek( Qt::DayOfWeek dayOfWeek )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETFIRSTDAYOFWEEK )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setFirstDayOfWeek ( (Qt::DayOfWeek) par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setFirstDayOfWeek( ( Qt::DayOfWeek ) par2 );
}
/*
void setHorizontalHeaderFormat ( HorizontalHeaderFormat format )
void setHorizontalHeaderFormat( HorizontalHeaderFormat format )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETHORIZONTALHEADERFORMAT )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setHorizontalHeaderFormat ( (QCalendarWidget::HorizontalHeaderFormat) par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setHorizontalHeaderFormat( ( QCalendarWidget::HorizontalHeaderFormat ) par2 );
}
/*
void setSelectionMode ( SelectionMode mode )
void setSelectionMode( SelectionMode mode )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETSELECTIONMODE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setSelectionMode ( (QCalendarWidget::SelectionMode) par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setSelectionMode( ( QCalendarWidget::SelectionMode ) par2 );
}
/*
void setVerticalHeaderFormat ( VerticalHeaderFormat format )
void setVerticalHeaderFormat( VerticalHeaderFormat format )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETVERTICALHEADERFORMAT )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setVerticalHeaderFormat ( (QCalendarWidget::VerticalHeaderFormat) par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setVerticalHeaderFormat( ( QCalendarWidget::VerticalHeaderFormat ) par2 );
}
/*
@@ -216,9 +216,9 @@ VerticalHeaderFormat verticalHeaderFormat () const
*/
HB_FUNC( QT_QCALENDARWIDGET_VERTICALHEADERFORMAT )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->verticalHeaderFormat ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->verticalHeaderFormat();
hb_retni( i );
}
/*
@@ -226,40 +226,40 @@ int yearShown () const
*/
HB_FUNC( QT_QCALENDARWIDGET_YEARSHOWN )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int i = par1->yearShown ( );
hb_retni( i );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int i = par1->yearShown();
hb_retni( i );
}
/*
void setCurrentPage ( int year, int month )
void setCurrentPage( int year, int month )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETCURRENTPAGE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
int par2 = hb_parni(2);
int par3 = hb_parni(3);
par1->setCurrentPage ( par2, par3 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
int par3 = hb_parni( 3 );
par1->setCurrentPage( par2, par3 );
}
/*
void setGridVisible ( bool show )
void setGridVisible( bool show )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETGRIDVISIBLE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
bool par2 = hb_parl(2);
par1->setGridVisible ( par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
bool par2 = hb_parl( 2 );
par1->setGridVisible( par2 );
}
/*
void setNavigationBarVisible ( bool visible )
void setNavigationBarVisible( bool visible )
*/
HB_FUNC( QT_QCALENDARWIDGET_SETNAVIGATIONBARVISIBLE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
bool par2 = hb_parl(2);
par1->setNavigationBarVisible ( par2 );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
bool par2 = hb_parl( 2 );
par1->setNavigationBarVisible( par2 );
}
/*
@@ -267,8 +267,8 @@ void showNextMonth ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWNEXTMONTH )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
par1->showNextMonth ( );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
par1->showNextMonth();
}
/*
@@ -276,8 +276,8 @@ void showNextYear ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWNEXTYEAR )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
par1->showNextYear ( );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
par1->showNextYear();
}
/*
@@ -285,8 +285,8 @@ void showPreviousMonth ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWPREVIOUSMONTH )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
par1->showPreviousMonth ( );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
par1->showPreviousMonth();
}
/*
@@ -294,8 +294,8 @@ void showPreviousYear ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWPREVIOUSYEAR )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
par1->showPreviousYear ( );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
par1->showPreviousYear();
}
/*
@@ -303,8 +303,8 @@ void showSelectedDate ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWSELECTEDDATE )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
par1->showSelectedDate ( );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
par1->showSelectedDate();
}
/*
@@ -312,8 +312,8 @@ void showToday ()
*/
HB_FUNC( QT_QCALENDARWIDGET_SHOWTODAY )
{
QCalendarWidget * par1 = (QCalendarWidget *) hb_parptr(1);
par1->showToday ( );
QCalendarWidget * par1 = ( QCalendarWidget * ) hb_parptr( 1 );
par1->showToday();
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qdateedit.cpp
View File

@@ -66,7 +66,7 @@ QDateEdit ( const QDate & date, QWidget * parent = 0 )
*/
HB_FUNC( QT_QDATEEDIT )
{
hb_retptr( ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qdatetimeedit.cpp
View File

@@ -68,7 +68,7 @@ QDateTimeEdit ( const QTime & time, QWidget * parent = 0 )
*/
HB_FUNC( QT_QDATETIMEEDIT )
{
hb_retptr( ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qdial.cpp
View File

@@ -65,7 +65,7 @@ QDial ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QDIAL )
{
hb_retptr( ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qdoublespinbox.cpp
View File

@@ -65,7 +65,7 @@ QDoubleSpinBox ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QDOUBLESPINBOX )
{
hb_retptr( ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qerrormessage.cpp
View File

@@ -65,7 +65,7 @@ QErrorMessage ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QERRORMESSAGE )
{
hb_retptr( ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qfiledialog.cpp
View File

@@ -66,7 +66,7 @@ QFileDialog ( QWidget * parent = 0, const QString & caption = QString(), const Q
*/
HB_FUNC( QT_QFILEDIALOG )
{
hb_retptr( ( QFileDialog* ) new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
hb_retptr( ( QFileDialog* ) new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qfocusframe.cpp
View File

@@ -65,7 +65,7 @@ QFocusFrame ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QFOCUSFRAME )
{
hb_retptr( ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qfont.cpp
View File

@@ -68,7 +68,7 @@ QFont ( const QFont & font )
*/
HB_FUNC( QT_QFONT )
{
hb_retptr( ( QFont* ) new QFont() );
hb_retptr( ( QFont* ) new QFont() );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qfontcombobox.cpp
View File

@@ -65,7 +65,7 @@ QFontComboBox ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QFONTCOMBOBOX )
{
hb_retptr( (QFontComboBox*) new QFontComboBox( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qfontdialog.cpp
View File

@@ -66,7 +66,7 @@ QFontDialog ( const QFont & initial, QWidget * parent = 0 )
*/
HB_FUNC( QT_QFONTDIALOG )
{
hb_retptr( (QFontDialog*) new QFontDialog( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QFontDialog * ) new QFontDialog( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

254
harbour/contrib/hbqt/hbqt_qformlayout.cpp
View File

@@ -65,10 +65,10 @@ QFormLayout ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QFORMLAYOUT )
{
QFormLayout *formlayout = NULL;
QWidget* parent = ISNIL(1)? 0:(QWidget*) hb_parptr(1);
formlayout = new QFormLayout( parent );
hb_retptr((QFormLayout*) formlayout);
QFormLayout *formlayout = NULL;
QWidget* parent = ( QWidget * ) hb_parptr( 1 );
formlayout = new QFormLayout( parent );
hb_retptr( ( QFormLayout * ) formlayout);
}
/*
@@ -76,10 +76,10 @@ void addRow ( QWidget * label, QWidget * field )
*/
HB_FUNC( QT_QFORMLAYOUT_ADDROW_1 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QWidget * par2 = (QWidget *) hb_parptr(2);
QWidget * par3 = (QWidget *) hb_parptr(3);
par1->addRow ( par2, par3 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QWidget * par2 = ( QWidget * ) hb_parptr( 2 );
QWidget * par3 = ( QWidget * ) hb_parptr( 3 );
par1->addRow( par2, par3 );
}
/*
@@ -87,10 +87,10 @@ void addRow ( QWidget * label, QLayout * field )
*/
HB_FUNC( QT_QFORMLAYOUT_ADDROW_2 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QWidget * par2 = (QWidget *) hb_parptr(2);
QLayout * par3 = (QLayout *) hb_parptr(3);
par1->addRow ( par2, par3 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QWidget * par2 = ( QWidget * ) hb_parptr( 2 );
QLayout * par3 = ( QLayout * ) hb_parptr( 3 );
par1->addRow( par2, par3 );
}
/*
@@ -98,10 +98,10 @@ void addRow ( const QString & labelText, QWidget * field )
*/
HB_FUNC( QT_QFORMLAYOUT_ADDROW_3 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QString par2 = hb_parc(2);
QWidget * par3 = (QWidget *) hb_parptr(3);
par1->addRow ( par2, par3 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QString par2 = hb_parc( 2 );
QWidget * par3 = ( QWidget * ) hb_parptr( 3 );
par1->addRow( par2, par3 );
}
/*
@@ -109,10 +109,10 @@ void addRow ( const QString & labelText, QLayout * field )
*/
HB_FUNC( QT_QFORMLAYOUT_ADDROW_4 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QString par2 = hb_parc(2);
QLayout * par3 = ( QLayout *) hb_parptr(3);
par1->addRow ( par2, par3 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QString par2 = hb_parc( 2 );
QLayout * par3 = ( QLayout *) hb_parptr( 3 );
par1->addRow( par2, par3 );
}
/*
@@ -120,9 +120,9 @@ void addRow ( QWidget * widget )
*/
HB_FUNC( QT_QFORMLAYOUT_ADDROW_5 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QWidget * par2 = (QWidget *) hb_parptr(2);
par1->addRow ( par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QWidget * par2 = ( QWidget * ) hb_parptr( 2 );
par1->addRow( par2 );
}
/*
@@ -130,9 +130,9 @@ void addRow ( QLayout * layout )
*/
HB_FUNC( QT_QFORMLAYOUT_ADDROW_6 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QLayout * par2 = (QLayout *) hb_parptr(2);
par1->addRow ( par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QLayout * par2 = ( QLayout * ) hb_parptr( 2 );
par1->addRow( par2 );
}
/*
@@ -140,9 +140,9 @@ FieldGrowthPolicy fieldGrowthPolicy () const
*/
HB_FUNC( QT_QFORMLAYOUT_FIELDGROWTHPOLICY )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->fieldGrowthPolicy ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->fieldGrowthPolicy();
hb_retni( i );
}
/*
@@ -150,9 +150,9 @@ Qt::Alignment formAlignment () const
*/
HB_FUNC( QT_QFORMLAYOUT_FORMALIGNMENT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->formAlignment ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->formAlignment();
hb_retni( i );
}
/*
@@ -160,9 +160,9 @@ int horizontalSpacing () const
*/
HB_FUNC( QT_QFORMLAYOUT_HORIZONTALSPACING )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->horizontalSpacing ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->horizontalSpacing();
hb_retni( i );
}
/*
@@ -170,11 +170,11 @@ void insertRow ( int row, QWidget * label, QWidget * field )
*/
HB_FUNC( QT_QFORMLAYOUT_INSERTROW_1 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
QWidget * par3 = (QWidget *) hb_parptr(3);
QWidget * par4 = (QWidget *) hb_parptr(4);
par1->insertRow ( par2, par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
QWidget * par3 = ( QWidget * ) hb_parptr( 3 );
QWidget * par4 = ( QWidget * ) hb_parptr( 4 );
par1->insertRow( par2, par3, par4 );
}
/*
@@ -182,11 +182,11 @@ void insertRow ( int row, QWidget * label, QLayout * field )
*/
HB_FUNC( QT_QFORMLAYOUT_INSERTROW_2 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
QWidget * par3 = (QWidget *) hb_parptr(3);
QLayout * par4 = (QLayout *) hb_parptr(4);
par1->insertRow ( par2, par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
QWidget * par3 = ( QWidget * ) hb_parptr( 3 );
QLayout * par4 = ( QLayout * ) hb_parptr( 4 );
par1->insertRow( par2, par3, par4 );
}
/*
@@ -194,11 +194,11 @@ void insertRow ( int row, const QString & labelText, QWidget * field )
*/
HB_FUNC( QT_QFORMLAYOUT_INSERTROW_3 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
QString par3 = hb_parc(3);
QWidget * par4 = (QWidget *) hb_parptr(4);
par1->insertRow ( par2, par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
QString par3 = hb_parc( 3 );
QWidget * par4 = ( QWidget * ) hb_parptr( 4 );
par1->insertRow( par2, par3, par4 );
}
/*
@@ -206,11 +206,11 @@ void insertRow ( int row, const QString & labelText, QLayout * field )
*/
HB_FUNC( QT_QFORMLAYOUT_INSERTROW_4 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
QString par3 = hb_parc(3);
QLayout * par4 = (QLayout *) hb_parptr(4);
par1->insertRow ( par2, par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
QString par3 = hb_parc( 3 );
QLayout * par4 = ( QLayout * ) hb_parptr( 4 );
par1->insertRow( par2, par3, par4 );
}
/*
@@ -218,10 +218,10 @@ void insertRow ( int row, QWidget * widget )
*/
HB_FUNC( QT_QFORMLAYOUT_INSERTROW_5 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
QWidget * par3 = (QWidget *) hb_parptr(3);
par1->insertRow ( par2, par3 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
QWidget * par3 = ( QWidget * ) hb_parptr( 3 );
par1->insertRow( par2, par3 );
}
/*
@@ -229,10 +229,10 @@ void insertRow ( int row, QLayout * layout )
*/
HB_FUNC( QT_QFORMLAYOUT_INSERTROW_6 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
QLayout * par3 = (QLayout *) hb_parptr(3);
par1->insertRow ( par2, par3 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
QLayout * par3 = ( QLayout * ) hb_parptr( 3 );
par1->insertRow( par2, par3 );
}
/*
@@ -240,11 +240,11 @@ QLayoutItem * itemAt ( int row, ItemRole role ) const
*/
HB_FUNC( QT_QFORMLAYOUT_ITEMAT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
int par3 = hb_parni(3);
QLayoutItem * ptr = par1->itemAt ( par2, (QFormLayout::ItemRole) par3 );
hb_retptr( (QLayoutItem *) ptr );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
int par3 = hb_parni( 3 );
QLayoutItem * ptr = par1->itemAt( par2, ( QFormLayout::ItemRole ) par3 );
hb_retptr( ( QLayoutItem * ) ptr );
}
/*
@@ -252,9 +252,9 @@ Qt::Alignment labelAlignment () const
*/
HB_FUNC( QT_QFORMLAYOUT_LABELALIGNMENT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->labelAlignment ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->labelAlignment();
hb_retni( i );
}
/*
@@ -262,10 +262,10 @@ QWidget * labelForField ( QWidget * field ) const
*/
HB_FUNC( QT_QFORMLAYOUT_LABELFORFIELD_1 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QWidget * par2 = (QWidget *) hb_parptr(2);
QWidget * ptr = par1->labelForField ( par2 );
hb_retptr( (QWidget *) ptr );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QWidget * par2 = ( QWidget * ) hb_parptr( 2 );
QWidget * ptr = par1->labelForField( par2 );
hb_retptr( ( QWidget * ) ptr );
}
/*
@@ -273,10 +273,10 @@ QWidget * labelForField ( QLayout * field ) const
*/
HB_FUNC( QT_QFORMLAYOUT_LABELFORFIELD_2 )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
QLayout * par2 = (QLayout *) hb_parptr(2);
QWidget * ptr = par1->labelForField ( par2 );
hb_retptr( (QWidget *) ptr );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
QLayout * par2 = ( QLayout * ) hb_parptr( 2 );
QWidget * ptr = par1->labelForField( par2 );
hb_retptr( ( QWidget * ) ptr );
}
/*
@@ -284,9 +284,9 @@ int rowCount () const
*/
HB_FUNC( QT_QFORMLAYOUT_ROWCOUNT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->rowCount ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->rowCount();
hb_retni( i );
}
/*
@@ -294,9 +294,9 @@ RowWrapPolicy rowWrapPolicy () const
*/
HB_FUNC( QT_QFORMLAYOUT_ROWWRAPPOLICY )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->rowWrapPolicy ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->rowWrapPolicy();
hb_retni( i );
}
/*
@@ -304,9 +304,9 @@ void setFieldGrowthPolicy ( FieldGrowthPolicy policy )
*/
HB_FUNC( QT_QFORMLAYOUT_SETFIELDGROWTHPOLICY )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setFieldGrowthPolicy ( (QFormLayout::FieldGrowthPolicy) par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setFieldGrowthPolicy( ( QFormLayout::FieldGrowthPolicy ) par2 );
}
/*
@@ -314,9 +314,9 @@ void setFormAlignment ( Qt::Alignment alignment )
*/
HB_FUNC( QT_QFORMLAYOUT_SETFORMALIGNMENT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setFormAlignment ( (Qt::Alignment) par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setFormAlignment( ( Qt::Alignment ) par2 );
}
/*
@@ -324,9 +324,9 @@ void setHorizontalSpacing ( int spacing )
*/
HB_FUNC( QT_QFORMLAYOUT_SETHORIZONTALSPACING )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setHorizontalSpacing ( par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setHorizontalSpacing( par2 );
}
/*
@@ -334,11 +334,11 @@ void setItem ( int row, ItemRole role, QLayoutItem * item )
*/
HB_FUNC( QT_QFORMLAYOUT_SETITEM )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
int par3 = hb_parni(3);
QLayout * par4 = (QLayout *) hb_parptr(4);
par1->setItem ( par2, (QFormLayout::ItemRole) par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
int par3 = hb_parni( 3 );
QLayout * par4 = ( QLayout * ) hb_parptr( 4 );
par1->setItem( par2, ( QFormLayout::ItemRole ) par3, par4 );
}
/*
@@ -346,9 +346,9 @@ void setLabelAlignment ( Qt::Alignment alignment )
*/
HB_FUNC( QT_QFORMLAYOUT_SETLABELALIGNMENT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setLabelAlignment ( (Qt::Alignment) par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setLabelAlignment( ( Qt::Alignment ) par2 );
}
/*
@@ -356,11 +356,11 @@ void setLayout ( int row, ItemRole role, QLayout * layout )
*/
HB_FUNC( QT_QFORMLAYOUT_SETLAYOUT )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
int par3 = hb_parni(3);
QLayout * par4 = (QLayout *) hb_parptr(4);
par1->setLayout ( par2, (QFormLayout::ItemRole) par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
int par3 = hb_parni( 3 );
QLayout * par4 = ( QLayout * ) hb_parptr( 4 );
par1->setLayout( par2, ( QFormLayout::ItemRole ) par3, par4 );
}
/*
@@ -368,9 +368,9 @@ void setRowWrapPolicy ( RowWrapPolicy policy )
*/
HB_FUNC( QT_QFORMLAYOUT_SETROWWRAPPOLICY )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setRowWrapPolicy ( (QFormLayout::RowWrapPolicy) par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setRowWrapPolicy( ( QFormLayout::RowWrapPolicy ) par2 );
}
/*
@@ -378,9 +378,9 @@ void setSpacing ( int spacing )
*/
HB_FUNC( QT_QFORMLAYOUT_SETSPACING )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setSpacing ( par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setSpacing( par2 );
}
/*
@@ -388,9 +388,9 @@ void setVerticalSpacing ( int spacing )
*/
HB_FUNC( QT_QFORMLAYOUT_SETVERTICALSPACING )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
par1->setVerticalSpacing ( par2 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
par1->setVerticalSpacing( par2 );
}
/*
@@ -398,11 +398,11 @@ void setWidget ( int row, ItemRole role, QWidget * widget )
*/
HB_FUNC( QT_QFORMLAYOUT_SETWIDGET )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int par2 = hb_parni(2);
int par3 = hb_parni(3);
QWidget * par4 = (QWidget *) hb_parptr(4);
par1->setWidget ( par2, (QFormLayout::ItemRole) par3, par4 );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int par2 = hb_parni( 2 );
int par3 = hb_parni( 3 );
QWidget * par4 = ( QWidget * ) hb_parptr( 4 );
par1->setWidget( par2, (QFormLayout::ItemRole) par3, par4 );
}
/*
@@ -410,9 +410,9 @@ int spacing () const
*/
HB_FUNC( QT_QFORMLAYOUT_SPACING )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->spacing ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->spacing();
hb_retni( i );
}
/*
@@ -420,9 +420,9 @@ int verticalSpacing () const
*/
HB_FUNC( QT_QFORMLAYOUT_VERTICALSPACING )
{
QFormLayout * par1 = (QFormLayout *) hb_parptr(1);
int i = par1->verticalSpacing ( );
hb_retni( i );
QFormLayout * par1 = ( QFormLayout * ) hb_parptr( 1 );
int i = par1->verticalSpacing();
hb_retni( i );
}
/*----------------------------------------------------------------------*/

24
harbour/contrib/hbqt/hbqt_qframe.cpp
View File

@@ -65,7 +65,7 @@ QFrame ( QWidget * parent = 0, Qt::WindowFlags f = 0 )
*/
HB_FUNC( QT_QFRAME )
{
hb_retptr( ( QFrame* ) new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
hb_retptr( ( QFrame * ) new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*
@@ -73,7 +73,7 @@ Shadow frameShadow () const
*/
HB_FUNC( QT_QFRAME_FRAMESHADOW )
{
hb_retni( hbqt_par_QFrame( 1 )->frameShadow() );
hb_retni( hbqt_par_QFrame( 1 )->frameShadow() );
}
/*
@@ -81,7 +81,7 @@ Shape frameShape () const
*/
HB_FUNC( QT_QFRAME_FRAMESHAPE )
{
hb_retni( hbqt_par_QFrame( 1 )->frameShape() );
hb_retni( hbqt_par_QFrame( 1 )->frameShape() );
}
/*
@@ -89,7 +89,7 @@ int frameStyle () const
*/
HB_FUNC( QT_QFRAME_FRAMESTYLE )
{
hb_retni( hbqt_par_QFrame( 1 )->frameStyle() );
hb_retni( hbqt_par_QFrame( 1 )->frameStyle() );
}
/*
@@ -97,7 +97,7 @@ int frameWidth () const
*/
HB_FUNC( QT_QFRAME_FRAMEWIDTH )
{
hb_retni( hbqt_par_QFrame( 1 )->frameWidth() );
hb_retni( hbqt_par_QFrame( 1 )->frameWidth() );
}
/*
@@ -105,7 +105,7 @@ int lineWidth () const
*/
HB_FUNC( QT_QFRAME_LINEWIDTH )
{
hb_retni( hbqt_par_QFrame( 1 )->lineWidth() );
hb_retni( hbqt_par_QFrame( 1 )->lineWidth() );
}
/*
@@ -113,7 +113,7 @@ int midLineWidth () const
*/
HB_FUNC( QT_QFRAME_MIDLINEWIDTH )
{
hb_retni( hbqt_par_QFrame( 1 )->midLineWidth() );
hb_retni( hbqt_par_QFrame( 1 )->midLineWidth() );
}
/*
@@ -121,7 +121,7 @@ void setFrameShadow ( Shadow )
*/
HB_FUNC( QT_QFRAME_SETFRAMESHADOW )
{
hbqt_par_QFrame( 1 )->setFrameShadow( ( QFrame::Shadow ) hb_parni( 2 ) );
hbqt_par_QFrame( 1 )->setFrameShadow( ( QFrame::Shadow ) hb_parni( 2 ) );
}
/*
@@ -129,7 +129,7 @@ void setFrameShape ( Shape )
*/
HB_FUNC( QT_QFRAME_SETFRAMESHAPE )
{
hbqt_par_QFrame( 1 )->setFrameShape( ( QFrame::Shape ) hb_parni( 2 ) );
hbqt_par_QFrame( 1 )->setFrameShape( ( QFrame::Shape ) hb_parni( 2 ) );
}
/*
@@ -137,7 +137,7 @@ void setFrameStyle ( int style )
*/
HB_FUNC( QT_QFRAME_SETFRAMESTYLE )
{
hbqt_par_QFrame( 1 )->setFrameStyle( hb_parni( 2 ) );
hbqt_par_QFrame( 1 )->setFrameStyle( hb_parni( 2 ) );
}
/*
@@ -145,7 +145,7 @@ void setLineWidth ( int )
*/
HB_FUNC( QT_QFRAME_SETLINEWIDTH )
{
hbqt_par_QFrame( 1 )->setLineWidth( hb_parni( 2 ) );
hbqt_par_QFrame( 1 )->setLineWidth( hb_parni( 2 ) );
}
/*
@@ -153,7 +153,7 @@ void setMidLineWidth ( int )
*/
HB_FUNC( QT_QFRAME_SETMIDLINEWIDTH )
{
hbqt_par_QFrame( 1 )->setMidLineWidth( hb_parni( 2 ) );
hbqt_par_QFrame( 1 )->setMidLineWidth( hb_parni( 2 ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qgroupbox.cpp
View File

@@ -66,7 +66,7 @@ QGroupBox ( const QString & title, QWidget * parent = 0 )
*/
HB_FUNC( QT_QGROUPBOX )
{
hb_retptr( ( QGroupBox* ) new QGroupBox( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QGroupBox * ) new QGroupBox( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qhboxlayout.cpp
View File

@@ -66,7 +66,7 @@ QHBoxLayout ( QWidget * parent )
*/
HB_FUNC( QT_QHBOXLAYOUT )
{
hb_retptr( ( QHBoxLayout* ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QHBoxLayout * ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qinputdialog.cpp
View File

@@ -65,7 +65,7 @@ QInputDialog ( QWidget * parent = 0, Qt::WindowFlags flags = 0 )
*/
HB_FUNC( QT_QINPUTDIALOG )
{
hb_retptr( ( QInputDialog* ) new QInputDialog( hbqt_par_QWidget( 1 ), (Qt::WindowFlags) hb_parni( 2 ) ) );
hb_retptr( ( QInputDialog * ) new QInputDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

58
harbour/contrib/hbqt/hbqt_qlabel.cpp
View File

@@ -66,7 +66,7 @@ QLabel ( const QString & text, QWidget * parent = 0, Qt::WindowFlags f = 0 )
*/
HB_FUNC( QT_QLABEL )
{
hb_retptr( ( QLabel* ) new QLabel( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QLabel* ) new QLabel( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -74,7 +74,7 @@ Qt::Alignment alignment () const
*/
HB_FUNC( QT_QLABEL_ALIGNMENT )
{
hb_retni( hbqt_par_QLabel( 1 )->alignment() );
hb_retni( hbqt_par_QLabel( 1 )->alignment() );
}
/*
@@ -82,7 +82,7 @@ QWidget * buddy () const
*/
HB_FUNC( QT_QLABEL_BUDDY )
{
hb_retptr( ( QWidget* ) hbqt_par_QLabel( 1 )->buddy() );
hb_retptr( ( QWidget* ) hbqt_par_QLabel( 1 )->buddy() );
}
/*
@@ -90,7 +90,7 @@ bool hasScaledContents () const
*/
HB_FUNC( QT_QLABEL_HASSCALEDCONTENTS )
{
hb_retl( hbqt_par_QLabel( 1 )->hasScaledContents() );
hb_retl( hbqt_par_QLabel( 1 )->hasScaledContents() );
}
/*
@@ -98,7 +98,7 @@ int indent () const
*/
HB_FUNC( QT_QLABEL_INDENT )
{
hb_retni( hbqt_par_QLabel( 1 )->indent() );
hb_retni( hbqt_par_QLabel( 1 )->indent() );
}
/*
@@ -106,7 +106,7 @@ int margin () const
*/
HB_FUNC( QT_QLABEL_MARGIN )
{
hb_retni( hbqt_par_QLabel( 1 )->margin() );
hb_retni( hbqt_par_QLabel( 1 )->margin() );
}
/*
@@ -114,7 +114,7 @@ bool openExternalLinks () const
*/
HB_FUNC( QT_QLABEL_OPENEXTERNALLINKS )
{
hb_retl( hbqt_par_QLabel( 1 )->openExternalLinks() );
hb_retl( hbqt_par_QLabel( 1 )->openExternalLinks() );
}
/*
@@ -122,7 +122,7 @@ void setAlignment ( Qt::Alignment )
*/
HB_FUNC( QT_QLABEL_SETALIGNMENT )
{
hbqt_par_QLabel( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
hbqt_par_QLabel( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
}
/*
@@ -130,7 +130,7 @@ void setBuddy ( QWidget * buddy )
*/
HB_FUNC( QT_QLABEL_SETBUDDY )
{
hbqt_par_QLabel( 1 )->setBuddy( hbqt_par_QWidget( 1 ) );
hbqt_par_QLabel( 1 )->setBuddy( hbqt_par_QWidget( 1 ) );
}
/*
@@ -138,7 +138,7 @@ void setIndent ( int )
*/
HB_FUNC( QT_QLABEL_SETINDENT )
{
hbqt_par_QLabel( 1 )->setIndent( hb_parni( 2 ) );
hbqt_par_QLabel( 1 )->setIndent( hb_parni( 2 ) );
}
/*
@@ -146,7 +146,7 @@ void setMargin ( int )
*/
HB_FUNC( QT_QLABEL_SETMARGIN )
{
hbqt_par_QLabel( 1 )->setMargin( hb_parni( 2 ) );
hbqt_par_QLabel( 1 )->setMargin( hb_parni( 2 ) );
}
/*
@@ -154,7 +154,7 @@ void setOpenExternalLinks ( bool open )
*/
HB_FUNC( QT_QLABEL_SETOPENEXTERNALLINKS )
{
hbqt_par_QLabel( 1 )->setOpenExternalLinks( hb_parl( 2 ) );
hbqt_par_QLabel( 1 )->setOpenExternalLinks( hb_parl( 2 ) );
}
/*
@@ -162,7 +162,7 @@ void setScaledContents ( bool )
*/
HB_FUNC( QT_QLABEL_SETSCALEDCONTENTS )
{
hbqt_par_QLabel( 1 )->setScaledContents( hb_parl( 2 ) );
hbqt_par_QLabel( 1 )->setScaledContents( hb_parl( 2 ) );
}
/*
@@ -170,7 +170,7 @@ void setTextFormat ( Qt::TextFormat )
*/
HB_FUNC( QT_QLABEL_SETTEXTFORMAT )
{
hbqt_par_QLabel( 1 )->setTextFormat( ( Qt::TextFormat ) hb_parni( 2 ) );
hbqt_par_QLabel( 1 )->setTextFormat( ( Qt::TextFormat ) hb_parni( 2 ) );
}
/*
@@ -178,7 +178,7 @@ void setTextInteractionFlags ( Qt::TextInteractionFlags flags )
*/
HB_FUNC( QT_QLABEL_SETTEXTINTERACTIONFLAGS )
{
hbqt_par_QLabel( 1 )->setTextInteractionFlags( ( Qt::TextInteractionFlags ) hb_parni( 2 ) );
hbqt_par_QLabel( 1 )->setTextInteractionFlags( ( Qt::TextInteractionFlags ) hb_parni( 2 ) );
}
/*
@@ -186,7 +186,7 @@ void setWordWrap ( bool on )
*/
HB_FUNC( QT_QLABEL_SETWORDWRAP )
{
hbqt_par_QLabel( 1 )->setWordWrap( hb_parl( 2 ) );
hbqt_par_QLabel( 1 )->setWordWrap( hb_parl( 2 ) );
}
/*
@@ -194,7 +194,7 @@ QString text () const
*/
HB_FUNC( QT_QLABEL_TEXT )
{
hb_retc( hbqt_par_QLabel( 1 )->text().toLatin1().data() );
hb_retc( hbqt_par_QLabel( 1 )->text().toLatin1().data() );
}
/*
@@ -202,7 +202,7 @@ Qt::TextFormat textFormat () const
*/
HB_FUNC( QT_QLABEL_TEXTFORMAT )
{
hb_retni( hbqt_par_QLabel( 1 )->textFormat() );
hb_retni( hbqt_par_QLabel( 1 )->textFormat() );
}
/*
@@ -210,7 +210,7 @@ Qt::TextInteractionFlags textInteractionFlags () const
*/
HB_FUNC( QT_QLABEL_TEXTINTERACTIONFLAGS )
{
hb_retni( hbqt_par_QLabel( 1 )->textInteractionFlags() );
hb_retni( hbqt_par_QLabel( 1 )->textInteractionFlags() );
}
/*
@@ -218,7 +218,7 @@ bool wordWrap () const
*/
HB_FUNC( QT_QLABEL_WORDWRAP )
{
hb_retl( hbqt_par_QLabel( 1 )->wordWrap() );
hb_retl( hbqt_par_QLabel( 1 )->wordWrap() );
}
/*
@@ -226,22 +226,18 @@ void clear ()
*/
HB_FUNC( QT_QLABEL_CLEAR )
{
hbqt_par_QLabel( 1 )->clear();
hbqt_par_QLabel( 1 )->clear();
}
HB_FUNC( QT_QLABEL_SETNUM )
{
PHB_ITEM num = hb_param( 2, HB_IT_ANY );
PHB_ITEM num = hb_param( 2, HB_IT_ANY );
if( HB_IS_DOUBLE( num ) )
{
hbqt_par_QLabel( 1 )->setNum( ( double ) hb_parnd( 2 ) );
}
else if( HB_IS_NUMBER(num) )
{
hbqt_par_QLabel( 1 )->setNum( ( int ) hb_parni( 2 ) );
}
if( HB_IS_DOUBLE( num ) )
hbqt_par_QLabel( 1 )->setNum( ( double ) hb_parnd( 2 ) );
else if( HB_IS_NUMBER(num) )
hbqt_par_QLabel( 1 )->setNum( ( int ) hb_parni( 2 ) );
}
/*
@@ -249,7 +245,7 @@ void setText ( const QString & )
*/
HB_FUNC( QT_QLABEL_SETTEXT )
{
hbqt_par_QLabel( 1 )->setText( hbqt_par_QString( 2 ) );
hbqt_par_QLabel( 1 )->setText( hbqt_par_QString( 2 ) );
}
/*----------------------------------------------------------------------*/

36
harbour/contrib/hbqt/hbqt_qlayout.cpp
View File

@@ -65,7 +65,7 @@ bool activate ()
*/
HB_FUNC( QT_QLAYOUT_ACTIVATE )
{
hb_retl( hbqt_par_QLayout( 1 )->activate() );
hb_retl( hbqt_par_QLayout( 1 )->activate() );
}
/*
@@ -73,7 +73,7 @@ void addWidget ( QWidget * w )
*/
HB_FUNC( QT_QLAYOUT_ADDWIDGET )
{
hbqt_par_QLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ) );
hbqt_par_QLayout( 1 )->addWidget( hbqt_par_QWidget( 2 ) );
}
/*
@@ -81,7 +81,7 @@ bool isEnabled () const
*/
HB_FUNC( QT_QLAYOUT_ISENABLED )
{
hb_retl( hbqt_par_QLayout( 1 )->isEnabled() );
hb_retl( hbqt_par_QLayout( 1 )->isEnabled() );
}
/*
@@ -89,7 +89,7 @@ QWidget * menuBar () const
*/
HB_FUNC( QT_QLAYOUT_MENUBAR )
{
hb_retptr( ( QWidget* ) hbqt_par_QLayout( 1 )->menuBar() );
hb_retptr( ( QWidget* ) hbqt_par_QLayout( 1 )->menuBar() );
}
/*
@@ -97,7 +97,7 @@ QWidget * parentWidget () const
*/
HB_FUNC( QT_QLAYOUT_PARENTWIDGET )
{
hb_retptr( ( QWidget* ) hbqt_par_QLayout( 1 )->parentWidget() );
hb_retptr( ( QWidget* ) hbqt_par_QLayout( 1 )->parentWidget() );
}
/*
@@ -105,7 +105,7 @@ void removeItem ( QLayoutItem * item )
*/
HB_FUNC( QT_QLAYOUT_REMOVEITEM )
{
hbqt_par_QLayout( 1 )->removeItem( hbqt_par_QLayoutItem( 2 ) );
hbqt_par_QLayout( 1 )->removeItem( hbqt_par_QLayoutItem( 2 ) );
}
/*
@@ -113,7 +113,7 @@ void removeWidget ( QWidget * widget )
*/
HB_FUNC( QT_QLAYOUT_REMOVEWIDGET )
{
hbqt_par_QLayout( 1 )->removeWidget( hbqt_par_QWidget( 2 ) );
hbqt_par_QLayout( 1 )->removeWidget( hbqt_par_QWidget( 2 ) );
}
/*
@@ -121,7 +121,7 @@ bool setAlignment ( QWidget * w, Qt::Alignment alignment )
*/
HB_FUNC( QT_QLAYOUT_SETALIGNMENT_1 )
{
hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QWidget( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QWidget( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
}
/*
@@ -129,7 +129,7 @@ void setAlignment ( Qt::Alignment alignment )
*/
HB_FUNC( QT_QLAYOUT_SETALIGNMENT_2 )
{
hbqt_par_QLayout( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
hbqt_par_QLayout( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
}
/*
@@ -137,7 +137,7 @@ bool setAlignment ( QLayout * l, Qt::Alignment alignment )
*/
HB_FUNC( QT_QLAYOUT_SETALIGNMENT_3 )
{
hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QLayout( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
hb_retl( hbqt_par_QLayout( 1 )->setAlignment( hbqt_par_QLayout( 2 ), ( Qt::Alignment ) hb_parni( 3 ) ) );
}
/*
@@ -145,7 +145,7 @@ void setContentsMargins ( int left, int top, int right, int bottom )
*/
HB_FUNC( QT_QLAYOUT_SETCONTENTSMARGINS )
{
hbqt_par_QLayout( 1 )->setContentsMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
hbqt_par_QLayout( 1 )->setContentsMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
}
/*
@@ -153,7 +153,7 @@ void setEnabled ( bool enable )
*/
HB_FUNC( QT_QLAYOUT_SETENABLED )
{
hbqt_par_QLayout( 1 )->setEnabled( hb_parl( 2 ) );
hbqt_par_QLayout( 1 )->setEnabled( hb_parl( 2 ) );
}
/*
@@ -161,7 +161,7 @@ void setMenuBar ( QWidget * widget )
*/
HB_FUNC( QT_QLAYOUT_SETMENUBAR )
{
hbqt_par_QLayout( 1 )->setMenuBar( hbqt_par_QWidget( 2 ) );
hbqt_par_QLayout( 1 )->setMenuBar( hbqt_par_QWidget( 2 ) );
}
/*
@@ -169,7 +169,7 @@ void setSizeConstraint ( SizeConstraint )
*/
HB_FUNC( QT_QLAYOUT_SETSIZECONSTRAINT )
{
hbqt_par_QLayout( 1 )->setSizeConstraint( ( QLayout::SizeConstraint ) hb_parni( 2 ) );
hbqt_par_QLayout( 1 )->setSizeConstraint( ( QLayout::SizeConstraint ) hb_parni( 2 ) );
}
/*
@@ -177,7 +177,7 @@ void setSpacing ( int )
*/
HB_FUNC( QT_QLAYOUT_SETSPACING )
{
hbqt_par_QLayout( 1 )->setSpacing( hb_parni( 2 ) );
hbqt_par_QLayout( 1 )->setSpacing( hb_parni( 2 ) );
}
/*
@@ -185,7 +185,7 @@ SizeConstraint sizeConstraint () const
*/
HB_FUNC( QT_QLAYOUT_SIZECONSTRAINT )
{
hb_retni( hbqt_par_QLayout( 1 )->sizeConstraint() );
hb_retni( hbqt_par_QLayout( 1 )->sizeConstraint() );
}
/*
@@ -193,7 +193,7 @@ int spacing () const
*/
HB_FUNC( QT_QLAYOUT_SPACING )
{
hb_retni( hbqt_par_QLayout( 1 )->spacing() );
hb_retni( hbqt_par_QLayout( 1 )->spacing() );
}
/*
@@ -201,7 +201,7 @@ void update ()
*/
HB_FUNC( QT_QLAYOUT_UPDATE )
{
hbqt_par_QLayout( 1 )->update();
hbqt_par_QLayout( 1 )->update();
}
/*----------------------------------------------------------------------*/

6
harbour/contrib/hbqt/hbqt_qlayoutitem.cpp
View File

@@ -65,7 +65,7 @@ Qt::Alignment alignment () const
*/
HB_FUNC( QT_QLAYOUTITEM_ALIGNMENT )
{
hb_retni( hbqt_par_QLayoutItem( 1 )->alignment() );
hb_retni( hbqt_par_QLayoutItem( 1 )->alignment() );
}
/*
@@ -73,7 +73,7 @@ QSizePolicy::ControlTypes controlTypes () const
*/
HB_FUNC( QT_QLAYOUTITEM_CONTROLTYPES )
{
hb_retni( hbqt_par_QLayoutItem( 1 )->controlTypes() );
hb_retni( hbqt_par_QLayoutItem( 1 )->controlTypes() );
}
/*
@@ -81,7 +81,7 @@ void setAlignment ( Qt::Alignment alignment )
*/
HB_FUNC( QT_QLAYOUTITEM_SETALIGNMENT )
{
hbqt_par_QLayoutItem( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
hbqt_par_QLayoutItem( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qlcdnumber.cpp
View File

@@ -66,7 +66,7 @@ QLCDNumber ( uint numDigits, QWidget * parent = 0 )
*/
HB_FUNC( QT_QLCDNUMBER )
{
hb_retptr( ( QLCDNumber* ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QLCDNumber * ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

98
harbour/contrib/hbqt/hbqt_qlineedit.cpp
View File

@@ -66,7 +66,7 @@ QLineEdit( const QString & contents, QWidget * parent = 0 )
*/
HB_FUNC( QT_QLINEEDIT )
{
hb_retptr( ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -74,7 +74,7 @@ Qt::Alignment alignment () const
*/
HB_FUNC( QT_QLINEEDIT_ALIGNMENT )
{
hb_retni( hbqt_par_QLineEdit( 1 )->alignment() );
hb_retni( hbqt_par_QLineEdit( 1 )->alignment() );
}
/*
@@ -82,7 +82,7 @@ void backspace ()
*/
HB_FUNC( QT_QLINEEDIT_BACKSPACE )
{
hbqt_par_QLineEdit( 1 )->backspace();
hbqt_par_QLineEdit( 1 )->backspace();
}
/*
@@ -90,7 +90,7 @@ QCompleter * completer () const
*/
HB_FUNC( QT_QLINEEDIT_COMPLETER )
{
hb_retptr( ( QCompleter* ) hbqt_par_QLineEdit( 1 )->completer() );
hb_retptr( ( QCompleter* ) hbqt_par_QLineEdit( 1 )->completer() );
}
/*
@@ -98,7 +98,7 @@ QMenu * createStandardContextMenu ()
*/
HB_FUNC( QT_QLINEEDIT_CREATESTANDARDCONTEXTMENU )
{
hb_retptr( ( QMenu* ) hbqt_par_QLineEdit( 1 )->createStandardContextMenu() );
hb_retptr( ( QMenu* ) hbqt_par_QLineEdit( 1 )->createStandardContextMenu() );
}
/*
@@ -106,7 +106,7 @@ void cursorBackward( bool mark, int steps = 1 )
*/
HB_FUNC( QT_QLINEEDIT_CURSORBACKWARD )
{
hbqt_par_QLineEdit( 1 )->cursorBackward( hb_parl( 2 ), hb_parni( 3 ) );
hbqt_par_QLineEdit( 1 )->cursorBackward( hb_parl( 2 ), hb_parni( 3 ) );
}
/*
@@ -114,7 +114,7 @@ void cursorForward( bool mark, int steps = 1 )
*/
HB_FUNC( QT_QLINEEDIT_CURSORFORWARD )
{
hbqt_par_QLineEdit( 1 )->cursorForward( hb_parl( 2 ), hb_parni( 3 ) );
hbqt_par_QLineEdit( 1 )->cursorForward( hb_parl( 2 ), hb_parni( 3 ) );
}
/*
@@ -122,7 +122,7 @@ int cursorPosition () const
*/
HB_FUNC( QT_QLINEEDIT_CURSORPOSITION )
{
hb_retni( hbqt_par_QLineEdit( 1 )->cursorPosition() );
hb_retni( hbqt_par_QLineEdit( 1 )->cursorPosition() );
}
/*
@@ -130,7 +130,7 @@ void cursorWordBackward( bool mark )
*/
HB_FUNC( QT_QLINEEDIT_CURSORWORDBACKWARD )
{
hbqt_par_QLineEdit( 1 )->cursorWordBackward( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->cursorWordBackward( hb_parl( 2 ) );
}
/*
@@ -138,7 +138,7 @@ void cursorWordForward( bool mark )
*/
HB_FUNC( QT_QLINEEDIT_CURSORWORDFORWARD )
{
hbqt_par_QLineEdit( 1 )->cursorWordForward( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->cursorWordForward( hb_parl( 2 ) );
}
/*
@@ -146,7 +146,7 @@ void del ()
*/
HB_FUNC( QT_QLINEEDIT_DEL )
{
hbqt_par_QLineEdit( 1 )->del();
hbqt_par_QLineEdit( 1 )->del();
}
/*
@@ -154,7 +154,7 @@ void deselect ()
*/
HB_FUNC( QT_QLINEEDIT_DESELECT )
{
hbqt_par_QLineEdit( 1 )->deselect();
hbqt_par_QLineEdit( 1 )->deselect();
}
/*
@@ -162,7 +162,7 @@ QString displayText () const
*/
HB_FUNC( QT_QLINEEDIT_DISPLAYTEXT )
{
hb_retc( hbqt_par_QLineEdit( 1 )->displayText().toLatin1().data() );
hb_retc( hbqt_par_QLineEdit( 1 )->displayText().toLatin1().data() );
}
/*
@@ -170,7 +170,7 @@ bool dragEnabled () const
*/
HB_FUNC( QT_QLINEEDIT_DRAGENABLED )
{
hb_retl( hbqt_par_QLineEdit( 1 )->dragEnabled() );
hb_retl( hbqt_par_QLineEdit( 1 )->dragEnabled() );
}
/*
@@ -178,7 +178,7 @@ EchoMode echoMode () const
*/
HB_FUNC( QT_QLINEEDIT_ECHOMODE )
{
hb_retni( hbqt_par_QLineEdit( 1 )->echoMode() );
hb_retni( hbqt_par_QLineEdit( 1 )->echoMode() );
}
/*
@@ -186,7 +186,7 @@ void end( bool mark )
*/
HB_FUNC( QT_QLINEEDIT_END )
{
hbqt_par_QLineEdit( 1 )->end( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->end( hb_parl( 2 ) );
}
/*
@@ -194,7 +194,7 @@ bool hasAcceptableInput () const
*/
HB_FUNC( QT_QLINEEDIT_HASACCEPTABLEINPUT )
{
hb_retl( hbqt_par_QLineEdit( 1 )->hasAcceptableInput() );
hb_retl( hbqt_par_QLineEdit( 1 )->hasAcceptableInput() );
}
/*
@@ -202,7 +202,7 @@ bool hasFrame () const
*/
HB_FUNC( QT_QLINEEDIT_HASFRAME )
{
hb_retl( hbqt_par_QLineEdit( 1 )->hasFrame() );
hb_retl( hbqt_par_QLineEdit( 1 )->hasFrame() );
}
/*
@@ -210,7 +210,7 @@ bool hasSelectedText () const
*/
HB_FUNC( QT_QLINEEDIT_HASSELECTEDTEXT )
{
hb_retl( hbqt_par_QLineEdit( 1 )->hasSelectedText() );
hb_retl( hbqt_par_QLineEdit( 1 )->hasSelectedText() );
}
/*
@@ -218,7 +218,7 @@ void home( bool mark )
*/
HB_FUNC( QT_QLINEEDIT_HOME )
{
hbqt_par_QLineEdit( 1 )->home( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->home( hb_parl( 2 ) );
}
/*
@@ -226,7 +226,7 @@ QString inputMask () const
*/
HB_FUNC( QT_QLINEEDIT_INPUTMASK )
{
hb_retc( hbqt_par_QLineEdit( 1 )->inputMask().toLatin1().data() );
hb_retc( hbqt_par_QLineEdit( 1 )->inputMask().toLatin1().data() );
}
/*
@@ -234,7 +234,7 @@ void insert( const QString & newText )
*/
HB_FUNC( QT_QLINEEDIT_INSERT )
{
hbqt_par_QLineEdit( 1 )->insert( hbqt_par_QString( 2 ) );
hbqt_par_QLineEdit( 1 )->insert( hbqt_par_QString( 2 ) );
}
/*
@@ -242,7 +242,7 @@ bool isModified () const
*/
HB_FUNC( QT_QLINEEDIT_ISMODIFIED )
{
hb_retl( hbqt_par_QLineEdit( 1 )->isModified() );
hb_retl( hbqt_par_QLineEdit( 1 )->isModified() );
}
/*
@@ -250,7 +250,7 @@ bool isReadOnly () const
*/
HB_FUNC( QT_QLINEEDIT_ISREADONLY )
{
hb_retl( hbqt_par_QLineEdit( 1 )->isReadOnly() );
hb_retl( hbqt_par_QLineEdit( 1 )->isReadOnly() );
}
/*
@@ -258,7 +258,7 @@ bool isRedoAvailable () const
*/
HB_FUNC( QT_QLINEEDIT_ISREDOAVAILABLE )
{
hb_retl( hbqt_par_QLineEdit( 1 )->isRedoAvailable() );
hb_retl( hbqt_par_QLineEdit( 1 )->isRedoAvailable() );
}
/*
@@ -266,7 +266,7 @@ bool isUndoAvailable () const
*/
HB_FUNC( QT_QLINEEDIT_ISUNDOAVAILABLE )
{
hb_retl( hbqt_par_QLineEdit( 1 )->isUndoAvailable() );
hb_retl( hbqt_par_QLineEdit( 1 )->isUndoAvailable() );
}
/*
@@ -274,7 +274,7 @@ int maxLength () const
*/
HB_FUNC( QT_QLINEEDIT_MAXLENGTH )
{
hb_retni( hbqt_par_QLineEdit( 1 )->maxLength() );
hb_retni( hbqt_par_QLineEdit( 1 )->maxLength() );
}
/*
@@ -282,7 +282,7 @@ QString selectedText () const
*/
HB_FUNC( QT_QLINEEDIT_SELECTEDTEXT )
{
hb_retc( hbqt_par_QLineEdit( 1 )->selectedText().toLatin1().data() );
hb_retc( hbqt_par_QLineEdit( 1 )->selectedText().toLatin1().data() );
}
/*
@@ -290,7 +290,7 @@ int selectionStart () const
*/
HB_FUNC( QT_QLINEEDIT_SELECTIONSTART )
{
hb_retni( hbqt_par_QLineEdit( 1 )->selectionStart() );
hb_retni( hbqt_par_QLineEdit( 1 )->selectionStart() );
}
/*
@@ -298,7 +298,7 @@ void setAlignment( Qt::Alignment flag )
*/
HB_FUNC( QT_QLINEEDIT_SETALIGNMENT )
{
hbqt_par_QLineEdit( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
hbqt_par_QLineEdit( 1 )->setAlignment( ( Qt::Alignment ) hb_parni( 2 ) );
}
/*
@@ -306,7 +306,7 @@ void setCompleter( QCompleter * c )
*/
HB_FUNC( QT_QLINEEDIT_SETCOMPLETER )
{
hbqt_par_QLineEdit( 1 )->setCompleter( hbqt_par_QCompleter( 2 ) );
hbqt_par_QLineEdit( 1 )->setCompleter( hbqt_par_QCompleter( 2 ) );
}
/*
@@ -314,7 +314,7 @@ void setCursorPosition( int )
*/
HB_FUNC( QT_QLINEEDIT_SETCURSORPOSITION )
{
hbqt_par_QLineEdit( 1 )->setCursorPosition( hb_parni( 2 ) );
hbqt_par_QLineEdit( 1 )->setCursorPosition( hb_parni( 2 ) );
}
/*
@@ -322,7 +322,7 @@ void setDragEnabled( bool b )
*/
HB_FUNC( QT_QLINEEDIT_SETDRAGENABLED )
{
hbqt_par_QLineEdit( 1 )->setDragEnabled( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->setDragEnabled( hb_parl( 2 ) );
}
/*
@@ -330,7 +330,7 @@ void setEchoMode( EchoMode )
*/
HB_FUNC( QT_QLINEEDIT_SETECHOMODE )
{
hbqt_par_QLineEdit( 1 )->setEchoMode( ( QLineEdit::EchoMode ) hb_parni( 2 ) );
hbqt_par_QLineEdit( 1 )->setEchoMode( ( QLineEdit::EchoMode ) hb_parni( 2 ) );
}
/*
@@ -338,7 +338,7 @@ void setFrame( bool )
*/
HB_FUNC( QT_QLINEEDIT_SETFRAME )
{
hbqt_par_QLineEdit( 1 )->setFrame( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->setFrame( hb_parl( 2 ) );
}
/*
@@ -346,7 +346,7 @@ void setInputMask( const QString & inputMask )
*/
HB_FUNC( QT_QLINEEDIT_SETINPUTMASK )
{
hbqt_par_QLineEdit( 1 )->setInputMask( hbqt_par_QString( 2 ) );
hbqt_par_QLineEdit( 1 )->setInputMask( hbqt_par_QString( 2 ) );
}
/*
@@ -354,7 +354,7 @@ void setMaxLength( int )
*/
HB_FUNC( QT_QLINEEDIT_SETMAXLENGTH )
{
hbqt_par_QLineEdit( 1 )->setMaxLength( hb_parni( 2 ) );
hbqt_par_QLineEdit( 1 )->setMaxLength( hb_parni( 2 ) );
}
/*
@@ -362,7 +362,7 @@ void setModified( bool )
*/
HB_FUNC( QT_QLINEEDIT_SETMODIFIED )
{
hbqt_par_QLineEdit( 1 )->setModified( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->setModified( hb_parl( 2 ) );
}
/*
@@ -370,7 +370,7 @@ void setReadOnly( bool )
*/
HB_FUNC( QT_QLINEEDIT_SETREADONLY )
{
hbqt_par_QLineEdit( 1 )->setReadOnly( hb_parl( 2 ) );
hbqt_par_QLineEdit( 1 )->setReadOnly( hb_parl( 2 ) );
}
/*
@@ -378,7 +378,7 @@ void setSelection( int start, int length )
*/
HB_FUNC( QT_QLINEEDIT_SETSELECTION )
{
hbqt_par_QLineEdit( 1 )->setSelection( hb_parni( 2 ), hb_parni( 3 ) );
hbqt_par_QLineEdit( 1 )->setSelection( hb_parni( 2 ), hb_parni( 3 ) );
}
/*
@@ -386,7 +386,7 @@ void setTextMargins( int left, int top, int right, int bottom )
*/
HB_FUNC( QT_QLINEEDIT_SETTEXTMARGINS )
{
hbqt_par_QLineEdit( 1 )->setTextMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
hbqt_par_QLineEdit( 1 )->setTextMargins( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) );
}
/*
@@ -394,7 +394,7 @@ QString text () const
*/
HB_FUNC( QT_QLINEEDIT_TEXT )
{
hb_retc( hbqt_par_QLineEdit( 1 )->text().toLatin1().data() );
hb_retc( hbqt_par_QLineEdit( 1 )->text().toLatin1().data() );
}
/*
@@ -402,7 +402,7 @@ void copy () const
*/
HB_FUNC( QT_QLINEEDIT_COPY )
{
hbqt_par_QLineEdit( 1 )->copy();
hbqt_par_QLineEdit( 1 )->copy();
}
/*
@@ -410,7 +410,7 @@ void cut ()
*/
HB_FUNC( QT_QLINEEDIT_CUT )
{
hbqt_par_QLineEdit( 1 )->cut();
hbqt_par_QLineEdit( 1 )->cut();
}
/*
@@ -418,7 +418,7 @@ void paste ()
*/
HB_FUNC( QT_QLINEEDIT_PASTE )
{
hbqt_par_QLineEdit( 1 )->paste();
hbqt_par_QLineEdit( 1 )->paste();
}
/*
@@ -426,7 +426,7 @@ void redo ()
*/
HB_FUNC( QT_QLINEEDIT_REDO )
{
hbqt_par_QLineEdit( 1 )->redo();
hbqt_par_QLineEdit( 1 )->redo();
}
/*
@@ -434,7 +434,7 @@ void selectAll ()
*/
HB_FUNC( QT_QLINEEDIT_SELECTALL )
{
hbqt_par_QLineEdit( 1 )->selectAll();
hbqt_par_QLineEdit( 1 )->selectAll();
}
/*
@@ -442,7 +442,7 @@ void setText( const QString & )
*/
HB_FUNC( QT_QLINEEDIT_SETTEXT )
{
hbqt_par_QLineEdit( 1 )->setText( hbqt_par_QString( 2 ) );
hbqt_par_QLineEdit( 1 )->setText( hbqt_par_QString( 2 ) );
}
/*
@@ -450,7 +450,7 @@ void undo ()
*/
HB_FUNC( QT_QLINEEDIT_UNDO )
{
hbqt_par_QLineEdit( 1 )->undo();
hbqt_par_QLineEdit( 1 )->undo();
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qlistview.cpp
View File

@@ -65,7 +65,7 @@ QListView ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QLISTVIEW )
{
hb_retptr( ( QListView* ) new QListView( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QListView * ) new QListView( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

90
harbour/contrib/hbqt/hbqt_qmainwindow.cpp
View File

@@ -65,7 +65,7 @@ QMainWindow( QWidget * parent = 0, Qt::WindowFlags flags = 0 )
*/
HB_FUNC( QT_QMAINWINDOW )
{
hb_retptr( ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
hb_retptr( ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*
@@ -73,7 +73,7 @@ void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget )
*/
HB_FUNC( QT_QMAINWINDOW_ADDDOCKWIDGET_1 )
{
hbqt_par_QMainWindow( 1 )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) );
hbqt_par_QMainWindow( 1 )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ) );
}
/*
@@ -81,7 +81,7 @@ void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget, Qt::Orien
*/
HB_FUNC( QT_QMAINWINDOW_ADDDOCKWIDGET_2 )
{
hbqt_par_QMainWindow( 1 )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni(4) );
hbqt_par_QMainWindow( 1 )->addDockWidget( ( Qt::DockWidgetArea ) hb_parni( 2 ), hbqt_par_QDockWidget( 3 ), ( Qt::Orientation ) hb_parni(4) );
}
/*
@@ -89,7 +89,7 @@ void addToolBar( Qt::ToolBarArea area, QToolBar * toolbar )
*/
HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_1 )
{
hbqt_par_QMainWindow( 1 )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) );
hbqt_par_QMainWindow( 1 )->addToolBar( ( Qt::ToolBarArea ) hb_parni( 2 ), hbqt_par_QToolBar( 3 ) );
}
/*
@@ -97,7 +97,7 @@ void addToolBar( QToolBar * toolbar )
*/
HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_2 )
{
hbqt_par_QMainWindow( 1 )->addToolBar( hbqt_par_QToolBar( 2 ) );
hbqt_par_QMainWindow( 1 )->addToolBar( hbqt_par_QToolBar( 2 ) );
}
/*
@@ -105,7 +105,7 @@ QToolBar * addToolBar( const QString & title )
*/
HB_FUNC( QT_QMAINWINDOW_ADDTOOLBAR_3 )
{
hb_retptr( (QToolBar *) hbqt_par_QMainWindow( 1 )->addToolBar( hbqt_par_QString( 2 ) ) );
hb_retptr( (QToolBar *) hbqt_par_QMainWindow( 1 )->addToolBar( hbqt_par_QString( 2 ) ) );
}
/*
@@ -113,7 +113,7 @@ void addToolBarBreak( Qt::ToolBarArea area = Qt::TopToolBarArea )
*/
HB_FUNC( QT_QMAINWINDOW_ADDTOOLBARBREAK )
{
hbqt_par_QMainWindow( 1 )->addToolBarBreak( ( Qt::ToolBarArea ) hb_parni( 2 ) );
hbqt_par_QMainWindow( 1 )->addToolBarBreak( ( Qt::ToolBarArea ) hb_parni( 2 ) );
}
/*
@@ -121,7 +121,7 @@ QWidget * centralWidget () const
*/
HB_FUNC( QT_QMAINWINDOW_CENTRALWIDGET )
{
hb_retptr( (QWidget *) hbqt_par_QMainWindow( 1 )->centralWidget() );
hb_retptr( (QWidget *) hbqt_par_QMainWindow( 1 )->centralWidget() );
}
/*
@@ -129,7 +129,7 @@ Qt::DockWidgetArea corner( Qt::Corner corner ) const
*/
HB_FUNC( QT_QMAINWINDOW_CORNER )
{
hb_retni( hbqt_par_QMainWindow( 1 )->corner( ( Qt::Corner ) hb_parni( 2 ) ) );
hb_retni( hbqt_par_QMainWindow( 1 )->corner( ( Qt::Corner ) hb_parni( 2 ) ) );
}
/*
@@ -137,7 +137,7 @@ virtual QMenu * createPopupMenu ()
*/
HB_FUNC( QT_QMAINWINDOW_CREATEPOPUPMENU )
{
hb_retptr( (QMenu *) hbqt_par_QMainWindow( 1 )->createPopupMenu() );
hb_retptr( (QMenu *) hbqt_par_QMainWindow( 1 )->createPopupMenu() );
}
/*
@@ -145,7 +145,7 @@ DockOptions dockOptions () const
*/
HB_FUNC( QT_QMAINWINDOW_DOCKOPTIONS )
{
hb_retni( hbqt_par_QMainWindow( 1 )->dockOptions() );
hb_retni( hbqt_par_QMainWindow( 1 )->dockOptions() );
}
/*
@@ -153,7 +153,7 @@ Qt::DockWidgetArea dockWidgetArea( QDockWidget * dockwidget ) const
*/
HB_FUNC( QT_QMAINWINDOW_DOCKWIDGETAREA )
{
hb_retni( hbqt_par_QMainWindow( 1 )->dockWidgetArea( hbqt_par_QDockWidget( 2 ) ) );
hb_retni( hbqt_par_QMainWindow( 1 )->dockWidgetArea( hbqt_par_QDockWidget( 2 ) ) );
}
/*
@@ -161,7 +161,7 @@ bool documentMode () const
*/
HB_FUNC( QT_QMAINWINDOW_DOCUMENTMODE )
{
hb_retl( hbqt_par_QMainWindow( 1 )->documentMode() );
hb_retl( hbqt_par_QMainWindow( 1 )->documentMode() );
}
/*
@@ -169,7 +169,7 @@ void insertToolBar( QToolBar * before, QToolBar * toolbar )
*/
HB_FUNC( QT_QMAINWINDOW_INSERTTOOLBAR )
{
hbqt_par_QMainWindow( 1 )->insertToolBar( hbqt_par_QToolBar( 2 ), hbqt_par_QToolBar( 3 ) );
hbqt_par_QMainWindow( 1 )->insertToolBar( hbqt_par_QToolBar( 2 ), hbqt_par_QToolBar( 3 ) );
}
/*
@@ -177,7 +177,7 @@ void insertToolBarBreak( QToolBar * before )
*/
HB_FUNC( QT_QMAINWINDOW_INSERTTOOLBARBREAK )
{
hbqt_par_QMainWindow( 1 )->insertToolBarBreak( hbqt_par_QToolBar( 2 ) );
hbqt_par_QMainWindow( 1 )->insertToolBarBreak( hbqt_par_QToolBar( 2 ) );
}
/*
@@ -185,7 +185,7 @@ bool isAnimated () const
*/
HB_FUNC( QT_QMAINWINDOW_ISANIMATED )
{
hb_retl( hbqt_par_QMainWindow( 1 )->isAnimated() );
hb_retl( hbqt_par_QMainWindow( 1 )->isAnimated() );
}
/*
@@ -193,7 +193,7 @@ bool isDockNestingEnabled () const
*/
HB_FUNC( QT_QMAINWINDOW_ISDOCKNESTINGENABLED )
{
hb_retl( hbqt_par_QMainWindow( 1 )->isDockNestingEnabled() );
hb_retl( hbqt_par_QMainWindow( 1 )->isDockNestingEnabled() );
}
/*
@@ -201,7 +201,7 @@ QMenuBar * menuBar () const
*/
HB_FUNC( QT_QMAINWINDOW_MENUBAR )
{
hb_retptr( (QMenuBar *) hbqt_par_QMainWindow( 1 )->menuBar() );
hb_retptr( (QMenuBar *) hbqt_par_QMainWindow( 1 )->menuBar() );
}
/*
@@ -209,7 +209,7 @@ QWidget * menuWidget () const
*/
HB_FUNC( QT_QMAINWINDOW_MENUWIDGET )
{
hb_retptr( (QWidget *) hbqt_par_QMainWindow( 1 )->menuWidget() );
hb_retptr( (QWidget *) hbqt_par_QMainWindow( 1 )->menuWidget() );
}
/*
@@ -217,7 +217,7 @@ void removeDockWidget( QDockWidget * dockwidget )
*/
HB_FUNC( QT_QMAINWINDOW_REMOVEDOCKWIDGET )
{
hbqt_par_QMainWindow( 1 )->removeDockWidget( hbqt_par_QDockWidget( 2 ) );
hbqt_par_QMainWindow( 1 )->removeDockWidget( hbqt_par_QDockWidget( 2 ) );
}
/*
@@ -225,7 +225,7 @@ void removeToolBar( QToolBar * toolbar )
*/
HB_FUNC( QT_QMAINWINDOW_REMOVETOOLBAR )
{
hbqt_par_QMainWindow( 1 )->removeToolBar( hbqt_par_QToolBar( 2 ) );
hbqt_par_QMainWindow( 1 )->removeToolBar( hbqt_par_QToolBar( 2 ) );
}
/*
@@ -233,7 +233,7 @@ void removeToolBarBreak( QToolBar * before )
*/
HB_FUNC( QT_QMAINWINDOW_REMOVETOOLBARBREAK )
{
hbqt_par_QMainWindow( 1 )->removeToolBarBreak( hbqt_par_QToolBar( 2 ) );
hbqt_par_QMainWindow( 1 )->removeToolBarBreak( hbqt_par_QToolBar( 2 ) );
}
/*
@@ -241,7 +241,7 @@ bool restoreDockWidget( QDockWidget * dockwidget )
*/
HB_FUNC( QT_QMAINWINDOW_RESTOREDOCKWIDGET )
{
hb_retl( hbqt_par_QMainWindow( 1 )->restoreDockWidget( hbqt_par_QDockWidget( 2 ) ) );
hb_retl( hbqt_par_QMainWindow( 1 )->restoreDockWidget( hbqt_par_QDockWidget( 2 ) ) );
}
/*
@@ -249,7 +249,7 @@ void setCentralWidget( QWidget * widget )
*/
HB_FUNC( QT_QMAINWINDOW_SETCENTRALWIDGET )
{
hbqt_par_QMainWindow( 1 )->setCentralWidget( hbqt_par_QWidget( 2 ) );
hbqt_par_QMainWindow( 1 )->setCentralWidget( hbqt_par_QWidget( 2 ) );
}
/*
@@ -257,7 +257,7 @@ void setCorner( Qt::Corner corner, Qt::DockWidgetArea area )
*/
HB_FUNC( QT_QMAINWINDOW_SETCORNER )
{
hbqt_par_QMainWindow( 1 )->setCorner( ( Qt::Corner) hb_parni( 2 ), ( Qt::DockWidgetArea ) hb_parni(3) );
hbqt_par_QMainWindow( 1 )->setCorner( ( Qt::Corner) hb_parni( 2 ), ( Qt::DockWidgetArea ) hb_parni(3) );
}
/*
@@ -265,7 +265,7 @@ void setDockOptions( DockOptions options )
*/
HB_FUNC( QT_QMAINWINDOW_SETDOCKOPTIONS )
{
hbqt_par_QMainWindow( 1 )->setDockOptions( ( QMainWindow::DockOptions ) hb_parni( 2 ) );
hbqt_par_QMainWindow( 1 )->setDockOptions( ( QMainWindow::DockOptions ) hb_parni( 2 ) );
}
/*
@@ -273,7 +273,7 @@ void setDocumentMode( bool enabled )
*/
HB_FUNC( QT_QMAINWINDOW_SETDOCUMENTMODE )
{
hbqt_par_QMainWindow( 1 )->setDocumentMode( hb_parl( 2 ) );
hbqt_par_QMainWindow( 1 )->setDocumentMode( hb_parl( 2 ) );
}
/*
@@ -281,7 +281,7 @@ void setMenuBar( QMenuBar * menuBar )
*/
HB_FUNC( QT_QMAINWINDOW_SETMENUBAR )
{
hbqt_par_QMainWindow( 1 )->setMenuBar( hbqt_par_QMenuBar( 2 ) );
hbqt_par_QMainWindow( 1 )->setMenuBar( hbqt_par_QMenuBar( 2 ) );
}
/*
@@ -289,7 +289,7 @@ void setMenuWidget( QWidget * menuBar )
*/
HB_FUNC( QT_QMAINWINDOW_SETMENUWIDGET )
{
hbqt_par_QMainWindow( 1 )->setMenuWidget( hbqt_par_QWidget( 2 ) );
hbqt_par_QMainWindow( 1 )->setMenuWidget( hbqt_par_QWidget( 2 ) );
}
/*
@@ -297,7 +297,7 @@ void setStatusBar( QStatusBar * statusbar )
*/
HB_FUNC( QT_QMAINWINDOW_SETSTATUSBAR )
{
hbqt_par_QMainWindow( 1 )->setStatusBar( hbqt_par_QStatusBar( 2 ) );
hbqt_par_QMainWindow( 1 )->setStatusBar( hbqt_par_QStatusBar( 2 ) );
}
/*
@@ -305,7 +305,7 @@ void setTabPosition( Qt::DockWidgetAreas areas, QTabWidget::TabPosition tabPosit
*/
HB_FUNC( QT_QMAINWINDOW_SETTABPOSITION )
{
hbqt_par_QMainWindow( 1 )->setTabPosition( ( Qt::DockWidgetAreas) hb_parni( 2 ), ( QTabWidget::TabPosition ) hb_parni(3) );
hbqt_par_QMainWindow( 1 )->setTabPosition( ( Qt::DockWidgetAreas) hb_parni( 2 ), ( QTabWidget::TabPosition ) hb_parni(3) );
}
/*
@@ -313,7 +313,7 @@ void setTabShape( QTabWidget::TabShape tabShape )
*/
HB_FUNC( QT_QMAINWINDOW_SETTABSHAPE )
{
hbqt_par_QMainWindow( 1 )->setTabShape( ( QTabWidget::TabShape ) hb_parni( 2 ) );
hbqt_par_QMainWindow( 1 )->setTabShape( ( QTabWidget::TabShape ) hb_parni( 2 ) );
}
/*
@@ -321,7 +321,7 @@ void setToolButtonStyle( Qt::ToolButtonStyle toolButtonStyle )
*/
HB_FUNC( QT_QMAINWINDOW_SETTOOLBUTTONSTYLE )
{
hbqt_par_QMainWindow( 1 )->setToolButtonStyle( ( Qt::ToolButtonStyle ) hb_parni( 2 ) );
hbqt_par_QMainWindow( 1 )->setToolButtonStyle( ( Qt::ToolButtonStyle ) hb_parni( 2 ) );
}
/*
@@ -329,7 +329,7 @@ void setUnifiedTitleAndToolBarOnMac( bool set )
*/
HB_FUNC( QT_QMAINWINDOW_SETUNIFIEDTITLEANDTOOLBARONMAC )
{
hbqt_par_QMainWindow( 1 )->setUnifiedTitleAndToolBarOnMac( hb_parl( 2 ) );
hbqt_par_QMainWindow( 1 )->setUnifiedTitleAndToolBarOnMac( hb_parl( 2 ) );
}
/*
@@ -337,7 +337,7 @@ void splitDockWidget( QDockWidget * first, QDockWidget * second, Qt::Orientation
*/
HB_FUNC( QT_QMAINWINDOW_SPLITDOCKWIDGET )
{
hbqt_par_QMainWindow( 1 )->splitDockWidget( hbqt_par_QDockWidget( 2 ), hbqt_par_QDockWidget( 3 ), (Qt::Orientation) hb_parni(4) );
hbqt_par_QMainWindow( 1 )->splitDockWidget( hbqt_par_QDockWidget( 2 ), hbqt_par_QDockWidget( 3 ), (Qt::Orientation) hb_parni(4) );
}
/*
@@ -345,7 +345,7 @@ QStatusBar * statusBar () const
*/
HB_FUNC( QT_QMAINWINDOW_STATUSBAR )
{
hb_retptr( (QStatusBar *) hbqt_par_QMainWindow( 1 )->statusBar() );
hb_retptr( (QStatusBar *) hbqt_par_QMainWindow( 1 )->statusBar() );
}
/*
@@ -353,7 +353,7 @@ QTabWidget::TabPosition tabPosition( Qt::DockWidgetArea area ) const
*/
HB_FUNC( QT_QMAINWINDOW_TABPOSITION )
{
hb_retni( hbqt_par_QMainWindow( 1 )->tabPosition( ( Qt::DockWidgetArea ) hb_parni( 2 ) ) );
hb_retni( hbqt_par_QMainWindow( 1 )->tabPosition( ( Qt::DockWidgetArea ) hb_parni( 2 ) ) );
}
/*
@@ -361,7 +361,7 @@ QTabWidget::TabShape tabShape () const
*/
HB_FUNC( QT_QMAINWINDOW_TABSHAPE )
{
hb_retni( hbqt_par_QMainWindow( 1 )->tabShape() );
hb_retni( hbqt_par_QMainWindow( 1 )->tabShape() );
}
/*
@@ -369,7 +369,7 @@ void tabifyDockWidget( QDockWidget * first, QDockWidget * second )
*/
HB_FUNC( QT_QMAINWINDOW_TABIFYDOCKWIDGET )
{
hbqt_par_QMainWindow( 1 )->tabifyDockWidget( hbqt_par_QDockWidget( 2 ), hbqt_par_QDockWidget( 3 ) );
hbqt_par_QMainWindow( 1 )->tabifyDockWidget( hbqt_par_QDockWidget( 2 ), hbqt_par_QDockWidget( 3 ) );
}
/*
@@ -377,7 +377,7 @@ Qt::ToolBarArea toolBarArea( QToolBar * toolbar ) const
*/
HB_FUNC( QT_QMAINWINDOW_TOOLBARAREA )
{
hb_retni( hbqt_par_QMainWindow( 1 )->toolBarArea( hbqt_par_QToolBar( 2 ) ) );
hb_retni( hbqt_par_QMainWindow( 1 )->toolBarArea( hbqt_par_QToolBar( 2 ) ) );
}
/*
@@ -385,7 +385,7 @@ bool toolBarBreak( QToolBar * toolbar ) const
*/
HB_FUNC( QT_QMAINWINDOW_TOOLBARBREAK )
{
hb_retl( hbqt_par_QMainWindow( 1 )->toolBarBreak( hbqt_par_QToolBar( 2 ) ) );
hb_retl( hbqt_par_QMainWindow( 1 )->toolBarBreak( hbqt_par_QToolBar( 2 ) ) );
}
/*
@@ -393,7 +393,7 @@ Qt::ToolButtonStyle toolButtonStyle () const
*/
HB_FUNC( QT_QMAINWINDOW_TOOLBUTTONSTYLE )
{
hb_retni( hbqt_par_QMainWindow( 1 )->toolButtonStyle() );
hb_retni( hbqt_par_QMainWindow( 1 )->toolButtonStyle() );
}
/*
@@ -401,7 +401,7 @@ bool unifiedTitleAndToolBarOnMac () const
*/
HB_FUNC( QT_QMAINWINDOW_UNIFIEDTITLEANDTOOLBARONMAC )
{
hb_retl( hbqt_par_QMainWindow( 1 )->unifiedTitleAndToolBarOnMac() );
hb_retl( hbqt_par_QMainWindow( 1 )->unifiedTitleAndToolBarOnMac() );
}
/*
@@ -409,7 +409,7 @@ void setAnimated( bool enabled )
*/
HB_FUNC( QT_QMAINWINDOW_SETANIMATED )
{
hbqt_par_QMainWindow( 1 )->setAnimated( hb_parl( 2 ) );
hbqt_par_QMainWindow( 1 )->setAnimated( hb_parl( 2 ) );
}
/*
@@ -417,7 +417,7 @@ void setDockNestingEnabled( bool enabled ) const
*/
HB_FUNC( QT_QMAINWINDOW_SETDOCKNESTINGENABLED )
{
hbqt_par_QMainWindow( 1 )->setDockNestingEnabled( hb_parl( 2 ) );
hbqt_par_QMainWindow( 1 )->setDockNestingEnabled( hb_parl( 2 ) );
}
/*----------------------------------------------------------------------*/

92
harbour/contrib/hbqt/hbqt_qmenu.cpp
View File

@@ -66,17 +66,17 @@ QMenu ( const QString & title, QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QMENU )
{
if( hb_param( 1, HB_IT_POINTER ) )
hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QWidget( 1 ) ) );
else if( hb_param( 1, HB_IT_STRING ) && hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( NULL );
if( hb_param( 1, HB_IT_POINTER ) )
hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QWidget( 1 ) ) );
else if( hb_param( 1, HB_IT_STRING ) && hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( NULL );
}
#if 0
HB_FUNC( QT_QMENU_2 )
{
hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
}
#endif
@@ -85,7 +85,7 @@ QAction * activeAction () const
*/
HB_FUNC( QT_QMENU_ACTIVEACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->activeAction() );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->activeAction() );
}
/*
@@ -93,12 +93,12 @@ QAction * addAction ( const QString & text )
*/
HB_FUNC( QT_QMENU_ADDACTION )
{
if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hbqt_par_QMenu( 1 )->addAction( hbqt_par_QAction( 2 ) );
else if( hb_pcount() == 3 && hb_param( 2, HB_IT_STRING ) && hb_param( 3, HB_IT_STRING ) )
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hbqt_par_QMenu( 1 )->addAction( hbqt_par_QAction( 2 ) );
else if( hb_pcount() == 3 && hb_param( 2, HB_IT_STRING ) && hb_param( 3, HB_IT_STRING ) )
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
}
#if 0
@@ -107,7 +107,7 @@ QAction * addAction ( const QIcon & icon, const QString & text )
*/
HB_FUNC( QT_QMENU_ADDACTION_2 )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
}
/*
@@ -115,20 +115,20 @@ void addAction ( QAction * action )
*/
HB_FUNC( QT_QMENU_ADDACTION_5 )
{
hbqt_par_QMenu( 1 )->addAction( hbqt_par_QAction( 2 ) );
hbqt_par_QMenu( 1 )->addAction( hbqt_par_QAction( 2 ) );
}
#endif
HB_FUNC( QT_QMENU_ADDMENU )
{
if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 3 && hb_param( 2, HB_IT_STRING ) && hb_param( 3, HB_IT_STRING ) )
hb_retptr( (QMenu *) hbqt_par_QMenu( 1 )->addMenu ( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
else
hb_retptr( NULL );
if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QAction * ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( ( QMenu * ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 3 && hb_param( 2, HB_IT_STRING ) && hb_param( 3, HB_IT_STRING ) )
hb_retptr( ( QMenu * ) hbqt_par_QMenu( 1 )->addMenu ( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
else
hb_retptr( NULL );
}
#if 0
@@ -137,7 +137,7 @@ QAction * addMenu ( QMenu * menu )
*/
HB_FUNC( QT_QMENU_ADDMENU_1 )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
}
/*
@@ -145,7 +145,7 @@ QMenu * addMenu ( const QString & title )
*/
HB_FUNC( QT_QMENU_ADDMENU_2 )
{
hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
hb_retptr( ( QMenu* ) hbqt_par_QMenu( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
}
/*
@@ -153,7 +153,7 @@ QMenu * addMenu ( const QIcon & icon, const QString & title )
*/
HB_FUNC( QT_QMENU_ADDMENU_3 )
{
hb_retptr( (QMenu *) hbqt_par_QMenu( 1 )->addMenu ( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
hb_retptr( (QMenu *) hbqt_par_QMenu( 1 )->addMenu ( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
}
#endif
@@ -162,7 +162,7 @@ QAction * addSeparator ()
*/
HB_FUNC( QT_QMENU_ADDSEPARATOR )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addSeparator() );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->addSeparator() );
}
/*
@@ -170,7 +170,7 @@ void clear ()
*/
HB_FUNC( QT_QMENU_CLEAR )
{
hbqt_par_QMenu( 1 )->clear();
hbqt_par_QMenu( 1 )->clear();
}
/*
@@ -178,7 +178,7 @@ QAction * defaultAction () const
*/
HB_FUNC( QT_QMENU_DEFAULTACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->defaultAction() );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->defaultAction() );
}
/*
@@ -186,7 +186,7 @@ QAction * exec ()
*/
HB_FUNC( QT_QMENU_EXEC_1 )
{
hb_retptr( (QAction *) hbqt_par_QMenu( 1 )->exec() );
hb_retptr( (QAction *) hbqt_par_QMenu( 1 )->exec() );
}
/*
@@ -194,7 +194,7 @@ void hideTearOffMenu ()
*/
HB_FUNC( QT_QMENU_HIDETEAROFFMENU )
{
hbqt_par_QMenu( 1 )->hideTearOffMenu ( );
hbqt_par_QMenu( 1 )->hideTearOffMenu ( );
}
/*
@@ -202,7 +202,7 @@ QAction * insertMenu ( QAction * before, QMenu * menu )
*/
HB_FUNC( QT_QMENU_INSERTMENU )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->insertMenu( hbqt_par_QAction( 2 ), hbqt_par_QMenu( 3 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->insertMenu( hbqt_par_QAction( 2 ), hbqt_par_QMenu( 3 ) ) );
}
/*
@@ -210,7 +210,7 @@ QAction * insertSeparator ( QAction * before )
*/
HB_FUNC( QT_QMENU_INSERTSEPARATOR )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->insertSeparator( hbqt_par_QAction( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->insertSeparator( hbqt_par_QAction( 2 ) ) );
}
/*
@@ -218,7 +218,7 @@ bool isEmpty () const
*/
HB_FUNC( QT_QMENU_ISEMPTY )
{
hb_retl( hbqt_par_QMenu( 1 )->isEmpty() );
hb_retl( hbqt_par_QMenu( 1 )->isEmpty() );
}
/*
@@ -226,7 +226,7 @@ bool isTearOffEnabled () const
*/
HB_FUNC( QT_QMENU_ISTEAROFFENABLED )
{
hb_retl( hbqt_par_QMenu( 1 )->isTearOffEnabled() );
hb_retl( hbqt_par_QMenu( 1 )->isTearOffEnabled() );
}
/*
@@ -234,7 +234,7 @@ bool isTearOffMenuVisible () const
*/
HB_FUNC( QT_QMENU_ISTEAROFFMENUVISIBLE )
{
hb_retl( hbqt_par_QMenu( 1 )->isTearOffMenuVisible() );
hb_retl( hbqt_par_QMenu( 1 )->isTearOffMenuVisible() );
}
/*
@@ -242,7 +242,7 @@ QAction * menuAction () const
*/
HB_FUNC( QT_QMENU_MENUACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->menuAction() );
hb_retptr( ( QAction* ) hbqt_par_QMenu( 1 )->menuAction() );
}
/*
@@ -250,7 +250,7 @@ bool separatorsCollapsible () const
*/
HB_FUNC( QT_QMENU_SEPARATORSCOLLAPSIBLE )
{
hb_retl( hbqt_par_QMenu( 1 )->separatorsCollapsible() );
hb_retl( hbqt_par_QMenu( 1 )->separatorsCollapsible() );
}
/*
@@ -258,7 +258,7 @@ void setActiveAction ( QAction * act )
*/
HB_FUNC( QT_QMENU_SETACTIVEACTION )
{
hbqt_par_QMenu( 1 )->setActiveAction( hbqt_par_QAction( 2 ) );
hbqt_par_QMenu( 1 )->setActiveAction( hbqt_par_QAction( 2 ) );
}
/*
@@ -266,7 +266,7 @@ void setDefaultAction ( QAction * act )
*/
HB_FUNC( QT_QMENU_SETDEFAULTACTION )
{
hbqt_par_QMenu( 1 )->setDefaultAction( hbqt_par_QAction( 2 ) );
hbqt_par_QMenu( 1 )->setDefaultAction( hbqt_par_QAction( 2 ) );
}
/*
@@ -274,7 +274,7 @@ void setIcon ( const QIcon & icon )
*/
HB_FUNC( QT_QMENU_SETICON )
{
hbqt_par_QMenu( 1 )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
hbqt_par_QMenu( 1 )->setIcon( QIcon( hbqt_par_QString( 2 ) ) );
}
/*
@@ -282,7 +282,7 @@ void setSeparatorsCollapsible ( bool collapse )
*/
HB_FUNC( QT_QMENU_SETSEPARATORSCOLLAPSIBLE )
{
hbqt_par_QMenu( 1 )->setSeparatorsCollapsible( hb_parl( 2 ) );
hbqt_par_QMenu( 1 )->setSeparatorsCollapsible( hb_parl( 2 ) );
}
/*
@@ -290,7 +290,7 @@ void setTearOffEnabled ( bool )
*/
HB_FUNC( QT_QMENU_SETTEAROFFENABLED )
{
hbqt_par_QMenu( 1 )->setTearOffEnabled( hb_parl( 2 ) );
hbqt_par_QMenu( 1 )->setTearOffEnabled( hb_parl( 2 ) );
}
/*
@@ -298,7 +298,7 @@ void setTitle ( const QString & title )
*/
HB_FUNC( QT_QMENU_SETTITLE )
{
hbqt_par_QMenu( 1 )->setTitle( hbqt_par_QString( 2 ) );
hbqt_par_QMenu( 1 )->setTitle( hbqt_par_QString( 2 ) );
}
/*
@@ -306,7 +306,7 @@ QString title () const
*/
HB_FUNC( QT_QMENU_TITLE )
{
hb_retc( hbqt_par_QMenu( 1 )->title().toLatin1().data() );
hb_retc( hbqt_par_QMenu( 1 )->title().toLatin1().data() );
}
/*----------------------------------------------------------------------*/

56
harbour/contrib/hbqt/hbqt_qmenubar.cpp
View File

@@ -65,7 +65,7 @@ QMenuBar ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QMENUBAR )
{
hb_retptr( ( QMenuBar* ) new QMenuBar( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QMenuBar* ) new QMenuBar( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -73,17 +73,17 @@ QAction * activeAction () const
*/
HB_FUNC( QT_QMENUBAR_ACTIVEACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->activeAction() );
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->activeAction() );
}
HB_FUNC( QT_QMENUBAR_ADDACTION )
{
if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( (QAction *) hbqt_par_QMenuBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hbqt_par_QMenuBar( 1 )->addAction ( hbqt_par_QAction( 2 ) );
else
hb_retptr( NULL );
if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( (QAction *) hbqt_par_QMenuBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hbqt_par_QMenuBar( 1 )->addAction ( hbqt_par_QAction( 2 ) );
else
hb_retptr( NULL );
}
/*
@@ -91,7 +91,7 @@ QAction * addAction ( const QString & text )
*/
HB_FUNC( QT_QMENUBAR_ADDACTION_1 )
{
hb_retptr( (QAction *) hbqt_par_QMenuBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
hb_retptr( (QAction *) hbqt_par_QMenuBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
}
/*
@@ -99,19 +99,19 @@ void addAction ( QAction * action )
*/
HB_FUNC( QT_QMENUBAR_ADDACTION_2 )
{
hbqt_par_QMenuBar( 1 )->addAction ( hbqt_par_QAction( 2 ) );
hbqt_par_QMenuBar( 1 )->addAction ( hbqt_par_QAction( 2 ) );
}
HB_FUNC( QT_QMENUBAR_ADDMENU )
{
if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( (QMenu *) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 3 && hb_param( 2, HB_IT_STRING ) && hb_param( 3, HB_IT_STRING ) )
hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
else
hb_retptr( NULL );
if( hb_pcount() == 2 && hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
else if( hb_pcount() == 2 && hb_param( 2, HB_IT_STRING ) )
hb_retptr( (QMenu *) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
else if( hb_pcount() == 3 && hb_param( 2, HB_IT_STRING ) && hb_param( 3, HB_IT_STRING ) )
hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
else
hb_retptr( NULL );
}
/*
@@ -119,7 +119,7 @@ QAction * addMenu ( QMenu * menu )
*/
HB_FUNC( QT_QMENUBAR_ADDMENU_1 )
{
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QMenu( 2 ) ) );
}
/*
@@ -127,7 +127,7 @@ QMenu * addMenu ( const QString & title )
*/
HB_FUNC( QT_QMENUBAR_ADDMENU_2 )
{
hb_retptr( (QMenu *) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
hb_retptr( (QMenu *) hbqt_par_QMenuBar( 1 )->addMenu( hbqt_par_QString( 2 ) ) );
}
/*
@@ -135,7 +135,7 @@ QMenu * addMenu ( const QIcon & icon, const QString & title )
*/
HB_FUNC( QT_QMENUBAR_ADDMENU_3 )
{
hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
hb_retptr( ( QMenu* ) hbqt_par_QMenuBar( 1 )->addMenu( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
}
/*
@@ -143,7 +143,7 @@ QAction * addSeparator ()
*/
HB_FUNC( QT_QMENUBAR_ADDSEPARATOR )
{
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addSeparator() );
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->addSeparator() );
}
/*
@@ -151,7 +151,7 @@ void clear ()
*/
HB_FUNC( QT_QMENUBAR_CLEAR )
{
hbqt_par_QMenuBar( 1 )->clear();
hbqt_par_QMenuBar( 1 )->clear();
}
/*
@@ -159,7 +159,7 @@ QAction * insertMenu ( QAction * before, QMenu * menu )
*/
HB_FUNC( QT_QMENUBAR_INSERTMENU )
{
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->insertMenu( hbqt_par_QAction( 2 ), hbqt_par_QMenu( 3 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->insertMenu( hbqt_par_QAction( 2 ), hbqt_par_QMenu( 3 ) ) );
}
/*
@@ -167,7 +167,7 @@ QAction * insertSeparator ( QAction * before )
*/
HB_FUNC( QT_QMENUBAR_INSERTSEPARATOR )
{
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->insertSeparator( hbqt_par_QAction( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QMenuBar( 1 )->insertSeparator( hbqt_par_QAction( 2 ) ) );
}
/*
@@ -175,7 +175,7 @@ bool isDefaultUp () const
*/
HB_FUNC( QT_QMENUBAR_ISDEFAULTUP )
{
hb_retl( hbqt_par_QMenuBar( 1 )->isDefaultUp() );
hb_retl( hbqt_par_QMenuBar( 1 )->isDefaultUp() );
}
/*
@@ -183,7 +183,7 @@ void setActiveAction ( QAction * act )
*/
HB_FUNC( QT_QMENUBAR_SETACTIVEACTION )
{
hbqt_par_QMenuBar( 1 )->setActiveAction( hbqt_par_QAction( 2 ) );
hbqt_par_QMenuBar( 1 )->setActiveAction( hbqt_par_QAction( 2 ) );
}
/*
@@ -191,7 +191,7 @@ void setDefaultUp ( bool )
*/
HB_FUNC( QT_QMENUBAR_SETDEFAULTUP )
{
hbqt_par_QMenuBar( 1 )->setDefaultUp( hb_parl(2) );
hbqt_par_QMenuBar( 1 )->setDefaultUp( hb_parl(2) );
}
/*----------------------------------------------------------------------*/

8
harbour/contrib/hbqt/hbqt_qmessagebox.cpp
View File

@@ -63,16 +63,16 @@
HB_FUNC( QT_QMESSAGEBOX )
{
hb_retptr( ( QMessageBox* ) new QMessageBox() );
hb_retptr( ( QMessageBox* ) new QMessageBox() );
}
// function added only for tests
// a better implementation will be done
HB_FUNC( MSGINFO )
{
QMessageBox msgBox;
msgBox.setText( hb_parc( 1 ) );
msgBox.exec();
QMessageBox msgBox;
msgBox.setText( hb_parc( 1 ) );
msgBox.exec();
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qpagesetupdialog.cpp
View File

@@ -65,7 +65,7 @@ QPageSetupDialog ( QPrinter * printer, QWidget * parent = 0 )
*/
HB_FUNC( QT_QPAGESETUPDIALOG )
{
hb_retptr( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qprintdialog.cpp
View File

@@ -66,7 +66,7 @@ QPrintDialog::QPrintDialog ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QPRINTDIALOG )
{
hb_retptr( ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

12
harbour/contrib/hbqt/hbqt_qprintpreviewdialog.cpp
View File

@@ -66,12 +66,12 @@ QPrintPreviewDialog ( QWidget * parent = 0, Qt::WindowFlags flags = 0 )
*/
HB_FUNC( QT_QPRINTPREVIEWDIALOG )
{
if( hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ),
hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) );
else
hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QWidget( 2 ),
( Qt::WindowFlags ) hb_parni( 3 ) ) );
if( hb_param( 2, HB_IT_POINTER ) )
hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ),
hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) );
else
hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QWidget( 2 ),
( Qt::WindowFlags ) hb_parni( 3 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qprogressbar.cpp
View File

@@ -65,7 +65,7 @@ QProgressBar ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QPROGRESSBAR )
{
hb_retptr( ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qprogressdialog.cpp
View File

@@ -66,7 +66,7 @@ QProgressDialog ( const QString & labelText, const QString & cancelButtonText, i
*/
HB_FUNC( QT_QPROGRESSDIALOG )
{
hb_retptr( ( QProgressDialog* ) new QProgressDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
hb_retptr( ( QProgressDialog* ) new QProgressDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

26
harbour/contrib/hbqt/hbqt_qpushbutton.cpp
View File

@@ -78,15 +78,17 @@ QPushButton ( const QIcon & icon, const QString & text, QWidget * parent = 0 ) [
*/
HB_FUNC( QT_QPUSHBUTTON_1 )
{
hb_retptr( ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) );
}
HB_FUNC( QT_QPUSHBUTTON_2 )
{
hb_retptr( ( QPushButton* ) new QPushButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QPushButton* ) new QPushButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
}
HB_FUNC( QT_QPUSHBUTTON_3 )
{
hb_retptr( ( QPushButton* ) new QPushButton( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 2 ), hbqt_par_QWidget( 3 ) ) );
hb_retptr( ( QPushButton* ) new QPushButton( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 2 ), hbqt_par_QWidget( 3 ) ) );
}
/*
@@ -94,7 +96,7 @@ bool autoDefault () const
*/
HB_FUNC( QT_QPUSHBUTTON_AUTODEFAULT )
{
hb_retl( hbqt_par_QPushButton( 1 )->autoDefault() );
hb_retl( hbqt_par_QPushButton( 1 )->autoDefault() );
}
/*
@@ -102,7 +104,7 @@ bool isDefault () const
*/
HB_FUNC( QT_QPUSHBUTTON_ISDEFAULT )
{
hb_retl( hbqt_par_QPushButton( 1 )->isDefault() );
hb_retl( hbqt_par_QPushButton( 1 )->isDefault() );
}
/*
@@ -110,7 +112,7 @@ bool isFlat () const
*/
HB_FUNC( QT_QPUSHBUTTON_ISFLAT )
{
hb_retl( hbqt_par_QPushButton( 1 )->isFlat() );
hb_retl( hbqt_par_QPushButton( 1 )->isFlat() );
}
/*
@@ -118,7 +120,7 @@ QMenu * menu () const
*/
HB_FUNC( QT_QPUSHBUTTON_MENU )
{
hb_retptr( ( QMenu* ) hbqt_par_QPushButton( 1 )->menu() );
hb_retptr( ( QMenu* ) hbqt_par_QPushButton( 1 )->menu() );
}
/*
@@ -126,7 +128,7 @@ void setAutoDefault ( bool )
*/
HB_FUNC( QT_QPUSHBUTTON_SETAUTODEFAULT )
{
hbqt_par_QPushButton( 1 )->setAutoDefault( hb_parl( 2 ) );
hbqt_par_QPushButton( 1 )->setAutoDefault( hb_parl( 2 ) );
}
/*
@@ -134,7 +136,7 @@ void setDefault ( bool )
*/
HB_FUNC( QT_QPUSHBUTTON_SETDEFAULT )
{
hbqt_par_QPushButton( 1 )->setDefault( hb_parl( 2 ) );
hbqt_par_QPushButton( 1 )->setDefault( hb_parl( 2 ) );
}
/*
@@ -142,7 +144,7 @@ void setFlat ( bool )
*/
HB_FUNC( QT_QPUSHBUTTON_SETFLAT )
{
hbqt_par_QPushButton( 1 )->setFlat( hb_parl( 2 ) );
hbqt_par_QPushButton( 1 )->setFlat( hb_parl( 2 ) );
}
/*
@@ -150,7 +152,7 @@ void setMenu ( QMenu * menu )
*/
HB_FUNC( QT_QPUSHBUTTON_SETMENU )
{
hbqt_par_QPushButton( 1 )->setMenu( hbqt_par_QMenu( 2 ) );
hbqt_par_QPushButton( 1 )->setMenu( hbqt_par_QMenu( 2 ) );
}
/*
@@ -158,7 +160,7 @@ void showMenu ()
*/
HB_FUNC( QT_QPUSHBUTTON_SHOWMENU )
{
hbqt_par_QPushButton( 1 )->showMenu();
hbqt_par_QPushButton( 1 )->showMenu();
}
/*----------------------------------------------------------------------*/

12
harbour/contrib/hbqt/hbqt_qradiobutton.cpp
View File

@@ -63,10 +63,10 @@
HB_FUNC( QT_QRADIOBUTTON )
{
if( hb_param( 1, HB_IT_STRING ) )
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) );
if( ISCHAR( 1 ) )
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,11 +75,11 @@ QRadioButton ( const QString & text, QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QRADIOBUTTON_1 )
{
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) );
}
HB_FUNC( QT_QRADIOBUTTON_2 )
{
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qscrollarea.cpp
View File

@@ -65,7 +65,7 @@ QScrollArea ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QSCROLLAREA )
{
hb_retptr( ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qscrollbar.cpp
View File

@@ -65,7 +65,7 @@ QScrollBar ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QSCROLLBAR )
{
hb_retptr( ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qsizegrip.cpp
View File

@@ -65,7 +65,7 @@ QSizeGrip ( QWidget * parent )
*/
HB_FUNC( QT_QSIZEGRIP )
{
hb_retptr( ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

13
harbour/contrib/hbqt/hbqt_qslider.cpp
View File

@@ -63,10 +63,10 @@
HB_FUNC( QT_QSLIDER )
{
if( hb_param( 1, HB_IT_NUMERIC ) )
hb_retptr( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) );
if( ISNUM( 1 ) )
hb_retptr( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,11 +75,12 @@ QSlider ( Qt::Orientation orientation, QWidget * parent = 0 )
*/
HB_FUNC( QT_QSLIDER_1 )
{
hb_retptr( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) );
}
HB_FUNC( QT_QSLIDER_2 )
{
hb_retptr( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qspinbox.cpp
View File

@@ -65,7 +65,7 @@ QSpinBox ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QSPINBOX )
{
hb_retptr( ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

12
harbour/contrib/hbqt/hbqt_qsplitter.cpp
View File

@@ -63,10 +63,10 @@
HB_FUNC( QT_QSPLITTER )
{
if( hb_param( 1, HB_IT_NUMERIC ) )
hb_retptr( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) );
if( hb_param( 1, HB_IT_NUMERIC ) )
hb_retptr( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,11 +75,11 @@ QSplitter ( Qt::Orientation orientation, QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QSPLITTER_1 )
{
hb_retptr( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) );
}
HB_FUNC( QT_QSPLITTER_2 )
{
hb_retptr( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qtabbar.cpp
View File

@@ -65,7 +65,7 @@ QTabBar ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QTABBAR )
{
hb_retptr( ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qtableview.cpp
View File

@@ -65,7 +65,7 @@ QTableView ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QTABLEVIEW )
{
hb_retptr( ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

13
harbour/contrib/hbqt/hbqt_qtablewidget.cpp
View File

@@ -63,10 +63,10 @@
HB_FUNC( QT_QTABLEWIDGET )
{
if( hb_param( 1, HB_IT_NUMERIC ) && hb_param( 2, HB_IT_NUMERIC ) )
hb_retptr( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) );
else
hb_retptr( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) );
if( hb_param( 1, HB_IT_NUMERIC ) && hb_param( 2, HB_IT_NUMERIC ) )
hb_retptr( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) );
else
hb_retptr( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,11 +75,12 @@ QTableWidget ( int rows, int columns, QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QTABLEWIDGET_1 )
{
hb_retptr( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) );
}
HB_FUNC( QT_QTABLEWIDGET_2 )
{
hb_retptr( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) );
hb_retptr( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) );
}
/*----------------------------------------------------------------------*/

16
harbour/contrib/hbqt/hbqt_qtablewidgetitem.cpp
View File

@@ -68,31 +68,31 @@ QTableWidgetItem ( const QTableWidgetItem & other ) [4]
*/
HB_FUNC( QT_QTABLEWIDGETITEM_1 )
{
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hb_parni( 1 ) ) );
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hb_parni( 1 ) ) );
}
HB_FUNC( QT_QTABLEWIDGETITEM_2 )
{
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hbqt_par_QString( 1 ), hb_parni( 2 ) ) );
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hbqt_par_QString( 1 ), hb_parni( 2 ) ) );
}
HB_FUNC( QT_QTABLEWIDGETITEM_3 )
{
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( QIcon( hbqt_par_QString( 1 ) ),hbqt_par_QString( 2 ), hb_parni( 3 ) ) );
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( QIcon( hbqt_par_QString( 1 ) ),hbqt_par_QString( 2 ), hb_parni( 3 ) ) );
}
#if 0
HB_FUNC( QT_QTABLEWIDGETITEM_4 )
{
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hbqt_par_QTableWidgetItem( 1 ) ) );
hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hbqt_par_QTableWidgetItem( 1 ) ) );
}
HB_FUNC( QT_QTABLEWIDGETITEM_4 )
{
QTableWidgetItem * twi = NULL;
QTableWidgetItem * other = (QTableWidgetItem *) hb_parptr(1);
twi = new QTableWidgetItem ( (QTableWidgetItem *) other );
hb_retptr( (QTableWidgetItem *) twi );
QTableWidgetItem * twi = NULL;
QTableWidgetItem * other = ( QTableWidgetItem * ) hb_parptr( 1 );
twi = new QTableWidgetItem ( ( QTableWidgetItem * ) other );
hb_retptr( ( QTableWidgetItem * ) twi );
}
#endif

2
harbour/contrib/hbqt/hbqt_qtabwidget.cpp
View File

@@ -65,7 +65,7 @@ QTabWidget ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QTABWIDGET )
{
hb_retptr( ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

12
harbour/contrib/hbqt/hbqt_qtextedit.cpp
View File

@@ -63,10 +63,10 @@
HB_FUNC( QT_QTEXTEDIT )
{
if( hb_param( 1, HB_IT_STRING ) )
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) );
if( hb_param( 1, HB_IT_STRING ) )
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,12 +75,12 @@ QTextEdit ( const QString & text, QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QTEXTEDIT_1 )
{
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) );
}
HB_FUNC( QT_QTEXTEDIT_2 )
{
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
}
/*----------------------------------------------------------------------*/

4
harbour/contrib/hbqt/hbqt_qtimeedit.cpp
View File

@@ -66,13 +66,13 @@ QTimeEdit ( const QTime & time, QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QTIMEEDIT_1 )
{
hb_retptr( ( QTimeEdit* ) new QTimeEdit( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTimeEdit* ) new QTimeEdit( hbqt_par_QWidget( 1 ) ) );
}
#if 0
HB_FUNC( QT_QTIMEEDIT_2 )
{
hb_retptr( (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) );
}
#endif

58
harbour/contrib/hbqt/hbqt_qtoolbar.cpp
View File

@@ -64,10 +64,10 @@
HB_FUNC( QT_QTOOLBAR )
{
if( hb_param( 1, HB_IT_STRING ) )
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) );
if( hb_param( 1, HB_IT_STRING ) )
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
else
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -76,12 +76,12 @@ QToolBar ( QWidget * parent = 0 ) [2]
*/
HB_FUNC( QT_QTOOLBAR_1 )
{
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) );
}
HB_FUNC( QT_QTOOLBAR_2 )
{
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -89,7 +89,7 @@ QAction * actionAt ( int x, int y ) const
*/
HB_FUNC( QT_QTOOLBAR_ACTIONAT_1 )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->actionAt( hb_parni(2), hb_parni(3) ) );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->actionAt( hb_parni(2), hb_parni(3) ) );
}
/*
@@ -97,7 +97,7 @@ void addAction ( QAction * action )
*/
HB_FUNC( QT_QTOOLBAR_ADDACTION_1 )
{
hbqt_par_QToolBar( 1 )->addAction( hbqt_par_QAction( 2 ) );
hbqt_par_QToolBar( 1 )->addAction( hbqt_par_QAction( 2 ) );
}
/*
@@ -105,7 +105,7 @@ QAction * addAction ( const QString & text )
*/
HB_FUNC( QT_QTOOLBAR_ADDACTION_2 )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( hbqt_par_QString( 2 ) ) );
}
/*
@@ -113,7 +113,7 @@ QAction * addAction ( const QIcon & icon, const QString & text )
*/
HB_FUNC( QT_QTOOLBAR_ADDACTION_3 )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addAction( QIcon( hbqt_par_QString( 2 ) ), hbqt_par_QString( 3 ) ) );
}
/*
@@ -121,7 +121,7 @@ QAction * addSeparator ()
*/
HB_FUNC( QT_QTOOLBAR_ADDSEPARATOR )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addSeparator() );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addSeparator() );
}
/*
@@ -129,7 +129,7 @@ QAction * addWidget ( QWidget * widget )
*/
HB_FUNC( QT_QTOOLBAR_ADDWIDGET )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addWidget( hbqt_par_QWidget( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->addWidget( hbqt_par_QWidget( 2 ) ) );
}
/*
@@ -137,7 +137,7 @@ Qt::ToolBarAreas allowedAreas () const
*/
HB_FUNC( QT_QTOOLBAR_ALLOWEDAREAS )
{
hb_retni( hbqt_par_QToolBar( 1 )->allowedAreas() );
hb_retni( hbqt_par_QToolBar( 1 )->allowedAreas() );
}
/*
@@ -145,7 +145,7 @@ void clear ()
*/
HB_FUNC( QT_QTOOLBAR_CLEAR )
{
hbqt_par_QToolBar( 1 )->clear();
hbqt_par_QToolBar( 1 )->clear();
}
/*
@@ -153,7 +153,7 @@ QAction * insertSeparator ( QAction * before )
*/
HB_FUNC( QT_QTOOLBAR_INSERTSEPARATOR )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->insertSeparator( hbqt_par_QAction( 2 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->insertSeparator( hbqt_par_QAction( 2 ) ) );
}
/*
@@ -161,7 +161,7 @@ QAction * insertWidget ( QAction * before, QWidget * widget )
*/
HB_FUNC( QT_QTOOLBAR_INSERTWIDGET )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->insertWidget( hbqt_par_QAction( 2 ), hbqt_par_QWidget( 3 ) ) );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->insertWidget( hbqt_par_QAction( 2 ), hbqt_par_QWidget( 3 ) ) );
}
/*
@@ -169,7 +169,7 @@ bool isAreaAllowed( Qt::ToolBarArea area ) const
*/
HB_FUNC( QT_QTOOLBAR_ISAREAALLOWED )
{
hb_retl( hbqt_par_QToolBar( 1 )->isAreaAllowed( ( Qt::ToolBarArea ) hb_parni(2) ) );
hb_retl( hbqt_par_QToolBar( 1 )->isAreaAllowed( ( Qt::ToolBarArea ) hb_parni(2) ) );
}
/*
@@ -177,7 +177,7 @@ bool isFloatable () const
*/
HB_FUNC( QT_QTOOLBAR_ISFLOATABLE )
{
hb_retl( hbqt_par_QToolBar( 1 )->isFloatable() );
hb_retl( hbqt_par_QToolBar( 1 )->isFloatable() );
}
/*
@@ -185,7 +185,7 @@ bool isFloating () const
*/
HB_FUNC( QT_QTOOLBAR_ISFLOATING )
{
hb_retl( hbqt_par_QToolBar( 1 )->isFloating() );
hb_retl( hbqt_par_QToolBar( 1 )->isFloating() );
}
/*
@@ -193,7 +193,7 @@ bool isMovable () const
*/
HB_FUNC( QT_QTOOLBAR_ISMOVABLE )
{
hb_retl( hbqt_par_QToolBar( 1 )->isMovable() );
hb_retl( hbqt_par_QToolBar( 1 )->isMovable() );
}
/*
@@ -201,7 +201,7 @@ Qt::Orientation orientation () const
*/
HB_FUNC( QT_QTOOLBAR_ORIENTATION )
{
hb_retni( hbqt_par_QToolBar( 1 )->orientation() );
hb_retni( hbqt_par_QToolBar( 1 )->orientation() );
}
/*
@@ -209,7 +209,7 @@ void setAllowedAreas( Qt::ToolBarAreas areas )
*/
HB_FUNC( QT_QTOOLBAR_SETALLOWEDAREAS )
{
hbqt_par_QToolBar( 1 )->setAllowedAreas( ( Qt::ToolBarAreas ) hb_parni(2) );
hbqt_par_QToolBar( 1 )->setAllowedAreas( ( Qt::ToolBarAreas ) hb_parni(2) );
}
/*
@@ -217,7 +217,7 @@ void setFloatable ( bool floatable )
*/
HB_FUNC( QT_QTOOLBAR_SETFLOATABLE )
{
hbqt_par_QToolBar( 1 )->setFloatable( hb_parl(2) );
hbqt_par_QToolBar( 1 )->setFloatable( hb_parl(2) );
}
/*
@@ -225,7 +225,7 @@ void setMovable ( bool movable )
*/
HB_FUNC( QT_QTOOLBAR_SETMOVABLE )
{
hbqt_par_QToolBar( 1 )->setMovable( hb_parl(2) );
hbqt_par_QToolBar( 1 )->setMovable( hb_parl(2) );
}
/*
@@ -233,7 +233,7 @@ void setOrientation ( Qt::Orientation orientation )
*/
HB_FUNC( QT_QTOOLBAR_SETORIENTATION )
{
hbqt_par_QToolBar( 1 )->setOrientation( ( Qt::Orientation ) hb_parni(2) );
hbqt_par_QToolBar( 1 )->setOrientation( ( Qt::Orientation ) hb_parni(2) );
}
/*
@@ -241,7 +241,7 @@ QAction * toggleViewAction () const
*/
HB_FUNC( QT_QTOOLBAR_TOGGLEVIEWACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->toggleViewAction() );
hb_retptr( ( QAction* ) hbqt_par_QToolBar( 1 )->toggleViewAction() );
}
/*
@@ -249,7 +249,7 @@ Qt::ToolButtonStyle toolButtonStyle () const
*/
HB_FUNC( QT_QTOOLBAR_TOOLBUTTONSTYLE )
{
hb_retni( hbqt_par_QToolBar( 1 )->toolButtonStyle() );
hb_retni( hbqt_par_QToolBar( 1 )->toolButtonStyle() );
}
/*
@@ -257,7 +257,7 @@ QWidget * widgetForAction ( QAction * action ) const
*/
HB_FUNC( QT_QTOOLBAR_WIDGETFORACTION )
{
hb_retptr( ( QWidget* ) hbqt_par_QToolBar( 1 )->widgetForAction( hbqt_par_QAction( 2 ) ) );
hb_retptr( ( QWidget* ) hbqt_par_QToolBar( 1 )->widgetForAction( hbqt_par_QAction( 2 ) ) );
}
/*
@@ -265,7 +265,7 @@ void setToolButtonStyle ( Qt::ToolButtonStyle toolButtonStyle )
*/
HB_FUNC( QT_QTOOLBAR_SETTOOLBUTTONSTYLE )
{
hbqt_par_QToolBar( 1 )->setToolButtonStyle( ( Qt::ToolButtonStyle ) hb_parni(2) );
hbqt_par_QToolBar( 1 )->setToolButtonStyle( ( Qt::ToolButtonStyle ) hb_parni(2) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qtoolbox.cpp
View File

@@ -65,7 +65,7 @@ QToolBox ( QWidget * parent = 0, Qt::WindowFlags f = 0 )
*/
HB_FUNC( QT_QTOOLBOX )
{
hb_retptr( ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
hb_retptr( ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

28
harbour/contrib/hbqt/hbqt_qtoolbutton.cpp
View File

@@ -65,7 +65,7 @@ QToolButton ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QTOOLBUTTON )
{
hb_retptr( ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -73,7 +73,7 @@ Qt::ArrowType arrowType () const
*/
HB_FUNC( QT_QTOOLBUTTON_ARROWTYPE )
{
hb_retni( hbqt_par_QToolButton( 1 )->arrowType() );
hb_retni( hbqt_par_QToolButton( 1 )->arrowType() );
}
/*
@@ -81,7 +81,7 @@ bool autoRaise () const
*/
HB_FUNC( QT_QTOOLBUTTON_AUTORAISE )
{
hb_retl( hbqt_par_QToolButton( 1 )->autoRaise() );
hb_retl( hbqt_par_QToolButton( 1 )->autoRaise() );
}
/*
@@ -89,7 +89,7 @@ QAction * defaultAction () const
*/
HB_FUNC( QT_QTOOLBUTTON_DEFAULTACTION )
{
hb_retptr( ( QAction* ) hbqt_par_QToolButton( 1 )->defaultAction() );
hb_retptr( ( QAction* ) hbqt_par_QToolButton( 1 )->defaultAction() );
}
/*
@@ -97,7 +97,7 @@ QMenu * menu () const
*/
HB_FUNC( QT_QTOOLBUTTON_MENU )
{
hb_retptr( ( QMenu* ) hbqt_par_QToolButton( 1 )->menu() );
hb_retptr( ( QMenu* ) hbqt_par_QToolButton( 1 )->menu() );
}
/*
@@ -105,7 +105,7 @@ ToolButtonPopupMode popupMode () const
*/
HB_FUNC( QT_QTOOLBUTTON_POPUPMODE )
{
hb_retni( hbqt_par_QToolButton( 1 )->popupMode() );
hb_retni( hbqt_par_QToolButton( 1 )->popupMode() );
}
/*
@@ -113,7 +113,7 @@ void setArrowType ( Qt::ArrowType type )
*/
HB_FUNC( QT_QTOOLBUTTON_SETARROWTYPE )
{
hbqt_par_QToolButton( 1 )->setArrowType( ( Qt::ArrowType ) hb_parni(2) );
hbqt_par_QToolButton( 1 )->setArrowType( ( Qt::ArrowType ) hb_parni(2) );
}
/*
@@ -121,7 +121,7 @@ void setAutoRaise ( bool enable )
*/
HB_FUNC( QT_QTOOLBUTTON_SETAUTORAISE )
{
hbqt_par_QToolButton( 1 )->setAutoRaise( hb_parl(2) );
hbqt_par_QToolButton( 1 )->setAutoRaise( hb_parl(2) );
}
/*
@@ -129,7 +129,7 @@ void setMenu ( QMenu * menu )
*/
HB_FUNC( QT_QTOOLBUTTON_SETMENU )
{
hbqt_par_QToolButton( 1 )->setMenu( hbqt_par_QMenu( 2 ) );
hbqt_par_QToolButton( 1 )->setMenu( hbqt_par_QMenu( 2 ) );
}
/*
@@ -137,7 +137,7 @@ void setPopupMode ( ToolButtonPopupMode mode )
*/
HB_FUNC( QT_QTOOLBUTTON_SETPOPUPMODE )
{
hbqt_par_QToolButton( 1 )->setPopupMode( ( QToolButton::ToolButtonPopupMode ) hb_parni(2) );
hbqt_par_QToolButton( 1 )->setPopupMode( ( QToolButton::ToolButtonPopupMode ) hb_parni(2) );
}
/*
@@ -145,7 +145,7 @@ Qt::ToolButtonStyle toolButtonStyle () const
*/
HB_FUNC( QT_QTOOLBUTTON_TOOLBUTTONSTYLE )
{
hb_retni( hbqt_par_QToolButton( 1 )->toolButtonStyle() );
hb_retni( hbqt_par_QToolButton( 1 )->toolButtonStyle() );
}
/*
@@ -153,7 +153,7 @@ void setDefaultAction ( QAction * action )
*/
HB_FUNC( QT_QTOOLBUTTON_SETDEFAULTACTION )
{
hbqt_par_QToolButton( 1 )->setDefaultAction( hbqt_par_QAction( 2 ) );
hbqt_par_QToolButton( 1 )->setDefaultAction( hbqt_par_QAction( 2 ) );
}
/*
@@ -161,7 +161,7 @@ void setToolButtonStyle ( Qt::ToolButtonStyle style )
*/
HB_FUNC( QT_QTOOLBUTTON_SETTOOLBUTTONSTYLE )
{
hbqt_par_QToolButton( 1 )->setToolButtonStyle( ( Qt::ToolButtonStyle ) hb_parni(2) );
hbqt_par_QToolButton( 1 )->setToolButtonStyle( ( Qt::ToolButtonStyle ) hb_parni(2) );
}
/*
@@ -169,7 +169,7 @@ void showMenu ()
*/
HB_FUNC( QT_QTOOLBUTTON_SHOWMENU )
{
hbqt_par_QToolButton( 1 )->showMenu();
hbqt_par_QToolButton( 1 )->showMenu();
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qtreeview.cpp
View File

@@ -65,7 +65,7 @@ QTreeView ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QTREEVIEW )
{
hb_retptr( ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

2
harbour/contrib/hbqt/hbqt_qvboxlayout.cpp
View File

@@ -66,7 +66,7 @@ QVBoxLayout ( QWidget * parent )
*/
HB_FUNC( QT_QVBOXLAYOUT )
{
hb_retptr( ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) );
}
/*----------------------------------------------------------------------*/

8
harbour/contrib/hbqt/hbqt_qwebview.cpp
View File

@@ -67,7 +67,7 @@ QWebView ( QWidget * parent = 0 )
*/
HB_FUNC( QT_QWEBVIEW )
{
hb_retptr( ( QWebView* ) new QWebView( hbqt_par_QWidget( 1 ) ) );
hb_retptr( ( QWebView* ) new QWebView( hbqt_par_QWidget( 1 ) ) );
}
/*
@@ -75,7 +75,7 @@ void load ( const QUrl & url )
*/
HB_FUNC( QT_QWEBVIEW_LOAD )
{
hbqt_par_QWebView( 1 )->load( QUrl( hbqt_par_QString( 2 ) ) );
hbqt_par_QWebView( 1 )->load( QUrl( hbqt_par_QString( 2 ) ) );
}
/*
@@ -84,12 +84,12 @@ void setUrl ( const QUrl & url )
*/
HB_FUNC( QT_QWEBVIEW_URL )
{
//QWebView * webview = (QWebView *) hb_parptr(1);
/* QWebView * webview = (QWebView *) hb_parptr(1); */
}
HB_FUNC( QT_QWEBVIEW_SETURL )
{
hbqt_par_QWebView( 1 )->setUrl( QUrl( hbqt_par_QString( 2 ) ) );
hbqt_par_QWebView( 1 )->setUrl( QUrl( hbqt_par_QString( 2 ) ) );
}
/*----------------------------------------------------------------------*/

296
harbour/contrib/hbqt/hbqt_qwidget.cpp
View File

File diff suppressed because it is too large Load Diff

2
harbour/contrib/hbqt/hbqt_qwizard.cpp
View File

@@ -65,7 +65,7 @@ QWizard ( QWidget * parent = 0, Qt::WindowFlags flags = 0 )
*/
HB_FUNC( QT_QWIZARD )
{
hb_retptr( ( QWizard* ) new QWizard( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
hb_retptr( ( QWizard* ) new QWizard( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) );
}
/*----------------------------------------------------------------------*/

437
harbour/contrib/hbqt/hbqt_slots.cpp
View File

@@ -81,21 +81,22 @@ static Slots *s = NULL;
static void SlotsExec( QWidget* widget, QString event, PHB_ITEM pItem )
{
for( int i = 0; i < s->list1.size(); ++i )
{
if( ( QWidget* ) s->list1.at( i ) == widget )
{
if( ( ( QString ) s->list2.at( i ) == event ) && ( ( bool ) s->list4.at( i ) == true ) )
for( int i = 0; i < s->list1.size(); ++i )
{
if( ( QWidget* ) s->list1.at( i ) == widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget* ) widget );
if( ( ( QString ) s->list2.at( i ) == event ) && ( ( bool ) s->list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget* ) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) s->list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
hb_vmEvalBlockV( ( PHB_ITEM ) s->list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
}
}
}
}
if( pItem != NULL )
hb_itemRelease( pItem );
}
if( pItem != NULL )
hb_itemRelease( pItem );
}
@@ -109,192 +110,190 @@ Slots::~Slots()
void Slots::clicked()
{
QWidget *widget = qobject_cast<QWidget *>( sender() );
QWidget *widget = qobject_cast<QWidget *>( sender() );
SlotsExec( widget, ( QString ) "clicked()", NULL );
SlotsExec( widget, ( QString ) "clicked()", NULL );
#if 0
for( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget* ) list1.at( i ) == ( QWidget* ) widget )
{
if( ( ( QString ) list2.at( i ) == ( QString ) "clicked()" ) && ( ( bool ) list4.at( i ) == true ) )
#if 0
for( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget* ) list1.at( i ) == ( QWidget* ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget* ) widget );
if( ( ( QString ) list2.at( i ) == ( QString ) "clicked()" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget* ) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
}
}
}
}
#endif
}
#endif
}
void Slots::triggered()
{
QObject *widget = qobject_cast<QWidget *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QObject* ) list1.at( i ) == ( QObject* ) widget )
{
if( ( ( QString ) list2.at( i ) == ( QString ) "triggered()" ) && ( ( bool ) list4.at( i ) == true ) )
QObject *widget = qobject_cast<QWidget *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QObject* ) list1.at( i ) == ( QObject* ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QObject * ) widget );
if( ( ( QString ) list2.at( i ) == ( QString ) "triggered()" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QObject * ) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
}
}
}
}
}
}
void Slots::triggered( bool checked )
{
QObject *widget = qobject_cast<QObject *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QObject* ) list1.at( i ) == ( QObject* ) widget )
{
if( ( ( QString ) list2.at( i ) == ( QString ) "triggered(bool)" ) && ( ( bool ) list4.at( i ) == true ) )
QObject *widget = qobject_cast<QObject *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QObject* ) list1.at( i ) == ( QObject* ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QObject * ) widget );
PHB_ITEM pChecked = hb_itemPutL( NULL, checked );
if( ( ( QString ) list2.at( i ) == ( QString ) "triggered(bool)" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QObject * ) widget );
PHB_ITEM pChecked = hb_itemPutL( NULL, checked );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 2, pWidget, pChecked );
hb_itemRelease( pWidget );
hb_itemRelease( pChecked );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 2, pWidget, pChecked );
hb_itemRelease( pWidget );
hb_itemRelease( pChecked );
}
}
}
}
}
}
void Slots::hovered()
{
QObject *widget = qobject_cast<QObject *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QObject* ) list1.at( i ) == ( QObject* ) widget )
{
if( ( ( QString ) list2.at(i) == (QString) "hovered()" ) && ( (bool) list4.at(i) == true ) )
QObject *widget = qobject_cast<QObject *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QObject* ) list1.at( i ) == ( QObject* ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, (QObject *) widget );
hb_vmEvalBlockV( (PHB_ITEM) list3.at(i), 1, pWidget );
hb_itemRelease( pWidget );
if( ( ( QString ) list2.at( i ) == ( QString ) "hovered()" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QObject * ) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
}
}
}
}
}
}
void Slots::stateChanged( int state )
{
QWidget *widget = qobject_cast<QWidget *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget* ) list1.at( i ) == ( QWidget* ) widget )
{
if( ( (QString) list2.at( i ) == ( QString ) "stateChanged(int)" ) && ( ( bool ) list4.at( i ) == true ) )
QWidget * widget = qobject_cast<QWidget *>( sender() );
for( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget * ) list1.at( i ) == ( QWidget * ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, (QWidget *) widget );
PHB_ITEM pState = hb_itemPutNI( NULL, state );
if( ( ( QString ) list2.at( i ) == ( QString ) "stateChanged(int)" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget * ) widget );
PHB_ITEM pState = hb_itemPutNI( NULL, state );
hb_vmEvalBlockV( (PHB_ITEM) list3.at(i), 2, pWidget, pState );
hb_itemRelease( pWidget );
hb_itemRelease( pState );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 2, pWidget, pState );
hb_itemRelease( pWidget );
hb_itemRelease( pState );
}
}
}
}
}
}
void Slots::pressed()
{
QWidget *widget = qobject_cast<QWidget *>(sender());
for (int i = 0; i < list1.size(); ++i)
{
if( (QWidget*) list1.at(i) == (QWidget*) widget )
{
if( ( (QString) list2.at(i) == (QString) "pressed()" ) && ( (bool) list4.at(i) == true ) )
QWidget * widget = qobject_cast<QWidget *>(sender());
for( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget * ) list1.at( i ) == ( QWidget * ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, (QWidget *) widget );
hb_vmEvalBlockV( (PHB_ITEM) list3.at(i), 1, pWidget );
hb_itemRelease( pWidget );
if( ( ( QString ) list2.at( i ) == ( QString ) "pressed()" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, (QWidget *) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
}
}
}
}
}
}
void Slots::released()
{
QWidget* widget = qobject_cast<QWidget *>( sender() );
QWidget* widget = qobject_cast<QWidget *>( sender() );
for ( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget* ) list1.at( i ) == ( QWidget* ) widget )
{
if( ( ( QString ) list2.at( i ) == ( QString ) "released()" ) && ( ( bool ) list4.at( i ) == true ) )
for( int i = 0; i < list1.size(); ++i )
{
if( ( QWidget* ) list1.at( i ) == ( QWidget* ) widget )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget * ) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
if( ( ( QString ) list2.at( i ) == ( QString ) "released()" ) && ( ( bool ) list4.at( i ) == true ) )
{
PHB_ITEM pWidget = hb_itemPutPtr( NULL, ( QWidget * ) widget );
hb_vmEvalBlockV( ( PHB_ITEM ) list3.at( i ), 1, pWidget );
hb_itemRelease( pWidget );
}
}
}
}
}
}
#if 0
HB_FUNC( QT_CONNECT_SIGNAL_1 )
{
QWidget * widget = ( QWidget* ) hb_parptr( 1 ); /* get sender */
int signal = hb_parni( 2 ); /* get signal */
PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); /* get codeblock */
bool ret = false; /* return value */
QWidget * widget = ( QWidget* ) hb_parptr( 1 ); /* get sender */
int signal = hb_parni( 2 ); /* get signal */
PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); /* get codeblock */
bool ret = false; /* return value */
/* create object s, if not created yet */
if( s == NULL )
{
s = new Slots();
}
/* create object s, if not created yet */
if( s == NULL )
s = new Slots();
/* connect signal with slot
// if the list become to long, more classes can be created
// TODO: parameter Qt::AutoConnection
*/
switch( signal )
{
case HBQT_EVT_CLICKED:
ret = widget->connect( widget, SIGNAL( clicked() ) , s, SLOT( clicked() ) , Qt::AutoConnection );
break;
case HBQT_EVT_TRIGGERED:
ret = widget->connect( widget, SIGNAL( triggered() ) , s, SLOT( triggered() ) , Qt::AutoConnection );
break;
case HBQT_EVT_TRIGGERED_BOOL:
ret = widget->connect( widget, SIGNAL( triggered( bool ) ) , s, SLOT( triggered( bool ) ) , Qt::AutoConnection );
break;
case HBQT_EVT_HOVERED:
ret = widget->connect( widget, SIGNAL( hovered() ) , s, SLOT( hovered() ) , Qt::AutoConnection );
break;
case HBQT_EVT_STATECHANGED:
ret = widget->connect( widget, SIGNAL( stateChanged( int ) ), s, SLOT( stateChanged( int ) ), Qt::AutoConnection );
break;
case HBQT_EVT_PRESSED:
ret = widget->connect( widget, SIGNAL( pressed() ) , s, SLOT( pressed() ) , Qt::AutoConnection );
break;
case HBQT_EVT_RELEASED:
ret = widget->connect( widget, SIGNAL( released() ) , s, SLOT( released() ) , Qt::AutoConnection );
break;
}
/* connect signal with slot
// if the list become to long, more classes can be created
// TODO: parameter Qt::AutoConnection
*/
switch( signal )
{
case HBQT_EVT_CLICKED:
ret = widget->connect( widget, SIGNAL( clicked() ) , s, SLOT( clicked() ) , Qt::AutoConnection );
break;
case HBQT_EVT_TRIGGERED:
ret = widget->connect( widget, SIGNAL( triggered() ) , s, SLOT( triggered() ) , Qt::AutoConnection );
break;
case HBQT_EVT_TRIGGERED_BOOL:
ret = widget->connect( widget, SIGNAL( triggered( bool ) ) , s, SLOT( triggered( bool ) ) , Qt::AutoConnection );
break;
case HBQT_EVT_HOVERED:
ret = widget->connect( widget, SIGNAL( hovered() ) , s, SLOT( hovered() ) , Qt::AutoConnection );
break;
case HBQT_EVT_STATECHANGED:
ret = widget->connect( widget, SIGNAL( stateChanged( int ) ), s, SLOT( stateChanged( int ) ), Qt::AutoConnection );
break;
case HBQT_EVT_PRESSED:
ret = widget->connect( widget, SIGNAL( pressed() ) , s, SLOT( pressed() ) , Qt::AutoConnection );
break;
case HBQT_EVT_RELEASED:
ret = widget->connect( widget, SIGNAL( released() ) , s, SLOT( released() ) , Qt::AutoConnection );
break;
}
// return connect result
hb_retl( ret );
// return connect result
hb_retl( ret );
// if connected: store widget, signal, codeblock and flag
// TODO: locate a inactive entry and use it
if( ret == true )
{
s->list1 << widget;
s->list2 << signal;
s->list3 << codeblock;
s->list4 << true;
}
// if connected: store widget, signal, codeblock and flag
// TODO: locate a inactive entry and use it
if( ret == true )
{
s->list1 << widget;
s->list2 << signal;
s->list3 << codeblock;
s->list4 << true;
}
}
#endif
@@ -303,62 +302,60 @@ harbour function to connect signals with slots
*/
HB_FUNC( QT_CONNECT_SIGNAL )
{
QWidget * widget = ( QWidget* ) hb_parptr( 1 ); /* get sender */
QString signal = hb_parc( 2 ); /* get signal */
PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); /* get codeblock */
bool ret = false; /* return value */
QWidget * widget = ( QWidget* ) hb_parptr( 1 ); /* get sender */
QString signal = hb_parc( 2 ); /* get signal */
PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) ); /* get codeblock */
bool ret = false; /* return value */
/* create object s, if not created yet */
if( s == NULL )
{
s = new Slots();
}
/* create object s, if not created yet */
if( s == NULL )
s = new Slots();
/* connect signal with slot
// if the list become to long, more classes can be created
// TODO: parameter Qt::AutoConnection
*/
if( signal == ( QString ) "clicked()" )
{
ret = widget->connect( widget, SIGNAL( clicked() ) , s, SLOT( clicked() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "triggered()" )
{
ret = widget->connect( widget, SIGNAL( triggered() ) , s, SLOT( triggered() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "triggered(bool)" )
{
ret = widget->connect( widget, SIGNAL( triggered( bool ) ) , s, SLOT( triggered( bool ) ) , Qt::AutoConnection );
}
if( signal == ( QString ) "hovered()" )
{
ret = widget->connect( widget, SIGNAL( hovered() ) , s, SLOT( hovered() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "stateChanged(int)" )
{
ret = widget->connect( widget, SIGNAL( stateChanged( int ) ), s, SLOT( stateChanged( int ) ), Qt::AutoConnection );
}
if( signal == ( QString ) "pressed()" )
{
ret = widget->connect( widget, SIGNAL( pressed() ) , s, SLOT( pressed() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "released()" )
{
ret = widget->connect( widget, SIGNAL( released() ) , s, SLOT( released() ) , Qt::AutoConnection );
}
/* connect signal with slot
// if the list become to long, more classes can be created
// TODO: parameter Qt::AutoConnection
*/
if( signal == ( QString ) "clicked()" )
{
ret = widget->connect( widget, SIGNAL( clicked() ) , s, SLOT( clicked() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "triggered()" )
{
ret = widget->connect( widget, SIGNAL( triggered() ) , s, SLOT( triggered() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "triggered(bool)" )
{
ret = widget->connect( widget, SIGNAL( triggered( bool ) ) , s, SLOT( triggered( bool ) ) , Qt::AutoConnection );
}
if( signal == ( QString ) "hovered()" )
{
ret = widget->connect( widget, SIGNAL( hovered() ) , s, SLOT( hovered() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "stateChanged(int)" )
{
ret = widget->connect( widget, SIGNAL( stateChanged( int ) ), s, SLOT( stateChanged( int ) ), Qt::AutoConnection );
}
if( signal == ( QString ) "pressed()" )
{
ret = widget->connect( widget, SIGNAL( pressed() ) , s, SLOT( pressed() ) , Qt::AutoConnection );
}
if( signal == ( QString ) "released()" )
{
ret = widget->connect( widget, SIGNAL( released() ) , s, SLOT( released() ) , Qt::AutoConnection );
}
// return connect result
hb_retl( ret );
// return connect result
hb_retl( ret );
// if connected: store widget, signal, codeblock and flag
// TODO: locate a inactive entry and use it
if( ret == true )
{
s->list1 << widget;
s->list2 << signal;
s->list3 << codeblock;
s->list4 << true;
}
// if connected: store widget, signal, codeblock and flag
// TODO: locate a inactive entry and use it
if( ret == true )
{
s->list1 << widget;
s->list2 << signal;
s->list3 << codeblock;
s->list4 << true;
}
}
@@ -367,26 +364,28 @@ harbour function to disconnect signals
*/
HB_FUNC( QT_DISCONNECT_SIGNAL )
{
/* TODO */
/* TODO */
}
/*
harbour function to release all codeblocks storeds
*/
// HB_FUNC( RELEASE_CODEBLOCKS )
// {
// if( s )
// {
// for (int i = 0; i < s->list1.size(); ++i)
// {
// if( (bool) s->list4.at(i) == true )
// {
// hb_itemRelease((PHB_ITEM) s->list3.at(i) );
// }
// }
// }
// }
#if 0
HB_FUNC( RELEASE_CODEBLOCKS )
{
if( s )
{
for( int i = 0; i < s->list1.size(); ++i )
{
if( ( bool ) s->list4.at( i ) == true )
{
hb_itemRelease( ( PHB_ITEM ) s->list3.at( i ) );
}
}
}
}
#endif
/*
@@ -394,18 +393,18 @@ C function to release all codeblocks storeds
called at end of the program
see qapplication.cpp
*/
void release_codeblocks ()
void release_codeblocks( void )
{
if( s )
{
for( int i = 0; i < s->list1.size(); ++i )
{
if( ( bool ) s->list4.at( i ) == true )
if( s )
{
for( int i = 0; i < s->list1.size(); ++i )
{
hb_itemRelease( ( PHB_ITEM ) s->list3.at( i ) );
if( ( bool ) s->list4.at( i ) == true )
{
hb_itemRelease( ( PHB_ITEM ) s->list3.at( i ) );
}
}
}
}
}
}
/*----------------------------------------------------------------------*/

33
harbour/contrib/hbqt/slots.h
View File

@@ -58,29 +58,30 @@
#include <QtCore/QObject>
#include <QtCore/QList>
#include "hbapi.h"
#include "hbapiitm.h"
class Slots: public QObject
{
Q_OBJECT
Q_OBJECT
public:
Slots(QObject *parent = 0);
~Slots();
QList<QWidget*> list1;
QList<QString> list2;
QList<PHB_ITEM> list3;
QList<bool> list4;
public:
Slots( QObject *parent = 0 );
~Slots();
QList<QWidget*> list1;
QList<QString> list2;
QList<PHB_ITEM> list3;
QList<bool> list4;
public slots:
void clicked();
void triggered();
void triggered(bool checked);
void hovered();
void stateChanged(int state);
void pressed();
void released();
public slots:
void clicked();
void triggered();
void triggered( bool checked );
void hovered();
void stateChanged( int state );
void pressed();
void released();
};
#endif

19
harbour/contrib/hbsqlit3/Makefile
View File

@@ -19,7 +19,24 @@ endif
endif
ifneq ($(HB_WITHOUT_SQLIT3),yes)
C_SOURCES =\
HB_INC_SQLITE3_OK =
ifeq ($(HB_INC_SQLITE3),)
ifeq ($(HB_XBUILD),)
HB_INC_SQLITE3 = /usr/include $(TOP)$(ROOT)/external/sqlite3
endif
endif
HB_INC_SQLITE3_OK += $(foreach d, $(HB_INC_SQLITE3), $(if $(wildcard $(d)/sqlite3.h),$(d),))
endif
ifneq ($(strip $(HB_INC_SQLITE3_OK)),)
HB_USER_CFLAGS += $(foreach d, $(HB_INC_SQLITE3_OK), -I$(d))
C_SOURCES=\
hbsqlit3.c \
PRG_HEADERS=\

38
harbour/contrib/hbsqlit3/hbsqlit3.c
View File

@@ -59,43 +59,7 @@
char *sqlite3_hb_snprintf(int,char*,const char*, ...);
*/
#if defined( __WATCOMC__ ) || (defined(__POCC__) && __POCC__ <= 450)
/* NOTE: Don't include the full library for those compilers
which cannot compile it, due its large size.
In these case the library should be linked separately.
[vszakats] */
#include "sqlite3/sqlite3.h"
#else
#if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
#pragma GCC diagnostic ignored "-Wunused"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wuninitialized"
#elif defined( __BORLANDC__ )
#pragma warn -aus
#pragma warn -use
#pragma warn -par
#pragma warn -prc
#pragma warn -eff
#pragma warn -amp
#elif defined( _MSC_VER )
#pragma warning( disable: 4018 4244 )
#endif
#include "sqlite3/sqlite3.c"
#if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
#pragma GCC diagnostic warning "-Wunused"
#pragma GCC diagnostic warning "-Wsign-compare"
#pragma GCC diagnostic warning "-Wuninitialized"
#elif defined( __BORLANDC__ )
#pragma warn +aus
/* #pragma warn +use */ /* This affects the whole file, so don't turn it back on. */
#pragma warn +par
#pragma warn +prc
#pragma warn +eff
#pragma warn +amp
#elif defined( _MSC_VER )
#pragma warning( default: 4018 4244 )
#endif
#endif
#include "sqlite3.h"
#include "hbvm.h"
#include "hbapi.h"

2
harbour/contrib/hbsqlit3/tests/hbsqlit3.hbp
View File

@@ -2,4 +2,4 @@
# $Id$
#
libs=hbsqlit3
libs=hbsqlit3 sqlite3

10
harbour/contrib/hbwin/wapi_commctrl.c
View File

@@ -66,7 +66,7 @@ HB_FUNC( WAPI_IMAGELIST_ADD )
{
wapi_ret_NI( ImageList_Add( wapi_par_HIMAGELIST( 1 ),
wapi_par_HBITMAP( 2 ),
ISNIL( 3 ) ? NULL : wapi_par_HBITMAP( 3 ) ) );
wapi_par_HBITMAP( 3 ) ) );
}
/*----------------------------------------------------------------------*/
/*
@@ -476,7 +476,7 @@ HB_FUNC( WAPI_TABCTRL_INSERTITEM )
LPTSTR szText = HB_TCHAR_CONVTO( hb_parc( 3 ) );
item.mask = TCIF_TEXT | TCIF_IMAGE;
item.iImage = ISNIL( 4 ) ? -1 : wapi_par_INT( 4 );
item.iImage = ISNUM( 4 ) ? wapi_par_INT( 4 ) : -1;
item.pszText = szText;
wapi_ret_NI( TabCtrl_InsertItem( wapi_par_HWND( 1 ), wapi_par_INT( 3 ), &item ) );
@@ -571,7 +571,7 @@ HB_FUNC( WAPI_TABCTRL_SETITEM )
LPTSTR szText = HB_TCHAR_CONVTO( hb_parc( 3 ) );
item.mask = TCIF_TEXT | TCIF_IMAGE;
item.iImage = ISNIL( 4 ) ? -1 : wapi_par_INT( 4 );
item.iImage = ISNUM( 4 ) ? wapi_par_INT( 4 ) : -1;
item.pszText = szText;
wapi_ret_L( TabCtrl_SetItem( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), &item ) );
@@ -778,7 +778,7 @@ HB_FUNC( WAPI_TABCTRL_CREATE )
HWND hbutton;
LONG hFont;
LONG style;
style = ISNIL( 6 ) ? 0 : ( LONG ) hb_parnl( 6 );
style = ( LONG ) hb_parnl( 6 ); /* defaults to 0 */
hwnd = ( HWND ) hb_parnint( 1 );
hFont = SendMessage( hwnd, WM_GETFONT, 0, 0 );
hbutton = CreateWindowEx( 0, WC_TABCONTROL, NULL, style, hb_parni( 2 ), hb_parni( 3 ) , hb_parni( 4 ), hb_parni( 5 ), hwnd, NULL, GetModuleHandle( NULL ), NULL );
@@ -796,7 +796,7 @@ HB_FUNC( WAPI_TABCTRL_ADDITEM )
TC_ITEM item;
item.mask = TCIF_TEXT | TCIF_IMAGE;
item.iImage = ISNIL( 3 ) ? -1 : wapi_par_INT( 3 );
item.iImage = ISNUM( 3 ) ? wapi_par_INT( 3 ) : -1;
item.pszText = szText;
wapi_ret_NI( TabCtrl_InsertItem( wapi_par_HWND( 1 ), iCount, &item ) );

4
harbour/contrib/hbwin/wapi_winuser.c
View File

@@ -199,7 +199,7 @@ HB_FUNC( WAPI_SETSCROLLINFO )
wapi_ret_NI( SetScrollInfo( wapi_par_HWND( 1 ),
wapi_par_INT( 2 ),
si,
ISNIL( 4 ) ? TRUE : wapi_par_BOOL( 4 ) ) );
ISLOG( 4 ) ? wapi_par_BOOL( 4 ) : TRUE ) );
}
/*----------------------------------------------------------------------*/
/*
@@ -222,7 +222,7 @@ HB_FUNC( WAPI_SETSCROLLRANGE )
wapi_par_INT( 2 ),
wapi_par_INT( 3 ),
wapi_par_INT( 4 ),
( ISLOG( 5 ) ? wapi_par_BOOL( 5 ) : TRUE ) ) );
ISLOG( 5 ) ? wapi_par_BOOL( 5 ) : TRUE ) );
}
/*----------------------------------------------------------------------*/
/*

34
harbour/external/sqlite3/Makefile vendored Normal file
View File

@@ -0,0 +1,34 @@
#
# $Id$
#
ROOT = ../../
LIBNAME=sqlite3
ifeq ($(HB_WITHOUT_SQLIT3),)
ifeq ($(HB_ARCHITECTURE),dos)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),bsd)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),hpux)
HB_WITHOUT_SQLIT3=yes
endif
endif
ifneq ($(HB_WITHOUT_SQLIT3),yes)
C_SOURCES =\
_sqlite3.c \
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
else
include $(TOP)$(ROOT)config/none.cf
endif

83
harbour/external/sqlite3/_sqlite3.c vendored Normal file
View File

@@ -0,0 +1,83 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* SQLite3 stub
*
* Copyright 2009 Viktor Szakats <harbour 01 syenar hu>
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
*
* As a special exception, the Harbour Project gives permission for
* additional uses of the text contained in its release of Harbour.
*
* The exception is that, if you link the Harbour libraries with other
* files to produce an executable, this does not by itself cause the
* resulting executable to be covered by the GNU General Public License.
* Your use of that executable is in no way restricted on account of
* linking the Harbour library code into it.
*
* This exception does not however invalidate any other reasons why
* the executable file might be covered by the GNU General Public License.
*
* This exception applies only to the code released by the Harbour
* Project under the name Harbour. If you copy code from other
* Harbour Project or Free Software Foundation releases into a copy of
* Harbour, as the General Public License permits, the exception does
* not apply to the code that you add in this way. To avoid misleading
* anyone as to the status of such modified files, you must delete
* this exception notice from them.
*
* If you write modifications of your own for Harbour, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice.
*
*/
#if !( defined( __WATCOMC__ ) || (defined(__POCC__) && __POCC__ <= 450) )
#if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
#pragma GCC diagnostic ignored "-Wunused"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wuninitialized"
#elif defined( __BORLANDC__ )
#pragma warn -aus
#pragma warn -use
#pragma warn -par
#pragma warn -prc
#pragma warn -eff
#pragma warn -amp
#elif defined( _MSC_VER )
#pragma warning( disable: 4018 4244 )
#endif
#include "sqlite3.c"
#if defined( __GCC__ ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
#pragma GCC diagnostic warning "-Wunused"
#pragma GCC diagnostic warning "-Wsign-compare"
#pragma GCC diagnostic warning "-Wuninitialized"
#elif defined( __BORLANDC__ )
#pragma warn +aus
/* #pragma warn +use */ /* This affects the whole file, so don't turn it back on. */
#pragma warn +par
#pragma warn +prc
#pragma warn +eff
#pragma warn +amp
#elif defined( _MSC_VER )
#pragma warning( default: 4018 4244 )
#endif
#endif

0
harbour/contrib/hbsqlit3/sqlite3/sqlite3.c → harbour/external/sqlite3/sqlite3.c vendored
View File

0
harbour/contrib/hbsqlit3/sqlite3/sqlite3.h → harbour/external/sqlite3/sqlite3.h vendored
View File

49
harbour/include/hbapi.h
View File

@@ -223,21 +223,38 @@ HB_EXTERN_BEGIN
#endif
#define ISNIL( n ) ( hb_param( n, HB_IT_ANY ) == NULL || HB_IS_NIL( hb_param( n, HB_IT_ANY ) ) ) /* NOTE: Intentionally using a different method */
#define ISCHAR( n ) ( hb_param( n, HB_IT_STRING ) != NULL )
#define ISNUM( n ) ( hb_param( n, HB_IT_NUMERIC ) != NULL )
#define ISLOG( n ) ( hb_param( n, HB_IT_LOGICAL ) != NULL )
#define ISDATE( n ) ( hb_param( n, HB_IT_DATE ) != NULL )
#define ISTIMESTAMP( n ) ( hb_param( n, HB_IT_TIMESTAMP ) != NULL ) /* Not available in CA-Cl*pper. */
#define ISMEMO( n ) ( hb_param( n, HB_IT_MEMO ) != NULL )
#define ISBYREF( n ) ( ( hb_parinfo( n ) & HB_IT_BYREF ) != 0 ) /* NOTE: Intentionally using a different method */
#define ISARRAY( n ) ( hb_param( n, HB_IT_ARRAY ) != NULL )
#define ISOBJECT( n ) ( hb_extIsObject( n ) )
#define ISBLOCK( n ) ( hb_param( n, HB_IT_BLOCK ) != NULL ) /* Not available in CA-Cl*pper. */
#define ISPOINTER( n ) ( hb_param( n, HB_IT_POINTER ) != NULL ) /* Not available in CA-Cl*pper. */
#define ISHASH( n ) ( hb_param( n, HB_IT_HASH ) != NULL ) /* Not available in CA-Cl*pper. */
#define ISSYMBOL( n ) ( hb_param( n, HB_IT_SYMBOL ) != NULL ) /* Not available in CA-Cl*pper. */
#define ISDATETIME( n ) ( hb_param( n, HB_IT_DATETIME ) != NULL ) /* Not available in CA-Cl*pper. */
#define HB_ISNIL( n ) ( hb_param( n, HB_IT_ANY ) == NULL || HB_IS_NIL( hb_param( n, HB_IT_ANY ) ) ) /* NOTE: Intentionally using a different method */
#define HB_ISCHAR( n ) ( hb_param( n, HB_IT_STRING ) != NULL )
#define HB_ISNUM( n ) ( hb_param( n, HB_IT_NUMERIC ) != NULL )
#define HB_ISLOG( n ) ( hb_param( n, HB_IT_LOGICAL ) != NULL )
#define HB_ISDATE( n ) ( hb_param( n, HB_IT_DATE ) != NULL )
#define HB_ISTIMESTAMP( n ) ( hb_param( n, HB_IT_TIMESTAMP ) != NULL ) /* Not available in CA-Cl*pper. */
#define HB_ISMEMO( n ) ( hb_param( n, HB_IT_MEMO ) != NULL )
#define HB_ISBYREF( n ) ( ( hb_parinfo( n ) & HB_IT_BYREF ) != 0 ) /* NOTE: Intentionally using a different method */
#define HB_ISARRAY( n ) ( hb_param( n, HB_IT_ARRAY ) != NULL )
#define HB_ISOBJECT( n ) ( hb_extIsObject( n ) )
#define HB_ISBLOCK( n ) ( hb_param( n, HB_IT_BLOCK ) != NULL ) /* Not available in CA-Cl*pper. */
#define HB_ISPOINTER( n ) ( hb_param( n, HB_IT_POINTER ) != NULL ) /* Not available in CA-Cl*pper. */
#define HB_ISHASH( n ) ( hb_param( n, HB_IT_HASH ) != NULL ) /* Not available in CA-Cl*pper. */
#define HB_ISSYMBOL( n ) ( hb_param( n, HB_IT_SYMBOL ) != NULL ) /* Not available in CA-Cl*pper. */
#define HB_ISDATETIME( n ) ( hb_param( n, HB_IT_DATETIME ) != NULL ) /* Not available in CA-Cl*pper. */
/* Compatibility #defined, deprecated */
#define ISNIL( n ) HB_ISNIL( n )
#define ISCHAR( n ) HB_ISCHAR( n )
#define ISNUM( n ) HB_ISNUM( n )
#define ISLOG( n ) HB_ISLOG( n )
#define ISDATE( n ) HB_ISDATE( n )
#define ISTIMESTAMP( n ) HB_ISTIMESTAMP( n )
#define ISMEMO( n ) HB_ISMEMO( n )
#define ISBYREF( n ) HB_ISBYREF( n )
#define ISARRAY( n ) HB_ISARRAY( n )
#define ISOBJECT( n ) HB_ISOBJECT( n )
#define ISBLOCK( n ) HB_ISBLOCK( n )
#define ISPOINTER( n ) HB_ISPOINTER( n )
#define ISHASH( n ) HB_ISHASH( n )
#define ISSYMBOL( n ) HB_ISSYMBOL( n )
#define ISDATETIME( n ) HB_ISDATETIME( n )
#ifdef _HB_API_INTERNAL_
@@ -587,7 +604,7 @@ extern HB_EXPORT ULONG hb_parcsiz( int iParam, ... ); /* retrieve a by-refe
extern HB_EXPORT char * hb_pards( int iParam, ... ); /* retrieve a date as a string yyyymmdd */
extern HB_EXPORT char * hb_pardsbuff( char * szDate, int iParam, ... ); /* retrieve a date as a string yyyymmdd */
extern HB_EXPORT LONG hb_pardl( int iParam, ... ); /* retrieve a date as a LONG NUMBER */
extern HB_EXPORT double hb_partd( int iParam, ... ); /* retrieve a timestamp as a double number */
extern HB_EXPORT double hb_partd( int iParam, ... ); /* retrieve a timestamp as a double number */
extern HB_EXPORT BOOL hb_partdt( LONG * plJulian, LONG * plMilliSec , int iParam, ... ); /* retrieve a timestamp as two long numbers */
extern HB_EXPORT ULONG hb_parinfa( int iParamNum, ULONG uiArrayIndex ); /* retrieve length or element type of an array parameter */
extern HB_EXPORT ULONG hb_parinfo( int iParam ); /* Determine the param count or data type */