[devhelp/wip/privatize-classes: 4/4] Make DhApp, DhAssistant and DhWindow private



commit 47b703106ff329237066a35d9621feae919dd631
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed May 3 13:01:04 2017 +0200

    Make DhApp, DhAssistant and DhWindow private
    
    DhApp is not re-usable. DhApp is a subclass of GtkApplication. An
    application can have only one GtkApplication instance, so DhApp in the
    current state doesn't make sense as a library.
    
    DhAssistant and DhWindow depend on DhApp, so they are not re-usable
    either, it was not possible to use them in another app.
    
    dh-app.h was not #included in devhelp.h.

 src/Makefile.am |   20 ++++++++++----------
 src/devhelp.h   |    2 --
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index eb45324..be24f61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,8 +52,6 @@ lib_LTLIBRARIES = libdevhelp-3.la
 
 libdevhelp_public_headers =            \
        devhelp.h                       \
-       dh-app.h                        \
-       dh-assistant.h                  \
        dh-assistant-view.h             \
        dh-book.h                       \
        dh-book-manager.h               \
@@ -61,12 +59,9 @@ libdevhelp_public_headers =          \
        dh-keyword-model.h              \
        dh-language.h                   \
        dh-link.h                       \
-       dh-sidebar.h                    \
-       dh-window.h
+       dh-sidebar.h
 
 libdevhelp_public_c_files =            \
-       dh-app.c                        \
-       dh-assistant.c                  \
        dh-assistant-view.c             \
        dh-book.c                       \
        dh-book-manager.c               \
@@ -75,22 +70,27 @@ libdevhelp_public_c_files =         \
        dh-keyword-model.c              \
        dh-language.c                   \
        dh-link.c                       \
-       dh-sidebar.c                    \
-       dh-window.c
+       dh-sidebar.c
 
 libdevhelp_private_headers =           \
+       dh-app.h                        \
+       dh-assistant.h                  \
        dh-error.h                      \
        dh-parser.h                     \
        dh-preferences.h                \
        dh-settings.h                   \
-       dh-util.h
+       dh-util.h                       \
+       dh-window.h
 
 libdevhelp_private_c_files =           \
+       dh-app.c                        \
+       dh-assistant.c                  \
        dh-error.c                      \
        dh-parser.c                     \
        dh-preferences.c                \
        dh-util.c                       \
-       dh-settings.c
+       dh-settings.c                   \
+       dh-window.c
 
 devhelpincludedir = $(includedir)/devhelp-3.0/devhelp
 devhelpinclude_HEADERS = $(libdevhelp_public_headers)
diff --git a/src/devhelp.h b/src/devhelp.h
index 156ebc9..ac1b967 100644
--- a/src/devhelp.h
+++ b/src/devhelp.h
@@ -22,7 +22,6 @@
 #include <glib.h>
 
 /* Explicitly include all the exported headers */
-#include "dh-assistant.h"
 #include "dh-assistant-view.h"
 #include "dh-book-manager.h"
 #include "dh-language.h"
@@ -31,7 +30,6 @@
 #include "dh-keyword-model.h"
 #include "dh-link.h"
 #include "dh-sidebar.h"
-#include "dh-window.h"
 
 G_BEGIN_DECLS
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]