[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/gwenview
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2009-02-24 8:16:59
Message-ID: 1235463419.092162.4482.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 930759 by gateau:

Get rid of unused resizeRequested() signals.


 M  +0 -2      app/documentpanel.cpp  
 M  +0 -2      app/documentpanel.h  
 M  +0 -1      lib/documentview/abstractdocumentviewadapter.h  
 M  +0 -2      lib/documentview/documentview.cpp  
 M  +0 -2      lib/documentview/documentview.h  
 M  +1 -16     lib/documentview/imageviewadapter.cpp  
 M  +0 -1      lib/documentview/imageviewadapter.h  


--- trunk/KDE/kdegraphics/gwenview/app/documentpanel.cpp #930758:930759
@@ -229,8 +229,6 @@
 
 		QObject::connect(mDocumentView, SIGNAL(completed()),
 			that, SIGNAL(completed()) );
-		QObject::connect(mDocumentView, SIGNAL(resizeRequested(const QSize&)),
-			that, SIGNAL(resizeRequested(const QSize&)) );
 		QObject::connect(mDocumentView, SIGNAL(previousImageRequested()),
 			that, SIGNAL(previousImageRequested()) );
 		QObject::connect(mDocumentView, SIGNAL(nextImageRequested()),
--- trunk/KDE/kdegraphics/gwenview/app/documentpanel.h #930758:930759
@@ -96,8 +96,6 @@
 	 */
 	void completed();
 
-	void resizeRequested(const QSize&);
-
 	void previousImageRequested();
 
 	void nextImageRequested();
--- trunk/KDE/kdegraphics/gwenview/lib/documentview/abstractdocumentviewadapter.h #930758:930759
@@ -89,7 +89,6 @@
 	void setWidget(QWidget* widget) { mWidget = widget; }
 
 Q_SIGNALS:
-	void resizeRequested(const QSize&);
 	void previousImageRequested();
 	void nextImageRequested();
 
--- trunk/KDE/kdegraphics/gwenview/lib/documentview/documentview.cpp #930758:930759
@@ -87,8 +87,6 @@
 
 		mAdapter->loadConfig();
 
-		QObject::connect(mAdapter, SIGNAL(resizeRequested(const QSize&)),
-			that, SIGNAL(resizeRequested(const QSize&)) );
 		QObject::connect(mAdapter, SIGNAL(previousImageRequested()),
 			that, SIGNAL(previousImageRequested()) );
 		QObject::connect(mAdapter, SIGNAL(nextImageRequested()),
--- trunk/KDE/kdegraphics/gwenview/lib/documentview/documentview.h #930758:930759
@@ -68,8 +68,6 @@
 	 */
 	void completed();
 
-	void resizeRequested(const QSize&);
-
 	void previousImageRequested();
 
 	void nextImageRequested();
--- trunk/KDE/kdegraphics/gwenview/lib/documentview/imageviewadapter.cpp #930758:930759
@@ -85,12 +85,8 @@
 void ImageViewAdapter::setDocument(Document::Ptr doc) {
 	d->mView->setDocument(doc);
 
-	connect(doc.data(), SIGNAL(downSampledImageReady()), SLOT(slotLoaded()) );
-	connect(doc.data(), SIGNAL(loaded(const KUrl&)), SLOT(slotLoaded()) );
 	connect(doc.data(), SIGNAL(loadingFailed(const KUrl&)), SLOT(slotLoadingFailed()) );
-	if (doc->loadingState() == Document::Loaded) {
-		slotLoaded();
-	} else if (doc->loadingState() == Document::LoadingFailed) {
+	if (doc->loadingState() == Document::LoadingFailed) {
 		slotLoadingFailed();
 	}
 }
@@ -136,17 +132,6 @@
 }
 
 
-void ImageViewAdapter::slotLoaded() {
-	if (d->mView->zoomToFit()) {
-		emit resizeRequested(d->mView->document()->size());
-	}
-
-	// We don't want to emit resizeRequested() again if we receive another
-	// downSampledImageReady() or loaded() signal from the current document.
-	disconnect(d->mView->document().data(), 0, this, SLOT(slotLoaded()) );
-}
-
-
 void ImageViewAdapter::slotLoadingFailed() {
 	d->mView->setDocument(Document::Ptr());
 }
--- trunk/KDE/kdegraphics/gwenview/lib/documentview/imageviewadapter.h #930758:930759
@@ -70,7 +70,6 @@
 
 private Q_SLOTS:
 	void slotLoadingFailed();
-	void slotLoaded();
 
 private:
 	ImageViewAdapterPrivate* const d;
[prev in list] [next in list] [prev in thread] [next in thread]