[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-11-22 22:57:02
Message-ID: 20101122225702.1D219AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199862 by gateau:

memleak--

 M  +12 -15    app/kipiexportaction.cpp  
 M  +5 -0      app/sidebar.cpp  
 M  +1 -0      app/sidebar.h  
 M  +1 -0      lib/thumbnailview/thumbnailbarview.cpp  


--- trunk/KDE/kdegraphics/gwenview/app/kipiexportaction.cpp #1199861:1199862
@@ -39,29 +39,29 @@
 struct KIPIExportActionPrivate {
 	KIPIExportAction* q;
 	KIPIInterface* mKIPIInterface;
-	KMenu* mMenu;
 	QAction* mDefaultAction;
 	QList<QAction*> mExportActionList;
 
 	void updateMenu() {
-		mMenu->clear();
+		KMenu* menu = static_cast<KMenu*>(q->menu());
+		menu->clear();
 
 		if (mDefaultAction) {
-			mMenu->addTitle(i18n("Last Used Plugin"));
-			mMenu->addAction(mDefaultAction);
-			mMenu->addTitle(i18n("Other Plugins"));
+			menu->addTitle(i18n("Last Used Plugin"));
+			menu->addAction(mDefaultAction);
+			menu->addTitle(i18n("Other Plugins"));
 		}
 		Q_FOREACH(QAction* action, mExportActionList) {
 			action->setIconVisibleInMenu(true);
 			if (action != mDefaultAction) {
-				mMenu->addAction(action);
+				menu->addAction(action);
 			}
 		}
-		if (mMenu->isEmpty()) {
-			QAction* action = new QAction(mMenu);
+		if (menu->isEmpty()) {
+			QAction* action = new QAction(menu);
 			action->setText(i18n("No Plugin Found"));
 			action->setEnabled(false);
-			mMenu->addAction(action);
+			menu->addAction(action);
 		}
 	}
 };
@@ -76,18 +76,15 @@
 , d(new KIPIExportActionPrivate) {
 	d->q = this;
 	d->mKIPIInterface = 0;
-	d->mMenu = new KMenu;
 	d->mDefaultAction = 0;
 
 	setDelayed(false);
-	setMenu(d->mMenu);
-	connect(d->mMenu, SIGNAL(aboutToShow()), SLOT(init()));
-	connect(d->mMenu, SIGNAL(triggered(QAction*)), SLOT(setDefaultAction(QAction*)));
+	connect(menu(), SIGNAL(aboutToShow()), SLOT(init()));
+	connect(menu(), SIGNAL(triggered(QAction*)), SLOT(setDefaultAction(QAction*)));
 }
 
 
 KIPIExportAction::~KIPIExportAction() {
-	delete d->mMenu;
 	delete d;
 }
 
@@ -98,7 +95,7 @@
 
 
 void KIPIExportAction::init() {
-	if (!d->mMenu->isEmpty()) {
+	if (!menu()->isEmpty()) {
 		return;
 	}
 	d->mKIPIInterface->loadPlugins();
--- trunk/KDE/kdegraphics/gwenview/app/sidebar.cpp #1199861:1199862
@@ -179,6 +179,11 @@
 }
 
 
+SideBarPage::~SideBarPage() {
+	delete d;
+}
+
+
 const QString& SideBarPage::title() const {
 	return d->mTitle;
 }
--- trunk/KDE/kdegraphics/gwenview/app/sidebar.h #1199861:1199862
@@ -53,6 +53,7 @@
 	Q_OBJECT
 public:
 	SideBarPage(const QString& title);
+	~SideBarPage();
 	void addWidget(QWidget*);
 	void addStretch();
 
--- trunk/KDE/kdegraphics/gwenview/lib/thumbnailview/thumbnailbarview.cpp #1199861:1199862
@@ -354,6 +354,7 @@
 
 ThumbnailBarView::~ThumbnailBarView() {
 	delete d->mStyle;
+	delete d;
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]