From 739173819cd39ded3024add383c7eb5f4dd363ef Mon Sep 17 00:00:00 2001 From: Morris Tseng Date: Mon, 24 Nov 2014 22:08:00 +0100 Subject: [PATCH] Bug 1101392 - Part 1: Fix coding style in nsEditorCommands.cpp. r=roc --- editor/libeditor/nsEditorCommands.cpp | 236 +++++++++++--------------- 1 file changed, 103 insertions(+), 133 deletions(-) diff --git a/editor/libeditor/nsEditorCommands.cpp b/editor/libeditor/nsEditorCommands.cpp index e03065a268b..3fdd6992533 100644 --- a/editor/libeditor/nsEditorCommands.cpp +++ b/editor/libeditor/nsEditorCommands.cpp @@ -3,7 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "mozFlushType.h" #include "mozilla/ArrayUtils.h" #include "mozilla/Assertions.h" @@ -28,27 +27,21 @@ class nsISupports; - -#define STATE_ENABLED "state_enabled" +#define STATE_ENABLED "state_enabled" #define STATE_DATA "state_data" - -nsBaseEditorCommand::nsBaseEditorCommand() -{ -} +nsBaseEditorCommand::nsBaseEditorCommand() {} NS_IMPL_ISUPPORTS(nsBaseEditorCommand, nsIControllerCommand) - NS_IMETHODIMP -nsUndoCommand::IsCommandEnabled(const char * aCommandName, - nsISupports *aCommandRefCon, +nsUndoCommand::IsCommandEnabled(const char *aCommandName, + nsISupports *aCommandRefCon, bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { bool isEnabled, isEditable = false; nsresult rv = editor->GetIsSelectionEditable(&isEditable); NS_ENSURE_SUCCESS(rv, rv); @@ -60,18 +53,17 @@ nsUndoCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsUndoCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); if (editor) return editor->Undo(1); - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsUndoCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -79,25 +71,24 @@ nsUndoCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsUndoCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP -nsRedoCommand::IsCommandEnabled(const char * aCommandName, +nsRedoCommand::IsCommandEnabled(const char *aCommandName, nsISupports *aCommandRefCon, bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { bool isEnabled, isEditable = false; nsresult rv = editor->GetIsSelectionEditable(&isEditable); NS_ENSURE_SUCCESS(rv, rv); @@ -109,18 +100,17 @@ nsRedoCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsRedoCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); if (editor) return editor->Redo(1); - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsRedoCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -128,20 +118,20 @@ nsRedoCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsRedoCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP -nsClearUndoCommand::IsCommandEnabled(const char * aCommandName, +nsClearUndoCommand::IsCommandEnabled(const char *aCommandName, nsISupports *refCon, bool *outCmdEnabled) -{ +{ NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(refCon); if (editor) @@ -150,51 +140,48 @@ nsClearUndoCommand::IsCommandEnabled(const char * aCommandName, *outCmdEnabled = false; return NS_OK; } - NS_IMETHODIMP nsClearUndoCommand::DoCommand(const char *aCommandName, nsISupports *refCon) -{ +{ nsCOMPtr editor = do_QueryInterface(refCon); NS_ENSURE_TRUE(editor, NS_ERROR_NOT_IMPLEMENTED); - - editor->EnableUndo(false); // Turning off undo clears undo/redo stacks. - editor->EnableUndo(true); // This re-enables undo/redo. - + + editor->EnableUndo(false); // Turning off undo clears undo/redo stacks. + editor->EnableUndo(true); // This re-enables undo/redo. + return NS_OK; } - -NS_IMETHODIMP + +NS_IMETHODIMP nsClearUndoCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *refCon) { return DoCommand(aCommandName, refCon); } - -NS_IMETHODIMP + +NS_IMETHODIMP nsClearUndoCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *refCon) -{ +{ NS_ENSURE_ARG_POINTER(aParams); - + bool enabled; nsresult rv = IsCommandEnabled(aCommandName, refCon, &enabled); NS_ENSURE_SUCCESS(rv, rv); - + return aParams->SetBooleanValue(STATE_ENABLED, enabled); } NS_IMETHODIMP -nsCutCommand::IsCommandEnabled(const char * aCommandName, - nsISupports *aCommandRefCon, - bool *outCmdEnabled) +nsCutCommand::IsCommandEnabled(const char *aCommandName, + nsISupports *aCommandRefCon, bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { bool isEditable = false; nsresult rv = editor->GetIsSelectionEditable(&isEditable); NS_ENSURE_SUCCESS(rv, rv); @@ -206,18 +193,17 @@ nsCutCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsCutCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); if (editor) return editor->Cut(); - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsCutCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -225,19 +211,18 @@ nsCutCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsCutCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } - NS_IMETHODIMP -nsCutOrDeleteCommand::IsCommandEnabled(const char * aCommandName, +nsCutOrDeleteCommand::IsCommandEnabled(const char *aCommandName, nsISupports *aCommandRefCon, bool *outCmdEnabled) { @@ -250,14 +235,12 @@ nsCutOrDeleteCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsCutOrDeleteCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { nsCOMPtr selection; nsresult rv = editor->GetSelection(getter_AddRefs(selection)); if (NS_SUCCEEDED(rv) && selection && selection->Collapsed()) { @@ -265,11 +248,11 @@ nsCutOrDeleteCommand::DoCommand(const char *aCommandName, } return editor->Cut(); } - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsCutOrDeleteCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -277,18 +260,18 @@ nsCutOrDeleteCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsCutOrDeleteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP -nsCopyCommand::IsCommandEnabled(const char * aCommandName, +nsCopyCommand::IsCommandEnabled(const char *aCommandName, nsISupports *aCommandRefCon, bool *outCmdEnabled) { @@ -301,18 +284,17 @@ nsCopyCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsCopyCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); if (editor) return editor->Copy(); - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsCopyCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -320,18 +302,18 @@ nsCopyCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsCopyCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP -nsCopyOrDeleteCommand::IsCommandEnabled(const char * aCommandName, +nsCopyOrDeleteCommand::IsCommandEnabled(const char *aCommandName, nsISupports *aCommandRefCon, bool *outCmdEnabled) { @@ -344,14 +326,12 @@ nsCopyOrDeleteCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsCopyOrDeleteCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { nsCOMPtr selection; nsresult rv = editor->GetSelection(getter_AddRefs(selection)); if (NS_SUCCEEDED(rv) && selection && selection->Collapsed()) { @@ -359,11 +339,11 @@ nsCopyOrDeleteCommand::DoCommand(const char *aCommandName, } return editor->Copy(); } - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsCopyOrDeleteCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -371,14 +351,14 @@ nsCopyOrDeleteCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsCopyOrDeleteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP @@ -388,8 +368,7 @@ nsPasteCommand::IsCommandEnabled(const char *aCommandName, { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { bool isEditable = false; nsresult rv = editor->GetIsSelectionEditable(&isEditable); NS_ENSURE_SUCCESS(rv, rv); @@ -401,17 +380,16 @@ nsPasteCommand::IsCommandEnabled(const char *aCommandName, return NS_OK; } - NS_IMETHODIMP nsPasteCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); NS_ENSURE_TRUE(editor, NS_ERROR_FAILURE); - + return editor->Paste(nsIClipboard::kGlobalClipboard); } -NS_IMETHODIMP +NS_IMETHODIMP nsPasteCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -419,14 +397,14 @@ nsPasteCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsPasteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP @@ -436,8 +414,7 @@ nsPasteTransferableCommand::IsCommandEnabled(const char *aCommandName, { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); - if (editor) - { + if (editor) { bool isEditable = false; nsresult rv = editor->GetIsSelectionEditable(&isEditable); NS_ENSURE_SUCCESS(rv, rv); @@ -450,19 +427,20 @@ nsPasteTransferableCommand::IsCommandEnabled(const char *aCommandName, } NS_IMETHODIMP -nsPasteTransferableCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) +nsPasteTransferableCommand::DoCommand(const char *aCommandName, + nsISupports *aCommandRefCon) { return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsPasteTransferableCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); NS_ENSURE_TRUE(editor, NS_ERROR_FAILURE); - + nsCOMPtr supports; aParams->GetISupportsValue("transferable", getter_AddRefs(supports)); NS_ENSURE_TRUE(supports, NS_ERROR_FAILURE); @@ -473,7 +451,7 @@ nsPasteTransferableCommand::DoCommandParams(const char *aCommandName, return editor->PasteTransferable(trans); } -NS_IMETHODIMP +NS_IMETHODIMP nsPasteTransferableCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -499,8 +477,8 @@ nsPasteTransferableCommand::GetCommandStateParams(const char *aCommandName, NS_IMETHODIMP nsSwitchTextDirectionCommand::IsCommandEnabled(const char *aCommandName, - nsISupports *aCommandRefCon, - bool *outCmdEnabled) + nsISupports *aCommandRefCon, + bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); @@ -512,7 +490,8 @@ nsSwitchTextDirectionCommand::IsCommandEnabled(const char *aCommandName, } NS_IMETHODIMP -nsSwitchTextDirectionCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) +nsSwitchTextDirectionCommand::DoCommand(const char *aCommandName, + nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); NS_ENSURE_TRUE(editor, NS_ERROR_FAILURE); @@ -520,18 +499,18 @@ nsSwitchTextDirectionCommand::DoCommand(const char *aCommandName, nsISupports *a return editor->SwitchTextDirection(); } -NS_IMETHODIMP +NS_IMETHODIMP nsSwitchTextDirectionCommand::DoCommandParams(const char *aCommandName, - nsICommandParams *aParams, - nsISupports *aCommandRefCon) + nsICommandParams *aParams, + nsISupports *aCommandRefCon) { return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsSwitchTextDirectionCommand::GetCommandStateParams(const char *aCommandName, - nsICommandParams *aParams, - nsISupports *aCommandRefCon) + nsICommandParams *aParams, + nsISupports *aCommandRefCon) { bool canSwitchTextDirection = true; IsCommandEnabled(aCommandName, aCommandRefCon, &canSwitchTextDirection); @@ -539,9 +518,9 @@ nsSwitchTextDirectionCommand::GetCommandStateParams(const char *aCommandName, } NS_IMETHODIMP -nsDeleteCommand::IsCommandEnabled(const char* aCommandName, - nsISupports* aCommandRefCon, - bool* outCmdEnabled) +nsDeleteCommand::IsCommandEnabled(const char *aCommandName, + nsISupports *aCommandRefCon, + bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(aCommandRefCon); @@ -563,10 +542,9 @@ nsDeleteCommand::IsCommandEnabled(const char* aCommandName, return NS_OK; } - NS_IMETHODIMP -nsDeleteCommand::DoCommand(const char* aCommandName, - nsISupports* aCommandRefCon) +nsDeleteCommand::DoCommand(const char *aCommandName, + nsISupports *aCommandRefCon) { nsCOMPtr editor = do_QueryInterface(aCommandRefCon); NS_ENSURE_TRUE(editor, NS_ERROR_FAILURE); @@ -597,7 +575,7 @@ nsDeleteCommand::DoCommand(const char* aCommandName, return editor->DeleteSelection(deleteDir, nsIEditor::eStrip); } -NS_IMETHODIMP +NS_IMETHODIMP nsDeleteCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -605,18 +583,18 @@ nsDeleteCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsDeleteCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } NS_IMETHODIMP -nsSelectAllCommand::IsCommandEnabled(const char * aCommandName, +nsSelectAllCommand::IsCommandEnabled(const char *aCommandName, nsISupports *aCommandRefCon, bool *outCmdEnabled) { @@ -639,7 +617,6 @@ nsSelectAllCommand::IsCommandEnabled(const char * aCommandName, return rv; } - NS_IMETHODIMP nsSelectAllCommand::DoCommand(const char *aCommandName, nsISupports *aCommandRefCon) @@ -647,11 +624,11 @@ nsSelectAllCommand::DoCommand(const char *aCommandName, nsCOMPtr editor = do_QueryInterface(aCommandRefCon); if (editor) return editor->SelectAll(); - + return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsSelectAllCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -659,19 +636,18 @@ nsSelectAllCommand::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsSelectAllCommand::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } - NS_IMETHODIMP -nsSelectionMoveCommands::IsCommandEnabled(const char * aCommandName, +nsSelectionMoveCommands::IsCommandEnabled(const char *aCommandName, nsISupports *aCommandRefCon, bool *outCmdEnabled) { @@ -765,13 +741,13 @@ nsSelectionMoveCommands::DoCommand(const char *aCommandName, } nsCOMPtr selCont; - nsresult rv = editor->GetSelectionController(getter_AddRefs(selCont)); + nsresult rv = editor->GetSelectionController(getter_AddRefs(selCont)); NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_TRUE(selCont, NS_ERROR_FAILURE); // scroll commands for (size_t i = 0; i < mozilla::ArrayLength(scrollCommands); i++) { - const ScrollCommand& cmd = scrollCommands[i]; + const ScrollCommand &cmd = scrollCommands[i]; if (!nsCRT::strcmp(aCommandName, cmd.reverseScroll)) { return (selCont->*(cmd.scroll))(false); } else if (!nsCRT::strcmp(aCommandName, cmd.forwardScroll)) { @@ -781,7 +757,7 @@ nsSelectionMoveCommands::DoCommand(const char *aCommandName, // caret movement/selection commands for (size_t i = 0; i < mozilla::ArrayLength(moveCommands); i++) { - const MoveCommand& cmd = moveCommands[i]; + const MoveCommand &cmd = moveCommands[i]; if (!nsCRT::strcmp(aCommandName, cmd.reverseMove)) { return (selCont->*(cmd.move))(false, false); } else if (!nsCRT::strcmp(aCommandName, cmd.forwardMove)) { @@ -795,7 +771,7 @@ nsSelectionMoveCommands::DoCommand(const char *aCommandName, // physical-direction movement/selection for (size_t i = 0; i < mozilla::ArrayLength(physicalCommands); i++) { - const PhysicalCommand& cmd = physicalCommands[i]; + const PhysicalCommand &cmd = physicalCommands[i]; if (!nsCRT::strcmp(aCommandName, cmd.move)) { return selCont->PhysicalMove(cmd.direction, cmd.amount, false); } else if (!nsCRT::strcmp(aCommandName, cmd.select)) { @@ -806,7 +782,7 @@ nsSelectionMoveCommands::DoCommand(const char *aCommandName, return NS_ERROR_FAILURE; } -NS_IMETHODIMP +NS_IMETHODIMP nsSelectionMoveCommands::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) @@ -814,20 +790,19 @@ nsSelectionMoveCommands::DoCommandParams(const char *aCommandName, return DoCommand(aCommandName, aCommandRefCon); } -NS_IMETHODIMP +NS_IMETHODIMP nsSelectionMoveCommands::GetCommandStateParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *aCommandRefCon) { bool canUndo; IsCommandEnabled(aCommandName, aCommandRefCon, &canUndo); - return aParams->SetBooleanValue(STATE_ENABLED,canUndo); + return aParams->SetBooleanValue(STATE_ENABLED, canUndo); } - NS_IMETHODIMP -nsInsertPlaintextCommand::IsCommandEnabled(const char * aCommandName, - nsISupports *refCon, +nsInsertPlaintextCommand::IsCommandEnabled(const char *aCommandName, + nsISupports *refCon, bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); @@ -839,7 +814,6 @@ nsInsertPlaintextCommand::IsCommandEnabled(const char * aCommandName, return NS_ERROR_NOT_IMPLEMENTED; } - NS_IMETHODIMP nsInsertPlaintextCommand::DoCommand(const char *aCommandName, nsISupports *refCon) @@ -880,16 +854,15 @@ nsInsertPlaintextCommand::GetCommandStateParams(const char *aCommandName, return aParams->SetBooleanValue(STATE_ENABLED, outCmdEnabled); } - NS_IMETHODIMP -nsPasteQuotationCommand::IsCommandEnabled(const char * aCommandName, +nsPasteQuotationCommand::IsCommandEnabled(const char *aCommandName, nsISupports *refCon, bool *outCmdEnabled) { NS_ENSURE_ARG_POINTER(outCmdEnabled); nsCOMPtr editor = do_QueryInterface(refCon); - nsCOMPtr mailEditor = do_QueryInterface(refCon); + nsCOMPtr mailEditor = do_QueryInterface(refCon); if (editor && mailEditor) { uint32_t flags; editor->GetFlags(&flags); @@ -901,12 +874,11 @@ nsPasteQuotationCommand::IsCommandEnabled(const char * aCommandName, return NS_OK; } - NS_IMETHODIMP nsPasteQuotationCommand::DoCommand(const char *aCommandName, nsISupports *refCon) { - nsCOMPtr mailEditor = do_QueryInterface(refCon); + nsCOMPtr mailEditor = do_QueryInterface(refCon); if (mailEditor) return mailEditor->PasteAsQuotation(nsIClipboard::kGlobalClipboard); @@ -918,7 +890,7 @@ nsPasteQuotationCommand::DoCommandParams(const char *aCommandName, nsICommandParams *aParams, nsISupports *refCon) { - nsCOMPtr mailEditor = do_QueryInterface(refCon); + nsCOMPtr mailEditor = do_QueryInterface(refCon); if (mailEditor) return mailEditor->PasteAsQuotation(nsIClipboard::kGlobalClipboard); @@ -931,13 +903,11 @@ nsPasteQuotationCommand::GetCommandStateParams(const char *aCommandName, nsISupports *refCon) { nsCOMPtr editor = do_QueryInterface(refCon); - if (editor) - { + if (editor) { bool enabled = false; editor->CanPaste(nsIClipboard::kGlobalClipboard, &enabled); aParams->SetBooleanValue(STATE_ENABLED, enabled); } - + return NS_OK; } -