← Back to branch summary

~ubuntu-branches/ubuntu/quantal/qtmobility/quantal

« back to all changes in this revision

Viewing changes to src/gallery/maemo5/qgallerytrackertyperesultset.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-16 16:18:07 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20101116161807-k2dzt2nyse975r3l
Tags: 1.1.0-0ubuntu1
* New upstream release
* Syncronise with Debian, no remaining changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallery/maemo5/qgallerytrackertyperesultset.cpp
8
8
**
9
9
** $QT_BEGIN_LICENSE:LGPL$
10
10
** Commercial Usage
11
 
** Licensees holding valid Qt Commercial licenses may use this file in
12
 
** accordance with the Qt Solutions Commercial License Agreement provided
13
 
** with the Software or, alternatively, in accordance with the terms
 
11
** Licensees holding valid Qt Commercial licenses may use this file in 
 
12
** accordance with the Qt Commercial License Agreement provided with
 
13
** the Software or, alternatively, in accordance with the terms
14
14
** contained in a written agreement between you and Nokia.
15
15
**
16
16
** GNU Lesser General Public License Usage
33
33
** ensure the GNU General Public License version 3.0 requirements will be
34
34
** met: http://www.gnu.org/copyleft/gpl.html.
35
35
**
36
 
** Please note Third Party Software included with Qt Solutions may impose
37
 
** additional restrictions and it is the user's responsibility to ensure
38
 
** that they have met the licensing requirements of the GPL, LGPL, or Qt
39
 
** Solutions Commercial license and the relevant license of the Third
40
 
** Party Software they are using.
41
 
**
42
36
** If you are unsure which license is appropriate for your use, please
43
37
** contact the sales department at qt-sales@nokia.com.
44
38
** $QT_END_LICENSE$
66
60
public:
67
61
    QGalleryTrackerTypeResultSetPrivate(const QGalleryTrackerTypeResultSetArguments &arguments)
68
62
        : accumulative(arguments.accumulative)
69
 
        , cancelled(false)
 
63
        , canceled(false)
70
64
        , refresh(false)
71
65
        , updateMask(arguments.updateMask)
72
66
        , currentIndex(-1)
86
80
    void queryCount();
87
81
 
88
82
    const bool accumulative;
89
 
    bool cancelled;
 
83
    bool canceled;
90
84
    bool refresh;
91
85
    const int updateMask;
92
86
    int currentIndex;
153
147
                if (count > workingCount)
154
148
                    count = workingCount;
155
149
 
156
 
                if (cancelled)
 
150
                if (canceled)
157
151
                    q_func()->QGalleryAbstractResponse::cancel();
158
152
                else
159
153
                    queryCount();
273
267
 
274
268
void QGalleryTrackerTypeResultSet::cancel()
275
269
{
276
 
    d_func()->cancelled = true;
 
270
    d_func()->canceled = true;
277
271
    d_func()->refresh = false;
278
272
 
279
273
    if (!d_func()->queryWatcher)
296
290
 
297
291
            delete watcher;
298
292
 
299
 
            if (d->status != QGalleryAbstractRequest::Active)
 
293
            if (d->state != QGalleryAbstractRequest::Active)
300
294
                return true;
301
295
        } else {
302
296
            return true;
310
304
{
311
305
    Q_D(QGalleryTrackerTypeResultSet);
312
306
 
313
 
    if (!d->cancelled && (d->updateMask & serviceId)) {
 
307
    if (!d->canceled && (d->updateMask & serviceId)) {
314
308
        d->refresh = true;
315
309
 
316
310
        if (!d->queryWatcher)