diff options
Diffstat (limited to 'kspread/dialogs/kspread_dlg_layout.cc')
| -rw-r--r-- | kspread/dialogs/kspread_dlg_layout.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 6b5c233b..fcbb734e 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -182,7 +182,7 @@ GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg ) m_parentBox->insertStringList( tmp ); if ( m_dlg->getStyle()->tqparent() ) - m_parentBox->setCurrentText( m_dlg->getStyle()->tqparentName() ); + m_parentBox->setCurrentText( m_dlg->getStyle()->parentName() ); else { m_parentBox->setCurrentText( i18n( "<None>" ) ); @@ -219,16 +219,16 @@ void GeneralTab::slotNameChanged() checkName(); } -void GeneralTab::slotNewParent( const TQString & tqparentName ) +void GeneralTab::slotNewParent( const TQString & parentName ) { kdDebug() << "New Parent" << endl; - if ( !checkParent( tqparentName ) ) + if ( !checkParent( parentName ) ) return; - if ( tqparentName.isEmpty() || tqparentName == i18n( "<None>" ) ) + if ( parentName.isEmpty() || parentName == i18n( "<None>" ) ) m_dlg->getStyle()->setParent( 0 ); else - m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( tqparentName ) ); + m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( parentName ) ); // Set difference to new tqparent, set GUI to tqparent values, add changes made before // m_dlg->initGUI(); @@ -248,17 +248,17 @@ bool GeneralTab::checkName() return true; } -bool GeneralTab::checkParent( const TQString & tqparentName ) +bool GeneralTab::checkParent( const TQString & parentName ) { - if ( m_dlg->getStyle()->tqparentName() != tqparentName - && m_parentBox->isEnabled() && tqparentName != i18n( "<None>" ) && !tqparentName.isEmpty() ) + if ( m_dlg->getStyle()->parentName() != parentName + && m_parentBox->isEnabled() && parentName != i18n( "<None>" ) && !parentName.isEmpty() ) { - if ( m_nameEdit->text() == tqparentName ) + if ( m_nameEdit->text() == parentName ) { KMessageBox::sorry( this, i18n( "A style cannot inherit from itself." ) ); return false; } - if ( !m_dlg->checkCircle( m_nameEdit->text(), tqparentName ) ) + if ( !m_dlg->checkCircle( m_nameEdit->text(), parentName ) ) { KMessageBox::sorry( this, i18n( "The style cannot inherit from '%1' because of recursive references." ) @@ -266,7 +266,7 @@ bool GeneralTab::checkParent( const TQString & tqparentName ) return false; } - CustomStyle * p = m_dlg->getStyleManager()->style( tqparentName ); + CustomStyle * p = m_dlg->getStyleManager()->style( parentName ); if ( !p ) { |