diff options
Diffstat (limited to 'kword/KWFrameDia.cpp')
| -rw-r--r-- | kword/KWFrameDia.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index d33d9118..2130e235 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -448,7 +448,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options "When a new page is created, a new frame will be created for this " "frameset, so that the text can flow from one page to the next if necessary. " "This is what happens for the \"main text frameset\", but this option makes it possible " - "to choose the same behavior for other framesets, for instance in magazine tqlayouts.")); + "to choose the same behavior for other framesets, for instance in magazine layouts.")); if ( m_rResizeFrame ) connect( m_reconnect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) ); m_onpGrid->addRowSpacing( 0, KDialog::marginHint() + 5 ); @@ -2142,12 +2142,12 @@ bool KWFrameDia::applyChanges() while(f) { // The floating attribute applies to the whole frameset... KWFrameSet * fs = f->frameSet(); - KWFrameSet * tqparentFs = fs->groupmanager() ? fs->groupmanager() : fs; + KWFrameSet * parentFs = fs->groupmanager() ? fs->groupmanager() : fs; // Floating if ( m_floating->isChecked() && m_floating->state() != TQButton::NoChange && - !tqparentFs->isFloating() ) + !parentFs->isFloating() ) { if(!macroCmd) macroCmd = new KMacroCommand( i18n("Make Frameset Inline") ); @@ -2158,7 +2158,7 @@ bool KWFrameDia::applyChanges() KoPoint oldPos = f->topLeft(); // turn non-floating frame into floating frame - KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), tqparentFs, true ); + KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), parentFs, true ); cmd->execute(); frameindexList.append( FrameIndex( f ) ); @@ -2171,12 +2171,12 @@ bool KWFrameDia::applyChanges() } else if ( !m_floating->isChecked() && m_floating->state() != TQButton::NoChange && - tqparentFs->isFloating() ) + parentFs->isFloating() ) { if(!macroCmd) macroCmd = new KMacroCommand( i18n("Make Frameset Non-Inline") ); // turn floating-frame into non-floating frame - KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), tqparentFs, false ); + KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), parentFs, false ); macroCmd->addCommand(cmd); cmd->execute(); } |