From 90efb2c0598d49130ada9195fd8ffa41ff4ece42 Mon Sep 17 00:00:00 2001
From: Denis Mingulov <denis.mingulov@gmail.com>
Date: Wed, 13 Oct 2010 14:02:49 +0200
Subject: [PATCH] Locator filter: Fix qHash - allow including QHash also
anywhere
Merge-request: 2182
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
src/plugins/locator/locatorwidget.cpp | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index 7ada35794f3..87759ff57e3 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -29,17 +29,10 @@
#include <qglobal.h>
-namespace Locator {
-struct FilterEntry;
-}
-
-QT_BEGIN_NAMESPACE
-unsigned int qHash(const Locator::FilterEntry &entry);
-QT_END_NAMESPACE
-
#include "locatorwidget.h"
#include "locatorplugin.h"
#include "locatorconstants.h"
+#include "ilocatorfilter.h"
#include <extensionsystem/pluginmanager.h>
#include <coreplugin/icore.h>
@@ -117,20 +110,18 @@ private:
};
} // namespace Internal
-} // namespace Locator
-
-using namespace Locator;
-using namespace Locator::Internal;
-QT_BEGIN_NAMESPACE
uint qHash(const FilterEntry &entry)
{
if (entry.internalData.canConvert(QVariant::String))
- return qHash(entry.internalData.toString());
- return qHash(entry.internalData.constData());
+ return QT_PREPEND_NAMESPACE(qHash)(entry.internalData.toString());
+ return QT_PREPEND_NAMESPACE(qHash)(entry.internalData.constData());
}
-QT_END_NAMESPACE
+} // namespace Locator
+
+using namespace Locator;
+using namespace Locator::Internal;
// =========== LocatorModel ===========
--
GitLab