diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdeui/kpopupmenu.cpp | |
parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/kpopupmenu.cpp')
-rw-r--r-- | kdeui/kpopupmenu.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp index 6765216b4..468703ed3 100644 --- a/kdeui/kpopupmenu.cpp +++ b/kdeui/kpopupmenu.cpp @@ -110,9 +110,9 @@ void KPopupTitle::paintEvent(TQPaintEvent *) } } -TQSize KPopupTitle::sizeHint() const +TQSize KPopupTitle::tqsizeHint() const { - return minimumSize(); + return tqminimumSize(); } class KPopupMenu::KPopupMenuPrivate @@ -198,7 +198,7 @@ int KPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id, void KPopupMenu::changeTitle(int id, const TQString &text) { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text); @@ -215,7 +215,7 @@ void KPopupMenu::changeTitle(int id, const TQString &text) void KPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text) { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text, &icon); @@ -234,7 +234,7 @@ TQString KPopupMenu::title(int id) const { if(id == -1) // obsolete return d->m_lastTitle; - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->title(); @@ -248,7 +248,7 @@ TQString KPopupMenu::title(int id) const TQPixmap KPopupMenu::titlePixmap(int id) const { - TQMenuItem *item = findItem(id); + TQMenuItem *item = tqfindItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->icon(); @@ -377,13 +377,13 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // if there is an accelerator present, remove it if ((int)accel(j) != 0) - thisText = thisText.replace("&", TQString::null); + thisText = thisText.tqreplace("&", TQString::null); // chop text to the search length thisText = thisText.left(seqLen); // do the search - if (!thisText.find(d->keySeq, 0, false)) { + if (!thisText.tqfind(d->keySeq, 0, false)) { if (firstpass) { // match @@ -424,8 +424,8 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) activateItemAt(d->lastHitIndex); resetKeyboardVars(); - } else if (findItem(idAt(d->lastHitIndex)) && - findItem(idAt(d->lastHitIndex))->popup()) { + } else if (tqfindItem(idAt(d->lastHitIndex)) && + tqfindItem(idAt(d->lastHitIndex))->popup()) { // only activate sub-menus activateItemAt(d->lastHitIndex); resetKeyboardVars(); @@ -552,7 +552,7 @@ void KPopupMenu::itemHighlighted(int /* whichItem */) void KPopupMenu::showCtxMenu(TQPoint pos) { - TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -572,7 +572,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) emit aboutToShowContextMenu(this, KPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu); - TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); @@ -596,7 +596,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) */ void KPopupMenu::ctxMenuHideShowingMenu() { - TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -611,7 +611,7 @@ void KPopupMenu::ctxMenuHiding() { if (KPopupMenuPrivate::s_highlightedItem) { - TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); |