[vte] lib: Remove private header
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] lib: Remove private header
- Date: Fri, 5 Feb 2016 18:50:56 +0000 (UTC)
commit a7c9910df445b3b97fe670bbaa6465d362a390f7
Author: Christian Persch <chpe gnome org>
Date: Fri Feb 5 19:50:30 2016 +0100
lib: Remove private header
Don't need more than one private header, so remove vte-private.h.
doc/reference/Makefile.am | 3 +-
src/Makefile.am | 1 -
src/vte-private.h | 73 ---------------------------------------------
src/vte.cc | 19 ++++++++++-
src/vteaccess.cc | 2 +-
src/vteconv.cc | 7 +----
src/vtedraw.cc | 24 +++++++++++----
src/vtegtk.cc | 2 -
src/vteinternal.hh | 13 ++++++++
src/vterowdata.h | 2 +-
src/vteseq.cc | 7 ++--
11 files changed, 56 insertions(+), 97 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 42b0e91..4f759e9 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -92,8 +92,7 @@ IGNORE_HFILES = \
trie.h \
vteconv.h \
vtedraw.h \
- vteint.h \
- vte-private.h \
+ vteinternal.hh \
vterowdata.h \
vteseq-list.h \
vtestream-base.h \
diff --git a/src/Makefile.am b/src/Makefile.am
index 19fe7ba..8dcf170 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,6 @@ libvte_ VTE_API_MAJOR_VERSION@_ VTE_API_MINOR_VERSION@_la_SOURCES = \
table.cc \
table.h \
vte.cc \
- vte-private.h \
vteaccess.cc \
vteaccess.h \
vteconv.cc \
diff --git a/src/vte.cc b/src/vte.cc
index 16da473..989853e 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -20,11 +20,26 @@
#include <config.h>
#include <math.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
+#ifdef HAVE_SYS_TERMIOS_H
+#include <sys/termios.h>
+#endif
#include <glib.h>
+#include <glib/gi18n-lib.h>
#include <vte/vte.h>
-#include "vte-private.h"
+#include "vteinternal.hh"
+#include "buffer.h"
+#include "debug.h"
+#include "vteconv.h"
+#include "vtedraw.hh"
+#include "ring.h"
+#include "caps.h"
#ifdef HAVE_WCHAR_H
#include <wchar.h>
@@ -5926,7 +5941,7 @@ VteTerminalPrivate::widget_clipboard_requested(GtkClipboard *target_clipboard,
}
}
-/* Convert the internal color code (either index or RGB, see vte-private.h) into RGB. */
+/* Convert the internal color code (either index or RGB) into RGB. */
void
VteTerminalPrivate::rgb_from_index(guint index,
vte::color::rgb& color) const
diff --git a/src/vteaccess.cc b/src/vteaccess.cc
index 9c2ced8..31eaec1 100644
--- a/src/vteaccess.cc
+++ b/src/vteaccess.cc
@@ -33,7 +33,7 @@
#include "debug.h"
#include <vte/vte.h>
#include "vteaccess.h"
-#include "vte-private.h"
+#include "vteinternal.hh"
#ifdef HAVE_LOCALE_H
#include <locale.h>
diff --git a/src/vteconv.cc b/src/vteconv.cc
index d0f2fe6..b78d392 100644
--- a/src/vteconv.cc
+++ b/src/vteconv.cc
@@ -26,12 +26,7 @@
#include <glib.h>
#include "buffer.h"
#include "vteconv.h"
-
-#ifdef VTE_COMPILATION
-#include "vte-private.h"
-#else
-#define VTE_UTF8_BPC (6) /* Maximum number of bytes used per UTF-8 character */
-#endif
+#include "vtedefines.hh"
typedef size_t (*convert_func)(GIConv converter,
const guchar **inbuf,
diff --git a/src/vtedraw.cc b/src/vtedraw.cc
index 026a887..ba2755e 100644
--- a/src/vtedraw.cc
+++ b/src/vtedraw.cc
@@ -16,16 +16,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
-#include <config.h>
-
-#include <sys/param.h>
+#include <math.h>
+#include <stdlib.h>
#include <string.h>
-#include <gtk/gtk.h>
+#include <sys/param.h>
+
#include <glib.h>
-#include "debug.h"
+#include <gtk/gtk.h>
+
#include "vtedraw.hh"
-#include "vte-private.h"
+#include "vtedefines.hh"
+#include "debug.h"
#include <pango/pangocairo.h>
@@ -39,6 +42,15 @@
"{|}~" \
""
+static inline bool
+_vte_double_equal(double a,
+ double b)
+{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+ return a == b;
+#pragma GCC diagnostic pop
+}
/* Overview:
*
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 421dac6..a5662d9 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -55,8 +55,6 @@
#include "vtegtk.hh"
-#include "vte-private.h"
-
#if !GLIB_CHECK_VERSION(2, 42, 0)
#define G_PARAM_EXPLICIT_NOTIFY 0
#endif
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index f871a37..adbb853 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -20,6 +20,7 @@
#include <glib.h>
+#include "vtedefines.hh"
#include "vtetypes.hh"
#include "ring.h"
#include "vteconv.h"
@@ -1228,3 +1229,15 @@ public:
};
extern GTimer *process_timer;
+
+VteTerminalPrivate *_vte_terminal_get_impl(VteTerminal *terminal);
+
+static inline bool
+_vte_double_equal(double a,
+ double b)
+{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+ return a == b;
+#pragma GCC diagnostic pop
+}
diff --git a/src/vterowdata.h b/src/vterowdata.h
index 447410f..78bc73b 100644
--- a/src/vterowdata.h
+++ b/src/vterowdata.h
@@ -57,7 +57,7 @@ typedef struct _VteCellAttr {
guint64 italic: 1;
guint64 fore: 25; /* Index into color palette, or direct RGB, */
/* 4-byte boundary */
- guint64 back: 25; /* see vte-private.h */
+ guint64 back: 25; /* see vtedefines.hh */
guint64 underline: 1;
guint64 strikethrough: 1;
diff --git a/src/vteseq.cc b/src/vteseq.cc
index 0b61f6e..86998a6 100644
--- a/src/vteseq.cc
+++ b/src/vteseq.cc
@@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
-#include <config.h>
-
+#include <string.h>
#include <limits.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
@@ -27,9 +27,10 @@
#include <glib.h>
#include <vte/vte.h>
-#include "vte-private.h"
#include "vteinternal.hh"
#include "vtegtk.hh"
+#include "caps.h"
+#include "debug.h"
#define BEL "\007"
#define ST _VTE_CAP_ST
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]