From bf3bdf1468c5264a57b6aac343f8c7d1a50de848 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 31 Dec 2010 23:53:28 +0000 Subject: Automated conversion aRts now compiles with TQt for Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1210526 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- flow/gsl/gsloscillator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'flow/gsl/gsloscillator.c') diff --git a/flow/gsl/gsloscillator.c b/flow/gsl/gsloscillator.c index 2ae2868..e988efe 100644 --- a/flow/gsl/gsloscillator.c +++ b/flow/gsl/gsloscillator.c @@ -131,9 +131,9 @@ osc_process (GslOscData *osc, if_reject (mode != osc->last_mode) { - guint change_mask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode; + guint change_tqmask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode; - if (change_mask & OSC_FLAG_FREQ) + if (change_tqmask & OSC_FLAG_FREQ) { gdouble fcpos, flpos; -- cgit v1.2.1