diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2012-05-17 19:37:46 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-05-17 19:38:08 -0700 |
| commit | 86645b32e172301088517bfb860b2e0990b3e5ec (patch) | |
| tree | 3a085358e6a382074c7569b997a006f2765b7c73 /wildcard.cpp | |
| parent | 977c585f8be898e327221911b505da577619520a (diff) | |
Work towards getting function.h off of shared_ptr
Diffstat (limited to 'wildcard.cpp')
| -rw-r--r-- | wildcard.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wildcard.cpp b/wildcard.cpp index e9055f9b..e27efe59 100644 --- a/wildcard.cpp +++ b/wildcard.cpp @@ -204,7 +204,7 @@ static bool wildcard_complete_internal(const wcstring &orig, const wchar_t *wc, bool is_first, const wchar_t *desc, - const wchar_t *(*desc_func)(const wcstring &), + wcstring (*desc_func)(const wcstring &), std::vector<completion_t> &out, int flags ) { @@ -245,8 +245,8 @@ static bool wildcard_complete_internal(const wcstring &orig, it. If it returns something, use that as the description. */ - const wchar_t *func_desc = desc_func( orig ); - if( func_desc ) + wcstring func_desc = desc_func( orig ); + if (! func_desc.empty()) out_desc = func_desc; } @@ -300,7 +300,7 @@ static bool wildcard_complete_internal(const wcstring &orig, bool wildcard_complete(const wcstring &str, const wchar_t *wc, const wchar_t *desc, - const wchar_t *(*desc_func)(const wcstring &), + wcstring (*desc_func)(const wcstring &), std::vector<completion_t> &out, int flags ) { |