qt4-moc: Add more Boost include guards to moc's definition list.

In preparation for updating Boost to 1.60, add include guards from more Boost
headers to the list of macros that moc automatically defines when processing
files. As explained in r408911, Qt4's moc cannot parse some constructs used by
a few Boost headers, so we define their include guards to make moc skip them.

This is a cleaner approach that allows us to largely revert r408472, r408473,
r408474, r408475, r408502, r408773 and r408419, which added several patches to
many ports to work around this moc bug.

PR:		199601
PR:		208322

6 files changed, 0 insertions, 80 deletions

diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp
deleted file mode 100644
index 2666a823c44d..000000000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/QGlib/connect.cpp.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/connect.cpp
-@@ -20,10 +20,13 @@
- #include <glib-object.h>
- #include <QtCore/QHash>
- #include <QtCore/QMutex>
-+
-+#ifndef Q_MOC_RUN
- #include <boost/multi_index_container.hpp>
- #include <boost/multi_index/sequenced_index.hpp>
- #include <boost/multi_index/ordered_index.hpp>
- #include <boost/multi_index/member.hpp>
-+#endif
- 
- namespace QGlib {
- namespace Private {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h
deleted file mode 100644
index 112f0a600fe1..000000000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connect.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/QGlib/connect.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/connect.h
-@@ -25,8 +25,11 @@
- #include <QtCore/QSharedPointer>
- #include <QtCore/QFlags>
- #include <QtCore/QHash>
-+
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #include <boost/utility/enable_if.hpp>
-+#endif
- 
- namespace QGlib {
- 
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h
deleted file mode 100644
index 5ef0f390a670..000000000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_connectimpl.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/QGlib/connectimpl.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/connectimpl.h
-@@ -26,7 +26,9 @@
- # include "refpointer.h"
- # include <QtCore/QList>
- # include <stdexcept>
-+#ifndef Q_MOC_RUN
- # include <boost/type_traits.hpp>
-+#endif
- 
- 
- namespace QGlib {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h
deleted file mode 100644
index b8a188fd20fe..000000000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_refpointer.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/QGlib/refpointer.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/refpointer.h
-@@ -23,8 +23,10 @@
- #include "type.h"
- #include "wrap.h"
- #include <cstddef>
-+#ifndef Q_MOC_RUN
- #include <boost/type_traits.hpp>
- #include <boost/utility/enable_if.hpp>
-+#endif
- #include <QtCore/QHash>
- 
- namespace QGlib {
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h
deleted file mode 100644
index 6be012c52c13..000000000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_type.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/QGlib/type.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/type.h
-@@ -21,7 +21,9 @@
- 
- #include "global.h"
- #include <QtCore/QList>
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/if.hpp>
-+#endif
- 
- /*
-  * This is a re-definition of GType inside the QGlib::Private namespace.
diff --git a/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h b/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h
deleted file mode 100644
index 1b4a6b12dbe5..000000000000
--- a/multimedia/gstreamer-qt4/files/patch-src_QGlib_value.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/QGlib/value.h.orig	2013-10-14 08:44:40 UTC
-+++ src/QGlib/value.h
-@@ -23,8 +23,10 @@
- #include "type.h"
- #include "refpointer.h"
- #include "error.h"
-+#ifndef Q_MOC_RUN
- #include <boost/mpl/if.hpp>
- #include <boost/type_traits.hpp>
-+#endif
- #include <stdexcept>
- #include <QtCore/QString>
- #include <QtCore/QDebug>