Skip to content

Commit

Permalink
Replaced non-ASCII symbols with equivalents
Browse files Browse the repository at this point in the history
  • Loading branch information
oprypin committed Mar 10, 2015
1 parent 20af2a4 commit 01d5d1b
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ else()
POST_BUILD
COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* $<TARGET_FILE_DIR:SFML>/Headers)

# adapt install directory to allow distributing dylibs/frameworks in users frameworks/application bundle
# adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
# NOTE: it's not required to link agains SFML.framework
set_target_properties(SFML PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
Expand Down
2 changes: 1 addition & 1 deletion cmake/Macros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ macro(sfml_add_library target)
MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
endif()

# adapt install directory to allow distributing dylibs/frameworks in users frameworks/application bundle
# adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
set_target_properties(${target} PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@rpath")
Expand Down
2 changes: 1 addition & 1 deletion doc/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="footer-container">
<div id="footer">
SFML is licensed under the terms and conditions of the <a href="http://www.sfml-dev.org/license.php">zlib/png license</a>.<br>
Copyright © Laurent Gomila &nbsp;::&nbsp;
Copyright &copy; Laurent Gomila &nbsp;::&nbsp;
Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions include/SFML/Window/Sensor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ class SFML_WINDOW_API Sensor
////////////////////////////////////////////////////////////
enum Type
{
Accelerometer, ///< Measures the raw acceleration (m/s²)
Accelerometer, ///< Measures the raw acceleration (m/s^2)
Gyroscope, ///< Measures the raw rotation rates (degrees/s)
Magnetometer, ///< Measures the ambient magnetic field (micro-teslas)
Gravity, ///< Measures the direction and intensity of gravity, independent of device acceleration (m/s²)
UserAcceleration, ///< Measures the direction and intensity of device acceleration, independent of the gravity (m/s²)
Gravity, ///< Measures the direction and intensity of gravity, independent of device acceleration (m/s^2)
UserAcceleration, ///< Measures the direction and intensity of device acceleration, independent of the gravity (m/s^2)
Orientation, ///< Measures the absolute 3D orientation (degrees)

Count ///< Keep last -- the total number of sensor types
Expand Down
6 changes: 3 additions & 3 deletions src/SFML/Window/OSX/HIDInputManager.mm
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@
case 0x33: return sf::Keyboard::BackSpace;
case 0x30: return sf::Keyboard::Tab;

// Duplicates (see next §).
// Duplicates (see next section).
case 0x74: return sf::Keyboard::PageUp;
case 0x79: return sf::Keyboard::PageDown;
case 0x77: return sf::Keyboard::End;
Expand All @@ -798,7 +798,7 @@
case 0x43: return sf::Keyboard::Multiply;
case 0x4b: return sf::Keyboard::Divide;

// Duplicates (see next §).
// Duplicates (see next section).
case 0x7b: return sf::Keyboard::Left;
case 0x7c: return sf::Keyboard::Right;
case 0x7e: return sf::Keyboard::Up;
Expand All @@ -820,7 +820,7 @@
case 0x5b: return sf::Keyboard::Numpad8;
case 0x5c: return sf::Keyboard::Numpad9;

// Duplicates (see next §).
// Duplicates (see next section).
case 0x7a: return sf::Keyboard::F1;
case 0x78: return sf::Keyboard::F2;
case 0x63: return sf::Keyboard::F3;
Expand Down
12 changes: 6 additions & 6 deletions src/SFML/Window/OSX/SFApplication.m
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ +(NSMenu*)newAppleMenu
// Services >
// / default empty menu /
// --------------------
// Hide AppName H
// Hide Others ⌥⌘H
// Hide AppName Command+H
// Hide Others Option+Command+H
// Show All
// --------------------
// Quit AppName Q
// Quit AppName Command+Q

NSString* appName = [SFApplication applicationName];

Expand All @@ -112,7 +112,7 @@ +(NSMenu*)newAppleMenu
[appleMenu addItem:[NSMenuItem separatorItem]];

// PREFERENCES
[appleMenu addItemWithTitle:@"Preferences"
[appleMenu addItemWithTitle:@"Preferences..."
action:nil
keyEquivalent:@""];

Expand Down Expand Up @@ -164,7 +164,7 @@ +(NSMenu*)newFileMenu
// The File menu is as follow:
//
// File >
// Close W
// Close Command+W

// FILE MENU
NSMenu* fileMenu = [[NSMenu alloc] initWithTitle:@"File"];
Expand All @@ -186,7 +186,7 @@ +(NSMenu*)newWindowMenu
// The Window menu is as follow:
//
// Window >
// Minimize M
// Minimize Command+M
// Zoom
// --------------------
// Bring All to Front
Expand Down
2 changes: 1 addition & 1 deletion src/SFML/Window/OSX/SFWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
///
/// Override NSWindow implementation, see implementation for details
///
/// \param sender The messages sender
/// \param sender The message's sender
///
////////////////////////////////////////////////////////////
-(void)performClose:(id)sender;
Expand Down
8 changes: 4 additions & 4 deletions src/SFML/Window/OSX/SFWindow.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ -(void)performClose:(id)sender
{
// From Apple documentation:
//
// > If the windows delegate or the window itself implements windowShouldClose:,
// > If the window's delegate or the window itself implements windowShouldClose:,
// > that message is sent with the window as the argument. (Only one such message is sent;
// > if both the delegate and the NSWindow object implement the method, only the delegate
// > receives the message.) If the windowShouldClose: method returns NO, the window isnt
// > closed. If it returns YES, or if it isnt implemented, performClose: invokes the
// > receives the message.) If the windowShouldClose: method returns NO, the window isn't
// > closed. If it returns YES, or if it isn't implemented, performClose: invokes the
// > close method to close the window.
// >
// > If the window doesnt have a close button or cant be closed (for example, if the
// > If the window doesn't have a close button or can't be closed (for example, if the
// > delegate replies NO to a windowShouldClose: message), the system emits the alert sound.
//
// The last paragraph is problematic for SFML fullscreen window since they don't have
Expand Down
26 changes: 13 additions & 13 deletions src/SFML/Window/OSX/WindowImplCocoa.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ class WindowImplCocoa : public WindowImpl
~WindowImplCocoa();

////////////////////////////////////////////////////////////
/// \brief Window Closed Event called by the cocoa window object
/// \brief Window Closed Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
////////////////////////////////////////////////////////////
void windowClosed(void);

////////////////////////////////////////////////////////////
/// \brief Window Resized Event called by the cocoa window object
/// \brief Window Resized Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -109,23 +109,23 @@ class WindowImplCocoa : public WindowImpl
void windowResized(unsigned int width, unsigned int height);

////////////////////////////////////////////////////////////
/// \brief Window Lost Focus Event called by the cocoa window object
/// \brief Window Lost Focus Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
////////////////////////////////////////////////////////////
void windowLostFocus(void);

////////////////////////////////////////////////////////////
/// \brief Window Get Focus Event called by the cocoa window object
/// \brief Window Get Focus Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
////////////////////////////////////////////////////////////
void windowGainedFocus(void);

////////////////////////////////////////////////////////////
/// \brief Mouse Down Event called by the cocoa view object
/// \brief Mouse Down Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -137,7 +137,7 @@ class WindowImplCocoa : public WindowImpl
void mouseDownAt(Mouse::Button button, int x, int y);

////////////////////////////////////////////////////////////
/// \brief Mouse Up Event called by the cocoa view object
/// \brief Mouse Up Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -149,7 +149,7 @@ class WindowImplCocoa : public WindowImpl
void mouseUpAt(Mouse::Button button, int x, int y);

////////////////////////////////////////////////////////////
/// \brief Mouse Moved Event called by the cocoa view object
/// \brief Mouse Moved Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -160,7 +160,7 @@ class WindowImplCocoa : public WindowImpl
void mouseMovedAt(int x, int y);

////////////////////////////////////////////////////////////
/// \brief Mouse Wheel Scrolled Event called by the cocoa view object
/// \brief Mouse Wheel Scrolled Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -172,23 +172,23 @@ class WindowImplCocoa : public WindowImpl
void mouseWheelScrolledAt(float delta, int x, int y);

////////////////////////////////////////////////////////////
/// \brief Mouse In Event called by the cocoa view object
/// \brief Mouse In Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
////////////////////////////////////////////////////////////
void mouseMovedIn(void);

////////////////////////////////////////////////////////////
/// \brief Mouse Out Event called by the cocoa view object
/// \brief Mouse Out Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
////////////////////////////////////////////////////////////
void mouseMovedOut(void);

////////////////////////////////////////////////////////////
/// \brief Key Down Event called by the cocoa view object
/// \brief Key Down Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -198,7 +198,7 @@ class WindowImplCocoa : public WindowImpl
void keyDown(Event::KeyEvent key);

////////////////////////////////////////////////////////////
/// \brief Key Up Event called by the cocoa view object
/// \brief Key Up Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand All @@ -208,7 +208,7 @@ class WindowImplCocoa : public WindowImpl
void keyUp(Event::KeyEvent key);

////////////////////////////////////////////////////////////
/// \brief Text Entred Event called by the cocoa view object
/// \brief Text Entred Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
Expand Down
4 changes: 2 additions & 2 deletions src/SFML/Window/iOS/SensorImpl.mm
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ float toDegrees(float radians)
switch (m_sensor)
{
case Sensor::Accelerometer:
// Acceleration is given in G, convert to m/s²
// Acceleration is given in G, convert to m/s^2
value.x = manager.accelerometerData.acceleration.x * 9.81f;
value.y = manager.accelerometerData.acceleration.y * 9.81f;
value.z = manager.accelerometerData.acceleration.z * 9.81f;
Expand All @@ -159,7 +159,7 @@ float toDegrees(float radians)
break;

case Sensor::UserAcceleration:
// User acceleration is given in G, convert to m/s²
// User acceleration is given in G, convert to m/s^2
value.x = manager.deviceMotion.userAcceleration.x * 9.81f;
value.y = manager.deviceMotion.userAcceleration.y * 9.81f;
value.z = manager.deviceMotion.userAcceleration.z * 9.81f;
Expand Down

0 comments on commit 01d5d1b

Please sign in to comment.