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 <Q3Dict>
+#include <QHash>
 
 class QString;
 
@@ -19,11 +19,12 @@ class QString;
 class fontEncodingPool {
  public:
   fontEncodingPool();
+  ~fontEncodingPool();
 
   fontEncoding *findByName(const QString &name);
 
  private:
-  Q3Dict<fontEncoding> dictionary;
+  QHash<QString,fontEncoding*> dictionary;
 };
 
 #endif