diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp index f0c92f9e..130d40e4 100644 --- a/src/lib/component/controller/GraphController.cpp +++ b/src/lib/component/controller/GraphController.cpp @@ -1203,7 +1203,7 @@ void GraphController::handleMessage(MessageColorSchemeTest* message) [&](Node* parent, Id id, Node::NodeType type, std::string name, AccessKind access) { Node* node = graph->createNode(id + 1000, type, NameHierarchy(name), true); - Edge* edge = graph->createEdge(id + 10000, Edge::EDGE_MEMBER, parent, node); + graph->createEdge(id + 10000, Edge::EDGE_MEMBER, parent, node); if (access != ACCESS_NONE) { diff --git a/src/lib/component/view/GraphViewStyle.cpp b/src/lib/component/view/GraphViewStyle.cpp index 0cb445cd..727fc847 100644 --- a/src/lib/component/view/GraphViewStyle.cpp +++ b/src/lib/component/view/GraphViewStyle.cpp @@ -268,6 +268,9 @@ GraphViewStyle::NodeMargins GraphViewStyle::getMarginsOfAccessNode(AccessKind ac case ACCESS_PRIVATE: margins.minWidth = 58; break; + case ACCESS_DEFAULT: + margins.minWidth = 60; + break; case ACCESS_TEMPLATE_PARAMETER: case ACCESS_TYPE_PARAMETER: margins.minWidth = 133; diff --git a/src/lib/data/graph/token_component/TokenComponentAccess.cpp b/src/lib/data/graph/token_component/TokenComponentAccess.cpp index b4196991..ed265d89 100644 --- a/src/lib/data/graph/token_component/TokenComponentAccess.cpp +++ b/src/lib/data/graph/token_component/TokenComponentAccess.cpp @@ -4,6 +4,8 @@ std::string TokenComponentAccess::getAccessString(AccessKind access) { switch (access) { + case ACCESS_NONE: + break; case ACCESS_PUBLIC: return "public"; case ACCESS_PROTECTED: diff --git a/src/lib/data/parser/ParserClient.cpp b/src/lib/data/parser/ParserClient.cpp index cba9cccb..8cc715f7 100644 --- a/src/lib/data/parser/ParserClient.cpp +++ b/src/lib/data/parser/ParserClient.cpp @@ -18,6 +18,8 @@ std::string ParserClient::addAccessPrefix(const std::string& str, AccessKind acc return "private " + str; case ACCESS_DEFAULT: return "default " + str; + default: + break; } return str; } diff --git a/src/lib/data/parser/java/JavaEnvironment.cpp b/src/lib/data/parser/java/JavaEnvironment.cpp index 21c886c1..a648531c 100644 --- a/src/lib/data/parser/java/JavaEnvironment.cpp +++ b/src/lib/data/parser/java/JavaEnvironment.cpp @@ -67,7 +67,7 @@ void JavaEnvironment::registerNativeMethods(std::string className, std::vector(methods[i].name.c_str()); jniMethods[i].signature = const_cast(methods[i].signature.c_str()); diff --git a/src/lib/data/parser/java/JavaEnvironmentFactory.cpp b/src/lib/data/parser/java/JavaEnvironmentFactory.cpp index be6748ae..bd0f095d 100644 --- a/src/lib/data/parser/java/JavaEnvironmentFactory.cpp +++ b/src/lib/data/parser/java/JavaEnvironmentFactory.cpp @@ -41,7 +41,7 @@ void JavaEnvironmentFactory::createInstance(std::string classPath) JavaVMOption* options = new JavaVMOption[3]; // JVM invocation options std::string classPathOption = "-Djava.class.path=" + classPath; options[0].optionString = const_cast(classPathOption.c_str()); - options[1].optionString = "-Xms1m"; + options[1].optionString = const_cast("-Xms1m"); std::string maximumMemoryOprionString = "-Xmx" + std::to_string(ApplicationSettings::getInstance()->getJavaMaximumMemory()) + "m"; options[2].optionString = const_cast(maximumMemoryOprionString.c_str()); // options[3].optionString = "-verbose:jni"; @@ -52,7 +52,7 @@ void JavaEnvironmentFactory::createInstance(std::string classPath) jint rc = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args); // YES !! - delete options; + delete [] options; if(rc != JNI_OK) { diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp index b411b6dd..a4663dc5 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeAccess.cpp @@ -32,6 +32,7 @@ QtGraphNodeAccess::QtGraphNodeAccess(AccessKind accessKind) break; case ACCESS_PRIVATE: iconFileName = "private"; + break; case ACCESS_DEFAULT: iconFileName = "default"; break;