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

prepare for use of QStringBuilder

Browse Source
This commit is contained in:
hjk
2009-06-08 15:54:05 +02:00
parent f3875c7e8e
commit 7786f8af8d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qtcreator.pri
View File

@@ -89,8 +89,8 @@ LIBS += -L$$IDE_LIBRARY_PATH
# DEFINES += QT_NO_CAST_FROM_ASCII # DEFINES += QT_NO_CAST_FROM_ASCII
DEFINES += QT_NO_CAST_TO_ASCII DEFINES += QT_NO_CAST_TO_ASCII
DEFINES += QT_USE_STRINGBUILDER_FOR_CONCATENATION #DEFINES += QT_USE_FAST_OPERATOR_PLUS
DEFINES += QT_USE_OPERATOR_PLUS_FOR_CONCATENATION #DEFINES += QT_USE_FAST_CONCATENATION
unix { unix {
debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared debug:OBJECTS_DIR = $${OUT_PWD}/.obj/debug-shared

2
src/plugins/coreplugin/settingsdatabase.cpp
View File

@@ -208,7 +208,7 @@ void SettingsDatabase::remove(const QString &key)
QSqlQuery query(d->m_db); QSqlQuery query(d->m_db);
query.prepare(QLatin1String("DELETE FROM settings WHERE key = ? OR key LIKE ?")); query.prepare(QLatin1String("DELETE FROM settings WHERE key = ? OR key LIKE ?"));
query.addBindValue(effectiveKey); query.addBindValue(effectiveKey);
query.addBindValue(effectiveKey + QLatin1String("/%")); query.addBindValue(QString(effectiveKey + QLatin1String("/%")));
query.exec(); query.exec();
} }

3
src/plugins/find/searchresulttreemodel.cpp
View File

@@ -187,7 +187,8 @@ QVariant SearchResultTreeModel::data(const SearchResultFile *file, int role) con
result = QColor(qRgb(245, 245, 245)); result = QColor(qRgb(245, 245, 245));
break; break;
case Qt::DisplayRole: case Qt::DisplayRole:
result = file->fileName() + " (" + QString::number(file->childrenCount()) + ")"; result = QString(file->fileName()
+ " (" + QString::number(file->childrenCount()) + ")");
break; break;
case ItemDataRoles::FileNameRole: case ItemDataRoles::FileNameRole:
case Qt::ToolTipRole: case Qt::ToolTipRole:

2
src/plugins/projectexplorer/editorsettingspropertiespage.cpp
View File

@@ -88,7 +88,7 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project)
m_codecs += codec; m_codecs += codec;
QString name = codec->name(); QString name = codec->name();
foreach (QByteArray alias, codec->aliases()) foreach (QByteArray alias, codec->aliases())
name += QLatin1String(" / ") + alias; name += QString(QLatin1String(" / ") + alias);
m_ui.encodingComboBox->addItem(name); m_ui.encodingComboBox->addItem(name);
if (defaultTextCodec == codec) if (defaultTextCodec == codec)
m_ui.encodingComboBox->setCurrentIndex(i); m_ui.encodingComboBox->setCurrentIndex(i);