From e285cd125f3124be6cb693b2a7429ddfdd7ca226 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Sat, 16 Jan 2010 15:29:52 +0000 Subject: [PATCH] Q3Dict->QHash svn path=/trunk/KDE/kdegraphics/okular/; revision=1075707 --- generators/dvi/fontEncodingPool.cpp | 6 +++++- generators/dvi/fontEncodingPool.h | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/generators/dvi/fontEncodingPool.cpp b/generators/dvi/fontEncodingPool.cpp index e6d542d41..0e6ea7573 100644 --- a/generators/dvi/fontEncodingPool.cpp +++ b/generators/dvi/fontEncodingPool.cpp @@ -16,10 +16,14 @@ fontEncodingPool::fontEncodingPool() {} +fontEncodingPool::~fontEncodingPool() +{ + qDeleteAll(dictionary); +} fontEncoding *fontEncodingPool::findByName(const QString &name) { - fontEncoding *ptr = dictionary.find( name ); + fontEncoding *ptr = dictionary.value( name ); if (ptr == 0) { ptr = new fontEncoding(name); diff --git a/generators/dvi/fontEncodingPool.h b/generators/dvi/fontEncodingPool.h index 3121e4997..3f6cf5ce8 100644 --- a/generators/dvi/fontEncodingPool.h +++ b/generators/dvi/fontEncodingPool.h @@ -11,7 +11,7 @@ #include "fontEncoding.h" -#include +#include class QString; @@ -19,11 +19,12 @@ class QString; class fontEncodingPool { public: fontEncodingPool(); + ~fontEncodingPool(); fontEncoding *findByName(const QString &name); private: - Q3Dict dictionary; + QHash dictionary; }; #endif