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

Find: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
- Add missing tr()
- Fix potential crash constructing QString(0).

Change-Id: Ie35c047800a60410ca0886f8e50be1670c8375e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-20 15:33:18 +01:00
parent a138465848
commit fa20c2a95e
5 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/find/findtoolwindow.cpp
View File

@@ -237,8 +237,8 @@ void FindToolWindow::replace()
void FindToolWindow::writeSettings()
{
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
settings->setValue("CurrentFilter", m_currentFilter ? m_currentFilter->id() : 0);
settings->beginGroup(QLatin1String("Find"));
settings->setValue(QLatin1String("CurrentFilter"), m_currentFilter ? m_currentFilter->id() : QString());
foreach (IFindFilter *filter, m_filters)
filter->writeSettings(settings);
settings->endGroup();
@@ -247,8 +247,8 @@ void FindToolWindow::writeSettings()
void FindToolWindow::readSettings()
{
QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find");
const QString currentFilter = settings->value("CurrentFilter").toString();
settings->beginGroup(QLatin1String("Find"));
const QString currentFilter = settings->value(QLatin1String("CurrentFilter")).toString();
for (int i = 0; i < m_filters.size(); ++i) {
IFindFilter *filter = m_filters.at(i);
filter->readSettings(settings);