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

TextEditor: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I8fa683c4f68d6e3d3a3eb95acf2f54f8c56b87b7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-05 11:05:28 +01:00
parent f85df65594
commit 34933799fa
19 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/basefilefind.cpp
View File

@@ -160,7 +160,7 @@ void BaseFileFind::runSearch(Find::SearchResult *search)
Core::FutureProgress *progress =
Core::ICore::instance()->progressManager()->addTask(watcher->future(),
tr("Search"),
Constants::TASK_SEARCH);
QLatin1String(Constants::TASK_SEARCH));
progress->setWidget(label);
connect(progress, SIGNAL(clicked()), Find::SearchResultWindow::instance(), SLOT(popup()));
}
@@ -240,15 +240,15 @@ QWidget *BaseFileFind::createPatternWidget()
void BaseFileFind::writeCommonSettings(QSettings *settings)
{
settings->setValue("filters", m_filterStrings.stringList());
settings->setValue(QLatin1String("filters"), m_filterStrings.stringList());
if (m_filterCombo)
settings->setValue("currentFilter", m_filterCombo->currentText());
settings->setValue(QLatin1String("currentFilter"), m_filterCombo->currentText());
}
void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaultFilter)
{
QStringList filters = settings->value("filters").toStringList();
m_filterSetting = settings->value("currentFilter").toString();
QStringList filters = settings->value(QLatin1String("filters")).toStringList();
m_filterSetting = settings->value(QLatin1String("currentFilter")).toString();
if (filters.isEmpty())
filters << defaultFilter;
if (m_filterSetting.isEmpty())