summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bind/javabind.cpp4
-rw-r--r--src/selection-describer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index db112708e..f1a3423fe 100644
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
@@ -568,7 +568,7 @@ static const char *commonJavaPaths[] =
static bool findJVM(String &result)
{
std::vector<String> results;
- int found = false;
+ bool found = false;
/* Is there one specified by the user? */
const char *javaHome = getenv("JAVA_HOME");
@@ -586,7 +586,7 @@ static bool findJVM(String &result)
{
return false;
}
- if (results.size() == 0)
+ if (results.empty())
return false;
//Look first for a Client VM
for (unsigned int i=0 ; i<results.size() ; i++)
diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index 5693ce351..5d6f9288d 100644
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -138,7 +138,7 @@ void SelectionDescriber::_updateMessageFromSelection(Inkscape::Selection *select
} else {
char const *layer_label;
bool is_label = false;
- if (layer && layer->label()) {
+ if (layer->label()) {
layer_label = layer->label();
is_label = true;
} else {