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

11
src/plugins/texteditor/outlinefactory.cpp
View File

@@ -95,13 +95,17 @@ QToolButton *OutlineWidgetStack::filterButton()
return m_filterButton;
}
static inline QString outLineKey(int position)
{
return QLatin1String("Outline.") + QString::number(position) + QLatin1String(".SyncWithEditor");
}
void OutlineWidgetStack::restoreSettings(int position)
{
m_position = position; // save it so that we can save/restore in updateCurrentEditor
QSettings *settings = Core::ICore::instance()->settings();
const bool toggleSync = settings->value("Outline."+ QString::number(position) + ".SyncWithEditor",
true).toBool();
const bool toggleSync = settings->value(outLineKey(position), true).toBool();
toggleSyncButton()->setChecked(toggleSync);
if (IOutlineWidget *outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget())) {
@@ -114,8 +118,7 @@ void OutlineWidgetStack::saveSettings(int position)
Q_ASSERT(position == m_position);
QSettings *settings = Core::ICore::instance()->settings();
settings->setValue("Outline."+QString::number(position)+".SyncWithEditor",
toggleSyncButton()->isEnabled());
settings->setValue(outLineKey(position), toggleSyncButton()->isEnabled());
if (IOutlineWidget *outlineWidget = qobject_cast<IOutlineWidget*>(currentWidget())) {
outlineWidget->saveSettings(position);