diff --git a/doc/htmlparser.py b/doc/htmlparser.py
index 0cd687464..faad23098 100644
--- a/doc/htmlparser.py
+++ b/doc/htmlparser.py
@@ -10,9 +10,9 @@ def __init__(self, text):
self.code = False
class ArgumentDef:
- def __init__(self, name, type):
+ def __init__(self, name, typeName):
self.name = name
- self.type = type
+ self.type = typeName
self.default = None # type: Optional[str]
self.reference = None # type: Optional[str]
self.modificators = None # type: Optional[str]
@@ -46,7 +46,6 @@ def __init__(self, name):
def extractTypes(element, classDef):
content = list(element)
methods = element.findall(".//*[@class='fn']")
-
for fn in methods:
result = re.search(r'(.*) (?:(.*))?', "".join(fn.itertext()))
if result is not None:
diff --git a/doc/qdoctorst.py b/doc/qdoctorst.py
index 72a5f5fdd..83dd368cb 100644
--- a/doc/qdoctorst.py
+++ b/doc/qdoctorst.py
@@ -21,16 +21,16 @@ def composeTable(classDef, static):
returnMod = ""
if method.returnModificators is not None:
returnMod = "{} ".format(" ".join(method.returnModificators))
- type = ""
+ typeName = ""
reference = ""
if method.reference != "":
reference = " {}".format(method.reference)
if method.returnType is not None:
if method.returnType not in defaultTypes:
refType = "ref"
- type = "{0}:{3}:`{1}`{2}".format(returnMod, method.returnType, reference, refType)
+ typeName = "{0}:{3}:`{1}`{2}".format(returnMod, method.returnType, reference, refType)
else:
- type = returnMod + method.returnType
+ typeName = returnMod + method.returnType
methodMod = ""
if method.modificators is not None:
@@ -51,7 +51,7 @@ def composeTable(classDef, static):
args.append("{0}{1} {2} {3}{4}".format(argMod, argument.type, argument.reference, argument.name, default))
body = ":ref:`{0}` ({1}){2}".format(method.name, ", ".join(args), methodMod, classDef.name)
- table.add_row([type, body])
+ table.add_row([typeName, body])
return table.draw()
@@ -107,7 +107,7 @@ def composeMethods(classDef):
text = text.replace("Note: ", "**Note:** ")
result += text + "\n\n"
-
+
if index != len(classDef.methods.values())-1:
result += "----\n\n"
@@ -135,10 +135,7 @@ def composeEnums(classDef):
return result;
def main():
- try:
- os.mkdir("reference")
- except OSError as exc:
- pass
+ os.mkdir("reference")
f = open("page.rst", "r")
s = Template(f.read())
diff --git a/engine/src/commandbuffer.cpp b/engine/src/commandbuffer.cpp
index deb0fe569..0302308a6 100644
--- a/engine/src/commandbuffer.cpp
+++ b/engine/src/commandbuffer.cpp
@@ -99,7 +99,7 @@ void CommandBuffer::setGlobalValue(const char *name, const Variant &value) {
auto it = offsets.find(name);
if(it != offsets.end()) {
void *src = value.data();
- memcpy((uint8_t *)&m_global + it->second.first, src, it->second.second);
+ memcpy(reinterpret_cast(&m_global) + it->second.first, src, it->second.second);
}
}
/*!
diff --git a/engine/src/components/component.cpp b/engine/src/components/component.cpp
index 34ba9201b..95f8d4a7e 100644
--- a/engine/src/components/component.cpp
+++ b/engine/src/components/component.cpp
@@ -223,7 +223,6 @@ void Component::loadUserData(const VariantMap &data) {
auto factory = System::metaFactory(typeName);
if(factory) {
uint32_t type = MetaType::type(typeName.c_str()) + 1;
- Object *root = Engine::findRoot(this);
if(isArray) {
VariantList list;
for(auto it : field->second.toList()) {
diff --git a/engine/src/editor/baseassetprovider.cpp b/engine/src/editor/baseassetprovider.cpp
index d52bd3b10..80ca3b4c9 100644
--- a/engine/src/editor/baseassetprovider.cpp
+++ b/engine/src/editor/baseassetprovider.cpp
@@ -90,10 +90,6 @@ void BaseAssetProvider::onDirectoryChangedForce(const QString &path, bool force)
}
if(info.isDir()) {
- AssetManager *asset = AssetManager::instance();
-
- AssetConverterSettings *settings = asset->fetchSettings(item);
-
m_dirWatcher->addPath(info.absoluteFilePath());
continue;
}
@@ -265,7 +261,6 @@ void BaseAssetProvider::duplicateResource(const QString &source) {
// Copied from: https://forum.qt.io/topic/59245/is-there-any-api-to-recursively-copy-a-directory-and-all-it-s-sub-dirs-and-files/3
bool BaseAssetProvider::copyRecursively(const QString &sourceFolder, const QString &destFolder) {
- bool success = false;
QDir sourceDir(sourceFolder);
if(!sourceDir.exists()) {
@@ -281,8 +276,7 @@ bool BaseAssetProvider::copyRecursively(const QString &sourceFolder, const QStri
for(int i = 0; i< files.count(); i++) {
QString srcName = sourceFolder + QDir::separator() + files[i];
QString destName = destFolder + QDir::separator() + files[i];
- success = QFile::copy(srcName, destName);
- if(!success) {
+ if(!QFile::copy(srcName, destName)) {
return false;
}
}
@@ -292,8 +286,7 @@ bool BaseAssetProvider::copyRecursively(const QString &sourceFolder, const QStri
for(int i = 0; i< files.count(); i++) {
QString srcName = sourceFolder + QDir::separator() + files[i];
QString destName = destFolder + QDir::separator() + files[i];
- success = copyRecursively(srcName, destName);
- if(!success) {
+ if(!copyRecursively(srcName, destName)) {
return false;
}
}
diff --git a/modules/editor/timeline/editor/animationclipmodel.cpp b/modules/editor/timeline/editor/animationclipmodel.cpp
index d3cd19af7..0f46b17b3 100644
--- a/modules/editor/timeline/editor/animationclipmodel.cpp
+++ b/modules/editor/timeline/editor/animationclipmodel.cpp
@@ -342,16 +342,15 @@ void UndoUpdateKey::redo() {
AnimationTrack &track = (*std::next(m_model->clip()->m_tracks.begin(), m_row));
AnimationCurve::KeyFrame *k = &track.curve().m_keys[m_index];
- if(k) {
- m_key = *k;
- k->m_value = m_value;
- k->m_leftTangent = m_left;
- k->m_rightTangent = m_right;
- k->m_position = (float)m_position / (float)track.duration();
+ m_key = *k;
- m_model->updateController();
- }
+ k->m_value = m_value;
+ k->m_leftTangent = m_left;
+ k->m_rightTangent = m_right;
+ k->m_position = (float)m_position / (float)track.duration();
+
+ m_model->updateController();
}
void UndoRemoveItems::undo() {
diff --git a/modules/network/src/objects/webrequest.cpp b/modules/network/src/objects/webrequest.cpp
index bd1c0891d..e5c69e50e 100644
--- a/modules/network/src/objects/webrequest.cpp
+++ b/modules/network/src/objects/webrequest.cpp
@@ -226,9 +226,8 @@ void WebRequest::readAnswer() {
if(m_content.size() == m_downloadCurrent) {
m_state = State::Done;
}
-
return;
- } break;
+ }
default: break;
}
}
diff --git a/modules/renders/rendergl/src/resources/rendertargetgl.cpp b/modules/renders/rendergl/src/resources/rendertargetgl.cpp
index 156f4cff3..a76f836a4 100644
--- a/modules/renders/rendergl/src/resources/rendertargetgl.cpp
+++ b/modules/renders/rendergl/src/resources/rendertargetgl.cpp
@@ -16,7 +16,7 @@ void RenderTargetGL::bindBuffer(uint32_t level) {
destroyBuffer();
setState(ToBeDeleted);
return;
- } break;
+ }
case ToBeUpdated: {
if(updateBuffer(level)) {
setState(Ready);
@@ -42,7 +42,7 @@ void RenderTargetGL::setNativeHandle(uint32_t id) {
bool RenderTargetGL::updateBuffer(uint32_t level) {
bool newObject = false;
if(m_buffer == -1) {
- glGenFramebuffers(1, (GLuint *)&m_buffer);
+ glGenFramebuffers(1, reinterpret_cast(&m_buffer));
newObject = true;
}
@@ -91,7 +91,7 @@ bool RenderTargetGL::updateBuffer(uint32_t level) {
void RenderTargetGL::destroyBuffer() {
if(m_buffer) {
- glDeleteFramebuffers(1, (GLuint *)&m_buffer);
+ glDeleteFramebuffers(1, reinterpret_cast(&m_buffer));
}
m_buffer = -1;
}
diff --git a/modules/renders/rendermt/src/resources/rendertargetmt.cpp b/modules/renders/rendermt/src/resources/rendertargetmt.cpp
index 261125ed9..20b59455f 100644
--- a/modules/renders/rendermt/src/resources/rendertargetmt.cpp
+++ b/modules/renders/rendermt/src/resources/rendertargetmt.cpp
@@ -20,7 +20,7 @@ MTL::RenderPassDescriptor *RenderTargetMt::nativeHandle() {
setState(ToBeDeleted);
return nullptr;
- } break;
+ }
case ToBeUpdated: {
if(m_descriptor != nullptr) {
m_descriptor->release();
diff --git a/modules/renders/rendervk/src/resources/rendertargetvk.cpp b/modules/renders/rendervk/src/resources/rendertargetvk.cpp
index 6590b8476..14b504561 100644
--- a/modules/renders/rendervk/src/resources/rendertargetvk.cpp
+++ b/modules/renders/rendervk/src/resources/rendertargetvk.cpp
@@ -22,7 +22,7 @@ void RenderTargetVk::bind(VkCommandBuffer &buffer, uint32_t level) {
setState(ToBeDeleted);
return;
- } break;
+ }
case ToBeUpdated: {
destroyBuffer();
diff --git a/modules/uikit/src/components/textinput.cpp b/modules/uikit/src/components/textinput.cpp
index 4f1f20c3a..d5cd59c30 100644
--- a/modules/uikit/src/components/textinput.cpp
+++ b/modules/uikit/src/components/textinput.cpp
@@ -316,7 +316,6 @@ void TextInput::composeComponent() {
setTextCursor(cursor);
RectTransform *rect = cursor->rectTransform();
- float height = label->fontSize();
rect->setSize(Vector2(corners, 0)); // corners should be replaced with width of cursor glyph
rect->setAnchors(Vector2(0.0f, 0.0f), Vector2(0.0f, 1.0f));
diff --git a/modules/uikit/src/utils/cssparser.cpp b/modules/uikit/src/utils/cssparser.cpp
index 52989f0b6..9c3b6b10e 100644
--- a/modules/uikit/src/utils/cssparser.cpp
+++ b/modules/uikit/src/utils/cssparser.cpp
@@ -15,8 +15,7 @@
#include
#include
-CSSParser::ASTNode* TreeTranverseCreateExpressionAction(std::stack<
- CSSParser::ASTNode *>* stack);
+CSSParser::ASTNode* TreeTranverseCreateExpressionAction(std::stack* stack);
static void cleanASTTree(CSSParser::ASTNode *);
#define PopOperand(left,right) ASTNode*left = operandStack.top();\
@@ -610,7 +609,7 @@ void CSSParser::MLRtranverseAST(ASTNode *root, treeTranverseWithUserDataAction a
if(!root) {
return;
}
- std::stack *oldStack = (std::stack *) userData;
+ std::stack *oldStack = static_cast *>(userData);
std::stack *newStack = new std::stack;
newStack->push(root);
if(root->left) {