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

Clang: Cleanup string interface of sqlite

Browse Source 
We only will need the utf8 optimized SmallString for the indexer database.
So we remove all other string bindings, QByteArray and QVariant.

Change-Id: I4a77901a80b26bf292fc85df535c2ccf3a8ab52f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-07-27 15:59:54 +02:00
parent 1727e64349
commit 2fed425cd3
29 changed files with 514 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/sqlite/sqlitetable.cpp
View File

@@ -44,12 +44,12 @@ SqliteTable::~SqliteTable()
qDeleteAll(m_sqliteColumns);
}
void SqliteTable::setName(const Utf8String &name)
void SqliteTable::setName(Utils::SmallString &&name)
{
m_tableName = name;
m_tableName = std::move(name);
}
const Utf8String &SqliteTable::name() const
Utils::SmallStringView SqliteTable::name() const
{
return m_tableName;
}
@@ -66,10 +66,10 @@ bool SqliteTable::useWithoutRowId() const
void SqliteTable::addColumn(SqliteColumn *newColumn)
{
m_sqliteColumns.append(newColumn);
m_sqliteColumns.push_back(newColumn);
}
const QVector<SqliteColumn *> &SqliteTable::columns() const
const std::vector<SqliteColumn *> &SqliteTable::columns() const
{
return m_sqliteColumns;
}
@@ -84,7 +84,7 @@ void SqliteTable::initialize()
try {
CreateTableSqlStatementBuilder createTableSqlStatementBuilder;
createTableSqlStatementBuilder.setTable(m_tableName);
createTableSqlStatementBuilder.setTable(m_tableName.clone());
createTableSqlStatementBuilder.setUseWithoutRowId(m_withoutRowId);
createTableSqlStatementBuilder.setColumnDefinitions(createColumnDefintions());
@@ -104,12 +104,12 @@ bool SqliteTable::isReady() const
return m_isReady;
}
QVector<ColumnDefinition> SqliteTable::createColumnDefintions() const
ColumnDefinitions SqliteTable::createColumnDefintions() const
{
QVector<ColumnDefinition> columnDefintions;
ColumnDefinitions columnDefintions;
for (SqliteColumn *sqliteColumn : m_sqliteColumns)
columnDefintions.append(sqliteColumn->columnDefintion());
columnDefintions.push_back(sqliteColumn->columnDefintion());
return columnDefintions;
}