Revert "kcontrol: a bit more collision resilient hashes for font types"

This reverts commit 32a8b214c3d152ea6b532fcfcf5c765e9243f814.

diff --git a/kcontrol/kfontinst/dbus/Folder.h b/kcontrol/kfontinst/dbus/Folder.h
index a6fa208..fdc0e97 100644 (file)
--- a/kcontrol/kfontinst/dbus/Folder.h
+++ b/kcontrol/kfontinst/dbus/Folder.h
@@ -104,7 +104,7 @@ class Folder
 
 inline KDE_EXPORT uint qHash(const Folder::FlatFont &key)
 {
-    return qHash(key.file) + key.scalable;
+    return qHash(key.file); // +qHash(key.index());
 }
 
 }

diff --git a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
index 1919da2..91a2c18 100644 (file)
--- a/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp
@@ -50,6 +50,9 @@
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 #include <QtCore/QProcess>
+#if defined USE_POLICYKIT && USE_POLICYKIT==1
+#include <QtDBus/QDBusInterface>
+#endif
 
 namespace KFI
 {

diff --git a/kcontrol/kfontinst/lib/File.h b/kcontrol/kfontinst/lib/File.h
index 9a18f48..347c977 100644 (file)
--- a/kcontrol/kfontinst/lib/File.h
+++ b/kcontrol/kfontinst/lib/File.h
@@ -70,7 +70,7 @@ typedef QSet<File> FileCont;
 
 inline KDE_EXPORT uint qHash(const File &key)
 {
-    return qHash(key.path()) + qHash(key.foundry());
+    return qHash(key.path()); // +qHash(key.index());
 }
 
 }

diff --git a/kcontrol/kfontinst/lib/Style.h b/kcontrol/kfontinst/lib/Style.h
index 6f3e741..b245081 100644 (file)
--- a/kcontrol/kfontinst/lib/Style.h
+++ b/kcontrol/kfontinst/lib/Style.h
@@ -68,7 +68,7 @@ typedef QSet<Style> StyleCont;
 
 inline KDE_EXPORT uint qHash(const Style &key)
 {
-    return key.value() + uint(key.scalable());
+    return key.value();
 }
 
 }