← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdegraphics/maverick-proposed

« back to all changes in this revision

Viewing changes to gwenview/lib/document/document.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2009-12-02 14:03:43 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20091202140343-2732gbkj69g89arq
Tags: 4:4.3.80-0ubuntu1
* New upstream beta release:
  - Add build-depend on shared-desktop-ontologies for nepomuk integration
  - Bump .so versions for libkexiv, libkdcraw and libkipi
  - Update various .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
gwenview/lib/document/document.cpp
75
75
        d->mImpl = 0;
76
76
        d->mUrl = url;
77
77
        d->mKeepRawData = false;
78
 
        d->mKind = MimeTypeUtils::KIND_UNKNOWN;
79
 
 
80
78
        connect(&d->mUndoStack, SIGNAL(indexChanged(int)), SLOT(slotUndoIndexChanged()) );
81
 
        KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url);
82
 
        d->mImageMetaInfoModel.setFileItem(fileItem);
83
 
        switchToImpl(new LoadingDocumentImpl(this));
 
79
 
 
80
        reload();
84
81
}
85
82
 
86
83
 
227
224
                // Use QueuedConnection to ensure we are (more or less :/) thread-safe.
228
225
                // FIXME: This method should be turned into an asynchronous call to
229
226
                // reduce thread-safe potential issues.
230
 
                QMetaObject::invokeMethod(this, "saved", Qt::QueuedConnection, Q_ARG(KUrl, d->mUrl));
 
227
                QMetaObject::invokeMethod(this, "saved", Qt::QueuedConnection, Q_ARG(KUrl, d->mUrl), Q_ARG(KUrl, url));
231
228
                QMetaObject::invokeMethod(&d->mUndoStack, "setClean", Qt::QueuedConnection);
 
229
                d->mUrl = url;
232
230
        }
233
231
 
234
232
        return ok;
394
392
                // If user just undid all his changes this does not really correspond
395
393
                // to a save, but it's similar enough as far as Document users are
396
394
                // concerned
397
 
                saved(d->mUrl);
 
395
                saved(d->mUrl, d->mUrl);
398
396
        } else {
399
397
                modified(d->mUrl);
400
398
        }