Bug 1260651 part.33 Rename nsEditorController to mozilla::EditorController (and their files too) r=mccr8

MozReview-Commit-ID: 5xedcGTDlq1

--HG--
rename : editor/libeditor/nsEditorController.cpp => editor/libeditor/EditorController.cpp
rename : editor/libeditor/nsEditorController.h => editor/libeditor/EditorController.h

Author: masayuki-nakano

editor/libeditor/nsEditorController.cpp renamed to editor/libeditor/EditorController.cpp

@@ -3,7 +3,7 @@
  * 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 "nsEditorController.h"
+#include "mozilla/EditorController.h"
 
 #include "mozilla/mozalloc.h"
 #include "nsDebug.h"
@@ -13,35 +13,40 @@
 
 class nsIControllerCommand;
 
+namespace mozilla {
 
-
-#define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName)                                      \
-  {                                                                                       \
-    _cmdClass* theCmd = new _cmdClass();                                                  \
-    NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY);                                       \
-    inCommandTable->RegisterCommand(_cmdName,                                             \
-                                   static_cast<nsIControllerCommand *>(theCmd));          \
+#define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName)                           \
+  {                                                                            \
+    _cmdClass* theCmd = new _cmdClass();                                       \
+    NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY);                            \
+    aCommandTable->RegisterCommand(                                            \
+                     _cmdName,                                                 \
+                     static_cast<nsIControllerCommand *>(theCmd));             \
   }
 
-#define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)                                    \
-  {                                                                                       \
-    _cmdClass* theCmd = new _cmdClass();                                                  \
-    NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY);                                       \
-    inCommandTable->RegisterCommand(_cmdName,                                             \
-                                   static_cast<nsIControllerCommand *>(theCmd));
-
-#define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)                                     \
-    inCommandTable->RegisterCommand(_cmdName,                                             \
-                                   static_cast<nsIControllerCommand *>(theCmd));
-
-#define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)                                     \
-    inCommandTable->RegisterCommand(_cmdName,                                             \
-                                   static_cast<nsIControllerCommand *>(theCmd));          \
+#define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)                         \
+  {                                                                            \
+    _cmdClass* theCmd = new _cmdClass();                                       \
+    NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY);                            \
+    aCommandTable->RegisterCommand(                                            \
+                     _cmdName,                                                 \
+                     static_cast<nsIControllerCommand *>(theCmd));
+
+#define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)                          \
+    aCommandTable->RegisterCommand(                                            \
+                     _cmdName,                                                 \
+                     static_cast<nsIControllerCommand *>(theCmd));
+
+#define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)                          \
+    aCommandTable->RegisterCommand(                                            \
+                     _cmdName,                                                 \
+                     static_cast<nsIControllerCommand *>(theCmd));             \
   }
 
-
 // static
-nsresult nsEditorController::RegisterEditingCommands(nsIControllerCommandTable *inCommandTable)
+nsresult
+EditorController::RegisterEditingCommands(
+                    nsIControllerCommandTable* aCommandTable)
 {
   // now register all our commands
   // These are commands that will be used in text widgets, and in composer
@@ -78,9 +83,10 @@ nsresult nsEditorController::RegisterEditingCommands(nsIControllerCommandTable *
   return NS_OK;
 }
 
-
 // static
-nsresult nsEditorController::RegisterEditorCommands(nsIControllerCommandTable *inCommandTable)
+nsresult
+EditorController::RegisterEditorCommands(
+                    nsIControllerCommandTable* aCommandTable)
 {
   // These are commands that will be used in text widgets only.
 
@@ -134,3 +140,4 @@ nsresult nsEditorController::RegisterEditorCommands(nsIControllerCommandTable *i
   return NS_OK;
 }
 
+} // namespace mozilla

editor/libeditor/nsEditorController.h renamed to editor/libeditor/EditorController.h

@@ -3,29 +3,35 @@
  * 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/. */
 
-#ifndef nsEditorController_h__
-#define nsEditorController_h__
+#ifndef mozilla_EditorController_h
+#define mozilla_EditorController_h
 
 #include "nscore.h"
 
 #define NS_EDITORCONTROLLER_CID \
-{ 0x26fb965c, 0x9de6, 0x11d3, { 0xbc, 0xcc, 0x0, 0x60, 0xb0, 0xfc, 0x76, 0xbd } }
+{ 0x26fb965c, 0x9de6, 0x11d3, \
+  { 0xbc, 0xcc, 0x0, 0x60, 0xb0, 0xfc, 0x76, 0xbd } }
 
 #define NS_EDITINGCONTROLLER_CID \
-{ 0x2c5a5cdd, 0xe742, 0x4dfe, { 0x86, 0xb8, 0x06, 0x93, 0x09, 0xbf, 0x6c, 0x91 } }
+{ 0x2c5a5cdd, 0xe742, 0x4dfe, \
+  { 0x86, 0xb8, 0x06, 0x93, 0x09, 0xbf, 0x6c, 0x91 } }
 
 class nsIControllerCommandTable;
 
+namespace mozilla {
 
 // the editor controller is used for both text widgets, and basic text editing
 // commands in composer. The refCon that gets passed to its commands is an nsIEditor.
 
-class nsEditorController
+class EditorController final
 {
 public:
-  static nsresult RegisterEditorCommands(nsIControllerCommandTable* inCommandTable);
-  static nsresult RegisterEditingCommands(nsIControllerCommandTable* inCommandTable);
+  static nsresult RegisterEditorCommands(
+                    nsIControllerCommandTable* aCommandTable);
+  static nsresult RegisterEditingCommands(
+                    nsIControllerCommandTable* aCommandTable);
 };
 
-#endif /* nsEditorController_h__ */
+} // namespace mozilla
 
+#endif // #ifndef mozilla_EditorController_h

editor/libeditor/moz.build

@@ -13,6 +13,10 @@ MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
 
+EXPORTS.mozilla += [
+    'EditorController.h',
+]
+
 UNIFIED_SOURCES += [
     'ChangeAttributeTransaction.cpp',
     'ChangeStyleTransaction.cpp',
@@ -22,6 +26,7 @@ UNIFIED_SOURCES += [
     'DeleteRangeTransaction.cpp',
     'DeleteTextTransaction.cpp',
     'EditAggregateTransaction.cpp',
+    'EditorController.cpp',
     'EditorUtils.cpp',
     'EditTransactionBase.cpp',
     'HTMLEditUtils.cpp',
@@ -30,7 +35,6 @@ UNIFIED_SOURCES += [
     'JoinNodeTransaction.cpp',
     'nsEditor.cpp',
     'nsEditorCommands.cpp',
-    'nsEditorController.cpp',
     'nsEditorEventListener.cpp',
     'nsHTMLAbsPosition.cpp',
     'nsHTMLAnonymousUtils.cpp',

layout/build/nsLayoutModule.cpp

@@ -138,7 +138,7 @@ using mozilla::dom::AudioChannelAgent;
 #include "nsEditorCID.h"
 #include "nsEditor.h"
 #include "nsPlaintextEditor.h"
-#include "nsEditorController.h" //CID
+#include "mozilla/EditorController.h" //CID
 
 #include "nsHTMLEditor.h"
 #include "nsTextServicesDocument.h"
@@ -911,8 +911,7 @@ CreateWindowControllerWithSingletonCommandTable(nsISupports *aOuter,
 // Constructor of a controller which is set up to use, internally, a
 // singleton command-table pre-filled with editor commands.
 static nsresult
-nsEditorControllerConstructor(nsISupports *aOuter, REFNSIID aIID,
-                              void **aResult)
+EditorControllerConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
 {
   nsresult rv;
   nsCOMPtr<nsIController> controller = do_CreateInstance("@mozilla.org/embedcomp/base-command-controller;1", &rv);
@@ -968,7 +967,7 @@ nsEditorCommandTableConstructor(nsISupports *aOuter, REFNSIID aIID,
       do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) return rv;
 
-  rv = nsEditorController::RegisterEditorCommands(commandTable);
+  rv = EditorController::RegisterEditorCommands(commandTable);
   if (NS_FAILED(rv)) return rv;
 
   // we don't know here whether we're being created as an instance,
@@ -987,7 +986,7 @@ nsEditingCommandTableConstructor(nsISupports *aOuter, REFNSIID aIID,
       do_CreateInstance(NS_CONTROLLERCOMMANDTABLE_CONTRACTID, &rv);
   if (NS_FAILED(rv)) return rv;
 
-  rv = nsEditorController::RegisterEditingCommands(commandTable);
+  rv = EditorController::RegisterEditingCommands(commandTable);
   if (NS_FAILED(rv)) return rv;
 
   // we don't know here whether we're being created as an instance,
@@ -1088,7 +1087,7 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
 #endif
   { &kNS_AUDIOCHANNELAGENT_CID, true, nullptr, AudioChannelAgentConstructor },
   { &kNS_HTMLEDITOR_CID, false, nullptr, nsHTMLEditorConstructor },
-  { &kNS_EDITORCONTROLLER_CID, false, nullptr, nsEditorControllerConstructor },
+  { &kNS_EDITORCONTROLLER_CID, false, nullptr, EditorControllerConstructor },
   { &kNS_EDITINGCONTROLLER_CID, false, nullptr, nsEditingControllerConstructor },
   { &kNS_EDITORCOMMANDTABLE_CID, false, nullptr, nsEditorCommandTableConstructor },
   { &kNS_EDITINGCOMMANDTABLE_CID, false, nullptr, nsEditingCommandTableConstructor },