diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 282b322144..f919c81e4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,16 +17,26 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-10 08:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/hbgtinfo.ch + + contrib/gtqtc/hbgtqtc.ch + * contrib/gtqtc/gtqtc.h + * contrib/gtqtc/Makefile + * Moved HB_GTI_CODEC local to GT. Pls never add GT specific + (especially non-core) HB_GTI_* settings to core header. + * Renamed HB_GTI_CODEC to HB_GTI_QTCODEC. + ! Fix to not install non-public header gtqtc.h. + 2009-09-09 20:58 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * include/hbgtinfo.ch + #define HB_GTI_CODEC 60 * contrib/gtqtc/gtqtc.h * contrib/gtqtc/gtqtc.cpp - + Implemented CODEC support. - USAGE: + + Implemented CODEC support. + USAGE: hb_gtInfo( HB_GTI_CODEC, "Windows-1251" ) - hb_setCodePage( "RU1251" ) + hb_setCodePage( "RU1251" ) Please test as I have never used any codepage. 2009-09-10 02:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile index a93ba83cd7..abaf480ded 100644 --- a/harbour/contrib/gtqtc/Makefile +++ b/harbour/contrib/gtqtc/Makefile @@ -16,8 +16,8 @@ CPP_SOURCES := \ gtqtc.cpp \ moc_gtqtc.cpp \ -C_HEADERS := \ - gtqtc.h \ +PRG_HEADERS := \ + hbgtqtc.ch _DET_DSP_NAME := qt _DET_VAR_INC_ := HB_INC_QT diff --git a/harbour/contrib/gtqtc/gtqtc.cpp b/harbour/contrib/gtqtc/gtqtc.cpp index ef14542004..31bb473991 100644 --- a/harbour/contrib/gtqtc/gtqtc.cpp +++ b/harbour/contrib/gtqtc/gtqtc.cpp @@ -911,7 +911,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) switch( iType ) { - case HB_GTI_CODEC: + case HB_GTI_QTCODEC: { QTextCodec * codec = QTextCodec::codecForName( ( char * ) hb_itemGetCPtr( pInfo->pNewVal ) ); QTextCodec::setCodecForCStrings( codec ); diff --git a/harbour/contrib/gtqtc/gtqtc.h b/harbour/contrib/gtqtc/gtqtc.h index 6654813ae6..562653d9ed 100644 --- a/harbour/contrib/gtqtc/gtqtc.h +++ b/harbour/contrib/gtqtc/gtqtc.h @@ -81,6 +81,8 @@ #include "hbvm.h" #include "hbthread.h" +#include "hbgtqtc.ch" + #define WVT_CHAR_QUEUE_SIZE 4096 // 128 #define WVT_MAX_TITLE_SIZE 128 #define WVT_MAX_ROWS 256 diff --git a/harbour/contrib/gtqtc/hbgtqtc.ch b/harbour/contrib/gtqtc/hbgtqtc.ch new file mode 100644 index 0000000000..ccbc2e1d14 --- /dev/null +++ b/harbour/contrib/gtqtc/hbgtqtc.ch @@ -0,0 +1,60 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Header file for the GTQTC + * + * Copyright 2009 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. + * + */ + +/* NOTE: This file is also used by C code. */ + +#ifndef _HBGTQTC_CH +#define _HBGTQTC_CH + +#define HB_GTI_QTCODEC 90 /* Instructs gtqtc to request for code page conversion class off Qt */ + +#endif /* _HBGTQTC_CH */ diff --git a/harbour/include/hbgtinfo.ch b/harbour/include/hbgtinfo.ch index 7e6a774413..cc55b3b392 100644 --- a/harbour/include/hbgtinfo.ch +++ b/harbour/include/hbgtinfo.ch @@ -138,8 +138,6 @@ #define HB_GTI_CARGO 58 /* Storage of any user defined value */ #define HB_GTI_FONTSEL 59 /* X11 style font selecting */ -#define HB_GTI_CODEC 60 /* Instructs gtqtc to reqest for code page conversion class off Qt */ - /* Font weights */ #define HB_GTI_FONTW_THIN 1 #define HB_GTI_FONTW_NORMAL 2