From 36b9cc8e16cd43a85920a74fafdc6bca7d24eb70 Mon Sep 17 00:00:00 2001 From: Alec Clews Date: Mon, 16 Dec 2013 11:46:01 +1100 Subject: [PATCH] Make the Channel ID consistantly of Type Channel ID Signed-off-by: Mark Watkins --- sleepyhead/SleepLib/schema.cpp | 2 +- sleepyhead/SleepLib/schema.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sleepyhead/SleepLib/schema.cpp b/sleepyhead/SleepLib/schema.cpp index 1980f2f1..37219b65 100644 --- a/sleepyhead/SleepLib/schema.cpp +++ b/sleepyhead/SleepLib/schema.cpp @@ -305,7 +305,7 @@ void init() ZEO_TimeToZ=schema::channel["TimeToZ"].id(); } -Channel::Channel(int id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit, DataType datatype, QColor color, int link): +Channel::Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit, DataType datatype, QColor color, int link): m_id(id), m_type(type), m_scope(scope), diff --git a/sleepyhead/SleepLib/schema.h b/sleepyhead/SleepLib/schema.h index 07f77c74..6fe8e341 100644 --- a/sleepyhead/SleepLib/schema.h +++ b/sleepyhead/SleepLib/schema.h @@ -53,7 +53,7 @@ class Channel { public: Channel() { m_id=0; } - Channel(int id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit,DataType datatype=DEFAULT, QColor=Qt::black, int link=0); + Channel(ChannelID id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit,DataType datatype=DEFAULT, QColor=Qt::black, int link=0); void addColor(Function f, QColor color) { m_colors[f]=color; } void addOption(int i, QString option) { m_options[i]=option; }