diff --git a/eek/eek-keyboard.h b/eek/eek-keyboard.h index ebf63351..9bc5e2e0 100644 --- a/eek/eek-keyboard.h +++ b/eek/eek-keyboard.h @@ -28,7 +28,6 @@ #include #include #include "eek-types.h" -#include "eek-layout.h" #include "src/layout.h" G_BEGIN_DECLS diff --git a/eek/eek-layout.c b/eek/eek-layout.c deleted file mode 100644 index ff4f96ca..00000000 --- a/eek/eek-layout.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2010-2011 Daiki Ueno - * Copyright (C) 2010-2011 Red Hat, Inc. - * - * 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 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. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - -/** - * SECTION:eek-layout - * @short_description: Base class of a layout engine - * - * The #EekLayout class is a base class of layout engine which - * arranges keyboard elements. - */ - -#include "config.h" - -#include "eek-layout.h" -#include "eek-keyboard.h" -#include "eekboard/eekboard-context-service.h" -#include "eek-xml-layout.h" - -G_DEFINE_ABSTRACT_TYPE (EekLayout, eek_layout, G_TYPE_OBJECT) - -static void -eek_layout_class_init (EekLayoutClass *klass) -{ - klass->create_keyboard = NULL; -} - -void -eek_layout_init (EekLayout *self) -{ -} diff --git a/eek/eek-layout.h b/eek/eek-layout.h deleted file mode 100644 index 480f1692..00000000 --- a/eek/eek-layout.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2010-2011 Daiki Ueno - * Copyright (C) 2010-2011 Red Hat, Inc. - * - * 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 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. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - -#if !defined(__EEK_H_INSIDE__) && !defined(EEK_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef EEK_LAYOUT_H -#define EEK_LAYOUT_H 1 - -#include -#include "eek-types.h" -#include "src/layout.h" - -G_BEGIN_DECLS - -#define EEK_TYPE_LAYOUT (eek_layout_get_type()) -G_DECLARE_DERIVABLE_TYPE (EekLayout, eek_layout, EEK, LAYOUT, GObject) - -/** - * EekLayoutClass: - * @create_keyboard: virtual function for creating a keyboard - */ -struct _EekLayoutClass -{ - /*< private >*/ - GObjectClass parent_class; - - /*< public >*/ - LevelKeyboard* (* create_keyboard) (EekboardContextService *manager, - EekLayout *self, - gdouble initial_width, - gdouble initial_height); - - /*< private >*/ - /* padding */ - gpointer pdummy[24]; -}; - -GType eek_layout_get_type (void) G_GNUC_CONST; - -G_END_DECLS -#endif /* EEK_LAYOUT_H */ diff --git a/eek/eek.h b/eek/eek.h index c1548121..5ba3d099 100644 --- a/eek/eek.h +++ b/eek/eek.h @@ -23,7 +23,6 @@ #define __EEK_H_INSIDE__ 1 #include "eek-keyboard.h" -#include "eek-layout.h" void eek_init (void); diff --git a/src/meson.build b/src/meson.build index 9763f647..ef317d37 100644 --- a/src/meson.build +++ b/src/meson.build @@ -19,7 +19,6 @@ sources = [ '../eek/eek-element.c', '../eek/eek-gtk-keyboard.c', '../eek/eek-keyboard.c', - '../eek/eek-layout.c', '../eek/eek-renderer.c', '../eek/eek-types.c', '../eek/eek-xml-layout.c',