Commit 7218c051 authored by claes's avatar claes

More gcc 4.3 changes

parent 5921f3f8
/*
* Proview $Id: cnv_xtthelptohtml.cpp,v 1.7 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_xtthelptohtml.cpp,v 1.8 2008-11-03 13:20:14 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -50,7 +50,7 @@ extern "C" {
#define abs(Dragon) ((Dragon) >= 0 ? (Dragon) : (-(Dragon)))
#endif
void CnvXtthelpToHtml::subject_to_fname( char *fname, char *subject, int path)
void CnvXtthelpToHtml::subject_to_fname( char *fname, const char *subject, int path)
{
char *s, *t;
......@@ -62,7 +62,7 @@ void CnvXtthelpToHtml::subject_to_fname( char *fname, char *subject, int path)
strcpy( fname, ctx->rx->name);
strcat( fname, "_");
t = fname + strlen(fname);
for ( s = subject; *s; s++,t++) {
for ( s = (char *)subject; *s; s++,t++) {
if ( *s == ' ' || *s == '(' || *s == ')')
*t = '_';
else
......@@ -73,11 +73,11 @@ void CnvXtthelpToHtml::subject_to_fname( char *fname, char *subject, int path)
cdh_ToLower( fname, fname);
}
void *CnvXtthelpToHtml::insert( navh_eItemType item_type, char *text1,
char *text2, char *text3, char *link,
char *link_bookmark, char *file_name,
void *CnvXtthelpToHtml::insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index,
char *bookmark)
const char *bookmark)
{
int i;
static int in_table = 0;
......
/*
* Proview $Id: cnv_xtthelptohtml.h,v 1.3 2005-09-01 14:57:47 claes Exp $
* Proview $Id: cnv_xtthelptohtml.h,v 1.4 2008-11-03 13:20:14 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -39,12 +39,12 @@ class CnvXtthelpToHtml : public CnvXtthelpTo {
virtual ~CnvXtthelpToHtml() {}
Cnv_eXtthelpToType type() { return Cnv_eXtthelpToType_Html;}
void *insert( navh_eItemType item_type, char *text1,
char *text2, char *text3, char *link,
char *link_bookmark, char *file_name,
void *insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index,
char *bookmark);
void subject_to_fname( char *fname, char *subject, int path);
const char *bookmark);
void subject_to_fname( char *fname, const char *subject, int path);
CnvCtx *ctx;
CnvFile *cf;
......
/*
* Proview $Id: cnv_xtthelptoxml.cpp,v 1.3 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_xtthelptoxml.cpp,v 1.4 2008-11-03 13:20:14 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -96,7 +96,7 @@ static xml_sTag tags[] = {
#define abs(Dragon) ((Dragon) >= 0 ? (Dragon) : (-(Dragon)))
#endif
void CnvXtthelpToXml::cnv_text( char *to, char *from)
void CnvXtthelpToXml::cnv_text( char *to, const char *from)
{
if ( !from) {
strcpy( to, "");
......@@ -104,7 +104,7 @@ void CnvXtthelpToXml::cnv_text( char *to, char *from)
}
char *t = to;
char *s = from;
char *s = (char *)from;
for ( ; *s; s++) {
switch ( *s) {
......@@ -145,7 +145,7 @@ void CnvXtthelpToXml::cnv_text( char *to, char *from)
*t = 0;
}
void CnvXtthelpToXml::subject_to_fname( char *fname, char *subject, int path)
void CnvXtthelpToXml::subject_to_fname( char *fname, const char *subject, int path)
{
char *s, *t;
......@@ -158,7 +158,7 @@ void CnvXtthelpToXml::subject_to_fname( char *fname, char *subject, int path)
if ( !ctx->common_structfile_only) {
strcat( fname, "_");
t = fname + strlen(fname);
for ( s = subject; *s; s++,t++) {
for ( s = (char *)subject; *s; s++,t++) {
if ( *s == ' ' || *s == '(' || *s == ')')
*t = '_';
else
......@@ -182,11 +182,11 @@ CnvXtthelpToXml::~CnvXtthelpToXml()
}
}
void *CnvXtthelpToXml::insert( navh_eItemType item_type, char *t1,
char *t2, char *t3, char *link,
char *link_bookmark, char *file_name,
void *CnvXtthelpToXml::insert( navh_eItemType item_type, const char *t1,
const char *t2, const char *t3, const char *link,
const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index,
char *bookmark)
const char *bookmark)
{
int i;
static int in_table = 0;
......
/*
* Proview $Id: cnv_xtthelptoxml.h,v 1.2 2005-09-01 14:57:47 claes Exp $
* Proview $Id: cnv_xtthelptoxml.h,v 1.3 2008-11-03 13:20:14 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -45,13 +45,13 @@ class CnvXtthelpToXml : public CnvXtthelpTo {
virtual ~CnvXtthelpToXml();
Cnv_eXtthelpToType type() { return Cnv_eXtthelpToType_Xml;}
void *insert( navh_eItemType item_type, char *text1,
char *text2, char *text3, char *link,
char *link_bookmark, char *file_name,
void *insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *link,
const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index,
char *bookmark);
void subject_to_fname( char *fname, char *subject, int path);
void cnv_text( char *to, char *from);
const char *bookmark);
void subject_to_fname( char *fname, const char *subject, int path);
void cnv_text( char *to, const char *from);
CnvCtx *ctx;
ofstream fp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment