X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fkeystrokelistener.h;h=ea2052ccae543e6d3eac68c11eeded7e86f251e4;hb=638c8a67ca492fdd3aa10b0e5fcf672ec27544e2;hp=7daca1583b1ac8e0d879868a47a9d5210112bbcc;hpb=e5a9e644107d0a366d8f4036fc8d363a4ff82255;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/keystrokelistener.h b/libspi/keystrokelistener.h
index 7daca15..ea2052c 100644
--- a/libspi/keystrokelistener.h
+++ b/libspi/keystrokelistener.h
@@ -20,46 +20,42 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef KEYSTROKE_LISTENER_H_
-#define KEYSTROKE_LISTENER_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#ifndef SPI_KEYSTROKE_LISTENER_H_
+#define SPI_KEYSTROKE_LISTENER_H_
 
 #include <bonobo/bonobo-object.h>
 #include <atk/atkobject.h>
 #include <libspi/Accessibility.h>
-#include "keymasks.h"
+#include <libspi/keymasks.h>
+
+G_BEGIN_DECLS
 
-#define KEYSTROKE_LISTENER_TYPE        (keystroke_listener_get_type ())
-#define KEYSTROKE_LISTENER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), KEYSTROKE_LISTENER_TYPE, KeystrokeListener))
-#define KEYSTROKE_LISTENER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), KEYSTROKE_LISTENER_TYPE, KeystrokeListenerClass))
-#define IS_KEYSTROKE_LISTENER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), KEYSTROKE_LISTENER_TYPE))
-#define IS_KEYSTROKE_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), KEYSTROKE_LISTENER_TYPE))
+#define SPI_KEYSTROKE_LISTENER_TYPE        (spi_keystroke_listener_get_type ())
+#define SPI_KEYSTROKE_LISTENER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_KEYSTROKE_LISTENER_TYPE, SpiKeystrokeListener))
+#define SPI_KEYSTROKE_LISTENER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_KEYSTROKE_LISTENER_TYPE, SpiKeystrokeListenerClass))
+#define IS_SPI_KEYSTROKE_LISTENER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_KEYSTROKE_LISTENER_TYPE))
+#define IS_SPI_KEYSTROKE_LISTENER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_KEYSTROKE_LISTENER_TYPE))
 
-typedef gboolean (*BooleanKeystrokeListenerCB) (void *keystroke_ptr);
+typedef gboolean (*BooleanKeystrokeListenerCB) (const void *keystroke_ptr);
 
 typedef struct {
         BonoboObject parent;
 	GList *callbacks;
-} KeystrokeListener;
+} SpiKeystrokeListener;
 
 typedef struct {
         BonoboObjectClass parent_class;
         POA_Accessibility_KeystrokeListener__epv epv;
-} KeystrokeListenerClass;
+} SpiKeystrokeListenerClass;
 
-GType               keystroke_listener_get_type   (void);
-KeystrokeListener  *keystroke_listener_new       (void);
-void   keystroke_listener_add_callback (KeystrokeListener *listener,
-                                        BooleanKeystrokeListenerCB callback);
-void   keystroke_listener_remove_callback (KeystrokeListener *listener,
-                                           BooleanKeystrokeListenerCB callback);
+GType                  spi_keystroke_listener_get_type        (void);
+SpiKeystrokeListener  *spi_keystroke_listener_new             (void);
+void                   spi_keystroke_listener_add_callback    (SpiKeystrokeListener *listener,
+							       BooleanKeystrokeListenerCB callback);
+void                   spi_keystroke_listener_remove_callback (SpiKeystrokeListener *listener,
+							       BooleanKeystrokeListenerCB callback);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* KEYSTROKE_LISTENER_H_ */
+#endif /* KEYSTROKE_SPI_LISTENER_H_ */