diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:31 -0600 |
| commit | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch) | |
| tree | 1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kpresenter/KPrBrushProperty.cpp | |
| parent | 94844816550ad672ccfcdc25659c625546239998 (diff) | |
| download | koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'kpresenter/KPrBrushProperty.cpp')
| -rw-r--r-- | kpresenter/KPrBrushProperty.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp index 4dbd9f3fa..6e550fe0b 100644 --- a/kpresenter/KPrBrushProperty.cpp +++ b/kpresenter/KPrBrushProperty.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqslider.h> #include <tqwhatsthis.h> #include <tqwidgetstack.h> @@ -37,34 +37,34 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP : TQWidget( parent, name ) , m_brush( brush ) { - TQGridLayout *layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); + TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); m_typeCombo = new KComboBox( this ); - layout->addWidget( m_typeCombo, 0, 1 ); + tqlayout->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 ); - layout->addWidget( typeLabel, 0, 0 ); + tqlayout->addWidget( typeLabel, 0, 0 ); typeLabel->setBuddy( m_typeCombo ); m_stack = new TQWidgetStack( this ); - layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); + tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 ); connect( m_typeCombo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeChanged( int ) ) ); m_brushUI = new BrushPropertyUI( m_stack ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 100 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 94 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 88 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 63 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 50 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 37 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 12 ) ); - m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 6 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 100 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 94 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 88 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 63 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 50 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 37 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 12 ) ); + m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 6 ) ); m_brushUI->styleCombo->insertItem( i18n( "Horizontal Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) ); m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) ); |