summaryrefslogtreecommitdiffstats
path: root/karbon
diff options
context:
space:
mode:
Diffstat (limited to 'karbon')
-rw-r--r--karbon/core/vdocument.h2
-rw-r--r--karbon/core/vtext.cc8
-rw-r--r--karbon/dialogs/vconfiguredlg.cc6
-rw-r--r--karbon/dockers/vdocumentdocker.cc62
-rw-r--r--karbon/dockers/vstyledocker.cc8
-rw-r--r--karbon/karbon_part.cc12
-rw-r--r--karbon/karbon_part.h2
-rw-r--r--karbon/karbon_view.cc10
-rw-r--r--karbon/tools/vpatterntool.cc8
-rw-r--r--karbon/tools/vtexttool.cc28
-rw-r--r--karbon/widgets/vcolorslider.cc10
-rw-r--r--karbon/widgets/vreference.cc6
-rw-r--r--karbon/widgets/vsmallpreview.cc14
-rw-r--r--karbon/widgets/vtranslate.cc38
14 files changed, 107 insertions, 107 deletions
diff --git a/karbon/core/vdocument.h b/karbon/core/vdocument.h
index 45270d2e..aa35b834 100644
--- a/karbon/core/vdocument.h
+++ b/karbon/core/vdocument.h
@@ -83,7 +83,7 @@ public:
* Draw the document frame to a painting device.
*
* @param painter abstraction that is used to render to a painting device.
- * @param pl tqlayout describing the page to draw on (restricting the painter)
+ * @param pl layout describing the page to draw on (restricting the painter)
* @param drawPageMargins if @c true, also draw the crop marks for the page margins,
* otherwise, don't draw them.
*/
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cc
index e9888355..4c7d3989 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cc
@@ -473,7 +473,7 @@ VText::traceText()
bool foundCharmap = false;
- // Try to choose tqunicode charmap
+ // Try to choose unicode charmap
for( int charmap = 0; charmap < fontFace->num_charmaps; charmap++ )
{
if( fontFace->charmaps[charmap]->encoding == ft_encoding_unicode )
@@ -481,14 +481,14 @@ VText::traceText()
FT_Error error = FT_Set_Charmap( fontFace, fontFace->charmaps[charmap] );
if( error )
{
- kdDebug(38000) << "traceText(), unable to select tqunicode charmap." << endl;
+ kdDebug(38000) << "traceText(), unable to select unicode charmap." << endl;
continue;
}
foundCharmap = true;
}
}
- // Choose first charmap if no tqunicode charmap was found
+ // Choose first charmap if no unicode charmap was found
if( ! foundCharmap )
{
error = FT_Set_Charmap( fontFace, fontFace->charmaps[0] );
@@ -518,7 +518,7 @@ VText::traceText()
{
// get the glyph index for the current character
TQChar character = m_text.at( i );
- glyphIndex = FT_Get_Char_Index( fontFace, character.tqunicode() );
+ glyphIndex = FT_Get_Char_Index( fontFace, character.unicode() );
if( ! glyphIndex )
{
kdDebug(38000) << "traceText(), unable get index of char : " << character << endl;
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index 141006dc..8c41704c 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -218,10 +218,10 @@ VConfigMiscPage::VConfigMiscPage( KarbonView* view, TQVBox* box, char* name )
KoUnit::Unit unit = view->part()->unit();
TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Misc" ), box, "GroupBox" );
- tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
- tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+ tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
+ tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
- TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->tqlayout(), 4, 2 );
+ TQGridLayout* grid = new TQGridLayout(tmpTQGroupBox->layout(), 4, 2 );
m_oldUndoRedo = 30;
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 3812c790..9a7329a0 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -224,28 +224,28 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent )
: TQWidget( parent, "DocumentTab" ), m_view( view )
{
TQFrame* frame;
- TQGridLayout* tqlayout = new TQGridLayout( this );
- tqlayout->setMargin( 3 );
- tqlayout->setSpacing( 2 );
- tqlayout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 );
- tqlayout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 );
- tqlayout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 );
- tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 );
+ TQGridLayout* layout = new TQGridLayout( this );
+ layout->setMargin( 3 );
+ layout->setSpacing( 2 );
+ layout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 );
+ layout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 );
+ layout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 );
+ layout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 );
frame->setFrameShape( TQFrame::HLine );
- tqlayout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 );
- tqlayout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 );
- tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 );
+ layout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 );
+ layout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 );
+ layout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 );
frame->setFrameShape( TQFrame::HLine );
- //tqlayout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 );
- tqlayout->addWidget( m_width = new TQLabel( this ), 0, 1 );
- tqlayout->addWidget( m_height = new TQLabel( this ), 1, 1 );
- tqlayout->addWidget( m_layers = new TQLabel( this ), 3, 1 );
- tqlayout->addWidget( m_format = new TQLabel( this ), 4, 1 );
- tqlayout->setRowStretch( 7, 1 );
- tqlayout->setColStretch( 0, 0 );
- tqlayout->setColStretch( 1, 0 );
- tqlayout->setColStretch( 2, 2 );
- //tqlayout->addWidget(
+ //layout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 );
+ layout->addWidget( m_width = new TQLabel( this ), 0, 1 );
+ layout->addWidget( m_height = new TQLabel( this ), 1, 1 );
+ layout->addWidget( m_layers = new TQLabel( this ), 3, 1 );
+ layout->addWidget( m_format = new TQLabel( this ), 4, 1 );
+ layout->setRowStretch( 7, 1 );
+ layout->setColStretch( 0, 0 );
+ layout->setColStretch( 1, 0 );
+ layout->setColStretch( 2, 2 );
+ //layout->addWidget(
m_width->setAlignment( AlignRight );
m_height->setAlignment( AlignRight );
@@ -454,8 +454,8 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
{
TQToolButton* button;
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 1 );
- tqlayout->addWidget( m_layersListView = new TQListView( this ), 1 );
+ TQVBoxLayout* layout = new TQVBoxLayout( this, 1 );
+ layout->addWidget( m_layersListView = new TQListView( this ), 1 );
m_buttonGroup = new TQHButtonGroup( this );
m_buttonGroup->setInsideMargin( 3 );
button = new TQToolButton( m_buttonGroup );
@@ -474,9 +474,9 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
button->setIconSet( SmallIcon( "14_layer_deletelayer" ) );
button->setTextLabel( i18n( "Delete" ) );
m_buttonGroup->insert( button );
- tqlayout->addWidget( m_buttonGroup, 0);
- tqlayout->setSpacing( 0 );
- tqlayout->setMargin( 3 );
+ layout->addWidget( m_buttonGroup, 0);
+ layout->setSpacing( 0 );
+ layout->setMargin( 3 );
m_layersListView->setAllColumnsShowFocus( true );
m_layersListView->addColumn( i18n( "Item" ), 120 );
@@ -497,7 +497,7 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent )
connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) );
- tqlayout->activate();
+ layout->activate();
updateLayers();
} // VLayersTab::VLayersTab
@@ -1203,16 +1203,16 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& )
VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent )
: TQWidget( parent ), m_part( part )
{
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
- tqlayout->setMargin( 3 );
- tqlayout->setSpacing( 2 );
- tqlayout->add( m_history = new TQListView( this ) );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
+ layout->setMargin( 3 );
+ layout->setSpacing( 2 );
+ layout->add( m_history = new TQListView( this ) );
m_history->setVScrollBarMode( TQListView::AlwaysOn );
m_history->setSelectionMode( TQListView::NoSelection );
m_history->addColumn( i18n( "Commands" ) );
m_history->setResizeMode( TQListView::AllColumns );
m_history->setRootIsDecorated( true );
- tqlayout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) );
+ layout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) );
m_history->setSorting( 0, true );
VHistoryGroupItem* group = 0;
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index fd8cfb30..672000ae 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -128,9 +128,9 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP
{
KIconLoader il;
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
- tqlayout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );
- tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
+ layout->addWidget( m_clipartChooser = new ClipartChooser( TQSize( 32, 32 ), this ) );
+ layout->addWidget( m_buttonGroup = new TQHButtonGroup( this ) );
TQToolButton* m_addClipartButton;
m_buttonGroup->insert( m_addClipartButton = new TQToolButton( m_buttonGroup ) );
m_buttonGroup->insert( m_importClipartButton = new TQToolButton( m_buttonGroup ) );
@@ -145,7 +145,7 @@ ClipartWidget::ClipartWidget( TQPtrList<VClipartIconItem>* clipartItems, KarbonP
m_buttonGroup->setInsideMargin( 3 );
//setFrameStyle( Box | Sunken );
- tqlayout->setMargin( 3 );
+ layout->setMargin( 3 );
connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
//connect( m_deleteClipartButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteClipart() ) );
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 9355c961..955b21f5 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject()
}
void
-KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit )
+KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit )
{
- m_pageLayout = tqlayout;
+ m_pageLayout = layout;
m_doc.setUnit( _unit );
m_doc.setWidth( m_pageLayout.ptWidth );
m_doc.setHeight( m_pageLayout.ptHeight );
@@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ
return false;
}
- TQString masterPageName = "Standard"; // use default tqlayout as fallback
+ TQString masterPageName = "Standard"; // use default layout as fallback
TQDomElement *master = styles.masterPages()[ masterPageName ];
if ( !master ) //last test...
master = styles.masterPages()[ "Default" ];
@@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ
master = it.current();
}
Q_ASSERT( master );
- const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0;
+ const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0;
if( style )
{
m_pageLayout.loadOasis( *style );
@@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
KoGenStyle pageLayout = m_pageLayout.saveOasis();
TQString layoutName = mainStyles.lookup( pageLayout, "PL" );
KoGenStyle masterPage( KoGenStyle::STYLE_MASTER );
- masterPage.addAttribute( "style:page-tqlayout-name", layoutName );
+ masterPage.addAttribute( "style:page-layout-name", layoutName );
mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering );
KTempFile contentTmpFile;
@@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
it = styleList.begin();
for( ; it != styleList.end(); ++it )
- (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" );
+ (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" );
styleWriter->endElement(); // office:automatic-styles
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 328eab89..9c9ae91a 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -102,7 +102,7 @@ public:
void initConfig();
unsigned int maxRecentFiles() const { return m_maxRecentFiles; }
- void setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit );
+ void setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit );
bool mergeNativeFormat( const TQString & file );
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 10df9e02..3ea792f2 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -494,7 +494,7 @@ KarbonView::addSelectionToClipboard() const
KarbonDrag* kd = new KarbonDrag();
kd->setObjectList( part()->document().selection()->objects() );
- TQApplication::tqclipboard()->setData( kd );
+ TQApplication::clipboard()->setData( kd );
}
void
@@ -503,7 +503,7 @@ KarbonView::editPaste()
KarbonDrag kd;
VObjectList objects;
- if( !kd.decode( TQApplication::tqclipboard()->data(), objects, part()->document() ) )
+ if( !kd.decode( TQApplication::clipboard()->data(), objects, part()->document() ) )
return;
// Paste with a small offset.
@@ -1310,11 +1310,11 @@ void
KarbonView::pageLayout()
{
KoHeadFoot hf;
- KoPageLayout tqlayout = part()->pageLayout();
+ KoPageLayout layout = part()->pageLayout();
KoUnit::Unit unit = part()->unit();
- if( KoPageLayoutDia::pageLayout( tqlayout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) )
+ if( KoPageLayoutDia::pageLayout( layout, hf, FORMAT_AND_BORDERS | DISABLE_UNIT, unit ) )
{
- part()->setPageLayout( tqlayout, unit );
+ part()->setPageLayout( layout, unit );
m_horizRuler->setUnit( unit );
m_vertRuler->setUnit( unit );
m_canvas->resizeContents( int( ( part()->pageLayout().ptWidth + 300 ) * zoom() ),
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 893c8481..4abbb379 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -49,9 +49,9 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge
: KDialogBase( parent, "", true, i18n( "Choose Pattern" ), Ok | Cancel ), m_pattern( 0 )
{
TQWidget *base = new TQWidget( this );
- TQVBoxLayout* tqlayout = new TQVBoxLayout( base );
- tqlayout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) );
- tqlayout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) );
+ TQVBoxLayout* layout = new TQVBoxLayout( base );
+ layout->addWidget( m_patternChooser = new KoIconChooser( TQSize( 32, 32 ), base ) );
+ layout->addWidget( m_buttonGroup = new TQHButtonGroup( base ) );
m_buttonGroup->insert( m_importPatternButton = new TQToolButton( m_buttonGroup ) );
m_buttonGroup->insert( m_deletePatternButton = new TQToolButton( m_buttonGroup ) );
m_patternChooser->setFixedSize( 180, 120 );
@@ -65,7 +65,7 @@ VPatternWidget::VPatternWidget( TQPtrList<KoIconItem>* patterns, VTool*, TQWidge
m_deletePatternButton->setEnabled( false );
//setFrameStyle( Box | Sunken );
- tqlayout->setMargin( 3 );
+ layout->setMargin( 3 );
connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) );
connect( m_patternChooser, TQT_SIGNAL( selected( KoIconItem* ) ), this, TQT_SLOT( patternSelected( KoIconItem* ) ) );
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index ad74048f..cb2a9b3f 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -207,20 +207,20 @@ ShadowWidget::ShadowWidget( TQWidget* parent, const char* name, int angle, int d
setTitle( i18n( "Shadow" ) );
setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
- TQGridLayout* tqlayout = new TQGridLayout( this );
- tqlayout->addRowSpacing( 0, 12 );
- tqlayout->setMargin( 3 );
- tqlayout->setSpacing( 2 );
- tqlayout->setColStretch( 0, 1 );
- tqlayout->setColStretch( 1, 0 );
- tqlayout->setColStretch( 2, 2 );
- tqlayout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 );
- tqlayout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 );
- tqlayout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 );
- tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 );
- tqlayout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 );
- tqlayout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 );
- tqlayout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 );
+ TQGridLayout* layout = new TQGridLayout( this );
+ layout->addRowSpacing( 0, 12 );
+ layout->setMargin( 3 );
+ layout->setSpacing( 2 );
+ layout->setColStretch( 0, 1 );
+ layout->setColStretch( 1, 0 );
+ layout->setColStretch( 2, 2 );
+ layout->addMultiCellWidget( m_preview = new ShadowPreview( this ), 1, 3, 0, 0 );
+ layout->addWidget( new TQLabel( i18n( "Angle:" ), this ), 1, 1 );
+ layout->addWidget( m_angle = new KIntNumInput( this ), 1, 2 );
+ layout->addWidget( new TQLabel( i18n( "Distance:" ), this ), 2, 1 );
+ layout->addWidget( m_distance = new KIntNumInput( this ), 2, 2 );
+ layout->addWidget( m_useShadow = new TQCheckBox( i18n( "Shadow" ), this ), 3, 1 );
+ layout->addWidget( m_translucent = new TQCheckBox( i18n( "Draw translucent shadow" ), this ), 3, 2 );
m_distance->setRange( 1, 37, 1, true );
m_angle->setRange( 0, 360, 10, true );
m_angle->setValue( angle );
diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc
index 3e2af4f0..25cb58e6 100644
--- a/karbon/widgets/vcolorslider.cc
+++ b/karbon/widgets/vcolorslider.cc
@@ -53,15 +53,15 @@ VColorSlider::~VColorSlider()
void VColorSlider::init()
{
m_isDragging = false;
- TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 3 );
+ TQHBoxLayout *layout = new TQHBoxLayout( this, 3 );
m_label = new TQLabel( this );
m_gradientSelect = new KGradientSelector( Qt::Horizontal, this );
m_spinBox = new KIntSpinBox( this );
- tqlayout->addWidget( m_label );
- tqlayout->addWidget( m_gradientSelect, 2 );
- tqlayout->addWidget( m_spinBox );
+ layout->addWidget( m_label );
+ layout->addWidget( m_gradientSelect, 2 );
+ layout->addWidget( m_spinBox );
setValue( 0 );
setMinValue( 0 );
@@ -72,7 +72,7 @@ void VColorSlider::init()
m_gradientSelect->installEventFilter( this );
- tqlayout->activate();
+ layout->activate();
}
void VColorSlider::setLabel( const TQString& label )
diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cc
index f400fc13..c8580000 100644
--- a/karbon/widgets/vreference.cc
+++ b/karbon/widgets/vreference.cc
@@ -28,7 +28,7 @@
VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent, name )
{
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
mButtonGroup = new TQButtonGroup (3,Qt::Vertical, this );
TQRadioButton* radio = new TQRadioButton ( mButtonGroup );
mButtonGroup->insert( radio, TopLeft );
@@ -54,8 +54,8 @@ VReference::VReference( TQWidget *parent, const char *name ) : TQFrame ( parent,
this, TQT_SLOT( setReferencePoint( int ) ) );
mButtonGroup->setButton( Center );
- tqlayout->addWidget( mButtonGroup );
- tqlayout->activate();
+ layout->addWidget( mButtonGroup );
+ layout->activate();
setReferencePoint( Center );
}
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index 6e35d921..afd48d71 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -42,21 +42,21 @@
VSmallPreview::VSmallPreview( TQWidget* parent, const char* name )
: TQWidget( parent, name )
{
- /* Create widget tqlayout */
- TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 4 );
+ /* Create widget layout */
+ TQHBoxLayout *layout = new TQHBoxLayout( this, 4 );
m_strokeLabel = new TQLabel( i18n( "Stroke: None" ), this );
- tqlayout->addWidget( m_strokeLabel );
+ layout->addWidget( m_strokeLabel );
m_strokeFrame = new TQFrame( this );
m_strokeFrame->setFixedWidth ( FRAMEWIDTH );
m_strokeFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain );
- tqlayout->addWidget( m_strokeFrame );
+ layout->addWidget( m_strokeFrame );
m_fillLabel = new TQLabel( i18n( "Fill: None" ), this );
- tqlayout->addWidget( m_fillLabel );
+ layout->addWidget( m_fillLabel );
m_fillFrame = new TQFrame( this );
m_fillFrame->setFixedWidth ( FRAMEWIDTH );
m_fillFrame->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Plain );
- tqlayout->addWidget( m_fillFrame );
- tqlayout->activate();
+ layout->addWidget( m_fillFrame );
+ layout->activate();
m_fill = VFill();
m_stroke = VStroke();
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc
index e13da689..d6b288ba 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cc
@@ -34,38 +34,38 @@ VTranslate::VTranslate( TQWidget* parent, const char* name )
{
setCaption( i18n( "Translate" ) );
- TQVBoxLayout *maintqlayout = new TQVBoxLayout(this, 7);
- maintqlayout->addSpacing(5);
+ TQVBoxLayout *mainlayout = new TQVBoxLayout(this, 7);
+ mainlayout->addSpacing(5);
- TQGridLayout *inputtqlayout = new TQGridLayout(this, 5, 3);
- maintqlayout->addLayout(inputtqlayout);
+ TQGridLayout *inputlayout = new TQGridLayout(this, 5, 3);
+ mainlayout->addLayout(inputlayout);
m_labelX = new TQLabel(i18n("X:"), this);
- inputtqlayout->addWidget(m_labelX, 0, 0);
+ inputlayout->addWidget(m_labelX, 0, 0);
labely = new TQLabel(i18n("Y:"), this);
- inputtqlayout->addWidget(labely, 1, 0);
- inputtqlayout->addColSpacing(1, 1);
- inputtqlayout->addColSpacing(3, 5);
+ inputlayout->addWidget(labely, 1, 0);
+ inputlayout->addColSpacing(1, 1);
+ inputlayout->addColSpacing(3, 5);
m_inputX = new KDoubleNumInput( this );
m_inputX->setRange(-10000.00, 10000.00, 1.00, false); //range is just for example - for now :-)
- inputtqlayout->addWidget(m_inputX, 0, 2);
+ inputlayout->addWidget(m_inputX, 0, 2);
m_inputY = new KDoubleNumInput( this );
m_inputY->setRange(-10000.00, 10000.00, 1.00, false);
- inputtqlayout->addWidget(m_inputY, 1, 2);
+ inputlayout->addWidget(m_inputY, 1, 2);
m_labelUnit1 = new TQLabel("", this);
- inputtqlayout->addWidget(m_labelUnit1, 0, 4);
+ inputlayout->addWidget(m_labelUnit1, 0, 4);
m_labelUnit2 = new TQLabel("", this);
- inputtqlayout->addWidget(m_labelUnit2, 1, 4);
- maintqlayout->addSpacing(5);
+ inputlayout->addWidget(m_labelUnit2, 1, 4);
+ mainlayout->addSpacing(5);
m_checkBoxPosition = new TQCheckBox(i18n("Relative &position"), this);
- maintqlayout->addWidget(m_checkBoxPosition);
- maintqlayout->addSpacing(5);
+ mainlayout->addWidget(m_checkBoxPosition);
+ mainlayout->addSpacing(5);
m_buttonDuplicate = new TQPushButton(i18n("&Duplicate"), this);
- maintqlayout->addWidget(m_buttonDuplicate);
- maintqlayout->addSpacing(1);
+ mainlayout->addWidget(m_buttonDuplicate);
+ mainlayout->addSpacing(1);
m_buttonApply = new KPushButton(KStdGuiItem::apply(), this);
- maintqlayout->addWidget(m_buttonApply);
+ mainlayout->addWidget(m_buttonApply);
- maintqlayout->activate();
+ mainlayout->activate();
setFixedSize(baseSize()); //Set the size tp fixed values
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 03:37:53 +0000