diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-18 17:00:31 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-18 17:00:31 +0000 |
commit | 395a904bff7b4d6ead445c342f7ac0c5fbf29121 (patch) | |
tree | 9829cadb79d2cc7c29a940627fadb28b11e54150 /noatun-plugins/tippercanoe/ui.cpp | |
parent | 399f47c376fdf4d19192732a701ea9578d11619d (diff) | |
download | tdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.tar.gz tdeaddons-395a904bff7b4d6ead445c342f7ac0c5fbf29121.zip |
TQt4 port kdeaddons
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'noatun-plugins/tippercanoe/ui.cpp')
-rw-r--r-- | noatun-plugins/tippercanoe/ui.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp index e260d18..663816c 100644 --- a/noatun-plugins/tippercanoe/ui.cpp +++ b/noatun-plugins/tippercanoe/ui.cpp @@ -170,14 +170,14 @@ struct SliderBar : public UIObject struct PopperUpper : public UIObject { - int maskAdd; + int tqmaskAdd; PopperUpper(int _am,int _vm,double _x,double _y, - double _width,double _height, int _maskAdd) + double _width,double _height, int _tqmaskAdd) { activeMask = _am; visibleMask = _vm; x = _x; y = _y; width = _width; height = _height; - maskAdd = _maskAdd; + tqmaskAdd = _tqmaskAdd; } int go(bool mouseDown,bool mouseClick, bool mouseOver, @@ -195,7 +195,7 @@ struct PopperUpper : public UIObject 0x0200, x*scale,y*scale,width*scale,height*scale); - return mouseOver ? maskAdd : 0; + return mouseOver ? tqmaskAdd : 0; } void handleKey(char key, int &action) @@ -243,14 +243,14 @@ void Interface::setupPalette() #undef MAX } -//Visible mask +//Visible tqmask #define ALL 1 #define BUTTONBAR 2 #define TRACKBAR 4 #define DIALBAR 8 #define VOLUMEBAR 16 -//Active mask +//Active tqmask //#define ALL 1 #define PLAYING 2 #define PAUSED 4 @@ -259,7 +259,7 @@ void Interface::setupPalette() #define OPEN 64 -// TODO Lay things out with parents and a stack, like QT +// TODO Lay things out with tqparents and a stack, like QT Interface::Interface() { static const float IconSize=0.2; |