Add clang-format to format (C++) source files automatically (#491)

* Update all CMakeLists of extensions to use clang-format
* Run clang-format on all Extensions
* Update GDCore CMakeLists.txt to add clang-format
* Run clang-format on GDCore files
* Update GDJS and GDCpp CMakeLists.txt to add clang-format
* Run clang-format on GDCpp and GDJS files
This commit is contained in:
Florian Rival
2018-05-09 15:57:38 -07:00
committed by GitHub
parent a77f8e139f
commit a8559bfbbc
866 changed files with 128312 additions and 106701 deletions
+56 -58
View File
@@ -11,18 +11,18 @@ This project is released under the MIT License.
#include <SFML/Graphics.hpp>
#include <string>
#include "GDCore/Tools/Localization.h"
#include "GDCpp/Runtime/Project/Object.h"
#include "GDCore/Utf8/utf8.h"
#include "GDCpp/Runtime/ImageManager.h"
#include "GDCpp/Runtime/Serialization/SerializerElement.h"
#include "GDCpp/Runtime/Project/InitialInstance.h"
#include "GDCpp/Runtime/Project/Object.h"
#include "GDCpp/Runtime/Project/Project.h"
#include "GDCpp/Runtime/RuntimeScene.h"
#include "GDCore/Utf8/utf8.h"
#include "GDCpp/Runtime/Serialization/SerializerElement.h"
#include "TextEntryObject.h"
#if defined(GD_IDE_ONLY)
#include "GDCore/IDE/Dialogs/MainFrameWrapper.h"
#include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
#include "GDCpp/Runtime/CommonTools.h"
#include "GDCore/IDE/Dialogs/MainFrameWrapper.h"
#endif
using namespace std;
@@ -32,83 +32,81 @@ sf::Texture TextEntryObject::edittimeIconImage;
sf::Sprite TextEntryObject::edittimeIcon;
#endif
TextEntryObject::TextEntryObject(gd::String name_) :
Object(name_)
{
}
TextEntryObject::TextEntryObject(gd::String name_) : Object(name_) {}
RuntimeTextEntryObject::RuntimeTextEntryObject(RuntimeScene & scene_, const TextEntryObject & textEntryObject) :
RuntimeObject(scene_, textEntryObject),
text(),
activated(true)
{
}
RuntimeTextEntryObject::RuntimeTextEntryObject(
RuntimeScene& scene_, const TextEntryObject& textEntryObject)
: RuntimeObject(scene_, textEntryObject), text(), activated(true) {}
/**
* \brief Used to update input
*/
void RuntimeTextEntryObject::Update(const RuntimeScene & scene)
{
if (!activated) return;
void RuntimeTextEntryObject::Update(const RuntimeScene& scene) {
if (!activated) return;
//Retrieve text entered
const auto & characters = scene.GetInputManager().GetCharactersEntered();
for (std::size_t i = 0;i<characters.size();++i)
{
//Skip some non displayable characters
if (characters[i] > 30 && (characters[i] < 127 || characters[i] > 159))
{
text += static_cast<char32_t>(characters[i]);
}
else if (characters[i] == 8)
{
//Backspace : find the previous codepoint and remove it
if(text.empty())
continue;
// Retrieve text entered
const auto& characters = scene.GetInputManager().GetCharactersEntered();
for (std::size_t i = 0; i < characters.size(); ++i) {
// Skip some non displayable characters
if (characters[i] > 30 && (characters[i] < 127 || characters[i] > 159)) {
text += static_cast<char32_t>(characters[i]);
} else if (characters[i] == 8) {
// Backspace : find the previous codepoint and remove it
if (text.empty()) continue;
text.pop_back();
}
text.pop_back();
}
}
}
#if defined(GD_IDE_ONLY) && !defined(GD_NO_WX_GUI)
void TextEntryObject::DrawInitialInstance(gd::InitialInstance & instance, sf::RenderTarget & renderTarget, gd::Project & project, gd::Layout & layout)
{
edittimeIcon.setPosition(instance.GetX(), instance.GetY());
renderTarget.draw(edittimeIcon);
void TextEntryObject::DrawInitialInstance(gd::InitialInstance& instance,
sf::RenderTarget& renderTarget,
gd::Project& project,
gd::Layout& layout) {
edittimeIcon.setPosition(instance.GetX(), instance.GetY());
renderTarget.draw(edittimeIcon);
}
void TextEntryObject::LoadEdittimeIcon()
{
edittimeIconImage.loadFromFile("CppPlatform/Extensions/textentry.png");
edittimeIcon.setTexture(edittimeIconImage);
void TextEntryObject::LoadEdittimeIcon() {
edittimeIconImage.loadFromFile("CppPlatform/Extensions/textentry.png");
edittimeIcon.setTexture(edittimeIconImage);
}
bool TextEntryObject::GenerateThumbnail(const gd::Project & project, wxBitmap & thumbnail) const
{
thumbnail = wxBitmap("CppPlatform/Extensions/textentry.png", wxBITMAP_TYPE_ANY);
bool TextEntryObject::GenerateThumbnail(const gd::Project& project,
wxBitmap& thumbnail) const {
thumbnail =
wxBitmap("CppPlatform/Extensions/textentry.png", wxBITMAP_TYPE_ANY);
return true;
return true;
}
#endif
#if defined(GD_IDE_ONLY)
void RuntimeTextEntryObject::GetPropertyForDebugger(std::size_t propertyNb, gd::String & name, gd::String & value) const
{
if ( propertyNb == 0 ) {name = _("Text in memory"); value = GetString();}
else if ( propertyNb == 1 ) {name = _("Activated \?"); value = activated ? _("Yes") : _("No");}
void RuntimeTextEntryObject::GetPropertyForDebugger(std::size_t propertyNb,
gd::String& name,
gd::String& value) const {
if (propertyNb == 0) {
name = _("Text in memory");
value = GetString();
} else if (propertyNb == 1) {
name = _("Activated \?");
value = activated ? _("Yes") : _("No");
}
}
bool RuntimeTextEntryObject::ChangeProperty(std::size_t propertyNb, gd::String newValue)
{
if ( propertyNb == 0 ) { SetString(newValue); return true; }
else if ( propertyNb == 1 ) { activated = (newValue != _("No")); return true; }
bool RuntimeTextEntryObject::ChangeProperty(std::size_t propertyNb,
gd::String newValue) {
if (propertyNb == 0) {
SetString(newValue);
return true;
} else if (propertyNb == 1) {
activated = (newValue != _("No"));
return true;
}
return true;
}
std::size_t RuntimeTextEntryObject::GetNumberOfProperties() const
{
return 2;
}
std::size_t RuntimeTextEntryObject::GetNumberOfProperties() const { return 2; }
#endif