aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/findinfiles.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-05 11:05:28 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-01-06 11:41:24 +0100
commit34933799fa5ccee00981ee7506cd58aa1c06bbad (patch)
tree2c2d5acac092be41aa950ee393dbc4777199fed3 /src/plugins/texteditor/findinfiles.cpp
parentf85df65594ea43273f76f6c74aeb98bb1a90a396 (diff)
TextEditor: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I8fa683c4f68d6e3d3a3eb95acf2f54f8c56b87b7 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/texteditor/findinfiles.cpp')
-rw-r--r--src/plugins/texteditor/findinfiles.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 32a9129fd39..0f9852902d3 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -54,7 +54,7 @@ FindInFiles::FindInFiles()
QString FindInFiles::id() const
{
- return "Files on Disk";
+ return QLatin1String("Files on Disk");
}
QString FindInFiles::displayName() const
@@ -83,15 +83,16 @@ QVariant FindInFiles::additionalParameters() const
QString FindInFiles::label() const
{
+ const QChar slash = QLatin1Char('/');
const QStringList &nonEmptyComponents = QDir::cleanPath(
QFileInfo(QDir::fromNativeSeparators(m_directory->currentText())).absoluteFilePath())
- .split(QLatin1Char('/'), QString::SkipEmptyParts);
- return tr("Directory '%1':").arg(nonEmptyComponents.isEmpty() ? "/" : nonEmptyComponents.last());
+ .split(slash, QString::SkipEmptyParts);
+ return tr("Directory '%1':").arg(nonEmptyComponents.isEmpty() ? QString(slash) : nonEmptyComponents.last());
}
QString FindInFiles::toolTip() const
{
- // %3 is filled by BaseFileFind::runNewSearch
+ //: %3 is filled by BaseFileFind::runNewSearch
return tr("Path: %1\nFilter: %2\n%3")
.arg(QDir::toNativeSeparators(QFileInfo(m_directory->currentText()).absoluteFilePath()))
.arg(fileNameFilters().join(QLatin1String(",")));
@@ -150,20 +151,20 @@ void FindInFiles::openFileBrowser()
void FindInFiles::writeSettings(QSettings *settings)
{
- settings->beginGroup("FindInFiles");
+ settings->beginGroup(QLatin1String("FindInFiles"));
writeCommonSettings(settings);
- settings->setValue("directories", m_directoryStrings.stringList());
+ settings->setValue(QLatin1String("directories"), m_directoryStrings.stringList());
if (m_directory)
- settings->setValue("currentDirectory", m_directory->currentText());
+ settings->setValue(QLatin1String("currentDirectory"), m_directory->currentText());
settings->endGroup();
}
void FindInFiles::readSettings(QSettings *settings)
{
- settings->beginGroup("FindInFiles");
- readCommonSettings(settings, "*.cpp,*.h");
- m_directoryStrings.setStringList(settings->value("directories").toStringList());
- m_directorySetting = settings->value("currentDirectory").toString();
+ settings->beginGroup(QLatin1String("FindInFiles"));
+ readCommonSettings(settings, QLatin1String("*.cpp,*.h"));
+ m_directoryStrings.setStringList(settings->value(QLatin1String("directories")).toStringList());
+ m_directorySetting = settings->value(QLatin1String("currentDirectory")).toString();
settings->endGroup();
syncComboWithSettings(m_directory, m_directorySetting);
}