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

ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
- Add missing translations
- Remove some unneeded conversions.

Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-09 16:30:33 +01:00
parent ed2f41bb58
commit ced6fc4136
40 changed files with 352 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/projectexplorer/projecttreewidget.cpp
View File

@@ -174,7 +174,7 @@ void ProjectTreeWidget::disableAutoExpand()
void ProjectTreeWidget::loadExpandData()
{
m_autoExpand = true;
QStringList data = m_explorer->session()->value("ProjectTree.ExpandData").toStringList();
QStringList data = m_explorer->session()->value(QLatin1String("ProjectTree.ExpandData")).toStringList();
recursiveLoadExpandData(m_view->rootIndex(), data.toSet());
}
@@ -193,7 +193,7 @@ void ProjectTreeWidget::saveExpandData()
QStringList data;
recursiveSaveExpandData(m_view->rootIndex(), &data);
// TODO if there are multiple ProjectTreeWidgets, the last one saves the data
m_explorer->session()->setValue("ProjectTree.ExpandData", data);
m_explorer->session()->setValue(QLatin1String("ProjectTree.ExpandData"), data);
}
void ProjectTreeWidget::recursiveSaveExpandData(const QModelIndex &index, QStringList *data)
@@ -284,8 +284,8 @@ void ProjectTreeWidget::editCurrentItem()
void ProjectTreeWidget::setCurrentItem(Node *node, Project *project)
{
if (debug)
qDebug() << "ProjectTreeWidget::setCurrentItem(" << (project ? project->displayName() : "0")
<< ", " << (node ? node->path() : "0") << ")";
qDebug() << "ProjectTreeWidget::setCurrentItem(" << (project ? project->displayName() : QLatin1String("0"))
<< ", " << (node ? node->path() : QLatin1String("0")) << ")";
if (!project) {
return;
@@ -441,9 +441,10 @@ void ProjectTreeWidgetFactory::saveSettings(int position, QWidget *widget)
ProjectTreeWidget *ptw = qobject_cast<ProjectTreeWidget *>(widget);
Q_ASSERT(ptw);
QSettings *settings = Core::ICore::instance()->settings();
settings->setValue("ProjectTreeWidget."+QString::number(position)+".ProjectFilter", ptw->projectFilter());
settings->setValue("ProjectTreeWidget."+QString::number(position)+".GeneratedFilter", ptw->generatedFilesFilter());
settings->setValue("ProjectTreeWidget."+QString::number(position)+".SyncWithEditor", ptw->autoSynchronization());
const QString baseKey = QLatin1String("ProjectTreeWidget.") + QString::number(position);
settings->setValue(baseKey + QLatin1String(".ProjectFilter"), ptw->projectFilter());
settings->setValue(baseKey + QLatin1String(".GeneratedFilter"), ptw->generatedFilesFilter());
settings->setValue(baseKey + QLatin1String(".SyncWithEditor"), ptw->autoSynchronization());
}
void ProjectTreeWidgetFactory::restoreSettings(int position, QWidget *widget)
@@ -451,7 +452,8 @@ void ProjectTreeWidgetFactory::restoreSettings(int position, QWidget *widget)
ProjectTreeWidget *ptw = qobject_cast<ProjectTreeWidget *>(widget);
Q_ASSERT(ptw);
QSettings *settings = Core::ICore::instance()->settings();
ptw->setProjectFilter(settings->value("ProjectTreeWidget."+QString::number(position)+".ProjectFilter", false).toBool());
ptw->setGeneratedFilesFilter(settings->value("ProjectTreeWidget."+QString::number(position)+".GeneratedFilter", true).toBool());
ptw->setAutoSynchronization(settings->value("ProjectTreeWidget."+QString::number(position)+".SyncWithEditor", true).toBool());
const QString baseKey = QLatin1String("ProjectTreeWidget.") + QString::number(position);
ptw->setProjectFilter(settings->value(baseKey + QLatin1String(".ProjectFilter"), false).toBool());
ptw->setGeneratedFilesFilter(settings->value(baseKey + QLatin1String(".GeneratedFilter"), true).toBool());
ptw->setAutoSynchronization(settings->value(baseKey + QLatin1String(".SyncWithEditor"), true).toBool());
}