summaryrefslogtreecommitdiffstats
path: root/kiconedit
diff options
context:
space:
mode:
Diffstat (limited to 'kiconedit')
-rw-r--r--kiconedit/kiconconfig.cpp16
-rw-r--r--kiconedit/kicongrid.cpp2
-rw-r--r--kiconedit/kresize.cpp8
-rw-r--r--kiconedit/palettetoolbar.cpp12
4 files changed, 19 insertions, 19 deletions
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index d6144823..8755e0ac 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -60,9 +60,9 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQVBoxLayout *ml = new TQVBoxLayout(frame);
TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
grp->setColumnLayout(0, Qt::Vertical);
- grp->tqlayout()->setSpacing(spacingHint());
- grp->tqlayout()->setMargin(marginHint());
- TQGridLayout *l = new TQGridLayout(grp->tqlayout());
+ grp->layout()->setSpacing(spacingHint());
+ grp->layout()->setMargin(marginHint());
+ TQGridLayout *l = new TQGridLayout(grp->layout());
ln_name = new TQLineEdit( grp );
connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ),
@@ -130,7 +130,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
TQVBoxLayout* ml = new TQVBoxLayout( this );
ml->addWidget( grp );
- TQVBoxLayout* l = new TQVBoxLayout( grp->tqlayout(), KDialog::spacingHint() );
+ TQVBoxLayout* l = new TQVBoxLayout( grp->layout(), KDialog::spacingHint() );
l->addWidget( templates );
for( unsigned int i = 0; i < KIconTemplateContainer::self()->count(); i++ )
@@ -151,7 +151,7 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
bbox->addStretch( 1 );
- bbox->tqlayout();
+ bbox->layout();
l->addWidget( bbox );
}
@@ -246,11 +246,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
grp1->setColumnLayout(0, Qt::Vertical );
- grp1->tqlayout()->setSpacing( KDialog::spacingHint() );
- grp1->tqlayout()->setMargin( KDialog::marginHint() );
+ grp1->layout()->setSpacing( KDialog::spacingHint() );
+ grp1->layout()->setMargin( KDialog::marginHint() );
mainLayout->addWidget( grp1 );
- TQGridLayout *grp1Layout = new TQGridLayout( grp1->tqlayout(), 3, 2 );
+ TQGridLayout *grp1Layout = new TQGridLayout( grp1->layout(), 3, 2 );
TQButtonGroup* btngrp = new TQButtonGroup( grp1 );
btngrp->setExclusive( true );
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index 2316711a..5f5d9387 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -1118,7 +1118,7 @@ TQImage KIconEditGrid::clipboardImage(bool &ok)
{
TQCString format = fileFormats.current();
TQCString type = "image/" + format.lower();
- if (kapp->tqclipboard()->data()->provides(type ) )
+ if (kapp->clipboard()->data()->provides(type ) )
{
oneIsSupported = true;
}
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index ac98e214..b2af86b6 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -37,18 +37,18 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
group->setColumnLayout( 0, Qt::Horizontal );
genLayout->addWidget( group );
- TQHBoxLayout* tqlayout = new TQHBoxLayout( group->tqlayout(), 6 );
+ TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
m_width = new KIntSpinBox( 1, 200, 1, 1, 10, group );
m_width->setValue( size.width() );
- tqlayout->addWidget( m_width, 1 );
+ layout->addWidget( m_width, 1 );
TQLabel* label = new TQLabel( "X", group );
- tqlayout->addWidget( label );
+ layout->addWidget( label );
m_height = new KIntSpinBox( 1, 200, 1, 1, 10, group);
m_height->setValue( size.height() );
- tqlayout->addWidget( m_height, 1 );
+ layout->addWidget( m_height, 1 );
setMinimumSize( 200, 100 );
}
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index 969facac..85b7c6bb 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -54,27 +54,27 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
TQWhatsThis::add(m_currentColorView, i18n( "Current color\n\nThis is the currently selected color" ) );
m_layout->addWidget( m_currentColorView );
- TQVBoxLayout *vtqlayout = new TQVBoxLayout( m_layout, 0 );
+ TQVBoxLayout *vlayout = new TQVBoxLayout( m_layout, 0 );
TQLabel *l = new TQLabel( i18n( "System colors:" ), base );
- vtqlayout->addWidget( l );
+ vlayout->addWidget( l );
m_sysColors = new KSysColors( base );
TQWhatsThis::add(m_sysColors, i18n( "System colors\n\nHere you can select"
" colors from the KDE icon palette" ) );
- vtqlayout->addWidget( m_sysColors );
+ vlayout->addWidget( m_sysColors );
connect( m_sysColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );
- vtqlayout = new TQVBoxLayout( m_layout, 0 );
+ vlayout = new TQVBoxLayout( m_layout, 0 );
l = new TQLabel( i18n( "Custom colors:" ), base );
- vtqlayout->addWidget( l );
+ vlayout->addWidget( l );
m_customColors = new KCustomColors( base );
TQWhatsThis::add(m_customColors, i18n( "Custom colors\n\nHere you can"
" build a palette of custom colors.\nDouble-click on a box to edit"
" the color" ) );
- vtqlayout->addWidget( m_customColors );
+ vlayout->addWidget( m_customColors );
connect( m_customColors, TQT_SIGNAL( newColor(uint) ),
TQT_SIGNAL( newColor(uint) ) );