diff options
Diffstat (limited to 'kpresenter')
36 files changed, 262 insertions, 262 deletions
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp index fb87b9f3..d8eb9f20 100644 --- a/kpresenter/KPrBackDia.cpp +++ b/kpresenter/KPrBackDia.cpp @@ -89,10 +89,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name, TQWidget *page = new TQWidget( this ); setMainWidget(page); - TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() ); - TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout ); hbox->setSpacing( KDialog::spacingHint() ); TQVBoxLayout *vbox = new TQVBoxLayout( hbox ); vbox->setSpacing( KDialog::spacingHint() ); diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp index 484a5eab..e8dcdc39 100644 --- a/kpresenter/KPrBackground.cpp +++ b/kpresenter/KPrBackground.cpp @@ -589,7 +589,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T void KPrBackGround::drawBorders( TQPainter *_painter, const TQSize& /*ext*/, const TQRect& /*crect*/ ) { - _painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) ); + _painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) ); _painter->setBrush( TQt::NoBrush ); TQRect rect = m_page->getZoomPageRect(); diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index eee5d6c9..7734835a 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -37,21 +37,21 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP : TQWidget( parent, name ) , m_brush( brush ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); m_typeCombo = new KComboBox( this ); - tqlayout->addWidget( m_typeCombo, 0, 1 ); + layout->addWidget( m_typeCombo, 0, 1 ); m_typeCombo->insertItem( i18n( "Single Color" ) ); m_typeCombo->insertItem( i18n( "Gradient" ) ); m_typeCombo->insertItem( i18n( "Transparent" ) ); TQWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) ); TQLabel *typeLabel = new TQLabel( i18n( "&Type:" ), this ); - tqlayout->addWidget( typeLabel, 0, 0 ); + layout->addWidget( typeLabel, 0, 0 ); typeLabel->setBuddy( m_typeCombo ); m_stack = new TQWidgetStack( this ); - tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); + layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 61c00c96..56a75516 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -481,7 +481,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage // In edit mode we also want to draw the gray area out of the pages if ( !grayRegion.isEmpty() ) - eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) ); + eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) ); } else { @@ -706,9 +706,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e ) } else if( e->button() == Qt::MidButton ) { - TQApplication::tqclipboard()->setSelectionMode( true ); + TQApplication::clipboard()->setSelectionMode( true ); m_currentTextObjectView->paste(); - TQApplication::tqclipboard()->setSelectionMode( false ); + TQApplication::clipboard()->setSelectionMode( false ); } return; } @@ -2723,9 +2723,9 @@ void KPrCanvas::setTextDepthPlus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], - tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], + layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } @@ -2753,9 +2753,9 @@ void KPrCanvas::setTextDepthMinus() m_view->kPresenterDoc()->addCommand( macroCmd ); if(!lst.isEmpty()) { - const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat(); - m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine], - tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); + const KoParagLayout *layout=lst.first()->currentParagLayoutFormat(); + m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine], + layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl()); } } @@ -4145,7 +4145,7 @@ void KPrCanvas::copyOasisObjs() delete store; kd->setEncodedData( arr ); - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::copyObjs() @@ -4214,7 +4214,7 @@ void KPrCanvas::copyObjs() delete store; kd->setEncodedData( arr ); - TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard ); + TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard ); } void KPrCanvas::deleteObjs() @@ -4941,7 +4941,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k } -void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) +void KPrCanvas::finishResizeObject( const TQString &name, bool layout ) { if ( m_resizeObject ) { @@ -4958,8 +4958,8 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout ) m_view->kPresenterDoc()->addCommand( resizeCmd ); } - if ( tqlayout ) - m_view->kPresenterDoc()->tqlayout( m_resizeObject ); + if ( layout ) + m_view->kPresenterDoc()->layout( m_resizeObject ); m_ratio = 0.0; m_isResizing = false; @@ -5535,12 +5535,12 @@ void KPrCanvas::closeObject(bool /*close*/) m_view->kPresenterDoc()->addCommand( cmd ); } -void KPrCanvas::tqlayout() +void KPrCanvas::layout() { TQPtrListIterator<KPrObject> it(getObjectList()); for ( ; it.current(); ++it ) { if ( it.current()->getType() == OT_TEXT ) - static_cast<KPrTextObject *>( it.current() )->tqlayout(); + static_cast<KPrTextObject *>( it.current() )->layout(); } } diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h index f5355be7..2d8c7f48 100644 --- a/kpresenter/KPrCanvas.h +++ b/kpresenter/KPrCanvas.h @@ -360,7 +360,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 ); TQPixmap getPicturePixmap() const; void closeObject(bool _close); - void tqlayout(); + void layout(); void alignVertical(VerticalAlignmentType _type ); void savePicture(); @@ -633,7 +633,7 @@ private: /// resize the m_resizeObject void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio, bool scaleAroundCenter ); /// create KPrResizeCmd - void finishResizeObject( const TQString &name, bool tqlayout = true ); + void finishResizeObject( const TQString &name, bool layout = true ); /** * @brief Display object above the other objects in editiong mode diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp index 85e66845..5f88381d 100644 --- a/kpresenter/KPrCommand.cpp +++ b/kpresenter/KPrCommand.cpp @@ -1345,7 +1345,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP : KNamedCommand( _name ) { m_doc=_doc; - tqlayout = _layout; + layout = _layout; oldLayout = _oldLayout; oldUnit = _oldUnit; unit = _unit; @@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP void KPrPgLayoutCmd::execute() { m_doc->setUnit( unit ); - m_doc->setPageLayout( tqlayout ); + m_doc->setPageLayout( layout ); m_doc->updateHeaderFooterPosition(); m_doc->updateRuler(); m_doc->updateRulerPageLayout(); @@ -1842,7 +1842,7 @@ void KPrResizeCmd::execute() { if(object->isSelected()) doc->updateRuler(); - doc->tqlayout( object ); + doc->layout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); @@ -1863,7 +1863,7 @@ void KPrResizeCmd::unexecute() { if(object->isSelected()) doc->updateRuler(); - doc->tqlayout( object ); + doc->layout( object ); } if ( object->isSelected()) doc->updateObjectStatusBarItem(); @@ -2668,7 +2668,7 @@ void KPrChangeMarginCommand::execute() it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin, m_newMargins.rightMargin, m_newMargins.bottomMargin); it.current()->resizeTextDocument(); - it.current()->tqlayout(); + it.current()->layout(); } m_doc->repaint( false ); @@ -2684,7 +2684,7 @@ void KPrChangeMarginCommand::unexecute() object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin, marginsStruct->rightMargin, marginsStruct->bottomMargin); object->resizeTextDocument(); - object->tqlayout(); + object->layout(); } m_doc->repaint( false ); @@ -2708,7 +2708,7 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQSt void KPrChangeVerticalAlignmentCommand::execute() { m_obj->setVerticalAligment( m_newAlign ); - m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->layout(m_obj); m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); @@ -2717,7 +2717,7 @@ void KPrChangeVerticalAlignmentCommand::execute() void KPrChangeVerticalAlignmentCommand::unexecute() { m_obj->setVerticalAligment( m_oldAlign ); - m_obj->kPresenterDocument()->tqlayout(m_obj); + m_obj->kPresenterDocument()->layout(m_obj); m_obj->kPresenterDocument()->repaint(m_obj); m_doc->updateSideBarItem( m_page ); diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h index 4a4cc0ec..cc22d2c2 100644 --- a/kpresenter/KPrCommand.h +++ b/kpresenter/KPrCommand.h @@ -543,7 +543,7 @@ public: protected: KPrDocument *m_doc; - KoPageLayout tqlayout, oldLayout; + KoPageLayout layout, oldLayout; KoUnit::Unit unit, oldUnit; }; diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index b25e1255..1a5808ec 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -419,9 +419,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch config = KPrFactory::global()->config(); TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); + TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); m_oldNbRedo=30; m_printNotes=true; @@ -469,9 +469,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch box->addWidget(tmpTQGroupBox); tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" ); - tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint()); - tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint()); - grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 ); + tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); + tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); + grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 ); KoRect rect = doc->masterPage()->getPageRect(); TQLabel *lab=new TQLabel(i18n("Horizontal grid size:"), tmpTQGroupBox); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index fca675d5..1aa505eb 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -272,7 +272,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje saveOnlyPage = -1; m_maxRecentFiles = 10; - connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ), + connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( clipboardDataChanged() ) ); m_commandHistory = new KoCommandHistory( actionCollection(), true ) ; @@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl Q_ASSERT( styles.count() == 1 ); it = styles.begin(); for ( ; it != styles.end() ; ++it ) { - (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ ); + (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ ); stylesWriter->endElement(); } @@ -1648,7 +1648,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles kdDebug()<<" masterPageName:"<<masterPageName<<endl; if ( ! master ) { - masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter) + masterPageName = "Standard"; // use default layout as fallback (default in kpresenter) master = oasisStyles.masterPages()[ masterPageName]; if ( !master ) //last test... master = oasisStyles.masterPages()["Default"]; @@ -1685,7 +1685,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles kdDebug()<<" end load oasis master style \n"; Q_ASSERT( master ); - const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0; + const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() )) : 0; const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" ); kdDebug()<<"Standard background "<<backgroundStyle<<endl; // parse all pages @@ -2089,7 +2089,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa if ( !note.isEmpty() ) note += "\n"; - //todo load tqlayout for note. + //todo load layout for note. TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" ); if ( !textBox.isNull() ) @@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) else if(borders.hasAttribute("mmBottom")) //compatibility __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() ); } - // PAPER found and parsed -> apply page tqlayout + // PAPER found and parsed -> apply page layout // e.g. the text objects need it if ( _clean ) setPageLayout( __pgLayout ); @@ -3276,11 +3276,11 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout ) // m_pageList.at( i )->updateBackgroundSize(); repaint( false ); - tqlayout(); + layout(); // don't setModified(true) here, since this is called on startup } -//when we change pagetqlayout we must re-position header/footer +//when we change pagelayout we must re-position header/footer void KPrDocument::updateHeaderFooterPosition( ) { KoRect pageRect=m_masterPage->getPageRect(); @@ -3423,19 +3423,19 @@ void KPrDocument::repaint( const TQRect& rect ) } } -void KPrDocument::tqlayout(KPrObject *kpobject) +void KPrDocument::layout(KPrObject *kpobject) { KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject ); if (obj) - obj->tqlayout(); + obj->layout(); } -void KPrDocument::tqlayout() +void KPrDocument::layout() { TQPtrListIterator<KoView> it( views() ); for( ; it.current(); ++it ) { KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas(); - canvas->tqlayout(); + canvas->layout(); } } @@ -3963,7 +3963,7 @@ void KPrDocument::copyPageToClipboard( int pgnum ) KURL url; url.setPath( tempFile.name() ); KURL::List lst; lst.append( url ); - TQApplication::tqclipboard()->setData( new KURLDrag( lst ) ); + TQApplication::clipboard()->setData( new KURLDrag( lst ) ); m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged } @@ -3987,7 +3987,7 @@ void KPrDocument::clipboardDataChanged() } // TODO enable paste as well, when a txtobject is activated // and there is plain text in the clipboard. Then enable this code. - //TQMimeSource *data = TQApplication::tqclipboard()->data(); + //TQMimeSource *data = TQApplication::clipboard()->data(); //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" ); // emit enablePaste( canPaste ); } @@ -4295,7 +4295,7 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ ) for (; it.current(); ++it ) { static_cast<KPrView *>( it.current() )->getCanvas()->update(); - static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout(); + static_cast<KPrView *>( it.current() )->getCanvas()->layout(); } } } diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h index e1ae80e3..3584e372 100644 --- a/kpresenter/KPrDocument.h +++ b/kpresenter/KPrDocument.h @@ -166,7 +166,7 @@ class KPrDocument : public KoDocument virtual void addView( KoView *_view ); virtual void removeView( KoView *_view ); - // page tqlayout + // page layout void setPageLayout( const KoPageLayout &); virtual TQPixmap generatePreview( const TQSize &size ); @@ -461,8 +461,8 @@ class KPrDocument : public KoDocument KoCommandHistory * commandHistory()const { return m_commandHistory; } void updateObjectStatusBarItem(); void updateObjectSelected(); - void tqlayout(KPrObject *kpobject); - void tqlayout(); + void layout(KPrObject *kpobject); + void layout(); void changeBgSpellCheckingState( bool b ); bool cursorInProtectedArea()const; diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp index 979df309..3d66f48a 100644 --- a/kpresenter/KPrEffectDia.cpp +++ b/kpresenter/KPrEffectDia.cpp @@ -62,10 +62,10 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page ); - grp1->tqlayout()->setSpacing(KDialog::spacingHint()); - grp1->tqlayout()->setMargin(KDialog::marginHint()); + grp1->layout()->setSpacing(KDialog::spacingHint()); + grp1->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp1); - TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4); + TQGridLayout *upperRow = new TQGridLayout(grp1->layout(), 6, 4); lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 ); lAppear->setAlignment( AlignVCenter ); @@ -197,10 +197,10 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList< topLayout->addWidget(disappear); TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page); - grp2->tqlayout()->setSpacing(KDialog::spacingHint()); - grp2->tqlayout()->setMargin(KDialog::marginHint()); + grp2->layout()->setSpacing(KDialog::spacingHint()); + grp2->layout()->setMargin(KDialog::marginHint()); topLayout->addWidget(grp2); - TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4); + TQGridLayout *lowerRow = new TQGridLayout(grp2->layout(), 5, 4); lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 ); lDisappear->setAlignment( AlignVCenter ); diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp index 89cf00ab..75671e28 100644 --- a/kpresenter/KPrGeneralProperty.cpp +++ b/kpresenter/KPrGeneralProperty.cpp @@ -37,11 +37,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene , m_generalValue( generalValue ) , m_unit( unit ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); if ( m_generalValue.m_name.isNull() ) { diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp index 48074143..532fbb6e 100644 --- a/kpresenter/KPrMarginWidget.cpp +++ b/kpresenter/KPrMarginWidget.cpp @@ -38,13 +38,13 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn , m_changed( false ) , m_noSignal( false ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_ui = new MarginUI( this ); - tqlayout->addWidget( m_ui ); + layout->addWidget( m_ui ); TQSpacerItem *spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); m_ui->margins->setTitle( i18n( "Margins" ) ); diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index ea050f41..ba07c8b6 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -74,7 +74,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page ); group->setRadioButtonExclusive( TRUE ); - group->tqlayout(); + group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp index 3eff9180..656b48e2 100644 --- a/kpresenter/KPrPage.cpp +++ b/kpresenter/KPrPage.cpp @@ -538,7 +538,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage xmlWriter.startElement( "style:master-page" ); xmlWriter.addAttribute( "style:name", "Standard" ); - xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName ); + xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName ); TQString styleName = saveOasisPageStyle( store, context.mainStyles() ); if ( !styleName.isEmpty() ) @@ -655,7 +655,7 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const return true; //todo : add size for draw:text-box otherwise we can't import into oo - //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> + //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes"> xmlWriter.startElement( "presentation:notes" ); xmlWriter.startElement( "draw:frame" ); //todo save style @@ -2445,7 +2445,7 @@ void KPrPage::changeTabStopValue ( double _tabStop ) if ( obj ) { obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop )); - obj->tqlayout(); + obj->layout(); m_doc->repaint( obj ); } } diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp index d6790084..753b184a 100644 --- a/kpresenter/KPrPenStyleWidget.cpp +++ b/kpresenter/KPrPenStyleWidget.cpp @@ -37,11 +37,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const : TQWidget( parent, name ) , m_pen( pen ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PenStyleUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PenStyleUI( this ) ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addItem( spacer ); + layout->addItem( spacer ); connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SLOT( slotPenChanged() ) ); diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp index 0b1aab1f..fa51abf4 100644 --- a/kpresenter/KPrPgConfDia.cpp +++ b/kpresenter/KPrPgConfDia.cpp @@ -135,9 +135,9 @@ void KPrPgConfDia::setupPageGeneral() "using the mouse.</p>" "<p>You can configure the color of the drawing pen and the " "width of the pen.</p>" ) ); - penGroup->tqlayout()->setSpacing(KDialog::marginHint()); - penGroup->tqlayout()->setMargin(KDialog::spacingHint()); - //TQGridLayout *grid = new TQGridLayout(penGroup->tqlayout(), 3, 2 ); + penGroup->layout()->setSpacing(KDialog::marginHint()); + penGroup->layout()->setMargin(KDialog::spacingHint()); + //TQGridLayout *grid = new TQGridLayout(penGroup->layout(), 3, 2 ); TQLabel* label = new TQLabel( i18n( "Color:" ), penGroup ); //grid->addWidget( label, 0, 0 ); diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp index 5e0e6db8..89c1111f 100644 --- a/kpresenter/KPrPictureProperty.cpp +++ b/kpresenter/KPrPictureProperty.cpp @@ -33,8 +33,8 @@ KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, cons : TQWidget( parent, name ) , m_pictureSettings( pictureSettings ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PicturePropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PicturePropertyUI( this ) ); connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) ); connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) ); diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp index 694a9653..7c7e788a 100644 --- a/kpresenter/KPrPieProperty.cpp +++ b/kpresenter/KPrPieProperty.cpp @@ -35,8 +35,8 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC : TQWidget( parent, name ) , m_pieValues( pieValues ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PiePropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PiePropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Pie" ) ); m_ui->typeCombo->insertItem( i18n( "Arc" ) ); diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp index fe303a0b..4d8cf155 100644 --- a/kpresenter/KPrPolygonProperty.cpp +++ b/kpresenter/KPrPolygonProperty.cpp @@ -33,8 +33,8 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP : TQWidget( parent, name ) , m_polygonSettings( polygonSettings ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new PolygonPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new PolygonPropertyUI( this ) ); m_ui->typeCombo->insertItem( i18n( "Polygon" ) ); m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) ); diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp index 3dce55a3..cf496a15 100644 --- a/kpresenter/KPrPrinterDlg.cpp +++ b/kpresenter/KPrPrinterDlg.cpp @@ -36,7 +36,7 @@ : KPrintDialogPage( parent, name ) { setTitle( i18n( "KPresenter Options" ) ); - TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 2, 1, 11, 6 ); txtRows = new KIntNumInput(this ); txtRows->setMinValue(1); txtRows->setMaxValue(5); @@ -50,21 +50,21 @@ TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this ); TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") ); - tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 ); + layout->addMultiCellWidget( caption, 0, 0, 0, 1 ); TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 ); l2->addWidget( new TQLabel(i18n("Rows: "), this) ); l2->addWidget( new TQLabel(i18n("Columns: "), this) ); - tqlayout->addLayout( l2, 1, 0 ); + layout->addLayout( l2, 1, 0 ); TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 ); l3->addWidget( txtRows ); l3->addWidget( txtColumns ); - tqlayout->addLayout( l3, 1, 1 ); + layout->addLayout( l3, 1, 1 ); drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this ); drawBorder->setChecked( true ); drawBorder->setEnabled( false ); - tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); + layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 ); } void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool ) diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp index 2174755b..4f9bd8b6 100644 --- a/kpresenter/KPrRectProperty.cpp +++ b/kpresenter/KPrRectProperty.cpp @@ -34,8 +34,8 @@ KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectVal , m_rectValue( rectValue ) { formerVerticalValue = 0; - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->addWidget( m_ui = new RectPropertyUI( this ) ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); + layout->addWidget( m_ui = new RectPropertyUI( this ) ); KoImageResource kir; m_ui->combineButton->setPixmap(kir.chain()); diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 6c16133e..87db439d 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -473,7 +473,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle { //kdDebug(33001) << "KPrTextObject::drawText onlyChanged=" << onlyChanged << " cursor=" << cursor << " resetChanged=" << resetChanged << endl; recalcVerticalAlignment(); - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); _painter->save(); _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical)); if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer)) @@ -972,7 +972,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool findStyle) { - KoParagLayout tqlayout; + KoParagLayout layout; // Only when loading paragraphs, not when loading styles if ( findStyle ) @@ -998,7 +998,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu style = doc->styleCollection()->findStyle( "Standard" ); } Q_ASSERT(style); - tqlayout.style = style; + layout.style = style; } TQDomElement element = parentElem.namedItem( "INDENTS" ).toElement(); @@ -1007,17 +1007,17 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu double val=0.0; if(element.hasAttribute("first")) val=element.attribute("first").toDouble(); - tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = val; + layout.margins[TQStyleSheetItem::MarginFirstLine] = val; val=0.0; if(element.hasAttribute( "left")) // The GUI prevents a negative indent, so let's fixup broken docs too val=TQMAX(0, element.attribute( "left").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginLeft] = val; + layout.margins[TQStyleSheetItem::MarginLeft] = val; val=0.0; if(element.hasAttribute("right")) // The GUI prevents a negative indent, so let's fixup broken docs too val=TQMAX(0, element.attribute("right").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginRight] = val; + layout.margins[TQStyleSheetItem::MarginRight] = val; } element = parentElem.namedItem( "LINESPACING" ).toElement(); if ( !element.isNull() ) @@ -1028,18 +1028,18 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu TQString value = element.attribute( "value" ); if ( value == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.setLineSpacingValue(0); } else if ( value == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.setLineSpacingValue(0); } else { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.setLineSpacingValue(value.toDouble()); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.setLineSpacingValue(value.toDouble()); } } else @@ -1047,28 +1047,28 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu TQString type = element.attribute( "type" ); if ( type == "oneandhalf" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF; + layout.setLineSpacingValue(0); } else if ( type == "double" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE; - tqlayout.setLineSpacingValue(0); + layout.lineSpacingType = KoParagLayout::LS_DOUBLE; + layout.setLineSpacingValue(0); } else if ( type == "custom" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_CUSTOM; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "atleast" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_AT_LEAST; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } else if ( type == "multiple" ) { - tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE; - tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); + layout.lineSpacingType = KoParagLayout::LS_MULTIPLE; + layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble()); } } } @@ -1079,43 +1079,43 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu double val =0.0; if(element.hasAttribute("before")) val=TQMAX(0, element.attribute("before").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginTop] = val; + layout.margins[TQStyleSheetItem::MarginTop] = val; val = 0.0; if(element.hasAttribute("after")) val=TQMAX(0, element.attribute("after").toDouble()); - tqlayout.margins[TQStyleSheetItem::MarginBottom] = val; + layout.margins[TQStyleSheetItem::MarginBottom] = val; } element = parentElem.namedItem( "LEFTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.leftBorder = KoBorder::loadBorder( element ); + layout.leftBorder = KoBorder::loadBorder( element ); else - tqlayout.leftBorder.setPenWidth( 0); + layout.leftBorder.setPenWidth( 0); element = parentElem.namedItem( "RIGHTBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.rightBorder = KoBorder::loadBorder( element ); + layout.rightBorder = KoBorder::loadBorder( element ); else - tqlayout.rightBorder.setPenWidth( 0); + layout.rightBorder.setPenWidth( 0); element = parentElem.namedItem( "TOPBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.topBorder = KoBorder::loadBorder( element ); + layout.topBorder = KoBorder::loadBorder( element ); else - tqlayout.topBorder.setPenWidth(0); + layout.topBorder.setPenWidth(0); element = parentElem.namedItem( "BOTTOMBORDER" ).toElement(); if ( !element.isNull() ) - tqlayout.bottomBorder = KoBorder::loadBorder( element ); + layout.bottomBorder = KoBorder::loadBorder( element ); else - tqlayout.bottomBorder.setPenWidth(0); + layout.bottomBorder.setPenWidth(0); element = parentElem.namedItem( "COUNTER" ).toElement(); if ( !element.isNull() ) { - tqlayout.counter = new KoParagCounter; - tqlayout.counter->load( element ); + layout.counter = new KoParagCounter; + layout.counter->load( element ); } KoTabulatorList tabList; @@ -1140,110 +1140,110 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu tabList.append( tab ); } } - tqlayout.setTabList( tabList ); + layout.setTabList( tabList ); - return tqlayout; + return layout; } -void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ) +void KPrTextObject::saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem ) { TQDomDocument doc = parentElem.ownerDocument(); TQDomElement element = doc.createElement( "NAME" ); parentElem.appendChild( element ); - if ( tqlayout.style ) - element.setAttribute( "value", tqlayout.style->name() ); + if ( layout.style ) + element.setAttribute( "value", layout.style->name() ); else kdWarning() << "KWTextParag::saveParagLayout: style==0L!" << endl; - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 || + layout.margins[TQStyleSheetItem::MarginLeft] != 0 || + layout.margins[TQStyleSheetItem::MarginRight] != 0 ) { element = doc.createElement( "INDENTS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) - element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ) - element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 ) - element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] ); + if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ) + element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] ); + if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 ) + element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] ); + if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 ) + element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] ); } - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 || - tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 || + layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) { element = doc.createElement( "OFFSETS" ); parentElem.appendChild( element ); - if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ) - element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] ); - if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 ) - element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] ); + if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ) + element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] ); + if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 ) + element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] ); } - if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE ) + if ( layout.lineSpacingType != KoParagLayout::LS_SINGLE ) { element = doc.createElement( "LINESPACING" ); parentElem.appendChild( element ); - if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) + if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF ) element.setAttribute( "type", "oneandhalf" ); - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE ) element.setAttribute( "type", "double" ); - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM ) + else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM ) { element.setAttribute( "type", "custom" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) + else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST ) { element.setAttribute( "type", "atleast" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } - else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) + else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE ) { element.setAttribute( "type", "multiple" ); - element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue()); + element.setAttribute( "spacingvalue", layout.lineSpacingValue()); } else kdDebug(33001) << " error in lineSpacing Type" << endl; } - if ( tqlayout.leftBorder.penWidth() > 0 ) + if ( layout.leftBorder.penWidth() > 0 ) { element = doc.createElement( "LEFTBORDER" ); parentElem.appendChild( element ); - tqlayout.leftBorder.save( element ); + layout.leftBorder.save( element ); } - if ( tqlayout.rightBorder.penWidth() > 0 ) + if ( layout.rightBorder.penWidth() > 0 ) { element = doc.createElement( "RIGHTBORDER" ); parentElem.appendChild( element ); - tqlayout.rightBorder.save( element ); + layout.rightBorder.save( element ); } - if ( tqlayout.topBorder.penWidth() > 0 ) + if ( layout.topBorder.penWidth() > 0 ) { element = doc.createElement( "TOPBORDER" ); parentElem.appendChild( element ); - tqlayout.topBorder.save( element ); + layout.topBorder.save( element ); } - if ( tqlayout.bottomBorder.penWidth() > 0 ) + if ( layout.bottomBorder.penWidth() > 0 ) { element = doc.createElement( "BOTTOMBORDER" ); parentElem.appendChild( element ); - tqlayout.bottomBorder.save( element ); + layout.bottomBorder.save( element ); } - if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE ) + if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE ) { element = doc.createElement( "COUNTER" ); parentElem.appendChild( element ); - if (tqlayout.counter ) - tqlayout.counter->save( element ); + if (layout.counter ) + layout.counter->save( element ); } - KoTabulatorList tabList = tqlayout.tabList(); + KoTabulatorList tabList = layout.tabList(); KoTabulatorList::ConstIterator it = tabList.begin(); for ( ; it != tabList.end() ; it++ ) { @@ -1293,7 +1293,7 @@ void KPrTextObject::recalcPageNum( KPrPage *page ) } } -void KPrTextObject::tqlayout() +void KPrTextObject::layout() { invalidate(); // Get the thing going though, repainting doesn't call formatMore @@ -1305,7 +1305,7 @@ void KPrTextObject::invalidate() //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl; m_textobj->setLastFormattedParag( textDocument()->firstParag() ); textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() ); - textDocument()->invalidate(); // lazy tqlayout, real update follows upon next repaint + textDocument()->invalidate(); // lazy layout, real update follows upon next repaint } // For the "paragraph after paragraph" effect @@ -1380,7 +1380,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV //p->fillRect( clip, TQt::blue ); TQPixmap *pix = 0; - TQColorGroup cg = TQApplication::tqpalette().active(); + TQColorGroup cg = TQApplication::palette().active(); cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() ); uint drawingFlags = KoTextDocument::DrawSelections; @@ -1582,7 +1582,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, if ( ( bottom > availHeight ) || // this parag is already below the avail height ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it { - int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels + int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels if( lastFormatted && bottom + lastFormatted->rect().height() > availHeight ) { difference += lastFormatted->rect().height(); @@ -1822,7 +1822,7 @@ void KPrTextView::copy() //kdDebug(33001)<<"void KPrTextView::copy() "<<endl; if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) { TQDragObject *drag = newDrag( 0 ); - TQApplication::tqclipboard()->setData( drag ); + TQApplication::clipboard()->setData( drag ); } } @@ -1830,7 +1830,7 @@ void KPrTextView::paste() { //kdDebug(33001) << "KPrTextView::paste()" << endl; - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString returnedMimeType = KoTextObject::providesOasis( data ); if ( !returnedMimeType.isEmpty() ) { @@ -1852,11 +1852,11 @@ void KPrTextView::paste() { // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" ) // In particular it handles charsets (in the mimetype). - TQString text = TQApplication::tqclipboard()->text(); + TQString text = TQApplication::clipboard()->text(); if ( !text.isEmpty() ) textObject()->pasteText( cursor(), text, currentFormat(), true /*removeSelected*/ ); } - kpTextObject()->tqlayout(); + kpTextObject()->layout(); } void KPrTextView::updateUI( bool updateFormat, bool force ) @@ -2472,7 +2472,7 @@ void KPrTextView::dropEvent( TQDropEvent * e ) KCommand *cmd = textView()->prepareDropMove( dropCursor ); if(cmd) { - kpTextObject()->tqlayout(); + kpTextObject()->layout(); macroCmd->addCommand(cmd); addMacroCmd = true; } diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h index 03de6444..6b62d6b8 100644 --- a/kpresenter/KPrTextObject.h +++ b/kpresenter/KPrTextObject.h @@ -137,7 +137,7 @@ public: bool isProtectContent() const { return textObject()->protectContent();} void loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset=0 ); - void tqlayout(); + void layout(); /** Reimplemented from KoTextFlow */ int availableHeight() const; @@ -194,7 +194,7 @@ protected: virtual void loadKTextObject( const TQDomElement &e ); void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged ); void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to ); - void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem ); + void saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem ); void invalidate(); void recalcVerticalAlignment(); virtual KoPen defaultPen() const; diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp index 0dfc1d79..01478ef2 100644 --- a/kpresenter/KPrTextObjectIface.cpp +++ b/kpresenter/KPrTextObjectIface.cpp @@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const void KPrTextObjectIface::setPtMarginLeft(double val) { m_textobject->setBLeft(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginRight(double val) { m_textobject->setBRight(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginTop(double val) { m_textobject->setBTop(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } void KPrTextObjectIface::setPtMarginBottom(double val) { m_textobject->setBBottom(val); - m_textobject->kPresenterDocument()->tqlayout( m_textobject ); + m_textobject->kPresenterDocument()->layout( m_textobject ); } double KPrTextObjectIface::ptMarginLeft()const diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp index 891ff5b4..a0610cec 100644 --- a/kpresenter/KPrTextProperty.cpp +++ b/kpresenter/KPrTextProperty.cpp @@ -37,10 +37,10 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg , m_unit( unit ) , m_protectContent( protectContent ) { - TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6 ); + TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6 ); - tqlayout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); - tqlayout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); + layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 ); + layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 ); connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ), this, TQT_SLOT( slotProtectContentChanged( bool ) ) ); diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp index a060e45f..ba421709 100644 --- a/kpresenter/KPrTransEffectDia.cpp +++ b/kpresenter/KPrTransEffectDia.cpp @@ -160,8 +160,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, // right-side of the dialog, for showing effect preview - TQVBoxLayout *righttqlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); - righttqlayout->setAutoAdd( true ); + TQVBoxLayout *rightlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() ); + rightlayout->setAutoAdd( true ); effectPreview = new KPrEffectPreview( rightpart, doc, view ); @@ -178,8 +178,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name, pageEffect = pg->getPageEffect(); speed = pg->getPageEffectSpeed(); - TQVBoxLayout *lefttqlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); - lefttqlayout->setAutoAdd( true ); + TQVBoxLayout *leftlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() ); + leftlayout->setAutoAdd( true ); new TQLabel( i18n("Effect:"), leftpart ); diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index a2781ca1..af3905ba 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -502,12 +502,12 @@ void KPrView::setupPrinter( KPrinter &prt ) prt.setFromTo( 1, m_pKPresenterDoc->getPageNums() ); prt.setOption( "kde-range", m_pKPresenterDoc->selectedForPrinting() ); prt.setPageSelection(KPrinter::ApplicationSide); - KoPageLayout tqlayout = m_pKPresenterDoc->pageLayout(); - prt.setOption( "kde-margin-top", TQString::number(tqlayout.ptTop) ); - prt.setOption( "kde-margin-bottom", TQString::number(tqlayout.ptBottom) ); - prt.setOption( "kde-margin-left", TQString::number(tqlayout.ptLeft) ); - prt.setOption( "kde-margin-right", TQString::number(tqlayout.ptRight) ); - KoFormat pageFormat = tqlayout.format; + KoPageLayout layout = m_pKPresenterDoc->pageLayout(); + prt.setOption( "kde-margin-top", TQString::number(layout.ptTop) ); + prt.setOption( "kde-margin-bottom", TQString::number(layout.ptBottom) ); + prt.setOption( "kde-margin-left", TQString::number(layout.ptLeft) ); + prt.setOption( "kde-margin-right", TQString::number(layout.ptRight) ); + KoFormat pageFormat = layout.format; prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) ); if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN ) @@ -620,7 +620,7 @@ void KPrView::editPaste() if ( !m_canvas->currentTextObjectView() ) { m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if ( data->provides( "text/uri-list" ) ) { m_pKPresenterDoc->pastePage( data, currPg ); @@ -5360,7 +5360,7 @@ KoTextZoomHandler *KPrView::zoomHandler() const void KPrView::slotViewFormattingChars() { m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked()); - m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated + m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated m_pKPresenterDoc->repaint(false); } @@ -5964,7 +5964,7 @@ void KPrView::duplicateObj() m_canvas->copyObjs(); m_canvas->setToolEditMode( TEM_MOUSE ); deSelectAllObjects(); - TQMimeSource *data = TQApplication::tqclipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter"); if ( data->provides( clip_str ) ) { diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 0d490cf4..d4df256b 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -87,7 +87,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, for (uint i=0; i<strIn.length(); i++) { ch=strIn[i]; - switch (ch.tqunicode()) + switch (ch.unicode()) { case 38: // & { @@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn, { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").arg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); break; } } @@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str { if (!codec->canEncode(ch)) { - strReturn+=TQString("&#%1;").arg(ch.tqunicode()); + strReturn+=TQString("&#%1;").arg(ch.unicode()); continue; } } @@ -664,7 +664,7 @@ void KPrWebPresentationWizard::setupPage1() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page1 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -673,29 +673,29 @@ void KPrWebPresentationWizard::setupPage1() "the title of the web presentation. " "Also enter the output directory where the " "web presentation should be saved. " ) ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Author:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title:"), canvas ); label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall " "presentation." ) ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas ); label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label3, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); TQLabel *label4 = new TQLabel( i18n("Path:"), canvas ); label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); @@ -703,24 +703,24 @@ void KPrWebPresentationWizard::setupPage1() "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - tqlayout->addWidget( label4, 5, 0 ); + layout->addWidget( label4, 5, 0 ); author = new KLineEdit( webPres.getAuthor(), canvas ); TQWhatsThis::add( author, i18n("This is where you enter the name of the person or " "organization that should be named as the author of " "the presentation.") ); - tqlayout->addWidget( author, 2, 1 ); + layout->addWidget( author, 2, 1 ); title = new KLineEdit( webPres.getTitle(), canvas ); TQWhatsThis::add( title, i18n("This is where you enter the title of the overall " "presentation." ) ); - tqlayout->addWidget( title, 3, 1 ); + layout->addWidget( title, 3, 1 ); email = new KLineEdit( webPres.getEmail(), canvas ); TQWhatsThis::add( email, i18n("This is where you enter the email address of the " "person or organization that is responsible for " "the presentation.") ); - tqlayout->addWidget( email, 4, 1 ); + layout->addWidget( email, 4, 1 ); path=new KURLRequester( canvas ); path->setMode( KFile::Directory); @@ -729,11 +729,11 @@ void KPrWebPresentationWizard::setupPage1() "where the presentation will be saved. If it does " "not exist, you'll be asked if you want to create " "the directory or abort the creation.") ); - tqlayout->addWidget( path, 5, 1 ); + layout->addWidget( path, 5, 1 ); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 6, 6, 0, 1 ); + layout->addMultiCell( spacer, 6, 6, 0, 1 ); connect(path, TQT_SIGNAL(textChanged(const TQString&)), this,TQT_SLOT(slotChoosePath(const TQString&))); @@ -762,7 +762,7 @@ void KPrWebPresentationWizard::setupPage2() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page2 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -771,34 +771,34 @@ void KPrWebPresentationWizard::setupPage2() help += i18n( "You can also specify the zoom for the slides." ); helptext->setText(help); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas ); label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas ); label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); zoom = new KIntNumInput( webPres.getZoom(), canvas ); TQWhatsThis::add( zoom, i18n( "This selection allows you to specify " "the size of the slide image." ) ); - tqlayout->addWidget( zoom, 2, 1 ); + layout->addWidget( zoom, 2, 1 ); zoom->setSuffix( " %" ); zoom->setRange( 25, 1000, 5 ); encoding = new KComboBox( false, canvas ); - tqlayout->addWidget( encoding, 3, 1 ); + layout->addWidget( encoding, 3, 1 ); // Fill encoding combo // Stolen from tdelibs/kate/part/katedialogs.cpp @@ -819,7 +819,7 @@ void KPrWebPresentationWizard::setupPage2() } doctype = new KComboBox( false, canvas ); - tqlayout->addWidget( doctype, 4, 1 ); + layout->addWidget( doctype, 4, 1 ); doctype->insertItem( "HTML 4.01", -1 ); doctype->insertItem( "XHTML 1.0", -1 ); @@ -827,7 +827,7 @@ void KPrWebPresentationWizard::setupPage2() TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page2, i18n( "Step 2: Configure HTML" ) ); @@ -852,40 +852,40 @@ void KPrWebPresentationWizard::setupPage3() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page3 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft ); helptext->setText( i18n( "Now you can customize the colors of the web pages." ) ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas ); label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label2, 3, 0 ); + layout->addWidget( label2, 3, 0 ); TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas ); label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label3, 4, 0 ); + layout->addWidget( label3, 4, 0 ); textColor = new KColorButton( webPres.getTextColor(), canvas ); - tqlayout->addWidget( textColor, 2, 1 ); + layout->addWidget( textColor, 2, 1 ); titleColor = new KColorButton( webPres.getTitleColor(), canvas ); - tqlayout->addWidget( titleColor, 3, 1 ); + layout->addWidget( titleColor, 3, 1 ); backColor = new KColorButton( webPres.getBackColor(), canvas ); - tqlayout->addWidget( backColor, 4, 1 ); + layout->addWidget( backColor, 4, 1 ); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page3, i18n( "Step 3: Customize Colors" ) ); @@ -909,7 +909,7 @@ void KPrWebPresentationWizard::setupPage4() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page4 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 3, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -921,19 +921,19 @@ void KPrWebPresentationWizard::setupPage4() "click on a title, KPresenter " "mainview will display the slide.") ); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas ); label->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); slideTitle = new KLineEdit( canvas ); - tqlayout->addWidget( slideTitle, 1, 1 ); + layout->addWidget( slideTitle, 1, 1 ); connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slideTitleChanged( const TQString & ) ) ); slideTitles = new KListView( canvas ); - tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); + layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 ); slideTitles->addColumn( i18n( "No." ) ); slideTitles->addColumn( i18n( "Slide Title" ) ); connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, @@ -977,7 +977,7 @@ void KPrWebPresentationWizard::setupPage5() sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png")); TQWidget* canvas = new TQWidget( page5 ); - TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2, + TQGridLayout *layout = new TQGridLayout( canvas, 6, 2, KDialog::marginHint(), KDialog::spacingHint() ); TQLabel *helptext = new TQLabel( canvas ); @@ -987,50 +987,50 @@ void KPrWebPresentationWizard::setupPage5() "the next slide, looping and the presence of headers."); helptext->setText(help); - tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); + layout->addMultiCellWidget( helptext, 0, 0, 0, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 ); TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas ); label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); TQWhatsThis::add( label1, i18n( "This selection allows you to specify " "the time between slides." ) ); - tqlayout->addWidget( label1, 2, 0 ); + layout->addWidget( label1, 2, 0 ); timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas ); timeBetweenSlides->setSpecialValueText(i18n( "Disabled" )); TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify " "the time between slides." ) ); - tqlayout->addWidget( timeBetweenSlides, 2, 1 ); + layout->addWidget( timeBetweenSlides, 2, 1 ); timeBetweenSlides->setSuffix( " seconds" ); timeBetweenSlides->setRange( 0, 900, 1 ); - tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); + layout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 ); writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas); TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you " "want to write the navigation buttons on top " "of the slide." ) ); writeHeader->setChecked( webPres.wantHeader() ); - tqlayout->addWidget( writeHeader, 3, 1); + layout->addWidget( writeHeader, 3, 1); writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas); TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you " "want to write an imprint consisting on the author " "and the software used to create these slides." ) ); writeFooter->setChecked( webPres.wantFooter() ); - tqlayout->addWidget( writeFooter, 4, 1); + layout->addWidget( writeFooter, 4, 1); loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas); TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you " "want the presentation to start again once " "the latest slide is reached." ) ); loopSlides->setChecked( webPres.wantLoopSlides() ); - tqlayout->addWidget( loopSlides, 5, 1); + layout->addWidget( loopSlides, 5, 1); TQSpacerItem* spacer = new TQSpacerItem( 1, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout->addMultiCell( spacer, 5, 5, 0, 1 ); + layout->addMultiCell( spacer, 5, 5, 0, 1 ); addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) ); diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui index 1161f42b..0dad8b48 100644 --- a/kpresenter/generalpropertyui.ui +++ b/kpresenter/generalpropertyui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui index bc7f0707..b0ccae0a 100644 --- a/kpresenter/gradientpropertyui.ui +++ b/kpresenter/gradientpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui index b4e1bd1e..8e638381 100644 --- a/kpresenter/marginui.ui +++ b/kpresenter/marginui.ui @@ -43,7 +43,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui index dd0be8e6..813215db 100644 --- a/kpresenter/polygonpropertyui.ui +++ b/kpresenter/polygonpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui index ff66c8b7..98bedfd5 100644 --- a/kpresenter/rectpropertyui.ui +++ b/kpresenter/rectpropertyui.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui index f54609ae..3f604490 100644 --- a/kpresenter/rotationpropertyui.ui +++ b/kpresenter/rotationpropertyui.ui @@ -50,7 +50,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui index 844424c2..b9774639 100644 --- a/kpresenter/slidetransitionwidget.ui +++ b/kpresenter/slidetransitionwidget.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout39</cstring> + <cstring>layout39</cstring> </property> <vbox> <property name="name"> @@ -67,7 +67,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -75,7 +75,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -147,7 +147,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> |