From e7366c97c998679efa80cf61c88e64a11a3d3c33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp') diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp index 772583ec..b31b04bf 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp @@ -142,7 +142,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback) } DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps) - : task(xtask),tqparent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0) + : task(xtask),parent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0) { // gtask=task; { @@ -158,7 +158,7 @@ DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps) startdate = curdate; if (!d.head) d.lastsigdate = curdate + INITIAL; - tqparent = d.head; + parent = d.head; d.head = this; } } @@ -171,8 +171,8 @@ DjVuProgressTask::~DjVuProgressTask() { if (data->head != this) G_THROW( ERR_MSG("DjVuGlobal.not_compatible") ); - data->head = tqparent; - if (!tqparent) + data->head = parent; + if (!parent) { unsigned long curdate = GOS::ticks(); if((*(data->callback))(data->gtask?data->gtask:"",curdate-startdate, curdate-startdate)) @@ -210,9 +210,9 @@ DjVuProgressTask::signal(unsigned long curdate, unsigned long estdate) { const unsigned long enddate = startdate+ (unsigned long)(((float)(estdate-startdate) * (float)nsteps) / (float)inprogress); - if (tqparent) + if (parent) { - tqparent->signal(curdate, enddate); + parent->signal(curdate, enddate); } else if (data && data->callback && curdate