diff options
Diffstat (limited to 'tdeui/kjanuswidget.cpp')
| -rw-r--r-- | tdeui/kjanuswidget.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 513ae2d8a..5344e83ca 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -115,8 +115,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTreeList->header()->hide(); mTreeList->setRootIsDecorated(true); mTreeList->setSorting( -1 ); - connect( mTreeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()) ); - connect( mTreeList, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect( mTreeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()) ); + connect( mTreeList, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemClicked(TQListViewItem *))); // // Page area. Title at top with a separator below and a pagestack using @@ -143,8 +143,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mIconList->setFont( listFont ); mIconList->verticalScrollBar()->installEventFilter( this ); - connect( mIconList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage())); - connect( mIconList, TQT_SIGNAL(onItem(TQListBoxItem *)), TQT_SLOT(slotOnItem(TQListBoxItem *))); + connect( mIconList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage())); + connect( mIconList, TQ_SIGNAL(onItem(TQListBoxItem *)), TQ_SLOT(slotOnItem(TQListBoxItem *))); hbox->addSpacing( KDialog::marginHint() ); page = new TQFrame( this ); @@ -170,8 +170,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) vbox->addWidget( mTitleSep ); mPageStack = new TQWidgetStack( page ); - connect(mPageStack, TQT_SIGNAL(aboutToShow(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mPageStack, TQ_SIGNAL(aboutToShow(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); vbox->addWidget( mPageStack, 10 ); } else if( mFace == Tabbed ) @@ -180,8 +180,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTabControl = new TQTabWidget( this ); mTabControl->setMargin (KDialog::marginHint()); - connect(mTabControl, TQT_SIGNAL(currentChanged(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mTabControl, TQ_SIGNAL(currentChanged(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); topLayout->addWidget( mTabControl, 10 ); } else if( mFace == Swallow ) @@ -196,8 +196,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) topLayout->addWidget( mPlainPage, 10 ); } - if ( kapp ) - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + if ( tdeApp ) + connect(tdeApp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); mValid = true; setSwallowedWidget(0); // Set default size if 'mFace' is Swallow. @@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade void KJanusWidget::pageGone( TQObject *obj ) { - removePage( TQT_TQWIDGET( obj ) ); + removePage( static_cast<TQWidget*>( obj ) ); } void KJanusWidget::slotReopen( TQListViewItem * item ) @@ -430,19 +430,19 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, const TQString &header,const TQPixmap &pixmap ) { - connect(page, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(pageGone(TQObject*))); + connect(page, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(pageGone(TQObject*))); if( mFace == Tabbed ) { mTabControl->addTab (page, items.last()); - d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page); - d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; d->mNextPageIndex++; } else if( mFace == TreeList || mFace == IconList ) { - d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page); - d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex; + d->mIntToPage[d->mNextPageIndex] = page; + d->mPageToInt[page] = d->mNextPageIndex; mPageStack->addWidget( page, 0 ); if (items.isEmpty()) { @@ -536,7 +536,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget ) } else { - if( TQT_BASE_OBJECT(widget->parent()) != TQT_BASE_OBJECT(mSwallowPage) ) + if( widget->parent() != mSwallowPage ) { widget->reparent( mSwallowPage, 0, TQPoint(0,0) ); } @@ -684,7 +684,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const // and addGridPage() but not with addPage() which returns a child of // the toplevel page. addPage() returns a TQFrame so I check for that. // - if( widget->isA(TQFRAME_OBJECT_NAME_STRING) ) + if( widget->isA("TQFrame") ) { return d->mPageToInt[widget->parentWidget()]; } @@ -726,7 +726,7 @@ void KJanusWidget::slotItemClicked(TQListViewItem *it) it->setOpen(!it->isOpen()); } -// hack because qt does not support Q_OBJECT in nested classes +// hack because qt does not support TQ_OBJECT in nested classes void KJanusWidget::slotOnItem(TQListBoxItem *qitem) { mIconList->slotOnItem( qitem ); @@ -856,9 +856,9 @@ void KJanusWidget::unfoldTreeList( bool persist ) if( mFace == TreeList ) { if( persist ) - connect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + connect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); else - disconnect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + disconnect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); for( TQListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() ) item->setOpen( true ); @@ -878,7 +878,7 @@ void KJanusWidget::addButtonBelowList( const TQString & text, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { TQPushButton * button = new TQPushButton( text, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } @@ -887,7 +887,7 @@ void KJanusWidget::addButtonBelowList( const KGuiItem & item, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { KPushButton * button = new KPushButton( item, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } @@ -1017,7 +1017,7 @@ void KJanusWidget::IconListBox::leaveEvent( TQEvent *ev ) } } -// hack because qt does not support Q_OBJECT in nested classes +// hack because qt does not support TQ_OBJECT in nested classes void KJanusWidget::IconListBox::slotOnItem(TQListBoxItem *qitem) { TDEListBox::slotOnItem( qitem ); @@ -1110,14 +1110,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap() pix = new TQPixmap( 32, 32 ); TQPainter p( pix ); p.eraseRect( 0, 0, pix->width(), pix->height() ); - p.setPen( Qt::red ); + p.setPen( TQt::red ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); TQBitmap mask( pix->width(), pix->height(), true ); - mask.fill( Qt::black ); + mask.fill( TQt::black ); p.begin( &mask ); - p.setPen( Qt::white ); + p.setPen( TQt::white ); p.drawRect ( 0, 0, pix->width(), pix->height() ); p.end(); @@ -1149,14 +1149,14 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter ) void KJanusWidget::IconListItem::paintContents( TQPainter *painter ) { TQFontMetrics fm = painter->fontMetrics(); - int ht = fm.boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); + int ht = fm.boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height(); int wp = mPixmap.width(); int hp = mPixmap.height(); painter->drawPixmap( (mMinimumWidth - wp) / 2, 5, mPixmap ); if( !text().isEmpty() ) { - painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, Qt::AlignCenter, text() ); + painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, TQt::AlignCenter, text() ); } } @@ -1168,7 +1168,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const } else { - int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height(); + int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height(); return (mPixmap.height() + ht + 10); } } @@ -1176,7 +1176,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const int KJanusWidget::IconListItem::width( const TQListBox *lb ) const { - int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).width() + 10; + int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).width() + 10; int wp = mPixmap.width() + 10; int w = TQMAX( wt, wp ); return TQMAX( w, mMinimumWidth ); |
