From 628043be55ddd2f534411d028e4f68c8fe4eaabb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:29:23 -0600 Subject: Rename old tq methods that no longer need a unique name --- tdeprint/kprinter/printwrapper.cpp | 2 +- tdeprint/slave/kio_print.cpp | 14 +++++++------- tdeprint/tdeprintfax/faxctrl.cpp | 8 ++++---- tdeprint/tdeprintfax/tdeprintfax.cpp | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tdeprint') diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index effa3dea3..e0862271c 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0) void showmsgconsole(const TQString& msg, int type = 0) { - TQString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); + TQString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); kdDebug() << errmsg << msg << endl; } diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 71c8779ef..12ecb8f60 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content)) + if (!loadTemplate(TQString::fromLatin1("printer.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template")); return; @@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("class.template"), content)) + if (!loadTemplate(TQString::fromLatin1("class.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template")); return; @@ -686,7 +686,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) TQStringList members(printer->members()); for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { - memberContent.append(TQString::tqfromLatin1("
  • %2
    • \n").arg(*it).arg(*it)); + memberContent.append(TQString::fromLatin1("
  • %2
    • \n").arg(*it).arg(*it)); } memberContent.append("\n"); @@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content)) + if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { - TQFile f(locate("data", TQString::tqfromLatin1("tdeprint/template/")+filename)); + TQFile f(locate("data", TQString::fromLatin1("tdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { TQTextStream t(&f); @@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) } TQString content; - if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content)) + if (!loadTemplate(TQString::fromLatin1("jobs.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content)) + if (!loadTemplate(TQString::fromLatin1("driver.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 171077eea..075b435d2 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -291,7 +291,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa if (v.isEmpty()) v = getenv("FAXSERVER"); if (v.isEmpty()) - v = TQString::tqfromLatin1("localhost"); + v = TQString::fromLatin1("localhost"); v = processTag( match, v ); } else if (isTag( match, "%page" )) @@ -491,7 +491,7 @@ void FaxCtrl::filter() m_tempfiles.append(tmp); m_process->clearArguments(); *m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters")) - << TQString::tqfromLatin1("--mime=%1").arg(mimeType) + << TQString::fromLatin1("--mime=%1").arg(mimeType) << "-p" << pageSize() << KProcess::quote(m_files[0]) << KProcess::quote(tmp); if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) @@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog() KPrinter printer; printer.setDocName( i18n( "Fax log" ) ); printer.setDocFileName( "faxlog" ); - if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) ) + if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) ) { TQPainter painter( &printer ); TQPaintDeviceMetrics metric( &printer ); @@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog() richText.setWidth( &painter, body.width() ); do { - richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() ); + richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() ); view.moveBy( 0, body.height() ); painter.translate( 0, -body.height() ); if ( view.top() >= richText.height() ) diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 24ad58a0e..047b4cb3c 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -429,14 +429,14 @@ void KdeprintFax::updateState() if ( !m_cover->isEnabled() ) m_cover->setChecked(false); m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked()); - //m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background)); + //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background)); if (!m_comment->isEnabled()) { m_comment->setText(""); - m_comment->setPaper( tqcolorGroup().background() ); + m_comment->setPaper( colorGroup().background() ); } else - m_comment->setPaper( tqcolorGroup().base() ); + m_comment->setPaper( colorGroup().base() ); /* m_enterprise->setEnabled(cmd.find("%enterprise") != -1); if (!m_enterprise->isEnabled()) -- cgit v1.2.1