qulogic/talkatu

d6cca556175d
Parents b94b0d468ffb
Children b31d43a01132
Define TALKATU_COMPILATION instead of __GI_SCANNER__ guards

This patch removes __GI_SCANNER__ guards in favor of adding
TALKATU_COMPILATION to the gnome.generate_gir() call. Generating the
GIR is, in effect, part of the Talkatu compilation, so we can do this
for cleaner, fresher headers.
--- a/talkatu/meson.build Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/meson.build Fri Dec 14 13:14:21 2018 -0600
@@ -195,7 +195,8 @@
namespace : 'Talkatu',
symbol_prefix : 'talkatu',
nsversion : '@0@.0'.format(TALKATU_MAJOR_VERSION),
- extra_args : ['--quiet', '--warn-error', '--warn-all'],
+ extra_args : ['--quiet', '--warn-error', '--warn-all',
+ '-DTALKATU_COMPILATION'],
install : true)
endif
--- a/talkatu/talkatuactiongroup.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuactiongroup.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_ACTION_GROUP_H
#define TALKATU_ACTION_GROUP_H
--- a/talkatu/talkatubuffer.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatubuffer.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_BUFFER_H
#define TALKATU_BUFFER_H
--- a/talkatu/talkatucodeset.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatucodeset.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_CODESET_H
#define TALKATU_CODESET_H
--- a/talkatu/talkatucore.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatucore.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_CORE_H
#define TALKATU_CORE_H
--- a/talkatu/talkatueditor.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatueditor.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_EDITOR_H
#define TALKATU_EDITOR_H
--- a/talkatu/talkatuhistory.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuhistory.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_HISTORY_H
#define TALKATU_HISTORY_H
--- a/talkatu/talkatuhistorybuffer.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuhistorybuffer.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_HISTORY_BUFFER_H
#define TALKATU_HISTORY_BUFFER_H
--- a/talkatu/talkatuhtmlbuffer.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuhtmlbuffer.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_HTML_BUFFER_H
#define TALKATU_HTML_BUFFER_H
--- a/talkatu/talkatulinkdialog.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatulinkdialog.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_LINK_DIALOG_H
#define TALKATU_LINK_DIALOG_H
--- a/talkatu/talkatumarkdownbuffer.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatumarkdownbuffer.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_MARKDOWN_BUFFER_H
#define TALKATU_MARKDOWN_BUFFER_H
--- a/talkatu/talkatumarkup.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatumarkup.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_MARKUP_H
#define TALKATU_MARKUP_H
--- a/talkatu/talkatumenutoolbutton.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatumenutoolbutton.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_MENU_TOOL_BUTTON_H
#define TALKATU_MENU_TOOL_BUTTON_H
--- a/talkatu/talkatumessage.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatumessage.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_MESSAGE_H
#define TALKATU_MESSAGE_H
--- a/talkatu/talkatumessageactions.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatumessageactions.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_MESSAGE_ACTIONS_H
#define TALKATU_MESSAGE_ACTIONS_H
--- a/talkatu/talkatutag.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatutag.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_TAG_H
#define TALKATU_TAG_H
--- a/talkatu/talkatutagtable.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatutagtable.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_TAG_TABLE_H
#define TALKATU_TAG_TABLE_H
--- a/talkatu/talkatutoolbar.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatutoolbar.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_TOOLBAR_H
#define TALKATU_TOOLBAR_H
--- a/talkatu/talkatutooldrawer.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatutooldrawer.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_TOOL_DRAWER_H
#define TALKATU_TOOL_DRAWER_H
--- a/talkatu/talkatuversion.h.in Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuversion.h.in Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_VERSION_H
#define TALKATU_VERSION_H
--- a/talkatu/talkatuview.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuview.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_VIEW_H
#define TALKATU_VIEW_H
--- a/talkatu/talkatuwholebuffer.h Fri Dec 14 13:05:41 2018 -0600
+++ b/talkatu/talkatuwholebuffer.h Fri Dec 14 13:14:21 2018 -0600
@@ -16,11 +16,9 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GI_SCANNER__ /* hide this bit from g-ir-scanner */
#if !defined(TALKATU_GLOBAL_HEADER_INSIDE) && !defined(TALKATU_COMPILATION)
#error "only <talkatu.h> may be included directly"
#endif
-#endif /* __GI_SCANNER__ */
#ifndef TALKATU_WHOLE_BUFFER_H
#define TALKATU_WHOLE_BUFFER_H