Skip to content

Fixing a couple compiler warnigs #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jojo-Schmitz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing a couple compiler warnigs #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d042e3e
add missing cases and a comment to prevent compiler warnings
Jojo-Schmitz Oct 16, 2019
00dcfc4
Replace deprecated function calls with lambdas
mattmcclinch Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions fmt_opts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ std::string formatting_options::get_par_str() const
break;
case formatting_options::align_justify:
style+="text-align:justify;";
break;
case formatting_options::align_left:
case formatting_options::align_error:
break;
}
if (papFirst!=0)
{
Expand Down Expand Up @@ -216,6 +220,7 @@ std::string formatter::format(const formatting_options &_opt)
case font::ff_cursive: style+=", cursive"; break;
case font::ff_fantasy: style+=", fantasy"; break;
case font::ff_monospace: style+=", monospace"; break;
case font::ff_none: break;
}
style+=";";
}
Expand Down
35 changes: 21 additions & 14 deletions rtf2html.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ int main(int argc, char **argv)
{
case '\\':
{
rtf_keyword kw(++buf_in);
if (in_title && kw.is_control_char() && kw.control_char() == '\'')
rtf_keyword kw1(++buf_in);
if (in_title && kw1.is_control_char() && kw1.control_char() == '\'')
title += char_by_code(buf_in);
else if (kw.keyword()==rtf_keyword::rkw_title)
else if (kw1.keyword()==rtf_keyword::rkw_title)
in_title=true;
break;
}
Expand Down Expand Up @@ -224,17 +224,19 @@ int main(int argc, char **argv)
{
case '\\':
{
rtf_keyword kw(++buf_in);
switch (kw.keyword())
rtf_keyword kw1(++buf_in);
switch (kw1.keyword())
{
case rtf_keyword::rkw_red:
clr.r=kw.parameter();
clr.r=kw1.parameter();
break;
case rtf_keyword::rkw_green:
clr.g=kw.parameter();
clr.g=kw1.parameter();
break;
case rtf_keyword::rkw_blue:
clr.b=kw.parameter();
clr.b=kw1.parameter();
break;
default:
break;
}
break;
Expand Down Expand Up @@ -264,20 +266,20 @@ int main(int argc, char **argv)
{
case '\\':
{
rtf_keyword kw(++buf_in);
if (kw.is_control_char() && kw.control_char()=='*')
rtf_keyword kw1(++buf_in);
if (kw1.is_control_char() && kw1.control_char()=='*')
skip_group(buf_in);
else
switch (kw.keyword())
switch (kw1.keyword())
{
case rtf_keyword::rkw_f:
font_num=kw.parameter();
font_num=kw1.parameter();
break;
case rtf_keyword::rkw_fprq:
fnt.pitch=kw.parameter();
fnt.pitch=kw1.parameter();
break;
case rtf_keyword::rkw_fcharset:
fnt.charset=kw.parameter();
fnt.charset=kw1.parameter();
break;
case rtf_keyword::rkw_fnil:
fnt.family=font::ff_none;
Expand All @@ -297,6 +299,8 @@ int main(int argc, char **argv)
case rtf_keyword::rkw_fdecor:
fnt.family=font::ff_fantasy;
break;
default:
break;
}
break;
}
Expand Down Expand Up @@ -479,6 +483,7 @@ int main(int argc, char **argv)
case rtf_keyword::rkw_trowd:
CurCellDefs=CellDefsList.insert(CellDefsList.end(),
table_cell_defs());
// fall through
case rtf_keyword::rkw_row:
if (!trCurRow->Cells.empty())
{
Expand Down Expand Up @@ -557,6 +562,8 @@ int main(int argc, char **argv)
case rtf_keyword::rkw_margl:
iMarginLeft=kw.parameter();
break;
default:
break;
}
}
}
Expand Down
14 changes: 5 additions & 9 deletions rtf_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ std::string table::make()
cell_def_2=
std::find_if((*span_row)->CellDefs->begin(),
(*span_row)->CellDefs->end(),
std::bind2nd(
std::mem_fun(&table_cell_def::right_equals),
(*cell_def)->Right));
[cell_def](table_cell_def* def) { return def->right_equals((*cell_def)->Right); });
if (cell_def_2==(*span_row)->CellDefs->end())
break;
if (!(*cell_def_2)->Merged)
Expand Down Expand Up @@ -139,19 +137,15 @@ std::string table::make()
cell_def_2=
std::find_if((*row2)->CellDefs->begin(),
(*row2)->CellDefs->end(),
std::bind2nd(
std::mem_fun(&table_cell_def::right_equals),
left));
[left](table_cell_def* def) { return def->right_equals(left); } );
if (cell_def_2!=(*row2)->CellDefs->end())
{
bleft=bleft && (*cell_def_2)->BorderRight;
}
cell_def_2=
std::find_if((*row2)->CellDefs->begin(),
(*row2)->CellDefs->end(),
std::bind2nd(
std::mem_fun(&table_cell_def::left_equals),
right));
[right](table_cell_def* def) { return def->left_equals(right); } );
if (cell_def_2!=(*row2)->CellDefs->end())
{
bright=bright && (*cell_def_2)->BorderLeft;
Expand Down Expand Up @@ -199,6 +193,8 @@ std::string table::make()
case table_cell_def::valign_bottom:
result+=" valign=bottom";
break;
case table_cell_def::valign_center:
break;
}

result+=">";
Expand Down