summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-26 09:30:27 +0200
committerNoel Grandin <noel@peralex.com>2015-05-27 11:14:25 +0200
commit5ad3886ec8d3d465c956d99fab42fffda656392c (patch)
tree254005df19d464031ece341354107850df42970d /vcl/inc
parentc6dfe0545cca8dc5e40864fd90e0ffe0b6182578 (diff)
convert EXTTEXTINPUT constants to scoped enum
Change-Id: I1bb4ff2c13eaa2a9da3e32963ac0802e947e18d9
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/headless/svpframe.hxx2
-rw-r--r--vcl/inc/osx/salframe.h2
-rw-r--r--vcl/inc/salframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx4
-rw-r--r--vcl/inc/unx/i18n_ic.hxx4
-rw-r--r--vcl/inc/unx/salframe.h2
-rw-r--r--vcl/inc/win/salframe.h2
7 files changed, 10 insertions, 8 deletions
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index b07c2163794f..0598bf00158c 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -109,7 +109,7 @@ public:
virtual void Flush() SAL_OVERRIDE;
virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
- virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
virtual LanguageType GetInputLanguage() SAL_OVERRIDE;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index b030d3934ee5..69ff3a1bfc48 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -134,7 +134,7 @@ public:
virtual void Flush( const Rectangle& ) SAL_OVERRIDE;
virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
- virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
virtual LanguageType GetInputLanguage() SAL_OVERRIDE;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 84cd1f53567c..acdb9b4b2d5e 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -174,7 +174,7 @@ public:
virtual void Sync() = 0;
virtual void SetInputContext( SalInputContext* pContext ) = 0;
- virtual void EndExtTextInput( sal_uInt16 nFlags ) = 0;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) = 0;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index de8903e729c8..194a20dc9e4c 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -155,7 +155,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
void createIMContext();
void deleteIMContext();
void updateIMSpotLocation();
- void endExtTextInput( sal_uInt16 nFlags );
+ void endExtTextInput( EndExtTextInputFlags nFlags );
bool handleKeyEvent( GdkEventKey* pEvent );
void focusChanged( bool bFocusIn );
@@ -405,7 +405,7 @@ public:
virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
- virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 656a3f0d4c14..b76ce3e3d0de 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -23,6 +23,8 @@
#include <i18nlangtag/lang.h>
#include "i18n_cb.hxx"
+enum class EndExtTextInputFlags;
+
class SalI18N_InputContext
{
@@ -65,7 +67,7 @@ public:
void HandleDestroyIM();
int HandleKeyEvent( XKeyEvent *pEvent, SalFrame *pFrame ); // unused
- void EndExtTextInput( sal_uInt16 nFlags ); // unused
+ void EndExtTextInput( EndExtTextInputFlags nFlags ); // unused
int CommitStringCallback( sal_Unicode* pText, sal_Size nLength );
int CommitKeyEvent( sal_Unicode* pText, sal_Size nLength );
int UpdateSpotLocation();
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 9ead2aed89e1..cb5c2f26d139 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -243,7 +243,7 @@ public:
virtual void Flush() SAL_OVERRIDE;
virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
- virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
virtual LanguageType GetInputLanguage() SAL_OVERRIDE;
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 73f9e7010551..1fc3be065fee 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -115,7 +115,7 @@ public:
virtual void Flush() SAL_OVERRIDE;
virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
- virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
+ virtual void EndExtTextInput( EndExtTextInputFlags nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE;
virtual LanguageType GetInputLanguage() SAL_OVERRIDE;