comparison data/fileio/CSVFormat.h @ 929:59e7fe1b1003 warnfix_no_size_t

Unsigned removals and warning fixes in data/
author Chris Cannam
date Tue, 17 Jun 2014 14:33:42 +0100
parents 69cc0454ed72
children dc1695b90a58
comparison
equal deleted inserted replaced
928:6a94bb528e9d 929:59e7fe1b1003
84 void guessFormatFor(QString path); 84 void guessFormatFor(QString path);
85 85
86 ModelType getModelType() const { return m_modelType; } 86 ModelType getModelType() const { return m_modelType; }
87 TimingType getTimingType() const { return m_timingType; } 87 TimingType getTimingType() const { return m_timingType; }
88 TimeUnits getTimeUnits() const { return m_timeUnits; } 88 TimeUnits getTimeUnits() const { return m_timeUnits; }
89 size_t getSampleRate() const { return m_sampleRate; } 89 int getSampleRate() const { return m_sampleRate; }
90 size_t getWindowSize() const { return m_windowSize; } 90 int getWindowSize() const { return m_windowSize; }
91 int getColumnCount() const { return m_columnCount; } 91 int getColumnCount() const { return m_columnCount; }
92 bool getAllowQuoting() const { return m_allowQuoting; } 92 bool getAllowQuoting() const { return m_allowQuoting; }
93 QChar getSeparator() const { 93 QChar getSeparator() const {
94 if (m_separator == "") return ' '; 94 if (m_separator == "") return ' ';
95 else return m_separator[0]; 95 else return m_separator[0];
97 97
98 void setModelType(ModelType t) { m_modelType = t; } 98 void setModelType(ModelType t) { m_modelType = t; }
99 void setTimingType(TimingType t) { m_timingType = t; } 99 void setTimingType(TimingType t) { m_timingType = t; }
100 void setTimeUnits(TimeUnits t) { m_timeUnits = t; } 100 void setTimeUnits(TimeUnits t) { m_timeUnits = t; }
101 void setSeparator(QChar s) { m_separator = s; } 101 void setSeparator(QChar s) { m_separator = s; }
102 void setSampleRate(size_t r) { m_sampleRate = r; } 102 void setSampleRate(int r) { m_sampleRate = r; }
103 void setWindowSize(size_t s) { m_windowSize = s; } 103 void setWindowSize(int s) { m_windowSize = s; }
104 void setColumnCount(int c) { m_columnCount = c; } 104 void setColumnCount(int c) { m_columnCount = c; }
105 void setAllowQuoting(bool q) { m_allowQuoting = q; } 105 void setAllowQuoting(bool q) { m_allowQuoting = q; }
106 106
107 QList<ColumnPurpose> getColumnPurposes() const { return m_columnPurposes; } 107 QList<ColumnPurpose> getColumnPurposes() const { return m_columnPurposes; }
108 void setColumnPurposes(QList<ColumnPurpose> cl) { m_columnPurposes = cl; } 108 void setColumnPurposes(QList<ColumnPurpose> cl) { m_columnPurposes = cl; }
121 protected: 121 protected:
122 ModelType m_modelType; 122 ModelType m_modelType;
123 TimingType m_timingType; 123 TimingType m_timingType;
124 TimeUnits m_timeUnits; 124 TimeUnits m_timeUnits;
125 QString m_separator; 125 QString m_separator;
126 size_t m_sampleRate; 126 int m_sampleRate;
127 size_t m_windowSize; 127 int m_windowSize;
128 128
129 int m_columnCount; 129 int m_columnCount;
130 bool m_variableColumnCount; 130 bool m_variableColumnCount;
131 131
132 QList<ColumnQualities> m_columnQualities; 132 QList<ColumnQualities> m_columnQualities;