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

2009-11-20 14:32 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/generator/qt45.qtp
  * contrib/hbqt/Makefile
  * contrib/hbqt/qtgui/filelist.mk
  * contrib/hbqt/qtgui/QWindowsXPStyle.cpp
  * contrib/hbqt/qtgui/TQWindowsXPStyle.prg
  * contrib/hbqt/qth/QWindowsXPStyle.qth
    - Deleted QWindowXPStyle class source header and definition.

  * contrib/hbqt/hbqt.ch
    + Added more constants.
This commit is contained in:
Pritpal Bedi
2009-11-20 22:34:03 +00:00
parent a2c2b76080
commit 207825db6c
8 changed files with 26 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-20 14:32 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/generator/qt45.qtp
* contrib/hbqt/Makefile
* contrib/hbqt/qtgui/filelist.mk
* contrib/hbqt/qtgui/QWindowsXPStyle.cpp
* contrib/hbqt/qtgui/TQWindowsXPStyle.prg
* contrib/hbqt/qth/QWindowsXPStyle.qth
- Deleted QWindowXPStyle class source header and definition.
* contrib/hbqt/hbqt.ch
+ Added more constants.
2009-11-20 17:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.pt_BR.po
* utils/hbmk2/hbmk2.hu_HU.po

3
harbour/contrib/hbqt/Makefile
View File

@@ -35,8 +35,7 @@ moc_slots.cpp : $(TOP)$(ROOT)contrib/hbqt/hbqt_slots.h
DIRS += \
qtcore \
qtgui \
qtnetwork \
qtwebkit
qtnetwork
include $(TOP)$(ROOT)config/dir.mk
endif

1
harbour/contrib/hbqt/generator/qt45.qtp
View File

@@ -279,7 +279,6 @@ QWidget.qth
QWidgetAction.qth
QWidgetItem.qth
QWindowsStyle.qth
QWindowsXPStyle.qth
QWizard.qth
QWizardPage.qth

13
harbour/contrib/hbqt/hbqt.ch
View File

@@ -2146,6 +2146,19 @@
#define QDockWidget_DockWidgetVerticalTitleBar 0x08 // The dock widget displays a vertical title bar on its left side. This can be used to increase the amount of vertical space in a QMainWindow.
#define QDockWidget_NoDockWidgetFeatures 0x00 // The dock widget cannot be closed, moved, or floated.
#define QMainWindow_AnimatedDocks 0x01 // Identical to the animated property.
#define QMainWindow_AllowNestedDocks 0x02 // Identical to the dockNestingEnabled property.
#define QMainWindow_AllowTabbedDocks 0x04 // The user can drop one dock widget "on top" of another. The two widgets are stacked and a tab bar appears for selecting which one is visible.
#define QMainWindow_ForceTabbedDocks 0x08 // Each dock area contains a single stack of tabbed dock widgets. In other words, dock widgets cannot be placed next to each other in a dock area. If this option is set, AllowNestedDocks has no effect.
#define QMainWindow_VerticalTabs 0x10 // The two vertical dock areas on the sides of the main window show their tabs vertically. If this option is not set, all dock areas show their tabs at the bottom. Implies AllowTabbedDocks. See also setTabPosition().
#define QTabWidget_North 0 // The tabs are drawn above the pages.
#define QTabWidget_South 1 // The tabs are drawn below the pages.
#define QTabWidget_West 2 // The tabs are drawn to the left of the pages.
#define QTabWidget_East 3 // The tabs are drawn to the right of the pages.
#define QTabWidget_Rounded 0 // The tabs are drawn with a rounded look. This is the default shape.
#define QTabWidget_Triangular 1 // The tabs are drawn with a triangular look.
/*----------------------------------------------------------------------*/
#define _HBQT_CH

162
harbour/contrib/hbqt/qtgui/QWindowsXPStyle.cpp
View File

@@ -1,162 +0,0 @@
/*
* $Id$
*/
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated source file. DO NOT EDIT! */
/* Instead, edit corresponding .qth file, */
/* or the generator tool itself, and run regenarate. */
/* -------------------------------------------------------------------- */
/*
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* 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.
*
*/
/*----------------------------------------------------------------------*/
#include "hbapi.h"
#include "../hbqt.h"
/*----------------------------------------------------------------------*/
#if QT_VERSION >= 0x040500
/*----------------------------------------------------------------------*/
#include <QtCore/QPointer>
#include <QtGui/QWindowsXPStyle>
/*
* QWindowsXPStyle ()
* ~QWindowsXPStyle ()
*
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QWindowsXPStyle > pq;
} QGC_POINTER_QWindowsXPStyle;
QT_G_FUNC( release_QWindowsXPStyle )
{
QGC_POINTER_QWindowsXPStyle * p = ( QGC_POINTER_QWindowsXPStyle * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QWindowsXPStyle p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QWindowsXPStyle ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
switch( hbqt_get_object_release_method() )
{
case HBQT_RELEASE_WITH_DELETE:
delete ( ( QWindowsXPStyle * ) p->ph );
break;
case HBQT_RELEASE_WITH_DESTRUTOR:
( ( QWindowsXPStyle * ) p->ph )->~QWindowsXPStyle();
break;
case HBQT_RELEASE_WITH_DELETE_LATER:
( ( QWindowsXPStyle * ) p->ph )->deleteLater();
break;
}
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QWindowsXPStyle Object deleted!" ) );
#if defined( __HB_DEBUG__ )
hbqt_debug( " YES release_QWindowsXPStyle %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() );
#endif
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "release_QWindowsXPStyle Object Name Missing!" ) );
#if defined( __HB_DEBUG__ )
hbqt_debug( " NO release_QWindowsXPStyle" );
#endif
}
}
else
{
HB_TRACE( HB_TR_DEBUG, ( "release_QWindowsXPStyle Object Allready deleted!" ) );
#if defined( __HB_DEBUG__ )
hbqt_debug( " DEL release_QWindowsXPStyle" );
#endif
}
}
void * gcAllocate_QWindowsXPStyle( void * pObj )
{
QGC_POINTER_QWindowsXPStyle * p = ( QGC_POINTER_QWindowsXPStyle * ) hb_gcAllocate( sizeof( QGC_POINTER_QWindowsXPStyle ), gcFuncs() );
p->ph = pObj;
p->func = release_QWindowsXPStyle;
new( & p->pq ) QPointer< QWindowsXPStyle >( ( QWindowsXPStyle * ) pObj );
#if defined( __HB_DEBUG__ )
hbqt_debug( " new_QWindowsXPStyle %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() );
#endif
return( p );
}
HB_FUNC( QT_QWINDOWSXPSTYLE )
{
void * pObj = NULL;
#if defined( HB_OS_WIN )
pObj = ( QWindowsXPStyle* ) new QWindowsXPStyle() ;
#else
pObj = NULL ;
#endif
hb_retptrGC( gcAllocate_QWindowsXPStyle( pObj ) );
}
/*----------------------------------------------------------------------*/
#endif /* #if QT_VERSION >= 0x040500 */
/*----------------------------------------------------------------------*/

90
harbour/contrib/hbqt/qtgui/TQWindowsXPStyle.prg
View File

@@ -1,90 +0,0 @@
/*
* $Id$
*/
/* -------------------------------------------------------------------- */
/* WARNING: Automatically generated source file. DO NOT EDIT! */
/* Instead, edit corresponding .qth file, */
/* or the generator tool itself, and run regenarate. */
/* -------------------------------------------------------------------- */
/*
* Harbour Project source code:
* QT wrapper main header
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
*
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
* 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.
*
*/
/*----------------------------------------------------------------------*/
#include "hbclass.ch"
CREATE CLASS QWindowsXPStyle INHERIT QWindowsStyle
VAR pPtr
METHOD new()
METHOD configure( xObject )
ENDCLASS
/*----------------------------------------------------------------------*/
METHOD QWindowsXPStyle:new( pParent )
::pPtr := Qt_QWindowsXPStyle( pParent )
RETURN Self
METHOD QWindowsXPStyle:configure( xObject )
IF hb_isObject( xObject )
::pPtr := xObject:pPtr
ELSEIF hb_isPointer( xObject )
::pPtr := xObject
ENDIF
RETURN Self

2
harbour/contrib/hbqt/qtgui/filelist.mk
View File

@@ -212,7 +212,6 @@ CPP_SOURCES := \
QWidgetAction.cpp \
QWidgetItem.cpp \
QWindowsStyle.cpp \
QWindowsXPStyle.cpp \
QWizard.cpp \
QWizardPage.cpp \
@@ -422,7 +421,6 @@ PRG_SOURCES := \
TQWidgetAction.prg \
TQWidgetItem.prg \
TQWindowsStyle.prg \
TQWindowsXPStyle.prg \
TQWizard.prg \
TQWizardPage.prg \

96
harbour/contrib/hbqt/qth/QWindowsXPStyle.qth
View File

@@ -1,96 +0,0 @@
/*
* $Id$
*/
/*
* Harbour Project source code:
* QT Source Generator for Harbour
*
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
* 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.
*
*/
/*----------------------------------------------------------------------*/
;
; Header File to Generate QT Wrapper Sources
;
<CLASS>
Inherits = QWindowsStyle
Type = Core
New =
</CLASS>
<CODE>
#include <QtGui/QWindowsXPStyle>
/*
* QWindowsXPStyle ()
* ~QWindowsXPStyle ()
*
*/
HB_FUNC( QT_QWINDOWSXPSTYLE )
{
#if defined( HB_OS_WIN )
hb_retptr( ( QWindowsXPStyle* ) new QWindowsXPStyle() );
#else
hb_retptr( NULL );
#endif
}
</CODE>
<ENUMS>
</ENUMS>
<PROTOS>
</PROTOS>
<SLOTS>
</SLOTS>
<SIGNALS>
</SIGNALS>