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

32
src/plugins/find/findplugin.cpp
View File

@@ -185,7 +185,9 @@ void FindPlugin::openFindDialog(IFindFilter *filter)
{ {
if (d->m_currentDocumentFind->candidateIsEnabled()) if (d->m_currentDocumentFind->candidateIsEnabled())
d->m_currentDocumentFind->acceptCandidate(); d->m_currentDocumentFind->acceptCandidate();
QString currentFindString = (d->m_currentDocumentFind->isEnabled() ? d->m_currentDocumentFind->currentFindString() : ""); const QString currentFindString =
d->m_currentDocumentFind->isEnabled() ?
d->m_currentDocumentFind->currentFindString() : QString();
if (!currentFindString.isEmpty()) if (!currentFindString.isEmpty())
d->m_findDialog->setFindText(currentFindString); d->m_findDialog->setFindText(currentFindString);
d->m_findDialog->setCurrentFilter(filter); d->m_findDialog->setCurrentFilter(filter);
@@ -301,13 +303,13 @@ bool FindPlugin::hasFindFlag(Find::FindFlag flag)
void FindPlugin::writeSettings() void FindPlugin::writeSettings()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find"); settings->beginGroup(QLatin1String("Find"));
settings->setValue("Backward", hasFindFlag(Find::FindBackward)); settings->setValue(QLatin1String("Backward"), hasFindFlag(Find::FindBackward));
settings->setValue("CaseSensitively", hasFindFlag(Find::FindCaseSensitively)); settings->setValue(QLatin1String("CaseSensitively"), hasFindFlag(Find::FindCaseSensitively));
settings->setValue("WholeWords", hasFindFlag(Find::FindWholeWords)); settings->setValue(QLatin1String("WholeWords"), hasFindFlag(Find::FindWholeWords));
settings->setValue("RegularExpression", hasFindFlag(Find::FindRegularExpression)); settings->setValue(QLatin1String("RegularExpression"), hasFindFlag(Find::FindRegularExpression));
settings->setValue("FindStrings", d->m_findCompletions); settings->setValue(QLatin1String("FindStrings"), d->m_findCompletions);
settings->setValue("ReplaceStrings", d->m_replaceCompletions); settings->setValue(QLatin1String("ReplaceStrings"), d->m_replaceCompletions);
settings->endGroup(); settings->endGroup();
d->m_findToolBar->writeSettings(); d->m_findToolBar->writeSettings();
d->m_findDialog->writeSettings(); d->m_findDialog->writeSettings();
@@ -316,15 +318,15 @@ void FindPlugin::writeSettings()
void FindPlugin::readSettings() void FindPlugin::readSettings()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find"); settings->beginGroup(QLatin1String("Find"));
bool block = blockSignals(true); bool block = blockSignals(true);
setBackward(settings->value("Backward", false).toBool()); setBackward(settings->value(QLatin1String("Backward"), false).toBool());
setCaseSensitive(settings->value("CaseSensitively", false).toBool()); setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
setWholeWord(settings->value("WholeWords", false).toBool()); setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
setRegularExpression(settings->value("RegularExpression", false).toBool()); setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
blockSignals(block); blockSignals(block);
d->m_findCompletions = settings->value("FindStrings").toStringList(); d->m_findCompletions = settings->value(QLatin1String("FindStrings")).toStringList();
d->m_replaceCompletions = settings->value("ReplaceStrings").toStringList(); d->m_replaceCompletions = settings->value(QLatin1String("ReplaceStrings")).toStringList();
d->m_findCompletionModel->setStringList(d->m_findCompletions); d->m_findCompletionModel->setStringList(d->m_findCompletions);
d->m_replaceCompletionModel->setStringList(d->m_replaceCompletions); d->m_replaceCompletionModel->setStringList(d->m_replaceCompletions);
settings->endGroup(); settings->endGroup();

34
src/plugins/find/findtoolbar.cpp
View File

@@ -121,23 +121,23 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen
connect(m_ui.replaceEdit, SIGNAL(returnPressed()), this, SLOT(invokeReplaceEnter())); connect(m_ui.replaceEdit, SIGNAL(returnPressed()), this, SLOT(invokeReplaceEnter()));
QAction *shiftEnterAction = new QAction(m_ui.findEdit); QAction *shiftEnterAction = new QAction(m_ui.findEdit);
shiftEnterAction->setShortcut(QKeySequence("Shift+Enter")); shiftEnterAction->setShortcut(QKeySequence(tr("Shift+Enter")));
shiftEnterAction->setShortcutContext(Qt::WidgetShortcut); shiftEnterAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftEnterAction, SIGNAL(triggered()), this, SLOT(invokeFindPrevious())); connect(shiftEnterAction, SIGNAL(triggered()), this, SLOT(invokeFindPrevious()));
m_ui.findEdit->addAction(shiftEnterAction); m_ui.findEdit->addAction(shiftEnterAction);
QAction *shiftReturnAction = new QAction(m_ui.findEdit); QAction *shiftReturnAction = new QAction(m_ui.findEdit);
shiftReturnAction->setShortcut(QKeySequence("Shift+Return")); shiftReturnAction->setShortcut(QKeySequence(tr("Shift+Return")));
shiftReturnAction->setShortcutContext(Qt::WidgetShortcut); shiftReturnAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftReturnAction, SIGNAL(triggered()), this, SLOT(invokeFindPrevious())); connect(shiftReturnAction, SIGNAL(triggered()), this, SLOT(invokeFindPrevious()));
m_ui.findEdit->addAction(shiftReturnAction); m_ui.findEdit->addAction(shiftReturnAction);
QAction *shiftEnterReplaceAction = new QAction(m_ui.replaceEdit); QAction *shiftEnterReplaceAction = new QAction(m_ui.replaceEdit);
shiftEnterReplaceAction->setShortcut(QKeySequence("Shift+Enter")); shiftEnterReplaceAction->setShortcut(QKeySequence(tr("Shift+Enter")));
shiftEnterReplaceAction->setShortcutContext(Qt::WidgetShortcut); shiftEnterReplaceAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftEnterReplaceAction, SIGNAL(triggered()), this, SLOT(invokeReplacePrevious())); connect(shiftEnterReplaceAction, SIGNAL(triggered()), this, SLOT(invokeReplacePrevious()));
m_ui.replaceEdit->addAction(shiftEnterReplaceAction); m_ui.replaceEdit->addAction(shiftEnterReplaceAction);
QAction *shiftReturnReplaceAction = new QAction(m_ui.replaceEdit); QAction *shiftReturnReplaceAction = new QAction(m_ui.replaceEdit);
shiftReturnReplaceAction->setShortcut(QKeySequence("Shift+Return")); shiftReturnReplaceAction->setShortcut(QKeySequence(tr("Shift+Return")));
shiftReturnReplaceAction->setShortcutContext(Qt::WidgetShortcut); shiftReturnReplaceAction->setShortcutContext(Qt::WidgetShortcut);
connect(shiftReturnReplaceAction, SIGNAL(triggered()), this, SLOT(invokeReplacePrevious())); connect(shiftReturnReplaceAction, SIGNAL(triggered()), this, SLOT(invokeReplacePrevious()));
m_ui.replaceEdit->addAction(shiftReturnReplaceAction); m_ui.replaceEdit->addAction(shiftReturnReplaceAction);
@@ -541,7 +541,7 @@ void FindToolBar::updateIcons()
QPixmap pixmap(17, 17); QPixmap pixmap(17, 17);
pixmap.fill(Qt::transparent); pixmap.fill(Qt::transparent);
QPainter painter(&pixmap); QPainter painter(&pixmap);
QPixmap mag(Core::Constants::ICON_MAGNIFIER); const QPixmap mag = QPixmap(QLatin1String(Core::Constants::ICON_MAGNIFIER));
painter.drawPixmap(0, (pixmap.height() - mag.height()) / 2, mag); painter.drawPixmap(0, (pixmap.height() - mag.height()) / 2, mag);
m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap); m_ui.findEdit->setButtonPixmap(Utils::FancyLineEdit::Left, pixmap);
} else { } else {
@@ -651,12 +651,12 @@ bool FindToolBar::focusNextPrevChild(bool next)
void FindToolBar::writeSettings() void FindToolBar::writeSettings()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find"); settings->beginGroup(QLatin1String("Find"));
settings->beginGroup("FindToolBar"); settings->beginGroup(QLatin1String("FindToolBar"));
settings->setValue("Backward", QVariant((m_findFlags & Find::FindBackward) != 0)); settings->setValue(QLatin1String("Backward"), QVariant((m_findFlags & Find::FindBackward) != 0));
settings->setValue("CaseSensitively", QVariant((m_findFlags & Find::FindCaseSensitively) != 0)); settings->setValue(QLatin1String("CaseSensitively"), QVariant((m_findFlags & Find::FindCaseSensitively) != 0));
settings->setValue("WholeWords", QVariant((m_findFlags & Find::FindWholeWords) != 0)); settings->setValue(QLatin1String("WholeWords"), QVariant((m_findFlags & Find::FindWholeWords) != 0));
settings->setValue("RegularExpression", QVariant((m_findFlags & Find::FindRegularExpression) != 0)); settings->setValue(QLatin1String("RegularExpression"), QVariant((m_findFlags & Find::FindRegularExpression) != 0));
settings->endGroup(); settings->endGroup();
settings->endGroup(); settings->endGroup();
} }
@@ -664,16 +664,16 @@ void FindToolBar::writeSettings()
void FindToolBar::readSettings() void FindToolBar::readSettings()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup("Find"); settings->beginGroup(QLatin1String("Find"));
settings->beginGroup("FindToolBar"); settings->beginGroup(QLatin1String("FindToolBar"));
Find::FindFlags flags; Find::FindFlags flags;
if (settings->value("Backward", false).toBool()) if (settings->value(QLatin1String("Backward"), false).toBool())
flags |= Find::FindBackward; flags |= Find::FindBackward;
if (settings->value("CaseSensitively", false).toBool()) if (settings->value(QLatin1String("CaseSensitively"), false).toBool())
flags |= Find::FindCaseSensitively; flags |= Find::FindCaseSensitively;
if (settings->value("WholeWords", false).toBool()) if (settings->value(QLatin1String("WholeWords"), false).toBool())
flags |= Find::FindWholeWords; flags |= Find::FindWholeWords;
if (settings->value("RegularExpression", false).toBool()) if (settings->value(QLatin1String("RegularExpression"), false).toBool())
flags |= Find::FindRegularExpression; flags |= Find::FindRegularExpression;
settings->endGroup(); settings->endGroup();
settings->endGroup(); settings->endGroup();

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

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

6
src/plugins/find/ifindfilter.cpp
View File

@@ -225,9 +225,9 @@ Find::FindFlags Find::IFindFilter::supportedFindFlags() const
QPixmap Find::IFindFilter::pixmapForFindFlags(Find::FindFlags flags) QPixmap Find::IFindFilter::pixmapForFindFlags(Find::FindFlags flags)
{ {
static const QPixmap casesensitiveIcon(":/find/images/casesensitively.png"); static const QPixmap casesensitiveIcon = QPixmap(QLatin1String(":/find/images/casesensitively.png"));
static const QPixmap regexpIcon(":/find/images/regexp.png"); static const QPixmap regexpIcon = QPixmap(QLatin1String(":/find/images/regexp.png"));
static const QPixmap wholewordsIcon(":/find/images/wholewords.png"); static const QPixmap wholewordsIcon = QPixmap(QLatin1String(":/find/images/wholewords.png"));
bool casesensitive = flags & Find::FindCaseSensitively; bool casesensitive = flags & Find::FindCaseSensitively;
bool wholewords = flags & Find::FindWholeWords; bool wholewords = flags & Find::FindWholeWords;
bool regexp = flags & Find::FindRegularExpression; bool regexp = flags & Find::FindRegularExpression;

2
src/plugins/find/searchresultwidget.cpp
View File

@@ -330,7 +330,7 @@ void SearchResultWidget::addResults(const QList<SearchResultItem> &items, Search
m_searchResultTreeView->addResults(items, mode); m_searchResultTreeView->addResults(items, mode);
if (firstItems) { if (firstItems) {
if (showWarningMessage()) { if (showWarningMessage()) {
Core::InfoBarEntry info("warninglabel", tr("This change cannot be undone.")); Core::InfoBarEntry info(QLatin1String("warninglabel"), tr("This change cannot be undone."));
info.setCustomButtonInfo(tr("Do not warn again"), this, SLOT(hideNoUndoWarning())); info.setCustomButtonInfo(tr("Do not warn again"), this, SLOT(hideNoUndoWarning()));
m_infoBar.addInfo(info); m_infoBar.addInfo(info);
} }