From 374d939d8af431477ce2601815f0ba121b66871c Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:11:41 +0000 Subject: Allow kdelibs to function correctly with TQt for Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp | 4 ++-- kdeprint/cups/cupsdconf2/locationdialog.cpp | 2 +- kdeprint/cups/kmcupsconfigwidget.cpp | 4 ++-- kdeprint/cups/kpimagepage.cpp | 6 +++--- kdeprint/driver.cpp | 2 +- kdeprint/kmjobmanager.cpp | 2 +- kdeprint/kmmanager.cpp | 2 +- kdeprint/kpcopiespage.cpp | 4 ++-- kdeprint/kpgeneralpage.cpp | 14 +++++++------- kdeprint/kpqtpage.cpp | 8 ++++---- kdeprint/kprintdialog.cpp | 8 ++++---- kdeprint/management/kmiconview.cpp | 2 +- kdeprint/management/kmjobviewer.cpp | 6 +++--- kdeprint/management/kmlistview.cpp | 2 +- kdeprint/management/kmspecialprinterdlg.cpp | 2 +- kdeprint/management/kmwdriverselect.cpp | 6 +++--- kdeprint/management/kmwinfobase.cpp | 12 ++++++------ kdeprint/management/kxmlcommanddlg.cpp | 10 +++++----- kdeprint/rlpr/kmproxywidget.cpp | 2 +- 19 files changed, 49 insertions(+), 49 deletions(-) (limited to 'kdeprint') diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 39da4d383..5be680300 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -127,7 +127,7 @@ void CupsdSecurityPage::slotAdd() { if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { - index = locs_.at(); + index = locs_.tqat(); locs_.remove(); break; } @@ -149,7 +149,7 @@ void CupsdSecurityPage::slotAdd() void CupsdSecurityPage::slotEdit(int index) { - CupsLocation *loc = locs_.at(index); + CupsLocation *loc = locs_.tqat(index); LocationDialog::editLocation(loc, this, conf_); } diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index 155d11388..a4d550d0e 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -128,7 +128,7 @@ void LocationDialog::setInfos(CupsdConf *conf) void LocationDialog::fillLocation(CupsLocation *loc) { - loc->resource_ = conf_->resources_.at(resource_->currentItem()); + loc->resource_ = conf_->resources_.tqat(resource_->currentItem()); loc->resourcename_ = loc->resource_->path_; loc->authtype_ = authtype_->currentItem(); loc->authclass_ = (loc->authtype_ == AUTHTYPE_NONE ? AUTHCLASS_ANONYMOUS : authclass_->currentItem()); diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp index cd3c3ab01..5242cd240 100644 --- a/kdeprint/cups/kmcupsconfigwidget.cpp +++ b/kdeprint/cups/kmcupsconfigwidget.cpp @@ -87,13 +87,13 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); lay0->addWidget(m_hostbox,1); lay0->addWidget(m_loginbox,1); - TQGridLayout *lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10); + TQGridLayout *lay2 = new TQGridLayout(m_hostbox->tqlayout(), 2, 2, 10); lay2->setColStretch(1,1); lay2->addWidget(m_hostlabel,0,0); lay2->addWidget(m_portlabel,1,0); lay2->addWidget(m_host,0,1); lay2->addWidget(m_port,1,1); - TQGridLayout *lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10); + TQGridLayout *lay3 = new TQGridLayout(m_loginbox->tqlayout(), 4, 2, 10); lay3->setColStretch(1,1); lay3->addWidget(m_loginlabel,0,0); lay3->addWidget(m_passwordlabel,1,0); diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index 4280ab40e..d669bc475 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -353,7 +353,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l0->addWidget(sizebox, 1, 0); l0->addWidget(positionbox, 1, 1); l0->setColStretch(0, 1); - TQGridLayout *l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10); + TQGridLayout *l1 = new TQGridLayout(colorbox->tqlayout(), 5, 2, 10); l1->addWidget(m_brightness, 0, 0); l1->addWidget(m_hue, 1, 0); l1->addWidget(m_saturation, 2, 0); @@ -361,14 +361,14 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l1->addWidget(m_gamma, 4, 0); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addWidget(defbtn, 4, 1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3); + TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->tqlayout()), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); l2->addSpacing(10); l2->addWidget(m_size); l2->addStretch(1); - TQGridLayout *l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10); + TQGridLayout *l3 = new TQGridLayout(positionbox->tqlayout(), 2, 2, 10); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 10); TQVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10); l3->addLayout(l4, 0, 1); diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp index 6cedb46b1..241dd0b10 100644 --- a/kdeprint/driver.cpp +++ b/kdeprint/driver.cpp @@ -627,7 +627,7 @@ void DrListOption::setChoice(int choicenum) { if (choicenum >= 0 && choicenum < (int)m_choices.count()) { - setValueText(m_choices.at(choicenum)->name()); + setValueText(m_choices.tqat(choicenum)->name()); } } diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp index fcc7d1a00..fcde4817f 100644 --- a/kdeprint/kmjobmanager.cpp +++ b/kdeprint/kmjobmanager.cpp @@ -53,7 +53,7 @@ void KMJobManager::discardAllJobs() void KMJobManager::removeDiscardedJobs() { for (uint i=0;iisDiscarded()) + if (m_jobs.tqat(i)->isDiscarded()) { m_jobs.remove(i); i--; diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index 4299b3718..e63fd8e4f 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -253,7 +253,7 @@ TQPtrList* KMManager::printerList(bool reload) // remove discarded printers for (uint i=0; iisDiscarded()) { m_printers.remove(i); diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp index 2079bc0f1..6d7a29c8c 100644 --- a/kdeprint/kpcopiespage.cpp +++ b/kdeprint/kpcopiespage.cpp @@ -220,7 +220,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) l1->setColStretch(1,1); l1->addWidget(m_pagebox,0,0); l1->addWidget(m_copybox,0,1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5); + TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->tqlayout()), 5); l3->addWidget(m_all); l3->addWidget(m_current); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5); @@ -233,7 +233,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) l3->addLayout(l2); l2->addWidget(m_pagesetlabel,0); l2->addWidget(m_pageset,1); - TQGridLayout *l5 = new TQGridLayout(m_copybox->layout(), 4, 2, 10); + TQGridLayout *l5 = new TQGridLayout(m_copybox->tqlayout(), 4, 2, 10); l5->setRowStretch(4,1); l5->addWidget(m_copieslabel,0,0); l5->addWidget(m_copies,0,1); diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp index 272d97119..ac7dfdae0 100644 --- a/kdeprint/kpgeneralpage.cpp +++ b/kdeprint/kpgeneralpage.cpp @@ -347,27 +347,27 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const lay2->addWidget(m_nupbox, 1, 1); lay2->setColStretch(0, 1); lay2->setColStretch(1, 1); - TQGridLayout *lay3 = new TQGridLayout(m_orientbox->layout(), 4, 2, + TQGridLayout *lay3 = new TQGridLayout(m_orientbox->tqlayout(), 4, 2, KDialog::spacingHint()); lay3->addWidget(m_portrait, 0, 0); lay3->addWidget(m_landscape, 1, 0); lay3->addWidget(m_revland, 2, 0); lay3->addWidget(m_revport, 3, 0); lay3->addMultiCellWidget(m_orientpix, 0, 3, 1, 1); - TQGridLayout *lay4 = new TQGridLayout(m_duplexbox->layout(), 3, 2, + TQGridLayout *lay4 = new TQGridLayout(m_duplexbox->tqlayout(), 3, 2, KDialog::spacingHint()); lay4->addWidget(m_dupnone, 0, 0); lay4->addWidget(m_duplong, 1, 0); lay4->addWidget(m_dupshort, 2, 0); lay4->addMultiCellWidget(m_duplexpix, 0, 2, 1, 1); lay4->setRowStretch( 0, 1 ); - TQGridLayout *lay5 = new TQGridLayout(m_nupbox->layout(), 3, 2, + TQGridLayout *lay5 = new TQGridLayout(m_nupbox->tqlayout(), 3, 2, KDialog::spacingHint()); lay5->addWidget(m_nup1, 0, 0); lay5->addWidget(m_nup2, 1, 0); lay5->addWidget(m_nup4, 2, 0); lay5->addMultiCellWidget(m_nuppix, 0, 2, 1, 1); - TQGridLayout *lay6 = new TQGridLayout(m_bannerbox->layout(), 2, 2, + TQGridLayout *lay6 = new TQGridLayout(m_bannerbox->tqlayout(), 2, 2, KDialog::spacingHint()); lay6->addWidget(m_startbannerlabel, 0, 0); lay6->addWidget(m_endbannerlabel, 1, 0); @@ -622,17 +622,17 @@ void KPGeneralPage::getOptions(TQMap& opts, bool incldef) DrListOption *opt; if ((opt=(DrListOption*)driver()->findOption("PageSize")) != NULL) { - DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["PageSize"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("MediaType")) != NULL) { - DrBase *ch = opt->choices()->at(m_papertype->currentItem()); + DrBase *ch = opt->choices()->tqat(m_papertype->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["MediaType"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("InputSlot")) != NULL) { - DrBase *ch = opt->choices()->at(m_inputslot->currentItem()); + DrBase *ch = opt->choices()->tqat(m_inputslot->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["InputSlot"] = ch->name(); } diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp index 92337f399..4c1a67f38 100644 --- a/kdeprint/kpqtpage.cpp +++ b/kdeprint/kpqtpage.cpp @@ -164,15 +164,15 @@ void KPQtPage::init() lay0->addWidget(m_orientbox,1,0); lay0->addWidget(m_colorbox,1,1); lay0->addWidget(m_nupbox,2,0); - TQGridLayout *lay1 = new TQGridLayout(m_orientbox->layout(), 2, 2, 10); + TQGridLayout *lay1 = new TQGridLayout(m_orientbox->tqlayout(), 2, 2, 10); lay1->addWidget(m_portrait,0,0); lay1->addWidget(m_landscape,1,0); lay1->addMultiCellWidget(m_orientpix,0,1,1,1); - TQGridLayout *lay2 = new TQGridLayout(m_colorbox->layout(), 2, 2, 10); + TQGridLayout *lay2 = new TQGridLayout(m_colorbox->tqlayout(), 2, 2, 10); lay2->addWidget(m_color,0,0); lay2->addWidget(m_grayscale,1,0); lay2->addMultiCellWidget(m_colorpix,0,1,1,1); - TQGridLayout *lay3 = new TQGridLayout(m_nupbox->layout(), 4, 2, 5); + TQGridLayout *lay3 = new TQGridLayout(m_nupbox->tqlayout(), 4, 2, 5); lay3->addWidget(m_nup1,0,0); lay3->addWidget(m_nup2,1,0); lay3->addWidget(m_nup4,2,0); @@ -305,7 +305,7 @@ void KPQtPage::getOptions(TQMap& opts, bool incldef) DrListOption *opt = static_cast(driver()->findOption("PageSize")); if (opt) { - DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); if (ch && (incldef || ch->name() != opt->get("default"))) { opts["PageSize"] = ch->name(); diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index 2bfd8100e..a873f41c2 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -361,7 +361,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) l2->addStretch(1); l2->addWidget(d->m_ok,0); l2->addWidget(m_cancel,0); - TQGridLayout *l3 = new TQGridLayout(m_pbox->layout(),3,3,7); + TQGridLayout *l3 = new TQGridLayout(m_pbox->tqlayout(),3,3,7); l3->setColStretch(1,1); l3->setRowStretch(0,1); TQGridLayout *l4 = new TQGridLayout(0, 5, 2, 0, 5); @@ -824,7 +824,7 @@ void KPrintDialog::reload() // remove printer dependent pages (usually from plugin) TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); for (uint i=0; im_pages.count(); i++) - if (d->m_pages.at(i)->onlyRealPrinters()) + if (d->m_pages.tqat(i)->onlyRealPrinters()) { KPrintDialogPage *page = d->m_pages.take(i--); if (tabs) @@ -952,10 +952,10 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { TQTabWidget *tabs = static_cast(TQT_TQWIDGET(d->m_dummy->child("TabWidget", "TQTabWidget"))); - tabs->setTabEnabled( d->m_pages.at( index ), flag ); + tabs->setTabEnabled( d->m_pages.tqat( index ), flag ); } else - d->m_pages.at( 0 )->setEnabled( flag ); + d->m_pages.tqat( 0 )->setEnabled( flag ); } void KPrintDialog::slotOpenFileDialog() diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index a7671c789..7afaf1537 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/management/kmiconview.cpp @@ -180,7 +180,7 @@ void KMIconView::setPrinterList(TQPtrList *list) } for (uint i=0; iisDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { delete m_items.take(i); i--; diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index d22bad860..ebdfacf81 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -398,7 +398,7 @@ void KMJobViewer::updateJobs() } for (uint i=0; iisDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { delete m_items.take(i); i--; @@ -510,7 +510,7 @@ void KMJobViewer::slotMove(int prID) { if (prID >= 0 && prID < (int)(m_printers.count())) { - KMPrinter *p = m_printers.at(prID); + KMPrinter *p = m_printers.tqat(prID); send(KMJob::Move,i18n("Move to %1").arg(p->printerName()),p->printerName()); } } @@ -540,7 +540,7 @@ void KMJobViewer::slotPrinterSelected(int prID) { if (prID >= 0 && prID < (int)(m_printers.count()+1)) { - TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName()); + TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.tqat(prID-1)->printerName()); emit printerChanged(this, prname); } } diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index 9bcaa44d3..76ec62bb3 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/management/kmlistview.cpp @@ -216,7 +216,7 @@ void KMListView::setPrinterList(TQPtrList *list) TQPtrList deleteList; deleteList.setAutoDelete(true); for (uint i=0; iisDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { // instance items are put in front of the list // so that they are destroyed first diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp index ce5741574..c444091e7 100644 --- a/kdeprint/management/kmspecialprinterdlg.cpp +++ b/kdeprint/management/kmspecialprinterdlg.cpp @@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) l0->addWidget(sep); l0->addWidget(m_gb); l0->addWidget(m_outfile_gb); - TQGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10); + TQGridLayout *l6 = new TQGridLayout(m_outfile_gb->tqlayout(), 3, 2, 10); l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 ); l6->addWidget(m_mimetypelabel, 1, 0); l6->addWidget(m_mimetype, 1, 1); diff --git a/kdeprint/management/kmwdriverselect.cpp b/kdeprint/management/kmwdriverselect.cpp index 93e37be7d..353fc0861 100644 --- a/kdeprint/management/kmwdriverselect.cpp +++ b/kdeprint/management/kmwdriverselect.cpp @@ -93,7 +93,7 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) int index = m_list->currentItem(); if (m_entries && index >= 0 && index < (int)(m_entries->count())) { - KMDBEntry *entry = m_entries->at(index); + KMDBEntry *entry = m_entries->tqat(index); p->setDbEntry(entry); p->setDriverInfo(entry->description); } @@ -107,8 +107,8 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) void KMWDriverSelect::slotDriverComment() { int index = m_list->currentItem(); - if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->at(index)->drivercomment.isEmpty()) - KMessageBox::information(this, m_entries->at(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); + if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->tqat(index)->drivercomment.isEmpty()) + KMessageBox::information(this, m_entries->tqat(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); else KMessageBox::error(this, i18n("No information about the selected driver.")); } diff --git a/kdeprint/management/kmwinfobase.cpp b/kdeprint/management/kmwinfobase.cpp index 0d6d4beae..835042c59 100644 --- a/kdeprint/management/kmwinfobase.cpp +++ b/kdeprint/management/kmwinfobase.cpp @@ -56,19 +56,19 @@ void KMWInfoBase::setInfo(const TQString& s) void KMWInfoBase::setLabel(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_labels.at(i)->setText(s); + m_labels.tqat(i)->setText(s); } void KMWInfoBase::setText(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_edits.at(i)->setText(s); + m_edits.tqat(i)->setText(s); } TQString KMWInfoBase::text(int i) { if (i >= 0 && i < m_nlines) - return m_edits.at(i)->text(); + return m_edits.tqat(i)->text(); return TQString::null; } @@ -76,15 +76,15 @@ void KMWInfoBase::setCurrent(int i) { if (i >= 0 && i < m_nlines) { - m_edits.at(i)->selectAll(); - m_edits.at(i)->setFocus(); + m_edits.tqat(i)->selectAll(); + m_edits.tqat(i)->setFocus(); } } TQLineEdit* KMWInfoBase::lineEdit( int i ) { if ( i >= 0 && i < m_nlines ) - return m_edits.at( i ); + return m_edits.tqat( i ); else return NULL; } diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index 3d92ad472..c0377993a 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -230,9 +230,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); - TQGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2, + TQGridLayout *l8 = new TQGridLayout(gb_input->tqlayout(), 2, 2, KDialog::spacingHint()); - TQGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2, + TQGridLayout *l9 = new TQGridLayout(gb_output->tqlayout(), 2, 2, KDialog::spacingHint()); l8->addWidget(m_inputfilelab, 0, 0); l8->addWidget(m_inputpipelab, 1, 0); @@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputpipe, 1, 1); - TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout())); + TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->tqlayout())); l11->addWidget(m_stack); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); @@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetype, 1); l7->addWidget(m_gb1); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10); + TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->tqlayout()), 4, 3, 10); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_removemime, 2, 1); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); - TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10); + TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->tqlayout()), 10); l4->addWidget(m_requirements); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index daf4b7665..1aeb1c03f 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); - TQGridLayout *lay0 = new TQGridLayout(layout(), 3, 2, 10); + TQGridLayout *lay0 = new TQGridLayout(tqlayout(), 3, 2, 10); lay0->setColStretch(1,1); lay0->addMultiCellWidget(m_useproxy,0,0,0,1); lay0->addWidget(m_hostlabel,1,0); -- cgit v1.2.1