summaryrefslogtreecommitdiffstats
path: root/klaptopdaemon/daemondock.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit625904bd3097f9749450428904ca14ff2531824d (patch)
treea45c43d5de71cb720078fa1272a4339815a919be /klaptopdaemon/daemondock.cpp
parent6335dc55802871b5a43492f217b6edbb420204c4 (diff)
downloadtdeutils-625904bd3097f9749450428904ca14ff2531824d.tar.gz
tdeutils-625904bd3097f9749450428904ca14ff2531824d.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'klaptopdaemon/daemondock.cpp')
-rw-r--r--klaptopdaemon/daemondock.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 1388b0a..c5c0a58 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -48,13 +48,13 @@
#include <kiconeffect.h>
extern void wake_laptop_daemon();
-laptop_dock::laptop_dock( laptop_daemon* tqparent )
+laptop_dock::laptop_dock( laptop_daemon* parent )
: KSystemTray()
{
setCaption(i18n("KLaptop Daemon"));
KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages
_pcmcia = NULL;
- pdaemon = tqparent;
+ pdaemon = parent;
current_code = -1;
brightness_widget = 0;
instance = new KInstance("klaptopdaemon");
@@ -568,10 +568,10 @@ void laptop_dock::displayPixmap()
// at this point, we have the file to display. so display it
TQImage image = pm.convertToImage();
- const TQBitmap *bmtqmask = pm.tqmask();
- TQImage tqmask;
- if (bmtqmask)
- tqmask = bmtqmask->convertToImage();
+ const TQBitmap *bmmask = pm.mask();
+ TQImage mask;
+ if (bmmask)
+ mask = bmmask->convertToImage();
int w = image.width();
int h = image.height();
@@ -580,7 +580,7 @@ void laptop_dock::displayPixmap()
int x, y;
for (x = 0; x < w; x++)
for (y = 0; y < h; y++)
- if (!bmtqmask || tqmask.pixelIndex(x, y) != 0){
+ if (!bmmask || mask.pixelIndex(x, y) != 0){
rgb = image.pixel(x, y);
if (tqRed(rgb) == 0xff &&
tqGreen(rgb) == 0xff &&
@@ -609,7 +609,7 @@ void laptop_dock::displayPixmap()
for (y = h-1; y >= 0; y--)
for (x = 0; x < w; x++)
- if (!bmtqmask || tqmask.pixelIndex(x, y) != 0){
+ if (!bmmask || mask.pixelIndex(x, y) != 0){
rgb = image.pixel(x, y);
if (tqRed(rgb) == 0xff &&
tqGreen(rgb) == 0xff &&
@@ -743,8 +743,8 @@ quit:
{
TQPixmap q;
q.convertFromImage(image);
- if (bmtqmask)
- q.setMask(*bmtqmask);
+ if (bmmask)
+ q.setMask(*bmmask);
setPixmap(q);
}
adjustSize();