diff --git a/ksquirrel/imageedit/sq_imagebcg.ui b/ksquirrel/imageedit/sq_imagebcg.ui index f3dabde..59bad45 100644 --- a/ksquirrel/imageedit/sq_imagebcg.ui +++ b/ksquirrel/imageedit/sq_imagebcg.ui @@ -114,7 +114,7 @@ - tqlayout6 + layout6 @@ -152,7 +152,7 @@ - tqlayout5 + layout5 @@ -190,7 +190,7 @@ - tqlayout4 + layout4 @@ -322,7 +322,7 @@ - tqlayout1 + layout1 @@ -357,7 +357,7 @@ - tqlayout2 + layout2 @@ -392,7 +392,7 @@ - tqlayout3 + layout3 @@ -544,7 +544,7 @@ - tqlayout8 + layout8 @@ -624,7 +624,7 @@ - tqlayout15 + layout15 diff --git a/ksquirrel/imageedit/sq_imageconvert.ui b/ksquirrel/imageedit/sq_imageconvert.ui index 65af5d4..d1ae474 100644 --- a/ksquirrel/imageedit/sq_imageconvert.ui +++ b/ksquirrel/imageedit/sq_imageconvert.ui @@ -24,7 +24,7 @@ - tqlayout1 + layout1 diff --git a/ksquirrel/imageedit/sq_imagefilter.ui b/ksquirrel/imageedit/sq_imagefilter.ui index 2d03333..d3e4783 100644 --- a/ksquirrel/imageedit/sq_imagefilter.ui +++ b/ksquirrel/imageedit/sq_imagefilter.ui @@ -1133,7 +1133,7 @@ - tqlayout2 + layout2 @@ -1342,7 +1342,7 @@ - tqlayout4 + layout4 diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp index 808ee9e..a6737bc 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp +++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp @@ -38,17 +38,17 @@ KLC::KLC( TQWidget* parent, const char* name, WFlags fl ) setName( "KLC" ); KLCLayout = new TQGridLayout( this, 1, 1, 11, 6, "KLCLayout"); - tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); spacer1 = new TQSpacerItem( 371, 26, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer1 ); + layout1->addItem( spacer1 ); pushApply = new TQPushButton( this, "pushApply" ); - tqlayout1->addWidget( pushApply ); + layout1->addWidget( pushApply ); pushClose = new TQPushButton( this, "pushClose" ); - tqlayout1->addWidget( pushClose ); + layout1->addWidget( pushClose ); - KLCLayout->addMultiCellLayout( tqlayout1, 2, 2, 0, 1 ); + KLCLayout->addMultiCellLayout( layout1, 2, 2, 0, 1 ); listDisabled = new TQListView( this, "listDisabled" ); listDisabled->addColumn( tr2i18n( "..." ) ); diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.ui b/ksquirrel/ksquirrel-libs-configurator/klc.ui index 7759eb6..8027065 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.ui +++ b/ksquirrel/ksquirrel-libs-configurator/klc.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 diff --git a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui index bd5339c..94cde9f 100644 --- a/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui +++ b/ksquirrel/ksquirrelpart/sq_codecsettingsskeleton.ui @@ -101,7 +101,7 @@ - tqlayout2 + layout2 diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp index 60b0cd0..662a637 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp @@ -644,7 +644,7 @@ void SQ_GLWidget::toClipboard() // image doesn't have extra regions if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h) - KApplication::tqclipboard()->setImage(im, TQClipboard::Clipboard); + KApplication::clipboard()->setImage(im, TQClipboard::Clipboard); else KApplication::tqclipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard); } @@ -1774,5 +1774,5 @@ void SQ_GLWidget::copyURL() if(!decoded || tab->broken) return; - TQApplication::tqclipboard()->setText(tab->m_original.prettyURL()); + TQApplication::clipboard()->setText(tab->m_original.prettyURL()); } diff --git a/ksquirrel/ksquirrelpart/sq_imagebcg.ui b/ksquirrel/ksquirrelpart/sq_imagebcg.ui index f3dabde..59bad45 100644 --- a/ksquirrel/ksquirrelpart/sq_imagebcg.ui +++ b/ksquirrel/ksquirrelpart/sq_imagebcg.ui @@ -114,7 +114,7 @@ - tqlayout6 + layout6 @@ -152,7 +152,7 @@ - tqlayout5 + layout5 @@ -190,7 +190,7 @@ - tqlayout4 + layout4 @@ -322,7 +322,7 @@ - tqlayout1 + layout1 @@ -357,7 +357,7 @@ - tqlayout2 + layout2 @@ -392,7 +392,7 @@ - tqlayout3 + layout3 @@ -544,7 +544,7 @@ - tqlayout8 + layout8 @@ -624,7 +624,7 @@ - tqlayout15 + layout15 diff --git a/ksquirrel/ksquirrelpart/sq_imagefilter.ui b/ksquirrel/ksquirrelpart/sq_imagefilter.ui index 2d03333..d3e4783 100644 --- a/ksquirrel/ksquirrelpart/sq_imagefilter.ui +++ b/ksquirrel/ksquirrelpart/sq_imagefilter.ui @@ -1133,7 +1133,7 @@ - tqlayout2 + layout2 @@ -1342,7 +1342,7 @@ - tqlayout4 + layout4 diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui index b15aaae..0cb55f9 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui @@ -422,7 +422,7 @@ - tqlayout5 + layout5 @@ -430,7 +430,7 @@ - tqlayout3 + layout3 @@ -629,7 +629,7 @@ - tqlayout4 + layout4 @@ -789,7 +789,7 @@ - tqlayout1 + layout1 diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h index 6c8606a..1ec36b0 100644 --- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h +++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui.h @@ -192,7 +192,7 @@ void SQ_ImageProperties::slotContextMenu( TQListViewItem *item, const TQPoint &p void SQ_ImageProperties::slotCopyString() { - TQApplication::tqclipboard()->setText(data->text(z), TQClipboard::Clipboard); + TQApplication::clipboard()->setText(data->text(z), TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyAll() @@ -208,7 +208,7 @@ void SQ_ImageProperties::slotCopyAll() app.append(item->text(0) + "\n" + item->text(1) + "\n"); } - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyEntry() @@ -218,7 +218,7 @@ void SQ_ImageProperties::slotCopyEntry() TQString app = data->text(0) + "\n" + data->text(1) + "\n"; - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotModeClicked(int id) diff --git a/ksquirrel/sq_codecsettingsskeleton.ui b/ksquirrel/sq_codecsettingsskeleton.ui index bd5339c..94cde9f 100644 --- a/ksquirrel/sq_codecsettingsskeleton.ui +++ b/ksquirrel/sq_codecsettingsskeleton.ui @@ -101,7 +101,7 @@ - tqlayout2 + layout2 diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index c83023b..e18a207 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -419,7 +419,7 @@ void SQ_DirOperator::slotCopyPath() KFileItem *f = fileview->currentFileItem(); if(f) - TQApplication::tqclipboard()->setText(f->url().path()); + TQApplication::clipboard()->setText(f->url().path()); } void SQ_DirOperator::slotCopyURL() @@ -427,7 +427,7 @@ void SQ_DirOperator::slotCopyURL() KFileItem *f = fileview->currentFileItem(); if(f) - TQApplication::tqclipboard()->setText(f->url().prettyURL()); + TQApplication::clipboard()->setText(f->url().prettyURL()); } void SQ_DirOperator::slotEditMime() diff --git a/ksquirrel/sq_externaltools.ui b/ksquirrel/sq_externaltools.ui index e5c5cdf..0867547 100644 --- a/ksquirrel/sq_externaltools.ui +++ b/ksquirrel/sq_externaltools.ui @@ -171,7 +171,7 @@ - tqlayout4 + layout4 diff --git a/ksquirrel/sq_filters.ui b/ksquirrel/sq_filters.ui index 3fbd653..922e2ac 100644 --- a/ksquirrel/sq_filters.ui +++ b/ksquirrel/sq_filters.ui @@ -90,7 +90,7 @@ - tqlayout7 + layout7 @@ -262,7 +262,7 @@ - tqlayout7 + layout7 diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp index 60b0cd0..662a637 100644 --- a/ksquirrel/sq_glwidget_stuff.cpp +++ b/ksquirrel/sq_glwidget_stuff.cpp @@ -644,7 +644,7 @@ void SQ_GLWidget::toClipboard() // image doesn't have extra regions if(tab->parts[tab->current].realw == tab->parts[tab->current].w && tab->parts[tab->current].realh == tab->parts[tab->current].h) - KApplication::tqclipboard()->setImage(im, TQClipboard::Clipboard); + KApplication::clipboard()->setImage(im, TQClipboard::Clipboard); else KApplication::tqclipboard()->setImage(im.copy(0, 0, tab->parts[tab->current].w, tab->parts[tab->current].h), TQClipboard::Clipboard); } @@ -1774,5 +1774,5 @@ void SQ_GLWidget::copyURL() if(!decoded || tab->broken) return; - TQApplication::tqclipboard()->setText(tab->m_original.prettyURL()); + TQApplication::clipboard()->setText(tab->m_original.prettyURL()); } diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui index 00ad30e..c75f810 100644 --- a/ksquirrel/sq_imageproperties.ui +++ b/ksquirrel/sq_imageproperties.ui @@ -422,7 +422,7 @@ - tqlayout5 + layout5 @@ -430,7 +430,7 @@ - tqlayout3 + layout3 @@ -629,7 +629,7 @@ - tqlayout4 + layout4 @@ -789,7 +789,7 @@ - tqlayout1 + layout1 diff --git a/ksquirrel/sq_imageproperties.ui.h b/ksquirrel/sq_imageproperties.ui.h index 41bcd53..73b63bb 100644 --- a/ksquirrel/sq_imageproperties.ui.h +++ b/ksquirrel/sq_imageproperties.ui.h @@ -192,7 +192,7 @@ void SQ_ImageProperties::slotContextMenu( TQListViewItem *item, const TQPoint &p void SQ_ImageProperties::slotCopyString() { - TQApplication::tqclipboard()->setText(data->text(z), TQClipboard::Clipboard); + TQApplication::clipboard()->setText(data->text(z), TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyAll() @@ -208,7 +208,7 @@ void SQ_ImageProperties::slotCopyAll() app.append(item->text(0) + "\n" + item->text(1) + "\n"); } - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotCopyEntry() @@ -218,7 +218,7 @@ void SQ_ImageProperties::slotCopyEntry() TQString app = data->text(0) + "\n" + data->text(1) + "\n"; - TQApplication::tqclipboard()->setText(app, TQClipboard::Clipboard); + TQApplication::clipboard()->setText(app, TQClipboard::Clipboard); } void SQ_ImageProperties::slotModeClicked(int id) diff --git a/ksquirrel/sq_options.ui b/ksquirrel/sq_options.ui index 90918d7..91c17da 100644 --- a/ksquirrel/sq_options.ui +++ b/ksquirrel/sq_options.ui @@ -61,7 +61,7 @@ - tqlayout5 + layout5 @@ -872,7 +872,7 @@ - tqlayout8 + layout8 diff --git a/ksquirrel/sq_pluginsinfo.ui b/ksquirrel/sq_pluginsinfo.ui index 06b0d0f..b3163e7 100644 --- a/ksquirrel/sq_pluginsinfo.ui +++ b/ksquirrel/sq_pluginsinfo.ui @@ -126,7 +126,7 @@ - tqlayout1 + layout1 @@ -195,7 +195,7 @@ - tqlayout6 + layout6 diff --git a/ksquirrel/sq_slideshow.ui b/ksquirrel/sq_slideshow.ui index 89a8478..ebaaaa0 100644 --- a/ksquirrel/sq_slideshow.ui +++ b/ksquirrel/sq_slideshow.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 @@ -350,7 +350,7 @@ - tqlayout3 + layout3 diff --git a/ksquirrel/sq_thumbnailcachemaster.ui b/ksquirrel/sq_thumbnailcachemaster.ui index a3c85ec..7848c67 100644 --- a/ksquirrel/sq_thumbnailcachemaster.ui +++ b/ksquirrel/sq_thumbnailcachemaster.ui @@ -138,7 +138,7 @@ - tqlayout1 + layout1 diff --git a/ksquirrel/sq_viewcache.ui b/ksquirrel/sq_viewcache.ui index 73e57c9..b82ceb7 100644 --- a/ksquirrel/sq_viewcache.ui +++ b/ksquirrel/sq_viewcache.ui @@ -96,7 +96,7 @@ - tqlayout2 + layout2