2010-01-03 13:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added OS/2 to QT supported platforms.
* harbour.spec
+ Merged lib and static subpackages into main one.
hbmk2 requires that both dynamic and static libs (namely hbcplr)
are present for successful linking.
Please test and comment, I can revert old version in
case of any problems.
* contrib/hbqt/filelist.mk
* contrib/hbqt/hbqt_hbevents.cpp
* contrib/hbqt/hbqt_hbslots.cpp
- contrib/hbqt/hbqt_hbevents2.cpp
- contrib/hbqt/hbqt_hbslots2.cpp
* Merged new EVENTS/SLOTS implementation with old one,
removing all existing redundancies and fixing double
definition of low-level classes.
This commit is contained in:
Viktor Szakats
24566
harbour/ChangeLog
24566
harbour/ChangeLog
File diff suppressed because one or more lines are too long
@@ -1286,7 +1286,7 @@ HARBOUR
|
||||
http://www.postgresql.org/
|
||||
HB_WITH_PNG - libpng [multiplatform, free, open-source]
|
||||
http://www.libpng.org/pub/png/libpng.html
|
||||
HB_WITH_QT - Nokia QT (GUI) [win, wce, darwin, linux, free, open-source]
|
||||
HB_WITH_QT - Nokia QT (GUI) [win, wce, os2, darwin, linux, free, open-source]
|
||||
http://qt.nokia.com/products/
|
||||
http://get.qt.nokia.com/qt/source/
|
||||
Currently supported Windows binary package:
|
||||
|
||||
@@ -16,12 +16,10 @@ CPP_SOURCES := \
|
||||
hbqt_destruct.cpp \
|
||||
hbqt_hbdbfmodel.cpp \
|
||||
hbqt_hbevents.cpp \
|
||||
hbqt_hbevents2.cpp \
|
||||
hbqt_hbqmainwindow.cpp \
|
||||
hbqt_hbqsyntaxhighlighter.cpp \
|
||||
hbqt_hbqtableview.cpp \
|
||||
hbqt_hbslots.cpp \
|
||||
hbqt_hbslots2.cpp \
|
||||
|
||||
PRG_SOURCES := \
|
||||
hbqt_misc.prg \
|
||||
|
||||
@@ -109,62 +109,6 @@ HB_FUNC( QT_EVENTS_DESTROY )
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
HBEvents::HBEvents( QObject * parent ) : QObject( parent )
|
||||
{
|
||||
}
|
||||
|
||||
HBEvents::~HBEvents()
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( " HBEvents::~HBEvents()" ) );
|
||||
int i;
|
||||
|
||||
for( i = 0; i < listBlock.size(); i++ )
|
||||
{
|
||||
if( listBlock[ i ] != NULL )
|
||||
{
|
||||
hb_itemRelease( listBlock.at( i ) );
|
||||
listBlock[ i ] = NULL;
|
||||
listObj[ i ] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
listBlock.clear();
|
||||
}
|
||||
|
||||
bool HBEvents::eventFilter( QObject * object, QEvent * event )
|
||||
{
|
||||
QEvent::Type eventtype = event->type();
|
||||
|
||||
if( ( int ) eventtype == 0 )
|
||||
return false;
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", eventtype, "P" );
|
||||
|
||||
int found = object->property( prop ).toInt();
|
||||
|
||||
if( found == 0 )
|
||||
return false;
|
||||
|
||||
bool ret = true;
|
||||
|
||||
if( found <= listBlock.size() && listObj.at( found - 1 ) == object && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pEvent = hb_itemPutPtr( NULL, event );
|
||||
ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 2, pObject, pEvent ) );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pEvent );
|
||||
|
||||
hb_vmRequestRestore();
|
||||
|
||||
if( eventtype == QEvent::Close )
|
||||
event->ignore();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
HB_FUNC( QT_CONNECT_EVENT )
|
||||
{
|
||||
QObject * object = ( QObject* ) hbqt_pPtrFromObj( 1 ); /* get sender */
|
||||
@@ -221,4 +165,202 @@ HB_FUNC( QT_DISCONNECT_EVENT )
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
#include <QPointer>
|
||||
#include <QVariant>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void * ph;
|
||||
QT_G_FUNC_PTR func;
|
||||
QPointer< HBEvents > pq;
|
||||
} QGC_POINTER_HBEvents;
|
||||
|
||||
static QT_G_FUNC( hbqt_release_HBEvents )
|
||||
{
|
||||
QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) Cargo;
|
||||
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents p=%p", p));
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents 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 ( ( HBEvents * ) p->ph );
|
||||
break;
|
||||
case HBQT_RELEASE_WITH_DESTRUTOR:
|
||||
( ( HBEvents * ) p->ph )->~HBEvents();
|
||||
break;
|
||||
case HBQT_RELEASE_WITH_DELETE_LATER:
|
||||
( ( HBEvents * ) p->ph )->deleteLater();
|
||||
break;
|
||||
}
|
||||
p->ph = NULL;
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "NO release_HBEvents Object Name Missing!" ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBEvents Object Already deleted!" ) );
|
||||
}
|
||||
}
|
||||
|
||||
static void * hbqt_gcAllocate_HBEvents( void * pObj )
|
||||
{
|
||||
QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) hb_gcAllocate( sizeof( QGC_POINTER_HBEvents ), hbqt_gcFuncs() );
|
||||
|
||||
p->ph = pObj;
|
||||
p->func = hbqt_release_HBEvents;
|
||||
new( & p->pq ) QPointer< HBEvents >( ( HBEvents * ) pObj );
|
||||
HB_TRACE( HB_TR_DEBUG, ( " new_HBEvents %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
|
||||
return( p );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
/* TOFIX: Possible GPF is below pointer is used by .prg after release. */
|
||||
HB_FUNC( QT_EVENTS_PTR )
|
||||
{
|
||||
hb_retptr( hbqt_par_HBEvents( 1 ) );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
HBEvents::HBEvents( QObject * parent ) : QObject( parent )
|
||||
{
|
||||
}
|
||||
|
||||
/* QUESTION: Shouldn't all events be disconnected at this point? */
|
||||
HBEvents::~HBEvents()
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( " HBEvents::~HBEvents()" ) );
|
||||
int i;
|
||||
|
||||
for( i = 0; i < listBlock.size(); i++ )
|
||||
{
|
||||
if( listBlock[ i ] != NULL )
|
||||
{
|
||||
hb_itemRelease( listBlock.at( i ) );
|
||||
listBlock[ i ] = NULL;
|
||||
listObj[ i ] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
listBlock.clear();
|
||||
}
|
||||
|
||||
bool HBEvents::eventFilter( QObject * object, QEvent * event )
|
||||
{
|
||||
QEvent::Type eventtype = event->type();
|
||||
|
||||
if( ( int ) eventtype == 0 )
|
||||
return false;
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", eventtype, "P" );
|
||||
|
||||
int found = object->property( prop ).toInt();
|
||||
|
||||
if( found == 0 )
|
||||
return false;
|
||||
|
||||
bool ret = true;
|
||||
|
||||
if( found <= listBlock.size() && listObj.at( found - 1 ) == object && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pEvent = hb_itemPutPtr( NULL, event );
|
||||
ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 2, pObject, pEvent ) );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pEvent );
|
||||
|
||||
hb_vmRequestRestore();
|
||||
|
||||
if( eventtype == QEvent::Close )
|
||||
event->ignore();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
HB_FUNC( QT_EVENTS_CONNECT )
|
||||
{
|
||||
HB_BOOL bRet = HB_FALSE;
|
||||
HBEvents * t_events = hbqt_par_HBEvents( 1 );
|
||||
|
||||
if( t_events )
|
||||
{
|
||||
QObject * object = ( QObject* ) hbqt_pPtrFromObj( 2 ); /* get sender */
|
||||
|
||||
if( object )
|
||||
{
|
||||
int type = hb_parni( 3 );
|
||||
PHB_ITEM codeblock = hb_itemNew( hb_param( 4, HB_IT_BLOCK | HB_IT_BYREF ) );
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */
|
||||
|
||||
t_events->listBlock << codeblock;
|
||||
/* TOFIX: Reference to GC collected pointer is stored. */
|
||||
t_events->listObj << object;
|
||||
|
||||
object->setProperty( prop, ( int ) t_events->listBlock.size() );
|
||||
|
||||
bRet = HB_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
hb_retl( bRet );
|
||||
}
|
||||
|
||||
HB_FUNC( QT_EVENTS_DISCONNECT )
|
||||
{
|
||||
HB_BOOL bRet = HB_FALSE;
|
||||
HBEvents * t_events = hbqt_par_HBEvents( 1 );
|
||||
|
||||
if( t_events )
|
||||
{
|
||||
QObject * object = ( QObject* ) hbqt_pPtrFromObj( 2 );
|
||||
|
||||
if( object )
|
||||
{
|
||||
int type = hb_parni( 3 );
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */
|
||||
|
||||
int i = object->property( prop ).toInt();
|
||||
if( i > 0 && i <= t_events->listBlock.size() )
|
||||
{
|
||||
hb_itemRelease( t_events->listBlock.at( i - 1 ) );
|
||||
t_events->listBlock[ i - 1 ] = NULL;
|
||||
t_events->listObj[ i - 1 ] = NULL;
|
||||
object->setProperty( prop, QVariant() );
|
||||
bRet = HB_TRUE;
|
||||
|
||||
HB_TRACE( HB_TR_DEBUG, ( " QT_EVENTS_DISCONNECT: %i", type ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hb_retl( bRet );
|
||||
}
|
||||
|
||||
HB_FUNC( QT_EVENTS_NEW )
|
||||
{
|
||||
void * pObj = NULL;
|
||||
|
||||
pObj = ( HBEvents * ) new HBEvents();
|
||||
|
||||
hb_retptrGC( hbqt_gcAllocate_HBEvents( pObj ) );
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,267 +0,0 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* QT wrapper main header
|
||||
*
|
||||
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
|
||||
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
|
||||
* Copyright 2010 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.
|
||||
*
|
||||
*/
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
#include "hbapi.h"
|
||||
#include "hbapiitm.h"
|
||||
#include "hbstack.h"
|
||||
#include "hbvm.h"
|
||||
|
||||
#include "hbqt.h"
|
||||
|
||||
#if QT_VERSION >= 0x040500
|
||||
|
||||
#include "hbqt_hbevents.h"
|
||||
|
||||
#include <QPointer>
|
||||
#include <QVariant>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void * ph;
|
||||
QT_G_FUNC_PTR func;
|
||||
QPointer< HBEvents > pq;
|
||||
} QGC_POINTER_HBEvents;
|
||||
|
||||
static QT_G_FUNC( hbqt_release_HBEvents )
|
||||
{
|
||||
QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) Cargo;
|
||||
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents p=%p", p));
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents 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 ( ( HBEvents * ) p->ph );
|
||||
break;
|
||||
case HBQT_RELEASE_WITH_DESTRUTOR:
|
||||
( ( HBEvents * ) p->ph )->~HBEvents();
|
||||
break;
|
||||
case HBQT_RELEASE_WITH_DELETE_LATER:
|
||||
( ( HBEvents * ) p->ph )->deleteLater();
|
||||
break;
|
||||
}
|
||||
p->ph = NULL;
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBEvents Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "NO release_HBEvents Object Name Missing!" ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBEvents Object Already deleted!" ) );
|
||||
}
|
||||
}
|
||||
|
||||
static void * hbqt_gcAllocate_HBEvents( void * pObj )
|
||||
{
|
||||
QGC_POINTER_HBEvents * p = ( QGC_POINTER_HBEvents * ) hb_gcAllocate( sizeof( QGC_POINTER_HBEvents ), hbqt_gcFuncs() );
|
||||
|
||||
p->ph = pObj;
|
||||
p->func = hbqt_release_HBEvents;
|
||||
new( & p->pq ) QPointer< HBEvents >( ( HBEvents * ) pObj );
|
||||
HB_TRACE( HB_TR_DEBUG, ( " new_HBEvents %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
|
||||
return( p );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
/* TOFIX: Possible GPF is below pointer is used by .prg after release. */
|
||||
HB_FUNC( QT_EVENTS_PTR )
|
||||
{
|
||||
hb_retptr( hbqt_par_HBEvents( 1 ) );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
HBEvents::HBEvents( QObject * parent ) : QObject( parent )
|
||||
{
|
||||
}
|
||||
|
||||
/* QUESTION: Shouldn't all events be disconnected at this point? */
|
||||
HBEvents::~HBEvents()
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( " HBEvents::~HBEvents()" ) );
|
||||
int i;
|
||||
|
||||
for( i = 0; i < listBlock.size(); i++ )
|
||||
{
|
||||
if( listBlock[ i ] != NULL )
|
||||
{
|
||||
hb_itemRelease( listBlock.at( i ) );
|
||||
listBlock[ i ] = NULL;
|
||||
listObj[ i ] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
listBlock.clear();
|
||||
}
|
||||
|
||||
bool HBEvents::eventFilter( QObject * object, QEvent * event )
|
||||
{
|
||||
QEvent::Type eventtype = event->type();
|
||||
|
||||
if( ( int ) eventtype == 0 )
|
||||
return false;
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", eventtype, "P" );
|
||||
|
||||
int found = object->property( prop ).toInt();
|
||||
|
||||
if( found == 0 )
|
||||
return false;
|
||||
|
||||
bool ret = true;
|
||||
|
||||
if( found <= listBlock.size() && listObj.at( found - 1 ) == object && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pEvent = hb_itemPutPtr( NULL, event );
|
||||
ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 2, pObject, pEvent ) );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pEvent );
|
||||
|
||||
hb_vmRequestRestore();
|
||||
|
||||
if( eventtype == QEvent::Close )
|
||||
event->ignore();
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
HB_FUNC( QT_EVENTS_CONNECT )
|
||||
{
|
||||
HB_BOOL bRet = HB_FALSE;
|
||||
HBEvents * t_events = hbqt_par_HBEvents( 1 );
|
||||
|
||||
if( t_events )
|
||||
{
|
||||
QObject * object = ( QObject* ) hbqt_pPtrFromObj( 2 ); /* get sender */
|
||||
|
||||
if( object )
|
||||
{
|
||||
int type = hb_parni( 3 );
|
||||
PHB_ITEM codeblock = hb_itemNew( hb_param( 4, HB_IT_BLOCK | HB_IT_BYREF ) );
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */
|
||||
|
||||
t_events->listBlock << codeblock;
|
||||
/* TOFIX: Reference to GC collected pointer is stored. */
|
||||
t_events->listObj << object;
|
||||
|
||||
object->setProperty( prop, ( int ) t_events->listBlock.size() );
|
||||
|
||||
bRet = HB_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
hb_retl( bRet );
|
||||
}
|
||||
|
||||
HB_FUNC( QT_EVENTS_DISCONNECT )
|
||||
{
|
||||
HB_BOOL bRet = HB_FALSE;
|
||||
HBEvents * t_events = hbqt_par_HBEvents( 1 );
|
||||
|
||||
if( t_events )
|
||||
{
|
||||
QObject * object = ( QObject* ) hbqt_pPtrFromObj( 2 );
|
||||
|
||||
if( object )
|
||||
{
|
||||
int type = hb_parni( 3 );
|
||||
|
||||
char prop[ 20 ];
|
||||
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */
|
||||
|
||||
int i = object->property( prop ).toInt();
|
||||
if( i > 0 && i <= t_events->listBlock.size() )
|
||||
{
|
||||
hb_itemRelease( t_events->listBlock.at( i - 1 ) );
|
||||
t_events->listBlock[ i - 1 ] = NULL;
|
||||
t_events->listObj[ i - 1 ] = NULL;
|
||||
object->setProperty( prop, QVariant() );
|
||||
bRet = HB_TRUE;
|
||||
|
||||
HB_TRACE( HB_TR_DEBUG, ( " QT_EVENTS_DISCONNECT: %i", type ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hb_retl( bRet );
|
||||
}
|
||||
|
||||
HB_FUNC( QT_EVENTS_NEW )
|
||||
{
|
||||
void * pObj = NULL;
|
||||
|
||||
pObj = ( HBEvents * ) new HBEvents();
|
||||
|
||||
hb_retptrGC( hbqt_gcAllocate_HBEvents( pObj ) );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,864 +0,0 @@
|
||||
/*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Harbour Project source code:
|
||||
* QT wrapper main header
|
||||
*
|
||||
* Copyright 2009 Marcos Antonio Gambeta <marcosgambeta at gmail dot com>
|
||||
* Copyright 2009 Pritpal Bedi <pritpal@vouchcac.com>
|
||||
* Copyright 2010 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.
|
||||
*
|
||||
*/
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
#include "hbapi.h"
|
||||
#include "hbapiitm.h"
|
||||
#include "hbstack.h"
|
||||
#include "hbvm.h"
|
||||
|
||||
#include "hbqt.h"
|
||||
|
||||
#if QT_VERSION >= 0x040500
|
||||
|
||||
#include "hbqt_hbslots.h"
|
||||
|
||||
#include <QPointer>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void * ph;
|
||||
QT_G_FUNC_PTR func;
|
||||
QPointer< HBSlots > pq;
|
||||
} QGC_POINTER_HBSlots;
|
||||
|
||||
static QT_G_FUNC( hbqt_release_HBSlots )
|
||||
{
|
||||
QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) Cargo;
|
||||
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBSlots p=%p", p));
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBSlots 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 ( ( HBSlots * ) p->ph );
|
||||
break;
|
||||
case HBQT_RELEASE_WITH_DESTRUTOR:
|
||||
( ( HBSlots * ) p->ph )->~HBSlots();
|
||||
break;
|
||||
case HBQT_RELEASE_WITH_DELETE_LATER:
|
||||
( ( HBSlots * ) p->ph )->deleteLater();
|
||||
break;
|
||||
}
|
||||
p->ph = NULL;
|
||||
HB_TRACE( HB_TR_DEBUG, ( "release_HBSlots Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "NO release_HBSlots Object Name Missing!" ) );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
HB_TRACE( HB_TR_DEBUG, ( "DEL release_HBSlots Object Already deleted!" ) );
|
||||
}
|
||||
}
|
||||
|
||||
static void * hbqt_gcAllocate_HBSlots( void * pObj )
|
||||
{
|
||||
QGC_POINTER_HBSlots * p = ( QGC_POINTER_HBSlots * ) hb_gcAllocate( sizeof( QGC_POINTER_HBSlots ), hbqt_gcFuncs() );
|
||||
|
||||
p->ph = pObj;
|
||||
p->func = hbqt_release_HBSlots;
|
||||
new( & p->pq ) QPointer< HBSlots >( ( HBSlots * ) pObj );
|
||||
HB_TRACE( HB_TR_DEBUG, ( " new_HBSlots %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
|
||||
return( p );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
HBSlots::HBSlots( QObject* parent ) : QObject( parent )
|
||||
{
|
||||
}
|
||||
|
||||
HBSlots::~HBSlots()
|
||||
{
|
||||
int i;
|
||||
|
||||
for( i = 0; i < listBlock.size(); i++ )
|
||||
{
|
||||
if( listBlock[ i ] != NULL )
|
||||
{
|
||||
hb_itemRelease( listBlock.at( i ) );
|
||||
listBlock[ i ] = NULL;
|
||||
}
|
||||
}
|
||||
/* QUESTION: Should there be all remaining active slots disconnected at this point? */
|
||||
|
||||
/* Should be disconnected, but this is a responsibility of programmer as object is only known to the application */
|
||||
listBlock.clear();
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExec( HBSlots * t_slots, QObject * object, const char * pszEvent )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 1, pObject );
|
||||
hb_itemRelease( pObject );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecBool( HBSlots * t_slots, QObject * object, const char * pszEvent, bool bBool )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pBool = hb_itemPutL( NULL, bBool );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, pBool );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pBool );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pState = hb_itemPutNI( NULL, iValue );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, pState );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pState );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecIntInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2 )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pValue1 = hb_itemPutNI( NULL, iValue1 );
|
||||
PHB_ITEM pValue2 = hb_itemPutNI( NULL, iValue2 );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 3, pObject, pValue1, pValue2 );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pValue1 );
|
||||
hb_itemRelease( pValue2 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecIntIntInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3 )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pValue1 = hb_itemPutNI( NULL, iValue1 );
|
||||
PHB_ITEM pValue2 = hb_itemPutNI( NULL, iValue2 );
|
||||
PHB_ITEM pValue3 = hb_itemPutNI( NULL, iValue3 );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 4, pObject, pValue1, pValue2, pValue3 );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pValue1 );
|
||||
hb_itemRelease( pValue2 );
|
||||
hb_itemRelease( pValue3 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecIntIntIntInt( HBSlots * t_slots, QObject * object, const char * pszEvent, int iValue1, int iValue2, int iValue3, int iValue4 )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pValue1 = hb_itemPutNI( NULL, iValue1 );
|
||||
PHB_ITEM pValue2 = hb_itemPutNI( NULL, iValue2 );
|
||||
PHB_ITEM pValue3 = hb_itemPutNI( NULL, iValue3 );
|
||||
PHB_ITEM pValue4 = hb_itemPutNI( NULL, iValue4 );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 5, pObject, pValue1, pValue2, pValue3, pValue4 );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pValue1 );
|
||||
hb_itemRelease( pValue2 );
|
||||
hb_itemRelease( pValue3 );
|
||||
hb_itemRelease( pValue4 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecString( HBSlots * t_slots, QObject * object, const char * pszEvent, const QString & string )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pString = hb_itemPutC( NULL, string.toAscii().data() );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, pString );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pString );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecModel( HBSlots * t_slots, QObject * object, const char * pszEvent, const QModelIndex & index )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pState = hb_itemPutPtr( NULL, ( QModelIndex * ) new QModelIndex( index ) );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, pState );
|
||||
hb_itemRelease( pObject );
|
||||
delete ( ( QModelIndex * ) hb_itemGetPtr( pState ) );
|
||||
hb_itemRelease( pState );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecTextCharFormat( HBSlots * t_slots, QObject * object, const char * pszEvent, const QTextCharFormat & f )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM p1 = hb_itemPutPtr( NULL, new QTextCharFormat( f ) );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, p1 );
|
||||
hb_itemRelease( pObject );
|
||||
delete ( ( QTextCharFormat * ) hb_itemGetPtr( p1 ) );
|
||||
hb_itemRelease( p1 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecFont( HBSlots * t_slots, QObject * object, const char * pszEvent, const QFont & font )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM p1 = hb_itemPutPtr( NULL, new QFont( font ) );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, p1 );
|
||||
hb_itemRelease( pObject );
|
||||
delete ( ( QFont * ) hb_itemGetPtr( p1 ) );
|
||||
hb_itemRelease( p1 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecQTextCursor( HBSlots * t_slots, QObject * object, const char * pszEvent, const QTextCursor & cursor )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM p1 = hb_itemPutPtr( NULL, new QTextCursor( cursor ) );
|
||||
//PHB_ITEM p1 = hb_itemPutPtr( NULL, *cursor );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, p1 );
|
||||
hb_itemRelease( pObject );
|
||||
delete ( ( QTextCursor * ) hb_itemGetPtr( p1 ) );
|
||||
hb_itemRelease( p1 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecStringList( HBSlots * t_slots, QObject * object, const char * pszEvent, const QStringList & stringList )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM p1 = hb_itemPutPtr( NULL, new QStringList( stringList ) );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, p1 );
|
||||
hb_itemRelease( pObject );
|
||||
delete ( ( QStringList * ) hb_itemGetPtr( p1 ) );
|
||||
hb_itemRelease( p1 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecPointer( HBSlots * t_slots, QObject * object, const char * pszEvent, void * p1 )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pP1 = hb_itemPutPtr( NULL, p1 );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 2, pObject, pP1 );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pP1 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecPointerInt( HBSlots * t_slots, QObject * object, const char * pszEvent, void * p1, int iInt )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pP1 = hb_itemPutPtr( NULL, p1 );
|
||||
PHB_ITEM pI1 = hb_itemPutNI( NULL, iInt );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 3, pObject, pP1, pI1 );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pP1 );
|
||||
hb_itemRelease( pI1 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void hbqt_SlotsExecPointerPointer( HBSlots * t_slots, QObject * object, const char * pszEvent, void * p1, void * p2 )
|
||||
{
|
||||
if( object )
|
||||
{
|
||||
int i = object->property( pszEvent ).toInt();
|
||||
if( i > 0 && i <= t_slots->listBlock.size() && hb_vmRequestReenter() )
|
||||
{
|
||||
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
|
||||
PHB_ITEM pP1 = hb_itemPutPtr( NULL, p1 );
|
||||
PHB_ITEM pP2 = hb_itemPutPtr( NULL, p2 );
|
||||
hb_vmEvalBlockV( t_slots->listBlock.at( i - 1 ), 3, pObject, pP1, pP2 );
|
||||
hb_itemRelease( pObject );
|
||||
hb_itemRelease( pP1 );
|
||||
hb_itemRelease( pP2 );
|
||||
hb_vmRequestRestore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Generic Key and Mouse Events emitted by subclass objects */
|
||||
void HBSlots::keyPressEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "keyPressEvent()", event ); }
|
||||
void HBSlots::keyReleaseEvent( QKeyEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "keyReleaseEvent()", event ); }
|
||||
void HBSlots::mouseMoveEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "mouseMoveEvent()", event ); }
|
||||
void HBSlots::mouseDoubleClickEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "mouseDoubleClickEvent()", event ); }
|
||||
void HBSlots::mousePressEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "mousePressEvent()", event ); }
|
||||
void HBSlots::mouseReleaseEvent( QMouseEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "mouseReleaseEvent()", event ); }
|
||||
void HBSlots::wheelEvent( QWheelEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "wheelEvent()", event ); }
|
||||
void HBSlots::resizeEvent( QResizeEvent * event ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "resizeEvent()", event ); }
|
||||
void HBSlots::triggered( bool checked ) { hbqt_SlotsExecBool( this, qobject_cast<QObject *>( sender() ), "triggered(bool)", checked ); }
|
||||
void HBSlots::hovered( QAction * action ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "hovered(action)", action ); }
|
||||
void HBSlots::clicked() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "clicked()" ); }
|
||||
void HBSlots::returnPressed() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "returnPressed()" ); }
|
||||
void HBSlots::viewportEntered() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "viewportEntered()" ); }
|
||||
void HBSlots::pressed() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "pressed()" ); }
|
||||
void HBSlots::released() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "released()" ); }
|
||||
void HBSlots::triggered() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "triggered()" ); }
|
||||
void HBSlots::hovered() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "hovered()" ); }
|
||||
void HBSlots::stateChanged( int state ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "stateChanged(int)", state ); }
|
||||
void HBSlots::activated( int index ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "activated(int)", index ); }
|
||||
void HBSlots::currentIndexChanged( int index ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "currentIndexChanged(int)", index ); }
|
||||
void HBSlots::currentChanged( int index ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "currentChanged(int)", index ); }
|
||||
void HBSlots::highlighted( int index ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "highlighted(int)", index ); }
|
||||
void HBSlots::clicked( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast<QObject *>( sender() ), "clicked(QModelIndex)", index ); }
|
||||
void HBSlots::doubleClicked( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast<QObject *>( sender() ), "doubleClicked(QModelIndex)", index ); }
|
||||
void HBSlots::entered( const QModelIndex & index ) { hbqt_SlotsExecModel( this, qobject_cast<QObject *>( sender() ), "entered(QModelIndex)", index ); }
|
||||
void HBSlots::actionTriggered( int action ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "actionTriggered(int)", action ); }
|
||||
void HBSlots::rangeChanged( int min, int max ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "rangeChanged(int)", min, max ); }
|
||||
void HBSlots::sliderMoved( int value ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "sliderMoved(int)", value ); }
|
||||
void HBSlots::sliderPressed() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "sliderPressed()" ); }
|
||||
void HBSlots::sliderReleased() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "sliderReleased()" ); }
|
||||
void HBSlots::valueChanged( int value ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "valueChanged(int)", value ); }
|
||||
void HBSlots::cursorPositionChanged( int iOld, int iNew ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cursorPositionChanged(int,int)", iOld, iNew ); }
|
||||
void HBSlots::editingFinished() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "editingFinished()" ); }
|
||||
void HBSlots::selectionChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "selectionChanged()" ); }
|
||||
void HBSlots::textChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "textChanged(QString)", text ); }
|
||||
void HBSlots::textEdited( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "textEdited(QString)", text ); }
|
||||
/* TreeViewobject */
|
||||
void HBSlots::currentItemChanged( QTreeWidgetItem * current, QTreeWidgetItem * previous ) { hbqt_SlotsExecPointerPointer( this, qobject_cast<QObject *>( sender() ), "currentItemChanged(QTWItem)", current, previous ); }
|
||||
void HBSlots::itemActivated( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast<QObject *>( sender() ), "itemActivated(QTWItem)", item, column ); }
|
||||
void HBSlots::itemChanged( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast<QObject *>( sender() ), "itemChanged(QTWItem)", item, column ); }
|
||||
void HBSlots::itemClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast<QObject *>( sender() ), "itemClicked(QTWItem)", item, column ); }
|
||||
void HBSlots::itemDoubleClicked( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast<QObject *>( sender() ), "itemDoubleClicked(QTWItem)", item, column ); }
|
||||
void HBSlots::itemEntered( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast<QObject *>( sender() ), "itemEntered(QTWItem)", item, column ); }
|
||||
void HBSlots::itemPressed( QTreeWidgetItem * item, int column ) { hbqt_SlotsExecPointerInt( this, qobject_cast<QObject *>( sender() ), "itemPressed(QTWItem)", item, column ); }
|
||||
void HBSlots::itemExpanded( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "itemExpanded(QTWItem)", item ); }
|
||||
void HBSlots::itemCollapsed( QTreeWidgetItem * item ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "itemCollapsed(QTWItem)", item ); }
|
||||
void HBSlots::itemSelectionChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "itemSelectionChanged()" ); }
|
||||
/* QDialog (s)*/
|
||||
void HBSlots::currentFontChanged( const QFont & font ) { hbqt_SlotsExecFont( this, qobject_cast<QObject *>( sender() ), "currentFontChanged(QFont)", font ); }
|
||||
void HBSlots::fontSelected( const QFont & font ) { hbqt_SlotsExecFont( this, qobject_cast<QObject *>( sender() ), "fontSelected(QFont)", font ); }
|
||||
void HBSlots::accepted() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "accepted()" ); }
|
||||
void HBSlots::finished( int result ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "finished(int)", result ); }
|
||||
void HBSlots::rejected() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "rejected()" ); }
|
||||
void HBSlots::currentChanged( const QString & path ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "currentChanged(QString)", path ); }
|
||||
void HBSlots::directoryEntered( const QString & directory ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "directoryEntered(QString)", directory ); }
|
||||
void HBSlots::fileSelected( const QString & file ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "fileSelected(QString)", file ); }
|
||||
void HBSlots::filesSelected( const QStringList & selected ) { hbqt_SlotsExecStringList( this, qobject_cast<QObject *>( sender() ), "filesSelected(QStringList)", selected ); }
|
||||
void HBSlots::filterSelected( const QString & filter ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "filterSelected(QString)", filter ); }
|
||||
/* QPrintDialog */
|
||||
void HBSlots::accepted( QPrinter * printer ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "accepted(QPrinter)", printer ); }
|
||||
/* QTextEdit */
|
||||
void HBSlots::copyAvailable( bool yes ) { hbqt_SlotsExecBool( this, qobject_cast<QObject *>( sender() ), "copyAvailable(bool)", yes ); }
|
||||
void HBSlots::currentCharFormatChanged( const QTextCharFormat & f ) { hbqt_SlotsExecTextCharFormat( this, qobject_cast<QObject *>( sender() ), "currentCharFormatChanged(QTextCharFormat)", f ); }
|
||||
void HBSlots::cursorPositionChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "cursorPositionChanged()" ); }
|
||||
void HBSlots::redoAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast<QObject *>( sender() ), "redoAvailable(bool)", available ); }
|
||||
void HBSlots::textChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "textChanged()" ); }
|
||||
void HBSlots::undoAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast<QObject *>( sender() ), "undoAvailable(available)", available ); }
|
||||
void HBSlots::timeout() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "timeout()" ); }
|
||||
void HBSlots::scrollContentsBy( int x, int y ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "scrollContentsBy(int,int)", x, y ); }
|
||||
void HBSlots::geometriesChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "geometriesChanged()" ); }
|
||||
void HBSlots::sectionAutoResize( int logicalIndex, QHeaderView::ResizeMode mode ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "sectionAutoResize(int,int)", logicalIndex, mode ); }
|
||||
void HBSlots::sectionClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "sectionClicked(int)", logicalIndex ); }
|
||||
void HBSlots::sectionCountChanged( int oldCount, int newCount ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "sectionCountChanged(int,int)", oldCount, newCount ); }
|
||||
void HBSlots::sectionDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "sectionDoubleClicked(int)", logicalIndex ); }
|
||||
void HBSlots::sectionEntered( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "sectionEntered(int)", logicalIndex ); }
|
||||
void HBSlots::sectionHandleDoubleClicked( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "sectionHandleDoubleClicked(int)", logicalIndex ); }
|
||||
void HBSlots::sectionMoved( int logicalIndex, int oldVisualIndex, int newVisualIndex ) { hbqt_SlotsExecIntIntInt( this, qobject_cast<QObject *>( sender() ), "sectionMoved(int,int,int)", logicalIndex, oldVisualIndex, newVisualIndex ); }
|
||||
void HBSlots::sectionPressed( int logicalIndex ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "sectionPressed(int)", logicalIndex ); }
|
||||
void HBSlots::sectionResized( int logicalIndex, int oldSize, int newSize ) { hbqt_SlotsExecIntIntInt( this, qobject_cast<QObject *>( sender() ), "sectionResized(int,int,int)", logicalIndex, oldSize, newSize ); }
|
||||
void HBSlots::sortIndicatorChanged( int logicalIndex, Qt::SortOrder order ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "sortIndicatorChanged(int,int)", logicalIndex, order ); }
|
||||
void HBSlots::buttonClicked( int id ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "buttonClicked(int)", id ); }
|
||||
void HBSlots::buttonPressed( int id ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "buttonPressed(int)", id ); }
|
||||
void HBSlots::buttonReleased( int id ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "buttonReleased(int)", id ); }
|
||||
void HBSlots::linkActivated( const QString & link ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "linkActivated(QString)", link ); }
|
||||
void HBSlots::linkHovered( const QString & link ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "linkHovered(QString)", link ); }
|
||||
void HBSlots::cellActivated( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cellActivated(int,int)", row, column ); }
|
||||
void HBSlots::cellChanged( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cellChanged(int,int)", row, column ); }
|
||||
void HBSlots::cellClicked( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cellClicked(int,int)", row, column ); }
|
||||
void HBSlots::cellDoubleClicked( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cellDoubleClicked(int,int)", row, column ); }
|
||||
void HBSlots::cellEntered( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cellEntered(int,int)", row, column ); }
|
||||
void HBSlots::cellPressed( int row, int column ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "cellEntered(int,int)", row, column ); }
|
||||
void HBSlots::currentCellChanged( int currentRow, int currentColumn, int previousRow, int previousColumn ) { hbqt_SlotsExecIntIntIntInt( this, qobject_cast<QObject *>( sender() ), "currentCellChanged(int,int,int,int)", currentRow, currentColumn, previousRow, previousColumn ); }
|
||||
void HBSlots::tabCloseRequested( int index ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "tabCloseRequested(int)", index ); }
|
||||
void HBSlots::paintRequested( QPrinter * printer ) { hbqt_SlotsExecPointer( this, qobject_cast<QObject *>( sender() ), "paintRequested(QPrinter)", printer ); }
|
||||
/* QIODevice */
|
||||
void HBSlots::aboutToClose() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "aboutToClose()" ); }
|
||||
void HBSlots::bytesWritten( qint64 bytes ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "bytesWritten(int)", bytes ); }
|
||||
void HBSlots::readChannelFinished() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "readChannelFinished()" ); }
|
||||
void HBSlots::readyRead() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "readyRead()" ); }
|
||||
/* QProcess */
|
||||
void HBSlots::error( QProcess::ProcessError error ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "error(error)", error ); }
|
||||
void HBSlots::finished( int exitCode, QProcess::ExitStatus exitStatus ) { hbqt_SlotsExecIntInt( this, qobject_cast<QObject *>( sender() ), "finished(int,int)", exitCode, exitStatus ); }
|
||||
void HBSlots::readyReadStandardError() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "readyReadStandardError()" ); }
|
||||
void HBSlots::readyReadStandardOutput() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "readyReadStandardOutput()" ); }
|
||||
void HBSlots::started() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "started()" ); }
|
||||
void HBSlots::stateChanged( QProcess::ProcessState newState ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "stateChanged(int)", newState ); }
|
||||
/* QComboBox */
|
||||
void HBSlots::activated( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "activated(text)", text ); }
|
||||
void HBSlots::currentIndexChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "currentIndexChanged(text)", text ); }
|
||||
void HBSlots::editTextChanged( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "editTextChanged(text)", text ); }
|
||||
void HBSlots::highlighted( const QString & text ) { hbqt_SlotsExecString( this, qobject_cast<QObject *>( sender() ), "highlighted(text)", text ); }
|
||||
/* QTextDocument */
|
||||
void HBSlots::blockCountChanged( int newBlockCount ) { hbqt_SlotsExecInt( this, qobject_cast<QObject *>( sender() ), "blockCountChanged(int)", newBlockCount ); }
|
||||
void HBSlots::contentsChange( int position, int charsRemoved, int charsAdded ) { hbqt_SlotsExecIntIntInt( this, qobject_cast<QObject *>( sender() ), "contentsChange(int,int,int)", position, charsRemoved, charsAdded ); }
|
||||
void HBSlots::contentsChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "contentsChanged()" ); }
|
||||
void HBSlots::cursorPositionChanged( const QTextCursor & cursor ) { hbqt_SlotsExecQTextCursor( this, qobject_cast<QObject *>( sender() ), "cursorPositionChanged(QTextCursor)", cursor ); }
|
||||
void HBSlots::documentLayoutChanged() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "documentLayoutChanged()" ); }
|
||||
void HBSlots::modificationChanged( bool changed ) { hbqt_SlotsExecBool( this, qobject_cast<QObject *>( sender() ), "modificationChanged(bool)", changed ); }
|
||||
void HBSlots::undoCommandAdded() { hbqt_SlotsExec( this, qobject_cast<QObject *>( sender() ), "undoCommandAdded()" ); }
|
||||
/**/
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/*
|
||||
* Harbour function to connect signals with slots
|
||||
*/
|
||||
HB_FUNC( QT_SLOTS_CONNECT )
|
||||
{
|
||||
HB_BOOL bRet = HB_FALSE;
|
||||
HBSlots * t_slots = hbqt_par_HBSlots( 1 );
|
||||
|
||||
if( t_slots )
|
||||
{
|
||||
QObject * object = ( QObject * ) hbqt_pPtrFromObj( 2 ); /* get sender */
|
||||
|
||||
if( object )
|
||||
{
|
||||
QString signal = hb_parcx( 3 ); /* get signal */
|
||||
PHB_ITEM pBlock = hb_itemNew( hb_param( 4, HB_IT_BLOCK ) ); /* get codeblock */
|
||||
bool ret;
|
||||
|
||||
if( signal == ( QString ) "clicked()" ) ret = object->connect( object, SIGNAL( clicked() ), t_slots, SLOT( clicked() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ), t_slots, SLOT( returnPressed() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "triggered()" ) ret = object->connect( object, SIGNAL( triggered() ), t_slots, SLOT( triggered() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "hovered()" ) ret = object->connect( object, SIGNAL( hovered() ), t_slots, SLOT( hovered() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "viewportEntered()" ) ret = object->connect( object, SIGNAL( viewportEntered() ), t_slots, SLOT( viewportEntered() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "pressed()" ) ret = object->connect( object, SIGNAL( pressed() ), t_slots, SLOT( pressed() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "released()" ) ret = object->connect( object, SIGNAL( released() ), t_slots, SLOT( released() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "stateChanged(int)" ) ret = object->connect( object, SIGNAL( stateChanged( int ) ), t_slots, SLOT( stateChanged( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "activated(int)" ) ret = object->connect( object, SIGNAL( activated( int ) ), t_slots, SLOT( activated( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "currentIndexChanged(int)" ) ret = object->connect( object, SIGNAL( currentIndexChanged( int ) ), t_slots, SLOT( currentIndexChanged( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "highlighted(int)" ) ret = object->connect( object, SIGNAL( highlighted( int ) ), t_slots, SLOT( highlighted( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "triggered(bool)" ) ret = object->connect( object, SIGNAL( triggered( bool ) ), t_slots, SLOT( triggered( bool ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "clicked(QModelIndex)" ) ret = object->connect( object, SIGNAL( clicked( const QModelIndex & ) ), t_slots, SLOT( clicked( const QModelIndex & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "doubleClicked(QModelIndex)" ) ret = object->connect( object, SIGNAL( doubleClicked( const QModelIndex & ) ), t_slots, SLOT( doubleClicked( const QModelIndex & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "entered(QModelIndex)" ) ret = object->connect( object, SIGNAL( entered( const QModelIndex & ) ), t_slots, SLOT( entered( const QModelIndex & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "hovered(action)" ) ret = object->connect( object, SIGNAL( hovered( QAction * ) ), t_slots, SLOT( hovered( QAction * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "currentChanged(int)" ) ret = object->connect( object, SIGNAL( currentChanged( int ) ), t_slots, SLOT( currentChanged( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "actionTriggered(int)" ) ret = object->connect( object, SIGNAL( actionTriggered(int) ), t_slots, SLOT( actionTriggered(int) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "rangeChanged(int,int)" ) ret = object->connect( object, SIGNAL( rangeChanged(int,int) ), t_slots, SLOT( rangeChanged(int,int) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sliderMoved(int)" ) ret = object->connect( object, SIGNAL( sliderMoved(int) ), t_slots, SLOT( sliderMoved(int) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sliderPressed()" ) ret = object->connect( object, SIGNAL( sliderPressed() ), t_slots, SLOT( sliderPressed() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sliderReleased()" ) ret = object->connect( object, SIGNAL( sliderReleased() ), t_slots, SLOT( sliderReleased() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "valueChanged(int)" ) ret = object->connect( object, SIGNAL( valueChanged(int) ), t_slots, SLOT( valueChanged(int) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cursorPositionChanged(int,int)" ) ret = object->connect( object, SIGNAL( cursorPositionChanged(int,int) ), t_slots, SLOT( cursorPositionChanged(int,int) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "editingFinished()" ) ret = object->connect( object, SIGNAL( editingFinished() ), t_slots, SLOT( editingFinished() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "returnPressed()" ) ret = object->connect( object, SIGNAL( returnPressed() ), t_slots, SLOT( returnPressed() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "selectionChanged()" ) ret = object->connect( object, SIGNAL( selectionChanged() ), t_slots, SLOT( selectionChanged() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "textChanged(QString)" ) ret = object->connect( object, SIGNAL( textChanged( const QString & ) ), t_slots, SLOT( textChanged( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "textEdited(QString)" ) ret = object->connect( object, SIGNAL( textEdited( const QString & ) ), t_slots, SLOT( textEdited( const QString & ) ), Qt::AutoConnection );
|
||||
/* QTreeViewWidget */
|
||||
else if( signal == ( QString ) "currentItemChanged(QTWItem)" ) ret = object->connect( object, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ), t_slots, SLOT( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemActivated(QTWItem)" ) ret = object->connect( object, SIGNAL( itemActivated( QTreeWidgetItem *, int ) ), t_slots, SLOT( itemActivated( QTreeWidgetItem *, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemChanged(QTWItem)" ) ret = object->connect( object, SIGNAL( itemChanged( QTreeWidgetItem *, int ) ), t_slots, SLOT( itemChanged( QTreeWidgetItem *, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemClicked(QTWItem)" ) ret = object->connect( object, SIGNAL( itemClicked( QTreeWidgetItem *, int ) ), t_slots, SLOT( itemClicked( QTreeWidgetItem *, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemCollapsed(QTWItem)" ) ret = object->connect( object, SIGNAL( itemCollapsed( QTreeWidgetItem * ) ), t_slots, SLOT( itemCollapsed( QTreeWidgetItem * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemDoubleClicked(QTWItem)" ) ret = object->connect( object, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ), t_slots, SLOT( itemDoubleClicked( QTreeWidgetItem *, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemEntered(QTWItem)" ) ret = object->connect( object, SIGNAL( itemEntered( QTreeWidgetItem *, int ) ), t_slots, SLOT( itemEntered( QTreeWidgetItem *, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemExpanded(QTWItem)" ) ret = object->connect( object, SIGNAL( itemExpanded( QTreeWidgetItem * ) ), t_slots, SLOT( itemExpanded( QTreeWidgetItem * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemPressed(QTWItem)" ) ret = object->connect( object, SIGNAL( itemPressed( QTreeWidgetItem *, int ) ), t_slots, SLOT( itemPressed( QTreeWidgetItem *, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "itemSelectionChanged()" ) ret = object->connect( object, SIGNAL( itemSelectionChanged() ), t_slots, SLOT( itemSelectionChanged() ), Qt::AutoConnection );
|
||||
/* QDialog (s) QFontDialog, QFileDialog */
|
||||
else if( signal == ( QString ) "currentFontChanged(QFont)" ) ret = object->connect( object, SIGNAL( currentFontChanged( const QFont & ) ), t_slots, SLOT( currentFontChanged( const QFont & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "fontSelected(QFont)" ) ret = object->connect( object, SIGNAL( fontSelected( const QFont & ) ), t_slots, SLOT( fontSelected( const QFont & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "accepted()" ) ret = object->connect( object, SIGNAL( accepted() ), t_slots, SLOT( accepted() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "finished(int)" ) ret = object->connect( object, SIGNAL( finished( int ) ), t_slots, SLOT( finished( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "rejected()" ) ret = object->connect( object, SIGNAL( rejected() ), t_slots, SLOT( rejected() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "currentChanged(QString)" ) ret = object->connect( object, SIGNAL( currentChanged( const QString & ) ), t_slots, SLOT( currentChanged( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "directoryEntered(QString)" ) ret = object->connect( object, SIGNAL( directoryEntered( const QString & ) ), t_slots, SLOT( directoryEntered( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "fileSelected(QString)" ) ret = object->connect( object, SIGNAL( fileSelected( const QString & ) ), t_slots, SLOT( fileSelected( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "filesSelected(QStringList)" ) ret = object->connect( object, SIGNAL( filesSelected( const QStringList & ) ), t_slots, SLOT( filesSelected( const QStringList & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "filterSelected(QString)" ) ret = object->connect( object, SIGNAL( filterSelected( const QString & ) ), t_slots, SLOT( filterSelected( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "accepted(QPrinter)" ) ret = object->connect( object, SIGNAL( accepted( QPrinter * ) ), t_slots, SLOT( accepted( QPrinter * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "copyAvailable(bool)" ) ret = object->connect( object, SIGNAL( copyAvailable( bool ) ), t_slots, SLOT( copyAvailable( bool ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "currentCharFormatChanged(QTextCharFormat)" ) ret = object->connect( object, SIGNAL( currentCharFormatChanged( const QTextCharFormat & ) ), t_slots, SLOT( currentCharFormatChanged( const QTextCharFormat & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cursorPositionChanged()" ) ret = object->connect( object, SIGNAL( cursorPositionChanged() ), t_slots, SLOT( cursorPositionChanged() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "redoAvailable(bool)" ) ret = object->connect( object, SIGNAL( redoAvailable( bool ) ), t_slots, SLOT( redoAvailable( bool ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "textChanged()" ) ret = object->connect( object, SIGNAL( textChanged() ), t_slots, SLOT( textChanged() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "undoAvailable(available)" ) ret = object->connect( object, SIGNAL( undoAvailable( bool ) ), t_slots, SLOT( undoAvailable( bool ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "timeout()" ) ret = object->connect( object, SIGNAL( timeout() ), t_slots, SLOT( timeout() ), Qt::AutoConnection );
|
||||
/* Generic purpose mechanism to receive key and mouse events off subclasses */
|
||||
else if( signal == ( QString ) "keyPressEvent()" ) ret = object->connect( object, SIGNAL( sg_keyPressEvent( QKeyEvent * ) ), t_slots, SLOT( keyPressEvent( QKeyEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "keyReleaseEvent()" ) ret = object->connect( object, SIGNAL( sg_keyReleaseEvent( QKeyEvent * ) ), t_slots, SLOT( keyReleaseEvent( QKeyEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "mouseMoveEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseMoveEvent( QMouseEvent * ) ), t_slots, SLOT( mouseMoveEvent( QMouseEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "mouseDoubleClickEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseDoubleClickEvent( QMouseEvent * ) ), t_slots, SLOT( mouseDoubleClickEvent( QMouseEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "mousePressEvent()" ) ret = object->connect( object, SIGNAL( sg_mousePressEvent( QMouseEvent * ) ), t_slots, SLOT( mousePressEvent( QMouseEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "mouseReleaseEvent()" ) ret = object->connect( object, SIGNAL( sg_mouseReleaseEvent( QMouseEvent * ) ), t_slots, SLOT( mouseReleaseEvent( QMouseEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "wheelEvent()" ) ret = object->connect( object, SIGNAL( sg_wheelEvent( QWheelEvent * ) ), t_slots, SLOT( wheelEvent( QWheelEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "resizeEvent()" ) ret = object->connect( object, SIGNAL( sg_resizeEvent( QResizeEvent * ) ), t_slots, SLOT( resizeEvent( QResizeEvent * ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "scrollContentsBy(int,int)" ) ret = object->connect( object, SIGNAL( sg_scrollContentsBy( int, int ) ), t_slots, SLOT( scrollContentsBy( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "geometriesChanged()" ) ret = object->connect( object, SIGNAL( geometriesChanged() ), t_slots, SLOT( geometriesChanged() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionAutoResize(int,int)" ) ret = object->connect( object, SIGNAL( sectionAutoResize( int, QHeaderView::ResizeMode ) ), t_slots, SLOT( sectionAutoResize( int, QHeaderView::ResizeMode ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionClicked(int)" ) ret = object->connect( object, SIGNAL( sectionClicked( int ) ), t_slots, SLOT( sectionClicked( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionCountChanged(int,int)" ) ret = object->connect( object, SIGNAL( sectionCountChanged( int, int ) ), t_slots, SLOT( sectionCountChanged( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionDoubleClicked(int)" ) ret = object->connect( object, SIGNAL( sectionDoubleClicked( int ) ), t_slots, SLOT( sectionDoubleClicked( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionEntered(int)" ) ret = object->connect( object, SIGNAL( sectionEntered( int ) ), t_slots, SLOT( sectionEntered( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionHandleDoubleClicked(int)" ) ret = object->connect( object, SIGNAL( sectionHandleDoubleClicked( int ) ), t_slots, SLOT( sectionHandleDoubleClicked( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionMoved(int,int,int)" ) ret = object->connect( object, SIGNAL( sectionMoved( int, int, int ) ), t_slots, SLOT( sectionMoved( int, int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionPressed(int)" ) ret = object->connect( object, SIGNAL( sectionPressed( int ) ), t_slots, SLOT( sectionPressed( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sectionResized(int,int,int)" ) ret = object->connect( object, SIGNAL( sectionResized( int, int, int ) ), t_slots, SLOT( sectionResized( int, int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "sortIndicatorChanged(int,int)" ) ret = object->connect( object, SIGNAL( sortIndicatorChanged( int, Qt::SortOrder ) ), t_slots, SLOT( sortIndicatorChanged( int, Qt::SortOrder ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "buttonClicked(int)" ) ret = object->connect( object, SIGNAL( buttonClicked( int ) ), t_slots, SLOT( buttonClicked( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "buttonPressed(int)" ) ret = object->connect( object, SIGNAL( buttonPressed( int ) ), t_slots, SLOT( buttonPressed( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "buttonReleased(int)" ) ret = object->connect( object, SIGNAL( buttonReleased( int ) ), t_slots, SLOT( buttonReleased( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "linkActivated(QString)" ) ret = object->connect( object, SIGNAL( linkActivated( const QString & ) ), t_slots, SLOT( linkActivated( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "linkHovered(QString)" ) ret = object->connect( object, SIGNAL( linkHovered( const QString & ) ), t_slots, SLOT( linkHovered( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cellActivated(int,int)" ) ret = object->connect( object, SIGNAL( cellActivated( int, int ) ), t_slots, SLOT( cellActivated( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cellChanged(int,int)" ) ret = object->connect( object, SIGNAL( cellChanged( int, int ) ), t_slots, SLOT( cellChanged( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cellClicked(int,int)" ) ret = object->connect( object, SIGNAL( cellClicked( int, int ) ), t_slots, SLOT( cellClicked( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cellDoubleClicked(int,int)" ) ret = object->connect( object, SIGNAL( cellDoubleClicked( int, int ) ), t_slots, SLOT( cellDoubleClicked( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cellEntered(int,int)" ) ret = object->connect( object, SIGNAL( cellEntered( int, int ) ), t_slots, SLOT( cellEntered( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cellPressed(int,int)" ) ret = object->connect( object, SIGNAL( cellPressed( int, int ) ), t_slots, SLOT( cellPressed( int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "currentCellChanged(int,int,int,int)" ) ret = object->connect( object, SIGNAL( currentCellChanged( int, int, int, int ) ), t_slots, SLOT( currentCellChanged( int, int, int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "tabCloseRequested(int)" ) ret = object->connect( object, SIGNAL( tabCloseRequested( int ) ), t_slots, SLOT( tabCloseRequested( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "paintRequested(QPrinter)" ) ret = object->connect( object, SIGNAL( paintRequested( QPrinter * ) ), t_slots, SLOT( paintRequested( QPrinter * ) ), Qt::AutoConnection );
|
||||
/* QIODevice & QProcess */
|
||||
else if( signal == ( QString ) "aboutToClose()" ) ret = object->connect( object, SIGNAL( aboutToClose() ), t_slots, SLOT( aboutToClose() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "bytesWritten(int)" ) ret = object->connect( object, SIGNAL( bytesWritten( qint64 ) ), t_slots, SLOT( bytesWritten( qint64 ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "readChannelFinished()" ) ret = object->connect( object, SIGNAL( readChannelFinished() ), t_slots, SLOT( readChannelFinished() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "readyRead()" ) ret = object->connect( object, SIGNAL( readyRead() ), t_slots, SLOT( readyRead() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "error(int)" ) ret = object->connect( object, SIGNAL( error( int ) ), t_slots, SLOT( error( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "finished(int,int)" ) ret = object->connect( object, SIGNAL( finished( int, QProcess::ExitStatus ) ), t_slots, SLOT( finished( int, QProcess::ExitStatus ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "readyReadStandardError()" ) ret = object->connect( object, SIGNAL( readyReadStandardError() ), t_slots, SLOT( readyReadStandardError() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "readyReadStandardOutput()" ) ret = object->connect( object, SIGNAL( readyReadStandardOutput() ), t_slots, SLOT( readyReadStandardOutput() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "started()" ) ret = object->connect( object, SIGNAL( started() ), t_slots, SLOT( started() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "stateChanged(int)" ) ret = object->connect( object, SIGNAL( stateChanged( int ) ), t_slots, SLOT( stateChanged( int ) ), Qt::AutoConnection );
|
||||
/* QComboBox */
|
||||
else if( signal == ( QString ) "activated(text)" ) ret = object->connect( object, SIGNAL( activated( const QString & ) ), t_slots, SLOT( activated( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "currentIndexChanged(text)" ) ret = object->connect( object, SIGNAL( currentIndexChanged( const QString & ) ), t_slots, SLOT( currentIndexChanged( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "editTextChanged(text)" ) ret = object->connect( object, SIGNAL( editTextChanged( const QString & ) ), t_slots, SLOT( editTextChanged( const QString & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "highlighted(text)" ) ret = object->connect( object, SIGNAL( highlighted( const QString & ) ), t_slots, SLOT( highlighted( const QString & ) ), Qt::AutoConnection );
|
||||
/* QTextDocument */
|
||||
else if( signal == ( QString ) "blockCountChanged(int)" ) ret = object->connect( object, SIGNAL( blockCountChanged( int ) ), t_slots, SLOT( blockCountChanged( int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "contentsChange(int,int,int)" ) ret = object->connect( object, SIGNAL( contentsChange( int, int, int ) ), t_slots, SLOT( contentsChange( int, int, int ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "contentsChanged()" ) ret = object->connect( object, SIGNAL( contentsChanged() ), t_slots, SLOT( contentsChanged() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "cursorPositionChanged(QTextCursor)" ) ret = object->connect( object, SIGNAL( cursorPositionChanged( const QTextCursor & ) ), t_slots, SLOT( cursorPositionChanged( const QTextCursor & ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "documentLayoutChanged()" ) ret = object->connect( object, SIGNAL( documentLayoutChanged() ), t_slots, SLOT( documentLayoutChanged() ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "modificationChanged(bool)" ) ret = object->connect( object, SIGNAL( modificationChanged( bool ) ), t_slots, SLOT( modificationChanged( bool ) ), Qt::AutoConnection );
|
||||
else if( signal == ( QString ) "undoCommandAdded()" ) ret = object->connect( object, SIGNAL( undoCommandAdded() ), t_slots, SLOT( undoCommandAdded() ), Qt::AutoConnection );
|
||||
else ret = false;
|
||||
|
||||
if( ret == true )
|
||||
{
|
||||
t_slots->listBlock << pBlock;
|
||||
object->setProperty( hb_parcx( 3 ), ( int ) t_slots->listBlock.size() );
|
||||
bRet = HB_TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hb_retl( bRet );
|
||||
}
|
||||
|
||||
static bool disconnect_signal( QObject * object, const char * signal )
|
||||
{
|
||||
if( signal == ( QString ) "clicked()" ) return object->disconnect( SIGNAL( clicked() ) );
|
||||
else if( signal == ( QString ) "returnPressed()" ) return object->disconnect( SIGNAL( returnPressed() ) );
|
||||
else if( signal == ( QString ) "triggered()" ) return object->disconnect( SIGNAL( triggered() ) );
|
||||
else if( signal == ( QString ) "hovered()" ) return object->disconnect( SIGNAL( hovered() ) );
|
||||
else if( signal == ( QString ) "viewportEntered()" ) return object->disconnect( SIGNAL( viewportEntered() ) );
|
||||
else if( signal == ( QString ) "pressed()" ) return object->disconnect( SIGNAL( pressed() ) );
|
||||
else if( signal == ( QString ) "released()" ) return object->disconnect( SIGNAL( released() ) );
|
||||
else if( signal == ( QString ) "stateChanged(int)" ) return object->disconnect( SIGNAL( stateChanged( int ) ) );
|
||||
else if( signal == ( QString ) "activated(int)" ) return object->disconnect( SIGNAL( activated( int ) ) );
|
||||
else if( signal == ( QString ) "currentIndexChanged(int)" ) return object->disconnect( SIGNAL( currentIndexChanged( int ) ) );
|
||||
else if( signal == ( QString ) "highlighted(int)" ) return object->disconnect( SIGNAL( highlighted( int ) ) );
|
||||
else if( signal == ( QString ) "triggered(bool)" ) return object->disconnect( SIGNAL( triggered( bool ) ) );
|
||||
else if( signal == ( QString ) "clicked(QModelIndex)" ) return object->disconnect( SIGNAL( clicked( const QModelIndex & ) ) );
|
||||
else if( signal == ( QString ) "doubleClicked(QModelIndex)" ) return object->disconnect( SIGNAL( doubleClicked( const QModelIndex & ) ) );
|
||||
else if( signal == ( QString ) "entered(QModelIndex)" ) return object->disconnect( SIGNAL( entered( const QModelIndex & ) ) );
|
||||
else if( signal == ( QString ) "hovered(action)" ) return object->disconnect( SIGNAL( hovered( QAction * ) ) );
|
||||
else if( signal == ( QString ) "currentChanged(int)" ) return object->disconnect( SIGNAL( currentChanged( int ) ) );
|
||||
else if( signal == ( QString ) "actionTriggered(int)" ) return object->disconnect( SIGNAL( actionTriggered(int) ) );
|
||||
else if( signal == ( QString ) "rangeChanged(int,int)" ) return object->disconnect( SIGNAL( rangeChanged(int,int) ) );
|
||||
else if( signal == ( QString ) "sliderMoved(int)" ) return object->disconnect( SIGNAL( sliderMoved(int) ) );
|
||||
else if( signal == ( QString ) "sliderPressed()" ) return object->disconnect( SIGNAL( sliderPressed() ) );
|
||||
else if( signal == ( QString ) "sliderReleased()" ) return object->disconnect( SIGNAL( sliderReleased() ) );
|
||||
else if( signal == ( QString ) "valueChanged(int)" ) return object->disconnect( SIGNAL( valueChanged(int) ) );
|
||||
else if( signal == ( QString ) "cursorPositionChanged(int,int)" ) return object->disconnect( SIGNAL( cursorPositionChanged(int,int) ) );
|
||||
else if( signal == ( QString ) "editingFinished()" ) return object->disconnect( SIGNAL( editingFinished() ) );
|
||||
else if( signal == ( QString ) "returnPressed()" ) return object->disconnect( SIGNAL( returnPressed() ) );
|
||||
else if( signal == ( QString ) "selectionChanged()" ) return object->disconnect( SIGNAL( selectionChanged() ) );
|
||||
else if( signal == ( QString ) "textChanged(QString)" ) return object->disconnect( SIGNAL( textChanged( const QString &) ) );
|
||||
else if( signal == ( QString ) "textEdited(QString)" ) return object->disconnect( SIGNAL( textEdited( const QString &) ) );
|
||||
else if( signal == ( QString ) "currentItemChanged(QTWItem)" ) return object->disconnect( SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ) );
|
||||
else if( signal == ( QString ) "itemActivated(QTWItem)" ) return object->disconnect( SIGNAL( itemActivated( QTreeWidgetItem *, int ) ) );
|
||||
else if( signal == ( QString ) "itemChanged(QTWItem)" ) return object->disconnect( SIGNAL( itemChanged( QTreeWidgetItem *, int ) ) );
|
||||
else if( signal == ( QString ) "itemClicked(QTWItem)" ) return object->disconnect( SIGNAL( itemClicked( QTreeWidgetItem *, int ) ) );
|
||||
else if( signal == ( QString ) "itemCollapsed(QTWItem)" ) return object->disconnect( SIGNAL( itemCollapsed( QTreeWidgetItem * ) ) );
|
||||
else if( signal == ( QString ) "itemDoubleClicked(QTWItem)" ) return object->disconnect( SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ) );
|
||||
else if( signal == ( QString ) "itemEntered(QTWItem)" ) return object->disconnect( SIGNAL( itemEntered( QTreeWidgetItem *, int ) ) );
|
||||
else if( signal == ( QString ) "itemExpanded(QTWItem)" ) return object->disconnect( SIGNAL( itemExpanded( QTreeWidgetItem * ) ) );
|
||||
else if( signal == ( QString ) "itemPressed(QTWItem)" ) return object->disconnect( SIGNAL( itemPressed( QTreeWidgetItem *, int ) ) );
|
||||
else if( signal == ( QString ) "itemSelectionChanged()" ) return object->disconnect( SIGNAL( itemSelectionChanged() ) );
|
||||
else if( signal == ( QString ) "iconChanged()" ) return object->disconnect( SIGNAL( iconChanged() ) );
|
||||
else if( signal == ( QString ) "titleChanged(QString)" ) return object->disconnect( SIGNAL( titleChanged( const QString & ) ) );
|
||||
else if( signal == ( QString ) "urlChanged(QUrl)" ) return object->disconnect( SIGNAL( urlChanged( const QUrl & ) ) );
|
||||
else if( signal == ( QString ) "currentFontChanged(QFont)" ) return object->disconnect( SIGNAL( currentFontChanged( const QFont & ) ) );
|
||||
else if( signal == ( QString ) "fontSelected(QFont)" ) return object->disconnect( SIGNAL( fontSelected( const QFont & ) ) );
|
||||
else if( signal == ( QString ) "accepted()" ) return object->disconnect( SIGNAL( accepted() ) );
|
||||
else if( signal == ( QString ) "finished(int)" ) return object->disconnect( SIGNAL( finished( int ) ) );
|
||||
else if( signal == ( QString ) "rejected()" ) return object->disconnect( SIGNAL( rejected() ) );
|
||||
else if( signal == ( QString ) "currentChanged(QString)" ) return object->disconnect( SIGNAL( currentChanged( const QString & ) ) );
|
||||
else if( signal == ( QString ) "directoryEntered(QString)" ) return object->disconnect( SIGNAL( directoryEntered( const QString & ) ) );
|
||||
else if( signal == ( QString ) "fileSelected(QString)" ) return object->disconnect( SIGNAL( fileSelected( const QString & ) ) );
|
||||
else if( signal == ( QString ) "filesSelected(QStringList)" ) return object->disconnect( SIGNAL( filesSelected( const QStringList & ) ) );
|
||||
else if( signal == ( QString ) "filterSelected(QString)" ) return object->disconnect( SIGNAL( filterSelected( const QString & ) ) );
|
||||
else if( signal == ( QString ) "accepted(QPrinter)" ) return object->disconnect( SIGNAL( accepted( QPrinter * ) ) );
|
||||
else if( signal == ( QString ) "copyAvailable(bool)" ) return object->disconnect( SIGNAL( copyAvailable( bool ) ) );
|
||||
else if( signal == ( QString ) "currentCharFormatChanged(QTextCharFormat)" ) return object->disconnect( SIGNAL( currentCharFormatChanged( const QTextCharFormat & ) ) );
|
||||
else if( signal == ( QString ) "cursorPositionChanged()" ) return object->disconnect( SIGNAL( cursorPositionChanged() ) );
|
||||
else if( signal == ( QString ) "redoAvailable(bool)" ) return object->disconnect( SIGNAL( redoAvailable( bool ) ) );
|
||||
else if( signal == ( QString ) "textChanged()" ) return object->disconnect( SIGNAL( textChanged() ) );
|
||||
else if( signal == ( QString ) "undoAvailable(available)" ) return object->disconnect( SIGNAL( undoAvailable( bool ) ) );
|
||||
else if( signal == ( QString ) "timeout()" ) return object->disconnect( SIGNAL( timeout() ) );
|
||||
else if( signal == ( QString ) "keyPressEvent()" ) return object->disconnect( SIGNAL( sg_keyPressEvent( QKeyEvent * ) ) );
|
||||
else if( signal == ( QString ) "keyReleaseEvent()" ) return object->disconnect( SIGNAL( sg_keyReleaseEvent( QKeyEvent * ) ) );
|
||||
else if( signal == ( QString ) "mouseMoveEvent()" ) return object->disconnect( SIGNAL( sg_mouseMoveEvent( QMouseEvent * ) ) );
|
||||
else if( signal == ( QString ) "mouseDoubleClickEvent()" ) return object->disconnect( SIGNAL( sg_mouseDoubleClickEvent( QMouseEvent * ) ) );
|
||||
else if( signal == ( QString ) "mousePressEvent()" ) return object->disconnect( SIGNAL( sg_mousePressEvent( QMouseEvent * ) ) );
|
||||
else if( signal == ( QString ) "mouseReleaseEvent()" ) return object->disconnect( SIGNAL( sg_mouseReleaseEvent( QMouseEvent * ) ) );
|
||||
else if( signal == ( QString ) "wheelEvent()" ) return object->disconnect( SIGNAL( sg_wheelEvent( QWheelEvent * ) ) );
|
||||
else if( signal == ( QString ) "resizeEvent()" ) return object->disconnect( SIGNAL( sg_resizeEvent( QResizeEvent * ) ) );
|
||||
else if( signal == ( QString ) "scrollContentsBy(int,int)" ) return object->disconnect( SIGNAL( sg_scrollContentsBy( int, int ) ) );
|
||||
else if( signal == ( QString ) "geometriesChanged()" ) return object->disconnect( SIGNAL( geometriesChanged() ) );
|
||||
else if( signal == ( QString ) "sectionAutoResize(int,int)" ) return object->disconnect( SIGNAL( sectionAutoResize( int, QHeaderView::ResizeMode ) ) );
|
||||
else if( signal == ( QString ) "sectionClicked(int)" ) return object->disconnect( SIGNAL( sectionClicked( int ) ) );
|
||||
else if( signal == ( QString ) "sectionCountChanged(int,int)" ) return object->disconnect( SIGNAL( sectionCountChanged( int, int ) ) );
|
||||
else if( signal == ( QString ) "sectionDoubleClicked(int)" ) return object->disconnect( SIGNAL( sectionDoubleClicked( int ) ) );
|
||||
else if( signal == ( QString ) "sectionEntered(int)" ) return object->disconnect( SIGNAL( sectionEntered( int ) ) );
|
||||
else if( signal == ( QString ) "sectionHandleDoubleClicked(int)" ) return object->disconnect( SIGNAL( sectionHandleDoubleClicked( int ) ) );
|
||||
else if( signal == ( QString ) "sectionMoved(int,int,int)" ) return object->disconnect( SIGNAL( sectionMoved( int, int, int ) ) );
|
||||
else if( signal == ( QString ) "sectionPressed(int)" ) return object->disconnect( SIGNAL( sectionPressed( int ) ) );
|
||||
else if( signal == ( QString ) "sectionResized(int,int,int)" ) return object->disconnect( SIGNAL( sectionResized( int, int, int ) ) );
|
||||
else if( signal == ( QString ) "sortIndicatorChanged(int,int)" ) return object->disconnect( SIGNAL( sortIndicatorChanged( int, Qt::SortOrder ) ) );
|
||||
else if( signal == ( QString ) "buttonClicked(int)" ) return object->disconnect( SIGNAL( buttonClicked( int ) ) );
|
||||
else if( signal == ( QString ) "buttonPressed(int)" ) return object->disconnect( SIGNAL( buttonPressed( int ) ) );
|
||||
else if( signal == ( QString ) "buttonReleased(int)" ) return object->disconnect( SIGNAL( buttonReleased( int ) ) );
|
||||
else if( signal == ( QString ) "linkActivated(QString)" ) return object->disconnect( SIGNAL( linkActivated( const QString & ) ) );
|
||||
else if( signal == ( QString ) "linkHovered(QString)" ) return object->disconnect( SIGNAL( linkHovered( const QString & ) ) );
|
||||
else if( signal == ( QString ) "cellActivated(int,int)" ) return object->disconnect( SIGNAL( cellActivated( int, int ) ) );
|
||||
else if( signal == ( QString ) "cellChanged(int,int)" ) return object->disconnect( SIGNAL( cellChanged( int, int ) ) );
|
||||
else if( signal == ( QString ) "cellClicked(int,int)" ) return object->disconnect( SIGNAL( cellClicked( int, int ) ) );
|
||||
else if( signal == ( QString ) "cellDoubleClicked(int,int)" ) return object->disconnect( SIGNAL( cellDoubleClicked( int, int ) ) );
|
||||
else if( signal == ( QString ) "cellEntered(int,int)" ) return object->disconnect( SIGNAL( cellEntered( int, int ) ) );
|
||||
else if( signal == ( QString ) "cellPressed(int,int)" ) return object->disconnect( SIGNAL( cellPressed( int, int ) ) );
|
||||
else if( signal == ( QString ) "currentCellChanged(int,int,int,int)" ) return object->disconnect( SIGNAL( currentCellChanged( int, int, int, int ) ) );
|
||||
else if( signal == ( QString ) "tabCloseRequested(int)" ) return object->disconnect( SIGNAL( tabCloseRequested( int ) ) );
|
||||
else if( signal == ( QString ) "paintRequested(QPrinter)" ) return object->disconnect( SIGNAL( paintRequested( QPrinter * ) ) );
|
||||
/* QIODevice & QProcess */
|
||||
else if( signal == ( QString ) "aboutToClose()" ) return object->disconnect( SIGNAL( aboutToClose() ) );
|
||||
else if( signal == ( QString ) "bytesWritten(int)" ) return object->disconnect( SIGNAL( bytesWritten( qint64 ) ) );
|
||||
else if( signal == ( QString ) "readChannelFinished()" ) return object->disconnect( SIGNAL( readChannelFinished() ) );
|
||||
else if( signal == ( QString ) "readyRead()" ) return object->disconnect( SIGNAL( readyRead() ) );
|
||||
else if( signal == ( QString ) "error(int)" ) return object->disconnect( SIGNAL( error( int ) ) );
|
||||
else if( signal == ( QString ) "finished(int,int)" ) return object->disconnect( SIGNAL( finished( int, QProcess::ExitStatus ) ) );
|
||||
else if( signal == ( QString ) "readyReadStandardError()" ) return object->disconnect( SIGNAL( readyReadStandardError() ) );
|
||||
else if( signal == ( QString ) "readyReadStandardOutput()" ) return object->disconnect( SIGNAL( readyReadStandardOutput() ) );
|
||||
else if( signal == ( QString ) "started()" ) return object->disconnect( SIGNAL( started() ) );
|
||||
else if( signal == ( QString ) "stateChanged(int)" ) return object->disconnect( SIGNAL( stateChanged( int ) ) );
|
||||
/* QComboBox */
|
||||
else if( signal == ( QString ) "activated(text)" ) return object->disconnect( SIGNAL( activated( const QString & ) ) );
|
||||
else if( signal == ( QString ) "currentIndexChanged(text)" ) return object->disconnect( SIGNAL( currentIndexChanged( const QString & ) ) );
|
||||
else if( signal == ( QString ) "editTextChanged(text)" ) return object->disconnect( SIGNAL( editTextChanged( const QString & ) ) );
|
||||
else if( signal == ( QString ) "highlighted(text)" ) return object->disconnect( SIGNAL( highlighted( const QString & ) ) );
|
||||
/* QTextDocument */
|
||||
else if( signal == ( QString ) "blockCountChanged(int)" ) return object->disconnect( SIGNAL( blockCountChanged( int ) ) );
|
||||
else if( signal == ( QString ) "contentsChange(int,int,int)" ) return object->disconnect( SIGNAL( contentsChange( int, int, int ) ) );
|
||||
else if( signal == ( QString ) "contentsChanged()" ) return object->disconnect( SIGNAL( contentsChanged() ) );
|
||||
else if( signal == ( QString ) "cursorPositionChanged(QTextCursor)" ) return object->disconnect( SIGNAL( cursorPositionChanged( const QTextCursor & ) ) );
|
||||
else if( signal == ( QString ) "documentLayoutChanged()" ) return object->disconnect( SIGNAL( documentLayoutChanged() ) );
|
||||
else if( signal == ( QString ) "modificationChanged(bool)" ) return object->disconnect( SIGNAL( modificationChanged( bool ) ) );
|
||||
else if( signal == ( QString ) "undoCommandAdded()" ) return object->disconnect( SIGNAL( undoCommandAdded() ) );
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* harbour function to disconnect signals
|
||||
*/
|
||||
HB_FUNC( QT_SLOTS_DISCONNECT )
|
||||
{
|
||||
HB_BOOL bRet = HB_FALSE;
|
||||
HBSlots * t_slots = hbqt_par_HBSlots( 1 );
|
||||
|
||||
if( t_slots )
|
||||
{
|
||||
QObject * object = ( QObject* ) hbqt_pPtrFromObj( 2 );
|
||||
|
||||
if( object )
|
||||
{
|
||||
const char * signal = hb_parcx( 3 );
|
||||
int i = object->property( signal ).toInt();
|
||||
|
||||
if( i > 0 && i <= t_slots->listBlock.size() )
|
||||
{
|
||||
hb_itemRelease( t_slots->listBlock.at( i - 1 ) );
|
||||
t_slots->listBlock[ i - 1 ] = NULL;
|
||||
|
||||
bRet = ( disconnect_signal( object, signal ) == true );
|
||||
|
||||
//HB_TRACE( HB_TR_DEBUG, ( " QT_SLOTS_DISCONNECT: %s %s", bRet ? "YES" : "NO", signal ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hb_retl( bRet );
|
||||
}
|
||||
|
||||
HB_FUNC( QT_SLOTS_NEW )
|
||||
{
|
||||
void * pObj = NULL;
|
||||
|
||||
pObj = ( HBSlots * ) new HBSlots();
|
||||
|
||||
hb_retptrGC( hbqt_gcAllocate_HBSlots( pObj ) );
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
#endif
|
||||
@@ -88,7 +88,7 @@ Source: %{name}-%{version}.src.tar.gz
|
||||
Packager: Przemys³aw Czerpak <druzus@polbox.com> Luiz Rafael Culik Guimaraes <culikr@uol.com.br>
|
||||
BuildPrereq: gcc binutils bash %{!?_without_curses: ncurses-devel} %{!?_without_gpm: gpm-devel}
|
||||
Requires: gcc binutils bash sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: %{name} harbour
|
||||
Provides: %{name} harbour lib%{name}.so lib%{name}mt.so
|
||||
BuildRoot: /tmp/%{name}-%{version}-root
|
||||
|
||||
%define _noautoreq 'libharbour.*'
|
||||
@@ -122,80 +122,9 @@ ford
|
||||
állományok, a virtuális gép és függvénykönyvtárak, valamint a dokumentáció.
|
||||
|
||||
######################################################################
|
||||
## main shared lib
|
||||
## contrib libs (without package requirements)
|
||||
######################################################################
|
||||
|
||||
%package lib
|
||||
Summary: Shared runtime libaries for %{dname} compiler
|
||||
Summary(pl): Dzielone bilioteki dla kompilatora %{dname}
|
||||
Summary(ru): óÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ËÏÍÐÉÌÑÔÏÒÁ %{dname}
|
||||
Summary(hu): Megosztott könyvtárak a(z) %{dname} fordítóhoz
|
||||
Group: Development/Languages
|
||||
Provides: lib%{name}.so lib%{name}mt.so
|
||||
|
||||
%description lib
|
||||
%{dname} is a Clipper compatible compiler.
|
||||
This package provides %{dname} runtime shared libraries for programs
|
||||
linked dynamically.
|
||||
|
||||
%description -l pl lib
|
||||
%{dname} to kompatybilny z jêzykiem CA-Cl*pper kompilator.
|
||||
Ten pakiet udostêpnia dzielone bilioteki kompilatora %{dname}
|
||||
dla programów konsolidowanych dynamicznie.
|
||||
|
||||
%description -l pt_BR lib
|
||||
%{dname} é um compilador compativel com o Clipper.
|
||||
Esse pacote %{dname} provem as bibliotecas compartilhadas para programas
|
||||
linkados dinamicamente.
|
||||
|
||||
%description -l ru lib
|
||||
%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Cl*pper.
|
||||
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ %{dname},
|
||||
ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÂÏÔÙ ÄÉÎÁÍÉÞÅÓËÉ ÓËÏÍÐÏÎÏ×ÁÎÎÙÈ ÐÒÏÇÒÁÍÍ.
|
||||
|
||||
%description -l hu lib
|
||||
A(z) %{dname} egy Clipper kompatibilis fordítóprogram.
|
||||
Ez a csomag biztosítja a dinamikusan szerkesztett %{dname}
|
||||
programokhoz szükséges megosztott (dinamikus) futtatókönyvtárakat.
|
||||
|
||||
######################################################################
|
||||
## static libs
|
||||
######################################################################
|
||||
|
||||
%package static
|
||||
Summary: Static runtime libaries for %{dname} compiler
|
||||
Summary(pl): Statyczne bilioteki dla kompilatora %{dname}
|
||||
Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ËÏÍÐÉÌÑÔÏÒÁ %{dname}
|
||||
Summary(hu): Statikus könyvtárak a(z) %{dname} fordítóhoz
|
||||
Group: Development/Languages
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
%description static
|
||||
%{dname} is a Clipper compatible compiler.
|
||||
This package provides %{dname} static runtime libraries for static
|
||||
program linking.
|
||||
|
||||
%description -l pl static
|
||||
%{dname} to kompatybilny z jêzykiem CA-Cl*pper kompilator.
|
||||
Ten pakiet udostêpnia statyczne bilioteki dla kompilatora %{dname}
|
||||
niezbêdne do statycznej konsolidacji programów.
|
||||
|
||||
%description -l pt_BR static
|
||||
%{dname} é um compilador compativel com o clippe.
|
||||
Esse pacote %{dname} provem as bibliotecas de run time staticas para linkagem
|
||||
dos os programas
|
||||
|
||||
%description -l ru static
|
||||
%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Cl*pper.
|
||||
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ËÏÍÐÉÌÑÔÏÒÁ %{dname},
|
||||
ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÔÁÔÉÞÅÓËÏÊ ËÏÍÐÏÎÏ×ËÉ ÐÒÏÇÒÁÍÍ.
|
||||
|
||||
%description -l hu lib
|
||||
A(z) %{dname} egy Clipper kompatibilis fordítóprogram.
|
||||
Ez a csomag biztosítja a statikusan szerkesztett %{dname}
|
||||
programokhoz szükséges statikus futtatókönyvtárakat.
|
||||
|
||||
|
||||
%package contrib
|
||||
Summary: Contrib runtime libaries for %{dname} compiler
|
||||
Summary(pl): Bilioteki z drzewa contrib dla kompilatora %{dname}
|
||||
@@ -223,11 +152,15 @@ dos programas.
|
||||
%{dname} - ËÏÍÐÉÌÑÔÏÒ, ÓÏ×ÍÅÓÔÉÍÙÊ Ó ÑÚÙËÏÍ CA-Cl*pper.
|
||||
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ %{dname} ÉÚ ÄÅÒÅ×Á contrib.
|
||||
|
||||
%description -l hu lib
|
||||
%description -l hu contrib
|
||||
A(z) %{dname} egy Clipper kompatibilis fordítóprogram.
|
||||
Ez a csomag kiegészítõ (contrib) könyvtárakat biztosít
|
||||
statikus szerkesztéshez.
|
||||
|
||||
######################################################################
|
||||
## contrib libs (with package requirements)
|
||||
######################################################################
|
||||
|
||||
## ADS RDD
|
||||
%{?_with_ads:%package ads}
|
||||
%{?_with_ads:Summary: ADS RDDs for %{dname} compiler}
|
||||
@@ -559,13 +492,13 @@ EOF
|
||||
######################################################################
|
||||
## Post install
|
||||
######################################################################
|
||||
#%post lib
|
||||
#%post
|
||||
#/sbin/ldconfig
|
||||
|
||||
######################################################################
|
||||
## Post uninstall
|
||||
######################################################################
|
||||
#%postun lib
|
||||
#%postun
|
||||
#/sbin/ldconfig
|
||||
|
||||
######################################################################
|
||||
@@ -607,7 +540,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %{_includedir}/%{name}
|
||||
%attr(644,root,root) %{_includedir}/%{name}/*
|
||||
|
||||
%files static
|
||||
%defattr(644,root,root,755)
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/libhbcpage.a
|
||||
@@ -636,6 +568,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{?_with_localzlib:%{_libdir}/%{name}/libhbzlib.a}
|
||||
%{?_with_localpcre:%{_libdir}/%{name}/libhbpcre.a}
|
||||
|
||||
%defattr(755,root,root,755)
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/*.so
|
||||
%{_libdir}/*.so
|
||||
%{?hb_ldconf:%{hb_ldconf}/%{name}.conf}
|
||||
|
||||
%files contrib
|
||||
%defattr(644,root,root,755)
|
||||
%dir %{_libdir}/%{name}
|
||||
@@ -656,13 +594,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/%{name}/libhbtpathy.a
|
||||
%{_libdir}/%{name}/libhbziparc.a
|
||||
|
||||
%files lib
|
||||
%defattr(755,root,root,755)
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/*.so
|
||||
%{_libdir}/*.so
|
||||
%{?hb_ldconf:%{hb_ldconf}/%{name}.conf}
|
||||
|
||||
%{?_with_ads:%files ads}
|
||||
%{?_with_ads:%defattr(644,root,root,755)}
|
||||
%{?_with_ads:%dir %{_libdir}/%{name}}
|
||||
|
||||
Reference in New Issue
Block a user