diff options
Diffstat (limited to 'src/tinyb/BluetoothEvent.cpp')
-rw-r--r-- | src/tinyb/BluetoothEvent.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/tinyb/BluetoothEvent.cpp b/src/tinyb/BluetoothEvent.cpp index 10558edb..a92fa851 100644 --- a/src/tinyb/BluetoothEvent.cpp +++ b/src/tinyb/BluetoothEvent.cpp @@ -38,36 +38,36 @@ void BluetoothEvent::generic_callback(BluetoothObject &object, void *data) generic_data->notify(); } -BluetoothEvent::BluetoothEvent(BluetoothType type, std::string *name, - std::string *identifier, BluetoothObject *parent, bool execute_once, - BluetoothCallback cb, void *data) +BluetoothEvent::BluetoothEvent(BluetoothType type_, std::string *name_, + std::string *identifier_, BluetoothObject *parent_, bool execute_once_, + BluetoothCallback cb_, void *data_) { canceled = false; - this->type = type; - if (name != nullptr) - this->name = new std::string(*name); + this->type = type_; + if (name_ != nullptr) + this->name = new std::string(*name_); else this->name = nullptr; - if (identifier != nullptr) - this->identifier = new std::string(*identifier); + if (identifier_ != nullptr) + this->identifier = new std::string(*identifier_); else this->identifier = nullptr; - if (parent != nullptr) - this->parent = parent->clone(); + if (parent_ != nullptr) + this->parent = parent_->clone(); else this->parent = nullptr; - this->execute_once = execute_once; + this->execute_once = execute_once_; - if (cb == nullptr) { + if (cb_ == nullptr) { this->data = static_cast<void *>(&cv); this->cb = generic_callback; } else { - this->cb = cb; - this->data = data; + this->cb = cb_; + this->data = data_; } } |