feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Clarify units of a Token

Browse Source 
This will avoid confusion when later more length and indices methods are
added.

In Token:
    length() --> bytes()
    begin() --> bytesBegin()
    end() --> bytesEnd()

Change-Id: I244c69b022e239ee762b4114559e707f93ff344f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-12-13 18:41:15 +01:00
parent ba76baa65f
commit 126e69137a
32 changed files with 272 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
View File

@@ -821,8 +821,8 @@ public:
void clear();
enum Columns { SpelledColumn, KindColumn, IndexColumn, OffsetColumn, LineColumnNumberColumn,
LengthColumn, GeneratedColumn, ExpandedColumn, WhiteSpaceColumn, NewlineColumn,
ColumnCount };
LengthInBytesColumn, GeneratedColumn, ExpandedColumn, WhiteSpaceColumn,
NewlineColumn, ColumnCount };
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -852,7 +852,7 @@ void TokensModel::configure(CPlusPlus::TranslationUnit *translationUnit)
for (int i = 0, total = translationUnit->tokenCount(); i < total; ++i) {
TokenInfo info;
info.token = translationUnit->tokenAt(i);
translationUnit->getPosition(info.token.begin(), &info.line, &info.column);
translationUnit->getPosition(info.token.bytesBegin(), &info.line, &info.column);
m_tokenInfos.append(info);
}
emit layoutChanged();
@@ -888,12 +888,12 @@ QVariant TokensModel::data(const QModelIndex &index, int role) const
else if (column == IndexColumn)
return index.row();
else if (column == OffsetColumn)
return token.begin();
return token.bytesBegin();
else if (column == LineColumnNumberColumn)
return QString::fromLatin1("%1:%2")
.arg(CMI::Utils::toString(info.line), CMI::Utils::toString(info.column));
else if (column == LengthColumn)
return CMI::Utils::toString(token.length());
else if (column == LengthInBytesColumn)
return CMI::Utils::toString(token.bytes());
else if (column == GeneratedColumn)
return CMI::Utils::toString(token.generated());
else if (column == ExpandedColumn)
@@ -922,8 +922,8 @@ QVariant TokensModel::headerData(int section, Qt::Orientation orientation, int r
return QLatin1String("Offset");
case LineColumnNumberColumn:
return QLatin1String("Line:Column");
case LengthColumn:
return QLatin1String("Length");
case LengthInBytesColumn:
return QLatin1String("Bytes");
case GeneratedColumn:
return QLatin1String("Generated");
case ExpandedColumn: