From: dooglus Date: Sat, 8 Sep 2007 15:33:07 +0000 (+0000) Subject: Prevent compiler warnings about unused parameters. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git Prevent compiler warnings about unused parameters. git-svn-id: http://svn.voria.com/code@631 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/ETL/trunk/ETL/_mutex_null.h b/ETL/trunk/ETL/_mutex_null.h index 35c1d66..6c0d21e 100644 --- a/ETL/trunk/ETL/_mutex_null.h +++ b/ETL/trunk/ETL/_mutex_null.h @@ -54,7 +54,7 @@ public: class lock { public: - lock(mutex_null &x) { } + lock(mutex_null &/*x*/) { } }; void lock_mutex(){} diff --git a/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp b/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp index 3c2c155..d7b87db 100644 --- a/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/booleancurve.cpp @@ -108,14 +108,14 @@ Layer::Vocab BooleanCurve::get_param_vocab()const return ret; } -Color BooleanCurve::get_color(Context context, const Point &pos)const +Color BooleanCurve::get_color(Context /*context*/, const Point &/*pos*/)const { Color c(Color::alpha()); return c; } -bool BooleanCurve::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const +bool BooleanCurve::accelerated_render(Context /*context*/,Surface */*surface*/,int /*quality*/, const RendDesc &/*renddesc*/, ProgressCallback */*cb*/)const { return false; } diff --git a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp index 60cf672..b42e94f 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp @@ -122,7 +122,7 @@ bmp_mptr::~bmp_mptr() } bool -bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *cb) +bmp_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb) { FILE *file=fopen(filename.c_str(),"rb"); if(!file) diff --git a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp index bfc484a..ee9f7c7 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp @@ -245,7 +245,7 @@ bmp::start_frame(synfig::ProgressCallback *callback) } Color * -bmp::start_scanline(int scanline) +bmp::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp index e2ec32a..8fcaabe 100644 --- a/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp +++ b/synfig-core/trunk/src/modules/mod_dv/trgt_dv.cpp @@ -151,7 +151,7 @@ dv_trgt::end_frame() } bool -dv_trgt::start_frame(synfig::ProgressCallback *callback) +dv_trgt::start_frame(synfig::ProgressCallback */*callback*/) { int w=desc.get_w(),h=desc.get_h(); @@ -172,7 +172,7 @@ dv_trgt::start_frame(synfig::ProgressCallback *callback) } Color * -dv_trgt::start_scanline(int scanline) +dv_trgt::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp index d42677a..cf82354 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp @@ -150,7 +150,7 @@ ffmpeg_trgt::end_frame() } bool -ffmpeg_trgt::start_frame(synfig::ProgressCallback *callback) +ffmpeg_trgt::start_frame(synfig::ProgressCallback */*callback*/) { int w=desc.get_w(),h=desc.get_h(); @@ -170,7 +170,7 @@ ffmpeg_trgt::start_frame(synfig::ProgressCallback *callback) } Color * -ffmpeg_trgt::start_scanline(int scanline) +ffmpeg_trgt::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp index c7083e1..b8977a9 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp @@ -93,13 +93,13 @@ Halftone2::color_func(const Point &point, float supersample,const Color& color)c } inline float -Halftone2::calc_supersample(const synfig::Point &x, float pw,float ph)const +Halftone2::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { return abs(pw/(halftone.size).mag()); } synfig::Layer::Handle -Halftone2::hit_check(synfig::Context context, const synfig::Point &point)const +Halftone2::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const { return const_cast(this); } diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp index b46ee6f..87d44af 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp @@ -229,13 +229,13 @@ Halftone3::color_func(const Point &point, float supersample,const Color& in_colo } inline float -Halftone3::calc_supersample(const synfig::Point &x, float pw,float ph)const +Halftone3::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { return abs(pw/(tone[0].size).mag()); } synfig::Layer::Handle -Halftone3::hit_check(synfig::Context context, const synfig::Point &point)const +Halftone3::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const { return const_cast(this); } diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp index 9ae4af2..7d48f05 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp @@ -386,7 +386,7 @@ CurveGradient::color_func(const Point &point_, int quality, float supersample)co } float -CurveGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const +CurveGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { return pw; } diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp index 603e761..182cecd 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp @@ -118,7 +118,7 @@ LinearGradient::color_func(const Point &point, float supersample)const } float -LinearGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const +LinearGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { return pw/(p2-p1).mag(); } diff --git a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp index 13de595..8359032 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp @@ -172,7 +172,7 @@ RadialGradient::color_func(const Point &point, float supersample)const float -RadialGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const +RadialGradient::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const { // return sqrt(pw*pw+ph*ph)/radius; return 1.2*pw/radius; diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp index 0ff6346..f4427b1 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp @@ -170,7 +170,7 @@ SpiralGradient::color_func(const Point &pos, float supersample)const } float -SpiralGradient::calc_supersample(const synfig::Point &x, float pw,float ph)const +SpiralGradient::calc_supersample(const synfig::Point &x, float pw,float /*ph*/)const { return (1.41421*pw/radius+(1.41421*pw/Point(x-center).mag())/(PI*2))*0.5; } diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp index bd577ac..390f611 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp @@ -72,7 +72,7 @@ imagemagick_mptr::~imagemagick_mptr() } bool -imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *cb) +imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb) { //#define HAS_LIBPNG 1 diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp index 99dd425..0d0cdff 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp @@ -142,7 +142,7 @@ imagemagick_trgt::start_frame(synfig::ProgressCallback *cb) } Color * -imagemagick_trgt::start_scanline(int scanline) +imagemagick_trgt::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp index cc81bb1..ee2f418 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_jpeg/mptr_jpeg.cpp @@ -249,7 +249,7 @@ jpeg_mptr::~jpeg_mptr() } bool -jpeg_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) +jpeg_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback */*cb*/) { surface.mirror(surface_buffer); return true; diff --git a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp index c0c116c..fc6557e 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp @@ -180,7 +180,7 @@ jpeg_trgt::end_frame() } Color * -jpeg_trgt::start_scanline(int scanline) +jpeg_trgt::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp index 5552793..667968b 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/mptr.cpp @@ -66,7 +66,7 @@ Importer_LibAVCodec::~Importer_LibAVCodec() } bool -Importer_LibAVCodec::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) +Importer_LibAVCodec::get_frame(synfig::Surface &/*surface*/,Time, synfig::ProgressCallback */*cb*/) { return false; } diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp index 93f0d08..3881ca1 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp @@ -454,7 +454,7 @@ public: return true; } - void close(AVFormatContext *formatc, AVStream *stream) + void close(AVFormatContext */*formatc*/, AVStream *stream) { if(stream) avcodec_close(stream->codec); @@ -745,7 +745,7 @@ public: } // add an audio output stream - AVStream *add_audio_stream(int codec_id,const AudioInfo &aInfo) + AVStream *add_audio_stream(int codec_id,const AudioInfo &/*aInfo*/) { AVCodecContext *context; AVStream *stream; @@ -905,7 +905,7 @@ Target_LibAVCodec::end_frame() } bool -Target_LibAVCodec::start_frame(synfig::ProgressCallback *callback) +Target_LibAVCodec::start_frame(synfig::ProgressCallback */*callback*/) { //prepare all the color buffer stuff, etc. diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp index 45f3179..837189e 100644 --- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp @@ -74,7 +74,7 @@ NoiseDistort::NoiseDistort(): } inline Color -NoiseDistort::color_func(const Point &point, float supersample,Context context)const +NoiseDistort::color_func(const Point &point, float /*supersample*/,Context context)const { Color ret(0,0,0,0); @@ -121,7 +121,7 @@ NoiseDistort::color_func(const Point &point, float supersample,Context context)c } inline float -NoiseDistort::calc_supersample(const synfig::Point &x, float pw,float ph)const +NoiseDistort::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const { return 0.0f; } diff --git a/synfig-core/trunk/src/modules/mod_noise/noise.cpp b/synfig-core/trunk/src/modules/mod_noise/noise.cpp index c3e1e5e..797c430 100644 --- a/synfig-core/trunk/src/modules/mod_noise/noise.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/noise.cpp @@ -79,7 +79,7 @@ Noise::Noise(): inline Color -Noise::color_func(const Point &point, float pixel_size,Context context)const +Noise::color_func(const Point &point, float pixel_size,Context /*context*/)const { Color ret(0,0,0,0); @@ -169,7 +169,7 @@ Noise::color_func(const Point &point, float pixel_size,Context context)const } inline float -Noise::calc_supersample(const synfig::Point &x, float pw,float ph)const +Noise::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const { return 0.0f; } diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp index d77732f..b485f27 100644 --- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp @@ -67,7 +67,7 @@ SYNFIG_IMPORTER_SET_CVS_ID(png_mptr,"$Id$"); /* === M E T H O D S ======================================================= */ void -png_mptr::png_out_error(png_struct *png_data,const char *msg) +png_mptr::png_out_error(png_struct */*png_data*/,const char *msg) { //png_mptr *me=(png_mptr*)png_data->error_ptr; synfig::error(strprintf("png_mptr: error: %s",msg)); @@ -75,7 +75,7 @@ png_mptr::png_out_error(png_struct *png_data,const char *msg) } void -png_mptr::png_out_warning(png_struct *png_data,const char *msg) +png_mptr::png_out_warning(png_struct */*png_data*/,const char *msg) { //png_mptr *me=(png_mptr*)png_data->error_ptr; synfig::warning(strprintf("png_mptr: warning: %s",msg)); @@ -83,7 +83,7 @@ png_mptr::png_out_warning(png_struct *png_data,const char *msg) } int -png_mptr::read_chunk_callback(png_struct *png_data, png_unknown_chunkp chunk) +png_mptr::read_chunk_callback(png_struct */*png_data*/, png_unknown_chunkp /*chunk*/) { /* The unknown chunk structure contains your chunk data: */ @@ -326,7 +326,7 @@ png_mptr::~png_mptr() } bool -png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) +png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback */*cb*/) { surface.mirror(surface_buffer); // surface=surface_buffer; diff --git a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp index 00c057d..e1bba49 100644 --- a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp @@ -221,7 +221,7 @@ png_trgt::start_frame(synfig::ProgressCallback *callback) } Color * -png_trgt::start_scanline(int scanline) +png_trgt::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp index 252bd47..502c60e 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp @@ -134,7 +134,7 @@ ppm::start_frame(synfig::ProgressCallback *callback) } Color * -ppm::start_scanline(int scanline) +ppm::start_scanline(int /*scanline*/) { return color_buffer; } diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp b/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp index 8dcfb5e..3f65801 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp +++ b/synfig-core/trunk/src/modules/mod_yuv420p/trgt_yuv.cpp @@ -93,7 +93,7 @@ yuv::set_rend_desc(RendDesc *given_desc) } bool -yuv::start_frame(synfig::ProgressCallback *callback) +yuv::start_frame(synfig::ProgressCallback */*callback*/) { return static_cast(file); } diff --git a/synfig-core/trunk/src/synfig/context.cpp b/synfig-core/trunk/src/synfig/context.cpp index 247dac1..49e9843 100644 --- a/synfig-core/trunk/src/synfig/context.cpp +++ b/synfig-core/trunk/src/synfig/context.cpp @@ -308,7 +308,7 @@ Context::set_time(Time time)const } void -Context::set_time(Time time,const Vector &pos)const +Context::set_time(Time time,const Vector &/*pos*/)const { set_time(time); /* diff --git a/synfig-core/trunk/src/synfig/curveset.cpp b/synfig-core/trunk/src/synfig/curveset.cpp index 2e607bd..4d02410 100644 --- a/synfig-core/trunk/src/synfig/curveset.cpp +++ b/synfig-core/trunk/src/synfig/curveset.cpp @@ -304,7 +304,7 @@ public: } } - bool ConstructSet(CurveSet &c, const CurveSet &lhs, const CurveSet &rhs, int type) + bool ConstructSet(CurveSet &/*c*/, const CurveSet &lhs, const CurveSet &rhs, int type) { bool in1,in2; @@ -428,7 +428,7 @@ void CurveSet::SetClamp(int &i, int &si) } } -void CurveSet::CleanUp(int curve) +void CurveSet::CleanUp(int /*curve*/) { } @@ -446,17 +446,17 @@ void CurveSet::CleanUp(int curve) - only works with odd-even rule */ -CurveSet CurveSet::operator &(const CurveSet &rhs) const +CurveSet CurveSet::operator &(const CurveSet &/*rhs*/) const { return *this; } -CurveSet CurveSet::operator |(const CurveSet &rhs) const +CurveSet CurveSet::operator |(const CurveSet &/*rhs*/) const { return *this; } -CurveSet CurveSet::operator -(const CurveSet &rhs) const +CurveSet CurveSet::operator -(const CurveSet &/*rhs*/) const { return *this; } diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h index 43e768d..dce5542 100644 --- a/synfig-core/trunk/src/synfig/general.h +++ b/synfig-core/trunk/src/synfig/general.h @@ -83,10 +83,10 @@ class ProgressCallback public: virtual ~ProgressCallback() { } - virtual bool task(const String &task) { return true; } - virtual bool error(const String &task) { return true; } - virtual bool warning(const String &task) { return true; } - virtual bool amount_complete(int current, int total) { return true; } + virtual bool task(const String &/*task*/) { return true; } + virtual bool error(const String &/*task*/) { return true; } + virtual bool warning(const String &/*task*/) { return true; } + virtual bool amount_complete(int /*current*/, int /*total*/) { return true; } virtual bool valid() const { return true; } }; diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index b7d8307..0d4f398 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -425,7 +425,7 @@ Layer::get_version()const } bool -Layer::set_version(const String &ver) +Layer::set_version(const String &/*ver*/) { return false; } @@ -466,7 +466,7 @@ Layer::hit_check(synfig::Context context, const synfig::Point &pos)const ** is anything but accelerated... */ bool -Layer::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb) const +Layer::accelerated_render(Context context,Surface *surface,int /*quality*/, const RendDesc &renddesc, ProgressCallback *cb) const { handle target=surface_target(surface); if(!target) diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 2dd949e..3a9c52d 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -316,7 +316,7 @@ struct CurveArray degrees.push_back(2); } - static int intersect_conic(Real x, Real y, Point *p, int level = 0) + static int intersect_conic(Real x, Real y, Point *p, int /*level*/ = 0) { Real ymin,ymax,xmin,xmax; int intersects = 0; @@ -471,7 +471,7 @@ struct CurveArray } } - static int intersect_cubic(Real x, Real y, Point *p, int level = 0) + static int intersect_cubic(Real x, Real y, Point *p, int /*level*/ = 0) { const Real INVALIDROOT = -FLT_MAX; Real ymin,ymax,xmin,xmax; @@ -2614,7 +2614,7 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co } bool -Layer_Shape::render_shape(Surface *surface,bool useblend,int quality, +Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, const RendDesc &renddesc, ProgressCallback *cb)const { int tmp(0); @@ -2854,8 +2854,8 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int quality, } bool -Layer_Shape::render_shape(surface *surface,int quality, - const RendDesc &renddesc, ProgressCallback *cb)const +Layer_Shape::render_shape(surface *surface,int /*quality*/, + const RendDesc &renddesc, ProgressCallback */*cb*/)const { // If our amount is set to zero, no need to render anything if(!get_amount()) diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index 6a532ea..073a9b7 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -147,7 +147,7 @@ synfig::check_version_(int version,int vec_size, int color_size,int canvas_size, return ret; } -static void broken_pipe_signal (int sig) { +static void broken_pipe_signal (int /*sig*/) { synfig::warning("Broken Pipe..."); } diff --git a/synfig-core/trunk/src/synfig/module.h b/synfig-core/trunk/src/synfig/module.h index 90fe77c..071e8e7 100644 --- a/synfig-core/trunk/src/synfig/module.h +++ b/synfig-core/trunk/src/synfig/module.h @@ -75,14 +75,14 @@ synfig::Module* _##x##_LTX_new_instance(synfig::ProgressCallback *cb) \ { if(SYNFIG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\ if(cb)cb->error(#x": Unable to load module due to version mismatch."); return NULL; } \ - }; x##_modclass::x##_modclass(synfig::ProgressCallback *cb) { + }; x##_modclass::x##_modclass(synfig::ProgressCallback */*cb*/) { #else //! Marks the start of a module's inventory #define MODULE_INVENTORY_BEGIN(x) extern "C" { \ synfig::Module* x##_LTX_new_instance(synfig::ProgressCallback *cb) \ { if(SYNFIG_CHECK_VERSION()){x##_modclass *mod=new x##_modclass(cb); mod->constructor_(cb); return mod; }\ if(cb)cb->error(#x": Unable to load module due to version mismatch."); return NULL; } \ - }; x##_modclass::x##_modclass(synfig::ProgressCallback *cb) { + }; x##_modclass::x##_modclass(synfig::ProgressCallback */*cb*/) { #endif //! Marks the start of the layers in the module's inventory @@ -133,7 +133,7 @@ class ProgressCallback; class Module : public etl::shared_object { public: - bool constructor_(synfig::ProgressCallback *cb) { return true; } + bool constructor_(synfig::ProgressCallback */*cb*/) { return true; } virtual void destructor_() { } typedef etl::handle Handle; diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp index cb47847..690277c 100644 --- a/synfig-core/trunk/src/synfig/savecanvas.cpp +++ b/synfig-core/trunk/src/synfig/savecanvas.cpp @@ -96,7 +96,7 @@ xmlpp::Element* encode_real(xmlpp::Element* root,Real v) return root; } -xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float fps=0) +xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float /*fps*/=0) { root->set_name("time"); //root->set_attribute("value",t.get_string(fps)); diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp index 6eef588..f783d9c 100644 --- a/synfig-core/trunk/src/synfig/surface.cpp +++ b/synfig-core/trunk/src/synfig/surface.cpp @@ -90,7 +90,7 @@ target2surface::set_rend_desc(synfig::RendDesc *newdesc) } bool -target2surface::start_frame(synfig::ProgressCallback *cb) +target2surface::start_frame(synfig::ProgressCallback */*cb*/) { if(surface->get_w() != desc.get_w() || surface->get_h() != desc.get_h()) { diff --git a/synfig-core/trunk/src/synfig/target_null.h b/synfig-core/trunk/src/synfig/target_null.h index 2ffb19e..45c90f2 100644 --- a/synfig-core/trunk/src/synfig/target_null.h +++ b/synfig-core/trunk/src/synfig/target_null.h @@ -52,16 +52,16 @@ public: ~Target_Null() { delete buffer; } - virtual bool start_frame(ProgressCallback *cb=NULL) + virtual bool start_frame(ProgressCallback */*cb*/=NULL) { delete buffer; buffer=new Color[desc.get_w()*sizeof(Color)]; return true; } virtual void end_frame() { delete buffer; buffer=0; return; } - virtual Color * start_scanline(int scanline) { return buffer; } + virtual Color * start_scanline(int /*scanline*/) { return buffer; } virtual bool end_scanline() { return true; } - static Target* create(const char *filename=0) { return new Target_Null(); } + static Target* create(const char */*filename*/=0) { return new Target_Null(); } }; // END of class Target_Null }; // END of namespace synfig diff --git a/synfig-core/trunk/src/synfig/target_null_tile.h b/synfig-core/trunk/src/synfig/target_null_tile.h index 2ad283f..f493e2b 100644 --- a/synfig-core/trunk/src/synfig/target_null_tile.h +++ b/synfig-core/trunk/src/synfig/target_null_tile.h @@ -49,14 +49,14 @@ class Target_Null_Tile : public Target_Tile public: ~Target_Null_Tile() { } - virtual bool add_tile(const synfig::Surface &surface, int x, int y) { return true; } + virtual bool add_tile(const synfig::Surface &/*surface*/, int /*x*/, int /*y*/) { return true; } - virtual bool start_frame(ProgressCallback *cb=NULL) + virtual bool start_frame(ProgressCallback */*cb*/=NULL) { return true; } virtual void end_frame() { return; } - static Target* create(const char *filename=0) { return new Target_Null_Tile(); } + static Target* create(const char */*filename*/=0) { return new Target_Null_Tile(); } }; // END of class Target_Null_Tile }; // END of namespace synfig diff --git a/synfig-core/trunk/src/synfig/timepointcollect.cpp b/synfig-core/trunk/src/synfig/timepointcollect.cpp index 3a6a74a..b2a0424 100644 --- a/synfig-core/trunk/src/synfig/timepointcollect.cpp +++ b/synfig-core/trunk/src/synfig/timepointcollect.cpp @@ -134,7 +134,7 @@ synfig::waypoint_collect(set >& waypoint_set,const //! \writeme int -synfig::activepoint_collect(set >& activepoint_set,const Time& time, const etl::handle& node) +synfig::activepoint_collect(set >& /*activepoint_set*/,const Time& time, const etl::handle& node) { const TimePointSet& timepoint_set(node->get_times()); diff --git a/synfig-core/trunk/src/synfig/value.h b/synfig-core/trunk/src/synfig/value.h index 3e843a6..ceb8fca 100644 --- a/synfig-core/trunk/src/synfig/value.h +++ b/synfig-core/trunk/src/synfig/value.h @@ -294,9 +294,9 @@ public: static const Type get_type(const etl::loose_handle&) { return TYPE_CANVAS; } static const Type get_type(const list_type&) { return TYPE_LIST; } - template static const Type get_type(const std::vector &x) + template static const Type get_type(const std::vector &/*x*/) { return TYPE_LIST; } - template static const Type get_type(const std::list &x) + template static const Type get_type(const std::list &/*x*/) { return TYPE_LIST; } // ======================================================================== diff --git a/synfig-core/trunk/src/synfig/valuenode.cpp b/synfig-core/trunk/src/synfig/valuenode.cpp index 4a66e6a..ee0feb8 100644 --- a/synfig-core/trunk/src/synfig/valuenode.cpp +++ b/synfig-core/trunk/src/synfig/valuenode.cpp @@ -430,7 +430,7 @@ PlaceholderValueNode::create(ValueBase::Type type) } ValueBase -PlaceholderValueNode::operator()(Time t)const +PlaceholderValueNode::operator()(Time /*t*/)const { assert(0); return ValueBase(); diff --git a/synfig-core/trunk/src/synfig/valuenode.h b/synfig-core/trunk/src/synfig/valuenode.h index 145a3dd..ccc11d4 100644 --- a/synfig-core/trunk/src/synfig/valuenode.h +++ b/synfig-core/trunk/src/synfig/valuenode.h @@ -173,7 +173,7 @@ public: public: //! Returns the value of the ValueNode at time \a t - virtual ValueBase operator()(Time t)const + virtual ValueBase operator()(Time /*t*/)const { return ValueBase(); } //! \internal Sets the id of the ValueNode @@ -256,7 +256,7 @@ public: static Handle create(ValueBase::Type type=ValueBase::TYPE_NIL); protected: - virtual void get_times_vfunc(Node::time_set &set) const {} + virtual void get_times_vfunc(Node::time_set &/*set*/) const {} }; // END of class PlaceholderValueNode diff --git a/synfig-core/trunk/src/synfig/valuenode_const.cpp b/synfig-core/trunk/src/synfig/valuenode_const.cpp index a9958d8..c38565d 100644 --- a/synfig-core/trunk/src/synfig/valuenode_const.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_const.cpp @@ -85,7 +85,7 @@ ValueNode_Const::~ValueNode_Const() ValueBase -ValueNode_Const::operator()(Time t)const +ValueNode_Const::operator()(Time /*t*/)const { return value; } @@ -126,6 +126,6 @@ ValueNode_Const::get_local_name()const return _("Constant"); } -void ValueNode_Const::get_times_vfunc(Node::time_set &set) const +void ValueNode_Const::get_times_vfunc(Node::time_set &/*set*/) const { } diff --git a/synfig-core/trunk/src/synfig/valuenode_reference.cpp b/synfig-core/trunk/src/synfig/valuenode_reference.cpp index f2d0ace..f1d7189 100644 --- a/synfig-core/trunk/src/synfig/valuenode_reference.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_reference.cpp @@ -109,7 +109,7 @@ ValueNode_Reference::link_local_name(int i)const } String -ValueNode_Reference::link_name(int i)const +ValueNode_Reference::link_name(int /*i*/)const { return "link"; } diff --git a/synfig-core/trunk/src/synfig/vector.h b/synfig-core/trunk/src/synfig/vector.h index e44137a..c509c3c 100644 --- a/synfig-core/trunk/src/synfig/vector.h +++ b/synfig-core/trunk/src/synfig/vector.h @@ -271,7 +271,7 @@ public: { return (&a)[i]; } //! Bezier curve intersection function - time_type intersect(const bezier_base &x, time_type near=0.0)const + time_type intersect(const bezier_base &/*x*/, time_type /*near*/=0.0)const { return 0; } diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp index 424d2ea..14f6b74 100644 --- a/synfig-core/trunk/src/tool/main.cpp +++ b/synfig-core/trunk/src/tool/main.cpp @@ -122,7 +122,7 @@ public: } virtual bool - amount_complete(int current, int total) + amount_complete(int /*current*/, int /*total*/) { return true; } diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index cc7874a..c45d4c3 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -352,7 +352,7 @@ public: } virtual bool - amount_complete(int current, int total) + amount_complete(int /*current*/, int /*total*/) { while(studio::App::events_pending())studio::App::iteration(false); return true; @@ -458,7 +458,15 @@ int v_key_check(const char* key, U32* serial, U32 appid) } +#ifdef _WIN32 +# ifdef LICENSE_KEY_REQUIRED int check_license(String basedir) +# else +int check_license(String /*basedir*/) +# endif +#else +int check_license(String /*basedir*/) +#endif { #ifdef LICENSE_KEY_REQUIRED String key; @@ -1628,8 +1636,8 @@ App::show_setup() dialog_setup->show(); } -gint Signal_Open_Ok(GtkWidget *widget, int *val){*val=1;return 0;} -gint Signal_Open_Cancel(GtkWidget *widget, int *val){*val=2;return 0;} +gint Signal_Open_Ok(GtkWidget */*widget*/, int *val){*val=1;return 0;} +gint Signal_Open_Cancel(GtkWidget */*widget*/, int *val){*val=2;return 0;} //#ifdef WIN32 //#define USE_WIN32_FILE_DIALOGS 1 diff --git a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp index 745409c..3c64f53 100644 --- a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp +++ b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp @@ -275,7 +275,7 @@ public: alive_flag=false; } - virtual bool start_frame(synfig::ProgressCallback *cb=0) + virtual bool start_frame(synfig::ProgressCallback */*cb*/=0) { return alive_flag; } diff --git a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp index 5b6f1a8..5640ac4 100644 --- a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp +++ b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp @@ -81,7 +81,11 @@ const double delay_factor = 3; struct FSOUND_SAMPLE; using studio::AudioContainer; +#ifdef WITH_FMOD bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector &samples) +#else +bool build_profile(FSOUND_SAMPLE */*sample*/, double &/*samplerate*/, std::vector &/*samples*/) +#endif { #ifdef WITH_FMOD @@ -685,7 +689,11 @@ struct studio::AudioContainer::AudioImp scrubinfo *scrptr; bool is_scrubbing() const {return scrptr != 0;} +#ifdef WITH_FMOD void set_scrubbing(bool s) +#else + void set_scrubbing(bool /*s*/) +#endif { #ifdef WITH_FMOD if(s) @@ -790,7 +798,11 @@ public: //forward interface } //Will override the parameter timevalue if the sound is running, and not if it's not... +#ifdef WITH_FMOD bool get_current_time(double &out) +#else + bool get_current_time(double &/*out*/) +#endif { if(isRunning()) { @@ -850,7 +862,11 @@ bool studio::AudioContainer::load(const string &filename,const string &filedirec return imp->load(filename,filedirectory); } +#ifdef WITH_FMOD handle studio::AudioContainer::get_profile(float samplerate) +#else +handle studio::AudioContainer::get_profile(float /*samplerate*/) +#endif { #ifdef WITH_FMOD @@ -985,8 +1001,13 @@ bool AudioContainer::isPaused() const //----------- Audio imp information ------------------- +#ifdef WITH_FMOD bool studio::AudioContainer::AudioImp::load(const std::string &filename, const std::string &filedirectory) +#else +bool studio::AudioContainer::AudioImp::load(const std::string &/*filename*/, + const std::string &/*filedirectory*/) +#endif { clear(); @@ -1074,7 +1095,11 @@ error: #endif } +#ifdef WITH_FMOD void studio::AudioContainer::AudioImp::play(double t) +#else +void studio::AudioContainer::AudioImp::play(double /*t*/) +#endif { #ifdef WITH_FMOD if(!sample) return; @@ -1161,7 +1186,11 @@ void studio::AudioContainer::AudioImp::clear() playing = false; } +#ifdef WITH_FMOD void AudioContainer::AudioImp::start_scrubbing(double t) +#else +void AudioContainer::AudioImp::start_scrubbing(double /*t*/) +#endif { //synfig::info("Start scrubbing: %lf", t); if(playing) stop(); @@ -1233,7 +1262,11 @@ void AudioContainer::AudioImp::stop_scrubbing() curscrubpos = 0; } +#ifdef WITH_FMOD void AudioContainer::AudioImp::scrub(double t) +#else +void AudioContainer::AudioImp::scrub(double /*t*/) +#endif { #ifdef WITH_FMOD //synfig::info("Scrub to %lf",t); diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 0ad6a31..cbaed03 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -553,13 +553,13 @@ public: } //! Sets which value_nodes should be selected - virtual void set_selected_children(const ChildrenList &children_list) + virtual void set_selected_children(const ChildrenList &/*children_list*/) { return; } //! Sets which value_node should be selected. Empty handle if none. - virtual void set_selected_child(const ChildrenList::value_type &child) + virtual void set_selected_child(const ChildrenList::value_type &/*child*/) { return; } @@ -610,12 +610,12 @@ public: return get_selected_layer_parameters().front(); } - void set_selected_layer_parameters(const LayerParamList &layer_param_list) + void set_selected_layer_parameters(const LayerParamList &/*layer_param_list*/) { return; } - void set_selected_layer_param(const LayerParam &layer_param) + void set_selected_layer_param(const LayerParam &/*layer_param*/) { return; } @@ -1737,7 +1737,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer) } void -CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map* category_map) +CanvasView::register_layer_type(synfig::Layer::Book::value_type &/*lyr*/,std::map* /*category_map*/) { /* if(lyr.second.category==_("Do Not Use")) return; @@ -1757,7 +1757,7 @@ CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map category_map; @@ -2079,7 +2079,7 @@ CanvasView::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamL } bool -CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnID column_id) +CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::ColumnID /*column_id*/) { switch(button) { @@ -3009,7 +3009,7 @@ CanvasView::on_waypoint_delete() } void -CanvasView::on_drop_drag_data_received(const Glib::RefPtr& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time) +CanvasView::on_drop_drag_data_received(const Glib::RefPtr& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time) { // We will make this true once we have a solid drop bool success(false); diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp index fe05759..c5a93e7 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp @@ -72,11 +72,11 @@ CellRenderer_Gradient::~CellRenderer_Gradient() void CellRenderer_Gradient::render_vfunc( const Glib::RefPtr& window, - Gtk::Widget& widget, - const Gdk::Rectangle& background_area, + Gtk::Widget& /*widget*/, + const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& ca, - const Gdk::Rectangle& expose_area, - Gtk::CellRendererState flags) + const Gdk::Rectangle& /*expose_area*/, + Gtk::CellRendererState /*flags*/) { if(!window) return; @@ -86,12 +86,12 @@ CellRenderer_Gradient::render_vfunc( Gtk::CellEditable* CellRenderer_Gradient::start_editing_vfunc( - GdkEvent* event, - Gtk::Widget& widget, - const Glib::ustring& path, - const Gdk::Rectangle& background_area, - const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags) + GdkEvent* /*event*/, + Gtk::Widget& /*widget*/, + const Glib::ustring& /*path*/, + const Gdk::Rectangle& /*background_area*/, + const Gdk::Rectangle& /*cell_area*/, + Gtk::CellRendererState /*flags*/) { return 0; } diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp index 95a9d97..56daa05 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp @@ -199,10 +199,10 @@ void CellRenderer_TimeTrack::render_vfunc( const Glib::RefPtr& window, Gtk::Widget& widget, - const Gdk::Rectangle& background_area, + const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& area_, - const Gdk::Rectangle& expose_area, - Gtk::CellRendererState flags) + const Gdk::Rectangle& /*expose_area*/, + Gtk::CellRendererState /*flags*/) { if(!window) return; @@ -529,7 +529,7 @@ CellRenderer_TimeTrack::render_vfunc( } synfig::ValueNode_Animated::WaypointList::iterator -CellRenderer_TimeTrack::find_waypoint(const synfig::Time& t,const synfig::Time& scope) +CellRenderer_TimeTrack::find_waypoint(const synfig::Time& /*t*/,const synfig::Time& scope) { synfig::ValueNode_Animated *value_node=dynamic_cast(property_value_desc().get_value().get_value_node().get()); @@ -564,11 +564,11 @@ CellRenderer_TimeTrack::find_waypoint(const synfig::Time& t,const synfig::Time& bool CellRenderer_TimeTrack::activate_vfunc( GdkEvent* event, - Gtk::Widget& widget, + Gtk::Widget& /*widget*/, const Glib::ustring& treepath, - const Gdk::Rectangle& background_area, + const Gdk::Rectangle& /*background_area*/, const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags) + Gtk::CellRendererState /*flags*/) { path=treepath; synfig::ValueNode_Animated::WaypointList::iterator iter; diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp index 45490c1..7538607 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp @@ -154,7 +154,7 @@ public: if(parent)parent->grab_focus(); Gtk::CellEditable::on_remove_widget(); } - void start_editing_vfunc(GdkEvent *event) + void start_editing_vfunc(GdkEvent */*event*/) { valuewidget->signal_activate().connect(sigc::mem_fun(*this, &studio::ValueBase_Entry::editing_done)); show(); diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp index e6521ec..35bb28d 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp @@ -169,7 +169,7 @@ ChildrenTreeStore::refresh_canvases() } void -ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) +ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool /*do_children*/) { CanvasTreeStore::refresh_row(row,false); @@ -204,7 +204,7 @@ ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas) } void -ChildrenTreeStore::on_canvas_removed(Canvas::Handle canvas) +ChildrenTreeStore::on_canvas_removed(Canvas::Handle /*canvas*/) { rebuild_canvases(); } @@ -329,7 +329,7 @@ ChildrenTreeStore::on_value_node_changed(etl::handle value_node) } void -ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle new_value_node) +ChildrenTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle /*new_value_node*/) { changed_connection.disconnect(); //if(!execute_changed_queued()) diff --git a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp index 78b65b5..d506058 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp @@ -171,7 +171,7 @@ Dialog_Gradient::on_values_adjusted() } static void -dialog_gradient_value_desc_edit(synfig::Gradient g,synfigapp::ValueDesc x,handle canvas_interface) +dialog_gradient_value_desc_edit(synfig::Gradient /*g*/,synfigapp::ValueDesc /*x*/,handle /*canvas_interface*/) { // canvas_interface->connect_value(x,ValueBase(g)); } diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp index 133ba03..25370ff 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp @@ -337,7 +337,7 @@ GammaPattern::refresh() } bool -GammaPattern::redraw(GdkEventExpose*bleh) +GammaPattern::redraw(GdkEventExpose */*bleh*/) { static const char hlines[] = { 3, 0 }; @@ -410,7 +410,7 @@ BlackLevelSelector::~BlackLevelSelector() } bool -BlackLevelSelector::redraw(GdkEventExpose*bleh) +BlackLevelSelector::redraw(GdkEventExpose */*bleh*/) { const int w(get_width()),h(get_height()); @@ -535,7 +535,7 @@ RedBlueLevelSelector::~RedBlueLevelSelector() } bool -RedBlueLevelSelector::redraw(GdkEventExpose*bleh) +RedBlueLevelSelector::redraw(GdkEventExpose */*bleh*/) { const int w(get_width()),h(get_height()); diff --git a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp index 453a68c..52056a3 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp @@ -50,7 +50,7 @@ using namespace synfig; /* === E N T R Y P O I N T ================================================= */ -studio::Dialog_SoundSelect::Dialog_SoundSelect(Gtk::Window &parent, etl::handle ci) +studio::Dialog_SoundSelect::Dialog_SoundSelect(Gtk::Window &/*parent*/, etl::handle ci) :Dialog(_("Sound Select")), okbutton(_("Ok")), canvas_interface(ci) diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp index 303d8fc..179f7c0 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp @@ -85,17 +85,17 @@ Dock_CanvasSpecific::get_canvas_interface() } void -Dock_CanvasSpecific::init_canvas_view_vfunc(etl::loose_handle canvas_view) +Dock_CanvasSpecific::init_canvas_view_vfunc(etl::loose_handle /*canvas_view*/) { } void -Dock_CanvasSpecific::init_instance_vfunc(etl::loose_handle instance) +Dock_CanvasSpecific::init_instance_vfunc(etl::loose_handle /*instance*/) { } void -Dock_CanvasSpecific::changed_canvas_view_vfunc(etl::loose_handle canvas_view) +Dock_CanvasSpecific::changed_canvas_view_vfunc(etl::loose_handle /*canvas_view*/) { } @@ -109,7 +109,7 @@ Dock_CanvasSpecific::init_instance(etl::handle instance) } void -Dock_CanvasSpecific::delete_instance(etl::handle instance) +Dock_CanvasSpecific::delete_instance(etl::handle /*instance*/) { changed_canvas_view_vfunc(0); } diff --git a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp index cc48ab6..f002b66 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp @@ -255,7 +255,7 @@ static double zoom_to_unit(double f) }else return -999999.0; } -bool studio::Widget_NavView::on_expose_draw(GdkEventExpose *exp) +bool studio::Widget_NavView::on_expose_draw(GdkEventExpose */*exp*/) { //print out the zoom //HACK kind of... diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index fe73d83..89864d6 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -360,7 +360,7 @@ public: } void - on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button) + on_waypoint_clicked(const Glib::ustring &/*path_string*/, synfig::Waypoint waypoint,int button) { /* Gtk::TreePath path(path_string); diff --git a/synfig-studio/trunk/src/gtkmm/dockable.cpp b/synfig-studio/trunk/src/gtkmm/dockable.cpp index 588b5d4..341d223 100644 --- a/synfig-studio/trunk/src/gtkmm/dockable.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockable.cpp @@ -201,7 +201,7 @@ Dockable::on_drag_data_received(const Glib::RefPtr& context, i } void -Dockable::on_drag_end(const Glib::RefPtr&context) +Dockable::on_drag_end(const Glib::RefPtr&/*context*/) { if(!dnd_success_) { @@ -211,13 +211,13 @@ Dockable::on_drag_end(const Glib::RefPtr&context) } void -Dockable::on_drag_begin(const Glib::RefPtr&context) +Dockable::on_drag_begin(const Glib::RefPtr&/*context*/) { dnd_success_=false; } void -Dockable::on_drag_data_get(const Glib::RefPtr&, Gtk::SelectionData& selection_data, guint info, guint time) +Dockable::on_drag_data_get(const Glib::RefPtr&, Gtk::SelectionData& selection_data, guint /*info*/, guint /*time*/) { Dockable* tmp(this); dnd_success_=true; diff --git a/synfig-studio/trunk/src/gtkmm/historytreestore.cpp b/synfig-studio/trunk/src/gtkmm/historytreestore.cpp index e54f31c..1544a61 100644 --- a/synfig-studio/trunk/src/gtkmm/historytreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/historytreestore.cpp @@ -103,7 +103,7 @@ HistoryTreeStore::rebuild() } void -HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle action, bool is_active, bool is_undo, bool is_redo) +HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle action, bool /*is_active*/, bool is_undo, bool is_redo) { assert(action); diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp index 41bdf4c..2e4aa0a 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp @@ -72,7 +72,11 @@ using namespace synfig; static Glib::RefPtr _tree_pixbuf_table_value_type[(int)synfig::ValueBase::TYPE_END]; +#ifdef WIN32 IconControler::IconControler(const synfig::String& basepath) +#else +IconControler::IconControler(const synfig::String& /*basepath*/) +#endif { Gtk::IconSource icon_source; icon_source.set_direction_wildcarded(); diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp index 48ee606..345fec5 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp @@ -188,7 +188,7 @@ KeyframeTreeStore_Class::init() } void -KeyframeTreeStore_Class::class_init_function(gpointer g_class, gpointer class_data) +KeyframeTreeStore_Class::class_init_function(gpointer /*g_class*/, gpointer /*class_data*/) { // ??? } @@ -258,7 +258,7 @@ KeyframeTreeStore::iterator_sane(const Gtk::TreeModel::iterator& iter)const } inline void -KeyframeTreeStore::dump_iterator(const GtkTreeIter* gtk_iter, const Glib::ustring &name)const +KeyframeTreeStore::dump_iterator(const GtkTreeIter* /*gtk_iter*/, const Glib::ustring &/*name*/)const { #if 0 if(!gtk_iter) diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp index 750d1bb..52275c7 100644 --- a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp @@ -465,7 +465,7 @@ LayerGroupTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co bool -LayerGroupTreeStore::row_draggable_vfunc (const TreeModel::Path& path)const +LayerGroupTreeStore::row_draggable_vfunc (const TreeModel::Path& /*path*/)const { //if(!get_iter(path)) return false; // Gtk::TreeModel::Row row(*get_iter(path)); @@ -512,7 +512,7 @@ LayerGroupTreeStore::drag_data_get_vfunc (const TreeModel::Path& path, Gtk::Sele } bool -LayerGroupTreeStore::drag_data_delete_vfunc (const TreeModel::Path& path) +LayerGroupTreeStore::drag_data_delete_vfunc (const TreeModel::Path& /*path*/) { return true; } @@ -842,7 +842,7 @@ LayerGroupTreeStore::on_group_removed(synfig::String group) } bool -LayerGroupTreeStore::on_group_changed(synfig::String group) +LayerGroupTreeStore::on_group_changed(synfig::String /*group*/) { //DEBUGPOINT(); return true; @@ -898,7 +898,7 @@ LayerGroupTreeStore::on_activity() } void -LayerGroupTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool x) +LayerGroupTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool /*x*/) { Gtk::TreeModel::Children::iterator iter; if(find_layer_row(handle,iter)) diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index 928208c..6e098e5 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -519,43 +519,43 @@ LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc) } void -LayerParamTreeStore::on_value_node_added(ValueNode::Handle value_node) +LayerParamTreeStore::on_value_node_added(ValueNode::Handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_deleted(etl::handle value_node) +LayerParamTreeStore::on_value_node_deleted(etl::handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_child_added(synfig::ValueNode::Handle value_node,synfig::ValueNode::Handle child) +LayerParamTreeStore::on_value_node_child_added(synfig::ValueNode::Handle /*value_node*/,synfig::ValueNode::Handle /*child*/) { queue_rebuild(); } void -LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle value_node,synfig::ValueNode::Handle child) +LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*value_node*/,synfig::ValueNode::Handle /*child*/) { rebuild(); } void -LayerParamTreeStore::on_value_node_changed(etl::handle value_node) +LayerParamTreeStore::on_value_node_changed(etl::handle /*value_node*/) { queue_refresh(); } void -LayerParamTreeStore::on_value_node_replaced(synfig::ValueNode::Handle replaced_value_node,synfig::ValueNode::Handle new_value_node) +LayerParamTreeStore::on_value_node_replaced(synfig::ValueNode::Handle /*replaced_value_node*/,synfig::ValueNode::Handle /*new_value_node*/) { queue_rebuild(); } void -LayerParamTreeStore::on_layer_param_changed(synfig::Layer::Handle handle,synfig::String param_name) +LayerParamTreeStore::on_layer_param_changed(synfig::Layer::Handle /*handle*/,synfig::String /*param_name*/) { queue_refresh(); } diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp index c76b003..2b681ff 100644 --- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp @@ -367,7 +367,7 @@ LayerTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int column, bool -LayerTreeStore::row_draggable_vfunc (const TreeModel::Path& path)const +LayerTreeStore::row_draggable_vfunc (const TreeModel::Path& /*path*/)const { //if(!get_iter(path)) return false; // Gtk::TreeModel::Row row(*get_iter(path)); @@ -421,7 +421,7 @@ LayerTreeStore::drag_data_get_vfunc (const TreeModel::Path& path, Gtk::Selection } bool -LayerTreeStore::drag_data_delete_vfunc (const TreeModel::Path& path) +LayerTreeStore::drag_data_delete_vfunc (const TreeModel::Path& /*path*/) { return true; } @@ -837,7 +837,7 @@ LayerTreeStore::on_layer_inserted(synfig::Layer::Handle handle,int depth) } void -LayerTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool x) +LayerTreeStore::on_layer_status_changed(synfig::Layer::Handle handle,bool /*x*/) { Gtk::TreeModel::Children::iterator iter; if(find_layer_row(handle,iter)) @@ -906,7 +906,7 @@ LayerTreeStore::on_layer_raised(synfig::Layer::Handle layer) } void -LayerTreeStore::on_layer_moved(synfig::Layer::Handle layer,int depth, synfig::Canvas::Handle canvas) +LayerTreeStore::on_layer_moved(synfig::Layer::Handle layer,int depth, synfig::Canvas::Handle /*canvas*/) { on_layer_removed(layer); on_layer_inserted(layer,depth); @@ -1022,7 +1022,7 @@ LayerTreeStore::find_canvas_row(synfig::Canvas::Handle canvas, Gtk::TreeModel::C bool -LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canvas::Handle canvas, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter, Gtk::TreeModel::Children::iterator &prev) +LayerTreeStore::find_layer_row_(const synfig::Layer::Handle &layer, synfig::Canvas::Handle /*canvas*/, Gtk::TreeModel::Children layers, Gtk::TreeModel::Children::iterator &iter, Gtk::TreeModel::Children::iterator &prev) { assert(layer); diff --git a/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp b/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp index 53f0714..fc1d645 100644 --- a/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp @@ -79,7 +79,7 @@ MetaDataTreeStore::create(etl::loose_handle canvas_i } void -MetaDataTreeStore::meta_data_changed(synfig::String key) +MetaDataTreeStore::meta_data_changed(synfig::String /*key*/) { rebuild(); } diff --git a/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp b/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp index 9382235..b5ed9a8 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp @@ -216,7 +216,7 @@ StateMirror_Context::refresh_tool_options() } Smach::event_result -StateMirror_Context::event_refresh_tool_options(const Smach::event& x) +StateMirror_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -247,7 +247,7 @@ DuckDrag_Mirror::DuckDrag_Mirror(): #endif void -DuckDrag_Mirror::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& offset) +DuckDrag_Mirror::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& /*offset*/) { diff --git a/synfig-studio/trunk/src/gtkmm/preview.cpp b/synfig-studio/trunk/src/gtkmm/preview.cpp index 0384398..ce8424f 100644 --- a/synfig-studio/trunk/src/gtkmm/preview.cpp +++ b/synfig-studio/trunk/src/gtkmm/preview.cpp @@ -104,7 +104,7 @@ public: return false; } - virtual bool start_frame(ProgressCallback *cb=NULL) + virtual bool start_frame(ProgressCallback */*cb*/=NULL) { return true; } @@ -514,7 +514,7 @@ void studio::Widget_Preview::preview_draw() draw_area.queue_draw();//on_expose_event(); } -bool studio::Widget_Preview::redraw(GdkEventExpose *heh) +bool studio::Widget_Preview::redraw(GdkEventExpose */*heh*/) { //And render the drawing area Glib::RefPtr pxnew, px = currentbuf; diff --git a/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp b/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp index d5553e7..35c94ef 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp @@ -66,7 +66,7 @@ Renderer_BBox::get_bbox() void Renderer_BBox::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp index a1ae816..602236c 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp @@ -91,7 +91,7 @@ Renderer_Canvas::get_rendering()const void Renderer_Canvas::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp b/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp index 088ad2f..fada69a 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp @@ -76,7 +76,7 @@ Renderer_Dragbox::get_enabled_vfunc()const void Renderer_Dragbox::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp index 6058050..735d2a1 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp @@ -81,7 +81,7 @@ struct ScreenDuck void Renderer_Ducks::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp b/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp index 806a19a..727f7b4 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp @@ -69,7 +69,7 @@ Renderer_Grid::get_grid_size()const void Renderer_Grid::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp b/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp index f92753e..c266e5e 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp @@ -191,7 +191,7 @@ Renderer_Guides::event_vfunc(GdkEvent* event) void Renderer_Guides::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp b/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp index 2910a98..7d5f357 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp @@ -75,7 +75,7 @@ Renderer_Timecode::get_grid_size()const void Renderer_Timecode::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index c511366..9211a07 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -163,7 +163,7 @@ public: Smach::event_result event_mouse_motion_handler(const Smach::event& x); Smach::event_result event_refresh_tool_options(const Smach::event& x); - Smach::event_result event_hijack(const Smach::event& x) { return Smach::RESULT_ACCEPT; } + Smach::event_result event_hijack(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } void refresh_tool_options(); @@ -187,7 +187,7 @@ public: bool run(); bool no_egress_on_selection_change; - Smach::event_result event_layer_selection_changed_handler(const Smach::event& x) + Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { if(!no_egress_on_selection_change) throw Smach::egress_exception(); @@ -409,7 +409,7 @@ StateBLine_Context::refresh_tool_options() } Smach::event_result -StateBLine_Context::event_refresh_tool_options(const Smach::event& x) +StateBLine_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -442,7 +442,7 @@ StateBLine_Context::~StateBLine_Context() } Smach::event_result -StateBLine_Context::event_stop_handler(const Smach::event& x) +StateBLine_Context::event_stop_handler(const Smach::event& /*x*/) { synfig::info("STATE RotoBLine: Received Stop Event"); // run(); @@ -453,7 +453,7 @@ StateBLine_Context::event_stop_handler(const Smach::event& x) } Smach::event_result -StateBLine_Context::event_refresh_handler(const Smach::event& x) +StateBLine_Context::event_refresh_handler(const Smach::event& /*x*/) { synfig::info("STATE RotoBLine: Received Refresh Event"); refresh_ducks(); @@ -730,7 +730,7 @@ StateBLine_Context::event_mouse_motion_handler(const Smach::event& x) } Smach::event_result -StateBLine_Context::event_mouse_release_handler(const Smach::event& x) +StateBLine_Context::event_mouse_release_handler(const Smach::event& /*x*/) { if(curr_duck) { diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp index 2484e1a..6309588 100644 --- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp @@ -148,7 +148,7 @@ public: void reset(); void increment_id(); bool no_egress_on_selection_change; - Smach::event_result event_layer_selection_changed_handler(const Smach::event& x) + Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { if(!no_egress_on_selection_change) throw Smach::egress_exception(); @@ -347,7 +347,7 @@ StateCircle_Context::refresh_tool_options() } Smach::event_result -StateCircle_Context::event_refresh_tool_options(const Smach::event& x) +StateCircle_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -376,13 +376,13 @@ StateCircle_Context::~StateCircle_Context() } Smach::event_result -StateCircle_Context::event_stop_handler(const Smach::event& x) +StateCircle_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateCircle_Context::event_refresh_handler(const Smach::event& x) +StateCircle_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index cf26372..4beb8e7 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -515,7 +515,7 @@ StateDraw_Context::refresh_tool_options() } Smach::event_result -StateDraw_Context::event_refresh_tool_options(const Smach::event& x) +StateDraw_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -550,13 +550,13 @@ StateDraw_Context::~StateDraw_Context() } Smach::event_result -StateDraw_Context::event_stop_handler(const Smach::event& x) +StateDraw_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateDraw_Context::event_refresh_handler(const Smach::event& x) +StateDraw_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp index 67fe9e5..711e166 100644 --- a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp @@ -109,7 +109,7 @@ StateEyedrop_Context::~StateEyedrop_Context() } Smach::event_result -StateEyedrop_Context::event_stop_handler(const Smach::event& x) +StateEyedrop_Context::event_stop_handler(const Smach::event& /*x*/) { synfig::info("STATE EYEDROP: Received Stop Event"); throw Smach::egress_exception(); @@ -118,7 +118,7 @@ StateEyedrop_Context::event_stop_handler(const Smach::event& x) } Smach::event_result -StateEyedrop_Context::event_refresh_handler(const Smach::event& x) +StateEyedrop_Context::event_refresh_handler(const Smach::event& /*x*/) { synfig::info("STATE EYEDROP: Received Refresh Event"); canvas_view->work_area->queue_render_preview(); diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp index b09951a..28bfa40 100644 --- a/synfig-studio/trunk/src/gtkmm/state_fill.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_fill.cpp @@ -116,7 +116,7 @@ StateFill_Context::~StateFill_Context() } Smach::event_result -StateFill_Context::event_stop_handler(const Smach::event& x) +StateFill_Context::event_stop_handler(const Smach::event& /*x*/) { synfig::info("STATE FILL: Received Stop Event"); throw Smach::egress_exception(); @@ -125,7 +125,7 @@ StateFill_Context::event_stop_handler(const Smach::event& x) } Smach::event_result -StateFill_Context::event_refresh_handler(const Smach::event& x) +StateFill_Context::event_refresh_handler(const Smach::event& /*x*/) { synfig::info("STATE FILL: Received Refresh Event"); canvas_view->work_area->queue_render_preview(); diff --git a/synfig-studio/trunk/src/gtkmm/state_gradient.cpp b/synfig-studio/trunk/src/gtkmm/state_gradient.cpp index a49767d..124658b 100644 --- a/synfig-studio/trunk/src/gtkmm/state_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_gradient.cpp @@ -134,7 +134,7 @@ public: void make_gradient(const Point& p1, const Point& p2); bool no_egress_on_selection_change; - Smach::event_result event_layer_selection_changed_handler(const Smach::event& x) + Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { if(!no_egress_on_selection_change) throw Smach::egress_exception(); @@ -311,7 +311,7 @@ StateGradient_Context::refresh_tool_options() } Smach::event_result -StateGradient_Context::event_refresh_tool_options(const Smach::event& x) +StateGradient_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -345,13 +345,13 @@ StateGradient_Context::~StateGradient_Context() } Smach::event_result -StateGradient_Context::event_stop_handler(const Smach::event& x) +StateGradient_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateGradient_Context::event_refresh_handler(const Smach::event& x) +StateGradient_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_normal.cpp b/synfig-studio/trunk/src/gtkmm/state_normal.cpp index 1977f9f..f5b98d4 100644 --- a/synfig-studio/trunk/src/gtkmm/state_normal.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_normal.cpp @@ -135,14 +135,14 @@ StateNormal_Context::refresh_tool_options() } Smach::event_result -StateNormal_Context::event_refresh_tool_options(const Smach::event& x) +StateNormal_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; } Smach::event_result -StateNormal_Context::event_stop_handler(const Smach::event& x) +StateNormal_Context::event_stop_handler(const Smach::event& /*x*/) { synfig::info("STATE NORMAL: Received Stop Event"); canvas_view->stop(); @@ -150,7 +150,7 @@ StateNormal_Context::event_stop_handler(const Smach::event& x) } Smach::event_result -StateNormal_Context::event_refresh_handler(const Smach::event& x) +StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/) { synfig::info("STATE NORMAL: Received Refresh Event"); canvas_view->rebuild_tables(); @@ -159,7 +159,7 @@ StateNormal_Context::event_refresh_handler(const Smach::event& x) } Smach::event_result -StateNormal_Context::event_refresh_ducks_handler(const Smach::event& x) +StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/) { synfig::info("STATE NORMAL: Received Refresh Ducks"); canvas_view->queue_rebuild_ducks(); @@ -167,7 +167,7 @@ StateNormal_Context::event_refresh_ducks_handler(const Smach::event& x) } Smach::event_result -StateNormal_Context::event_undo_handler(const Smach::event& x) +StateNormal_Context::event_undo_handler(const Smach::event& /*x*/) { synfig::info("STATE NORMAL: Received Undo Event"); canvas_view->get_instance()->undo(); @@ -175,7 +175,7 @@ StateNormal_Context::event_undo_handler(const Smach::event& x) } Smach::event_result -StateNormal_Context::event_redo_handler(const Smach::event& x) +StateNormal_Context::event_redo_handler(const Smach::event& /*x*/) { synfig::info("STATE NORMAL: Received Redo Event"); canvas_view->get_instance()->redo(); @@ -363,7 +363,7 @@ StateNormal_Context::edit_several_waypoints(std::list valu */ Smach::event_result -StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& x) +StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& /*x*/) { synfig::info("STATE NORMAL: Received multiple duck click event"); diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp index 4701913..ab1138b 100644 --- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp @@ -119,7 +119,7 @@ public: void reset(); void increment_id(); bool no_egress_on_selection_change; - Smach::event_result event_layer_selection_changed_handler(const Smach::event& x) + Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { if(!no_egress_on_selection_change) throw Smach::egress_exception(); @@ -289,7 +289,7 @@ StatePolygon_Context::refresh_tool_options() } Smach::event_result -StatePolygon_Context::event_refresh_tool_options(const Smach::event& x) +StatePolygon_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -320,7 +320,7 @@ StatePolygon_Context::~StatePolygon_Context() } Smach::event_result -StatePolygon_Context::event_stop_handler(const Smach::event& x) +StatePolygon_Context::event_stop_handler(const Smach::event& /*x*/) { synfig::info("STATE RotoPolygon: Received Stop Event"); //throw Smach::egress_exception(); @@ -330,7 +330,7 @@ StatePolygon_Context::event_stop_handler(const Smach::event& x) } Smach::event_result -StatePolygon_Context::event_refresh_handler(const Smach::event& x) +StatePolygon_Context::event_refresh_handler(const Smach::event& /*x*/) { synfig::info("STATE RotoPolygon: Received Refresh Event"); refresh_ducks(); diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp index b934437..50b542e 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp @@ -129,7 +129,7 @@ public: void reset(); void increment_id(); bool no_egress_on_selection_change; - Smach::event_result event_layer_selection_changed_handler(const Smach::event& x) + Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/) { if(!no_egress_on_selection_change) throw Smach::egress_exception(); @@ -302,7 +302,7 @@ StateRectangle_Context::refresh_tool_options() } Smach::event_result -StateRectangle_Context::event_refresh_tool_options(const Smach::event& x) +StateRectangle_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -332,13 +332,13 @@ StateRectangle_Context::~StateRectangle_Context() } Smach::event_result -StateRectangle_Context::event_stop_handler(const Smach::event& x) +StateRectangle_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateRectangle_Context::event_refresh_handler(const Smach::event& x) +StateRectangle_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_rotate.cpp b/synfig-studio/trunk/src/gtkmm/state_rotate.cpp index 424c780..23b84fe 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rotate.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rotate.cpp @@ -207,7 +207,7 @@ StateRotate_Context::refresh_tool_options() } Smach::event_result -StateRotate_Context::event_refresh_tool_options(const Smach::event& x) +StateRotate_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_scale.cpp b/synfig-studio/trunk/src/gtkmm/state_scale.cpp index 8563881..7468cb5 100644 --- a/synfig-studio/trunk/src/gtkmm/state_scale.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_scale.cpp @@ -192,7 +192,7 @@ StateScale_Context::refresh_tool_options() } Smach::event_result -StateScale_Context::event_refresh_tool_options(const Smach::event& x) +StateScale_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp index ad6985c..71a1ec8 100644 --- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp @@ -448,27 +448,27 @@ StateSketch_Context::refresh_tool_options() } Smach::event_result -StateSketch_Context::event_refresh_tool_options(const Smach::event& x) +StateSketch_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; } Smach::event_result -StateSketch_Context::event_yield_tool_options(const Smach::event& x) +StateSketch_Context::event_yield_tool_options(const Smach::event& /*x*/) { yield_tool_options(); return Smach::RESULT_ACCEPT; } Smach::event_result -StateSketch_Context::event_stop_handler(const Smach::event& x) +StateSketch_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateSketch_Context::event_refresh_handler(const Smach::event& x) +StateSketch_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } diff --git a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp index 4ea8de6..1e1539a 100644 --- a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp @@ -204,7 +204,7 @@ StateSmoothMove_Context::refresh_tool_options() } Smach::event_result -StateSmoothMove_Context::event_refresh_tool_options(const Smach::event& x) +StateSmoothMove_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index 479f0ea..0fb53ba 100644 --- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp @@ -144,19 +144,19 @@ StateStroke_Context::~StateStroke_Context() } Smach::event_result -StateStroke_Context::event_refresh_tool_options(const Smach::event& x) +StateStroke_Context::event_refresh_tool_options(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } Smach::event_result -StateStroke_Context::event_stop_handler(const Smach::event& x) +StateStroke_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::pop_exception(); } Smach::event_result -StateStroke_Context::event_refresh_handler(const Smach::event& x) +StateStroke_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } diff --git a/synfig-studio/trunk/src/gtkmm/state_width.cpp b/synfig-studio/trunk/src/gtkmm/state_width.cpp index 5af6765..c7d50bb 100644 --- a/synfig-studio/trunk/src/gtkmm/state_width.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_width.cpp @@ -307,7 +307,7 @@ StateWidth_Context::refresh_tool_options() } Smach::event_result -StateWidth_Context::event_refresh_tool_options(const Smach::event& x) +StateWidth_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -354,13 +354,13 @@ StateWidth_Context::~StateWidth_Context() } Smach::event_result -StateWidth_Context::event_stop_handler(const Smach::event& x) +StateWidth_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateWidth_Context::event_refresh_handler(const Smach::event& x) +StateWidth_Context::event_refresh_handler(const Smach::event& /*x*/) { refresh_ducks(); return Smach::RESULT_ACCEPT; diff --git a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp index 6ff0224..ad1f439 100644 --- a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp @@ -199,7 +199,7 @@ StateZoom_Context::refresh_tool_options() } Smach::event_result -StateZoom_Context::event_refresh_tool_options(const Smach::event& x) +StateZoom_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; @@ -230,13 +230,13 @@ StateZoom_Context::~StateZoom_Context() } Smach::event_result -StateZoom_Context::event_stop_handler(const Smach::event& x) +StateZoom_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateZoom_Context::event_refresh_handler(const Smach::event& x) +StateZoom_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index 3dd4b00..22ba151 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -577,7 +577,7 @@ Toolbox::on_recent_files_changed() } void -Toolbox::on_drop_drag_data_received(const Glib::RefPtr& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time) +Toolbox::on_drop_drag_data_received(const Glib::RefPtr& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time) { // We will make this true once we have a solid drop bool success(false); diff --git a/synfig-studio/trunk/src/gtkmm/valuelink.h b/synfig-studio/trunk/src/gtkmm/valuelink.h index 831d508..a2d999b 100644 --- a/synfig-studio/trunk/src/gtkmm/valuelink.h +++ b/synfig-studio/trunk/src/gtkmm/valuelink.h @@ -45,7 +45,7 @@ class ValueBaseLink : public synfig::LinkableValueNode protected: //stuff I don't want - virtual bool set_link_vfunc(int i,synfig::ValueNode::Handle x) {return false;} + virtual bool set_link_vfunc(int /*i*/,synfig::ValueNode::Handle /*x*/) {return false;} virtual LinkableValueNode* create_new()const {return 0;} //new stuff I need diff --git a/synfig-studio/trunk/src/gtkmm/widget_color.cpp b/synfig-studio/trunk/src/gtkmm/widget_color.cpp index 57cd781..d1b201f 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_color.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_color.cpp @@ -185,7 +185,7 @@ Widget_Color::on_event(GdkEvent *event) } bool -Widget_Color::redraw(GdkEventExpose*bleh) +Widget_Color::redraw(GdkEventExpose */*bleh*/) { //Glib::RefPtr gc(Gdk::GC::create(get_window())); diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp index dd1bb9e..ac85260 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp @@ -114,7 +114,7 @@ ColorSlider::adjust_color(Type type, Color &color, float amount) } bool -ColorSlider::redraw(GdkEventExpose*bleh) +ColorSlider::redraw(GdkEventExpose */*bleh*/) { Color color(color_); diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp index 3ff8b64..08a8a14 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp @@ -454,7 +454,7 @@ Widget_Curves::on_event(GdkEvent *event) } bool -Widget_Curves::redraw(GdkEventExpose*bleh) +Widget_Curves::redraw(GdkEventExpose */*bleh*/) { const int h(get_height()); const int w(get_width()); diff --git a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp index 9f8cb7e..b791ecf 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp @@ -78,7 +78,7 @@ public: } bool - redraw(GdkEventExpose*bleh) + redraw(GdkEventExpose */*bleh*/) { Glib::RefPtr gc(Gdk::GC::create(get_window())); diff --git a/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp b/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp index 945e791..e3235ec 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp @@ -119,7 +119,7 @@ Widget_Gradient::~Widget_Gradient() #define CONTROL_HEIGHT 16 bool -Widget_Gradient::redraw(GdkEventExpose*bleh) +Widget_Gradient::redraw(GdkEventExpose */*bleh*/) { const int h(get_height()); const int w(get_width()); diff --git a/synfig-studio/trunk/src/gtkmm/widget_sound.cpp b/synfig-studio/trunk/src/gtkmm/widget_sound.cpp index d8ad2b3..f0f914b 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_sound.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_sound.cpp @@ -137,7 +137,7 @@ void studio::Widget_Sound::draw() on_expose_event(); } -bool studio::Widget_Sound::on_expose_event(GdkEventExpose *heh) +bool studio::Widget_Sound::on_expose_event(GdkEventExpose */*heh*/) { if(!get_window()) return false; diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp index 67c298a..24241cb 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp @@ -402,7 +402,7 @@ void Widget_Timeslider::refresh() } }*/ -bool Widget_Timeslider::redraw(bool doublebuffer) +bool Widget_Timeslider::redraw(bool /*doublebuffer*/) { Glib::RefPtr window = get_window(); diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.h b/synfig-studio/trunk/src/gtkmm/widget_timeslider.h index ab641b6..925d2b1 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.h +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.h @@ -84,7 +84,7 @@ protected: //implementation that other interfaces can see virtual bool on_button_press_event(GdkEventButton *event); //for clicking virtual bool on_button_release_event(GdkEventButton *event); //for clicking - virtual bool on_expose_event(GdkEventExpose *event) {redraw(); return true;}//for drawing + virtual bool on_expose_event(GdkEventExpose */*event*/) {redraw(); return true;}//for drawing virtual bool redraw(bool doublebuffer = false); diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index 56ee2dc..740efd4 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -262,7 +262,7 @@ public: } - virtual bool start_frame(synfig::ProgressCallback *cb) + virtual bool start_frame(synfig::ProgressCallback */*cb*/) { synfig::Mutex::Lock lock(mutex); @@ -506,7 +506,7 @@ public: } - virtual bool start_frame(synfig::ProgressCallback *cb) + virtual bool start_frame(synfig::ProgressCallback */*cb*/) { return true; } @@ -1781,7 +1781,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event) } bool -WorkArea::on_hruler_event(GdkEvent *event) +WorkArea::on_hruler_event(GdkEvent */*event*/) { /* switch(event->type) @@ -1838,7 +1838,7 @@ WorkArea::on_hruler_event(GdkEvent *event) } bool -WorkArea::on_vruler_event(GdkEvent *event) +WorkArea::on_vruler_event(GdkEvent */*event*/) { /* switch(event->type) @@ -1932,7 +1932,7 @@ WorkArea::screen_to_comp_coords(synfig::Point pos)const } synfig::Point -WorkArea::comp_to_screen_coords(synfig::Point pos)const +WorkArea::comp_to_screen_coords(synfig::Point /*pos*/)const { synfig::warning("WorkArea::comp_to_screen_coords: Not yet implemented"); return synfig::Point(); diff --git a/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp b/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp index 215e031..c69a9ff 100644 --- a/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp @@ -91,15 +91,15 @@ WorkAreaRenderer::set_work_area(WorkArea* x) void WorkAreaRenderer::render_vfunc( - const Glib::RefPtr& window, - const Gdk::Rectangle& expose_area + const Glib::RefPtr& /*window*/, + const Gdk::Rectangle& /*expose_area*/ ) { } bool WorkAreaRenderer::event_vfunc( - GdkEvent* event + GdkEvent* /*event*/ ) { return false; diff --git a/synfig-studio/trunk/src/synfigapp/action.h b/synfig-studio/trunk/src/synfigapp/action.h index 8ead67f..b7244f0 100644 --- a/synfig-studio/trunk/src/synfigapp/action.h +++ b/synfig-studio/trunk/src/synfigapp/action.h @@ -199,7 +199,7 @@ public: //! This function will throw an Action::Error() on failure virtual void perform()=0; - virtual bool set_param(const synfig::String& name, const Param &) { return false; } + virtual bool set_param(const synfig::String& /*name*/, const Param &) { return false; } virtual bool is_ready()const=0; virtual synfig::String get_name()const =0; @@ -322,7 +322,7 @@ public: virtual void prepare() { }; - virtual bool set_param(const synfig::String& name, const Param &)const { return false; } + virtual bool set_param(const synfig::String& /*name*/, const Param &)const { return false; } virtual bool is_ready()const { return ready_; } void set_name(std::string&x) { name_=x; } diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index eb5e9dc..8e76d7f 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -246,7 +246,7 @@ void GetFirstDerivatives(const std::vector &f, unsigned int left, void GetSimpleDerivatives(const std::vector &f, int left, int right, std::vector &df, int outleft, - const std::vector &di) + const std::vector &/*di*/) { int i1,i2,i; int offset = 2; //df = 1/2 (f[i+o]-f[i-o]) diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp index 45882a9..4521c01 100644 --- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp +++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp @@ -463,7 +463,7 @@ CanvasInterface::jump_to_prev_keyframe() } bool -CanvasInterface::import(const synfig::String &filename, bool copy) +CanvasInterface::import(const synfig::String &filename, bool /*copy*/) { Action::PassiveGrouper group(get_instance().get(),_("Import Image")); @@ -617,7 +617,7 @@ CanvasInterface::waypoint_remove(synfigapp::ValueDesc value_desc,synfig::Waypoin void -CanvasInterface::auto_export(ValueNode::Handle value_node) +CanvasInterface::auto_export(ValueNode::Handle /*value_node*/) { /* // Check to see if we are already exported. @@ -643,7 +643,7 @@ CanvasInterface::auto_export(ValueNode::Handle value_node) } void -CanvasInterface::auto_export(const ValueDesc& value_desc) +CanvasInterface::auto_export(const ValueDesc& /*value_desc*/) { // THIS FUNCTION IS DEPRECATED, AND IS NOW A STUB. #if 0 diff --git a/synfig-studio/trunk/src/synfigapp/selectionmanager.h b/synfig-studio/trunk/src/synfigapp/selectionmanager.h index f77fc61..262459b 100644 --- a/synfig-studio/trunk/src/synfigapp/selectionmanager.h +++ b/synfig-studio/trunk/src/synfigapp/selectionmanager.h @@ -119,23 +119,23 @@ public: int get_selected_layer_count()const { return 0; } LayerList get_selected_layers()const { return LayerList(); } synfig::Layer::Handle get_selected_layer()const { return 0; } - void set_selected_layers(const LayerList &layer_list) { return; } - void set_selected_layer(const synfig::Layer::Handle &layer) { return; } + void set_selected_layers(const LayerList &/*layer_list*/) { return; } + void set_selected_layer(const synfig::Layer::Handle &/*layer*/) { return; } void clear_selected_layers() { return; } int get_selected_children_count()const { return 0; } ChildrenList get_selected_children()const { return ChildrenList(); } ChildrenList::value_type get_selected_child()const { return ChildrenList::value_type(); } - void set_selected_children(const ChildrenList &children_list) { return; } - void set_selected_child(const ChildrenList::value_type &child) { return; } + void set_selected_children(const ChildrenList &/*children_list*/) { return; } + void set_selected_child(const ChildrenList::value_type &/*child*/) { return; } void clear_selected_children() { return; } int get_selected_layer_parameter_count()const { return 0; } LayerParamList get_selected_layer_parameters()const { return LayerParamList(); } LayerParam get_selected_layer_parameter()const { return LayerParam(); } - void set_selected_layer_parameters(const LayerParamList &layer_param_list) { return; } - void set_selected_layer_param(const LayerParam &layer_param) { return; } + void set_selected_layer_parameters(const LayerParamList &/*layer_param_list*/) { return; } + void set_selected_layer_param(const LayerParam &/*layer_param*/) { return; } void clear_selected_layer_parameters() { return; } }; // END of class NullSelectionManager diff --git a/synfig-studio/trunk/src/synfigapp/uimanager.cpp b/synfig-studio/trunk/src/synfigapp/uimanager.cpp index 7ec30f6..0aa0450 100644 --- a/synfig-studio/trunk/src/synfigapp/uimanager.cpp +++ b/synfig-studio/trunk/src/synfigapp/uimanager.cpp @@ -149,7 +149,7 @@ ConsoleUIInterface::warning(const std::string &task) } bool -ConsoleUIInterface::amount_complete(int current, int total) +ConsoleUIInterface::amount_complete(int /*current*/, int /*total*/) { return true; } diff --git a/synfig-studio/trunk/src/synfigapp/uimanager.h b/synfig-studio/trunk/src/synfigapp/uimanager.h index 7c9f1bd..d5cfbb8 100644 --- a/synfig-studio/trunk/src/synfigapp/uimanager.h +++ b/synfig-studio/trunk/src/synfigapp/uimanager.h @@ -59,40 +59,40 @@ public: class DefaultUIInterface : public UIInterface { public: - Response yes_no(const std::string &title, const std::string &message,Response dflt) + Response yes_no(const std::string &/*title*/, const std::string &/*message*/,Response dflt) { return dflt; } - Response yes_no_cancel(const std::string &title, const std::string &message,Response dflt) + Response yes_no_cancel(const std::string &/*title*/, const std::string &/*message*/,Response dflt) { return dflt; } - Response ok_cancel(const std::string &title, const std::string &message,Response dflt) + Response ok_cancel(const std::string &/*title*/, const std::string &/*message*/,Response dflt) { return dflt; } - bool task(const std::string &task) + bool task(const std::string &/*task*/) { return true; } - bool error(const std::string &task) + bool error(const std::string &/*task*/) { return true; } - bool warning(const std::string &task) + bool warning(const std::string &/*task*/) { return true; } - bool amount_complete(int current, int total) + bool amount_complete(int /*current*/, int /*total*/) { return true; } }; class ConfidentUIInterface : public UIInterface { public: - Response yes_no(const std::string &title, const std::string &message,Response dflt) + Response yes_no(const std::string &/*title*/, const std::string &/*message*/,Response /*dflt*/) { return RESPONSE_YES; } - Response yes_no_cancel(const std::string &title, const std::string &message,Response dflt) + Response yes_no_cancel(const std::string &/*title*/, const std::string &/*message*/,Response /*dflt*/) { return RESPONSE_YES; } - Response ok_cancel(const std::string &title, const std::string &message,Response dflt) + Response ok_cancel(const std::string &/*title*/, const std::string &/*message*/,Response /*dflt*/) { return RESPONSE_OK; } - bool task(const std::string &task) + bool task(const std::string &/*task*/) { return true; } - bool error(const std::string &task) + bool error(const std::string &/*task*/) { return true; } - bool warning(const std::string &task) + bool warning(const std::string &/*task*/) { return true; } - bool amount_complete(int current, int total) + bool amount_complete(int /*current*/, int /*total*/) { return true; } };