diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:09:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:09:52 -0600 |
| commit | 5a561c21d6638f2d4cf461518734047aca88732c (patch) | |
| tree | ca53e91b8f14761c89b2eeca8260bc6208064743 | |
| parent | f176190ca6b0706ec1217d0da075c9513af80c0b (diff) | |
| download | kipi-plugins-5a561c21d6638f2d4cf461518734047aca88732c.tar.gz kipi-plugins-5a561c21d6638f2d4cf461518734047aca88732c.zip | |
Rename obsolete tq methods to standard names
37 files changed, 221 insertions, 221 deletions
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index 2499a59..0f68560 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -227,11 +227,11 @@ void AcquireImageDialog::setupImageOptions(void) TQGroupBox * groupBox2 = new TQGroupBox( i18n("Saving Options"), page_setupImageOptions ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); TQWhatsThis::add( groupBox2, i18n("<p>The saving options of the target image.") ); - TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); m_imageCompression = new KIntNumInput(75, groupBox2); @@ -327,11 +327,11 @@ void AcquireImageDialog::setupAlbumsList(void) TQGroupBox * groupBox2 = new TQGroupBox( i18n("Album Description"), page_setupAlbumsList ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); TQWhatsThis::add( groupBox2, i18n("<p>The description of the current Album in the selection list.") ); - TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); m_AlbumComments = new KSqueezedTextLabel( groupBox2 ); diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp index 62478da..725f721 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.cpp +++ b/kipi-plugins/acquireimages/screenshotdialog.cpp @@ -75,7 +75,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent m_inSelect = false; TQWidget* box = new TQWidget( this ); setMainWidget(box); - TQVBoxLayout *tqlayout = new TQVBoxLayout(box); + TQVBoxLayout *layout = new TQVBoxLayout(box); //--------------------------------------------- @@ -83,31 +83,31 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent "application window. If you grab a single window your mouse\n" "cursor will change into crosshairs; then, simply select the\n" "window with your mouse."), box); - tqlayout->addWidget(label1); + layout->addWidget(label1); //--------------------------------------------- m_desktopCB = new TQCheckBox(i18n("Grab the entire desktop"), box); TQWhatsThis::add( m_desktopCB, i18n( "<p>If you enable this option, the entire desktop will be grabbed; " "otherwise, only the active windows." ) ); - tqlayout->addWidget(m_desktopCB); + layout->addWidget(m_desktopCB); //--------------------------------------------- m_hideCB = new TQCheckBox(i18n("Hide all host application windows"), box); TQWhatsThis::add( m_hideCB, i18n( "<p>If you enable this option, all host application windows will be hidden " "during the grab operation." ) ); - tqlayout->addWidget(m_hideCB); + layout->addWidget(m_hideCB); //--------------------------------------------- TQLabel *label2 = new TQLabel(i18n("Delay:"), box); - tqlayout->addWidget(label2); + layout->addWidget(label2); m_delay = new KIntNumInput(box); TQWhatsThis::add( m_delay, i18n( "<p>The delay in seconds before the grab operation is started.") ); m_delay->setRange(0, 60); - tqlayout->addWidget(m_delay); - tqlayout->addStretch(1); + layout->addWidget(m_delay); + layout->addStretch(1); //--------------------------------------------- diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp index c339388..d71fbed 100644 --- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp +++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp @@ -122,9 +122,9 @@ BatchProcessImagesDialog::BatchProcessImagesDialog( KURL::List urlList, KIPI::In TQHBoxLayout *hlay = new TQHBoxLayout( dvlay ); groupBox1 = new TQGroupBox( 0, Qt::Vertical, box ); - groupBox1->tqlayout()->setSpacing(KDialog::spacingHint()); - groupBox1->tqlayout()->setMargin(KDialog::marginHint()); - TQGridLayout* grid = new TQGridLayout( groupBox1->tqlayout(), 2, 3); + groupBox1->layout()->setSpacing(KDialog::spacingHint()); + groupBox1->layout()->setMargin(KDialog::marginHint()); + TQGridLayout* grid = new TQGridLayout( groupBox1->layout(), 2, 3); m_labelType = new TQLabel( groupBox1 ); grid->addMultiCellWidget(m_labelType, 0, 0, 0, 0); diff --git a/kipi-plugins/batchprocessimages/renameimagesbase.ui b/kipi-plugins/batchprocessimages/renameimagesbase.ui index 779fecf..671a697 100644 --- a/kipi-plugins/batchprocessimages/renameimagesbase.ui +++ b/kipi-plugins/batchprocessimages/renameimagesbase.ui @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> diff --git a/kipi-plugins/calendar/caleventsbase.ui b/kipi-plugins/calendar/caleventsbase.ui index 6307181..0524bc8 100644 --- a/kipi-plugins/calendar/caleventsbase.ui +++ b/kipi-plugins/calendar/caleventsbase.ui @@ -34,7 +34,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ This is fully optional. All the events from this calendar will be printed red.</ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/kipi-plugins/calendar/calselect.cpp b/kipi-plugins/calendar/calselect.cpp index f7479db..08e9dee 100644 --- a/kipi-plugins/calendar/calselect.cpp +++ b/kipi-plugins/calendar/calselect.cpp @@ -68,7 +68,7 @@ void CalSelect::setupView( KIPI::Interface* interface ) setCaption(i18n("Create Calendar")); TQHGroupBox *yearBox = new TQHGroupBox(i18n("Select Year"), this); - yearBox->tqlayout()->addItem(new TQSpacerItem(5,5, + yearBox->layout()->addItem(new TQSpacerItem(5,5, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); yearSpin_ = new TQSpinBox(KGlobal::locale()->calendar()->minValidYear(), @@ -86,10 +86,10 @@ void CalSelect::setupView( KIPI::Interface* interface ) TQGroupBox *monthBox = new TQGroupBox(i18n("Select Images"), this); monthBox->setColumnLayout(0, Qt::Vertical ); - monthBox->tqlayout()->setSpacing( 6 ); - monthBox->tqlayout()->setMargin( 11 ); + monthBox->layout()->setSpacing( 6 ); + monthBox->layout()->setMargin( 11 ); - monthBoxLayout_ = new TQGridLayout(monthBox->tqlayout()); + monthBoxLayout_ = new TQGridLayout(monthBox->layout()); monthBoxLayout_->setAlignment( TQt::AlignCenter ); KURL::List urlList; diff --git a/kipi-plugins/calendar/caltemplate.cpp b/kipi-plugins/calendar/caltemplate.cpp index dd97df9..b6b2c90 100644 --- a/kipi-plugins/calendar/caltemplate.cpp +++ b/kipi-plugins/calendar/caltemplate.cpp @@ -65,9 +65,9 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) TQGroupBox *boxPreview_ = new TQGroupBox( i18n("Preview"), this ); boxPreview_->setColumnLayout(0, Qt::Vertical); - boxPreview_->tqlayout()->setMargin( 5 ); + boxPreview_->layout()->setMargin( 5 ); - TQVBoxLayout *previewLayout = new TQVBoxLayout(boxPreview_->tqlayout()); + TQVBoxLayout *previewLayout = new TQVBoxLayout(boxPreview_->layout()); calWidget_ = new CalWidget(boxPreview_); previewLayout->addWidget(calWidget_, 0, TQt::AlignCenter); @@ -77,18 +77,18 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) TQGroupBox *gbox = new TQGroupBox( i18n("Settings"), this ); gbox->setColumnLayout(0, Qt::Vertical ); - gbox->tqlayout()->setSpacing( 11 ); - gbox->tqlayout()->setMargin( 6 ); - TQVBoxLayout* gboxLayout = new TQVBoxLayout( gbox->tqlayout() ); + gbox->layout()->setSpacing( 11 ); + gbox->layout()->setMargin( 6 ); + TQVBoxLayout* gboxLayout = new TQVBoxLayout( gbox->layout() ); // --------------------------------------------------------------- - TQHBoxLayout *htqlayout = new TQHBoxLayout( 0, 0, 5 ); - htqlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) ); + TQHBoxLayout *hlayout = new TQHBoxLayout( 0, 0, 5 ); + hlayout->addWidget( new TQLabel(i18n("Paper size:"), gbox) ); comboPaperSize_ = new TQComboBox(false, gbox); - htqlayout->addWidget(comboPaperSize_); - gboxLayout->addLayout( htqlayout ); + hlayout->addWidget(comboPaperSize_); + gboxLayout->addLayout( hlayout ); TQStringList paperSizes; paperSizes << "A4"; @@ -131,26 +131,26 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) // --------------------------------------------------------------- - htqlayout = new TQHBoxLayout( 0, 0, 5 ); + hlayout = new TQHBoxLayout( 0, 0, 5 ); - htqlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox)); + hlayout->addWidget(new TQLabel(i18n("Image to text ratio:"), gbox)); sliderRatio_ = new TQSlider(50,300,5,100,Qt::Horizontal,gbox); - htqlayout->addWidget( sliderRatio_ ); + hlayout->addWidget( sliderRatio_ ); - gboxLayout->addLayout( htqlayout ); + gboxLayout->addLayout( hlayout ); connect(sliderRatio_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotParamsChanged())); // --------------------------------------------------------------- - htqlayout = new TQHBoxLayout( 0, 0, 5 ); + hlayout = new TQHBoxLayout( 0, 0, 5 ); - htqlayout->addWidget(new TQLabel(i18n("Font:"), gbox)); + hlayout->addWidget(new TQLabel(i18n("Font:"), gbox)); comboFont_ = new TQComboBox(false, gbox); - htqlayout->addWidget( comboFont_ ); + hlayout->addWidget( comboFont_ ); TQFontDatabase fontDB; TQStringList families(fontDB.families()); @@ -167,7 +167,7 @@ CalTemplate::CalTemplate(TQWidget* parent, const char* name) comboFont_->setCurrentText( f.family() ); - gboxLayout->addLayout( htqlayout ); + gboxLayout->addLayout( hlayout ); connect(comboFont_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotParamsChanged())); diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp index 818616f..edf2222 100644 --- a/kipi-plugins/calendar/calwizard.cpp +++ b/kipi-plugins/calendar/calwizard.cpp @@ -113,17 +113,17 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent ) wFinishLabel_ = new TQLabel(wFinish_); wFinishLayout->addWidget(wFinishLabel_); - TQHBoxLayout *hboxtqlayout = new TQHBoxLayout(0, 5, 5); - hboxtqlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_)); + TQHBoxLayout *hboxlayout = new TQHBoxLayout(0, 5, 5); + hboxlayout->addWidget(new TQLabel(i18n("Current Page"), wFinish_)); wFinishProgressCurrent_ = new TQProgressBar(wFinish_); - hboxtqlayout->addWidget(wFinishProgressCurrent_); - wFinishLayout->addLayout(hboxtqlayout); + hboxlayout->addWidget(wFinishProgressCurrent_); + wFinishLayout->addLayout(hboxlayout); - hboxtqlayout = new TQHBoxLayout(0, 5, 5); - hboxtqlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_)); + hboxlayout = new TQHBoxLayout(0, 5, 5); + hboxlayout->addWidget(new TQLabel(i18n("Total Pages"), wFinish_)); wFinishProgressTotal_ = new TQProgressBar(wFinish_); - hboxtqlayout->addWidget(wFinishProgressTotal_); - wFinishLayout->addLayout(hboxtqlayout); + hboxlayout->addWidget(wFinishProgressTotal_); + wFinishLayout->addLayout(hboxlayout); wFinishLayout->addStretch(); diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp index ca763d1..6f3c9f9 100644 --- a/kipi-plugins/cdarchiving/cdarchiving.cpp +++ b/kipi-plugins/cdarchiving/cdarchiving.cpp @@ -1847,7 +1847,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec, for (uint i = 0 ; i < strIn.length() ; ++i) { ch=strIn[i]; - switch (ch.tqunicode()) + switch (ch.unicode()) { case 38: // & { @@ -1889,7 +1889,7 @@ TQString CDArchiving::EscapeSgmlText(const TQTextCodec* codec, { if (!codec->canEncode(ch)) { - strReturn += TQString("&#%1;").arg(ch.tqunicode()); + strReturn += TQString("&#%1;").arg(ch.unicode()); break; } } diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp index e94baf7..fdcdaa8 100644 --- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp +++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp @@ -140,17 +140,17 @@ void CDArchivingDialog::setupSelection(void) page_setupSelection = addPage(i18n("Selection"), i18n("Album Selection"), BarIcon("folder_image", KIcon::SizeMedium)); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); - tqlayout->addWidget(m_imageCollectionSelector); + layout->addWidget(m_imageCollectionSelector); //--------------------------------------------- TQGroupBox * groupBox3 = new TQGroupBox( 2, Qt::Horizontal, i18n("Target Media Information"), page_setupSelection ); - groupBox3->tqlayout()->setSpacing( 6 ); - groupBox3->tqlayout()->setMargin( 11 ); + groupBox3->layout()->setSpacing( 6 ); + groupBox3->layout()->setMargin( 11 ); TQWhatsThis::add( groupBox3, i18n("<p>Information about the backup medium.") ); m_mediaSize = new TQLabel( groupBox3 ); @@ -165,7 +165,7 @@ void CDArchivingDialog::setupSelection(void) mediaFormatActived(m_mediaFormat->currentText()); TQWhatsThis::add( m_mediaFormat, i18n("<p>Select here the backup media format.")); - tqlayout->addWidget( groupBox3 ); + layout->addWidget( groupBox3 ); //--------------------------------------------- @@ -539,10 +539,10 @@ void CDArchivingDialog::setupBurning(void) TQGroupBox * groupBoxAdvancedOptions = new TQGroupBox( i18n("Advanced Burning Options"), page_burning ); groupBoxAdvancedOptions->setColumnLayout(0, Qt::Vertical ); - groupBoxAdvancedOptions->tqlayout()->setSpacing( 6 ); - groupBoxAdvancedOptions->tqlayout()->setMargin( 11 ); + groupBoxAdvancedOptions->layout()->setSpacing( 6 ); + groupBoxAdvancedOptions->layout()->setMargin( 11 ); - TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->tqlayout() ); + TQVBoxLayout * groupBoxAOLayout = new TQVBoxLayout( groupBoxAdvancedOptions->layout() ); groupBoxAOLayout->setAlignment( TQt::AlignTop ); m_burnOnTheFly = new TQCheckBox( i18n("Media burning On-The-Fly"), groupBoxAdvancedOptions); diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp index e966189..050a158 100644 --- a/kipi-plugins/findimages/displaycompare.cpp +++ b/kipi-plugins/findimages/displaycompare.cpp @@ -167,8 +167,8 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, //--------------------------------------------- GroupBox1 = new TQGroupBox( 1, Qt::Horizontal, i18n("Original Files"), box ); - GroupBox1->tqlayout()->setSpacing( 6 ); - GroupBox1->tqlayout()->setMargin( 11 ); + GroupBox1->layout()->setSpacing( 6 ); + GroupBox1->layout()->setMargin( 11 ); OriginalNameLabel = new KSqueezedTextLabel( GroupBox1, "OriginalNameLabel" ); OriginalNameLabel->setFrameShape( TQLabel::Box ); @@ -202,8 +202,8 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface, //--------------------------------------------- GroupBox2 = new TQGroupBox( 1, Qt::Horizontal, i18n("Similar Files"), box ); - GroupBox2->tqlayout()->setSpacing( 6 ); - GroupBox2->tqlayout()->setMargin( 11 ); + GroupBox2->layout()->setSpacing( 6 ); + GroupBox2->layout()->setMargin( 11 ); similarNameLabel = new KSqueezedTextLabel( GroupBox2, "similarNameLabel" ); similarNameLabel->setFrameShape( TQLabel::Box ); diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp index 32e7d4b..0841b84 100644 --- a/kipi-plugins/findimages/finddupplicatedialog.cpp +++ b/kipi-plugins/findimages/finddupplicatedialog.cpp @@ -126,9 +126,9 @@ void FindDuplicateDialog::setupSelection(void) i18n("Album's Selection"), BarIcon("folder_image", KIcon::SizeMedium)); - TQVBoxLayout *tqlayout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); - tqlayout->addWidget(m_imageCollectionSelector); + layout->addWidget(m_imageCollectionSelector); } @@ -145,8 +145,8 @@ void FindDuplicateDialog::setupPageMethod(void) //--------------------------------------------- TQGroupBox * groupBox1 = new TQGroupBox( 2, Qt::Horizontal, i18n("Method"), page_setupMethod ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); TQLabel *m_labelsearchMethod = new TQLabel( i18n("Search method:"), groupBox1 ); m_findMethod = new TQComboBox(false, groupBox1); diff --git a/kipi-plugins/flickrexport/flickralbumdialog.ui b/kipi-plugins/flickrexport/flickralbumdialog.ui index 7d8e498..6d17a1d 100644 --- a/kipi-plugins/flickrexport/flickralbumdialog.ui +++ b/kipi-plugins/flickrexport/flickralbumdialog.ui @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index 81537f5..224ba29 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -109,9 +109,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), settingsBox); optionsBox->setColumnLayout(0, Qt::Vertical); - optionsBox->tqlayout()->setSpacing(KDialog::spacingHint()); - optionsBox->tqlayout()->setMargin(KDialog::spacingHint()); - TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout(), 5, 3); + optionsBox->layout()->setSpacing(KDialog::spacingHint()); + optionsBox->layout()->setMargin(KDialog::spacingHint()); + TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout(), 5, 3); m_publicCheckBox = new TQCheckBox(optionsBox); m_publicCheckBox->setText(i18n("As in accessible for people", "Public (anyone can see them)")); @@ -157,9 +157,9 @@ FlickrWidget::FlickrWidget(TQWidget* parent, KIPI::Interface *iface) TQGroupBox* accountBox = new TQGroupBox(i18n("Account"), settingsBox); accountBox->setColumnLayout(0, Qt::Vertical); - accountBox->tqlayout()->setSpacing(KDialog::spacingHint()); - accountBox->tqlayout()->setMargin(KDialog::spacingHint()); - TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->tqlayout(), 1, 3); + accountBox->layout()->setSpacing(KDialog::spacingHint()); + accountBox->layout()->setMargin(KDialog::spacingHint()); + TQGridLayout* accountBoxLayout = new TQGridLayout(accountBox->layout(), 1, 3); TQLabel *userNameLabel = new TQLabel(i18n("User Name: "), accountBox); m_userNameDisplayLabel = new TQLabel(accountBox); diff --git a/kipi-plugins/galleryexport/TODO b/kipi-plugins/galleryexport/TODO index 7a3d8b6..fcff8e0 100644 --- a/kipi-plugins/galleryexport/TODO +++ b/kipi-plugins/galleryexport/TODO @@ -10,4 +10,4 @@ Somewhat immediate implementation needed: For the lazy times: * Polish the html code used to render the thumbnails, better - fonts sizes and tqlayout + fonts sizes and layout diff --git a/kipi-plugins/galleryexport/galleryalbumdialog.ui b/kipi-plugins/galleryexport/galleryalbumdialog.ui index bd62ba2..a04a137 100644 --- a/kipi-plugins/galleryexport/galleryalbumdialog.ui +++ b/kipi-plugins/galleryexport/galleryalbumdialog.ui @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> diff --git a/kipi-plugins/galleryexport/gallerywidget.cpp b/kipi-plugins/galleryexport/gallerywidget.cpp index 899b48b..f465697 100644 --- a/kipi-plugins/galleryexport/gallerywidget.cpp +++ b/kipi-plugins/galleryexport/gallerywidget.cpp @@ -99,9 +99,9 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), rightButtonGroup); optionsBox->setColumnLayout(0, Qt::Vertical); - optionsBox->tqlayout()->setSpacing(5); - optionsBox->tqlayout()->setMargin(5); - TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout()); + optionsBox->layout()->setSpacing(5); + optionsBox->layout()->setMargin(5); + TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout()); // ------------------------------------------------------------------------ m_captTitleCheckBox = new TQCheckBox(optionsBox); diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp index cfc3ee3..d9dc3b3 100644 --- a/kipi-plugins/gpssync/gpssyncdialog.cpp +++ b/kipi-plugins/gpssync/gpssyncdialog.cpp @@ -145,7 +145,7 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent) // --------------------------------------------------------------- TQGroupBox *settingsBox = new TQGroupBox(0, Qt::Vertical, i18n("Settings"), plainPage()); - TQGridLayout *settingsBoxLayout = new TQGridLayout(settingsBox->tqlayout(), 8, 1, + TQGridLayout *settingsBoxLayout = new TQGridLayout(settingsBox->layout(), 8, 1, KDialog::spacingHint()); TQPushButton *loadGPXButton = new TQPushButton(i18n("Load GPX File..."), settingsBox); diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp index f2deee8..fee4112 100644 --- a/kipi-plugins/gpssync/kmlexportconfig.cpp +++ b/kipi-plugins/gpssync/kmlexportconfig.cpp @@ -75,12 +75,12 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) // -------------------------------------------------------------- // Target preferences TargetPreferenceGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Target Preferences" ), plainPage()); - TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->tqlayout(), 6, 5, KDialog::spacingHint()); + TargetPreferenceGroupBoxLayout = new TQGridLayout( TargetPreferenceGroupBox->layout(), 6, 5, KDialog::spacingHint()); TargetPreferenceGroupBoxLayout->setAlignment( TQt::AlignTop ); // target type buttonGroupTargetType = new TQButtonGroup(0, Qt::Vertical, i18n( "Target Type" ), TargetPreferenceGroupBox, "buttonGroupTargetType" ); - buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->tqlayout(), 2, 1, KDialog::spacingHint() ); + buttonGroupTargetTypeLayout = new TQGridLayout( buttonGroupTargetType->layout(), 2, 1, KDialog::spacingHint() ); buttonGroupTargetTypeLayout->setAlignment( TQt::AlignTop ); LocalTargetRadioButton_ = new TQRadioButton( i18n( "&Local or web target used by GoogleEarth" ), @@ -146,7 +146,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) // Sizes TQGroupBox *SizeGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "Sizes" ), plainPage() ); SizeGroupBox->setColumnLayout(0, Qt::Vertical ); - SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->tqlayout(), 2, 3, KDialog::spacingHint() ); + SizeGroupBoxLayout = new TQGridLayout( SizeGroupBox->layout(), 2, 3, KDialog::spacingHint() ); SizeGroupBoxLayout->setAlignment( TQt::AlignTop ); IconSizeLabel = new TQLabel( i18n( "Icon size" ), @@ -176,7 +176,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name) // -------------------------------------------------------------- // GPX Tracks TQGroupBox *GPXTracksGroupBox = new TQGroupBox(0, Qt::Vertical, i18n( "GPX Tracks" ), plainPage()); - TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->tqlayout(), 5, 4, + TQGridLayout *GPXTracksGroupBoxLayout = new TQGridLayout(GPXTracksGroupBox->layout(), 5, 4, KDialog::spacingHint()); GPXTracksGroupBoxLayout->setAlignment( TQt::AlignTop ); diff --git a/kipi-plugins/htmlexport/imagesettingspage.ui b/kipi-plugins/htmlexport/imagesettingspage.ui index 42e8b5c..596076e 100644 --- a/kipi-plugins/htmlexport/imagesettingspage.ui +++ b/kipi-plugins/htmlexport/imagesettingspage.ui @@ -341,7 +341,7 @@ </spacer> <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> diff --git a/kipi-plugins/htmlexport/outputpage.ui b/kipi-plugins/htmlexport/outputpage.ui index 6e49fb2..aa7e3f4 100644 --- a/kipi-plugins/htmlexport/outputpage.ui +++ b/kipi-plugins/htmlexport/outputpage.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp index d25045f..383048d 100644 --- a/kipi-plugins/htmlexport/wizard.cpp +++ b/kipi-plugins/htmlexport/wizard.cpp @@ -102,7 +102,7 @@ struct Wizard::Private { void fillThemeParametersPage(Theme::Ptr theme) { // Delete any previous widgets TQFrame* content = mThemeParametersPage->content; - if (content->tqlayout()) { + if (content->layout()) { // Setting recursiveSearch to false is very important, if we don't // we will end up deleting subwidgets of our child widgets TQObjectList* list = content->queryList(TQWIDGET_OBJECT_NAME_STRING, 0 /*objName*/, @@ -112,14 +112,14 @@ struct Wizard::Private { delete it.current(); } - delete content->tqlayout(); + delete content->layout(); } mThemeParameterWidgetFromName.clear(); - // Create tqlayout. We need to recreate it everytime, to get rid of + // Create layout. We need to recreate it everytime, to get rid of // spacers - TQGridLayout* tqlayout = new TQGridLayout(content, 0, 3); - tqlayout->setSpacing(KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(content, 0, 3); + layout->setSpacing(KDialog::spacingHint()); // Create widgets Theme::ParameterList parameterList = theme->parameterList(); @@ -142,17 +142,17 @@ struct Wizard::Private { TQWidget* widget = themeParameter->createWidget(content, value); label->setBuddy(widget); - int row = tqlayout->numRows(); - tqlayout->addWidget(label, row, 0); + int row = layout->numRows(); + layout->addWidget(label, row, 0); if (widget->sizePolicy().expanding() & TQSizePolicy::Horizontally) { // Widget wants full width - tqlayout->addMultiCellWidget(widget, row, row, 1, 2); + layout->addMultiCellWidget(widget, row, row, 1, 2); } else { // Widget doesn't like to be stretched, add a spacer next to it - tqlayout->addWidget(widget, row, 1); + layout->addWidget(widget, row, 1); TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - tqlayout->addItem(spacer, row, 2); + layout->addItem(spacer, row, 2); } mThemeParameterWidgetFromName[internalName] = widget; @@ -161,7 +161,7 @@ struct Wizard::Private { // Add spacer at the end, so that widgets aren't spread on the whole // parent height TQSpacerItem* spacer = new TQSpacerItem(1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding); - tqlayout->addItem(spacer, tqlayout->numRows(), 0); + layout->addItem(spacer, layout->numRows(), 0); } }; diff --git a/kipi-plugins/ipodexport/ipodheader.cpp b/kipi-plugins/ipodexport/ipodheader.cpp index 255f3e6..61c56b1 100644 --- a/kipi-plugins/ipodexport/ipodheader.cpp +++ b/kipi-plugins/ipodexport/ipodheader.cpp @@ -25,7 +25,7 @@ using namespace IpodExport; IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f ) : TQFrame( parent, name, f ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 10/*margin*/, 5/*spacing*/ ); setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -40,8 +40,8 @@ IpodHeader::IpodHeader( TQWidget *parent, const char *name, WFlags f ) buttonLayout->addWidget( m_button ); buttonLayout->addStretch( 1 ); - tqlayout->addWidget( m_messageLabel ); - tqlayout->addLayout( buttonLayout ); + layout->addWidget( m_messageLabel ); + layout->addLayout( buttonLayout ); } void IpodHeader::setViewType( ViewType view ) diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp index 3e90a11..f4122b7 100644 --- a/kipi-plugins/kameraklient/cameraselection.cpp +++ b/kipi-plugins/kameraklient/cameraselection.cpp @@ -86,9 +86,9 @@ CameraSelection::CameraSelection(TQWidget* parent) TQGroupBox* mainBox = new TQGroupBox(page); mainBox->setTitle(i18n("Camera Configuration")); mainBox->setColumnLayout(0, Qt::Vertical ); - mainBox->tqlayout()->setSpacing( 5 ); - mainBox->tqlayout()->setMargin( 5 ); - TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->tqlayout()); + mainBox->layout()->setSpacing( 5 ); + mainBox->layout()->setMargin( 5 ); + TQGridLayout* mainBoxLayout = new TQGridLayout(mainBox->layout()); mainBoxLayout->setAlignment(TQt::AlignTop); listView_ = new TQListView( mainBox ); @@ -99,8 +99,8 @@ CameraSelection::CameraSelection(TQWidget* parent) portButtonGroup_ = new TQVButtonGroup(mainBox); portButtonGroup_->setTitle(i18n("Camera Port Type")); portButtonGroup_->setRadioButtonExclusive(true); - portButtonGroup_->tqlayout()->setSpacing(5); - portButtonGroup_->tqlayout()->setMargin(5); + portButtonGroup_->layout()->setSpacing(5); + portButtonGroup_->layout()->setMargin(5); usbButton_ = new TQRadioButton(portButtonGroup_); usbButton_->setText( i18n("USB")); @@ -113,9 +113,9 @@ CameraSelection::CameraSelection(TQWidget* parent) TQGroupBox* portPathBox = new TQGroupBox(mainBox); portPathBox->setTitle( i18n("Camera Port Path")); portPathBox->setColumnLayout(0, Qt::Vertical ); - portPathBox->tqlayout()->setSpacing( 5 ); - portPathBox->tqlayout()->setMargin( 5 ); - TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->tqlayout() ); + portPathBox->layout()->setSpacing( 5 ); + portPathBox->layout()->setMargin( 5 ); + TQVBoxLayout* portPathBoxLayout = new TQVBoxLayout( portPathBox->layout() ); portPathBoxLayout->setAlignment( TQt::AlignTop ); TQLabel* portPathLabel_ = new TQLabel( portPathBox); diff --git a/kipi-plugins/kameraklient/savefiledialog.cpp b/kipi-plugins/kameraklient/savefiledialog.cpp index 3e973a1..7b41afa 100644 --- a/kipi-plugins/kameraklient/savefiledialog.cpp +++ b/kipi-plugins/kameraklient/savefiledialog.cpp @@ -47,11 +47,11 @@ SavefileDialog::SavefileDialog(const TQString& file, TQWidget *parent, const cha bbox->addButton(i18n("Overwrite All"), TQT_TQOBJECT(this), TQT_SLOT(slot_overwriteAll()), true); TQPushButton *cancelBtn = bbox->addButton(i18n("&Cancel"), TQT_TQOBJECT(this), TQT_SLOT(reject()), true); cancelBtn->setDefault(true); - bbox->tqlayout(); - TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0, 15); - tqlayout->addMultiCellWidget(descLbl, 0, 0, 0, 3); - tqlayout->addMultiCellWidget(renameEdit, 3, 3, 0, 3); - tqlayout->addMultiCellWidget(bbox, 4, 4, 0, 3); + bbox->layout(); + TQGridLayout *layout = new TQGridLayout(this, 0, 0, 15); + layout->addMultiCellWidget(descLbl, 0, 0, 0, 3); + layout->addMultiCellWidget(renameEdit, 3, 3, 0, 3); + layout->addMultiCellWidget(bbox, 4, 4, 0, 3); } SavefileDialog::~SavefileDialog() { diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp index 5677182..0192045 100644 --- a/kipi-plugins/kameraklient/setupcamera.cpp +++ b/kipi-plugins/kameraklient/setupcamera.cpp @@ -90,10 +90,10 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name) TQGroupBox* groupBox = new TQGroupBox(page, "groupBox"); groupBox->setColumnLayout(0, Qt::Vertical); - groupBox->tqlayout()->setSpacing(5); - groupBox->tqlayout()->setMargin(5); + groupBox->layout()->setSpacing(5); + groupBox->layout()->setMargin(5); - TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->tqlayout()); + TQGridLayout* groupBoxLayout = new TQGridLayout(groupBox->layout()); groupBoxLayout->setAlignment( TQt::AlignTop ); listView_ = new TQListView( groupBox ); listView_->addColumn(i18n("Model")); diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui index db56a8e..d5093ca 100644 --- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui +++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui @@ -53,7 +53,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout26</cstring> + <cstring>layout26</cstring> </property> <hbox> <property name="name"> @@ -97,7 +97,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -105,7 +105,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <vbox> <property name="name"> @@ -164,7 +164,7 @@ DVD is an experimental option.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <vbox> <property name="name"> @@ -225,7 +225,7 @@ NTSC is an American TV standard; PAL/SECAM is European.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <vbox> <property name="name"> @@ -348,7 +348,7 @@ Change it if you have problems with the default value.</string> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -356,7 +356,7 @@ Change it if you have problems with the default value.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <vbox> <property name="name"> @@ -375,7 +375,7 @@ Change it if you have problems with the default value.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout32</cstring> + <cstring>layout32</cstring> </property> <hbox> <property name="name"> @@ -414,7 +414,7 @@ Change it if you have problems with the default value.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout44</cstring> + <cstring>layout44</cstring> </property> <vbox> <property name="name"> @@ -488,7 +488,7 @@ Change it if you have problems with the default value.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout45</cstring> + <cstring>layout45</cstring> </property> <vbox> <property name="name"> @@ -567,7 +567,7 @@ Black is a good value for this.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -758,7 +758,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -820,7 +820,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout28</cstring> + <cstring>layout28</cstring> </property> <hbox> <property name="name"> @@ -828,7 +828,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout27</cstring> + <cstring>layout27</cstring> </property> <vbox> <property name="name"> @@ -1135,7 +1135,7 @@ This audio file name will be multiplexed with the portfolio video. </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <vbox> <property name="name"> diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp index b3f3ccc..b61e8fc 100644 --- a/kipi-plugins/printwizard/frmprintwizard.cpp +++ b/kipi-plugins/printwizard/frmprintwizard.cpp @@ -399,7 +399,7 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned i { Q_ASSERT(layouts.count() > 1); - TQRect *tqlayout = layouts.at(1); + TQRect *layout = layouts.at(1); double maxDPI = 0.0; @@ -407,12 +407,12 @@ double getMaxDPI(TQPtrList<TPhoto> photos, TQPtrList<TQRect> layouts, unsigned i { TPhoto *photo = photos.at(current); double dpi = ((double)photo->cropRegion.width() + (double)photo->cropRegion.height()) / - (((double)tqlayout->width() / 1000.0) + ((double)tqlayout->height() / 1000.0)); + (((double)layout->width() / 1000.0) + ((double)layout->height() / 1000.0)); if (dpi > maxDPI) maxDPI = dpi; // iterate to the next position - tqlayout = layouts.next(); - if (tqlayout == 0) + layout = layouts.next(); + if (layout == 0) { break; } @@ -426,7 +426,7 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex) // how many photos would actually be printed, including copies? int photoCount = (photoIndex + 1); - // how many pages? Recall that the first tqlayout item is the paper size + // how many pages? Recall that the first layout item is the paper size int photosPerPage = s->layouts.count() - 1; int remainder = photoCount % photosPerPage; @@ -438,11 +438,11 @@ TQRect * FrmPrintWizard::getLayout(int photoIndex) int FrmPrintWizard::getPageCount() { - // get the selected tqlayout + // get the selected layout TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); int photoCount = m_photos.count(); - // how many pages? Recall that the first tqlayout item is the paper size + // how many pages? Recall that the first layout item is the paper size int photosPerPage = s->layouts.count() - 1; int remainder = photoCount % photosPerPage; int emptySlots = 0; @@ -574,7 +574,7 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL if (photos.count() == 0) return true; // no photos => last photo TQRect *srcPage = layouts.at(0); - TQRect *tqlayout = layouts.at(1); + TQRect *layout = layouts.at(1); // scale the page size to best fit the painter // size the rectangle based on the minimum image dimension @@ -654,10 +654,10 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL else img = img.copy(photo->cropRegion); - int x1 = NINT((double)tqlayout->left() * xRatio); - int y1 = NINT((double)tqlayout->top() * yRatio); - int w = NINT((double)tqlayout->width() * xRatio); - int h = NINT((double)tqlayout->height() * yRatio); + int x1 = NINT((double)layout->left() * xRatio); + int y1 = NINT((double)layout->top() * yRatio); + int w = NINT((double)layout->width() * xRatio); + int h = NINT((double)layout->height() * yRatio); p.drawImage( TQRect(x1 + left, y1 + top, w, h), img ); @@ -742,8 +742,8 @@ bool FrmPrintWizard::paintOnePage(TQPainter &p, TQPtrList<TPhoto> photos, TQPtrL } // caption // iterate to the next position - tqlayout = layouts.next(); - if (tqlayout == 0) + layout = layouts.next(); + if (layout == 0) { current++; break; @@ -766,7 +766,7 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis Q_ASSERT(layouts.count() > 1); TQRect *srcPage = layouts.at(0); - TQRect *tqlayout = layouts.at(1); + TQRect *layout = layouts.at(1); // scale the page size to best fit the painter // size the rectangle based on the minimum image dimension @@ -821,10 +821,10 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis img = img.copy(photo->cropRegion); - int x1 = NINT((double)tqlayout->left() * xRatio); - int y1 = NINT((double)tqlayout->top() * yRatio); - int w = NINT((double)tqlayout->width() * xRatio); - int h = NINT((double)tqlayout->height() * yRatio); + int x1 = NINT((double)layout->left() * xRatio); + int y1 = NINT((double)layout->top() * yRatio); + int w = NINT((double)layout->width() * xRatio); + int h = NINT((double)layout->height() * yRatio); // We can use scaleFree because the crop frame should have the proper dimensions. img = img.smoothScale(w, h, TQ_ScaleFree); @@ -929,8 +929,8 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis } // caption // iterate to the next position - tqlayout = layouts.next(); - if (tqlayout == 0) + layout = layouts.next(); + if (layout == 0) { current++; break; @@ -944,11 +944,11 @@ bool FrmPrintWizard::paintOnePage(TQImage &p, TQPtrList<TPhoto> photos, TQPtrLis // update the pages to be printed and preview first/last pages void FrmPrintWizard::previewPhotos() { - // get the selected tqlayout + // get the selected layout TPhotoSize *s = m_photoSizes.at(ListPhotoSizes->currentItem()); int photoCount = m_photos.count(); - // how many pages? Recall that the first tqlayout item is the paper size + // how many pages? Recall that the first layout item is the paper size int photosPerPage = s->layouts.count() - 1; int remainder = photoCount % photosPerPage; int emptySlots = 0; diff --git a/kipi-plugins/printwizard/frmprintwizardbase.ui b/kipi-plugins/printwizard/frmprintwizardbase.ui index 00dc5e5..93a1f13 100644 --- a/kipi-plugins/printwizard/frmprintwizardbase.ui +++ b/kipi-plugins/printwizard/frmprintwizardbase.ui @@ -37,7 +37,7 @@ </attribute> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout53</cstring> + <cstring>layout53</cstring> </property> <property name="geometry"> <rect> @@ -53,7 +53,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -116,7 +116,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <vbox> <property name="name"> @@ -195,7 +195,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout88</cstring> + <cstring>layout88</cstring> </property> <vbox> <property name="name"> @@ -244,7 +244,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout87</cstring> + <cstring>layout87</cstring> </property> <vbox> <property name="name"> @@ -271,7 +271,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -279,7 +279,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -343,7 +343,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -394,7 +394,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout86</cstring> + <cstring>layout86</cstring> </property> <hbox> <property name="name"> @@ -564,7 +564,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -665,7 +665,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -752,7 +752,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -801,7 +801,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -941,7 +941,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout113</cstring> + <cstring>layout113</cstring> </property> <vbox> <property name="name"> @@ -949,7 +949,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout88</cstring> + <cstring>layout88</cstring> </property> <hbox> <property name="name"> @@ -957,7 +957,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout86</cstring> + <cstring>layout86</cstring> </property> <vbox> <property name="name"> @@ -999,7 +999,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout87</cstring> + <cstring>layout87</cstring> </property> <vbox> <property name="name"> @@ -1026,7 +1026,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout90</cstring> + <cstring>layout90</cstring> </property> <hbox> <property name="name"> @@ -1080,7 +1080,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout91</cstring> + <cstring>layout91</cstring> </property> <hbox> <property name="name"> @@ -1134,7 +1134,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout92</cstring> + <cstring>layout92</cstring> </property> <hbox> <property name="name"> @@ -1240,7 +1240,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout112</cstring> + <cstring>layout112</cstring> </property> <vbox> <property name="name"> @@ -1322,7 +1322,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout75</cstring> + <cstring>layout75</cstring> </property> <hbox> <property name="name"> @@ -1370,7 +1370,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <vbox> <property name="name"> @@ -1405,7 +1405,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -1486,7 +1486,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -1603,7 +1603,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout110</cstring> + <cstring>layout110</cstring> </property> <hbox> <property name="name"> @@ -1673,7 +1673,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout121</cstring> + <cstring>layout121</cstring> </property> <hbox> <property name="name"> @@ -1698,7 +1698,7 @@ Click the 'Next' button to begin.</string> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout119</cstring> + <cstring>layout119</cstring> </property> <vbox> <property name="name"> @@ -1717,7 +1717,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout118</cstring> + <cstring>layout118</cstring> </property> <hbox> <property name="name"> @@ -1858,7 +1858,7 @@ Click the 'Next' button to begin.</string> </attribute> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout62</cstring> + <cstring>layout62</cstring> </property> <property name="geometry"> <rect> @@ -1874,7 +1874,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout61</cstring> + <cstring>layout61</cstring> </property> <vbox> <property name="name"> @@ -1937,7 +1937,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout60</cstring> + <cstring>layout60</cstring> </property> <vbox> <property name="name"> @@ -1998,7 +1998,7 @@ Click the 'Next' button to begin.</string> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -2060,7 +2060,7 @@ Click the 'Next' button to begin.</string> </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -2137,7 +2137,7 @@ Click the 'Next' button to begin.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <vbox> <property name="name"> diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp index a99fdaf..a717f4c 100644 --- a/kipi-plugins/sendimages/sendimagesdialog.cpp +++ b/kipi-plugins/sendimages/sendimagesdialog.cpp @@ -271,7 +271,7 @@ void SendImagesDialog::setupImagesList(void) TQWhatsThis::add( m_addImagesButton, i18n("<p>Add images to the list.") ); TQPushButton* m_remImagesButton = imagesListButtonBox->addButton ( i18n( "&Remove" )); TQWhatsThis::add( m_remImagesButton, i18n("<p>Remove selected images from the list.") ); - imagesListButtonBox->tqlayout(); + imagesListButtonBox->layout(); grid->addMultiCellWidget(imagesListButtonBox, 0, 1, 2, 2); m_imageLabel = new TQLabel( m_groupBoxImageList ); @@ -287,11 +287,11 @@ void SendImagesDialog::setupImagesList(void) TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Description"), page_setupImagesList ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); TQWhatsThis::add( groupBox2, i18n("<p>The description of the currently selected image on the list.") ); - TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); m_ImageComments = new KSqueezedTextLabel( groupBox2 ); @@ -434,11 +434,11 @@ void SendImagesDialog::setupEmailOptions(void) TQGroupBox * groupBox2 = new TQGroupBox( i18n("Image Properties"), page_setupEmailOptions ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); TQWhatsThis::add( groupBox2, i18n("<p>The properties of images to send.") ); - TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); + TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); m_changeImagesProp = new TQCheckBox(i18n("Adjust image properties"), groupBox2); diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp index 7c68d3c..160af75 100644 --- a/kipi-plugins/simpleviewerexport/svedialog.cpp +++ b/kipi-plugins/simpleviewerexport/svedialog.cpp @@ -171,9 +171,9 @@ void SVEDialog::selectionPage() m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"), BarIcon("folder_image", KIcon::SizeMedium)); - TQVBoxLayout *tqlayout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface ); - tqlayout->addWidget(m_imageCollectionSelector); + layout->addWidget(m_imageCollectionSelector); } void SVEDialog::lookPage() diff --git a/kipi-plugins/slideshow/slideshowconfigbase.ui b/kipi-plugins/slideshow/slideshowconfigbase.ui index c455a3b..51f63b1 100644 --- a/kipi-plugins/slideshow/slideshowconfigbase.ui +++ b/kipi-plugins/slideshow/slideshowconfigbase.ui @@ -163,7 +163,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -210,7 +210,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -366,7 +366,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <vbox> <property name="name"> @@ -428,7 +428,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout50</cstring> + <cstring>layout50</cstring> </property> <hbox> <property name="name"> @@ -436,7 +436,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout47</cstring> + <cstring>layout47</cstring> </property> <vbox> <property name="name"> @@ -535,7 +535,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -704,7 +704,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout48</cstring> + <cstring>layout48</cstring> </property> <hbox> <property name="name"> @@ -767,7 +767,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout49</cstring> + <cstring>layout49</cstring> </property> <hbox> <property name="name"> @@ -897,7 +897,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout57</cstring> + <cstring>layout57</cstring> </property> <hbox> <property name="name"> @@ -916,7 +916,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <hbox> <property name="name"> @@ -966,7 +966,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout51</cstring> + <cstring>layout51</cstring> </property> <hbox> <property name="name"> @@ -1034,7 +1034,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -1238,7 +1238,7 @@ If you want to add some images, click on the 'Add' button or use the drag-and-dr </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -1326,7 +1326,7 @@ Ken Burns effect doesn't use this cache mechanism.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <property name="sizePolicy"> <sizepolicy> diff --git a/kipi-plugins/sync/TODO b/kipi-plugins/sync/TODO index 7a3d8b6..fcff8e0 100644 --- a/kipi-plugins/sync/TODO +++ b/kipi-plugins/sync/TODO @@ -10,4 +10,4 @@ Somewhat immediate implementation needed: For the lazy times: * Polish the html code used to render the thumbnails, better - fonts sizes and tqlayout + fonts sizes and layout diff --git a/kipi-plugins/sync/galleryalbumdialog.ui b/kipi-plugins/sync/galleryalbumdialog.ui index bd62ba2..a04a137 100644 --- a/kipi-plugins/sync/galleryalbumdialog.ui +++ b/kipi-plugins/sync/galleryalbumdialog.ui @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> diff --git a/kipi-plugins/sync/gallerywidget.cpp b/kipi-plugins/sync/gallerywidget.cpp index e75c6b7..7313d7b 100644 --- a/kipi-plugins/sync/gallerywidget.cpp +++ b/kipi-plugins/sync/gallerywidget.cpp @@ -99,9 +99,9 @@ GalleryWidget::GalleryWidget( TQWidget* parent, const char* name, WFlags fl ) TQGroupBox* optionsBox = new TQGroupBox(i18n("Override Default Options"), rightButtonGroup); optionsBox->setColumnLayout(0, Qt::Vertical); - optionsBox->tqlayout()->setSpacing(5); - optionsBox->tqlayout()->setMargin(5); - TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->tqlayout()); + optionsBox->layout()->setSpacing(5); + optionsBox->layout()->setMargin(5); + TQGridLayout* optionsBoxLayout = new TQGridLayout(optionsBox->layout()); // ------------------------------------------------------------------------ diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp index 7ae1107..d99868d 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp +++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp @@ -212,9 +212,9 @@ void Plugin_WallPaper::slotSetScaleAndCrop() ///////////////////////////////////////////////////////////////////////////////////////////////////// -void Plugin_WallPaper::setWallpaper(int tqlayout) +void Plugin_WallPaper::setWallpaper(int layout) { - if (tqlayout>SCALE_AND_CROP || tqlayout < CENTER) + if (layout>SCALE_AND_CROP || layout < CENTER) return; KIPI::Interface* interface = dynamic_cast<KIPI::Interface*>( parent() ); @@ -254,7 +254,7 @@ void Plugin_WallPaper::setWallpaper(int tqlayout) } TQString cmd = TQString("dcop kdesktop KBackgroundIface setWallpaper '%1' %2") - .arg(path).arg(tqlayout); + .arg(path).arg(layout); KRun::runCommand(cmd); } diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.h b/kipi-plugins/wallpaper/plugin_wallpaper.h index 03db2fc..6dc7909 100644 --- a/kipi-plugins/wallpaper/plugin_wallpaper.h +++ b/kipi-plugins/wallpaper/plugin_wallpaper.h @@ -76,7 +76,7 @@ }; KActionMenu *m_action_Background; - void setWallpaper( int tqlayout ); + void setWallpaper( int layout ); }; #endif // PLUGIN_IMAGES2DESKTOP_H |