Fix file paths in the header comments.

Consistently use only "wx/foo.h" instead of "include/wx/foo.h" ("include" is
always implicit anyhow).

Also use "src/osx" instead of "src/mac" for the files in this directory.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/doxygen/mainpages/const_wxusedef.h

@@ -296,9 +296,9 @@ library:
 @section page_wxusedef_mac wxUSE preprocessor symbols used only in wxMac port
 
 @beginDefList
-@itemdef{wxUSE_MAC_CRITICAL_REGION_MUTEX, See src/mac/carbon/thread.cpp file.}
+@itemdef{wxUSE_MAC_CRITICAL_REGION_MUTEX, See src/osx/carbon/thread.cpp file.}
-@itemdef{wxUSE_MAC_PTHREADS_MUTEX, See src/mac/carbon/thread.cpp file.}
+@itemdef{wxUSE_MAC_PTHREADS_MUTEX, See src/osx/carbon/thread.cpp file.}
-@itemdef{wxUSE_MAC_SEMAPHORE_MUTEX, See src/mac/carbon/thread.cpp file.}
+@itemdef{wxUSE_MAC_SEMAPHORE_MUTEX, See src/osx/carbon/thread.cpp file.}
 @itemdef{wxUSE_WEBKIT, Use wxWebKitCtrl class.}
 @endDefList
 

include/wx/afterstd.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/afterstd.h
+// Name:        wx/afterstd.h
 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:

include/wx/arrstr.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/arrstr.h
+// Name:        wx/arrstr.h
 // Purpose:     wxArrayString class
 // Author:      Mattia Barbon and Vadim Zeitlin
 // Modified by:

include/wx/beforestd.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/beforestd.h
+// Name:        wx/beforestd.h
 // Purpose:     #include before STL headers
 // Author:      Vadim Zeitlin
 // Modified by:

include/wx/msw/gdiimage.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/msw/gdiimage.h
+// Name:        wx/msw/gdiimage.h
 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under MSW
 // Author:      Vadim Zeitlin

include/wx/msw/iniconf.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/msw/iniconf.h
+// Name:        wx/msw/iniconf.h
 // Purpose:     INI-file based wxConfigBase implementation
 // Author:      Vadim Zeitlin
 // Modified by:

include/wx/os2/iniconf.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/msw/iniconf.h
+// Name:        wx/msw/iniconf.h
 // Purpose:     INI-file based wxConfigBase implementation
 // Author:      David Webster
 // Modified by:

include/wx/osx/carbon/drawer.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/drawer.h
+// Name:        wx/osx/carbon/drawer.h
 // Purpose:     Drawer child window class.
 //              Drawer windows appear under their parent window and
 //              behave like a drawer, opening and closing to reveal

include/wx/osx/carbon/evtloop.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/evtloop.h
+// Name:        wx/osx/carbon/evtloop.h
 // Purpose:     declaration of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:

include/wx/osx/carbon/mimetype.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/mimetype.h
+// Name:        wx/osx/carbon/mimetype.h
 // Purpose:     Mac Carbon implementation for wx mime-related classes
 // Author:      Ryan Norton
 // Modified by:

include/wx/osx/carbon/private/overlay.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/private/overlay.h
+// Name:        wx/osx/carbon/private/overlay.h
 // Purpose:     wxOverlayImpl declaration
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/carbon/private/timer.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/private/timer.h
+// Name:        wx/osx/carbon/private/timer.h
 // Purpose:     wxTimer class
 // Author:      Stefan Csomor
 // Created:     1998-01-01

include/wx/osx/carbon/uma.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/uma.h
+// Name:        wx/osx/carbon/uma.h
 // Purpose:     Universal MacOS API
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/checklst.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/checklst.h
+// Name:        wx/osx/checklst.h
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      Stefan Csomor

include/wx/osx/choice.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/choice.h
+// Name:        wx/osx/choice.h
 // Purpose:     wxChoice class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/cocoa/dataview.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/dataview.h
+// Name:        wx/osx/cocoa/dataview.h
 // Purpose:     wxDataViewCtrl native implementation header for carbon
 // Author:
 // Id:          $Id: dataview.h 57374 2009-01-27

include/wx/osx/colordlg.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/colordlg.h
+// Name:        wx/osx/colordlg.h
 // Purpose:     wxColourDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      Stefan Csomor

include/wx/osx/core/cfdataref.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/corefoundation/cfdata.h
+// Name:        wx/osx/core/cfdataref.h
 // Purpose:     wxCFDataRef class
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html
 /////////////////////////////////////////////////////////////////////////////
-/*! @header     wx/mac/corefoundation/cfref.h
+/*! @header     wx/osx/core/cfdataref.h
     @abstract   wxCFDataRef template class
 */
 

include/wx/osx/core/cfref.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/corefoundation/cfref.h
+// Name:        wx/osx/core/cfref.h
 // Purpose:     wxCFRef template class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by: Stefan Csomor
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 // Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
 /////////////////////////////////////////////////////////////////////////////
-/*! @header     wx/mac/corefoundation/cfref.h
+/*! @header     wx/osx/core/cfref.h
     @abstract   wxCFRef template class
     @discussion FIXME: Convert doc tags to something less buggy with C++
 */

include/wx/osx/core/cfstring.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/corefoundation/cfstring.h
+// Name:        wx/osx/core/cfstring.h
 // Purpose:     wxCFStringRef and other string functions
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/core/colour.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/colour.h
+// Name:        wx/osx/core/colour.h
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/core/hid.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/corefoundation/hid.h
+// Name:        wx/osx/core/hid.h
 // Purpose:     DARWIN HID layer for WX
 // Author:      Ryan Norton
 // Modified by:

include/wx/osx/core/private/strconv_cf.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/mac/corefoundation/strconv_cf.h
+// Name:        wx/osx/core/private/strconv_cf.h
 // Purpose:     Unicode conversion classes
 // Author:      David Elliott, Ryan Norton
 // Modified by:

include/wx/osx/core/stdpaths.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/corefoundation/stdpaths.h
+// Name:        wx/osx/core/stdpaths.h
 // Purpose:     wxStandardPaths for CoreFoundation systems
 // Author:      David Elliott
 // Modified by:

include/wx/osx/dcprint.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/dcprint.h
+// Name:        wx/osx/dcprint.h
 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/dnd.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/dnd.h
+// Name:        wx/osx/dnd.h
 // Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.
 // Author:      Stefan Csomor
 // RCS-ID:      $Id$

include/wx/osx/evtloop.h

@@ -1,7 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/osx/evtloop.h
+// Name:        wx/osx/evtloop.h
-// Purpose:     simply forwards to wx/mac/carbon/evtloop.h for consistency with
+// Purpose:     simply forwards to wx/osx/carbon/evtloop.h or
-//              the other Mac headers
+//              wx/osx/cocoa/evtloop.h for consistency with the other Mac
+//              headers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-01-12

include/wx/osx/fontdlg.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/fontdlg.h
+// Name:        wx/osx/fontdlg.h
 // Purpose:     wxFontDialog class using fonts window services (10.2+).
 // Author:      Ryan Norton
 // Modified by:

include/wx/osx/glcanvas.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/glcanvas.h
+// Name:        wx/osx/glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/listbox.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/listbox.h
+// Name:        wx/osx/listbox.h
 // Purpose:     wxListBox class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/mdi.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/mdi.h
+// Name:        wx/osx/mdi.h
 // Purpose:     MDI (Multiple Document Interface) classes.
 // Author:      Stefan Csomor
 // Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes

include/wx/osx/menuitem.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/menuitem.h
+// Name:        wx/osx/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:

include/wx/osx/msgdlg.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/msgdlg.h
+// Name:        wx/osx/msgdlg.h
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      Stefan Csomor

include/wx/osx/nonownedwnd.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/nonownedwnd.h
+// Name:        wx/osx/nonownedwnd.h
 // Purpose:     declares wxNonOwnedWindow class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/palette.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/palette.h
+// Name:        wx/osx/palette.h
 // Purpose:     wxPalette class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/popupwin.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/popupwin.h
+// Name:        wx/osx/popupwin.h
 // Purpose:     wxPopupWindow class for wxMac
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/printdlg.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/printdlg.h
+// Name:        wx/osx/printdlg.h
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes.
 //              Use generic, PostScript version if no
 //              platform-specific implementation.

include/wx/osx/radiobox.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/radiobox.h
+// Name:        wx/osx/radiobox.h
 // Purpose:     wxRadioBox class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/srchctrl.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/srchctrl.h
+// Name:        wx/osx/srchctrl.h
 // Purpose:     mac carbon wxSearchCtrl class
 // Author:      Vince Harron
 // Created:     2006-02-19

include/wx/osx/statusbr.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/statusbr.h
+// Name:        wx/osx/statusbr.h
 // Purpose:     native implementation of wxStatusBar.
 //              Optional: can use generic version instead.
 // Author:      Stefan Csomor

include/wx/osx/textctrl.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/textctrl.h
+// Name:        wx/osx/textctrl.h
 // Purpose:     wxTextCtrl class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/toolbar.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/toolbar.h
+// Name:        wx/osx/toolbar.h
 // Purpose:     wxToolBar class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/tooltip.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/tooltip.h
+// Name:        wx/osx/tooltip.h
 // Purpose:     wxToolTip class - tooltip control
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/toplevel.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/toplevel.h
+// Name:        wx/osx/toplevel.h
 // Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/treectrl.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/treectrl.h
+// Name:        wx/osx/treectrl.h
 // Purpose:     wxTreeCtrl class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/osx/window.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/mac/carbon/window.h
+// Name:        wx/osx/window.h
 // Purpose:     wxWindowMac class
 // Author:      Stefan Csomor
 // Modified by:

include/wx/position.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/position.h
+// Name:        wx/position.h
 // Purpose:     Common structure and methods for positional information.
 // Author:      Vadim Zeitlin, Robin Dunn, Brad Anderson, Bryan Petty
 // Created:     2007-03-13

include/wx/private/fileback.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/private/fileback.h
+// Name:        wx/private/fileback.h
 // Purpose:     Back an input stream with memory or a file
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$

include/wx/private/filename.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/private/filename.h
+// Name:        wx/private/filename.h
 // Purpose:     Internal declarations for src/common/filename.cpp
 // Author:      Mike Wetherell
 // Modified by:

include/wx/private/stattext.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/private/stattext.h
+// Name:        wx/private/stattext.h
 // Purpose:     Internal declarations for dlgcmn.cpp and stattextcmn.cpp
 // Author:      Francesco Montorsi
 // Created:     2007-01-07 (extracted from dlgcmn.cpp)

include/wx/scrolwin.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/scrolwin.h
+// Name:        wx/scrolwin.h
 // Purpose:     wxScrolledWindow, wxScrolledControl and wxScrollHelper
 // Author:      Vadim Zeitlin
 // Modified by:

include/wx/uiaction.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/uiaction.cpp
+// Name:        wx/uiaction.h
 // Purpose:     wxUIActionSimulator interface
 // Author:      Kevin Ollivier
 // Modified by:

include/wx/vscroll.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/vscroll.h
+// Name:        wx/vscroll.h
 // Purpose:     Variable scrolled windows (wx[V/H/HV]ScrolledWindow)
 // Author:      Vadim Zeitlin
 // Modified by: Brad Anderson, Bryan Petty

include/wx/wx_cwcocoa.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/wx_cwcocoa.h
+// Name:        wx/wx_cwcocoa.h
 // Purpose:     Metrowerks Prefix Header File (wxCocoa Release)
 // Author:      Tommy Tian (tommy.tian@webex.com)
 // Modified by: David Elliott

include/wx/wx_cwcocoa_cm.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/wx_cwcocoa_cm.h
+// Name:        wx/wx_cwcocoa_cm.h
 // Purpose:     Metrowerks wxCocoa PCH common definitions
 // Author:      Tommy Tian (tommy.tian@webex.com)
 // Modified by:

include/wx/wx_cwcocoa_d.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/wx_cwcocoa_d.h
+// Name:        wx/wx_cwcocoa_d.h
 // Purpose:     Metrowerks Prefix Header File (wxCocoa Debug)
 // Author:      Tommy Tian (tommy.tian@webex.com)
 // Modified by: David Elliott

src/html/htmlctrl/webkit/webkit.mm

@@ -57,7 +57,7 @@ END_EVENT_TABLE()
 // Carbon Events handlers
 // ----------------------------------------------------------------------------
 
-// prototype for function in src/mac/carbon/toplevel.cpp
+// prototype for function in src/osx/carbon/nonownedwnd.cpp
 void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent );
 
 static const EventTypeSpec eventList[] =

src/osx/carbon/aboutdlg.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        mac/carbon/aboutdlg.cpp
+// Name:        osx/carbon/aboutdlg.cpp
 // Purpose:     native wxAboutBox() implementation for wxMac
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08

src/osx/carbon/glcanvas.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/glcanvas.cpp
+// Name:        src/osx/carbon/glcanvas.cpp
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by:

src/osx/carbon/region.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// File:      src/mac/carbon/region.cpp
+// File:      src/osx/carbon/region.cpp
 // Purpose:   Region class
 // Author:    Stefan Csomor
 // Created:   Fri Oct 24 10:46:34 MET 1997

src/osx/carbon/statline.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/statline.cpp
+// Name:        src/osx/carbon/statline.cpp
 // Purpose:     wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99

src/osx/carbon/timer.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        sec/mac/carbon/timer.cpp
+// Name:        src/osx/carbon/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Stefan Csomor
 // Modified by:

src/osx/glcanvas_osx.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/glcanvas.cpp
+// Name:        src/osx/glcanvas_osx.cpp
 // Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
 // Author:      Stefan Csomor
 // Modified by: