Commit 7786f8af authored by hjk's avatar hjk

prepare for use of QStringBuilder

parent f3875c7e
......@@ -89,8 +89,8 @@ LIBS += -L$$IDE_LIBRARY_PATH
# DEFINES += QT_NO_CAST_FROM_ASCII
DEFINES += QT_NO_CAST_TO_ASCII
DEFINES += QT_USE_STRINGBUILDER_FOR_CONCATENATION
DEFINES += QT_USE_OPERATOR_PLUS_FOR_CONCATENATION
#DEFINES += QT_USE_FAST_OPERATOR_PLUS
#DEFINES += QT_USE_FAST_CONCATENATION
unix {
debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared
......
......@@ -208,7 +208,7 @@ void SettingsDatabase::remove(const QString &key)
QSqlQuery query(d->m_db);
query.prepare(QLatin1String("DELETE FROM settings WHERE key = ? OR key LIKE ?"));
query.addBindValue(effectiveKey);
query.addBindValue(effectiveKey + QLatin1String("/%"));
query.addBindValue(QString(effectiveKey + QLatin1String("/%")));
query.exec();
}
......
......@@ -187,7 +187,8 @@ QVariant SearchResultTreeModel::data(const SearchResultFile *file, int role) con
result = QColor(qRgb(245, 245, 245));
break;
case Qt::DisplayRole:
result = file->fileName() + " (" + QString::number(file->childrenCount()) + ")";
result = QString(file->fileName()
+ " (" + QString::number(file->childrenCount()) + ")");
break;
case ItemDataRoles::FileNameRole:
case Qt::ToolTipRole:
......
......@@ -88,7 +88,7 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project)
m_codecs += codec;
QString name = codec->name();
foreach (QByteArray alias, codec->aliases())
name += QLatin1String(" / ") + alias;
name += QString(QLatin1String(" / ") + alias);
m_ui.encodingComboBox->addItem(name);
if (defaultTextCodec == codec)
m_ui.encodingComboBox->setCurrentIndex(i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment