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

List:       kde-commits
Subject:    KDE/kdegraphics/gwenview/lib
From:       Aurélien Gâteau <aurelien.gateau () free ! fr>
Date:       2008-07-30 14:29:57
Message-ID: 1217428197.369592.32693.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 839674 by gateau:

Changed the way we reference the Adapter widget so that it can be deleted
from AbstractDocumentViewAdapter dtor.


 M  +8 -1      abstractdocumentviewadapter.cpp  
 M  +8 -2      abstractdocumentviewadapter.h  
 M  +1 -5      imageviewadapter.cpp  
 M  +0 -2      imageviewadapter.h  


--- trunk/KDE/kdegraphics/gwenview/lib/abstractdocumentviewadapter.cpp #839673:839674
@@ -32,8 +32,15 @@
 
 
 AbstractDocumentViewAdapter::AbstractDocumentViewAdapter(QWidget* parent)
-: QObject(parent) {
+: QObject(parent)
+, mWidget(0) {
 }
 
 
+AbstractDocumentViewAdapter::~AbstractDocumentViewAdapter()
+{
+	delete mWidget;
+}
+
+
 } // namespace
--- trunk/KDE/kdegraphics/gwenview/lib/abstractdocumentviewadapter.h #839673:839674
@@ -51,9 +51,9 @@
 	Q_OBJECT
 public:
 	AbstractDocumentViewAdapter(QWidget*);
-	virtual ~AbstractDocumentViewAdapter() {}
+	virtual ~AbstractDocumentViewAdapter();
 
-	virtual QWidget* widget() const = 0;
+	QWidget* widget() const { return mWidget; }
 
 	virtual ImageView* imageView() const { return 0; }
 
@@ -78,11 +78,17 @@
 
 	virtual void loadConfig() {}
 
+protected:
+	void setWidget(QWidget* widget) { mWidget = widget; }
+
 Q_SIGNALS:
 	void resizeRequested(const QSize&);
 	void previousImageRequested();
 	void nextImageRequested();
 	void completed();
+
+private:
+	QWidget* mWidget;
 };
 
 
--- trunk/KDE/kdegraphics/gwenview/lib/imageviewadapter.cpp #839673:839674
@@ -43,6 +43,7 @@
 : AbstractDocumentViewAdapter(parent)
 , d(new ImageViewAdapterPrivate) {
 	d->mView = new ImageView(parent);
+	setWidget(d->mView);
 }
 
 
@@ -51,11 +52,6 @@
 }
 
 
-QWidget* ImageViewAdapter::widget() const {
-	return d->mView;
-}
-
-
 ImageView* ImageViewAdapter::imageView() const {
 	return d->mView;
 }
--- trunk/KDE/kdegraphics/gwenview/lib/imageviewadapter.h #839673:839674
@@ -54,8 +54,6 @@
 
 	virtual Document::Ptr document() const;
 
-	virtual QWidget* widget() const;
-
 	virtual ImageView* imageView() const;
 
 private Q_SLOTS:
[prev in list] [next in list] [prev in thread] [next in thread]