diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
commit | cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch) | |
tree | 2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kicker/applets/media | |
parent | 107dd1f98367d07df7cbe2042786511e44706d3a (diff) | |
download | tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip |
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/media')
-rw-r--r-- | kicker/applets/media/mediaapplet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 25b5869ff..d07bfdd2b 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -175,9 +175,9 @@ void MediaApplet::arrangeButtons() // Center icons if we only have one column/row if (mButtonList.count() < max_packed_buttons) { - max_packed_buttons = QMAX(uint(1), mButtonList.count()); + max_packed_buttons = TQMAX(uint(1), mButtonList.count()); } - max_packed_buttons = QMAX(uint(1), max_packed_buttons); + max_packed_buttons = TQMAX(uint(1), max_packed_buttons); int padded_button_size = kicker_size / max_packed_buttons; mButtonSizeSum = 0; |