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

2009-10-22 13:05 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/generator/hbqtgen.prg
    ! Fixed : "warning C4100: 'Cargo' : unreferenced formal parameter"

  * contrib/hbqt/generator/hbqtgen.prg
  * contrib/hbqt/qtcore/QTextCodec.cpp
  * contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
  * contrib/hbqt/qtgui/QClipboard.cpp
  * contrib/hbqt/qtgui/QSessionManager.cpp
  * contrib/hbqt/qtgui/QTextBlockGroup.cpp
  * contrib/hbqt/qtgui/QTextObject.cpp
  * contrib/hbqt/qtwebkit/QWebFrame.cpp
  * contrib/hbqt/qtwebkit/QWebHistory.cpp
  * contrib/hbqt/qtwebkit/QWebSettings.cpp
    ! The result of "Cargo" fix.

  * contrib/hbqt/tests/demoqt.prg
    ! Confirms to -w3 specifications.
This commit is contained in:
Pritpal Bedi
2009-10-22 21:05:37 +00:00
parent 5f728263e6
commit d4433fa2b2
12 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -17,6 +17,25 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-10-22 13:05 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/generator/hbqtgen.prg
! Fixed : "warning C4100: 'Cargo' : unreferenced formal parameter"
* contrib/hbqt/generator/hbqtgen.prg
* contrib/hbqt/qtcore/QTextCodec.cpp
* contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
* contrib/hbqt/qtgui/QClipboard.cpp
* contrib/hbqt/qtgui/QSessionManager.cpp
* contrib/hbqt/qtgui/QTextBlockGroup.cpp
* contrib/hbqt/qtgui/QTextObject.cpp
* contrib/hbqt/qtwebkit/QWebFrame.cpp
* contrib/hbqt/qtwebkit/QWebHistory.cpp
* contrib/hbqt/qtwebkit/QWebSettings.cpp
! The result of "Cargo" fix.
* contrib/hbqt/tests/demoqt.prg
! Confirms to -w3 specifications.
2009-10-22 12:35 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/hbqt_slots.cpp
! Quantrined "error C2065: 'str' : undeclared identifier".
@@ -43,7 +62,7 @@
../../../hbqt_slots.cpp(1787) : error C2070: ''unknown-type'': illegal sizeof operand
../../../hbqt_slots.cpp(1787) : error C2065: 'str' : undeclared identifier
---
; TOFIX: I saw these warnings in almost all tested .cpp files:
; FIXED: I saw these warnings in almost all tested .cpp files:
---
../../../QWebSettings.cpp(86) : warning C4100: 'Cargo' : unreferenced formal parameter
---

2
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -492,6 +492,8 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
aadd( cpp_, " ph = NULL;" )
ENDIF
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " HB_SYMBOL_UNUSED( Cargo );" )
ENDIF
aadd( cpp_, "} " )
aadd( cpp_, " " )

1
harbour/contrib/hbqt/qtcore/QTextCodec.cpp
View File

@@ -97,6 +97,7 @@
QT_G_FUNC( release_QTextCodec )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QTEXTCODEC )

1
harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
View File

@@ -81,6 +81,7 @@
QT_G_FUNC( release_QAbstractItemDelegate )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTITEMDELEGATE )

1
harbour/contrib/hbqt/qtgui/QClipboard.cpp
View File

@@ -83,6 +83,7 @@
QT_G_FUNC( release_QClipboard )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QCLIPBOARD )

1
harbour/contrib/hbqt/qtgui/QSessionManager.cpp
View File

@@ -81,6 +81,7 @@
QT_G_FUNC( release_QSessionManager )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QSESSIONMANAGER )

1
harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp
View File

@@ -77,6 +77,7 @@
QT_G_FUNC( release_QTextBlockGroup )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QTEXTBLOCKGROUP )

1
harbour/contrib/hbqt/qtgui/QTextObject.cpp
View File

@@ -77,6 +77,7 @@
QT_G_FUNC( release_QTextObject )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QTEXTOBJECT )

1
harbour/contrib/hbqt/qtwebkit/QWebFrame.cpp
View File

@@ -91,6 +91,7 @@
QT_G_FUNC( release_QWebFrame )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QWEBFRAME )

1
harbour/contrib/hbqt/qtwebkit/QWebHistory.cpp
View File

@@ -88,6 +88,7 @@
QT_G_FUNC( release_QWebHistory )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QWEBHISTORY )

1
harbour/contrib/hbqt/qtwebkit/QWebSettings.cpp
View File

@@ -85,6 +85,7 @@
QT_G_FUNC( release_QWebSettings )
{
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QWEBSETTINGS )

46
harbour/contrib/hbqt/tests/demoqt.prg
View File

@@ -99,16 +99,17 @@ EXIT PROCEDURE Qt_End()
/*----------------------------------------------------------------------*/
FUNCTION My_Events( o,e )
FUNCTION My_Events()
hb_toOutDebug( "Key Pressed" )
RETURN nil
/*----------------------------------------------------------------------*/
PROCEDURE Main()
LOCAL nLoops := 500
Local oLabel, oBtn, oDA, oWnd, oProg, oSBar, oStyle, i, oSize, n
LOCAL aMenu, aTool, aGrid, aTabs, aList, aObj := array( nLoops )
Local oLabel, oBtn, oDA, oWnd, oProg, oSBar, i
LOCAL aMenu, aTool, aGrid, aTabs, aList
//LOCAL oStyle, oSize, n, aObj := array( nLoops )
//LOCAL nLoops := 500
Qt_SetEventFilter()
Qt_SetEventSlots()
@@ -199,8 +200,8 @@ FUNCTION xReleaseMemory( aObj )
/*----------------------------------------------------------------------*/
PROCEDURE ExecOneMore()
Local oLabel, oBtn, oDA, oWnd, oProg, oSBar, oStyle, i, oSize, n
LOCAL aMenu, aTool, aGrid, aTabs, aList, oEventLoop, nStart
Local oLabel, oBtn, oDA, oWnd, oProg, oSBar
LOCAL aMenu, aTool, aGrid, aTabs, aList, oEventLoop
LOCAL lExit := .f.
oWnd := QMainWindow():new()
@@ -231,7 +232,6 @@ PROCEDURE ExecOneMore()
oEventLoop := QEventLoop():new( QT_PTROF( oWnd ) )
nStart := seconds()
DO WHILE .t.
oEventLoop:processEvents()
IF lExit
@@ -240,15 +240,14 @@ PROCEDURE ExecOneMore()
ENDDO
oEventLoop:exit( 0 )
oEventLoop := 1
xReleaseMemory( { oBtn, oLabel, oProg, oSBar, aGrid, aList, aMenu, aTool, aTabs, oDA, oWnd } )
xReleaseMemory( { oEventLoop, oBtn, oLabel, oProg, oSBar, aGrid, aList, aMenu, aTool, aTabs, oDA, oWnd } )
RETURN
/*----------------------------------------------------------------------*/
STATIC FUNCTION Build_MenuBar( oWnd )
LOCAL oMenuBar, oMenu1, oMenu2, oActNew, oActOpen, oActSave
LOCAL oMenuBar, oMenu1, oMenu2
oMenuBar := QMenuBar():new()
oMenuBar:resize( oWnd:width(), 25 )
@@ -260,7 +259,7 @@ STATIC FUNCTION Build_MenuBar( oWnd )
oMenu1:addSeparator()
Qt_Connect_Signal( oMenu1:addAction_1( "save.png", "&Save" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save", w, l ) } )
oMenu1:addSeparator()
Qt_Connect_Signal( oMenu1:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|w,l| MsgInfo( "Exit ?" ) } )
Qt_Connect_Signal( oMenu1:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|w,l| w := w, l := l, MsgInfo( "Exit ?" ) } )
oMenuBar:addMenu( QT_PTROF( oMenu1 ) )
oMenu2 := QMenu():new()
@@ -274,7 +273,7 @@ STATIC FUNCTION Build_MenuBar( oWnd )
Qt_Connect_Signal( oMenu2:addAction( "&Wizard" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard" , w, l ) } )
Qt_Connect_Signal( oMenu2:addAction( "W&ebPage" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage" , w, l ) } )
oMenu2:addSeparator()
Qt_Connect_Signal( oMenu2:addAction( "&Another Dialog" ), QT_EVE_TRIGGERED_B, {|w,l| ExecOneMore() } )
Qt_Connect_Signal( oMenu2:addAction( "&Another Dialog" ), QT_EVE_TRIGGERED_B, {|w,l| w := w, l := l, ExecOneMore() } )
oMenuBar:addMenu( QT_PTROF( oMenu2 ) )
oWnd:setMenuBar( QT_PTROF( oMenuBar ) )
@@ -522,10 +521,10 @@ STATIC FUNCTION Build_TextBox( oWnd )
/*----------------------------------------------------------------------*/
STATIC FUNCTION Build_Controls( oWnd )
LOCAL oEdit, oCheckBox, oComboBox, oSpinBox, oRadioButton, oVariant
LOCAL oEdit, oCheckBox, oComboBox, oSpinBox, oRadioButton
oEdit := QLineEdit():new( QT_PTROF( oWnd ) )
Qt_Connect_Signal( QT_PTROF( oEdit ), QT_EVE_RETURNPRESSED, {|o,i| MsgInfo( oEdit:text() ) } )
Qt_Connect_Signal( QT_PTROF( oEdit ), QT_EVE_RETURNPRESSED, {|o,i| o := o, i := i, MsgInfo( oEdit:text() ) } )
oEdit:move( 5, 10 )
oEdit:resize( 345, 30 )
oEdit:setMaxLength( 40 )
@@ -538,13 +537,13 @@ STATIC FUNCTION Build_Controls( oWnd )
oComboBox:addItem( "Second" )
oComboBox:addItem( "Third" )
//Qt_Connect_Signal( QT_PTROF( oComboBox ), QT_EVE_HIGHLIGHTED_I , {|o,i| hb_outDebug( oComboBox:itemText( i ) ) } )
Qt_Connect_Signal( QT_PTROF( oComboBox ), QT_EVE_CURRENTINDEXCHANGED_I, {|o,i| MsgInfo( oComboBox:itemText( i ) ) } )
Qt_Connect_Signal( QT_PTROF( oComboBox ), QT_EVE_CURRENTINDEXCHANGED_I, {|o,i| o := o, i := i, MsgInfo( oComboBox:itemText( i ) ) } )
oComboBox:move( 5, 60 )
oComboBox:resize( 345, 30 )
oComboBox:show()
oCheckBox := QCheckBox():New( QT_PTROF( oWnd ) )
Qt_Connect_Signal( QT_PTROF( oCheckBox ), QT_EVE_STATECHANGED_I, {|o,i| MsgInfo( IF( i == 0,"Uncheckd","Checked" ) ) } )
Qt_Connect_Signal( QT_PTROF( oCheckBox ), QT_EVE_STATECHANGED_I, {|o,i| o := o, i := i, MsgInfo( IF( i == 0,"Uncheckd","Checked" ) ) } )
oCheckBox:setText( "Testing CheckBox HbQt" )
oCheckBox:move( 5, 110 )
oCheckBox:resize( 345, 30 )
@@ -556,7 +555,7 @@ STATIC FUNCTION Build_Controls( oWnd )
oSpinBox:Show()
oRadioButton := QRadioButton():New( QT_PTROF( oWnd ) )
Qt_Connect_Signal( QT_PTROF( oRadioButton ), QT_EVE_CLICKED, {|o,i| MsgInfo( "Checked" ) } )
Qt_Connect_Signal( QT_PTROF( oRadioButton ), QT_EVE_CLICKED, {|o,i| o := o, i := i, MsgInfo( "Checked" ) } )
oRadioButton:Move( 5, 210 )
oRadioButton:ReSize( 345, 30 )
oRadioButton:Show()
@@ -605,7 +604,7 @@ STATIC FUNCTION MsgInfo( cMsg )
/*----------------------------------------------------------------------*/
STATIC FUNCTION FileDialog( cType, w, l )
STATIC FUNCTION FileDialog()
LOCAL oFD
oFD := QFileDialog():new()
@@ -616,7 +615,7 @@ STATIC FUNCTION FileDialog( cType, w, l )
/*----------------------------------------------------------------------*/
STATIC FUNCTION Dialogs( cType, w, l )
STATIC FUNCTION Dialogs( cType )
LOCAL oDlg, oUrl
DO CASE
@@ -664,8 +663,11 @@ PROCEDURE hb_GtSys()
* Just to Link Every New Widget
*/
STATIC FUNCTION Dummies()
#if 0
LOCAL oSome
HB_SYMBOL_UNUSED( oSome )
oSome := QAbstractButton():new()
oSome := QAbstractItemModel():new()
oSome := QAbstractItemView():new()
@@ -892,7 +894,7 @@ STATIC FUNCTION Dummies()
oSome := QWizard():new()
oSome := 1
#endif
RETURN nil
/*----------------------------------------------------------------------*/
@@ -903,9 +905,9 @@ FUNCTION ShowInSystemTray( oWnd )
oMenu := QMenu():new( QT_PTROF( oWnd ) )
oMenu:setTitle( "&File" )
Qt_Connect_Signal( oMenu:addAction_1( "new.png" , "&Show" ), QT_EVE_TRIGGERED_B, {|w,l| oWnd:show() } )
Qt_Connect_Signal( oMenu:addAction_1( "new.png" , "&Show" ), QT_EVE_TRIGGERED_B, {|| oWnd:show() } )
oMenu:addSeparator()
Qt_Connect_Signal( oMenu:addAction_1( "save.png", "&Hide" ), QT_EVE_TRIGGERED_B, {|w,l| oWnd:hide() } )
Qt_Connect_Signal( oMenu:addAction_1( "save.png", "&Hide" ), QT_EVE_TRIGGERED_B, {|| oWnd:hide() } )
oSys := QSystemTrayIcon():new( QT_PTROF( oWnd ) )
oSys:setIcon( 'new.png' )