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

2009-12-10 16:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbqt/Makefile
  * contrib/hbqt/generator/hbqtgen.prg
    + Moved static source files from filelist.mk to Makefile.

  * contrib/hbqt/Makefile
  * contrib/hbqt/hbqt_slots.cpp
  + contrib/hbqt/hbqt_events.cpp
    + Moved event filter related stuff to separate file.
    % Cleaned lots of unnecessary QT headers includes.
This commit is contained in:
Viktor Szakats
2009-12-10 15:11:48 +00:00
parent 03345c6143
commit 486b9dad6e
5 changed files with 224 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -17,6 +17,17 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-10 16:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/Makefile
* contrib/hbqt/generator/hbqtgen.prg
+ Moved static source files from filelist.mk to Makefile.
* contrib/hbqt/Makefile
* contrib/hbqt/hbqt_slots.cpp
+ contrib/hbqt/hbqt_events.cpp
+ Moved event filter related stuff to separate file.
% Cleaned lots of unnecessary QT headers includes.
2009-12-10 15:59 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbqt/hbqt_slots.cpp
* contrib/hbxbp/xbpgeneric.prg

6
harbour/contrib/hbqt/Makefile
View File

@@ -21,6 +21,12 @@ moc_slots.cpp : $(TOP)$(ROOT)contrib/hbqt/hbqt_slots.h
include $(TOP)$(ROOT)contrib/hbqt/filelist.mk
CPP_SOURCES += \
moc_slots.cpp \
hbqt_base.cpp \
hbqt_utils.cpp \
hbqt_slots.cpp \
hbqt_destruct.cpp \
hbqt_events.cpp \
hbqt_hbdbfmodel.cpp \
hbqt_hbdrawingarea.cpp \
hbqt_hbqmainwindow.cpp \

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

@@ -1661,11 +1661,6 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut )
aeval( hdr_, {|e| aadd( txt_, e ) } )
aadd( txt_, "CPP_SOURCES := \" )
//
aadd( txt_, " " + "moc_slots.cpp \" )
aadd( txt_, " " + "hbqt_base.cpp \" )
aadd( txt_, " " + "hbqt_utils.cpp \" )
aadd( txt_, " " + "hbqt_slots.cpp \" )
aadd( txt_, " " + "hbqt_destruct.cpp \" )
// We will strip lines below once subs proto is running
#if 0
FOR EACH s IN cpp_

206
harbour/contrib/hbqt/hbqt_events.cpp Normal file
View File

@@ -0,0 +1,206 @@
/*
* $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>
* 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_slots.h"
/*----------------------------------------------------------------------*/
typedef struct
{
Events * t_events;
} HB_EVENTS, * PHB_EVENTS;
static HB_TSD_NEW( s_events, sizeof( HB_EVENTS ), NULL, NULL );
#define HB_GETQTEVENTFILTER() ( ( PHB_EVENTS ) hb_stackGetTSD( &s_events ) )
/*----------------------------------------------------------------------*/
static void qt_setEventFilter()
{
if( ! HB_GETQTEVENTFILTER()->t_events )
HB_GETQTEVENTFILTER()->t_events = new Events();
}
static Events * qt_getEventFilter( void )
{
return HB_GETQTEVENTFILTER()->t_events;
}
HB_FUNC( QT_SETEVENTFILTER )
{
qt_setEventFilter();
}
HB_FUNC( QT_GETEVENTFILTER )
{
hb_retptr( qt_getEventFilter() );
}
/*----------------------------------------------------------------------*/
Events::Events( QObject * parent ) : QObject( parent )
{
}
Events::~Events()
{
listBlock.clear();
}
bool Events::eventFilter( QObject * object, QEvent * event )
{
QEvent::Type eventtype = event->type();
if( ( int ) eventtype == 0 )
return false;
char prop[ 10 ];
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_DESTROY )
{
qt_getEventFilter()->~Events();
}
HB_FUNC( QT_CONNECT_EVENT )
{
QObject * object = ( QObject* ) hbqt_gcpointer( 1 ); /* get sender */
if( object )
{
int type = hb_parni( 2 );
PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) );
Events * t_events = qt_getEventFilter();
char prop[ 20 ];
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */
t_events->listBlock << codeblock;
t_events->listObj << object;
object->setProperty( prop, ( int ) t_events->listBlock.size() );
hb_retl( HB_TRUE );
}
else
hb_retl( HB_FALSE );
}
HB_FUNC( QT_DISCONNECT_EVENT )
{
HB_BOOL bRet = HB_FALSE;
QObject * object = ( QObject* ) hbqt_gcpointer( 1 );
if( object )
{
int type = hb_parni( 2 );
Events * t_events = qt_getEventFilter();
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_DISCONNECT_EVENT: %i", type ) );
}
}
hb_retl( bRet );
}
/*----------------------------------------------------------------------*/
#endif

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

@@ -54,9 +54,9 @@
/*----------------------------------------------------------------------*/
#include "hbapi.h"
#include "hbvm.h"
#include "hbapiitm.h"
#include "hbstack.h"
#include "hbvm.h"
#include "hbqt.h"
@@ -64,27 +64,8 @@
#include "hbqt_slots.h"
#include <QWidget>
#include <QString>
#include <QList>
#include <QKeyEvent>
#include <QAction>
#include <QObject>
#include <QEvent>
#include <QMessageBox>
#include <QFileDialog>
/*----------------------------------------------------------------------*/
typedef struct
{
Events * t_events;
} HB_EVENTS, * PHB_EVENTS;
static HB_TSD_NEW( s_events, sizeof( HB_EVENTS ), NULL, NULL );
#define HB_GETQTEVENTFILTER() ( ( PHB_EVENTS ) hb_stackGetTSD( &s_events ) )
typedef struct
{
Slots * t_slots;
@@ -96,17 +77,6 @@ static HB_TSD_NEW( s_slots, sizeof( HB_SLOTS ), NULL, NULL );
/*----------------------------------------------------------------------*/
static void qt_setEventFilter()
{
if( ! HB_GETQTEVENTFILTER()->t_events )
HB_GETQTEVENTFILTER()->t_events = new Events();
}
static Events * qt_getEventFilter( void )
{
return HB_GETQTEVENTFILTER()->t_events;
}
static void qt_setEventSlots()
{
if( ! HB_GETQTEVENTSLOTS()->t_slots )
@@ -118,16 +88,6 @@ static Slots * qt_getEventSlots( void )
return HB_GETQTEVENTSLOTS()->t_slots;
}
HB_FUNC( QT_SETEVENTFILTER )
{
qt_setEventFilter();
}
HB_FUNC( QT_GETEVENTFILTER )
{
hb_retptr( qt_getEventFilter() );
}
HB_FUNC( QT_SETEVENTSLOTS )
{
qt_setEventSlots();
@@ -805,107 +765,4 @@ HB_FUNC( QT_SLOTS_DESTROY )
/*----------------------------------------------------------------------*/
Events::Events( QObject * parent ) : QObject( parent )
{
}
Events::~Events()
{
listBlock.clear();
}
bool Events::eventFilter( QObject * object, QEvent * event )
{
QEvent::Type eventtype = event->type();
if( ( int ) eventtype == 0 )
return false;
char prop[ 10 ];
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_DESTROY )
{
qt_getEventFilter()->~Events();
}
HB_FUNC( QT_CONNECT_EVENT )
{
QObject * object = ( QObject* ) hbqt_gcpointer( 1 ); /* get sender */
if( object )
{
int type = hb_parni( 2 );
PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK | HB_IT_BYREF ) );
Events * t_events = qt_getEventFilter();
char prop[ 20 ];
hb_snprintf( prop, sizeof( prop ), "%s%i%s", "P", type, "P" ); /* Make it a unique identifier */
t_events->listBlock << codeblock;
t_events->listObj << object;
object->setProperty( prop, ( int ) t_events->listBlock.size() );
hb_retl( HB_TRUE );
}
else
hb_retl( HB_FALSE );
}
HB_FUNC( QT_DISCONNECT_EVENT )
{
HB_BOOL bRet = HB_FALSE;
QObject * object = ( QObject* ) hbqt_gcpointer( 1 );
if( object )
{
int type = hb_parni( 2 );
Events * t_events = qt_getEventFilter();
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_DISCONNECT_EVENT: %i", type ) );
}
}
hb_retl( bRet );
}
/*----------------------------------------------------------------------*/
#endif