* Scripts/do-webcore-rename: Next round of renaming. (Last round was done.)
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 16:36:21 +0000 (16:36 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 9 Jul 2006 16:36:21 +0000 (16:36 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15257 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/do-webcore-rename

index 40e14d8f9ad216424c5c25dddd2a5a6263e5fbbc..9c3541c17d146789cd313824532c9dad353a9544 100644 (file)
@@ -1,3 +1,7 @@
+2006-07-09  Darin Adler  <darin@apple.com>
+
+        * Scripts/do-webcore-rename: Next round of renaming. (Last round was done.)
+
 2006-07-09  David Kilzer  <ddkilzer@kilzer.net>
 
         Reviewed by NOBODY (build fix).
index ff0cff850425f8b5ebce7fc07b652ebda696b2a8..eb889157ab127781b51917c15b159ef760dfdeb5 100755 (executable)
@@ -66,163 +66,12 @@ sub wanted
 }
 
 my %renames = (
-    "ALLOC_QCHAR" => "WEBCORE_ALLOCATE_CHARACTERS",
-    "HTMLTextControlInnerElement" => "HTMLTextFieldInnerElement",
-    "KCanvasContainer" => "RenderSVGContainer",
-    "KHTMLAssert" => "ASSERT",
-    "KHTMLDECODER_H" => "Decoder_h",
-    "KHTMLSettings" => "Settings",
-    "KHTML_CachedObjectClientWalker_h" => "CachedObjectClientWalker_h",
-    "KHTML_CachedObject_h" => "CachedObject_h",
-    "KHTML_CachedScript_h" => "CachedScript_h",
-    "KHTML_CachedXBLDocument_h" => "CachedXBLDocument_h",
-    "KHTML_DATAREF_H" => "DataRef_h",
-    "KHTML_DBLCLICK" => "dblclick",
-    "KHTML_DocLoader_h" => "DocLoader_h",
-    "KHTML_EDITING_EDIT_ACTIONS_H" => "EditAction_h",
-    "KHTML_EDITING_HTML_INTERCHANGE_H" => "HTMLInterchange_h",
-    "KHTML_EDITING_MARKUP_H" => "markup_h",
-    "KHTML_EDITING_SELECTIONCONTROLLER_H" => "SelectionController_h",
-    "KHTML_EDITING_SELECTION_H" => "Selection_h",
-    "KHTML_EDITING_TEXT_AFFINITY_H" => "TextAffinity_h",
-    "KHTML_EDITING_VISIBLE_POSITION_H" => "VisiblePosition_h",
-    "KHTML_EDITING_VISIBLE_TEXT_H" => "TextIterator_h",
-    "KHTML_EDITING_VISIBLE_UNITS_H" => "visible_units_h",
-    "KHTML_FORM_DATA_H" => "FormData_h",
-    "KHTML_Loader_h" => "loader_h",
-    "KHTML_QNAME_HIDE_GLOBALS" => "WEBCORE_QUALIFIEDNAME_HIDE_GLOBALS",
-    "KHTML_RenderText_H" => "RenderText_h",
-    "KHTML_RenderTreeFragment_H", "RenderTreeFragment_h",
-    "KSSLKeyGen" => "SSLKeyGenerator",
-    "KWQCFAutorelease" => "HardAutorelease",
-    "KWQCLIPBOARD_H_" => "ClipboardMac_h",
-    "KWQCString" => "DeprecatedCString",
-    "KWQCacheObjectExpiresTime" => "CacheObjectExpiresTime",
-    "KWQCheckCacheObjectStatus" => "CheckCacheObjectStatus",
-    "KWQCheckIfReloading" => "CheckIfReloading",
-    "KWQComboBox" => "PopUpButton",
-    "KWQComboBoxAdapter" => "WebCorePopUpButtonAdapter",
-    "KWQComboBoxKnowsAppKitSecrets" => "WebCorePopUpButtonKnowsAppKitSecrets",
-    "KWQEditCommand" => "WebCoreEditCommand",
-    "KWQFILEBUTTON_H" => "FileButton_h",
-    "KWQFileButton" => "FileButton",
-    "KWQFileButtonAdapter" => "WebCoreFileButtonAdapter",
-    "KWQFormData" => "FormDataMac",
-    "KWQHeaderStringFromDictionary" => "HeaderStringFromDictionary",
-    "KWQInternal" => "WebCoreInternal",
-    "KWQIsResponseURLEqualToURL" => "IsResponseURLEqualToURL",
-    "KWQKHTMLSettings" => "Settings",
-    "KWQKIOGlobal" => "CacheControl",
-    "KWQKSSLKeyGen" => "SSLKeyGenerator",
-    "KWQLISTBOX_H_" => "ListBox_h",
-    "KWQLineEdit" => "TextField",
-    "KWQListBox" => "ListBox",
-    "KWQListBoxGroupLabel" => "ListBoxGroupLabel",
-    "KWQListBoxItem" => "ListBoxItem",
-    "KWQListBoxItemType" => "ListBoxItemType",
-    "KWQListBoxOption" => "ListBoxOption",
-    "KWQListBoxScrollView" => "WebCoreListBoxScrollView",
-    "KWQListBoxSeparator" => "ListBoxSeparator",
-    "KWQListBoxSeparator" => "ListBoxSeparator",
-    "KWQListNode" => "DeprecatedListNode",
-    "KWQLoader" => "LoaderFunctions",
-    "KWQNSControlSizeForFont" => "ControlSizeForFont",
-    "KWQNSTextAlignment" => "TextAlignment",
-    "KWQNumberOfPendingOrLoadingRequests" => "NumberOfPendingOrLoadingRequests",
-    "KWQPTRQUEUE_H_" => "DeprecatedPtrQueue_h",
-    "KWQPageState" => "WebCorePageState",
-    "KWQPopUpButton" => "WebCorePopUpButton",
-    "KWQPopUpButtonCell" => "WebCorePopUpButtonCell",
-    "KWQPtrQueue" => "DeprecatedPtrQueue",
-    "KWQRegExpPrivate" => "Private",
-    "KWQRelease" => "HardRelease",
-    "KWQResourceLoader" => "WebCoreResourceLoaderImp",
-    "KWQResponseIsMultipart" => "ResponseIsMultipart",
-    "KWQResponseMIMEType" => "ResponseMIMEType",
-    "KWQResponseURL" => "ResponseURL",
-    "KWQRetain" => "HardRetain",
-    "KWQRetainNSRelease" => "HardRetainWithNSRelease",
-    "KWQSCROLLBAR_H_" => "ScrollBar_h",
-    "KWQSLIDER_H_" => "WebCoreSlider_h",
-    "KWQScrollBar" => "WebCoreScrollBar",
-    "KWQScrollDirection" => "ScrollDirection",
-    "KWQScrollDocument" => "ScrollByDocument",
-    "KWQScrollDown" => "ScrollDown",
-    "KWQScrollGranularity" => "ScrollGranularity",
-    "KWQScrollLeft" => "ScrollLeft",
-    "KWQScrollLine" => "ScrollByLine",
-    "KWQScrollPage" => "ScrollByPage",
-    "KWQScrollRight" => "ScrollRight",
-    "KWQScrollUp" => "ScrollUp",
-    "KWQScrollWheel" => "ScrollByWheel",
-    "KWQSearchField" => "WebCoreSearchField",
-    "KWQSearchFieldCell" => "WebCoreSearchFieldCell",
-    "KWQSecureTextField" => "WebCoreSecureTextField",
-    "KWQSecureTextFieldCell" => "WebCoreSecureTextFieldCell",
-    "KWQSelectingNext" => "SelectingNext",
-    "KWQSelectingPrevious" => "SelectingPrevious",
-    "KWQSelectionDirection" => "SelectionDirection",
-    "KWQServeSynchronousRequest" => "ServeSynchronousRequest",
-    "KWQSlider" => "WebCoreSlider",
-    "KWQStringData" => "DeprecatedStringData",
-    "KWQTableView" => "WebCoreTableView",
-    "KWQTableViewTypeSelectCallback" => "ListBoxTypeSelectCallback",
-    "KWQTextEdit" => "TextBox",
-    "KWQTextFieldAppKitSecrets" => "WebCoreTextField",
-    "KWQTextFieldController" => "WebCoreTextFieldController",
-    "KWQTextFieldFormatter" => "WebCoreTextFieldFormatter",
-    "KWQTextFieldKnowsAppKitSecrets" => "WebCoreTextField",
-    "KWQTextStream" => "TextStream",
-    "KWQVALUELIST_H_" => "DeprecatedValueListImpl_h",
-    "KWQValueListPrivate" => "Private",
-    "KWQWMatrix" => "AffineTransform",
-    "KWQ_LIST_IMPL_H" => "DeprecatedPtrListImpl_h",
-    "MouseEventMac" => "PlatformMouseEventMac",
-    "Q3CString" => "DeprecatedCString",
-    "Q3PtrList" => "DeprecatedPtrList",
-    "Q3PtrListIterator" => "DeprecatedPtrListIterator",
-    "Q3ValueList" => "DeprecatedValueList",
-    "QCOMBOBOX_H_" => "PopUpButton_h",
-    "QChar" => "DeprecatedChar",
-    "QComboBox" => "PopUpButton",
-    "QConstString" => "DeprecatedConstString",
-    "QLIST_H_" => "DeprecatedPtrList_h",
-    "QLineEdit" => "TextField",
-    "QLineEdit_H" => "TextField_h",
-    "QListBox" => "ListBox",
-    "QMatrix" => "AffineTransform",
-    "QREGEXP_H_" => "RegularExpression_h",
-    "QSIZEF_H_" => "FloatSize_h",
-    "QSTRINGLIST_H_" => "DeprecatedStringList_h",
-    "QSTRING_DEBUG_ALLOCATIONS" => "WEBCORE_DS_DEBUG_ALLOCATIONS",
-    "QSTRING_H_" => "DeprecatedString_h",
-    "QS_INTERNAL_BUFFER_CHARS" => "WEBCORE_DS_INTERNAL_BUFFER_CHARS",
-    "QS_INTERNAL_BUFFER_SIZE" => "WEBCORE_DS_INTERNAL_BUFFER_SIZE",
-    "QS_INTERNAL_BUFFER_UCHARS" => "WEBCORE_DS_INTERNAL_BUFFER_UCHARS",
-    "QScrollBar" => "ScrollBar",
-    "QSlider" => "Slider",
-    "QStringListMac" => "DeprecatedStringListMac",
-    "QStringMac" => "DeprecatedStringMac",
-    "QTEXTEDIT_H_" => "TextBox_h",
-    "QTextEdit" => "TextBox",
-    "QTextStream" => "TextStream",
-    "QTextStreamManipulator" => "TextStreamManipulator",
-    "QTextStreamSeparator" => "TextStreamSeparator",
-    "QTextStream_H" => "TextStream_h",
-    "QVALUELIST_H_" => "DeprecatedValueList_h",
-    "QWMATRIX_H_" => "AffineTransform_h",
-    "QWMatrix" => "AffineTransform",
-    "REALLOC_QCHAR" => "WEBCORE_REALLOCATE_CHARACTERS",
-    "RenderTextField" => "RenderTextControl",
-    "_KWQ_currentEditor" => "_webcore_currentEditor",
-    "_KWQ_numComposedCharacterSequences" => "_webcore_numComposedCharacterSequences",
-    "_KWQ_truncateToNumComposedCharacterSequences" => "_webcore_truncateToNumComposedCharacterSequences",
-    "detachQSlider" => "detachSlider",
-    "initWithQSlider" => "initWithSlider",
-    "qmatrix" => "matrix",
-    "render_button" => "RenderButton",
-    "render_style" => "RenderStyle",
-    "xml_tokenizer" => "XMLTokenizer",
+    "CachedObject" => "CachedResource",
+    "CachedObjectClient" => "CachedResourceClient",
+    "CachedObjectClientWalker" => "CachedResourceClientWalker",
+    "CachedObjectClientWalker_h" => "CachedResourceClientWalker_h",
+    "CachedObject_h" => "CachedResource_h",
+    "LOADER_CACHED_OBJECT_CLIENT_H" => "CachedResourceClient_h",
 );
 
 # rename files
@@ -257,12 +106,9 @@ for my $file (sort @paths) {
     }
     my $newContents = $contents;
 
-    $newContents =~ s/\n\s*class\s+AffineTransform;\s*\n/\n/g;
-
     for my $from (keys %renames) {
         $newContents =~ s/\b$from(?!["\w])/$renames{$from}/g; # this " unconfuses Xcode syntax highlighting
     }
-    $newContents =~ s/_KWQ_/_webcore_/g;
 
     if ($newContents ne $contents) {
         open FILE, ">", $file or die;