summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-10 02:27:40 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-10 02:27:40 +0200
commita66bc0aadc27a44bbd4cd61a0c1b3ddeb5f2dfbb (patch)
tree794baa9dabd5602eb961df3cc0e4892698ff0aa6
parentfae501da675f828eac939dbb991f9c1d57dc7d50 (diff)
downloaddbus-1-tqt-a66bc0aa.tar.gz
dbus-1-tqt-a66bc0aa.zip
Fix FTBFS on explicit specialization of 'm_keyType' after instantiation
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--tqdbusdata.cpp65
1 files changed, 32 insertions, 33 deletions
diff --git a/tqdbusdata.cpp b/tqdbusdata.cpp
index 0afa7e8..629df57 100644
--- a/tqdbusdata.cpp
+++ b/tqdbusdata.cpp
@@ -141,6 +141,38 @@ public:
} value;
};
+// key type definitions for TQT_DBusDataMap
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT8>::m_keyType = TQT_DBusData::Byte;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_INT16>::m_keyType = TQT_DBusData::Int16;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT16>::m_keyType = TQT_DBusData::UInt16;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_INT32>::m_keyType = TQT_DBusData::Int32;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT32>::m_keyType = TQT_DBusData::UInt32;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_INT64>::m_keyType = TQT_DBusData::Int64;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT64>::m_keyType = TQT_DBusData::UInt64;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQString>::m_keyType = TQT_DBusData::String;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQT_DBusObjectPath>::m_keyType = TQT_DBusData::ObjectPath;
+
+template <>
+const TQT_DBusData::Type TQT_DBusDataMap<TQT_DBusUnixFd>::m_keyType = TQT_DBusData::UnixFd;
+
+
TQT_DBusData::TQT_DBusData() : d(new Private())
{
}
@@ -1087,36 +1119,3 @@ TQCString TQT_DBusData::buildDBusSignature() const
return signature;
}
-
-
-// key type definitions for TQT_DBusDataMap
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT8>::m_keyType = TQT_DBusData::Byte;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_INT16>::m_keyType = TQT_DBusData::Int16;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT16>::m_keyType = TQT_DBusData::UInt16;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_INT32>::m_keyType = TQT_DBusData::Int32;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT32>::m_keyType = TQT_DBusData::UInt32;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_INT64>::m_keyType = TQT_DBusData::Int64;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQ_UINT64>::m_keyType = TQT_DBusData::UInt64;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQString>::m_keyType = TQT_DBusData::String;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQT_DBusObjectPath>::m_keyType =
- TQT_DBusData::ObjectPath;
-
-template <>
-const TQT_DBusData::Type TQT_DBusDataMap<TQT_DBusUnixFd>::m_keyType = TQT_DBusData::UnixFd;