[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/gwenview
From: Aurélien Gâteau <agateau () kde ! org>
Date: 2010-05-22 22:10:31
Message-ID: 20100522221031.C39BEAC8BE () svn ! kde ! org
[Download RAW message or body]
SVN commit 1129594 by gateau:
loadFullImage -> startLoadingFullImage
M +1 -1 app/gvcore.cpp
M +1 -1 app/imageopscontextmanageritem.cpp
M +1 -1 app/preloader.cpp
M +1 -1 lib/abstractimageoperation.cpp
M +2 -2 lib/document/document.cpp
M +3 -3 lib/document/document.h
M +1 -1 lib/imagescaler.cpp
M +1 -1 lib/imageview.cpp
M +1 -1 lib/print/printhelper.cpp
M +1 -1 lib/redeyereduction/redeyereductiontool.cpp
M +13 -13 tests/documenttest.cpp
M +1 -1 tests/imagescalertest.cpp
--- trunk/KDE/kdegraphics/gwenview/app/gvcore.cpp #1129593:1129594
@@ -292,7 +292,7 @@
// FIXME: Replace with a CheckEditableJob?
// This way we can factorize the error message
Document::Ptr doc = DocumentFactory::instance()->load(url);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
if (doc->isEditable()) {
return true;
--- trunk/KDE/kdegraphics/gwenview/app/imageopscontextmanageritem.cpp #1129593:1129594
@@ -215,7 +215,7 @@
return;
}
Document::Ptr doc = DocumentFactory::instance()->load(contextManager()->currentUrl());
- doc->loadFullImage();
+ doc->startLoadingFullImage();
int size = GwenviewConfig::imageResizeLastSize();
if (size == -1) {
size = qMax(doc->width(), doc->height());
--- trunk/KDE/kdegraphics/gwenview/app/preloader.cpp #1129593:1129594
@@ -91,7 +91,7 @@
d->mDocument->prepareDownSampledImageForZoom(zoom);
} else {
LOG("preloading full image");
- d->mDocument->loadFullImage();
+ d->mDocument->startLoadingFullImage();
}
// Forget about the document. Keeping a reference to it would prevent it
--- trunk/KDE/kdegraphics/gwenview/lib/abstractimageoperation.cpp #1129593:1129594
@@ -76,7 +76,7 @@
Document::Ptr AbstractImageOperation::document() const {
Document::Ptr doc = DocumentFactory::instance()->load(d->mUrl);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
return doc;
}
--- trunk/KDE/kdegraphics/gwenview/lib/document/document.cpp #1129593:1129594
@@ -211,7 +211,7 @@
void Document::waitUntilLoaded() {
- loadFullImage();
+ startLoadingFullImage();
while (true) {
LoadingState state = loadingState();
if (state == Loaded || state == LoadingFailed) {
@@ -342,7 +342,7 @@
}
-void Document::loadFullImage() {
+void Document::startLoadingFullImage() {
LoadingState state = loadingState();
if (state <= MetaInfoLoaded) {
// Schedule full image loading
--- trunk/KDE/kdegraphics/gwenview/lib/document/document.h #1129593:1129594
@@ -63,7 +63,7 @@
* It is capable of loading down sampled versions of an image using
* prepareDownSampledImageForZoom() and downSampledImageForZoom(). Down sampled
* images load much faster than the full image but you need to load the full
- * image to manipulate it( use loadFullImage() to do so).
+ * image to manipulate it( use startLoadingFullImage() to do so).
*
* To get a Document instance for url, ask for one with
* DocumentFactory::instance()->load(url);
@@ -97,7 +97,7 @@
void reload();
- void loadFullImage();
+ void startLoadingFullImage();
/**
* Prepare a version of the image down sampled to be a bit bigger than
@@ -162,7 +162,7 @@
/**
* Returns true if the image can be edited.
- * You must ensure it has been fully loaded with loadFullImage() first.
+ * You must ensure it has been fully loaded with startLoadingFullImage() first.
*/
bool isEditable() const;
--- trunk/KDE/kdegraphics/gwenview/lib/imagescaler.cpp #1129593:1129594
@@ -100,7 +100,7 @@
}
} else if (d->mDocument->image().isNull()) {
LOG("Asked for the full image");
- d->mDocument->loadFullImage();
+ d->mDocument->startLoadingFullImage();
return;
}
--- trunk/KDE/kdegraphics/gwenview/lib/imageview.cpp #1129593:1129594
@@ -295,7 +295,7 @@
// full image now.
connect(d->mDocument.data(), SIGNAL(loaded(const KUrl&)),
SLOT(finishSetDocument()) );
- d->mDocument->loadFullImage();
+ d->mDocument->startLoadingFullImage();
}
}
--- trunk/KDE/kdegraphics/gwenview/lib/print/printhelper.cpp #1129593:1129594
@@ -114,7 +114,7 @@
void PrintHelper::print(Document::Ptr doc) {
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QPrinter printer;
--- trunk/KDE/kdegraphics/gwenview/lib/redeyereduction/redeyereductiontool.cpp #1129593:1129594
@@ -128,7 +128,7 @@
);
d->showNotSetHudWidget();
- view->document()->loadFullImage();
+ view->document()->startLoadingFullImage();
}
--- trunk/KDE/kdegraphics/gwenview/tests/documenttest.cpp #1129593:1129594
@@ -86,7 +86,7 @@
Document::Ptr doc = DocumentFactory::instance()->load(url);
QSignalSpy spy(doc.data(), SIGNAL(isAnimatedUpdated()));
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QCOMPARE(doc->loadingState(), Document::Loaded);
@@ -142,7 +142,7 @@
waitUntilMetaInfoLoaded(doc);
QVERIFY2(doc->image().isNull(), "Image shouldn't have been loaded at this time");
QCOMPARE(doc->format().data(), "png");
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QCOMPARE(image, doc->image());
}
@@ -226,7 +226,7 @@
QVERIFY2(KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, 0), "test archive not found");
Document::Ptr doc = DocumentFactory::instance()->load(url);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QImage image = doc->image();
QCOMPARE(image.width(), 300);
@@ -237,7 +237,7 @@
KUrl srcUrl = urlForTestFile("40frames.gif");
Document::Ptr doc = DocumentFactory::instance()->load(srcUrl);
QSignalSpy spy(doc.data(), SIGNAL(imageRectUpdated(const QRect&)));
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QVERIFY(doc->isAnimated());
@@ -266,7 +266,7 @@
void DocumentTest::testSaveRemote() {
KUrl srcUrl = urlForTestFile("test.png");
Document::Ptr doc = DocumentFactory::instance()->load(srcUrl);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
KUrl dstUrl;
@@ -309,7 +309,7 @@
image = image.transformed(matrix);
Document::Ptr doc = DocumentFactory::instance()->load(url);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QCOMPARE(image, doc->image());
}
@@ -333,7 +333,7 @@
QSignalSpy savedSpy(doc.data(), SIGNAL(saved(const KUrl&, const KUrl&)));
QSignalSpy modifiedDocumentListChangedSpy(factory, SIGNAL(modifiedDocumentListChanged()));
QSignalSpy documentChangedSpy(factory, SIGNAL(documentChanged(const KUrl&)));
- doc->loadFullImage();
+ doc->startLoadingFullImage();
KUrl destUrl = urlForTestOutputFile("result.png");
QVERIFY(waitUntilJobIsDone(doc->save(destUrl, "png")));
@@ -366,7 +366,7 @@
void DocumentTest::testLosslessSave() {
KUrl url1 = urlForTestFile("orient6.jpg");
Document::Ptr doc = DocumentFactory::instance()->load(url1);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
KUrl url2 = urlForTestOutputFile("orient1.jpg");
QVERIFY(waitUntilJobIsDone(doc->save(url2, "jpeg")));
@@ -396,7 +396,7 @@
// Load it as a Gwenview document
Document::Ptr doc = DocumentFactory::instance()->load(url1);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
// Rotate one time
@@ -409,7 +409,7 @@
// Load the saved image
doc = DocumentFactory::instance()->load(url2);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
// Rotate the other way
@@ -444,7 +444,7 @@
QSignalSpy modifiedDocumentListChangedSpy(factory, SIGNAL(modifiedDocumentListChanged()));
QSignalSpy documentChangedSpy(factory, SIGNAL(documentChanged(const KUrl&)));
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QVERIFY(!doc->isModified());
QCOMPARE(modifiedDocumentListChangedSpy.count(), 0);
@@ -542,7 +542,7 @@
// Load it as a Gwenview document
Document::Ptr doc = DocumentFactory::instance()->load(url);
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
// Modify it
@@ -572,7 +572,7 @@
Document::Ptr doc = DocumentFactory::instance()->load(url);
QSignalSpy modifiedSpy(doc.data(), SIGNAL(modified(const KUrl&)));
QSignalSpy savedSpy(doc.data(), SIGNAL(saved(const KUrl&, const KUrl&)));
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
QCOMPARE(modifiedSpy.count(), 0);
--- trunk/KDE/kdegraphics/gwenview/tests/imagescalertest.cpp #1129593:1129594
@@ -53,7 +53,7 @@
// FIXME: Load full image for now, because ImageScalerClient does not wait
// when ImageScaler request a full image to be loaded asynchronously.
- doc->loadFullImage();
+ doc->startLoadingFullImage();
doc->waitUntilLoaded();
scaler.setDestinationRegion(QRect(QPoint(0,0), doc->size() * zoom));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic