diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2020-10-31 18:26:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 18:26:53 +0000 |
| commit | e0b03a045dc962c9b2a3729198bbe3350e7b164a (patch) | |
| tree | 9db96afcae36437bbeb029a47fd2cc70d3012afe | |
| parent | ee37269e0a69a3c05ff03c1cc5dfef6c5a483f8f (diff) | |
| parent | 0ab7221eec54063cb942e9b5c115e4c6f2116287 (diff) | |
Merge pull request #18691 from Rechi/fix/clang_tidy
[fix] revert ba15b9fcc3 python xbmc.Monitor changes
| -rw-r--r-- | xbmc/interfaces/legacy/Monitor.h | 20 | ||||
| -rw-r--r-- | xbmc/interfaces/python/PythonSwig.cpp.template | 1 |
2 files changed, 10 insertions, 11 deletions
diff --git a/xbmc/interfaces/legacy/Monitor.h b/xbmc/interfaces/legacy/Monitor.h index aae6168210..0d3d83115f 100644 --- a/xbmc/interfaces/legacy/Monitor.h +++ b/xbmc/interfaces/legacy/Monitor.h @@ -44,30 +44,30 @@ namespace XBMCAddon { XBMC_TRACE; invokeCallback( - new CallbackFunction<Monitor, const String&>(this, &Monitor::onScanStarted, library)); + new CallbackFunction<Monitor, const String>(this, &Monitor::onScanStarted, library)); } inline void OnScanFinished(const String &library) { XBMC_TRACE; invokeCallback( - new CallbackFunction<Monitor, const String&>(this, &Monitor::onScanFinished, library)); + new CallbackFunction<Monitor, const String>(this, &Monitor::onScanFinished, library)); } inline void OnCleanStarted(const String& library) { XBMC_TRACE; invokeCallback( - new CallbackFunction<Monitor, const String&>(this, &Monitor::onCleanStarted, library)); + new CallbackFunction<Monitor, const String>(this, &Monitor::onCleanStarted, library)); } inline void OnCleanFinished(const String& library) { XBMC_TRACE; invokeCallback( - new CallbackFunction<Monitor, const String&>(this, &Monitor::onCleanFinished, library)); + new CallbackFunction<Monitor, const String>(this, &Monitor::onCleanFinished, library)); } inline void OnNotification(const String& sender, const String& method, const String& data) { XBMC_TRACE; - invokeCallback(new CallbackFunction<Monitor, const String&, const String&, const String&>( + invokeCallback(new CallbackFunction<Monitor, const String, const String, const String>( this, &Monitor::onNotification, sender, method, data)); } @@ -163,7 +163,7 @@ namespace XBMCAddon /// onScanStarted(...); #else - virtual void onScanStarted(const String& library) { XBMC_TRACE; } + virtual void onScanStarted(const String library) { XBMC_TRACE; } #endif #ifdef DOXYGEN_SHOULD_USE_THIS @@ -184,7 +184,7 @@ namespace XBMCAddon /// onScanFinished(...); #else - virtual void onScanFinished(const String& library) { XBMC_TRACE; } + virtual void onScanFinished(const String library) { XBMC_TRACE; } #endif #ifdef DOXYGEN_SHOULD_USE_THIS @@ -205,7 +205,7 @@ namespace XBMCAddon /// onCleanStarted(...); #else - virtual void onCleanStarted(const String& library) { XBMC_TRACE; } + virtual void onCleanStarted(const String library) { XBMC_TRACE; } #endif #ifdef DOXYGEN_SHOULD_USE_THIS @@ -226,7 +226,7 @@ namespace XBMCAddon /// onCleanFinished(...); #else - virtual void onCleanFinished(const String& library) { XBMC_TRACE; } + virtual void onCleanFinished(const String library) { XBMC_TRACE; } #endif #ifdef DOXYGEN_SHOULD_USE_THIS @@ -247,7 +247,7 @@ namespace XBMCAddon /// onNotification(...); #else - virtual void onNotification(const String& sender, const String& method, const String& data) + virtual void onNotification(const String sender, const String method, const String data) { XBMC_TRACE; } diff --git a/xbmc/interfaces/python/PythonSwig.cpp.template b/xbmc/interfaces/python/PythonSwig.cpp.template index 3a241d64d9..1a46bad644 100644 --- a/xbmc/interfaces/python/PythonSwig.cpp.template +++ b/xbmc/interfaces/python/PythonSwig.cpp.template @@ -54,7 +54,6 @@ Helper.setup(this,classes, 'double': '${result} = PyFloat_FromDouble(${api});', 'float': '${result} = Py_BuildValue("f", ${api});', 'std::string' : new File('typemaps/python.string.outtm'), - 'r.q(const).XBMCAddon::String' : new File('typemaps/python.string.outtm'), 'p.q(const).char' : '${result} = PyUnicode_FromString(${api});', (Pattern.compile('''(p.){0,1}XbmcCommons::Buffer''')) : new File('typemaps/python.buffer.outtm'), (Pattern.compile('''std::shared_ptr<\\(.*\\)>''')) : new File('typemaps/python.smart_ptr.outtm'), |