Removed errors and warnings

SMJSGaming · Jun 19, 2024 · 8f9f927 · 8f9f927
1 parent eb5b647
commit 8f9f927
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/nodes/lists/JSONCodeBlock.cpp b/src/nodes/lists/JSONCodeBlock.cpp
@@ -38,7 +38,7 @@ void JSONCodeBlock::copyCode() {
 void JSONCodeBlock::setCode(const std::pair<HttpInfo::ContentType, std::string>& code) {
     const ThemeStyle& theme = ThemeStyle::getTheme();
     const CCSize& fontSize = CCLabelBMFont::create("0", theme.fontName)->getContentSize() * theme.fontSize;
-    const CCSize& size = this->getContentSize() - CCSize({ this->getPaddingX(), this->getPaddingY() }) * 2;
+    const CCSize& size = this->getContentSize() - ccp(this->getPaddingX(), this->getPaddingY()) * 2;
     const float cellHeight = fontSize.height + theme.lineHeight;
     const float lineNumberWidth = fontSize.width * 4;
     CCArray* cells = CCArray::create();

diff --git a/src/objects/HttpInfo.cpp b/src/objects/HttpInfo.cpp
@@ -83,7 +83,7 @@ HttpInfo::HttpInfo(CCHttpRequest* request) : m_active(false),
 
     m_body = body ? std::string(request->getRequestData()).substr(0, request->getRequestDataSize()) : "";
     m_bodyContentType = this->determineContentType(m_body, true);
-    request->setResponseCallback(this, callfuncND_selector(HttpInfo::onResponse));
+    request->setResponseCallback(this, httpresponse_selector(HttpInfo::onResponse));
 }
 
 bool HttpInfo::isActive() {

diff --git a/src/objects/JSONColor.cpp b/src/objects/JSONColor.cpp
@@ -65,7 +65,7 @@ bool JSONColor::determineCharToken(const char character, const std::string& trun
             return this->checkObjectTerminator(character);
         }
     } else {
-        bool accepted = m_token != TERMINATOR;
+        bool accepted = true;
 
         switch (m_token) {
             case STRING: {
@@ -101,6 +101,9 @@ bool JSONColor::determineCharToken(const char character, const std::string& trun
                 } else {
                     accepted = character == ' ';
                 }
+            } break;
+            default: {
+                accepted = false;
             }
         }