summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-06 15:49:32 +0200
committerNoel Grandin <noel@peralex.com>2013-08-12 11:56:43 +0200
commited55bea114561e3fbcbd472964527ccddcb34af2 (patch)
tree6ff83d91b8ff7880ae36da498b0b53d98a219bc9 /include/vcl
parent4c3cfe059057f403de3de8889ddead963e4b6952 (diff)
convert vcl mnemonicengine.hxx and quickselectionengine.hxx
.. from String to OUString. These 2 API's are tied together, necessitating their conversion in one step. Change-Id: Ibcc05d8d3617253adf49edb4a244542d32b38224
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/mnemonicengine.hxx6
-rw-r--r--include/vcl/quickselectionengine.hxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/mnemonicengine.hxx b/include/vcl/mnemonicengine.hxx
index e1def2d8d98e..e72fe276db86 100644
--- a/include/vcl/mnemonicengine.hxx
+++ b/include/vcl/mnemonicengine.hxx
@@ -24,10 +24,10 @@
#include <sal/config.h>
#include <sal/types.h>
+#include <rtl/ustring.hxx>
#include <memory>
-class String;
class KeyEvent;
//........................................................................
@@ -51,7 +51,7 @@ namespace vcl
If this value is <NULL/>, searching stops.
*/
- virtual const void* FirstSearchEntry( String& _rEntryText ) const = 0;
+ virtual const void* FirstSearchEntry( OUString& _rEntryText ) const = 0;
/** returns the next list entry for the mnemonic search
@@ -66,7 +66,7 @@ namespace vcl
to <member>FirstSearchEntry</member> (i.e. you cycled
around), then searching stops, too.
*/
- virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const = 0;
+ virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, OUString& _rEntryText ) const = 0;
/** "selects" a given entry.
diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx
index 631f0c40aa95..3bfa7a9e34d4 100644
--- a/include/vcl/quickselectionengine.hxx
+++ b/include/vcl/quickselectionengine.hxx
@@ -46,14 +46,14 @@ namespace vcl
Search operations will start with this entry.
*/
- virtual StringEntryIdentifier CurrentEntry( String& _out_entryText ) const = 0;
+ virtual StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const = 0;
/** returns the next entry in the list.
The implementation is expected to wrap around. That is, if the given entry denotes the last
entry in the list, then NextEntry should return the first entry.
*/
- virtual StringEntryIdentifier NextEntry( StringEntryIdentifier _currentEntry, String& _out_entryText ) const = 0;
+ virtual StringEntryIdentifier NextEntry( StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const = 0;
/** selects a given entry
*/