Commit ceaffbed authored by claes's avatar claes

More gcc 4.5

parent 0ff2c585
/*
* Proview $Id: cnv_content.cpp,v 1.3 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_content.cpp,v 1.4 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -38,7 +38,7 @@ extern "C" {
using namespace std;
int CnvContent::find_link( char *subject, char *text, int *page)
int CnvContent::find_link( const char *subject, char *text, int *page)
{
char key_part[4][40];
char subject_part[4][40];
......
/*
* Proview $Id: cnv_content.h,v 1.4 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_content.h,v 1.5 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelösund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -48,7 +48,7 @@ class CnvContent {
CnvContent() {}
vector<CnvContentElem> tab;
void add( CnvContentElem& elem);
int find_link( char *subject, char *text, int *page);
int find_link( const char *subject, char *text, int *page);
};
#endif
......
/*
* Proview $Id: cnv_topdf.cpp,v 1.7 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_topdf.cpp,v 1.8 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -798,7 +798,7 @@ void CnvToPdf::print_horizontal_line()
y -= 3;
}
int CnvToPdf::print_image_inline( char *filename)
int CnvToPdf::print_image_inline( const char *filename)
{
cnv_tImImage image;
cnv_tPixmap pixmap;
......@@ -878,7 +878,7 @@ scalex * width << " 0 0 " << scaley * height << " " << x << " " << y - scaley *
return 1;
}
int CnvToPdf::print_image( char *filename)
int CnvToPdf::print_image( const char *filename)
{
cnv_tImImage image;
cnv_tPixmap pixmap;
......@@ -961,13 +961,13 @@ int CnvToPdf::print_image( char *filename)
}
void CnvToPdf::set_pageheader( char *text)
void CnvToPdf::set_pageheader( const char *text)
{
strcpy( previous_chapter, current_chapter);
strcpy( current_chapter, text);
}
void CnvToPdf::print_h1( char *text, int hlevel, char *subject)
void CnvToPdf::print_h1( const char *text, int hlevel, char *subject)
{
char hnum[40];
......@@ -1023,12 +1023,12 @@ void CnvToPdf::print_h1( char *text, int hlevel, char *subject)
strcpy( previous_chapter, current_chapter);
}
void CnvToPdf::print_h2( char *text)
void CnvToPdf::print_h2( const char *text)
{
print_text( text, style[ci].h2);
}
void CnvToPdf::print_h3( char *text)
void CnvToPdf::print_h3( const char *text)
{
print_text( text, style[ci].h3);
}
......
/*
* Proview $Id: cnv_topdf.h,v 1.6 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_topdf.h,v 1.7 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -186,12 +186,12 @@ class CnvToPdf {
int gray);
void print_pagebreak( int print_num);
void print_content();
void print_h1( char *text, int hlevel, char *subject);
void print_h2( char *text);
void print_h3( char *text);
void print_h1( const char *text, int hlevel, char *subject);
void print_h2( const char *text);
void print_h3( const char *text);
void print_horizontal_line();
int print_image( char *filename);
int print_image_inline( char *filename);
int print_image( const char *filename);
int print_image_inline( const char *filename);
void cnv_text( char *to, const char *from);
void set_confpass( bool conf) {
conf_pass = conf;
......@@ -214,7 +214,7 @@ class CnvToPdf {
void incr_headerlevel();
void decr_headerlevel();
void reset_headernumbers( int level);
void set_pageheader( char *text);
void set_pageheader( const char *text);
void set_useoutlines( int u) { use_outlines = u;}
char *fontname( CnvStyle& style);
......
/*
* Proview $Id: cnv_xtthelptopdf.cpp,v 1.3 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_xtthelptopdf.cpp,v 1.4 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -51,7 +51,7 @@ extern "C" {
#define abs(Dragon) ((Dragon) >= 0 ? (Dragon) : (-(Dragon)))
#endif
void CnvXtthelpToPdf::subject_to_fname( char *fname, char *subject, int path)
void CnvXtthelpToPdf::subject_to_fname( char *fname, const char *subject, int path)
{
if ( path) {
......@@ -74,11 +74,11 @@ CnvXtthelpToPdf::~CnvXtthelpToPdf()
topdf.close();
}
void *CnvXtthelpToPdf::insert( navh_eItemType item_type, char *text1,
char *text2, char *text3, char *alink,
char *link_bookmark, char *file_name,
void *CnvXtthelpToPdf::insert( navh_eItemType item_type, const char *text1,
const char *text2, const char *text3, const char *alink,
const char *link_bookmark, const char *file_name,
navh_eHelpFile file_type, int help_index,
char *bookmark)
const char *bookmark)
{
char link[80];
if ( alink)
......
/*
* Proview $Id: cnv_xtthelptopdf.h,v 1.3 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_xtthelptopdf.h,v 1.4 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -55,12 +55,12 @@ class CnvXtthelpToPdf : public CnvXtthelpTo {
virtual ~CnvXtthelpToPdf();
Cnv_eXtthelpToType type() { return Cnv_eXtthelpToType_Ps;}
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);
bool confpass() { return true;}
void set_confpass( bool conf) {
topdf.set_confpass( conf);
......
/*
* Proview $Id: cnv_xtthelptops.cpp,v 1.4 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_xtthelptops.cpp,v 1.5 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -51,7 +51,7 @@ extern "C" {
#define abs(Dragon) ((Dragon) >= 0 ? (Dragon) : (-(Dragon)))
#endif
void CnvXtthelpToPs::subject_to_fname( char *fname, char *subject, int path)
void CnvXtthelpToPs::subject_to_fname( char *fname, const char *subject, int path)
{
if ( path) {
......@@ -74,11 +74,11 @@ CnvXtthelpToPs::~CnvXtthelpToPs()
tops.close();
}
void *CnvXtthelpToPs::insert( navh_eItemType item_type, char *text1,
char *text2, char *text3, char *link,
char *link_bookmark, char *file_name,
void *CnvXtthelpToPs::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)
{
if ( option & ps_mOption_printDisable &&
item_type != navh_eItemType_Option)
......
/*
* Proview $Id: cnv_xtthelptops.h,v 1.4 2008-10-31 12:51:30 claes Exp $
* Proview $Id: cnv_xtthelptops.h,v 1.5 2008-11-03 09:50:24 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -55,12 +55,12 @@ class CnvXtthelpToPs : public CnvXtthelpTo {
virtual ~CnvXtthelpToPs();
Cnv_eXtthelpToType type() { return Cnv_eXtthelpToType_Ps;}
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);
bool confpass() { return true;}
void set_confpass( bool conf) {
tops.set_confpass( conf);
......
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