diff options
Diffstat (limited to 'tdeprint')
156 files changed, 324 insertions, 324 deletions
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index ca7573300..ca40a10a7 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -24,7 +24,7 @@ #include <tqtimer.h> #include <tqprogressbar.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <klocale.h> #include <kmessagebox.h> @@ -156,7 +156,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) while (1) { // read a line - line = TQString::fromLatin1(""); + line = TQString::tqfromLatin1(""); partial = true; while (index < buflen) { @@ -433,7 +433,7 @@ bool CupsAddSmb::doExport() m_actions << "quit"; m_proc.clearArguments(); - m_proc << "smbclient" << TQString::fromLatin1("//")+m_servered->text()+"/print$"; + m_proc << "smbclient" << TQString::tqfromLatin1("//")+m_servered->text()+"/print$"; return startProcess(); } diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp index 32217b2af..fab6a6fba 100644 --- a/tdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp @@ -22,7 +22,7 @@ #include <tqcombobox.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp index 6460a8aa3..b337eb883 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp @@ -24,7 +24,7 @@ #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqregexp.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index acfe393c4..4b056cdb0 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -23,7 +23,7 @@ #include "browsedialog.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqwhatsthis.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdconf.h b/tdeprint/cups/cupsdconf2/cupsdconf.h index 5dff96f91..70b4f591b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdconf.h +++ b/tdeprint/cups/cupsdconf2/cupsdconf.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqptrlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqpair.h> #include "cupsdcomment.h" diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp index 6af5a8a54..268465a76 100644 --- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -23,7 +23,7 @@ #include "qdirmultilineedit.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index 32c6bdaab..79c8a9401 100644 --- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqcombobox.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 31f3afe57..f12f82f1e 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp index cf52f25e3..61a89f933 100644 --- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index 29ef71c81..9edca5868 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 2249050ab..092e1a7e5 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> @@ -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/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp index ecfebfa92..cfd731430 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp index c514bd429..a058299f0 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <tqpixmap.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp index 0b325311b..754c9659e 100644 --- a/tdeprint/cups/cupsdconf2/editlist.cpp +++ b/tdeprint/cups/cupsdconf2/editlist.cpp @@ -21,7 +21,7 @@ #include <klistbox.h> #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kiconloader.h> #include <kguiitem.h> diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index d1e9ac96a..7e1858cc7 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> @@ -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/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp index b89a4adb2..18cade9fc 100644 --- a/tdeprint/cups/cupsdconf2/portdialog.cpp +++ b/tdeprint/cups/cupsdconf2/portdialog.cpp @@ -25,7 +25,7 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp index 9ee1e0f2e..7cf0ea74e 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -20,7 +20,7 @@ #include "qdirlineedit.h" #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <kfiledialog.h> #include <kiconloader.h> diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 026c39aad..b1bd96ee6 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -19,7 +19,7 @@ #include "qdirmultilineedit.h" -#include <layout.h> +#include <tqlayout.h> #include <tqheader.h> #include <tqpushbutton.h> #include <klistview.h> diff --git a/tdeprint/cups/cupsdconf2/sizewidget.cpp b/tdeprint/cups/cupsdconf2/sizewidget.cpp index d59735349..742702e48 100644 --- a/tdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/tdeprint/cups/cupsdconf2/sizewidget.cpp @@ -21,7 +21,7 @@ #include <tqcombobox.h> #include <tqspinbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <klocale.h> diff --git a/tdeprint/cups/cupsinfos.cpp b/tdeprint/cups/cupsinfos.cpp index 2f7031503..1fae8e0db 100644 --- a/tdeprint/cups/cupsinfos.cpp +++ b/tdeprint/cups/cupsinfos.cpp @@ -119,9 +119,9 @@ void CupsInfos::load() { KConfig *conf_ = KMFactory::self()->printConfig(); conf_->setGroup("CUPS"); - host_ = conf_->readEntry("Host",TQString::fromLatin1(cupsServer())); + host_ = conf_->readEntry("Host",TQString::tqfromLatin1(cupsServer())); port_ = conf_->readNumEntry("Port",ippPort()); - login_ = conf_->readEntry("Login",TQString::fromLatin1(cupsUser())); + login_ = conf_->readEntry("Login",TQString::tqfromLatin1(cupsUser())); savepwd_ = conf_->readBoolEntry( "SavePassword", false ); if ( savepwd_ ) { diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index e2401d6d3..9912c1886 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/cups/imagepreview.cpp @@ -51,7 +51,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga hue_ = hue; saturation_ = saturation; gamma_ = gamma; - repaint(); + tqrepaint(); } void ImagePreview::paintEvent(TQPaintEvent*){ diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp index 1e07789ac..5fa54e11e 100644 --- a/tdeprint/cups/ippreportdlg.cpp +++ b/tdeprint/cups/ippreportdlg.cpp @@ -59,7 +59,7 @@ void IppReportDlg::slotUser1() int hh = rich.height(), page(1); while (1) { - rich.draw(&painter, margin, margin, r, colorGroup()); + rich.draw(&painter, margin, margin, r, tqcolorGroup()); TQString s = caption() + ": " + TQString::number(page); TQRect br = painter.fontMetrics().boundingRect(s); painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp index c7472a9ae..16cbe3308 100644 --- a/tdeprint/cups/ipprequest.cpp +++ b/tdeprint/cups/ipprequest.cpp @@ -66,7 +66,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString:: ipp_attribute_t *attr = req->attrs; while (attr) { - TQString s = TQString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); + TQString s = TQString::tqfromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16); for (int i=0;i<attr->num_values;i++) { switch (attr->value_tag) diff --git a/tdeprint/cups/ipprequest.h b/tdeprint/cups/ipprequest.h index 258b44803..ba8b2f081 100644 --- a/tdeprint/cups/ipprequest.h +++ b/tdeprint/cups/ipprequest.h @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqmap.h> #include <cups/ipp.h> diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp index 5c2de105b..e016e9954 100644 --- a/tdeprint/cups/kcupsprinterimpl.cpp +++ b/tdeprint/cups/kcupsprinterimpl.cpp @@ -67,8 +67,8 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) // check printer object if (!printer) return false; - TQString hoststr = TQString::fromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); - cmd = TQString::fromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); + TQString hoststr = TQString::tqfromLatin1("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); + cmd = TQString::tqfromLatin1("cupsdoprint -P %1 -J %3 -H %2").arg(quote(printer->printerName())).arg(quote(hoststr)).arg(quote(printer->docName())); if (!CupsInfos::self()->login().isEmpty()) { TQString userstr(CupsInfos::self()->login()); @@ -127,7 +127,7 @@ void KCupsPrinterImpl::broadcastOption(const TQString& key, const TQString& valu KPrinterImpl::broadcastOption("orientation-requested",(value == "Landscape" ? "4" : "3")); else if (key == "kde-pagesize") { - TQString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + TQString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); // simple hack for classes KPrinterImpl::broadcastOption("media",pagename); diff --git a/tdeprint/cups/kmconfigcups.cpp b/tdeprint/cups/kmconfigcups.cpp index d130f217f..7e03dae01 100644 --- a/tdeprint/cups/kmconfigcups.cpp +++ b/tdeprint/cups/kmconfigcups.cpp @@ -24,7 +24,7 @@ #include <kconfig.h> #include <kdialog.h> -#include <layout.h> +#include <tqlayout.h> KMConfigCups::KMConfigCups(TQWidget *parent) : KMConfigPage(parent,"ConfigCups") diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index d63e87de7..fbec34f2a 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -25,7 +25,7 @@ #include <kdialog.h> #include <kconfig.h> #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <kcursor.h> KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index 117247ec5..482680bd6 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqlineedit.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqvalidator.h> @@ -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/tdeprint/cups/kmcupsjobmanager.cpp b/tdeprint/cups/kmcupsjobmanager.cpp index be088d360..58de0818a 100644 --- a/tdeprint/cups/kmcupsjobmanager.cpp +++ b/tdeprint/cups/kmcupsjobmanager.cpp @@ -93,7 +93,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList<KMJob>& jobs, int ac if (argstr.isEmpty()) return false; req.setOperation(CUPS_MOVE_JOB); uri = - TQString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), + TQString::tqfromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(), argstr); req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); break; @@ -150,7 +150,7 @@ bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType ty // other attributes req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); if (type == KMJobManager::CompletedJobs) - req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::fromLatin1("completed")); + req.addKeyword(IPP_TAG_OPERATION,"which-jobs",TQString::tqfromLatin1("completed")); if (limit > 0) req.addInteger(IPP_TAG_OPERATION,"limit",limit); @@ -218,7 +218,7 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) } else if (name == "job-priority") { - job->setAttribute(0, TQString::fromLatin1("%1").arg(attr->values[0].integer, 3)); + job->setAttribute(0, TQString::tqfromLatin1("%1").arg(attr->values[0].integer, 3)); } else if (name == "job-billing") { diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index ed205316f..8db6bdc6d 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -34,7 +34,7 @@ #include "ppdloader.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <tqtimer.h> #include <tqsocket.h> @@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager() TQString KMCupsManager::driverDbCreationProgram() { - return TQString::fromLatin1("/opt/trinity/bin/make_driver_db_cups"); + return TQString::tqfromLatin1("/opt/trinity/bin/make_driver_db_cups"); } TQString KMCupsManager::driverDirectory() @@ -173,7 +173,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p) else if (!p->option("requesting-user-name-allowed").isEmpty()) req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQStringList::split(",",p->option("requesting-user-name-allowed"),false)); else - req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::fromLatin1("all")); + req.addName(IPP_TAG_PRINTER,"requesting-user-name-allowed",TQString::tqfromLatin1("all")); } req.addText(IPP_TAG_PRINTER,"printer-info",p->description()); req.addText(IPP_TAG_PRINTER,"printer-location",p->location()); @@ -287,8 +287,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) delete kes; m_hostSuccess = false; } else { - TQDateTime tm = TQDateTime::currentDateTime().addSecs(2); - while (!m_lookupDone && (TQDateTime::currentDateTime() < tm)) + TQDateTime tm = TQDateTime::tqcurrentDateTime().addSecs(2); + while (!m_lookupDone && (TQDateTime::tqcurrentDateTime() < tm)) tqApp->processEvents(); kes->cancelAsyncConnect(); @@ -358,8 +358,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // banners req.name("job-sheets-default",values); while (values.count() < 2) values.append("none"); - p->setOption("kde-banners",values.join(TQString::fromLatin1(","))); - if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::fromLatin1(","))); + p->setOption("kde-banners",values.join(TQString::tqfromLatin1(","))); + if (req.name("job-sheets-supported",values)) p->setOption("kde-banners-supported",values.join(TQString::tqfromLatin1(","))); // quotas int ival; @@ -405,7 +405,7 @@ bool KMCupsManager::testPrinter(KMPrinter *p) req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addMime(IPP_TAG_OPERATION,"document-format","application/postscript"); if (!CupsInfos::self()->login().isEmpty()) req.addName(IPP_TAG_OPERATION,"requesting-user-name",CupsInfos::self()->login()); - req.addName(IPP_TAG_OPERATION,"job-name",TQString::fromLatin1("KDE Print Test")); + req.addName(IPP_TAG_OPERATION,"job-name",TQString::tqfromLatin1("KDE Print Test")); if (req.doFileRequest("/printers/",testpage)) return true; reportIppError(&req); @@ -453,7 +453,7 @@ void KMCupsManager::loadServerPrinters() // load default req.init(); req.setOperation(CUPS_GET_DEFAULT); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name")); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name")); if (req.doRequest("/printers/")) { TQString s = TQString::null; @@ -576,7 +576,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { TQStringList comps = TQStringList::split('/', drname, false); TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { @@ -691,7 +691,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) keyword = line.mid(8,p-8); DrBase *bopt = 0; if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" ) - bopt = driver->findOption( TQString::fromLatin1( "PageSize" ) ); + bopt = driver->findOption( TQString::tqfromLatin1( "PageSize" ) ); else bopt = driver->findOption( keyword ); if (bopt) @@ -938,7 +938,7 @@ void KMCupsManager::slotConnectionSuccess() IppRequest req; req.setOperation( CUPS_GET_PRINTERS ); - req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::fromLatin1( "printer-name" ) ); + req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", TQString::tqfromLatin1( "printer-name" ) ); if ( req.doRequest( "/printers/" ) ) setUpdatePossible( true ); else diff --git a/tdeprint/cups/kmpropbanners.cpp b/tdeprint/cups/kmpropbanners.cpp index 479a7e106..22098cdff 100644 --- a/tdeprint/cups/kmpropbanners.cpp +++ b/tdeprint/cups/kmpropbanners.cpp @@ -23,7 +23,7 @@ #include "kmwbanners.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMPropBanners::KMPropBanners(TQWidget *parent, const char *name) diff --git a/tdeprint/cups/kmpropquota.cpp b/tdeprint/cups/kmpropquota.cpp index 1f80e16d6..9df6cbcb2 100644 --- a/tdeprint/cups/kmpropquota.cpp +++ b/tdeprint/cups/kmpropquota.cpp @@ -22,7 +22,7 @@ #include "kmwizard.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> // some forward declarations (see kmwquota.cpp) diff --git a/tdeprint/cups/kmpropusers.cpp b/tdeprint/cups/kmpropusers.cpp index d5b2290d7..65a9e4dbd 100644 --- a/tdeprint/cups/kmpropusers.cpp +++ b/tdeprint/cups/kmpropusers.cpp @@ -21,15 +21,15 @@ #include "kmprinter.h" #include "kmwizard.h" -#include <textview.h> -#include <layout.h> +#include <tqtextview.h> +#include <tqlayout.h> #include <klocale.h> KMPropUsers::KMPropUsers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { m_text = new TQTextView(this); - m_text->setPaper(colorGroup().background()); + m_text->setPaper(tqcolorGroup().background()); m_text->setFrameStyle(TQFrame::NoFrame); TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0); diff --git a/tdeprint/cups/kmwbanners.cpp b/tdeprint/cups/kmwbanners.cpp index 59b3d10ff..c221f69d7 100644 --- a/tdeprint/cups/kmwbanners.cpp +++ b/tdeprint/cups/kmwbanners.cpp @@ -25,7 +25,7 @@ #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqmap.h> #include <klocale.h> diff --git a/tdeprint/cups/kmwfax.cpp b/tdeprint/cups/kmwfax.cpp index 132e8c1e0..352081f6c 100644 --- a/tdeprint/cups/kmwfax.cpp +++ b/tdeprint/cups/kmwfax.cpp @@ -24,7 +24,7 @@ #include "cupsinfos.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klistbox.h> #include <klocale.h> #include <kiconloader.h> @@ -48,7 +48,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name) // initialize IppRequest req; req.setOperation(CUPS_GET_DEVICES); - TQString uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + TQString uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) { @@ -57,7 +57,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name) { if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0) { - m_list->insertItem(SmallIcon("blockdevice"),TQString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("blockdevice"),TQString::tqfromLatin1(attr->values[0].string.text)); } attr = attr->next; } diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp index cb9dedd6c..119da629a 100644 --- a/tdeprint/cups/kmwipp.cpp +++ b/tdeprint/cups/kmwipp.cpp @@ -41,7 +41,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name) "before continuing.</p>")); setLabel(0,i18n("Host:")); setLabel(1,i18n("Port:")); - setText( 1, TQString::fromLatin1( "631" ) ); + setText( 1, TQString::tqfromLatin1( "631" ) ); } bool KMWIpp::isValid(TQString& msg) diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp index 5559bc8bb..0a0c7b672 100644 --- a/tdeprint/cups/kmwippprinter.cpp +++ b/tdeprint/cups/kmwippprinter.cpp @@ -30,8 +30,8 @@ #include <tqlineedit.h> #include <tqlabel.h> #include <kmessagebox.h> -#include <textview.h> -#include <layout.h> +#include <tqtextview.h> +#include <tqlayout.h> #include <tqregexp.h> #include <kseparator.h> #include <klocale.h> @@ -59,7 +59,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) l1->setBuddy(m_uri); m_info = new TQTextView(this); - m_info->setPaper(colorGroup().background()); + m_info->setPaper(tqcolorGroup().background()); m_info->setMinimumHeight(100); m_info->setText(i18n("<p>Either enter the printer URI directly, or use the network scanning facility.</p>")); m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "tdeprint_report"), this); @@ -157,7 +157,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item) req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); req.setHost(item->text(1)); req.setPort(item->text(2).toInt()); - uri = TQString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); + uri = TQString::tqfromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); keys.append("printer-name"); keys.append("printer-state"); @@ -176,7 +176,7 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item) if (req.uri("printer-uri-supported",value)) { if (value[0] == '/') - value.prepend(TQString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); + value.prepend(TQString::tqfromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); m_uri->setText(value); } if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); diff --git a/tdeprint/cups/kmwippselect.cpp b/tdeprint/cups/kmwippselect.cpp index b13fb05fa..5c9cad356 100644 --- a/tdeprint/cups/kmwippselect.cpp +++ b/tdeprint/cups/kmwippselect.cpp @@ -24,7 +24,7 @@ #include "ipprequest.h" #include <klistbox.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> @@ -75,16 +75,16 @@ void KMWIppSelect::initPrinter(KMPrinter *p) IppRequest req; TQString uri; req.setOperation(CUPS_GET_PRINTERS); - uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + uri = TQString::tqfromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); - req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::fromLatin1("printer-name")); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",TQString::tqfromLatin1("printer-name")); if (req.doRequest("/printers/")) { ipp_attribute_t *attr = req.first(); while (attr) { if (attr->name && strcmp(attr->name,"printer-name") == 0) - m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("tdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); attr = attr->next; } m_list->sort(); diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp index 529aba14a..596f61990 100644 --- a/tdeprint/cups/kmwother.cpp +++ b/tdeprint/cups/kmwother.cpp @@ -24,7 +24,7 @@ #include "cupsinfos.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqheader.h> #include <tqdict.h> diff --git a/tdeprint/cups/kmwquota.cpp b/tdeprint/cups/kmwquota.cpp index a9b0eb89d..67245fb20 100644 --- a/tdeprint/cups/kmwquota.cpp +++ b/tdeprint/cups/kmwquota.cpp @@ -26,7 +26,7 @@ #include <tqspinbox.h> #include <tqlabel.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #ifdef HAVE_LIMITS_H diff --git a/tdeprint/cups/kmwusers.cpp b/tdeprint/cups/kmwusers.cpp index 520a2568c..714f6f4d4 100644 --- a/tdeprint/cups/kmwusers.cpp +++ b/tdeprint/cups/kmwusers.cpp @@ -24,7 +24,7 @@ #include "kmprinter.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcombobox.h> #include <klocale.h> #include <keditlistbox.h> diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp index deaad08f5..080cdf453 100644 --- a/tdeprint/cups/kphpgl2page.cpp +++ b/tdeprint/cups/kphpgl2page.cpp @@ -21,7 +21,7 @@ #include <tqcheckbox.h> #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 3715a341b..13332dee3 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -30,7 +30,7 @@ #include <tqapplication.h> #include <tqimage.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> #include <knuminput.h> @@ -192,7 +192,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPreviewPositionImagePage = i18n( " <qt> " " <p><b>Position Preview Thumbnail</b></p> " " <p>This position preview thumbnail indicates the position of the image on the paper sheet. " - " <p>Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: " + " <p>Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: " " <ul> " " <li> center </li>" " <li> top </li>" @@ -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/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index 6b085cc92..4d8bab4d1 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -20,7 +20,7 @@ #include "kpschedulepage.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcombobox.h> #include <tqregexp.h> #include <tqdatetimeedit.h> diff --git a/tdeprint/cups/kptagspage.cpp b/tdeprint/cups/kptagspage.cpp index 40c20db70..f47b0930c 100644 --- a/tdeprint/cups/kptagspage.cpp +++ b/tdeprint/cups/kptagspage.cpp @@ -21,7 +21,7 @@ #include <tqtable.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqregexp.h> #include <tqwhatsthis.h> diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index a8cc88098..3fe711104 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqradiobutton.h> #include <tqwhatsthis.h> diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp index abc468f7a..072f125c6 100644 --- a/tdeprint/driver.cpp +++ b/tdeprint/driver.cpp @@ -334,7 +334,7 @@ void DrGroup::flattenGroup(TQMap<TQString, DrBase*>& optmap, int& index) optmap[oit.current()->name()] = oit.current(); if (name().isEmpty()) - optmap[TQString::fromLatin1("group%1").arg(index++)] = this; + optmap[TQString::tqfromLatin1("group%1").arg(index++)] = this; else optmap[name()] = this; @@ -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/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp index 1ce2f5625..b6531fef2 100644 --- a/tdeprint/driveritem.cpp +++ b/tdeprint/driveritem.cpp @@ -46,7 +46,7 @@ void DriverItem::updateText() { QString s(m_item->get("text")); if (m_item->isOption()) - s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText())); + s.append(TQString::tqfromLatin1(": <%1>").arg(m_item->prettyText())); if (m_item->type() == DrBase::List) { // remove all children: something has changed (otherwise this @@ -107,7 +107,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width, p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); w += w1; p->setPen(cg.text()); - s = TQString::fromLatin1(">"); + s = TQString::tqfromLatin1(">"); w1 = p->fontMetrics().width(s); p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); } @@ -133,7 +133,7 @@ bool DriverItem::updateConflict() m_conflict = (m_item->conflict()); } } - repaint(); + tqrepaint(); return m_conflict; } diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp index bb78f1a3d..f7feabb06 100644 --- a/tdeprint/driverview.cpp +++ b/tdeprint/driverview.cpp @@ -25,7 +25,7 @@ #include <tqlistview.h> #include <tqsplitter.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp index 504003173..2ba4d1799 100644 --- a/tdeprint/droptionview.cpp +++ b/tdeprint/droptionview.cpp @@ -29,7 +29,7 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> #include <tqwidgetstack.h> -#include <layout.h> +#include <tqlayout.h> #include <tqapplication.h> #include <kcursor.h> diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp index b628ac6d9..d47a5e134 100644 --- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -44,7 +44,7 @@ bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) QString exe = executable(); if (!exe.isEmpty()) { - cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd = exe + TQString::tqfromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); return true; } else diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index 6a4de31eb..53049852b 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { driver->set("manufacturer", pelem.namedItem("make").toElement().text()); driver->set("model", pelem.namedItem("model").toElement().text()); - QString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); + QString s = TQString::tqfromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); driver->set("description", s); driver->set("text", s); diff --git a/tdeprint/kfilelist.cpp b/tdeprint/kfilelist.cpp index d93cd01b9..4f3cabe5b 100644 --- a/tdeprint/kfilelist.cpp +++ b/tdeprint/kfilelist.cpp @@ -21,7 +21,7 @@ #include <tqtoolbutton.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqheader.h> #include <tqwhatsthis.h> diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index b79c76240..3206d3cee 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst) if (sys.isEmpty()) // load default configured print plugin sys = printSystem(); - TQString libname = TQString::fromLatin1("tdeprint_%1").arg(sys); + TQString libname = TQString::tqfromLatin1("tdeprint_%1").arg(sys); m_factory = KLibLoader::self()->factory(TQFile::encodeName(libname)); if (!m_factory) { @@ -311,7 +311,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) { TQString path(name); if (path[0] != '/') - path = locate("data", TQString::fromLatin1("tdeprint/plugins/%1.print").arg(name)); + path = locate("data", TQString::tqfromLatin1("tdeprint/plugins/%1.print").arg(name)); KSimpleConfig conf(path); PluginInfo info; @@ -363,7 +363,7 @@ TQString KMFactory::autoDetect() currentPrecedence = plugins[i].detectPrecedence; } } - return (pluginIndex == -1 ? TQString::fromLatin1("lpdunix") : plugins[pluginIndex].name); + return (pluginIndex == -1 ? TQString::tqfromLatin1("lpdunix") : plugins[pluginIndex].name); } void KMFactory::slot_pluginChanged(pid_t pid) diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp index 7ff1efb95..ce7e95993 100644 --- a/tdeprint/kmjob.cpp +++ b/tdeprint/kmjob.cpp @@ -75,7 +75,7 @@ TQString KMJob::pixmap() { // special case if (m_type == KMJob::Threaded) - return TQString::fromLatin1("exec"); + return TQString::tqfromLatin1("exec"); // normal case QString str("tdeprint_job"); diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 30a1fb993..918c14ff2 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -53,7 +53,7 @@ void KMJobManager::discardAllJobs() void KMJobManager::removeDiscardedJobs() { for (uint i=0;i<m_jobs.count();i++) - if (m_jobs.at(i)->isDiscarded()) + if (m_jobs.tqat(i)->isDiscarded()) { m_jobs.remove(i); i--; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 3316244de..01ca0dc77 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -253,7 +253,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload) // remove discarded printers for (uint i=0; i<m_printers.count(); i++) { - KMPrinter *prt = m_printers.at(i); + KMPrinter *prt = m_printers.tqat(i); if (prt->isDiscarded()) { m_printers.remove(i); @@ -268,7 +268,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload) // - use the PRINTER variable if (!softDefault()) { - KMPrinter *defprinter = findPrinter(TQString::fromLatin1(getenv("PRINTER"))); + KMPrinter *defprinter = findPrinter(TQString::tqfromLatin1(getenv("PRINTER"))); if (defprinter) setSoftDefault(defprinter); } @@ -475,7 +475,7 @@ TQStringList KMManager::detectLocalPrinters() { TQStringList list; for (int i=0; i<3; i++) - list << TQString() << TQString::fromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString(); + list << TQString() << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString(); return list; } diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index d26515a16..6dc967757 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -66,7 +66,7 @@ bool KMSpecialManager::savePrinters() conf.setGroup("General"); int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) - conf.deleteGroup(TQString::fromLatin1("Printer %1").arg(i),true); + conf.deleteGroup(TQString::tqfromLatin1("Printer %1").arg(i),true); // then add printers n = 0; @@ -74,7 +74,7 @@ bool KMSpecialManager::savePrinters() for (;it.current();++it) { if (!it.current()->isSpecial() || it.current()->isVirtual()) continue; - conf.setGroup(TQString::fromLatin1("Printer %1").arg(n)); + conf.setGroup(TQString::tqfromLatin1("Printer %1").arg(n)); conf.writeEntry("Name",it.current()->name()); conf.writeEntry("Description",it.current()->description()); conf.writeEntry("Comment",it.current()->location()); @@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename) int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) { - QString grpname = TQString::fromLatin1("Printer %1").arg(i); + QString grpname = TQString::tqfromLatin1("Printer %1").arg(i); if (!conf.hasGroup(grpname)) continue; conf.setGroup(grpname); KMPrinter *printer = new KMPrinter; diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp index 146c55055..309da96a9 100644 --- a/tdeprint/kmthreadjob.cpp +++ b/tdeprint/kmthreadjob.cpp @@ -22,7 +22,7 @@ #include "kmjobmanager.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqstringlist.h> #include <kstandarddirs.h> diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp index 0bfb8e0c7..78757decd 100644 --- a/tdeprint/kmvirtualmanager.cpp +++ b/tdeprint/kmvirtualmanager.cpp @@ -25,7 +25,7 @@ #include <stdlib.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdir.h> #include <tqfileinfo.h> #include <klocale.h> diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 975a1d088..c8757e174 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <layout.h> +#include <tqlayout.h> #include <kapplication.h> #include <klocale.h> @@ -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); @@ -336,7 +336,7 @@ void KPCopiesPage::getOptions(TQMap<TQString,TQString>& options, bool incldef) options["kde-collate"] = (m_collate->isChecked() ? "Collate" : "Uncollate"); // ranges options["kde-current"] = (m_current->isChecked() ? "1" : "0"); - options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::fromLatin1("1-") : TQString::fromLatin1(""))); + options["kde-range"] = (m_range->isChecked() ? m_rangeedit->text() : (incldef ? TQString::tqfromLatin1("1-") : TQString::tqfromLatin1(""))); // page set options["kde-pageset"] = TQString::number(m_pageset->currentItem()); } diff --git a/tdeprint/kpdriverpage.cpp b/tdeprint/kpdriverpage.cpp index f2fa9f4ed..18cfeb207 100644 --- a/tdeprint/kpdriverpage.cpp +++ b/tdeprint/kpdriverpage.cpp @@ -21,7 +21,7 @@ #include "driverview.h" #include "driver.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KPDriverPage::KPDriverPage(KMPrinter *p, DrMain *d, TQWidget *parent, const char *name) diff --git a/tdeprint/kpfileselectpage.cpp b/tdeprint/kpfileselectpage.cpp index eaa7c0605..f3131717a 100644 --- a/tdeprint/kpfileselectpage.cpp +++ b/tdeprint/kpfileselectpage.cpp @@ -20,7 +20,7 @@ #include "kpfileselectpage.h" #include "kfilelist.h" -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <tqregexp.h> #include <tqheader.h> diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 690ce4643..b321b3141 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -24,7 +24,7 @@ #include <tqtoolbutton.h> #include <tqheader.h> #include <tqtooltip.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <klistview.h> #include <klocale.h> diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index d97afe542..3b93e59af 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tqbutton.h> #include <tqbuttongroup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqwhatsthis.h> @@ -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<TQString,TQString>& 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/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 80c02e60a..554679ee7 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -26,7 +26,7 @@ #include "marginwidget.h" #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqprinter.h> #include <tqpaintdevicemetrics.h> diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp index 8b9fa447d..2e0e78894 100644 --- a/tdeprint/kpposterpage.cpp +++ b/tdeprint/kpposterpage.cpp @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqlineedit.h> #include <tqwhatsthis.h> diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 5fa189344..4049ab4f8 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -28,7 +28,7 @@ #include <tqbuttongroup.h> #include <tqradiobutton.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <kiconloader.h> @@ -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<TQString,TQString>& opts, bool incldef) DrListOption *opt = static_cast<DrListOption*>(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/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index b9aa0c0cb..092884bde 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -44,7 +44,7 @@ #include <tqcombobox.h> #include <tqtabwidget.h> #include <tqvbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <kmessagebox.h> #include <tqdir.h> @@ -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); @@ -568,7 +568,7 @@ void KPrintDialog::initialize(KPrinter *printer) if (!sep && it.current()->isSpecial()) { sep = true; - d->m_printers->insertItem(TQPixmap(), TQString::fromLatin1("--------")); + d->m_printers->insertItem(TQPixmap(), TQString::tqfromLatin1("--------")); } d->m_printers->insertItem(SmallIcon(it.current()->pixmap(),0,(it.current()->isValid() ? (int)KIcon::DefaultState : (int)KIcon::LockOverlay)),it.current()->name(),false/*sep*/); if (it.current()->isSoftDefault()) @@ -824,7 +824,7 @@ void KPrintDialog::reload() // remove printer dependent pages (usually from plugin) TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); for (uint i=0; i<d->m_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) @@ -863,7 +863,7 @@ void KPrintDialog::expandDialog(bool on) if (on) { - sz.setHeight(sz.height()+d->m_dummy->minimumSize().height()+d->m_plugin->minimumSize().height()+2*layout()->spacing()); + sz.setHeight(sz.height()+d->m_dummy->tqminimumSize().height()+d->m_plugin->tqminimumSize().height()+2*layout()->spacing()); if (isVisible() || !d->m_dummy->isVisible() || !d->m_plugin->isVisible()) { d->m_dummy->show(); @@ -952,10 +952,10 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); - 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/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..67d276990 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -846,7 +846,7 @@ int KPrinter::toPage() const { return (option("kde-topage").isEmpty() ? 0 : option("kde-topage").toInt()); } void KPrinter::setFromTo(int m, int M) -{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::fromLatin1(""))); } +{ setOption("kde-frompage",TQString::number(m)); setOption("kde-topage",TQString::number(M)); setOption("kde-range",(m>0 && M>0 ? TQString("%1-%2").arg(m).arg(M) : TQString::tqfromLatin1(""))); } // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const @@ -889,7 +889,7 @@ void KPrinter::setPrintProgram(const TQString& prg) } TQString KPrinter::printerSelectionOption() const -{ return TQString::fromLatin1(""); } +{ return TQString::tqfromLatin1(""); } void KPrinter::setPrinterSelectionOption(const TQString&) {} diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 5b35f6eff..166ae7207 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -508,7 +508,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool TQString::null, i18n("Convert"), i18n("Keep"), - TQString::fromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes) + TQString::tqfromLatin1("tdeprintAutoConvert"))) == KMessageBox::Yes) { // find the filter chain TQStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index cf2e712e2..235472d1f 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -22,7 +22,7 @@ #include "kmfactory.h" #include <tqfile.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvbox.h> #include <kparts/part.h> @@ -111,7 +111,7 @@ static KLibFactory* componentFactory() factory = KLibLoader::self()->factory("libkghostviewpart"); if( factory ) return factory; - KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("application/postscript"), TQString::fromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null); + KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("application/postscript"), TQString::tqfromLatin1("KParts/ReadOnlyPart"), TQString::null, TQString::null); for (KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it) { KService::Ptr service = *it; diff --git a/tdeprint/lpd/gschecker.cpp b/tdeprint/lpd/gschecker.cpp index c86deaf4c..9fe6e290b 100644 --- a/tdeprint/lpd/gschecker.cpp +++ b/tdeprint/lpd/gschecker.cpp @@ -21,7 +21,7 @@ #include "kpipeprocess.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> GsChecker::GsChecker(TQObject *parent, const char *name) : TQObject(parent,name) @@ -53,7 +53,7 @@ void GsChecker::loadDriverList() else buffer.append(line).append(" "); } - else if (line.startsWith(TQString::fromLatin1("Available devices:"))) + else if (line.startsWith(TQString::tqfromLatin1("Available devices:"))) ok = true; } m_driverlist = TQStringList::split(' ',buffer,false); diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp index 2704cc46a..59f04e74c 100644 --- a/tdeprint/lpd/klpdprinterimpl.cpp +++ b/tdeprint/lpd/klpdprinterimpl.cpp @@ -46,6 +46,6 @@ bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr")); return false; } - cmd = TQString::fromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd = TQString::tqfromLatin1("%1 -P %2 '-#%3'").arg(exestr).arg(quote(printer->printerName())).arg(printer->numCopies()); return true; } diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index a3c2ad475..a5612ad58 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqmap.h> #include <tqregexp.h> @@ -65,12 +65,12 @@ KMLpdManager::~KMLpdManager() TQString KMLpdManager::driverDbCreationProgram() { - return TQString::fromLatin1("make_driver_db_lpd"); + return TQString::tqfromLatin1("make_driver_db_lpd"); } TQString KMLpdManager::driverDirectory() { - return TQString::fromLatin1("/usr/lib/rhs/rhs-printfilters"); + return TQString::tqfromLatin1("/usr/lib/rhs/rhs-printfilters"); } bool KMLpdManager::completePrinter(KMPrinter *printer) @@ -91,11 +91,11 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) KURL url; if (!entry->arg("rm").isEmpty()) { - url = TQString::fromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp")); + url = TQString::tqfromLatin1("lpd://%1/%2").arg(entry->arg("rm")).arg(entry->arg("rp")); printer->setDescription(i18n("Remote LPD queue %1@%2").arg(entry->arg("rp")).arg(entry->arg("rm"))); } else if (!lp.isEmpty() && lp != "/dev/null") - url = TQString::fromLatin1("parallel:%1").arg(lp); + url = TQString::tqfromLatin1("parallel:%1").arg(lp); else if (TQFile::exists(entry->arg("sd")+"/.config")) { TQMap<TQString,TQString> map = loadPrinttoolCfgFile(entry->arg("sd")+"/.config"); @@ -103,17 +103,17 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) { QStringList l = TQStringList::split('\\',map["share"],false); if (map["workgroup"].isEmpty()) - url = TQString::fromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]); + url = TQString::tqfromLatin1("smb://%1/%2").arg(l[0]).arg(l[1]); else - url = TQString::fromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]); + url = TQString::tqfromLatin1("smb://%1/%2/%3").arg(map["workgroup"]).arg(l[0]).arg(l[1]); url.setUser(map["user"]); url.setPass(map["password"]); } else if (type == "DIRECT") - url = TQString::fromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]); + url = TQString::tqfromLatin1("socket://%1:%2").arg(map["printer_ip"]).arg(map["port"]); else if (type == "NCP") { - url = TQString::fromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]); + url = TQString::tqfromLatin1("ncp://%1/%2").arg(map["server"]).arg(map["queue"]); url.setUser(map["user"]); url.setPass(map["password"]); } @@ -146,9 +146,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) { // remote lpd queue ent->m_args["rm"] = printer->device().host(); - ent->m_args["rp"] = printer->device().path().replace("/",TQString::fromLatin1("")); + ent->m_args["rp"] = printer->device().path().replace("/",TQString::tqfromLatin1("")); ent->m_args["lpd_bounce"] = "true"; - ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## REMOTE"); + ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## REMOTE"); } ent->m_args["mx"] = (printer->option("mx").isEmpty() ? "#0" : printer->option("mx")); ent->m_args["sh"] = TQString::null; @@ -259,7 +259,7 @@ bool KMLpdManager::disablePrinter(KMPrinter *printer) void KMLpdManager::listPrinters() { m_entries.clear(); - loadPrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix)); + loadPrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix)); TQDictIterator<PrintcapEntry> it(m_entries); for (;it.current();++it) @@ -312,7 +312,7 @@ void KMLpdManager::checkStatus() bool KMLpdManager::writePrinters() { - if (!writePrintcapFile(TQString::fromLatin1("%1/etc/printcap").arg(lpdprefix))) + if (!writePrintcapFile(TQString::tqfromLatin1("%1/etc/printcap").arg(lpdprefix))) { setErrorMsg(i18n("Unable to write printcap file.")); return false; @@ -489,7 +489,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt { // defines input and output file QString fname = TQFileInfo(templatefile).fileName(); - fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1("")); + fname.replace(TQRegExp("\\.in$"),TQString::tqfromLatin1("")); QFile fin(templatefile); QFile fout(dirname + "/" + fname); if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly)) @@ -508,7 +508,7 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt if (line.startsWith("export ")) { tout << "export "; - line.replace(0,7,TQString::fromLatin1("")); + line.replace(0,7,TQString::tqfromLatin1("")); } if ((p=line.find('=')) != -1) { @@ -543,8 +543,8 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) return false; QString resol(options["RESOLUTION"]), color(options["COLOR"]); // update entry comment to make printtool happy and save printcap file - ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15))); - ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter"); + ent->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::tqfromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::tqfromLatin1("Default") : color.right(color.length()-15))); + ent->m_args["if"] = spooldir+TQString::tqfromLatin1("/filter"); if (!writePrinters()) return false; // write various driver files using templates @@ -566,11 +566,11 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry { KURL dev(printer->device()); QString prot = dev.protocol(), sd(entry->arg("sd")); - entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer)); + entry->m_comment = TQString::tqfromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer)); if (prot == "smb" || prot == "ncp" || prot == "socket") { - entry->m_args["af"] = sd+TQString::fromLatin1("/acct"); - QFile f(sd+TQString::fromLatin1("/.config")); + entry->m_args["af"] = sd+TQString::tqfromLatin1("/acct"); + QFile f(sd+TQString::tqfromLatin1("/.config")); if (f.open(IO_WriteOnly)) { QTextStream t(&f); @@ -578,7 +578,7 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry { t << "printer_ip=" << dev.host() << endl; t << "port=" << dev.port() << endl; - entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/directprint"); + entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/directprint"); } else if (prot == "smb") { @@ -594,20 +594,20 @@ bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry t << "hostip=" << endl; t << "user='" << dev.user() << '\'' << endl; t << "password='" << dev.pass() << '\'' << endl; - t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::fromLatin1("")) << '\'' << endl; - entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/smbprint"); + t << "workgroup='" << (l.count() == 2 ? dev.host() : TQString::tqfromLatin1("")) << '\'' << endl; + entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/smbprint"); } else if (prot == "ncp") { t << "server=" << dev.host() << endl; - t << "queue=" << dev.path().replace("/",TQString::fromLatin1("")) << endl; + t << "queue=" << dev.path().replace("/",TQString::tqfromLatin1("")) << endl; t << "user=" << dev.user() << endl; t << "password=" << dev.pass() << endl; - entry->m_args["if"] = driverDirectory()+TQString::fromLatin1("/ncpprint"); + entry->m_args["if"] = driverDirectory()+TQString::tqfromLatin1("/ncpprint"); } } else return false; - entry->m_args["lp"] = TQString::fromLatin1("/dev/null"); + entry->m_args["lp"] = TQString::tqfromLatin1("/dev/null"); } else if (prot != "lpd") entry->m_args["lp"] = dev.path(); @@ -618,7 +618,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) { // first check if it has a "sd" defined if (entry->arg("sd").isEmpty()) - entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name; + entry->m_args["sd"] = TQString::tqfromLatin1("/var/spool/lpd/")+entry->m_name; QString sd = entry->arg("sd"); if (!KStandardDirs::exists(sd)) { diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp index 5131b33f3..610e8ead5 100644 --- a/tdeprint/lpd/lpdtools.cpp +++ b/tdeprint/lpd/lpdtools.cpp @@ -257,11 +257,11 @@ DrMain* PrinttoolEntry::createDriver() for (int i=0;it.current();++it,i++) { ch = new DrBase; - ch->setName(TQString::fromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi)); + ch->setName(TQString::tqfromLatin1("%1x%2").arg(it.current()->xdpi).arg(it.current()->ydpi)); if (it.current()->comment.isEmpty()) - ch->set("text",TQString::fromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi)); + ch->set("text",TQString::tqfromLatin1("%1x%2 DPI").arg(it.current()->xdpi).arg(it.current()->ydpi)); else - ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi)); + ch->set("text",TQString::tqfromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi)); lopt->addChoice(ch); } QString defval = lopt->choices()->first()->name(); @@ -281,13 +281,13 @@ DrMain* PrinttoolEntry::createDriver() { ch = new DrBase; if (m_gsdriver != "uniprint") - ch->setName(TQString::fromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp)); + ch->setName(TQString::tqfromLatin1("-dBitsPerPixel=%1").arg(it.current()->bpp)); else ch->setName(it.current()->bpp); if (it.current()->comment.isEmpty()) ch->set("text",it.current()->bpp); else - ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment)); + ch->set("text",TQString::tqfromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment)); lopt->addChoice(ch); } QString defval = lopt->choices()->first()->name(); diff --git a/tdeprint/lpd/lpdtools.h b/tdeprint/lpd/lpdtools.h index 11b5909d4..692dd0fa2 100644 --- a/tdeprint/lpd/lpdtools.h +++ b/tdeprint/lpd/lpdtools.h @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqmap.h> #include <tqptrlist.h> -#include <textstream.h> +#include <tqtextstream.h> class KMLpdManager; class DrMain; diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp index e8ee34fd5..9ba97efae 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -36,12 +36,12 @@ KLpdUnixPrinterImpl::~KLpdUnixPrinterImpl() void KLpdUnixPrinterImpl::initLpPrint(TQString& cmd, KPrinter *printer) { - cmd += TQString::fromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd += TQString::tqfromLatin1(" -d %1 -n%2").arg(quote(printer->printerName())).arg(printer->numCopies()); } void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer) { - cmd += TQString::fromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies()); + cmd += TQString::tqfromLatin1(" -P %1 '-#%2'").arg(quote(printer->printerName())).arg(printer->numCopies()); } // look for executable, starting with "lpr" diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp index 0ea7d2077..afcd83b2a 100644 --- a/tdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <klocale.h> #include <kstandarddirs.h> @@ -168,7 +168,7 @@ TQString getPrintcapFileName() if (pcentry[0] == '|') { // printcap through pipe printcap = locateLocal("tmp","printcap"); - TQString cmd = TQString::fromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap); + TQString cmd = TQString::tqfromLatin1("echo \"all\" | %1 > %2").arg(pcentry.mid(1)).arg(printcap); kdDebug() << "printcap obtained through pipe" << endl << "executing: " << cmd << endl; ::system(cmd.local8Bit()); } @@ -234,7 +234,7 @@ TQString getEtcPrintersConfName() { // standard file not found, try NIS printersconf = locateLocal("tmp","printers.conf"); - TQString cmd = TQString::fromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); + TQString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl; ::system(TQFile::encodeName(cmd)); } diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp index ff7f9d799..d4107d7c7 100644 --- a/tdeprint/lpr/apshandler.cpp +++ b/tdeprint/lpr/apshandler.cpp @@ -28,7 +28,7 @@ #include <tqfile.h> #include <tqdir.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqvaluestack.h> #include <kstandarddirs.h> #include <klocale.h> @@ -50,8 +50,8 @@ bool ApsHandler::validate(PrintcapEntry *entry) KMPrinter* ApsHandler::createPrinter(PrintcapEntry *entry) { - entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); - entry->postcomment = TQString::fromLatin1("# APS%1_END - don't delete this").arg(m_counter); + entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); + entry->postcomment = TQString::tqfromLatin1("# APS%1_END - don't delete this").arg(m_counter); m_counter++; return LprHandler::createPrinter(entry); } @@ -309,8 +309,8 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt) entry->addField("af", Field::String, sd + "/acct"); entry->addField("lf", Field::String, sd + "/log"); entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter"); - entry->comment = TQString::fromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); - entry->postcomment = TQString::fromLatin1("# APS%1_END").arg(m_counter); + entry->comment = TQString::tqfromLatin1("# APS%1_BEGIN:printer%2").arg(m_counter).arg(m_counter); + entry->postcomment = TQString::tqfromLatin1("# APS%1_END").arg(m_counter); m_counter++; return entry; } diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index 77616f6f1..6c4ecc30c 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tqheader.h> #include <klistview.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidgetstack.h> #include <klocale.h> #include <kiconloader.h> diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp index 92928a0cc..70356f23c 100644 --- a/tdeprint/lpr/klprprinterimpl.cpp +++ b/tdeprint/lpr/klprprinterimpl.cpp @@ -41,7 +41,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) if (!printer || m_exepath.isEmpty()) return false; - cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); + cmd = TQString::tqfromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer); if (!opts.isEmpty()) cmd += (" " + opts); @@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value KPrinterImpl::broadcastOption(key,value); if (key == "kde-pagesize") { - QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + QString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); } } diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp index 207035b63..f43a8da2d 100644 --- a/tdeprint/lpr/kmconfiglpr.cpp +++ b/tdeprint/lpr/kmconfiglpr.cpp @@ -22,7 +22,7 @@ #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <klocale.h> #include <kconfig.h> diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 54f987c58..cf4dbbb94 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -231,7 +231,7 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config) DrMain* KMLprManager::loadFileDriver(const TQString& filename) { int p = filename.find('/'); - TQString handler_str = (p != -1 ? filename.left(p) : TQString::fromLatin1("default")); + TQString handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default")); LprHandler *handler = m_handlers.find(handler_str); if (handler) { @@ -422,7 +422,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt) TQString KMLprManager::driverDbCreationProgram() { - return TQString::fromLatin1("make_driver_db_lpr"); + return TQString::tqfromLatin1("make_driver_db_lpr"); } TQString KMLprManager::driverDirectory() diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 614febc9b..c921a803c 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -23,7 +23,7 @@ #include "lprsettings.h" #include <kstandarddirs.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <kdebug.h> #include <klocale.h> diff --git a/tdeprint/lpr/lpchelper.h b/tdeprint/lpr/lpchelper.h index 9a597dc87..b1e20f089 100644 --- a/tdeprint/lpr/lpchelper.h +++ b/tdeprint/lpr/lpchelper.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <textstream.h> +#include <tqtextstream.h> #include "kmprinter.h" class KMJob; diff --git a/tdeprint/lpr/lprhandler.cpp b/tdeprint/lpr/lprhandler.cpp index d6a14e3f7..fcb838bb9 100644 --- a/tdeprint/lpr/lprhandler.cpp +++ b/tdeprint/lpr/lprhandler.cpp @@ -25,7 +25,7 @@ #include "driver.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqvaluestack.h> #include <klocale.h> diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp index 8c0bb5492..1d76cf2f5 100644 --- a/tdeprint/lpr/lprngtoolhandler.cpp +++ b/tdeprint/lpr/lprngtoolhandler.cpp @@ -27,7 +27,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <klocale.h> #include <kdebug.h> #include <kstandarddirs.h> @@ -308,7 +308,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt) TQString work, server, printer, user, passwd; if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) ) { - entry->addField("xfer_options", Field::String, TQString::fromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work)); + entry->addField("xfer_options", Field::String, TQString::tqfromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work)); TQFile authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth"); if (authfile.open(IO_WriteOnly)) { @@ -331,8 +331,8 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt) DrMain *driver = prt->driver(); comment.append("filtertype=IFHP ifhp_options=status@,sync@,pagecount@,waitend@ printerdb_entry="); comment.append(driver->get("driverID")); - entry->addField("ifhp", Field::String, TQString::fromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID"))); - entry->addField("lprngtooloptions", Field::String, TQString::fromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID"))); + entry->addField("ifhp", Field::String, TQString::tqfromLatin1("model=%1,status@,sync@,pagecount@,waitend@").arg(driver->get("driverID"))); + entry->addField("lprngtooloptions", Field::String, TQString::tqfromLatin1("FILTERTYPE=\"IFHP\" IFHP_OPTIONS=\"status@,sync@,pagecount@,waitend@\" PRINTERDB_ENTRY=\"%1\"").arg(driver->get("driverID"))); TQMap<TQString,TQString> opts; TQString optstr; driver->getOptions(opts, false); diff --git a/tdeprint/lpr/lprsettings.cpp b/tdeprint/lpr/lprsettings.cpp index d570d32e9..0c1cec2a9 100644 --- a/tdeprint/lpr/lprsettings.cpp +++ b/tdeprint/lpr/lprsettings.cpp @@ -23,7 +23,7 @@ #include <kconfig.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #define LPDCONF "/etc/lpd.conf" #define PRINTCAP "/etc/printcap" diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index d472274c6..ef2f1584b 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <kprocess.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <stdlib.h> @@ -104,7 +104,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh KURL url ( parsePostpipe(postpipe) ); if (!url.isEmpty()) { - TQString ds = TQString::fromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol()); + TQString ds = TQString::tqfromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol()); prt->setDevice(url.url()); prt->setLocation(ds); } @@ -115,7 +115,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh { prt->setManufacturer(m["make"].toString()); prt->setModel(m["model"].toString()); - prt->setDriverInfo(TQString::fromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString())); + prt->setDriverInfo(TQString::tqfromLatin1("%1 %2 (%3)").arg(prt->manufacturer()).arg(prt->model()).arg(m["driver"].toString())); } } } @@ -247,7 +247,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) } TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { @@ -351,7 +351,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) if (mdriver.isEmpty() || mprinter.isEmpty()) return true; - TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + TQString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { diff --git a/tdeprint/lpr/printcapentry.h b/tdeprint/lpr/printcapentry.h index 2b6037c31..b2d3931a8 100644 --- a/tdeprint/lpr/printcapentry.h +++ b/tdeprint/lpr/printcapentry.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqmap.h> #include <tqstringlist.h> -#include <textstream.h> +#include <tqtextstream.h> /** * @internal diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp index 718ffca21..00016c14f 100644 --- a/tdeprint/lpr/printcapreader.cpp +++ b/tdeprint/lpr/printcapreader.cpp @@ -56,7 +56,7 @@ void PrintcapReader::unputLine(const TQString& s) PrintcapEntry* PrintcapReader::nextEntry() { - if (!m_stream.device()) + if (!m_stream.tqdevice()) return NULL; TQString line, comment, name, fields, buf; diff --git a/tdeprint/lpr/printcapreader.h b/tdeprint/lpr/printcapreader.h index 8d72f370d..2236e5068 100644 --- a/tdeprint/lpr/printcapreader.h +++ b/tdeprint/lpr/printcapreader.h @@ -21,7 +21,7 @@ #define PRINTCAPREADER_H #include <tqstring.h> -#include <textstream.h> +#include <tqtextstream.h> class TQFile; class PrintcapEntry; diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 9798a2228..92ea782e5 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqpainter.h> #include <klistbox.h> -#include <layout.h> +#include <tqlayout.h> #include <kseparator.h> class CJanusWidget::CPage diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp index 1f27483cf..32fb7db11 100644 --- a/tdeprint/management/kmconfigcommand.cpp +++ b/tdeprint/management/kmconfigcommand.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdialog.h> diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index c269f1e35..3bd89a751 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -29,7 +29,7 @@ #include "kmconfigfonts.h" #include "kmconfigjobs.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kiconloader.h> #include <kconfig.h> diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index 09413b6fc..29d5107e0 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -24,7 +24,7 @@ #include <tqgroupbox.h> #include <tqlineedit.h> #include <tqtoolbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqapplication.h> diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index a11e137d2..183d0b621 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -21,7 +21,7 @@ #include <tqgroupbox.h> #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqheader.h> #include <tqlabel.h> #include <tqcheckbox.h> diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index 1ab5456d8..40d187c3c 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -19,7 +19,7 @@ #include "kmconfiggeneral.h" -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 638839e74..1088e1b3a 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -20,7 +20,7 @@ #include "kmconfigjobs.h" #include <tqgroupbox.h> -#include <layout.h> +#include <tqlayout.h> #include <knuminput.h> #include <klocale.h> diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index c7f1c565a..cd777ec7a 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -20,7 +20,7 @@ #include "kmconfigpreview.h" #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqlabel.h> diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 3fab5929e..1a89d0a8e 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -109,7 +109,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena { if (!m_dlg) { - m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); + m_dlg = new TQProgressDialog(parent->tqtopLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 906338b52..6fbab45ec 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqfileinfo.h> #include <kstandarddirs.h> #include <kapplication.h> @@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB() TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - TQString filename = locateLocal("data",TQString::fromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + TQString filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 8fadc8146..e9c490206 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -29,7 +29,7 @@ #include <kcursor.h> #include <tqapplication.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqstrlist.h> @@ -105,7 +105,7 @@ void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model) // try by stripping the manufacturer name from // the beginning of the model string. This is // often the case with PPD files - item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1(""))); + item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1(""))); if (item) m_model->setCurrentItem(item); } diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 0978c0782..905f4d248 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -99,7 +99,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setText(TQString::null); setText(p->name()); } - setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name())); + setKey(TQString::tqfromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name())); m_isclass = p->isClass(false); } if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap)) @@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setPixmap(SmallIcon(m_pixmap, 0, iconstate)); } //if (update) - // repaint(); + // tqrepaint(); setDiscarded(false); } @@ -180,7 +180,7 @@ void KMIconView::setPrinterList(TQPtrList<KMPrinter> *list) } for (uint i=0; i<m_items.count(); i++) - if (m_items.at(i)->isDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { delete m_items.take(i); i--; diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp index 449f71d47..2c3e7a2fa 100644 --- a/tdeprint/management/kminfopage.cpp +++ b/tdeprint/management/kminfopage.cpp @@ -22,7 +22,7 @@ #include <tqpixmap.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kiconloader.h> #include <kseparator.h> @@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) } else { - m_title->setText(TQString::fromLatin1("<b>%1</b>").arg(p->name())); + m_title->setText(TQString::tqfromLatin1("<b>%1</b>").arg(p->name())); m_titlepixmap->setPixmap(SmallIcon(p->pixmap())); if (p->isImplicit()) m_type->setText(i18n("Implicit class")); else if (p->isClass(false)) diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index b571881c0..25c037516 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -26,7 +26,7 @@ #include "kprinter.h" #include "kmtimer.h" -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <tqwhatsthis.h> #include <tqpushbutton.h> diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 465e31dd3..9fca665a7 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -46,7 +46,7 @@ #include <twin.h> #include <kio/netaccess.h> #include <tqtimer.h> -#include <layout.h> +#include <tqlayout.h> #include <stdlib.h> #include <tqlineedit.h> #include <kdialogbase.h> @@ -398,7 +398,7 @@ void KMJobViewer::updateJobs() } for (uint i=0; i<m_items.count(); i++) - if (m_items.at(i)->isDiscarded()) + 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/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 4bddf9203..4332a8678 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -89,7 +89,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) } setDiscarded(false); if (update) - repaint(); + tqrepaint(); } void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a) @@ -216,7 +216,7 @@ void KMListView::setPrinterList(TQPtrList<KMPrinter> *list) TQPtrList<KMListViewItem> deleteList; deleteList.setAutoDelete(true); for (uint i=0; i<m_items.count(); i++) - if (m_items.at(i)->isDiscarded()) + if (m_items.tqat(i)->isDiscarded()) { // instance items are put in front of the list // so that they are destroyed first diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index cd58ff3ce..f5f905af3 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -40,7 +40,7 @@ #include <tqtimer.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpopupmenu.h> #include <kmessagebox.h> #include <kaction.h> diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index 290309c70..59911ff34 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -24,7 +24,7 @@ #include "kmtimer.h" #include "kmmanager.h" -#include <layout.h> +#include <tqlayout.h> #include <tqpopupmenu.h> #include <kaction.h> #include <klocale.h> diff --git a/tdeprint/management/kmpropbackend.cpp b/tdeprint/management/kmpropbackend.cpp index 4ebfc9e80..98004d2ed 100644 --- a/tdeprint/management/kmpropbackend.cpp +++ b/tdeprint/management/kmpropbackend.cpp @@ -22,7 +22,7 @@ #include "kmwizard.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMPropBackend::KMPropBackend(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp index 123ab0a3e..9c7808199 100644 --- a/tdeprint/management/kmpropcontainer.cpp +++ b/tdeprint/management/kmpropcontainer.cpp @@ -21,7 +21,7 @@ #include "kmpropwidget.h" #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kseparator.h> #include <kguiitem.h> diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp index bddbd7271..55daf0ed5 100644 --- a/tdeprint/management/kmpropdriver.cpp +++ b/tdeprint/management/kmpropdriver.cpp @@ -22,7 +22,7 @@ #include "kmwizard.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmpropgeneral.cpp b/tdeprint/management/kmpropgeneral.cpp index 0a7bab776..c55603da9 100644 --- a/tdeprint/management/kmpropgeneral.cpp +++ b/tdeprint/management/kmpropgeneral.cpp @@ -24,7 +24,7 @@ #include "kmmanager.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp index 3d8999436..4efbcf547 100644 --- a/tdeprint/management/kmpropmembers.cpp +++ b/tdeprint/management/kmpropmembers.cpp @@ -21,15 +21,15 @@ #include "kmprinter.h" #include "kmwizard.h" -#include <textview.h> -#include <layout.h> +#include <tqtextview.h> +#include <tqlayout.h> #include <klocale.h> KMPropMembers::KMPropMembers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { m_members = new TQTextView(this); - m_members->setPaper(colorGroup().background()); + m_members->setPaper(tqcolorGroup().background()); m_members->setFrameStyle(TQFrame::NoFrame); TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index d4dbc97e6..6569f3f83 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -31,7 +31,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqgroupbox.h> #include <klocale.h> @@ -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/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp index 17c519435..e39b52f8d 100644 --- a/tdeprint/management/kmwbackend.cpp +++ b/tdeprint/management/kmwbackend.cpp @@ -21,7 +21,7 @@ #include "kmwizard.h" #include "kmprinter.h" -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> @@ -102,7 +102,7 @@ void KMWBackend::updatePrinter(KMPrinter *p) else p->setType(KMPrinter::Printer); p->setOption("kde-backend",TQString::number(ID)); TQString s = m_buttons->selected()->text(); - s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1("")); + s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1("")); p->setOption("kde-backend-description",s); setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error)); } diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index 0232c42dd..a87388a6f 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -23,7 +23,7 @@ #include "kmmanager.h" #include "kmprinter.h" -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqtoolbutton.h> #include <klistbox.h> diff --git a/tdeprint/management/kmwdriver.cpp b/tdeprint/management/kmwdriver.cpp index 1a6720224..58793c192 100644 --- a/tdeprint/management/kmwdriver.cpp +++ b/tdeprint/management/kmwdriver.cpp @@ -23,7 +23,7 @@ #include "kmdriverdbwidget.h" #include "kmdriverdb.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMWDriver::KMWDriver(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index fbfe2c4a0..e3d253660 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -24,7 +24,7 @@ #include "kmdriverdb.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <kpushbutton.h> #include <klistbox.h> #include <klocale.h> @@ -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/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index baa30a23a..545d3b94d 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kapplication.h> #include <kmessagebox.h> diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp index 7daa793c0..54294fb13 100644 --- a/tdeprint/management/kmwend.cpp +++ b/tdeprint/management/kmwend.cpp @@ -22,9 +22,9 @@ #include "kmwizard.h" #include "util.h" -#include <textview.h> +#include <tqtextview.h> #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> KMWEnd::KMWEnd(TQWidget *parent, const char *name) : KMWizardPage(parent,name) @@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name) void KMWEnd::initPrinter(KMPrinter *p) { TQString txt; - TQString s(TQString::fromLatin1("<li><u>%1</u>: %2</li>")); + TQString s(TQString::tqfromLatin1("<li><u>%1</u>: %2</li>")); int ID = p->option("kde-backend").toInt(); // general information - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("General"))); txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description"))); txt.append(s.arg(i18n("Name")).arg(p->name())); txt.append(s.arg(i18n("Location")).arg(p->location())); @@ -56,9 +56,9 @@ void KMWEnd::initPrinter(KMPrinter *p) if (ID == KMWizard::Class) { // class members - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Members"))); TQStringList m(p->members()); - TQString s1(TQString::fromLatin1("<li>%1</li>")); + TQString s1(TQString::tqfromLatin1("<li>%1</li>")); for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it) txt.append(s1.arg(*it)); txt.append("</ul><br>"); @@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p) else { // backend information - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Backend"))); KURL url ( p->device() ); switch (ID) { @@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p) if (p->option("kde-driver") == "raw" || p->driver()) { // driver information - txt.append(TQString::fromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver"))); + txt.append(TQString::tqfromLatin1("<b>%1</b><ul type=circle>").arg(i18n("Driver"))); if (p->option("kde-driver") == "raw") txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer"))); else diff --git a/tdeprint/management/kmwfile.cpp b/tdeprint/management/kmwfile.cpp index 98969df67..32da27c03 100644 --- a/tdeprint/management/kmwfile.cpp +++ b/tdeprint/management/kmwfile.cpp @@ -22,7 +22,7 @@ #include "kmprinter.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <kurlrequester.h> #include <klocale.h> @@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg) void KMWFile::updatePrinter(KMPrinter *p) { - TQString dev = TQString::fromLatin1("file:%1").arg(m_url->url()); + TQString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url()); p->setDevice(dev); } diff --git a/tdeprint/management/kmwinfobase.cpp b/tdeprint/management/kmwinfobase.cpp index fbe1d2b02..993576334 100644 --- a/tdeprint/management/kmwinfobase.cpp +++ b/tdeprint/management/kmwinfobase.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <layout.h> +#include <tqlayout.h> KMWInfoBase::KMWInfoBase(int n, TQWidget *parent, const char *name) : KMWizardPage(parent,name) @@ -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/tdeprint/management/kmwinfopage.cpp b/tdeprint/management/kmwinfopage.cpp index 7a23dd6f9..1e9652e93 100644 --- a/tdeprint/management/kmwinfopage.cpp +++ b/tdeprint/management/kmwinfopage.cpp @@ -21,7 +21,7 @@ #include "kmwizard.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kactivelabel.h> diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp index 38aac1cee..5dc915572 100644 --- a/tdeprint/management/kmwizard.cpp +++ b/tdeprint/management/kmwizard.cpp @@ -27,7 +27,7 @@ #include <tqlabel.h> #include <tqwidgetstack.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> #include <kseparator.h> diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index 49ab109c5..7b56b2deb 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -24,7 +24,7 @@ #include "kmmanager.h" #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqlabel.h> #include <tqheader.h> diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp index 352a075c5..cce4c7b5a 100644 --- a/tdeprint/management/kmwlpd.cpp +++ b/tdeprint/management/kmwlpd.cpp @@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg) void KMWLpd::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); + QString dev = TQString::tqfromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); p->setDevice(dev); } diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp index 8021aecf6..40dc105d5 100644 --- a/tdeprint/management/kmwpassword.cpp +++ b/tdeprint/management/kmwpassword.cpp @@ -25,7 +25,7 @@ #include <tqlineedit.h> #include <tqvbuttongroup.h> #include <tqradiobutton.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kcursor.h> @@ -121,7 +121,7 @@ void KMWPassword::updatePrinter(KMPrinter *p) p->setOption( "kde-password", TQString::null ); break; case 1: - p->setOption( "kde-login", TQString::fromLatin1( "guest" ) ); + p->setOption( "kde-login", TQString::tqfromLatin1( "guest" ) ); p->setOption( "kde-password", TQString::null ); break; case 2: diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp index 3056ae962..e76240cf8 100644 --- a/tdeprint/management/kmwsmb.cpp +++ b/tdeprint/management/kmwsmb.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqlabel.h> diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index 4d7468e70..98aad76a5 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <tqlabel.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kiconloader.h> #include <kseparator.h> @@ -88,7 +88,7 @@ KMWSocket::~KMWSocket() void KMWSocket::updatePrinter(KMPrinter *p) { - TQString dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); + TQString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); p->setDevice(dev); } diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp index 11c9a9fdd..7b77d1d82 100644 --- a/tdeprint/management/kmwsocketutil.cpp +++ b/tdeprint/management/kmwsocketutil.cpp @@ -28,7 +28,7 @@ #include <tqcombobox.h> #include <tqpushbutton.h> #include <kmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqregexp.h> #include <knumvalidator.h> @@ -53,7 +53,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na TQLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); TQLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); TQLineEdit *mm = new TQLineEdit(dummy); - mm->setText(TQString::fromLatin1(".[0-255]")); + mm->setText(TQString::tqfromLatin1(".[0-255]")); mm->setReadOnly(true); mm->setFixedWidth(fontMetrics().width(mm->text())+10); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index 38cbfe44b..3b42b71d7 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -21,7 +21,7 @@ #include "driver.h" #include "kxmlcommand.h" -#include <layout.h> +#include <tqlayout.h> #include <tqheader.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -52,8 +52,8 @@ TQString generateId(const TQMap<TQString, DrBase*>& map) { int index(-1); - while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ; - return TQString::fromLatin1("item%1").arg(index); + while (map.contains(TQString::tqfromLatin1("item%1").arg(++index))) ; + return TQString::tqfromLatin1("item%1").arg(index); } TQListViewItem* findPrev(TQListViewItem *item) @@ -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/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index cb1bcb3d7..6f2b4485e 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -26,7 +26,7 @@ #include <kpushbutton.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqlineedit.h> #include <kinputdialog.h> diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index 1424d607b..a5ca72071 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -23,7 +23,7 @@ #include <tqprogressbar.h> #include <kpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqlabel.h> #include <tqcombobox.h> @@ -339,7 +339,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * TQLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); TQLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); TQLineEdit *mm = new TQLineEdit(dummy); - mm->setText(TQString::fromLatin1(".[0-255]")); + mm->setText(TQString::tqfromLatin1(".[0-255]")); mm->setReadOnly(true); mm->setFixedWidth(fontMetrics().width(mm->text())+10); diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index 5c1fa279c..fde3a3451 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -31,7 +31,7 @@ #include <kcursor.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <cstdlib> diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index afeb1a229..53790a112 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -24,7 +24,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqwhatsthis.h> #include <klocale.h> diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp index 82f694707..a1b6ddf29 100644 --- a/tdeprint/messagewindow.cpp +++ b/tdeprint/messagewindow.cpp @@ -20,7 +20,7 @@ #include "messagewindow.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqpixmap.h> #include <tqhbox.h> diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp index 104eb28df..8fa09ab95 100644 --- a/tdeprint/plugincombobox.cpp +++ b/tdeprint/plugincombobox.cpp @@ -23,7 +23,7 @@ #include <tqcombobox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <tqwhatsthis.h> diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 241c53dbf..7e8542c22 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -106,7 +106,7 @@ void PosterPreview::drawContents( TQPainter *painter ) TQPixmap pix( width(), height() ); TQPainter *p = new TQPainter( &pix ); - p->fillRect( 0, 0, width(), height(), colorGroup().background() ); + p->fillRect( 0, 0, width(), height(), tqcolorGroup().background() ); if ( isEnabled() ) { @@ -120,7 +120,7 @@ void PosterPreview::drawContents( TQPainter *painter ) int x = ( width()-richtext.widthUsed() )/2, y = ( height()-richtext.height() )/2; x = QMAX( x, 0 ); y = QMAX( y, 0 ); - richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), colorGroup() ); + richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), tqcolorGroup() ); m_boundingrect = TQRect(); } else diff --git a/tdeprint/rlpr/kmconfigproxy.cpp b/tdeprint/rlpr/kmconfigproxy.cpp index 38ccf62e6..0f8ca3743 100644 --- a/tdeprint/rlpr/kmconfigproxy.cpp +++ b/tdeprint/rlpr/kmconfigproxy.cpp @@ -20,7 +20,7 @@ #include "kmconfigproxy.h" #include "kmproxywidget.h" -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMConfigProxy::KMConfigProxy(TQWidget *parent) diff --git a/tdeprint/rlpr/kmproprlpr.cpp b/tdeprint/rlpr/kmproprlpr.cpp index 022ab80f7..62fe97827 100644 --- a/tdeprint/rlpr/kmproprlpr.cpp +++ b/tdeprint/rlpr/kmproprlpr.cpp @@ -22,7 +22,7 @@ #include "kmwizard.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name) diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index 9c2920795..94ad60340 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -22,7 +22,7 @@ #include <tqlineedit.h> #include <tqlabel.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvalidator.h> #include <klocale.h> #include <kconfig.h> @@ -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); diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp index 553d9be13..64f6acde1 100644 --- a/tdeprint/rlpr/kmrlprmanager.cpp +++ b/tdeprint/rlpr/kmrlprmanager.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqmap.h> #include <kstandarddirs.h> @@ -116,7 +116,7 @@ void KMRlprManager::loadPrintersConf(const TQString& filename) if (w.count() > 4) printer->setLocation(w[4]); } printer->setState(KMPrinter::Idle); - printer->setDevice(TQString::fromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); + printer->setDevice(TQString::tqfromLatin1("lpd://%1/%2").arg(w[1]).arg(w[2])); addPrinter(printer); } diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp index e211dbd44..70defc27b 100644 --- a/tdeprint/rlpr/kmwrlpr.cpp +++ b/tdeprint/rlpr/kmwrlpr.cpp @@ -23,8 +23,8 @@ #include <tqdir.h> #include <tqfile.h> -#include <textstream.h> -#include <layout.h> +#include <tqtextstream.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqheader.h> @@ -53,7 +53,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) m_view = new KListView(this); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); - m_view->addColumn(TQString::fromLatin1("")); + m_view->addColumn(TQString::tqfromLatin1("")); m_view->header()->hide(); m_view->setRootIsDecorated(true); m_view->setSorting(0); @@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p) void KMWRlpr::updatePrinter(KMPrinter *p) { - TQString uri = TQString::fromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text()); + TQString uri = TQString::tqfromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text()); p->setDevice(uri); p->setOption("host",m_host->text()); p->setOption("queue",m_queue->text()); diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 2833c9598..a6b0e5986 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -54,7 +54,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) return false; } - cmd = TQString::fromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); + cmd = TQString::tqfromLatin1("%1 -H %2 -P %3 -\\#%4").arg(exestr).arg(quote(host)).arg(quote(queue)).arg(printer->numCopies()); // proxy settings KConfig *conf = KMFactory::self()->printConfig(); diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index 1b5cc691a..1ace082a4 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -101,8 +101,8 @@ bool KdeprintChecker::checkConfig(const KURL& url) const char* const *p = config_stddirs; while (*p) { - // kdDebug( 500 ) << "checkConfig() with " << TQString::fromLatin1( *p ) + f << endl; - if ( TQFile::exists( TQString::fromLatin1( *p ) + f ) ) + // kdDebug( 500 ) << "checkConfig() with " << TQString::tqfromLatin1( *p ) + f << endl; + if ( TQFile::exists( TQString::tqfromLatin1( *p ) + f ) ) { state = true; break; diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 1c9a2969a..2711ffdbf 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -34,7 +34,7 @@ #include <kstandarddirs.h> #include <twin.h> #include <kapplication.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqregexp.h> diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 443cc89e8..20fc3d12e 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -78,7 +78,7 @@ void drawFonts( TQPainter *p ) // -// This function draws some shapes +// This function draws some tqshapes // void drawShapes( TQPainter *p ) @@ -115,7 +115,7 @@ struct DrawThing { DrawThing ourDrawFunctions[] = { { drawColorWheel, "Draw color wheel" }, { drawFonts, "Draw fonts" }, - { drawShapes, "Draw shapes" }, + { drawShapes, "Draw tqshapes" }, { 0, 0 } }; diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index 87603ceb5..bee755d20 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -19,8 +19,8 @@ #include <tqtoolbutton.h> #include <tqiconset.h> #include <tqfile.h> -#include <textstream.h> -#include <stylesheet.h> +#include <tqtextstream.h> +#include <tqstylesheet.h> #include <tqmessagebox.h> #include <tqfiledialog.h> #include <tqapplication.h> @@ -278,7 +278,7 @@ void HelpWindow::print() TQRect view( body ); int page = 1; do { - richText.draw( &p, body.left(), body.top(), view, colorGroup() ); + richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() ); view.moveBy( 0, body.height() ); p.translate( 0 , -body.height() ); p.setFont( font ); diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h index 5c4a16c62..c444b8144 100644 --- a/tdeprint/tests/helpwindow.h +++ b/tdeprint/tests/helpwindow.h @@ -12,7 +12,7 @@ #define HELPWINDOW_H #include <kmainwindow.h> -#include <textbrowser.h> +#include <tqtextbrowser.h> #include <tqstringlist.h> #include <tqmap.h> #include <tqdir.h> diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index a89bcd13a..a1dc6b5e0 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -11,7 +11,7 @@ #include "helpwindow.h" #include <kapplication.h> #include <tqwindowsstyle.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <stdlib.h> diff --git a/tdeprint/tests/richpage.cpp b/tdeprint/tests/richpage.cpp index d611e4ecd..30da712de 100644 --- a/tdeprint/tests/richpage.cpp +++ b/tdeprint/tests/richpage.cpp @@ -4,7 +4,7 @@ #include <tqspinbox.h> #include <tqcombobox.h> #include <tqfontdatabase.h> -#include <layout.h> +#include <tqlayout.h> RichPage::RichPage(TQWidget *parent, const char *name) : KPrintDialogPage(parent,name) @@ -23,7 +23,7 @@ RichPage::RichPage(TQWidget *parent, const char *name) QFontDatabase db; QStringList fonts = db.families(); fontname_->insertStringList(fonts); - fontname_->setCurrentItem(fonts.findIndex(TQString::fromLatin1("times"))); + fontname_->setCurrentItem(fonts.findIndex(TQString::tqfromLatin1("times"))); if (fontname_->currentItem() < 0) fontname_->setCurrentItem(0); QLabel *l1 = new TQLabel("Margin:",this); diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index 929a9085b..e4bc1e6f2 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -20,7 +20,7 @@ #include "escpwidget.h" #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqaccel.h> diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp index a27b68289..45213f41c 100644 --- a/tdeprint/treecombobox.cpp +++ b/tdeprint/treecombobox.cpp @@ -102,7 +102,7 @@ void TreeListBoxItem::paint(TQPainter *p) if (m_depth > 0) { TQPen oldPen = p->pen(); - p->setPen(listBox()->colorGroup().mid()); + p->setPen(listBox()->tqcolorGroup().mid()); TreeListBoxItem *item = this; int s = xo-stepSize()/2; |