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

Merge remote branch 'origin/1.3'

Browse Source 
Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -150,30 +150,30 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent)
m_ui.setupUi(w);
m_group.clear();
m_group.insert(theFakeVimSetting(ConfigUseFakeVim),
m_group.insert(theFakeVimSetting(ConfigUseFakeVim),
m_ui.groupBox);
m_group.insert(theFakeVimSetting(ConfigExpandTab),
m_group.insert(theFakeVimSetting(ConfigExpandTab),
m_ui.checkBoxExpandTab);
m_group.insert(theFakeVimSetting(ConfigHlSearch),
m_group.insert(theFakeVimSetting(ConfigHlSearch),
m_ui.checkBoxHlSearch);
m_group.insert(theFakeVimSetting(ConfigShiftWidth),
m_group.insert(theFakeVimSetting(ConfigShiftWidth),
m_ui.lineEditShiftWidth);
m_group.insert(theFakeVimSetting(ConfigSmartTab),
m_group.insert(theFakeVimSetting(ConfigSmartTab),
m_ui.checkBoxSmartTab);
m_group.insert(theFakeVimSetting(ConfigStartOfLine),
m_group.insert(theFakeVimSetting(ConfigStartOfLine),
m_ui.checkBoxStartOfLine);
m_group.insert(theFakeVimSetting(ConfigTabStop),
m_group.insert(theFakeVimSetting(ConfigTabStop),
m_ui.lineEditTabStop);
m_group.insert(theFakeVimSetting(ConfigBackspace),
m_group.insert(theFakeVimSetting(ConfigBackspace),
m_ui.lineEditBackspace);
m_group.insert(theFakeVimSetting(ConfigAutoIndent),
m_group.insert(theFakeVimSetting(ConfigAutoIndent),
m_ui.checkBoxAutoIndent);
m_group.insert(theFakeVimSetting(ConfigSmartIndent),
m_group.insert(theFakeVimSetting(ConfigSmartIndent),
m_ui.checkBoxSmartIndent);
m_group.insert(theFakeVimSetting(ConfigIncSearch),
m_group.insert(theFakeVimSetting(ConfigIncSearch),
m_ui.checkBoxIncSearch);
connect(m_ui.pushButtonCopyTextEditorSettings, SIGNAL(clicked()),
@@ -202,9 +202,9 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent)
void FakeVimOptionPage::copyTextEditorSettings()
{
TextEditor::TabSettings ts =
TextEditor::TabSettings ts =
TextEditor::TextEditorSettings::instance()->tabSettings();
m_ui.checkBoxExpandTab->setChecked(ts.m_spacesForTabs);
m_ui.lineEditTabStop->setText(QString::number(ts.m_tabSize));
m_ui.lineEditShiftWidth->setText(QString::number(ts.m_indentSize));
@@ -554,7 +554,7 @@ private:
} // namespace FakeVim
FakeVimPluginPrivate::FakeVimPluginPrivate(FakeVimPlugin *plugin)
{
{
q = plugin;
m_fakeVimOptionsPage = 0;
m_fakeVimExCommandsPage = 0;
@@ -600,7 +600,7 @@ bool FakeVimPluginPrivate::initialize()
m_fakeVimExCommandsPage = new FakeVimExCommandsPage;
q->addObject(m_fakeVimExCommandsPage);
readSettings(Core::ICore::instance()->settings());
Core::Command *cmd = 0;
cmd = actionManager->registerAction(theFakeVimSetting(ConfigUseFakeVim),
Constants::INSTALL_HANDLER, globalcontext);
@@ -799,7 +799,7 @@ void FakeVimPluginPrivate::editorOpened(Core::IEditor *editor)
// we can only handle QTextEdit and QPlainTextEdit
if (!qobject_cast<QTextEdit *>(widget) && !qobject_cast<QPlainTextEdit *>(widget))
return;
//qDebug() << "OPENING: " << editor << editor->widget()
// << "MODE: " << theFakeVimSetting(ConfigUseFakeVim)->value();
@@ -839,7 +839,7 @@ void FakeVimPluginPrivate::editorOpened(Core::IEditor *editor)
handler->setCurrentFileName(editor->file()->fileName());
handler->installEventFilter();
// pop up the bar
if (theFakeVimSetting(ConfigUseFakeVim)->value().toBool())
showCommandBuffer(QString());
@@ -858,8 +858,8 @@ void FakeVimPluginPrivate::setUseFakeVim(const QVariant &value)
if (Find::Internal::FindPlugin::instance())
Find::Internal::FindPlugin::instance()->setUseFakeVim(on);
if (on) {
Core::EditorManager::instance()->showEditorStatusBar(
QLatin1String(Constants::MINI_BUFFER),
Core::EditorManager::instance()->showEditorStatusBar(
QLatin1String(Constants::MINI_BUFFER),
"vi emulation mode. Type :q to leave. Use , Ctrl-R to trigger run.",
tr("Quit FakeVim"), this, SLOT(quitFakeVim()));
foreach (Core::IEditor *editor, m_editorToHandler.keys())
@@ -909,7 +909,7 @@ void FakeVimPluginPrivate::writeFile(bool *handled,
file->save(fileName);
Core::ICore::instance()->fileManager()->unblockFileChange(file);
*handled = true;
}
}
}
void FakeVimPluginPrivate::handleExCommand(const QString &cmd)
@@ -1072,7 +1072,7 @@ void FakeVimPluginPrivate::quitFakeVim()
void FakeVimPluginPrivate::showCommandBuffer(const QString &contents)
{
//qDebug() << "SHOW COMMAND BUFFER" << contents;
Core::EditorManager::instance()->showEditorStatusBar(
Core::EditorManager::instance()->showEditorStatusBar(
QLatin1String(Constants::MINI_BUFFER), contents,
tr("Quit FakeVim"), this, SLOT(quitFakeVim()));
}