summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2016-04-21 06:14:10 +0000
committerJon A. Cruz <jon@joncruz.org>2016-04-21 06:14:10 +0000
commite71c798f2fd8610baaddbb58d103b2ef44d65ccb (patch)
treec9cdc3f3f3619e5212f4113c368899fd41c1d974 /src
parentfix #1571365 linking on win32 (diff)
downloadinkscape-e71c798f2fd8610baaddbb58d103b2ef44d65ccb.tar.gz
inkscape-e71c798f2fd8610baaddbb58d103b2ef44d65ccb.zip
minor warning cleanup.
(bzr r14861)
Diffstat (limited to 'src')
-rw-r--r--src/extension/loader.cpp4
-rw-r--r--src/live_effects/parameter/filletchamferpointarray.cpp2
-rw-r--r--src/ui/tools/measure-tool.cpp4
-rw-r--r--src/unclump.cpp8
4 files changed, 11 insertions, 7 deletions
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 32ac4b3b4..110df3ae3 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -59,7 +59,7 @@ Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Docum
if( !success ){
// Could not load dependency, we abort
const char *res = g_module_error();
- g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.get_name(), res);
+ g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.get_name(), "<todo>", res);
return NULL;
}
}
@@ -134,4 +134,4 @@ Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Docum
fill-column:99
End:
*/
-// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: \ No newline at end of file
+// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99:
diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp
index 117d57460..b321a5831 100644
--- a/src/live_effects/parameter/filletchamferpointarray.cpp
+++ b/src/live_effects/parameter/filletchamferpointarray.cpp
@@ -491,7 +491,7 @@ std::vector<double> FilletChamferPointArrayParam::get_times(int index, Geom::Pat
curve_it1 = subpaths[positions.first][positions.second].duplicate();
Coord it1_length = (*curve_it1).length(tolerance);
double time_it1, time_it2, time_it1_B, intpart;
- if(_vector.size() <= index){
+ if (static_cast<int>(_vector.size()) <= index){
std::vector<double> out;
out.push_back(0);
out.push_back(1);
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 07edf6039..287828d32 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -1287,9 +1287,9 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom,
if(to_guides) {
gchar *cross_number;
if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) {
- cross_number= g_strdup_printf(_("Crossing %u"), idx);
+ cross_number= g_strdup_printf(_("Crossing %lu"), static_cast<unsigned long>(idx));
} else {
- cross_number= g_strdup_printf(_("Crossing %u"), idx + 1);
+ cross_number= g_strdup_printf(_("Crossing %lu"), static_cast<unsigned long>(idx + 1));
}
if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true) && idx == 0) {
setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::rad_from_deg(90), "");
diff --git a/src/unclump.cpp b/src/unclump.cpp
index 2c6840425..5ec5cfce4 100644
--- a/src/unclump.cpp
+++ b/src/unclump.cpp
@@ -342,7 +342,9 @@ unclump (std::vector<SPItem*> &items)
std::list<SPItem*> nei;
std::list<SPItem*> rest;
- for(int i=0;i<items.size();i++)rest.push_front(items[items.size()-i-1]);
+ for (int i=0; i < static_cast<int>(items.size()); i++) {
+ rest.push_front(items[items.size() - i - 1]);
+ }
rest.remove(item);
while (!rest.empty()) {
@@ -352,7 +354,9 @@ unclump (std::vector<SPItem*> &items)
rest.remove(closest);
std::vector<SPItem*> new_rest = unclump_remove_behind (item, closest, rest);
rest.clear();
- for(int i=0;i<new_rest.size();i++)rest.push_front(new_rest[new_rest.size()-i-1]);
+ for (int i=0; i < static_cast<int>(new_rest.size()); i++) {
+ rest.push_front(new_rest[new_rest.size() - i - 1]);
+ }
} else {
break;
}