Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Type to Kind.

Browse Source
This commit is contained in:
Peter Johnson
2016-11-15 23:54:50 -08:00
parent 3c7d8063f6
commit 791cabbc26
25 changed files with 265 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CvSourceImpl.h
View File

@@ -37,11 +37,11 @@ class CvSourceImpl : public SourceImpl {
void PutFrame(cv::Mat& image);
void NotifyError(llvm::StringRef msg);
void SetConnected(bool connected);
CS_Property CreateProperty(llvm::StringRef name, CS_PropertyType type,
CS_Property CreateProperty(llvm::StringRef name, CS_PropertyKind kind,
int minimum, int maximum, int step,
int defaultValue, int value);
CS_Property CreateProperty(
llvm::StringRef name, CS_PropertyType type, int minimum, int maximum,
llvm::StringRef name, CS_PropertyKind kind, int minimum, int maximum,
int step, int defaultValue, int value,
std::function<void(CS_Property property)> onChange);
void SetEnumPropertyChoices(CS_Property property,
@@ -54,9 +54,9 @@ class CvSourceImpl : public SourceImpl {
class PropertyData : public PropertyBase {
public:
PropertyData() = default;
PropertyData(llvm::StringRef name_, CS_PropertyType type_, int minimum_,
PropertyData(llvm::StringRef name_, CS_PropertyKind kind_, int minimum_,
int maximum_, int step_, int defaultValue_, int value_)
: PropertyBase{name_, type_, minimum_, maximum_,
: PropertyBase{name_, kind_, minimum_, maximum_,
step_, defaultValue_, value_} {}
~PropertyData() override = default;