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

2010-10-20 17:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/qscintilla/qth/QsciAbstractAPIs.qth
  * contrib/hbqt/qscintilla/qth/QsciCommand.qth
  * contrib/hbqt/qscintilla/qth/QsciCommandSet.qth
  * contrib/hbqt/qscintilla/qth/QsciLexer.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth
  * contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth
  * contrib/hbqt/qtgui/qth/QApplication.qth
    + Added: Constructor = no.
  * contrib/hbqt/qtgui/qth/QClipboard.qth
    + Added: Constructor = no.
      QClipboard() does not have constructor so it has never to be released.
      Maybe this fixes the bug reported on HMG forums.

  * contrib/hbqt/qtgui/g/QClipboard.cpp
    * Re-generated.

  * contrib/hbqt/utils/hbqtgen.prg
    + Introduced: ::isDetached member pulled from .qth header.
This commit is contained in:
Pritpal Bedi
2010-10-21 00:16:48 +00:00
parent 59f94ca462
commit f59c793514
16 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
harbour/ChangeLog
View File

@@ -16,6 +16,31 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-10-20 17:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qscintilla/qth/QsciAbstractAPIs.qth
* contrib/hbqt/qscintilla/qth/QsciCommand.qth
* contrib/hbqt/qscintilla/qth/QsciCommandSet.qth
* contrib/hbqt/qscintilla/qth/QsciLexer.qth
* contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth
* contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth
* contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth
* contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth
* contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth
* contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth
* contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth
* contrib/hbqt/qtgui/qth/QApplication.qth
+ Added: Constructor = no.
* contrib/hbqt/qtgui/qth/QClipboard.qth
+ Added: Constructor = no.
QClipboard() does not have constructor so it has never to be released.
Maybe this fixes the bug reported on HMG forums.
* contrib/hbqt/qtgui/g/QClipboard.cpp
* Re-generated.
* contrib/hbqt/utils/hbqtgen.prg
+ Introduced: ::isDetached member pulled from .qth header.
2010-10-21 00:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbrun/hbrun.prg
! Refixed icon ordinal in file type registration.

1
harbour/contrib/hbqt/qscintilla/qth/QsciAbstractAPIs.qth
View File

@@ -60,6 +60,7 @@ Inherits =
Type =
New =
Folder = hbqscintilla
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qscintilla/qth/QsciCommand.qth
View File

@@ -60,6 +60,7 @@ Inherits =
Type =
New =
Folder = hbqscintilla
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth
View File

@@ -60,6 +60,7 @@ Inherits =
Type =
New =
Folder = hbqscintilla
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qscintilla/qth/QsciLexer.qth
View File

@@ -61,6 +61,7 @@ Type =
New =
Folder = hbqscintilla
Destructor = no
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerActionEditorInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits = QWidget
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowCursorInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits =
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits = QWidget
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerFormWindowManagerInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits = QObject
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerObjectInspectorInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits = QWidget
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerPropertyEditorInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits = QWidget
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

1
harbour/contrib/hbqt/qtdesigner/qth/QDesignerWidgetBoxInterface.qth
View File

@@ -60,6 +60,7 @@ Inherits = QWidget
Type =
New =
folder = hbqtdesigner
Constructor = no
</CLASS>
<SUBCLASS>

2
harbour/contrib/hbqt/qtgui/g/QClipboard.cpp
View File

@@ -169,7 +169,7 @@ HB_FUNC( QT_QCLIPBOARD )
pObj = QApplication::clipboard() ;
hb_retptrGC( hbqt_gcAllocate_QClipboard( ( void * ) pObj, true ) );
hb_retptrGC( hbqt_gcAllocate_QClipboard( ( void * ) pObj, false ) );
}
/*

1
harbour/contrib/hbqt/qtgui/qth/QApplication.qth
View File

@@ -56,6 +56,7 @@
<CLASS>
Inherit = QCoreApplication
New =
Constructor = no
</CLASS>

4
harbour/contrib/hbqt/qtgui/qth/QClipboard.qth
View File

@@ -59,6 +59,7 @@ Inherits = QObject
Type = Core
New =
Destructor = no
Detached = yes
</CLASS>
<CODE>
@@ -73,7 +74,8 @@ Destructor = no
*/
HB_FUNC( QT_QCLIPBOARD )
{
__HB_RETPTRGC__( QApplication::clipboard() );
//__HB_RETPTRGC__( QApplication::clipboard() );
pObj = QApplication::clipboard() ;
}
</CODE>

21
harbour/contrib/hbqt/utils/hbqtgen.prg
View File

@@ -473,6 +473,7 @@ CLASS HbQtSource
DATA isDestructor INIT .t.
DATA isConstructor INIT .f.
DATA isObject INIT .t.
DATA isDetached INIT .f.
DATA areMethodsClubbed INIT .t.
DATA class_ INIT {}
@@ -620,18 +621,22 @@ METHOD HbQtSource:new( oGen, cFileQth, cPathOut, cPathDoc, cProject )
aeval( ::slots_, {|e| aadd( ::protos_, e ) } )
::isList := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "list" .AND. lower( e_[ 2 ] ) == "yes" } ) > 0
::isDetached := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "detached" .AND. lower( e_[ 2 ] ) == "yes" } ) > 0
::isConstructor := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "constructor" .AND. lower( e_[ 2 ] ) == "no" } ) == 0
::isDestructor := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "destructor" .AND. lower( e_[ 2 ] ) == "no" } ) == 0
::isObject := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .AND. lower( e_[ 2 ] ) == "no" } ) == 0
::areMethodsClubbed := ascan( ::cls_, {|e_| lower( e_[ 1 ] ) == "clubmethods" .AND. lower( e_[ 2 ] ) == "no" } ) == 0
/* Determine Constructor - but this is hacky a bit. What could be easiest ? */
FOR i := 3 TO len( ::new_ ) - 1
IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" )
IF "__HB_RETPTRGC__(" $ ::new_[ i ]
::isConstructor := .t.
EXIT
IF ! ::isConstructor
FOR i := 3 TO len( ::new_ ) - 1
IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" )
IF "__HB_RETPTRGC__(" $ ::new_[ i ]
::isConstructor := .t.
EXIT
ENDIF
ENDIF
ENDIF
NEXT
NEXT
ENDIF
FOR EACH s IN ::protos_
cOrg := s
@@ -888,7 +893,7 @@ METHOD HbQtSource:build()
ENDIF
NEXT
aadd( ::cpp_, " " )
aadd( ::cpp_, " hb_retptrGC( hbqt_gcAllocate_" + ::cWidget + "( ( void * ) pObj, true ) );" )
aadd( ::cpp_, " hb_retptrGC( hbqt_gcAllocate_" + ::cWidget + "( ( void * ) pObj, " + iif( ::isDetached, "false", "true" ) + " ) );" )
ELSE
FOR i := 3 TO len( ::new_ ) - 1
aadd( ::cpp_, ::new_[ i ] )