diff options
author | Michal Kubecek <mkubecek@suse.cz> | 2015-04-14 15:06:43 +0200 |
---|---|---|
committer | Michal Kubecek <mkubecek@suse.cz> | 2015-04-15 10:54:16 +0200 |
commit | 3daedfdaf647cae3522b5cdad2b42810215efe6b (patch) | |
tree | 480e016ee3a284a35045460d104260d99ba9a078 /src/gui | |
parent | 9159a6f9ea308404227f64998c284c482f58b162 (diff) | |
download | twinkle-3daedfdaf647cae3522b5cdad2b42810215efe6b.tar twinkle-3daedfdaf647cae3522b5cdad2b42810215efe6b.tar.gz twinkle-3daedfdaf647cae3522b5cdad2b42810215efe6b.tar.lz twinkle-3daedfdaf647cae3522b5cdad2b42810215efe6b.tar.xz twinkle-3daedfdaf647cae3522b5cdad2b42810215efe6b.zip |
Qt4 port step 7: drop unused method
This method would require some work to port but it's not used anyway so
just drop it instead.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/freedesksystray.cpp | 19 | ||||
-rw-r--r-- | src/gui/freedesksystray.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/freedesksystray.cpp b/src/gui/freedesksystray.cpp index 33f5ed6..0096a73 100644 --- a/src/gui/freedesksystray.cpp +++ b/src/gui/freedesksystray.cpp @@ -117,25 +117,6 @@ void FreeDeskSysTray::mousePressEvent ( QMouseEvent *pMouseEvent ) } } -void FreeDeskSysTray::setPixmapOverlay ( const QPixmap& pmOverlay ) -{ - QWidget *pParent = parentWidget(); - if (pParent == 0) - return; - - // Get base pixmap from parent widget. - QPixmap pm; - pm.convertFromImage(pParent->icon()->convertToImage().smoothScale(22, 22), 0); - - // Merge with the overlay pixmap. - QBitmap bmMask(*pm.mask()); - bitBlt(&bmMask, 0, 0, pmOverlay.mask(), 0, 0, -1, -1, Qt::OrROP); - pm.setMask(bmMask); - bitBlt(&pm, 0, 0, &pmOverlay); - - QLabel::setPixmap(pm); -} - Q3PopupMenu *FreeDeskSysTray::contextMenu() { return trayMenu; diff --git a/src/gui/freedesksystray.h b/src/gui/freedesksystray.h index 66eda8c..c6a479e 100644 --- a/src/gui/freedesksystray.h +++ b/src/gui/freedesksystray.h @@ -62,7 +62,6 @@ public: FreeDeskSysTray(QWidget *pParent = 0, const char *pszName = 0); ~FreeDeskSysTray(); - void setPixmapOverlay(const QPixmap& pmOverlay); void showContextMenu(const QPoint& position); void dock (); void undock (); |