Remove the "registerNdefMessageHandler" template function and doc fixes

Too much syntactic sugar and qdoc has problems recognising it as well.

Change-Id: I99f482426f537a8d3c0099edc3c393676424afec
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

2 files changed, 1 insertions, 12 deletions

diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp
index 1790187c..a1673def 100644
--- a/src/nfc/qndefrecord.cpp
+++ b/src/nfc/qndefrecord.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
     QNdefRecord and derived classes are used to parse the contents of
     \l {QNdefMessage}{NDEF messages} and create new NDEF messages.
 
-    Use typeNameFormat(), userTypeNameFormat(), setTypeNameFormat() and setUserTypeNameFormat() to
+    Use typeNameFormat() and setTypeNameFormat() to
     get and set the type name format of the NDEF record.
 
     Use type() and setType() to get and set the type of the NDEF record.
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index b690c2e2..0e91abcc 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -78,8 +78,6 @@ public:
     bool startTargetDetection();
     void stopTargetDetection();
 
-    template<typename T>
-    int registerNdefMessageHandler(QObject *object, const char *method);
     int registerNdefMessageHandler(QObject *object, const char *method);
     int registerNdefMessageHandler(QNdefRecord::TypeNameFormat typeNameFormat,
                                    const QByteArray &type,
@@ -97,15 +95,6 @@ private:
     QNearFieldManagerPrivate *d_ptr;
 };
 
-template<typename T>
-int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *method)
-{
-    T record;
-
-    return registerNdefMessageHandler(record.userTypeNameFormat(), record.type(),
-                                         object, method);
-}
-
 Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldManager::TargetAccessModes)
 
 QT_END_NAMESPACE