Commit a44b0157 authored by Albert Astals Cid's avatar Albert Astals Cid

Make newer gcc happier about fallthrough

parent 18cb1e56
......@@ -423,6 +423,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case W4:
WWtmp = readINT(ch - W0);
currinf.data.w = ((long) (WWtmp * current_dimconv));
// fallthrough
case W0:
if ((is_vfmacro == false) &&
(currinf.fontp != 0) &&
......@@ -440,6 +441,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case X4:
XXtmp = readINT(ch - X0);
currinf.data.x = ((long) (XXtmp * current_dimconv));
// fallthrough
case X0:
if ((is_vfmacro == false) &&
(currinf.fontp != 0) &&
......@@ -478,6 +480,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case Y4:
YYtmp = readINT(ch - Y0);
currinf.data.y = ((long) (YYtmp * current_dimconv));
// fallthrough
case Y0:
if ((is_vfmacro == false) &&
(currinf.fontp != 0) &&
......@@ -499,6 +502,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro)
case Z4:
ZZtmp = readINT(ch - Z0);
currinf.data.z = ((long) (ZZtmp * current_dimconv));
// fallthrough
case Z0:
if ((is_vfmacro == false) &&
(currinf.fontp != 0) &&
......
......@@ -713,6 +713,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case W4:
WWtmp = readINT(ch - W0);
currinf.data.w = ((long) (WWtmp * 65536.0*fontPixelPerDVIunit));
// fallthrough
case W0:
currinf.data.dvi_h += currinf.data.w;
break;
......@@ -723,6 +724,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case X4:
XXtmp = readINT(ch - X0);
currinf.data.x = ((long) (XXtmp * 65536.0*fontPixelPerDVIunit));
// fallthrough
case X0:
currinf.data.dvi_h += currinf.data.x;
break;
......@@ -744,6 +746,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case Y4:
YYtmp = readINT(ch - Y0);
currinf.data.y = ((long) (YYtmp * 65536.0*fontPixelPerDVIunit));
// fallthrough
case Y0:
currinf.data.dvi_v += currinf.data.y/65536;
currinf.data.pxl_v = int(currinf.data.dvi_v/shrinkfactor);
......@@ -755,6 +758,7 @@ void dviRenderer::prescan(parseSpecials specialParser)
case Z4:
ZZtmp = readINT(ch - Z0);
currinf.data.z = ((long) (ZZtmp * 65536.0*fontPixelPerDVIunit));
// fallthrough
case Z0:
currinf.data.dvi_v += currinf.data.z/65536;
currinf.data.pxl_v = int(currinf.data.dvi_v/shrinkfactor);
......
......@@ -345,16 +345,12 @@ Okular::Annotation* createAnnotationFromPopplerAnnotation( Poppler::Annotation *
case Poppler::Annotation::AHighlight:
case Poppler::Annotation::AInk:
case Poppler::Annotation::ACaret:
{
externallyDrawn = true;
/* fallback */
}
/* fallthrough */
case Poppler::Annotation::AStamp:
{
tieToOkularAnn = true;
*doDelete = false;
/* fallback */
}
/* fallthrough */
default:
{
// this is uber ugly but i don't know a better way to do it without introducing a poppler::annotation dependency on core
......
......@@ -1924,7 +1924,7 @@ void PageView::keyPressEvent( QKeyEvent * e )
slotAutoScroll();
return;
}
// else fall trhough
// fallthrough
default:
e->ignore();
return;
......
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