summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe CorrĂȘa da Silva Sanches <juca@members.fsf.org>2018-03-27 19:45:22 +0000
committerFelipe CorrĂȘa da Silva Sanches <juca@members.fsf.org>2018-03-27 19:46:35 +0000
commit5e6745da63bc715ca8e52ad859971ac669226951 (patch)
tree589ff8f175d0689cfae7c7cc29a8698a68a62587
parentmove FTFixedToDouble / FTDoubleToFixed to a common header (diff)
downloadinkscape-5e6745da63bc715ca8e52ad859971ac669226951.tar.gz
inkscape-5e6745da63bc715ca8e52ad859971ac669226951.zip
Minor cleanup of warnings. No functional change.
-rw-r--r--src/inkscape.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/path-chemistry.cpp4
-rw-r--r--src/selcue.cpp2
-rw-r--r--src/splivarot.cpp2
-rw-r--r--src/ui/widget/object-composite-settings.cpp2
-rw-r--r--src/ui/widget/page-sizer.cpp7
-rw-r--r--src/ui/widget/selected-style.cpp6
8 files changed, 9 insertions, 18 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 996f72420..52072de0b 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -766,8 +766,6 @@ bool Application::load_menus()
{
using namespace Inkscape::IO::Resource;
Glib::ustring filename = get_filename(UIS, MENUS_FILE);
- gchar *menus_xml = 0;
- gsize len = 0;
_menus = sp_repr_read_file(filename.c_str(), NULL);
if ( !_menus ) {
diff --git a/src/main.cpp b/src/main.cpp
index 34f318b15..4a3b2d4ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -772,7 +772,7 @@ static void fixupSingleFilename( gchar **orig, gchar **spare )
static void fixupFilenameEncoding( std::vector<gchar*> &filenames)
{
- for (int i=0; i<filenames.size(); ++i ) {
+ for (unsigned int i=0; i<filenames.size(); ++i) {
gchar *fn = filenames[i];
gchar *newFileName = Inkscape::IO::locale_to_utf8_fallback(fn, -1, NULL, NULL, NULL);
if ( newFileName ) {
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index 5af000967..7ee811dc9 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -1,4 +1,4 @@
- /*
+/*
* Here are handlers for modifying selections, specific to paths
*
* Authors:
@@ -61,8 +61,8 @@ void
ObjectSet::combine(bool skip_undo)
{
//Inkscape::Selection *selection = desktop->getSelection();
+ //Inkscape::Preferences *prefs = Inkscape::Preferences::get();
SPDocument *doc = document();
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
std::vector<SPItem*> items_copy(items().begin(), items().end());
if (items_copy.size() < 1) {
diff --git a/src/selcue.cpp b/src/selcue.cpp
index b97b8ba26..8ef3aa03a 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -97,7 +97,7 @@ void Inkscape::SelCue::_updateItemBboxes(Inkscape::Preferences *prefs)
void Inkscape::SelCue::_updateItemBboxes(gint mode, int prefs_bbox)
{
auto items = _selection->items();
- if (_item_bboxes.size() != boost::distance(items)) {
+ if (_item_bboxes.size() != (unsigned int) boost::distance(items)) {
_newItemBboxes();
return;
}
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 2a4ac9c34..ff5ea8d78 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -1408,7 +1408,7 @@ sp_item_path_outline(SPItem *item, SPDesktop *desktop, bool legacy)
//The fill
Inkscape::XML::Node *fill = NULL;
if (!legacy) {
- gchar const *f_val = sp_repr_css_property(ncsf, "fill", NULL);
+// gchar const *f_val = sp_repr_css_property(ncsf, "fill", NULL);
if( !item->style->fill.noneSet ){
fill = xml_doc->createElement("svg:path");
sp_repr_css_change(fill, ncsf, "style");
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 161f5ba4f..3677233bc 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -48,8 +48,6 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
_filter_modifier.signal_blur_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_blendBlurValueChanged));
_filter_modifier.signal_opacity_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged));
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-
show_all_children();
}
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index c9b3664fc..805333f8e 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -22,15 +22,10 @@
#endif
#include "page-sizer.h"
-
#include <glibmm/i18n.h>
-
#include "verbs.h"
-
#include "helper/action.h"
-
#include "object/sp-root.h"
-
#include "ui/widget/button.h"
using std::pair;
@@ -922,7 +917,7 @@ PageSizer::on_margin_lock_changed()
double left = _marginLeft.getValue();
double right = _marginRight.getValue();
double top = _marginTop.getValue();
- double bottom = _marginBottom.getValue();
+ //double bottom = _marginBottom.getValue();
if (Geom::are_near(left,right)) {
if (Geom::are_near(left, top)) {
on_margin_changed(&_marginBottom);
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 3988ca544..a15afde4c 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -121,6 +121,8 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
:
current_stroke_width(0),
+ _sw_unit(NULL),
+
_desktop (NULL),
_table(),
_fill_label (_("Fill:")),
@@ -141,9 +143,7 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
_stroke_width_place(this),
_stroke_width (""),
- _opacity_blocked (false),
-
- _sw_unit(NULL)
+ _opacity_blocked (false)
{
set_name("SelectedStyle");
_drop[0] = _drop[1] = 0;