diff options
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/applets/clock/zone.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/core/containerarea.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/core/menumanager.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/interfaces/kickoff-search-plugin.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/appletop_mnu.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/ui/itemview.cpp | 10 |
6 files changed, 13 insertions, 13 deletions
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index c81faacc4..320d84b4c 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -151,7 +151,7 @@ void Zone::getSelectedZonelist(KListView *listView) root = root->nextSibling(); continue; } - root = root->tqparent(); + root = root->parent(); if (root) root = root->nextSibling(); } diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index e4e78fd3d..a202c910a 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -1200,10 +1200,10 @@ void ContainerArea::dropEvent(TQDropEvent *ev) return; } - TQObject *parent = ev->source() ? ev->source()->tqparent() : 0; + TQObject *parent = ev->source() ? ev->source()->parent() : 0; while (parent && (TQT_BASE_OBJECT(parent) != TQT_BASE_OBJECT(this))) { - parent = parent->tqparent(); + parent = parent->parent(); } if (parent) diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index 776056647..e6b7e3d60 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -178,7 +178,7 @@ void MenuManager::kmenuAccelActivated() // let's unhide the panel while we're at it. traverse the widget // hierarchy until we find the panel, if any - TQObject* menuParent = button->tqparent(); + TQObject* menuParent = button->parent(); while (menuParent) { ExtensionContainer* ext = dynamic_cast<ExtensionContainer*>(menuParent); @@ -192,7 +192,7 @@ void MenuManager::kmenuAccelActivated() break; } - menuParent = menuParent->tqparent(); + menuParent = menuParent->parent(); } button->showMenu(); } diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.cpp b/kicker/kicker/interfaces/kickoff-search-plugin.cpp index dc887d5e8..c229c85b0 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.cpp +++ b/kicker/kicker/interfaces/kickoff-search-plugin.cpp @@ -31,7 +31,7 @@ KickoffSearch::Plugin::~Plugin() KickoffSearch::KickoffSearchInterface* KickoffSearch::Plugin::kickoffSearchInterface() { - return static_cast<KickoffSearchInterface*>( tqparent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); + return static_cast<KickoffSearchInterface*>( parent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); } #include "kickoff-search-plugin.moc" diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index fb4f97ea8..f784a9ca2 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -58,7 +58,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP // this is part of the kiosk support in kicker, allowing // one to block users from adding new containers ContainerArea* area = 0; - TQObject* findTheArea = parent ? parent->tqparent() : 0; + TQObject* findTheArea = parent ? parent->parent() : 0; while (findTheArea) { area = dynamic_cast<ContainerArea*>(findTheArea); @@ -68,7 +68,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP break; } - findTheArea = findTheArea->tqparent(); + findTheArea = findTheArea->parent(); } if (!area || area->canAddContainers()) diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 3a2978261..36a7bef7d 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -761,7 +761,7 @@ void ItemView::slotMoveContent() int item_height = 0; TQListViewItemIterator it( this ); while ( it.current() ) { - if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { + if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { it.current()->invalidateHeight(); item_height += it.current()->totalHeight(); } @@ -1022,14 +1022,14 @@ TQDragObject * ItemView::dragObject() TQBitmap mask; - if (pix.tqmask()) - mask = *pix.tqmask(); + if (pix.mask()) + mask = *pix.mask(); else { mask.resize(pix.size()); mask.fill(Qt::color1); } - bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP ); + bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); pix.setMask( mask ); o->setPixmap(pix); @@ -1070,7 +1070,7 @@ int ItemView::goodHeight() int item_height = 0; TQListViewItemIterator it( this ); while ( it.current() ) { - if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { + if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { item_height += it.current()->height(); } ++it; |