From 3329a8cd2b363a11311b5a987c6db0cd16e46b99 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Wed, 20 Jan 2010 22:42:01 +0000 Subject: [PATCH] Q3IntDict->QHash (various font tables) svn path=/trunk/KDE/kdegraphics/okular/; revision=1077795 --- generators/dvi/TeXFontDefinition.cpp | 8 ++++---- generators/dvi/TeXFontDefinition.h | 4 ++-- generators/dvi/dviFile.cpp | 4 ++-- generators/dvi/dviFile.h | 4 ++-- generators/dvi/dviRenderer.h | 4 ++-- generators/dvi/dviRenderer_draw.cpp | 6 +++--- generators/dvi/dviRenderer_prescan.cpp | 4 ++-- generators/dvi/vf.cpp | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/generators/dvi/TeXFontDefinition.cpp b/generators/dvi/TeXFontDefinition.cpp index 6f7b3f8b0..b3c72bc3f 100644 --- a/generators/dvi/TeXFontDefinition.cpp +++ b/generators/dvi/TeXFontDefinition.cpp @@ -224,10 +224,10 @@ void TeXFontDefinition::mark_as_used() // For virtual fonts, also go through the list of referred fonts if (flags & TeXFontDefinition::FONT_VIRTUAL) { - Q3IntDictIterator it(vf_table); - while( it.current() ) { - it.current()->flags |= TeXFontDefinition::FONT_IN_USE; - ++it; + QHashIterator it(vf_table); + while( it.hasNext() ) { + it.next(); + it.value()->flags |= TeXFontDefinition::FONT_IN_USE; } } } diff --git a/generators/dvi/TeXFontDefinition.h b/generators/dvi/TeXFontDefinition.h index 3bb1964cc..46c735ed4 100644 --- a/generators/dvi/TeXFontDefinition.h +++ b/generators/dvi/TeXFontDefinition.h @@ -15,7 +15,7 @@ #ifndef _FONT_H #define _FONT_H -#include +#include #include @@ -110,7 +110,7 @@ class TeXFontDefinition { // used by (loaded) virtual fonts macro* macrotable; // used by (loaded) virtual fonts, list of fonts used by this vf, - Q3IntDict vf_table; + QHash vf_table; // acessible by number // used by (loaded) virtual fonts, list of fonts used by this vf TeXFontDefinition* first_font; diff --git a/generators/dvi/dviFile.cpp b/generators/dvi/dviFile.cpp index b58384db8..d1113ae7f 100644 --- a/generators/dvi/dviFile.cpp +++ b/generators/dvi/dviFile.cpp @@ -207,10 +207,10 @@ void dvifile::read_postamble() // Insert font in dictionary and make sure the dictionary is big // enough. - if (tn_table.size()-2 <= tn_table.count()) + if (tn_table.capacity()-2 <= tn_table.count()) // Not quite optimal. The size of the dictionary should be a // prime for optimal performance. I don't care. - tn_table.resize(tn_table.size()*2); + tn_table.reserve(tn_table.capacity()*2); tn_table.insert(TeXnumber, fontp); } diff --git a/generators/dvi/dviFile.h b/generators/dvi/dviFile.h index b6179fc10..b9b2b12b0 100644 --- a/generators/dvi/dviFile.h +++ b/generators/dvi/dviFile.h @@ -13,7 +13,7 @@ #include "bigEndianByteReader.h" -#include +#include #include #include #include @@ -69,7 +69,7 @@ class dvifile : public bigEndianByteReader KDVI ensures that the user is only informed once. */ bool sourceSpecialMarker; - Q3IntDict tn_table; + QHash tn_table; /** Returns the number of centimeters per DVI unit in this DVI file. */ diff --git a/generators/dvi/dviRenderer.h b/generators/dvi/dviRenderer.h index bee93d249..8f5f95a57 100644 --- a/generators/dvi/dviRenderer.h +++ b/generators/dvi/dviRenderer.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -82,7 +82,7 @@ struct drawinf { TeXFontDefinition* fontp; set_char_proc set_char_p; - Q3IntDict* fonttable; + QHash* fonttable; TeXFontDefinition* _virtual; }; diff --git a/generators/dvi/dviRenderer_draw.cpp b/generators/dvi/dviRenderer_draw.cpp index a825c4d9f..b81635396 100644 --- a/generators/dvi/dviRenderer_draw.cpp +++ b/generators/dvi/dviRenderer_draw.cpp @@ -281,7 +281,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) (this->*currinf.set_char_p)(ch, ch); } else if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) { - currinf.fontp = currinf.fonttable->find(ch - FNTNUM0); + currinf.fontp = currinf.fonttable->value(ch - FNTNUM0); if (currinf.fontp == NULL) { errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.", ch - FNTNUM0); return; @@ -502,7 +502,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) case FNT1: case FNT2: case FNT3: - currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1)); + currinf.fontp = currinf.fonttable->value(readUINT(ch - FNT1 + 1)); if (currinf.fontp == NULL) { errorMsg = i18n("The DVI code referred to a font which was not previously defined."); return; @@ -511,7 +511,7 @@ void dviRenderer::draw_part(double current_dimconv, bool is_vfmacro) break; case FNT4: - currinf.fontp = currinf.fonttable->find(readINT(ch - FNT1 + 1)); + currinf.fontp = currinf.fonttable->value(readINT(ch - FNT1 + 1)); if (currinf.fontp == NULL) { errorMsg = i18n("The DVI code referred to a font which was not previously defined."); return; diff --git a/generators/dvi/dviRenderer_prescan.cpp b/generators/dvi/dviRenderer_prescan.cpp index 56d61ea43..e7f38fab5 100644 --- a/generators/dvi/dviRenderer_prescan.cpp +++ b/generators/dvi/dviRenderer_prescan.cpp @@ -642,7 +642,7 @@ void dviRenderer::prescan(parseSpecials specialParser) } if (FNTNUM0 <= ch && ch <= (unsigned char) (FNTNUM0 + 63)) { - currinf.fontp = currinf.fonttable->find(ch - FNTNUM0); + currinf.fontp = currinf.fonttable->value(ch - FNTNUM0); if (currinf.fontp == NULL) { errorMsg = i18n("The DVI code referred to font #%1, which was not previously defined.", ch - FNTNUM0); return; @@ -761,7 +761,7 @@ void dviRenderer::prescan(parseSpecials specialParser) case FNT2: case FNT3: case FNT4: - currinf.fontp = currinf.fonttable->find(readUINT(ch - FNT1 + 1)); + currinf.fontp = currinf.fonttable->value(readUINT(ch - FNT1 + 1)); if (currinf.fontp == NULL) return; currinf.set_char_p = currinf.fontp->set_char_p; diff --git a/generators/dvi/vf.cpp b/generators/dvi/vf.cpp index 8cc59dd69..8336048ad 100644 --- a/generators/dvi/vf.cpp +++ b/generators/dvi/vf.cpp @@ -118,10 +118,10 @@ void TeXFontDefinition::read_VF_index() // Insert font in dictionary and make sure the dictionary is big // enough. - if (vf_table.size()-2 <= vf_table.count()) + if (vf_table.capacity()-2 <= vf_table.count()) // Not quite optimal. The size of the dictionary should be a // prime. I don't care. - vf_table.resize(vf_table.size()*2); + vf_table.reserve(vf_table.capacity()*2); vf_table.insert(TeXnumber, newfontp); if (first_font == NULL)