summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2013-05-30 20:30:28 +0300
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2013-06-07 14:46:23 +0300
commita07b97b3abe235ad8a98fb6577b9721cb36d8721 (patch)
treed05916040c30219acd471c68371bdf9a76421d27
parent2b01b283ced8b9d5da9d6b1c940103400fa8d8a8 (diff)
Rename signal.h to qglib_signal.h to avoid it being used instead of the system's signal.h
This is a problem that appears on windows builds
-rw-r--r--src/QGlib/CMakeLists.txt2
-rw-r--r--src/QGlib/Signal2
-rw-r--r--src/QGlib/gen.cpp2
-rw-r--r--src/QGlib/qglib_signal.h (renamed from src/QGlib/signal.h)2
-rw-r--r--src/QGlib/signal.cpp2
-rw-r--r--src/QGst/Ui/graphicsvideowidget.cpp2
-rw-r--r--src/QGst/Ui/videowidget.cpp2
-rw-r--r--src/QGst/bus.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/QGlib/CMakeLists.txt b/src/QGlib/CMakeLists.txt
index 71850b1..5ee1809 100644
--- a/src/QGlib/CMakeLists.txt
+++ b/src/QGlib/CMakeLists.txt
@@ -22,7 +22,7 @@ set(QtGLib_INSTALLED_HEADERS
paramspec.h ParamSpec
object.h Object
value.h Value
- signal.h Signal
+ qglib_signal.h Signal
emitimpl.h
connect.h Connect
connectimpl.h
diff --git a/src/QGlib/Signal b/src/QGlib/Signal
index d0e5cf6..e9b59c3 100644
--- a/src/QGlib/Signal
+++ b/src/QGlib/Signal
@@ -1 +1 @@
-#include "signal.h"
+#include "qglib_signal.h"
diff --git a/src/QGlib/gen.cpp b/src/QGlib/gen.cpp
index 9ef9920..7a972ac 100644
--- a/src/QGlib/gen.cpp
+++ b/src/QGlib/gen.cpp
@@ -29,7 +29,7 @@
#include <glib-object.h>
#include "QGlib/string_p.h"
-#include "QGlib/signal.h"
+#include "QGlib/qglib_signal.h"
namespace QGlib {
BOOST_STATIC_ASSERT(static_cast<int>(Signal::RunFirst) == static_cast<int>(G_SIGNAL_RUN_FIRST));
diff --git a/src/QGlib/signal.h b/src/QGlib/qglib_signal.h
index 523b53c..b317897 100644
--- a/src/QGlib/signal.h
+++ b/src/QGlib/qglib_signal.h
@@ -41,7 +41,7 @@
namespace QGlib {
-/*! \headerfile signal.h <QGlib/Signal>
+/*! \headerfile qglib_signal.h <QGlib/Signal>
* \brief Helper class providing introspection of GObject signals
*
* Signals are a generic notification mechanism. Each signal is bound to a
diff --git a/src/QGlib/signal.cpp b/src/QGlib/signal.cpp
index 4138a88..db3b5fc 100644
--- a/src/QGlib/signal.cpp
+++ b/src/QGlib/signal.cpp
@@ -16,7 +16,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "signal.h"
+#include "qglib_signal.h"
#include "quark.h"
#include <glib-object.h>
#include <QtCore/QStringList>
diff --git a/src/QGst/Ui/graphicsvideowidget.cpp b/src/QGst/Ui/graphicsvideowidget.cpp
index 9275404..37f2eea 100644
--- a/src/QGst/Ui/graphicsvideowidget.cpp
+++ b/src/QGst/Ui/graphicsvideowidget.cpp
@@ -17,7 +17,7 @@
*/
#include "graphicsvideowidget.h"
#include "graphicsvideosurface_p.h"
-#include "../../QGlib/signal.h"
+#include "../../QGlib/Signal"
namespace QGst {
namespace Ui {
diff --git a/src/QGst/Ui/videowidget.cpp b/src/QGst/Ui/videowidget.cpp
index 73fd61b..fcdd2e1 100644
--- a/src/QGst/Ui/videowidget.cpp
+++ b/src/QGst/Ui/videowidget.cpp
@@ -22,7 +22,7 @@
#include "../bus.h"
#include "../message.h"
#include "../../QGlib/connect.h"
-#include "../../QGlib/signal.h"
+#include "../../QGlib/Signal"
#include <QtCore/QDebug>
#include <QtCore/QMutex>
#include <QtCore/QThread>
diff --git a/src/QGst/bus.cpp b/src/QGst/bus.cpp
index 199f905..2e04059 100644
--- a/src/QGst/bus.cpp
+++ b/src/QGst/bus.cpp
@@ -16,7 +16,7 @@
*/
#include "bus.h"
#include "message.h"
-#include "../QGlib/signal.h"
+#include "../QGlib/Signal"
#include <gst/gst.h>
#include <QtCore/QObject>
#include <QtCore/QTimerEvent>