[tepl] amtk: port remaining Tepl code to Amtk

[Sébastien Wilmet <swilmet src gnome org>]

commit 56ad7754d49481183e6a1b970c965b1afe60d7e1
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Jul 14 15:22:52 2017 +0200

    amtk: port remaining Tepl code to Amtk

 tepl/tepl-application-window-actions.c |    6 +++---
 tepl/tepl-application-window.c         |    2 +-
 tepl/tepl-application.c                |   17 +++++++----------
 tepl/tepl-application.h                |    2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/tepl/tepl-application-window-actions.c b/tepl/tepl-application-window-actions.c
index 260c02f..01c60e2 100644
--- a/tepl/tepl-application-window-actions.c
+++ b/tepl/tepl-application-window-actions.c
@@ -18,8 +18,8 @@
  */
 
 #include "tepl-application-window-actions.h"
+#include <amtk/amtk.h>
 #include "tepl-application-window.h"
-#include "tepl-action-map.h"
 #include "tepl-tab-group.h"
 #include "tepl-view.h"
 
@@ -116,7 +116,7 @@ _tepl_application_window_add_actions (TeplApplicationWindow *tepl_window)
         * application or other libraries.
         *
         * Do not forget to document each action in the TeplApplicationWindow
-        * class description, and to add the corresponding TeplActionInfoEntry
+        * class description, and to add the corresponding AmtkActionInfoEntry
         * in tepl-application.c.
         */
        const GActionEntry entries[] = {
@@ -129,7 +129,7 @@ _tepl_application_window_add_actions (TeplApplicationWindow *tepl_window)
 
        gtk_window = tepl_application_window_get_application_window (tepl_window);
 
-       tepl_action_map_add_action_entries_check_dups (G_ACTION_MAP (gtk_window),
+       amtk_action_map_add_action_entries_check_dups (G_ACTION_MAP (gtk_window),
                                                       entries,
                                                       G_N_ELEMENTS (entries),
                                                       tepl_window);
diff --git a/tepl/tepl-application-window.c b/tepl/tepl-application-window.c
index 44ea9f5..e633fee 100644
--- a/tepl/tepl-application-window.c
+++ b/tepl/tepl-application-window.c
@@ -45,7 +45,7 @@
  * - `"win.tepl-delete"`: calls tepl_view_delete_selection() on the active view.
  * - `"win.tepl-select-all"`: calls tepl_view_select_all() on the active view.
  *
- * Corresponding #TeplActionInfo's are available with
+ * Corresponding #AmtkActionInfo's are available with
  * tepl_application_get_tepl_action_info_store().
  */
 
diff --git a/tepl/tepl-application.c b/tepl/tepl-application.c
index 744859f..97fd888 100644
--- a/tepl/tepl-application.c
+++ b/tepl/tepl-application.c
@@ -20,14 +20,11 @@
 #include "config.h"
 #include "tepl-application.h"
 #include <glib/gi18n-lib.h>
-#include "tepl-action-info.h"
-#include "tepl-action-info-store.h"
 
 /**
  * SECTION:application
  * @Short_description: An extension of GtkApplication
  * @Title: TeplApplication
- * @See_also: #TeplActionInfoStore
  *
  * #TeplApplication extends the #GtkApplication class.
  *
@@ -41,7 +38,7 @@ struct _TeplApplicationPrivate
 {
        GtkApplication *gtk_app;
        AmtkActionInfoStore *app_action_info_store;
-       TeplActionInfoStore *tepl_action_info_store;
+       AmtkActionInfoStore *tepl_action_info_store;
 };
 
 enum
@@ -69,7 +66,7 @@ init_app_action_info_store (TeplApplication *tepl_app)
 static void
 init_tepl_action_info_store (TeplApplication *tepl_app)
 {
-       const TeplActionInfoEntry entries[] =
+       const AmtkActionInfoEntry entries[] =
        {
                /* action, icon, label, accel, tooltip */
 
@@ -92,9 +89,9 @@ init_tepl_action_info_store (TeplApplication *tepl_app)
        g_return_if_fail (tepl_app->priv->tepl_action_info_store == NULL);
        g_assert (tepl_app->priv->gtk_app != NULL);
 
-       tepl_app->priv->tepl_action_info_store = tepl_action_info_store_new (tepl_app->priv->gtk_app);
+       tepl_app->priv->tepl_action_info_store = amtk_action_info_store_new (tepl_app->priv->gtk_app);
 
-       tepl_action_info_store_add_entries (tepl_app->priv->tepl_action_info_store,
+       amtk_action_info_store_add_entries (tepl_app->priv->tepl_action_info_store,
                                            entries,
                                            G_N_ELEMENTS (entries),
                                            GETTEXT_PACKAGE);
@@ -286,14 +283,14 @@ tepl_application_get_app_action_info_store (TeplApplication *tepl_app)
  * tepl_application_get_tepl_action_info_store:
  * @tepl_app: a #TeplApplication.
  *
- * The returned #TeplActionInfoStore contains #TeplActionInfo's for all the
+ * The returned #AmtkActionInfoStore contains #AmtkActionInfo's for all the
  * #GAction's listed  in the [class description of
  * TeplApplicationWindow][tepl-application-window-gactions].
  *
- * Returns: (transfer none): the #TeplActionInfoStore of the Tepl library.
+ * Returns: (transfer none): the #AmtkActionInfoStore of the Tepl library.
  * Since: 3.0
  */
-TeplActionInfoStore *
+AmtkActionInfoStore *
 tepl_application_get_tepl_action_info_store (TeplApplication *tepl_app)
 {
        g_return_val_if_fail (TEPL_IS_APPLICATION (tepl_app), NULL);
diff --git a/tepl/tepl-application.h b/tepl/tepl-application.h
index 9b24753..d401a4f 100644
--- a/tepl/tepl-application.h
+++ b/tepl/tepl-application.h
@@ -64,7 +64,7 @@ GtkApplication *      tepl_application_get_application                (TeplApplication 
*tepl_app);
 
 AmtkActionInfoStore *  tepl_application_get_app_action_info_store      (TeplApplication *tepl_app);
 
-TeplActionInfoStore *  tepl_application_get_tepl_action_info_store     (TeplApplication *tepl_app);
+AmtkActionInfoStore *  tepl_application_get_tepl_action_info_store     (TeplApplication *tepl_app);
 
 void                   tepl_application_open_simple                    (TeplApplication *tepl_app,
                                                                         GFile           *file);