introduce name space

Change-Id: I38aee0ccbf98258361334138e825a63e4f4f2cdc
Reviewed-by: Kranthi Kuntala <kranthi.kumar-kuntala@nokia.com>

7 files changed, 31 insertions, 21 deletions

diff --git a/src/alignedtimer/qalignedtimer.cpp b/src/alignedtimer/qalignedtimer.cpp
index e329e86..5c644f6 100644
--- a/src/alignedtimer/qalignedtimer.cpp
+++ b/src/alignedtimer/qalignedtimer.cpp
@@ -46,7 +46,7 @@
 #else
 #include "qalignedtimer_stub_p.h"
 #endif
-QT_BEGIN_NAMESPACE
+QTALIGNEDTIMER_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QAlignedTimerPrivate, alignedTimerPrivate)
 
@@ -93,7 +93,6 @@ QAlignedTimer::QAlignedTimer(QObject *parent)
 {
     d = new QAlignedTimerPrivate(this);
     connect(d, SIGNAL(timeout()), this, SIGNAL(timeout()));
-    connect(d, SIGNAL(error(QAlignedTimer::AlignedTimerError)), this, SIGNAL(error(QAlignedTimer::AlignedTimerError)));
 }
 
 /*!
@@ -268,4 +267,6 @@ bool QAlignedTimer::isActive () const
     return d->isActive();
 }
 
-QT_END_NAMESPACE
+#include "moc_qalignedtimer.cpp"
+
+QTALIGNEDTIMER_END_NAMESPACE
diff --git a/src/alignedtimer/qalignedtimer.h b/src/alignedtimer/qalignedtimer.h
index 1c94e08..9bdf797 100644
--- a/src/alignedtimer/qalignedtimer.h
+++ b/src/alignedtimer/qalignedtimer.h
@@ -43,13 +43,13 @@
 #define QALIGNEDTIMER_H
 
 #include <QObject>
+#include "qalignedtimerglobal.h"
 
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
+QTALIGNEDTIMER_BEGIN_NAMESPACE
 
 class QAlignedTimerPrivate;
 
-class Q_CORE_EXPORT QAlignedTimer : public QObject
+class Q_ALIGNEDTIMER_EXPORT QAlignedTimer : public QObject
 {
     Q_OBJECT
 
@@ -98,7 +98,6 @@ private:
     QAlignedTimerPrivate *d;
 };
 
-QT_END_NAMESPACE
-QT_END_HEADER
+QTALIGNEDTIMER_END_NAMESPACE
 
 #endif // QALIGNEDTIMER_H
diff --git a/src/alignedtimer/qalignedtimer_stub.cpp b/src/alignedtimer/qalignedtimer_stub.cpp
index 46ef949..5d71636 100644
--- a/src/alignedtimer/qalignedtimer_stub.cpp
+++ b/src/alignedtimer/qalignedtimer_stub.cpp
@@ -42,7 +42,7 @@
 #include "qalignedtimer.h"
 #include "qalignedtimer_stub_p.h"
 
-QT_BEGIN_NAMESPACE
+QTALIGNEDTIMER_BEGIN_NAMESPACE
 
 QAlignedTimerPrivate::QAlignedTimerPrivate(QObject *parent)
     : QObject(parent)
@@ -119,4 +119,6 @@ bool QAlignedTimerPrivate::isActive () const
     return false;
 }
 
-QT_END_NAMESPACE
+#include "moc_qalignedtimer_stub_p.cpp"
+
+QTALIGNEDTIMER_END_NAMESPACE
diff --git a/src/alignedtimer/qalignedtimer_stub_p.h b/src/alignedtimer/qalignedtimer_stub_p.h
index dc62c05..b3f7c92 100644
--- a/src/alignedtimer/qalignedtimer_stub_p.h
+++ b/src/alignedtimer/qalignedtimer_stub_p.h
@@ -43,9 +43,9 @@
 #define QALIGNEDTIMER_STUB_P_H
 
 #include "qalignedtimer.h"
+#include "qalignedtimerglobal.h"
 
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
+QTALIGNEDTIMER_BEGIN_NAMESPACE
 
 class QAlignedTimerPrivate : public QObject
 {
@@ -81,7 +81,6 @@ public Q_SLOTS:
     void stop();
 };
 
-QT_END_NAMESPACE
-QT_END_HEADER
+QTALIGNEDTIMER_END_NAMESPACE
 
 #endif // QALIGNEDTIMER_STUB_P_H
diff --git a/src/alignedtimer/qalignedtimer_systemhb.cpp b/src/alignedtimer/qalignedtimer_systemhb.cpp
index 001a77d..668f2dd 100644
--- a/src/alignedtimer/qalignedtimer_systemhb.cpp
+++ b/src/alignedtimer/qalignedtimer_systemhb.cpp
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-QT_BEGIN_NAMESPACE
+QTALIGNEDTIMER_BEGIN_NAMESPACE
 
 QAlignedTimerPrivate::QAlignedTimerPrivate(QObject *parent)
     : QObject(parent)
@@ -58,7 +58,7 @@ QAlignedTimerPrivate::QAlignedTimerPrivate(QObject *parent)
     , m_systemhbdHandler(0)
     , m_notifier(0)
 {
-    m_systemhbdHandler = systemhb_open(0);
+    m_systemhbdHandler = systemhb_open();
 
     if (!m_systemhbdHandler) {
         m_lastError = QAlignedTimer::InternalError;
@@ -228,4 +228,6 @@ bool QAlignedTimerPrivate::isActive() const
     return m_running;
 }
 
-QT_END_NAMESPACE
+#include "moc_qalignedtimer_systemhb_p.cpp"
+
+QTALIGNEDTIMER_END_NAMESPACE
diff --git a/src/alignedtimer/qalignedtimer_systemhb_p.h b/src/alignedtimer/qalignedtimer_systemhb_p.h
index f5f83e1..6cb36c7 100644
--- a/src/alignedtimer/qalignedtimer_systemhb_p.h
+++ b/src/alignedtimer/qalignedtimer_systemhb_p.h
@@ -43,6 +43,7 @@
 #define QALIGNEDTIMER_SYSTEMHB_P_H
 
 #include "qalignedtimer.h"
+#include "qalignedtimerglobal.h"
 
 #include <QSocketNotifier>
 
@@ -50,8 +51,7 @@ extern "C" {
 #include <systemhb/libsystemhb.h>
 }
 
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
+QTALIGNEDTIMER_BEGIN_NAMESPACE
 
 class QAlignedTimerPrivate : public QObject
 {
@@ -99,7 +99,6 @@ private Q_SLOTS:
     void heartbeatReceived(int sock);
 };
 
-QT_END_NAMESPACE
-QT_END_HEADER
+QTALIGNEDTIMER_END_NAMESPACE
 
 #endif // QALIGNEDTIMER_SYSTEMHB_P_H
diff --git a/src/alignedtimer/qalignedtimerglobal.h b/src/alignedtimer/qalignedtimerglobal.h
index 22dbb0c..efeaa15 100644
--- a/src/alignedtimer/qalignedtimerglobal.h
+++ b/src/alignedtimer/qalignedtimerglobal.h
@@ -56,6 +56,14 @@
 #  define QTALIGNEDTIMER_USE_NAMESPACE using namespace QtAlignedTimer;
 #endif
 
+#if !defined(Q_ALIGNEDTIMER_EXPORT)
+#  if defined(QT_SHARED)
+#    define Q_ALIGNEDTIMER_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_ALIGNEDTIMER_EXPORT
+#  endif
+#endif
+
 #define QTALIGNEDTIMER_VERSION_NAME "org.qt-project.Qt.alignedtimer.api.version"
 #define QTALIGNEDTIMER_IMPLEMENTATION_VERSION_NAME "org.qt-project.Qt.alignedtimer.implementation.version"
 #define QTALIGNEDTIMER_VERSION 1