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

List:       kde-commits
Subject:    extragear/utils/kpager
From:       Pino Toscano <pino () kde ! org>
Date:       2015-11-19 7:31:21
Message-ID: E1ZzJgf-0005cg-M5 () scm ! kde ! org
[Download RAW message or body]

SVN commit 1444571 by pino:

small tidy of Desktop::paintNewWindow

- return pixmaps by value instead of by pointer
- make it const


 M  +5 -6      desktop.cpp  
 M  +1 -1      desktop.h  


--- trunk/extragear/utils/kpager/desktop.cpp #1444570:1444571
@@ -249,7 +249,7 @@
 	}
 }
 
-QPixmap *Desktop::paintNewWindow(const KWindowInfo *info)
+QPixmap Desktop::paintNewWindow(const KWindowInfo *info) const
 {
     QRect r = info->frameGeometry();
     if( KWindowSystem::mapViewport())
@@ -261,10 +261,10 @@
     r.moveTopLeft(QPoint(0,0));
 
 
-    QPixmap *pixmap=new QPixmap(r.width(),r.height());
+    QPixmap pixmap(r.width(),r.height());
     QPainter p;
 
-    p.begin(pixmap);
+    p.begin(&pixmap);
     p.setFont(font());
     p.fillRect( r, palette().brush(QPalette::Dark));
     paintWindow(p, info, false);
@@ -279,7 +279,7 @@
   KWindowInfo *info=windowAtPosition(p,&dragpos);
   if ( (!info)/* || (info->state & NET::Max)*/ ) return;
 
-  QPixmap *pixmap=paintNewWindow(info);
+  QPixmap pixmap=paintNewWindow(info);
 
   int deltax=dragpos.x();
   int deltay=dragpos.y();
@@ -287,9 +287,8 @@
   QMimeData *mimeData = new QMimeData;
   PagerWindowDrag::populateMimeData(mimeData, info->win(), deltax, deltay, m_desk);
   drag->setMimeData(mimeData);
-  drag->setPixmap(*pixmap);
+  drag->setPixmap(pixmap);
   drag->setHotSpot(QPoint(deltax, deltay));
-  delete pixmap;
   drag->exec();
 
 }
--- trunk/extragear/utils/kpager/desktop.h #1444570:1444571
@@ -106,7 +106,7 @@
   static QSet<WId> m_windowPixmapsDirty;
   WindowTransparentMode m_transparentMode;
 
-  QPixmap *paintNewWindow(const KWindowInfo *info);
+  QPixmap paintNewWindow(const KWindowInfo *info) const;
 
   void paintWindow(QPainter &p, const KWindowInfo *info,
 			bool onDesktop=true) const;
[prev in list] [next in list] [prev in thread] [next in thread]