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

TODO: Remove Latin1String

Browse Source 
Change-Id: I2765abdafe508ad2d025f6c9b7b3374a6f1c79b5
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Andre Hartmann
2017-10-01 14:26:10 +02:00
committed by André Hartmann
parent 676d69b524
commit b1701ae933
7 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/todo/keyworddialog.cpp
View File

@@ -82,24 +82,23 @@ void KeywordDialog::setupListWidget(IconType selectedIcon)
ui->listWidget->setViewMode(QListWidget::IconMode); ui->listWidget->setViewMode(QListWidget::IconMode);
ui->listWidget->setDragEnabled(false); ui->listWidget->setDragEnabled(false);
QListWidgetItem *item = QListWidgetItem *item = new QListWidgetItem(icon(IconType::Info), "information");
new QListWidgetItem(icon(IconType::Info), QLatin1String("information"));
item->setData(Qt::UserRole, static_cast<int>(IconType::Info)); item->setData(Qt::UserRole, static_cast<int>(IconType::Info));
ui->listWidget->addItem(item); ui->listWidget->addItem(item);
item = new QListWidgetItem(icon(IconType::Warning), QLatin1String("warning")); item = new QListWidgetItem(icon(IconType::Warning), "warning");
item->setData(Qt::UserRole, static_cast<int>(IconType::Warning)); item->setData(Qt::UserRole, static_cast<int>(IconType::Warning));
ui->listWidget->addItem(item); ui->listWidget->addItem(item);
item = new QListWidgetItem(icon(IconType::Error), QLatin1String("error")); item = new QListWidgetItem(icon(IconType::Error), "error");
item->setData(Qt::UserRole, static_cast<int>(IconType::Error)); item->setData(Qt::UserRole, static_cast<int>(IconType::Error));
ui->listWidget->addItem(item); ui->listWidget->addItem(item);
item = new QListWidgetItem(icon(IconType::Bug), QLatin1String("bug")); item = new QListWidgetItem(icon(IconType::Bug), "bug");
item->setData(Qt::UserRole, static_cast<int>(IconType::Bug)); item->setData(Qt::UserRole, static_cast<int>(IconType::Bug));
ui->listWidget->addItem(item); ui->listWidget->addItem(item);
item = new QListWidgetItem(icon(IconType::Todo), QLatin1String("todo")); item = new QListWidgetItem(icon(IconType::Todo), "todo");
item->setData(Qt::UserRole, static_cast<int>(IconType::Todo)); item->setData(Qt::UserRole, static_cast<int>(IconType::Todo));
ui->listWidget->addItem(item); ui->listWidget->addItem(item);

6
src/plugins/todo/lineparser.cpp
View File

@@ -50,11 +50,7 @@ QList<TodoItem> LineParser::parse(const QString &line)
bool LineParser::isKeywordSeparator(const QChar &ch) bool LineParser::isKeywordSeparator(const QChar &ch)
{ {
return ch.isSpace() return ch.isSpace() || (ch == ':') || (ch == '/') || (ch == '*') || (ch == '(');
|| (ch == QLatin1Char(':'))
|| (ch == QLatin1Char('/'))
|| (ch == QLatin1Char('*'))
|| (ch == QLatin1Char('('));
} }
LineParser::KeywordEntryCandidates LineParser::findKeywordEntryCandidates(const QString &line) LineParser::KeywordEntryCandidates LineParser::findKeywordEntryCandidates(const QString &line)

2
src/plugins/todo/qmljstodoitemsscanner.cpp
View File

@@ -83,7 +83,7 @@ void QmlJsTodoItemsScanner::processDocument(QmlJS::Document::Ptr doc)
// Process every line // Process every line
// TODO: Do not create QStringList, just iterate through a string tracking line endings. // TODO: Do not create QStringList, just iterate through a string tracking line endings.
QStringList commentLines = source.split(QLatin1Char('\n'), QString::SkipEmptyParts); QStringList commentLines = source.split('\n', QString::SkipEmptyParts);
quint32 startLine = sourceLocation.startLine; quint32 startLine = sourceLocation.startLine;
for (int j = 0; j < commentLines.count(); ++j) { for (int j = 0; j < commentLines.count(); ++j) {
const QString &commentLine = commentLines.at(j); const QString &commentLine = commentLines.at(j);

40
src/plugins/todo/settings.cpp
View File

@@ -40,14 +40,14 @@ void Settings::save(QSettings *settings) const
if (!keywordsEdited) if (!keywordsEdited)
return; return;
settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP)); settings->beginGroup(Constants::SETTINGS_GROUP);
settings->setValue(QLatin1String(Constants::SCANNING_SCOPE), scanningScope); settings->setValue(Constants::SCANNING_SCOPE, scanningScope);
settings->beginWriteArray(QLatin1String(Constants::KEYWORDS_LIST)); settings->beginWriteArray(Constants::KEYWORDS_LIST);
if (const int size = keywords.size()) { if (const int size = keywords.size()) {
const QString nameKey = QLatin1String("name"); const QString nameKey = "name";
const QString colorKey = QLatin1String("color"); const QString colorKey = "color";
const QString iconTypeKey = QLatin1String("iconType"); const QString iconTypeKey = "iconType";
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
settings->setArrayIndex(i); settings->setArrayIndex(i);
settings->setValue(nameKey, keywords.at(i).name); settings->setValue(nameKey, keywords.at(i).name);
@@ -65,9 +65,9 @@ void Settings::save(QSettings *settings) const
// TODO: remove in 4.0 // TODO: remove in 4.0
IconType resourceToTypeKey(const QString &key) IconType resourceToTypeKey(const QString &key)
{ {
if (key.contains(QLatin1String("error"))) if (key.contains("error"))
return IconType::Error; return IconType::Error;
else if (key.contains(QLatin1String("warning"))) else if (key.contains("warning"))
return IconType::Warning; return IconType::Warning;
return IconType::Info; return IconType::Info;
} }
@@ -76,20 +76,20 @@ void Settings::load(QSettings *settings)
{ {
setDefault(); setDefault();
settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP)); settings->beginGroup(Constants::SETTINGS_GROUP);
scanningScope = static_cast<ScanningScope>(settings->value(QLatin1String(Constants::SCANNING_SCOPE), scanningScope = static_cast<ScanningScope>(settings->value(Constants::SCANNING_SCOPE,
ScanningScopeCurrentFile).toInt()); ScanningScopeCurrentFile).toInt());
if (scanningScope >= ScanningScopeMax) if (scanningScope >= ScanningScopeMax)
scanningScope = ScanningScopeCurrentFile; scanningScope = ScanningScopeCurrentFile;
KeywordList newKeywords; KeywordList newKeywords;
const int keywordsSize = settings->beginReadArray(QLatin1String(Constants::KEYWORDS_LIST)); const int keywordsSize = settings->beginReadArray(Constants::KEYWORDS_LIST);
if (keywordsSize > 0) { if (keywordsSize > 0) {
const QString nameKey = QLatin1String("name"); const QString nameKey = "name";
const QString colorKey = QLatin1String("color"); const QString colorKey = "color";
const QString iconResourceKey = QLatin1String("iconResource"); // Legacy since 3.7 TODO: remove in 4.0 const QString iconResourceKey = "iconResource"; // Legacy since 3.7 TODO: remove in 4.0
const QString iconTypeKey = QLatin1String("iconType"); const QString iconTypeKey = "iconType";
for (int i = 0; i < keywordsSize; ++i) { for (int i = 0; i < keywordsSize; ++i) {
settings->setArrayIndex(i); settings->setArrayIndex(i);
Keyword keyword; Keyword keyword;
@@ -117,27 +117,27 @@ void Settings::setDefault()
Keyword keyword; Keyword keyword;
keyword.name = QLatin1String("TODO"); keyword.name = "TODO";
keyword.iconType = IconType::Todo; keyword.iconType = IconType::Todo;
keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor); keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
keywords.append(keyword); keywords.append(keyword);
keyword.name = QLatin1String("NOTE"); keyword.name = "NOTE";
keyword.iconType = IconType::Info; keyword.iconType = IconType::Info;
keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor); keyword.color = theme->color(Utils::Theme::OutputPanes_NormalMessageTextColor);
keywords.append(keyword); keywords.append(keyword);
keyword.name = QLatin1String("FIXME"); keyword.name = "FIXME";
keyword.iconType = IconType::Error; keyword.iconType = IconType::Error;
keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor); keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
keywords.append(keyword); keywords.append(keyword);
keyword.name = QLatin1String("BUG"); keyword.name = "BUG";
keyword.iconType = IconType::Bug; keyword.iconType = IconType::Bug;
keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor); keyword.color = theme->color(Utils::Theme::OutputPanes_ErrorMessageTextColor);
keywords.append(keyword); keywords.append(keyword);
keyword.name = QLatin1String("WARNING"); keyword.name = "WARNING";
keyword.iconType = IconType::Warning; keyword.iconType = IconType::Warning;
keyword.color = theme->color(Utils::Theme::OutputPanes_WarningMessageTextColor); keyword.color = theme->color(Utils::Theme::OutputPanes_WarningMessageTextColor);
keywords.append(keyword); keywords.append(keyword);

4
src/plugins/todo/todoitemsprovider.cpp
View File

@@ -122,14 +122,14 @@ void TodoItemsProvider::setItemsListWithinStartupProject()
QHashIterator<QString, QList<TodoItem> > it(m_itemsHash); QHashIterator<QString, QList<TodoItem> > it(m_itemsHash);
QSet<QString> fileNames = QSet<QString>::fromList(m_startupProject->files(Project::SourceFiles)); QSet<QString> fileNames = QSet<QString>::fromList(m_startupProject->files(Project::SourceFiles));
QVariantMap settings = m_startupProject->namedSettings(QLatin1String(Constants::SETTINGS_NAME_KEY)).toMap(); QVariantMap settings = m_startupProject->namedSettings(Constants::SETTINGS_NAME_KEY).toMap();
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();
QString fileName = it.key(); QString fileName = it.key();
if (fileNames.contains(fileName)) { if (fileNames.contains(fileName)) {
bool skip = false; bool skip = false;
for (const QVariant &pattern : settings[QLatin1String(Constants::EXCLUDES_LIST_KEY)].toList()) { for (const QVariant &pattern : settings[Constants::EXCLUDES_LIST_KEY].toList()) {
QRegExp re(pattern.toString()); QRegExp re(pattern.toString());
if (re.indexIn(fileName) != -1) { if (re.indexIn(fileName) != -1) {
skip = true; skip = true;

14
src/plugins/todo/todooutputtreeview.cpp
View File

@@ -63,10 +63,10 @@ TodoOutputTreeView::~TodoOutputTreeView()
void TodoOutputTreeView::saveDisplaySettings() void TodoOutputTreeView::saveDisplaySettings()
{ {
QSettings *settings = Core::ICore::settings(); QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP)); settings->beginGroup(Constants::SETTINGS_GROUP);
settings->setValue(QLatin1String(Constants::OUTPUT_PANE_TEXT_WIDTH), settings->setValue(Constants::OUTPUT_PANE_TEXT_WIDTH,
columnWidth(Constants::OUTPUT_COLUMN_TEXT)); columnWidth(Constants::OUTPUT_COLUMN_TEXT));
settings->setValue(QLatin1String(Constants::OUTPUT_PANE_FILE_WIDTH), settings->setValue(Constants::OUTPUT_PANE_FILE_WIDTH,
columnWidth(Constants::OUTPUT_COLUMN_FILE)); columnWidth(Constants::OUTPUT_COLUMN_FILE));
settings->endGroup(); settings->endGroup();
} }
@@ -74,11 +74,9 @@ void TodoOutputTreeView::saveDisplaySettings()
void TodoOutputTreeView::loadDisplaySettings() void TodoOutputTreeView::loadDisplaySettings()
{ {
QSettings *settings = Core::ICore::settings(); QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP)); settings->beginGroup(Constants::SETTINGS_GROUP);
m_textColumnDefaultWidth = settings->value( m_textColumnDefaultWidth = settings->value(Constants::OUTPUT_PANE_TEXT_WIDTH, 0).toInt();
QLatin1String(Constants::OUTPUT_PANE_TEXT_WIDTH), 0).toInt(); m_fileColumnDefaultWidth = settings->value(Constants::OUTPUT_PANE_FILE_WIDTH, 0).toInt();
m_fileColumnDefaultWidth = settings->value(
QLatin1String(Constants::OUTPUT_PANE_FILE_WIDTH), 0).toInt();
settings->endGroup(); settings->endGroup();
} }

8
src/plugins/todo/todoprojectsettingswidget.cpp
View File

@@ -72,10 +72,10 @@ QListWidgetItem *TodoProjectSettingsWidget::addToExcludedPatternsList(const QStr
void TodoProjectSettingsWidget::loadSettings() void TodoProjectSettingsWidget::loadSettings()
{ {
QVariant s = m_project->namedSettings(QLatin1String(Constants::SETTINGS_NAME_KEY)); QVariant s = m_project->namedSettings(Constants::SETTINGS_NAME_KEY);
QVariantMap settings = s.toMap(); QVariantMap settings = s.toMap();
ui->excludedPatternsList->clear(); ui->excludedPatternsList->clear();
for (const QVariant &pattern : settings[QLatin1String(Constants::EXCLUDES_LIST_KEY)].toList()) for (const QVariant &pattern : settings[Constants::EXCLUDES_LIST_KEY].toList())
addToExcludedPatternsList(pattern.toString()); addToExcludedPatternsList(pattern.toString());
} }
@@ -87,9 +87,9 @@ void TodoProjectSettingsWidget::saveSettings()
for (int i = 0; i < ui->excludedPatternsList->count(); ++i) for (int i = 0; i < ui->excludedPatternsList->count(); ++i)
excludes << ui->excludedPatternsList->item(i)->text(); excludes << ui->excludedPatternsList->item(i)->text();
settings[QLatin1String(Constants::EXCLUDES_LIST_KEY)] = excludes; settings[Constants::EXCLUDES_LIST_KEY] = excludes;
m_project->setNamedSettings(QLatin1String(Constants::SETTINGS_NAME_KEY), settings); m_project->setNamedSettings(Constants::SETTINGS_NAME_KEY, settings);
emit projectSettingsChanged(); emit projectSettingsChanged();
} }