diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index 3cd86fc22..a89e63584 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -71,7 +71,7 @@ void BackTrace::start() TQString exec = m_krashconf->tryExec(); if ( !exec.isEmpty() && KStandardDirs::findExe(exec).isEmpty() ) { - TQObject * o = tqparent(); + TQObject * o = parent(); if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING)) { diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 45c700fd9..41a11ee43 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -301,10 +301,10 @@ void FileTypesView::removeType() if (!li) li = current->itemBelow(); if (!li) - li = current->tqparent(); + li = current->parent(); removedList.append(current->name()); - current->tqparent()->takeItem(current); + current->parent()->takeItem(current); m_itemList.removeRef( current ); setDirty(true); diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index fda83854f..b90d8bc07 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -312,7 +312,7 @@ void ModuleTreeItem::setPixmap(int column, const TQPixmap& pm) { if (!pm.isNull()) { - ModuleTreeItem* p = dynamic_cast(tqparent()); + ModuleTreeItem* p = dynamic_cast(parent()); if (p) p->regChildIconWidth(pm.width()); } @@ -331,7 +331,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu if (!pixmap(0)) { int offset = 0; - ModuleTreeItem* parentItem = dynamic_cast(tqparent()); + ModuleTreeItem* parentItem = dynamic_cast(parent()); if (parentItem) { offset = parentItem->maxChildIconWidth(); diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index fa9bb097c..9a4f6eb2c 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -383,7 +383,7 @@ void KCookiesManagement::doPolicy() if( domain.isEmpty() ) { - CookieListViewItem *parent = static_cast( item->tqparent() ); + CookieListViewItem *parent = static_cast( item->parent() ); if ( parent ) domain = parent->domain (); @@ -407,7 +407,7 @@ void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem) CookieListViewItem *item = static_cast( deleteItem ); if( item->cookie() ) { - CookieListViewItem *parent = static_cast(item->tqparent()); + CookieListViewItem *parent = static_cast(item->parent()); CookiePropList *list = deletedCookies.find(parent->domain()); if(!list) { diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 87d4b3208..9f0463c7d 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -639,9 +639,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item) int i = 0, indx = -1; for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { - if ( item->tqparent() ) + if ( item->parent() ) { - if ( item->tqparent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) + if ( item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) { indx = i; break; diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 69fef8e8f..910c721bc 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -806,13 +806,13 @@ void Minicli::setIcon () { int x = icon.width() - overlay.width(); int y = icon.height() - overlay.height(); - if ( icon.tqmask() ) + if ( icon.mask() ) { - TQBitmap mask = *icon.tqmask(); + TQBitmap mask = *icon.mask(); bitBlt( &mask, x, y, - overlay.tqmask() ? TQT_TQPIXMAP(const_cast(overlay.tqmask())) : &overlay, + overlay.mask() ? TQT_TQPIXMAP(const_cast(overlay.mask())) : &overlay, 0, 0, overlay.width(), overlay.height(), - overlay.tqmask() ? OrROP : SetROP ); + overlay.mask() ? OrROP : SetROP ); icon.setMask(mask); } bitBlt( &icon, x, y, &overlay ); diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index b534fe8ad..720dd4bba 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -218,8 +218,8 @@ void StartupId::start_startupid( const TQString& icon_P ) } else { - if( icon_pixmap.tqmask() != NULL ) - startup_widget->setMask( *icon_pixmap.tqmask()); + if( icon_pixmap.mask() != NULL ) + startup_widget->setMask( *icon_pixmap.mask()); else startup_widget->clearMask(); startup_widget->setBackgroundPixmap( icon_pixmap ); @@ -257,8 +257,8 @@ void StartupId::update_startupid() yoffset = frame_to_yoffset[ frame ]; TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ]; startup_widget->setBackgroundPixmap( pm ); - if ( pm.tqmask() != NULL ) - startup_widget->setMask( *pm.tqmask() ); + if ( pm.mask() != NULL ) + startup_widget->setMask( *pm.mask() ); else startup_widget->clearMask(); if ( ++frame >= ( sizeof( frame_to_yoffset ) / sizeof( frame_to_yoffset[ 0 ] ) ) ) diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 67778711d..88e5a7489 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -621,7 +621,7 @@ KdmItem::parentWidget() const if (!this->parent()) return 0; - if (tqparent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) + if (parent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) return (TQWidget*)parent(); return ((KdmItem*)parent())->parentWidget(); } diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 1a87692ac..ca6bd3435 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -147,7 +147,7 @@ public: TQString baseDir() const { if (basedir.isEmpty() && parent()) - return static_cast( tqparent()->qt_cast( "KdmItem" ) )->baseDir(); + return static_cast( parent()->qt_cast( "KdmItem" ) )->baseDir(); return basedir; } diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 148fe4dd9..46a9ce65b 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -311,7 +311,7 @@ void Glossary::slotSelectGlossEntry( const TQString &id ) if ( curItem != 0 ) { if ( curItem->id() == id ) return; - curItem->tqparent()->setOpen( false ); + curItem->parent()->setOpen( false ); } setCurrentItem( newItem ); diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 0f0e8af07..cdc7d92d9 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -261,8 +261,8 @@ TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, TQListViewItem TQString TOCSectionItem::url() { - if ( static_cast( tqparent()->firstChild() ) == this ) - return static_cast( tqparent() )->url() + "#" + m_name; + if ( static_cast( parent()->firstChild() ) == this ) + return static_cast( parent() )->url() + "#" + m_name; return "help:" + toc()->application() + "/" + m_name + ".html"; } diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index a2fedfdfb..95aa7db89 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -151,7 +151,7 @@ void Action_list_widget::copy_pressed() if ( !selected_item ) return; actions_listview->setSelected( create_listview_item( selected_item->action(), - selected_item->tqparent() ? NULL : actions_listview, selected_item->tqparent(), + selected_item->parent() ? NULL : actions_listview, selected_item->parent(), selected_item, true ), true ); } diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index cd61e2ae6..5048289df 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -92,7 +92,7 @@ void Actions_listview_widget::new_action( Action_data_base* data_P ) if( dynamic_cast< Action_data_group* >( current_action()->data()) != NULL ) parent = current_action(); else - parent = current_action()->tqparent(); + parent = current_action()->parent(); } if( parent ) parent->setOpen( true ); @@ -124,7 +124,7 @@ void Actions_listview_widget::delete_action() void Actions_listview_widget::item_moved( TQListViewItem* item_P, TQListViewItem*, TQListViewItem* ) { Action_listview_item* item = static_cast< Action_listview_item* >( item_P ); - Action_listview_item* parent = static_cast< Action_listview_item* >( item->tqparent()); + Action_listview_item* parent = static_cast< Action_listview_item* >( item->parent()); if( parent == NULL ) item->data()->reparent( module->actions_root()); else if( Action_data_group* group = dynamic_cast< Action_data_group* >( parent->data())) diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index b526d34ef..86ff8f47c 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -165,9 +165,9 @@ void Condition_list_widget::new_selected( int type_P ) parent = NULL; } } - if( parent == NULL && selected_item != NULL && selected_item->tqparent() != NULL ) + if( parent == NULL && selected_item != NULL && selected_item->parent() != NULL ) { - parent = static_cast< Condition_list_item* >( selected_item->tqparent()); + parent = static_cast< Condition_list_item* >( selected_item->parent()); after = selected_item; } Condition_list_base* parent_cond = parent @@ -217,8 +217,8 @@ void Condition_list_widget::copy_pressed() return; conditions_listview->setSelected( create_listview_item( selected_item->condition()->copy( selected_item->condition()->parent()), - selected_item->tqparent() ? NULL : conditions_listview, - static_cast< Condition_list_item* >( selected_item->tqparent()), + selected_item->parent() ? NULL : conditions_listview, + static_cast< Condition_list_item* >( selected_item->parent()), selected_item, true ), true ); } diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index 1533da6de..471aab743 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -134,7 +134,7 @@ void Windowdef_list_widget::new_selected( int type_P ) void Windowdef_list_widget::copy_pressed() { windows_listview->setSelected( create_listview_item( selected_item->window(), - selected_item->tqparent() ? NULL : windows_listview, selected_item->tqparent(), + selected_item->parent() ? NULL : windows_listview, selected_item->parent(), selected_item, true ), true ); } 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(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( tqparent()->child( 0, "KickoffSearch::KickoffSearchInterface" ) ); + return static_cast( 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(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( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { + if ( !dynamic_cast( 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( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() ) { + if ( !dynamic_cast( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { item_height += it.current()->height(); } ++it; diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index 1560a1431..6e81b61d3 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -322,7 +322,7 @@ void ThumbnailProtocol::get(const KURL &url) p.drawLine( 0, 0, 0, y2 ); p.end(); - const TQBitmap *mask = pix.tqmask(); + const TQBitmap *mask = pix.mask(); if ( mask ) // need to update it so we can see the frame { TQBitmap bitmap( *mask ); diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 72473d300..92006e583 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -331,14 +331,14 @@ void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item, KPopupMenu *menu = new KPopupMenu; addCmd = menu->insertItem( i18n("Add Command") ); rmCmd = menu->insertItem( i18n("Remove Command") ); - if ( !item->tqparent() ) {// no "command" item + if ( !item->parent() ) {// no "command" item menu->setItemEnabled( rmCmd, false ); item->setOpen( true ); } int id = menu->exec( pos ); if ( id == addCmd ) { - TQListViewItem *p = item->tqparent() ? item->tqparent() : item; + TQListViewItem *p = item->parent() ? item->parent() : item; TQListViewItem *cmdItem = new TQListViewItem( p, item, i18n("Click here to set the command to be executed"), i18n("") ); @@ -352,7 +352,7 @@ void ActionWidget::slotContextMenu( KListView *, TQListViewItem *item, void ActionWidget::slotItemChanged( TQListViewItem *item, const TQPoint&, int col ) { - if ( !item->tqparent() || col != 0 ) + if ( !item->parent() || col != 0 ) return; ClipCommand command( item->text(0), item->text(1) ); item->setPixmap( 0, SmallIcon( command.pixmap.isEmpty() ? @@ -371,8 +371,8 @@ void ActionWidget::slotAddAction() void ActionWidget::slotDeleteAction() { TQListViewItem *item = listView->currentItem(); - if ( item && item->tqparent() ) - item = item->tqparent(); + if ( item && item->parent() ) + item = item->parent(); delete item; } diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index c657120ef..693ba568c 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -808,11 +808,11 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI m_drag = 0; return; } - tmpItem = static_cast(tmpItem->tqparent() ); + tmpItem = static_cast(tmpItem->parent() ); } // Remove MenuFolderInfo - TreeItem *oldParentItem = static_cast(m_dragItem->tqparent()); + TreeItem *oldParentItem = static_cast(m_dragItem->parent()); MenuFolderInfo *oldParentFolderInfo = oldParentItem ? oldParentItem->folderInfo() : m_rootFolder; oldParentFolderInfo->take(folderInfo); @@ -1017,7 +1017,7 @@ void TreeView::newsubmenu() } else { - parentItem = static_cast(item->tqparent()); + parentItem = static_cast(item->parent()); folder = parentItem ? parentItem->directory() : TQString::null; } @@ -1093,7 +1093,7 @@ void TreeView::newitem() } else { - parentItem = static_cast(item->tqparent()); + parentItem = static_cast(item->parent()); folder = parentItem ? parentItem->directory() : TQString::null; } @@ -1139,7 +1139,7 @@ void TreeView::newsep() } else { - parentItem = static_cast(item->tqparent()); + parentItem = static_cast(item->parent()); } // create the TreeItem @@ -1181,7 +1181,7 @@ void TreeView::copy( bool cutting ) if (item == 0) return; if (cutting) - setLayoutDirty((TreeItem*)item->tqparent()); + setLayoutDirty((TreeItem*)item->parent()); // clean up old stuff cleanupClipboard(); @@ -1256,7 +1256,7 @@ void TreeView::paste() } else { - parentItem = static_cast(item->tqparent()); + parentItem = static_cast(item->parent()); folder = parentItem ? parentItem->directory() : TQString::null; } @@ -1384,7 +1384,7 @@ void TreeView::del() void TreeView::del(TreeItem *item, bool deleteInfo) { - TreeItem *parentItem = static_cast(item->tqparent()); + TreeItem *parentItem = static_cast(item->parent()); // is file a .directory or a .desktop file if(item->isDirectory()) { diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 7f2d785ae..62702a1c3 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -376,7 +376,7 @@ KEBListViewItem* ListView::getItemAtAddress(const TQString &address) const { void ListView::setOpen(bool open) { for (TQListViewItemIterator it(m_listView); it.current() != 0; ++it) - if (it.current()->tqparent()) + if (it.current()->parent()) it.current()->setOpen(open); } @@ -456,7 +456,7 @@ void ListView::updateListView() { KEBListViewItem * item = static_cast(m_listView->currentItem()); if(item->isEmptyFolderPadder()) - s_current_address = static_cast(item->tqparent())->bookmark().address(); + s_current_address = static_cast(item->parent())->bookmark().address(); else s_current_address = item->bookmark().address(); } @@ -804,7 +804,7 @@ TQDragObject *KEBListView::dragObject() { bool KEBListViewItem::parentSelected(TQListViewItem * item) { TQListViewItem *root = item->listView()->firstChild(); - for( TQListViewItem *parent = item->tqparent(); parent ; parent = parent->tqparent()) + for( TQListViewItem *parent = item->parent(); parent ; parent = parent->parent()) if (parent->isSelected() && parent != root) return true; return false; @@ -814,7 +814,7 @@ void KEBListViewItem::setSelected(bool s) { if( isEmptyFolderPadder()) { - tqparent()->setSelected(true); + parent()->setSelected(true); return; } @@ -904,7 +904,7 @@ KEBListViewItem::KEBListViewItem(TQListView *parent, TQListViewItem *after, cons // DESIGN - move this into kbookmark or into a helper void KEBListViewItem::setOpen(bool open) { - if (!tqparent()) + if (!parent()) return; m_bookmark.internalElement().setAttribute("folded", open ? "no" : "yes"); TQListViewItem::setOpen(open); diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 26422cf1b..7cc4877b2 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -1046,7 +1046,7 @@ TQObject *KonqMainWindow::lastFrame( KonqView *view ) viewFrame = 0; while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) { viewFrame = nextFrame; - nextFrame = nextFrame->tqparent(); + nextFrame = nextFrame->parent(); } return nextFrame ? viewFrame : 0L; } diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index e0e1d778d..b72586f8f 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -989,13 +989,13 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) // calculate nesting depth int nestingDepth = 0; - for (TQListViewItem *currentItem = _item->tqparent(); + for (TQListViewItem *currentItem = _item->parent(); currentItem != 0; - currentItem = currentItem->tqparent()) + currentItem = currentItem->parent()) nestingDepth++; // no parent no indent - if (_item->tqparent() == 0) + if (_item->parent() == 0) nestingDepth = 0; // Root decoration means additional indent @@ -1371,13 +1371,13 @@ KonqBaseListViewWidget::iterator& KonqBaseListViewWidget::iterator::operator++() m_p = i; return *this; } - m_p = (KonqBaseListViewItem *)m_p->tqparent(); + m_p = (KonqBaseListViewItem *)m_p->parent(); while ( m_p ) { if ( m_p->nextSibling() ) break; - m_p = (KonqBaseListViewItem *)m_p->tqparent(); + m_p = (KonqBaseListViewItem *)m_p->parent(); } if ( m_p ) @@ -1402,13 +1402,13 @@ KonqBaseListViewWidget::iterator KonqBaseListViewWidget::iterator::operator++(in m_p = i; return it; } - m_p = (KonqBaseListViewItem *)m_p->tqparent(); + m_p = (KonqBaseListViewItem *)m_p->parent(); while ( m_p ) { if ( m_p->nextSibling() ) break; - m_p = (KonqBaseListViewItem *)m_p->tqparent(); + m_p = (KonqBaseListViewItem *)m_p->parent(); } if ( m_p ) diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp index 0f3fdddde..75e762d35 100644 --- a/konqueror/sidebar/konqsidebarplugin.cpp +++ b/konqueror/sidebar/konqsidebarplugin.cpp @@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {} bool KonqSidebarPlugin::universalMode() { if (!parent()) return false; - KonqSidebarIface *ksi=static_cast(tqparent()->qt_cast("KonqSidebarIface")); + KonqSidebarIface *ksi=static_cast(parent()->qt_cast("KonqSidebarIface")); if (!ksi) return false; kdDebug()<<"calling KonqSidebarIface->universalMode()"<universalMode(); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 04358ddc4..e97c42c3f 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -1123,7 +1123,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar void Sidebar_Widget::enableAction( const char * name, bool enabled ) { - if (TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo")) + if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")) { ButtonInfo *btninfo = static_cast(sender()->parent()); if (btninfo) @@ -1148,7 +1148,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled ) bool Sidebar_Widget::doEnableActions() { - if (!(TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo"))) + if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))) { kdDebug()<<"Couldn't set active module, aborting"<tqparent(); + p = p->parent(); return static_cast(TQT_TQWIDGET(p)); } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 1437d7f83..d1b5cc16e 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -161,10 +161,10 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ KBookmarkGroup parentGroup; // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)... // if anything goes wrong, use the root. - if (item->tqparent()) { + if (item->parent()) { bool error = false; - KonqSidebarBookmarkItem *parent = dynamic_cast( (item->tqparent()) ); + KonqSidebarBookmarkItem *parent = dynamic_cast( (item->parent()) ); if (!parent) { error = true; } else { diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 57647c04c..02e77c526 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -29,7 +29,7 @@ #include #define MYMODULE static_cast(module()) -#define MYGROUP static_cast(tqparent()) +#define MYGROUP static_cast(parent()) KonqSidebarHistorySettings * KonqSidebarHistoryItem::s_settings = 0L; diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 622bf373a..32f6da202 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -1883,7 +1883,7 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) TQT_TQKEYEVENT( e )->ignore(); return false; } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(tqparent()) /* when standalone */ ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(this) /* when embedded */ && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(parent()) /* when standalone */ ) return false; // not us if ( e->type() == TQEvent::KeyPress ) { diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 87ac35a1a..037a27543 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -53,10 +53,10 @@ WndIcon::WndIcon( TQLabel *w = new TQLabel( this ); w->setFixedSize( pix.width(), pix.height() ); w->setPixmap( pix ); - if(pix.tqmask()) + if(pix.mask()) { - setMask(*pix.tqmask()); - w->setMask(*pix.tqmask()); + setMask(*pix.mask()); + w->setMask(*pix.mask()); } resize( pix.width(), pix.height() ); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 0dc2faf53..c1a60b65e 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -635,7 +635,7 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli) icon.fill(); bitBlt(&icon, 4, 0, &pix, 0, 0, pix.width(), pix.height()); TQBitmap mask(24, 16, true); - bitBlt(&mask, 4, 0, pix.tqmask(), 0, 0, pix.width(), pix.height()); + bitBlt(&mask, 4, 0, pix.mask(), 0, 0, pix.width(), pix.height()); icon.setMask(mask); pix = icon; } diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index 34c448918..7acd11501 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -447,8 +447,8 @@ void SensorDisplay::setSensorOk( bool ok ) mErrorIndicator = new TQWidget( mPlotterWdg ); mErrorIndicator->setErasePixmap( errorIcon ); mErrorIndicator->resize( errorIcon.size() ); - if ( errorIcon.tqmask() ) - mErrorIndicator->setMask( *errorIcon.tqmask() ); + if ( errorIcon.mask() ) + mErrorIndicator->setMask( *errorIcon.mask() ); mErrorIndicator->move( 0, 0 ); mErrorIndicator->show(); } diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 11d0e7af4..fbb16cf72 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -182,12 +182,12 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon int x = big.width() - small.width(); int y = 0; - if ( big.tqmask() ) { - TQBitmap mask = *big.tqmask(); + if ( big.mask() ) { + TQBitmap mask = *big.mask(); bitBlt( &mask, x, y, - small.tqmask() ? TQT_TQPIXMAP(const_cast(small.tqmask())) : &small, 0, 0, + small.mask() ? TQT_TQPIXMAP(const_cast(small.mask())) : &small, 0, 0, small.width(), small.height(), - small.tqmask() ? OrROP : SetROP ); + small.mask() ? OrROP : SetROP ); big.setMask( mask ); }