src: fixed clang warnings

This commit is contained in:
Eberhard Graether
2016-08-06 12:53:17 +02:00
parent f7de8d017a
commit 3c88998c10
7 changed files with 12 additions and 4 deletions
@@ -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)
{
@@ -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;
@@ -4,6 +4,8 @@ std::string TokenComponentAccess::getAccessString(AccessKind access)
{
switch (access)
{
case ACCESS_NONE:
break;
case ACCESS_PUBLIC:
return "public";
case ACCESS_PROTECTED:
+2
View File
@@ -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;
}
+1 -1
View File
@@ -67,7 +67,7 @@ void JavaEnvironment::registerNativeMethods(std::string className, std::vector<N
{
JNINativeMethod* jniMethods = new JNINativeMethod[methods.size()];
for (int i = 0; i < methods.size(); i++)
for (size_t i = 0; i < methods.size(); i++)
{
jniMethods[i].name = const_cast<char*>(methods[i].name.c_str());
jniMethods[i].signature = const_cast<char*>(methods[i].signature.c_str());
@@ -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<char*>(classPathOption.c_str());
options[1].optionString = "-Xms1m";
options[1].optionString = const_cast<char*>("-Xms1m");
std::string maximumMemoryOprionString = "-Xmx" + std::to_string(ApplicationSettings::getInstance()->getJavaMaximumMemory()) + "m";
options[2].optionString = const_cast<char*>(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)
{
@@ -32,6 +32,7 @@ QtGraphNodeAccess::QtGraphNodeAccess(AccessKind accessKind)
break;
case ACCESS_PRIVATE:
iconFileName = "private";
break;
case ACCESS_DEFAULT:
iconFileName = "default";
break;