From ad7910dabd6cdbbb62fe4c8718f69e6c291a78cc Mon Sep 17 00:00:00 2001
From: Niels Ole Salscheider <niels_ole@salscheider-online.de>
Date: Mon, 4 Sep 2017 12:58:48 +0200
Subject: Generate QXmppGlobal from the build system

---
 src/base/QXmppGlobal.cpp  | 34 ---------------------------
 src/base/QXmppGlobal.h    | 59 -----------------------------------------------
 src/base/QXmppGlobal.h.in | 56 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 93 deletions(-)
 delete mode 100644 src/base/QXmppGlobal.cpp
 delete mode 100644 src/base/QXmppGlobal.h
 create mode 100644 src/base/QXmppGlobal.h.in

(limited to 'src/base')

diff --git a/src/base/QXmppGlobal.cpp b/src/base/QXmppGlobal.cpp
deleted file mode 100644
index a0d9ce89..00000000
--- a/src/base/QXmppGlobal.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008-2014 The QXmpp developers
- *
- * Author:
- *  Manjeet Dahiya
- *
- * Source:
- *  https://github.com/qxmpp-project/qxmpp
- *
- * This file is a part of QXmpp library.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- */
-
-
-#include "QXmppGlobal.h"
-
-QString QXmppVersion()
-{
-    return QString("%1.%2.%3").arg(
-        QString::number((QXMPP_VERSION >> 16) & 0xff),
-        QString::number((QXMPP_VERSION >> 8) & 0xff),
-        QString::number(QXMPP_VERSION & 0xff));
-}
-
diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
deleted file mode 100644
index 8024ce73..00000000
--- a/src/base/QXmppGlobal.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2008-2014 The QXmpp developers
- *
- * Author:
- *  Manjeet Dahiya
- *
- * Source:
- *  https://github.com/qxmpp-project/qxmpp
- *
- * This file is a part of QXmpp library.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- */
-
-
-#ifndef QXMPPGLOBAL_H
-#define QXMPPGLOBAL_H
-
-#include <QString>
-
-#if defined(QXMPP_STATIC)
-#  define QXMPP_EXPORT
-#else
-#  if defined(QXMPP_BUILD)
-#    define QXMPP_EXPORT Q_DECL_EXPORT
-#  else
-#    define QXMPP_EXPORT Q_DECL_IMPORT
-#  endif
-#endif
-
-#if defined(QXMPP_AUTOTEST_INTERNAL)
-#    define QXMPP_AUTOTEST_EXPORT QXMPP_EXPORT
-#else
-#    define QXMPP_AUTOTEST_EXPORT
-#endif
-
-/// This macro expands a numeric value of the form 0xMMNNPP (MM =
-/// major, NN = minor, PP = patch) that specifies QXmpp's version
-/// number. For example, if you compile your application against
-/// QXmpp 1.2.3, the QXMPP_VERSION macro will expand to 0x010203.
-///
-/// You can use QXMPP_VERSION to use the latest QXmpp features where
-/// available.
-///
-
-#define QXMPP_VERSION 0x000903
-
-QXMPP_EXPORT QString QXmppVersion();
-
-#endif //QXMPPGLOBAL_H
diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in
new file mode 100644
index 00000000..80ba8375
--- /dev/null
+++ b/src/base/QXmppGlobal.h.in
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2008-2017 The QXmpp developers
+ *
+ * Author:
+ *  Manjeet Dahiya
+ *  Niels Ole Salscheider
+ *
+ * Source:
+ *  https://github.com/qxmpp-project/qxmpp
+ *
+ * This file is a part of QXmpp library.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
+
+
+#ifndef QXMPPGLOBAL_H
+#define QXMPPGLOBAL_H
+
+#include <QString>
+
+#if defined(QXMPP_BUILD)
+#    define QXMPP_EXPORT Q_DECL_EXPORT
+#else
+#    define QXMPP_EXPORT Q_DECL_IMPORT
+#endif
+
+#define QXMPP_AUTOTEST_EXPORT
+
+/// This macro expands a numeric value of the form 0xMMNNPP (MM =
+/// major, NN = minor, PP = patch) that specifies QXmpp's version
+/// number. For example, if you compile your application against
+/// QXmpp 1.2.3, the QXMPP_VERSION macro will expand to 0x010203.
+///
+/// You can use QXMPP_VERSION to use the latest QXmpp features where
+/// available.
+///
+
+#define QXMPP_VERSION (0x@VERSION_MAJOR@ << 16) | (0x@VERSION_MINOR@ << 8) | 0x@VERSION_PATCH@
+
+inline QLatin1String QXmppVersion()
+{
+    return QLatin1String("@VERSION_STRING@");
+}
+
+#endif //QXMPPGLOBAL_H
+
-- 
cgit v1.2.3