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/kicker/core | |
| 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/kicker/core')
| -rw-r--r-- | kicker/kicker/core/containerarealayout.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 301011688..4853b8d88 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -43,7 +43,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator TQLayoutItem* current() { - return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0; + return m_idx < int(m_list->count()) ? (*m_list->tqat(m_idx))->item : 0; } TQLayoutItem* next() @@ -55,7 +55,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator TQLayoutItem* takeCurrent() { TQLayoutItem* item = 0; - ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); + ContainerAreaLayout::ItemList::iterator b = m_list->tqat(m_idx); if (b != m_list->end()) { ContainerAreaLayoutItem* layoutItem = *b; @@ -223,7 +223,7 @@ int ContainerAreaLayout::count() const { \reimp */ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { - return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0; + return index >= 0 && index < m_items.count() ? (*m_items.tqat(index))->item : 0; } /*! @@ -232,8 +232,8 @@ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const { TQLayoutItem* ContainerAreaLayout::takeAt(int index) { if (index < 0 || index >= m_items.count()) return 0; - ContainerAreaLayoutItem *b = *m_items.at(index); - m_items.remove(m_items.at(index)); + ContainerAreaLayoutItem *b = *m_items.tqat(index); + m_items.remove(m_items.tqat(index)); TQLayoutItem *item = b->item; b->item = 0; delete b; |