diff options
Diffstat (limited to 'kdeprint')
-rw-r--r-- | kdeprint/descriptions/sortthem.cpp | 2 | ||||
-rw-r--r-- | kdeprint/kdeprint_part/printpart.cpp | 4 | ||||
-rw-r--r-- | kdeprint/kdeprint_part/printpart.h | 2 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/confgeneral.cpp | 20 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/confgeneral.h | 4 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/confsystem.cpp | 8 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/defcmds.cpp | 2 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/faxab.cpp | 2 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/faxctrl.cpp | 40 | ||||
-rw-r--r-- | kdeprint/kdeprintfax/kdeprintfax.cpp | 6 | ||||
-rw-r--r-- | kdeprint/kprinter/printwrapper.cpp | 4 | ||||
-rw-r--r-- | kdeprint/slave/kio_print.cpp | 26 |
12 files changed, 60 insertions, 60 deletions
diff --git a/kdeprint/descriptions/sortthem.cpp b/kdeprint/descriptions/sortthem.cpp index 1e1a37d93..9adc284b1 100644 --- a/kdeprint/descriptions/sortthem.cpp +++ b/kdeprint/descriptions/sortthem.cpp @@ -15,7 +15,7 @@ char buf[1024]; while (!feof(stdin)) { char *cline = fgets(buf, 1000, stdin); if (!cline) break; - if (!have.tqcontains(cline)) { + if (!have.contains(cline)) { have << cline; fprintf(stdout, "%s", cline); } diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp index 8b1e7169e..c8d6ccb15 100644 --- a/kdeprint/kdeprint_part/printpart.cpp +++ b/kdeprint/kdeprint_part/printpart.cpp @@ -33,7 +33,7 @@ typedef KParts::GenericFactory<PrintPart> PrintPartFactory; K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory ) -PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ , +PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , TQObject *parent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadOnlyPart(parent, name) @@ -42,7 +42,7 @@ PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ , instance()->iconLoader()->addAppDir("kdeprint"); m_extension = new PrintPartExtension(this); - m_view = new KMMainView(tqparentWidget, "MainView", actionCollection()); + m_view = new KMMainView(parentWidget, "MainView", actionCollection()); m_view->setFocusPolicy(TQWidget::ClickFocus); m_view->enableToolbar(false); setWidget(m_view); diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h index f89a3574b..c84fed1cc 100644 --- a/kdeprint/kdeprint_part/printpart.h +++ b/kdeprint/kdeprint_part/printpart.h @@ -31,7 +31,7 @@ class PrintPart : public KParts::ReadOnlyPart { Q_OBJECT public: - PrintPart(TQWidget *tqparentWidget, const char *widgetName, + PrintPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ); virtual ~PrintPart(); diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp index e19cdf94b..757c54af7 100644 --- a/kdeprint/kdeprintfax/confgeneral.cpp +++ b/kdeprint/kdeprintfax/confgeneral.cpp @@ -45,11 +45,11 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) QLabel *m_numberlabel = new TQLabel(i18n("N&umber:"), this); m_numberlabel->setBuddy(m_number); KSeparator *sep = new KSeparator( this ); - m_tqreplace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this ); - m_tqreplace_int_char_val = new TQLineEdit( this ); - m_tqreplace_int_char_val->setEnabled( false ); + m_replace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this ); + m_replace_int_char_val = new TQLineEdit( this ); + m_replace_int_char_val->setEnabled( false ); - connect( m_tqreplace_int_char, TQT_SIGNAL( toggled( bool ) ), m_tqreplace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); QGridLayout *l0 = new TQGridLayout(this, 6, 2, 10, 10); l0->setColStretch(1, 1); @@ -63,8 +63,8 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) l0->addMultiCellWidget( sep, 3, 3, 0, 1 ); TQHBoxLayout *l1 = new TQHBoxLayout( this, 0, 10 ); l0->addMultiCellLayout( l1, 4, 4, 0, 1 ); - l1->addWidget( m_tqreplace_int_char ); - l1->addWidget( m_tqreplace_int_char_val ); + l1->addWidget( m_replace_int_char ); + l1->addWidget( m_replace_int_char_val ); } void ConfGeneral::load() @@ -74,8 +74,8 @@ void ConfGeneral::load() m_name->setText(conf->readEntry("Name", getenv("USER"))); m_number->setText(conf->readEntry("Number")); m_company->setText(conf->readEntry("Company")); - m_tqreplace_int_char->setChecked( conf->readBoolEntry( "ReplaceIntChar", false ) ); - m_tqreplace_int_char_val->setText( conf->readEntry( "ReplaceIntCharVal" ) ); + m_replace_int_char->setChecked( conf->readBoolEntry( "ReplaceIntChar", false ) ); + m_replace_int_char_val->setText( conf->readEntry( "ReplaceIntCharVal" ) ); } void ConfGeneral::save() @@ -85,6 +85,6 @@ void ConfGeneral::save() conf->writeEntry("Name", m_name->text()); conf->writeEntry("Number", m_number->text()); conf->writeEntry("Company", m_company->text()); - conf->writeEntry( "ReplaceIntChar", m_tqreplace_int_char->isChecked() ); - conf->writeEntry( "ReplaceIntCharVal", m_tqreplace_int_char_val->text() ); + conf->writeEntry( "ReplaceIntChar", m_replace_int_char->isChecked() ); + conf->writeEntry( "ReplaceIntCharVal", m_replace_int_char_val->text() ); } diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h index da5bba2e0..5a3ee6ca9 100644 --- a/kdeprint/kdeprintfax/confgeneral.h +++ b/kdeprint/kdeprintfax/confgeneral.h @@ -36,8 +36,8 @@ public: private: QLineEdit *m_name, *m_company, *m_number; - TQCheckBox *m_tqreplace_int_char; - TQLineEdit *m_tqreplace_int_char_val; + TQCheckBox *m_replace_int_char; + TQLineEdit *m_replace_int_char_val; }; #endif diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp index 0a0a4968d..51ea326c8 100644 --- a/kdeprint/kdeprintfax/confsystem.cpp +++ b/kdeprint/kdeprintfax/confsystem.cpp @@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID) m_commands[m_current] = m_command->text(); m_current = ID; if (ID == EFAX_ID) - m_device->tqparentWidget()->show(); + m_device->parentWidget()->show(); else - m_device->tqparentWidget()->hide(); + m_device->parentWidget()->hide(); if (ID == HYLAFAX_ID) - m_server->tqparentWidget()->show(); + m_server->parentWidget()->show(); else - m_server->tqparentWidget()->hide(); + m_server->parentWidget()->hide(); m_command->setText(m_commands[m_current]); } diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp index f0f5cfdd5..09631b51d 100644 --- a/kdeprint/kdeprintfax/defcmds.cpp +++ b/kdeprint/kdeprintfax/defcmds.cpp @@ -32,7 +32,7 @@ TQString defaultCommand(const TQString& cmd) QString exe = KStandardDirs::findExe(r.cap(1)); if (exe.isEmpty()) exe = "/usr/bin/"+r.cap(1); - str.tqreplace(p, r.matchedLength(), exe); + str.replace(p, r.matchedLength(), exe); } return str; } diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp index 49a9be89e..ebd6b9cb2 100644 --- a/kdeprint/kdeprintfax/faxab.cpp +++ b/kdeprint/kdeprintfax/faxab.cpp @@ -163,7 +163,7 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent /* number = kab.m_fax->currentText(); name = kab.m_name->currentText(); - if (kab.m_entries.tqcontains(name)) + if (kab.m_entries.contains(name)) { enterprise = kab.m_entries[name][0]; } diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp index 6638c1b7f..1d1cd1fa5 100644 --- a/kdeprint/kdeprintfax/faxctrl.cpp +++ b/kdeprint/kdeprintfax/faxctrl.cpp @@ -87,9 +87,9 @@ static TQString stripNumber( const TQString& s ) // removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools) TQString strip_s = s; - strip_s.tqreplace( TQRegExp( "[^\\d+*#]" ), "" ); + strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" ); if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) ) - strip_s.tqreplace( "+", conf->readEntry( "ReplaceIntCharVal" ) ); + strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) ); return strip_s; } @@ -172,7 +172,7 @@ static TQString processTag( const TQString& match, const TQString& value ) if ( match[ p+1 ] == '{' ) { v = match.mid( p+2, match.length()-p-3 ); - v.tqreplace( "@@", quote( value ) ); + v.replace( "@@", quote( value ) ); } else v = ( "-" + match.mid( p+1 ) + " " + quote( value ) ); @@ -188,9 +188,9 @@ static bool isTag( const TQString& m, const TQString& t ) return ( m == t || m.startsWith( t+"_" ) ); } -static TQString tqreplaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() ) +static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() ) { - // unquote variables (they will be tqreplaced with quoted values later) + // unquote variables (they will be replaced with quoted values later) TQValueStack<bool> stack; KConfig *conf = KGlobal::config(); @@ -244,7 +244,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint else if (cmd[i]=='`') { // Replace all `...` with safer $(...) - cmd.tqreplace (i, 1, "$("); + cmd.replace (i, 1, "$("); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); for ( int i2=re_backticks.search(cmd,i+2); i2!=-1; @@ -253,7 +253,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint { if (cmd[i2] == '`') { - cmd.tqreplace (i2, 1, ")"); + cmd.replace (i2, 1, ")"); i2=cmd.length(); // leave loop } else @@ -291,7 +291,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint 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" )) @@ -343,7 +343,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint else if (issinglequote) v="'"+v+"'"; - cmd.tqreplace (i, match.length(), v); + cmd.replace (i, match.length(), v); i+=v.length(); } } @@ -375,8 +375,8 @@ bool FaxCtrl::send(KdeprintFax *f) if (m_command.isEmpty()) return false; - // tqreplace tags common to all fax "operations" - m_command = tqreplaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f ); + // replace tags common to all fax "operations" + m_command = replaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f ); m_log = TQString::null; m_filteredfiles.clear(); @@ -447,11 +447,11 @@ void FaxCtrl::sendFax() { if ( m_command.find( "%files" ) != -1 ) { - // tqreplace %files tag + // replace %files tag QString filestr; for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it) filestr += (quote(*it)+" "); - m_command.tqreplace("%files", filestr); + m_command.replace("%files", filestr); } if ( !m_faxlist.isEmpty() ) @@ -461,7 +461,7 @@ void FaxCtrl::sendFax() addLogTitle( i18n( "Sending fax to %1 (%2)" ).arg( item.number ).arg( item.name ) ); - TQString cmd = tqreplaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item ); + TQString cmd = replaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item ); m_process->clearArguments(); *m_process << cmd; addLog(i18n("Sending to fax using: %1").arg(cmd)); @@ -491,7 +491,7 @@ void FaxCtrl::filter() m_tempfiles.append(tmp); m_process->clearArguments(); *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/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)) @@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *) } else { - KWin::activateWindow(m_logview->tqparentWidget()->winId()); + KWin::activateWindow(m_logview->parentWidget()->winId()); } } @@ -605,7 +605,7 @@ void FaxCtrl::slotCloseLog() QTextEdit *view = m_logview; m_logview = 0; if (obj && obj->inherits("QPushButton")) - delete view->tqparentWidget(); + delete view->parentWidget(); kdDebug() << "slotClose()" << endl; } } @@ -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 ); @@ -625,7 +625,7 @@ void FaxCtrl::slotPrintLog() //TQString txt = m_logview->text(); TQString txt = m_log; - txt.tqreplace( '\n', "<br>" ); + txt.replace( '\n', "<br>" ); txt.prepend( "<h2>" + i18n( "KDEPrint Fax Tool Log" ) + "</h2>" ); kdDebug() << "Log: " << txt << endl; @@ -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/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp index 81f144b9a..a5f66992b 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.cpp +++ b/kdeprint/kdeprintfax/kdeprintfax.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()) diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp index 25ec75e28..f5e67f96e 100644 --- a/kdeprint/kprinter/printwrapper.cpp +++ b/kdeprint/kprinter/printwrapper.cpp @@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0) void showmsgconsole(const TQString& msg, int type = 0) { - QString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); + QString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); kdDebug() << errmsg << msg << endl; } @@ -237,7 +237,7 @@ void PrintWrapper::slotPrint() mgr->printerList(false); if (!printer.isEmpty()) - prt = mgr->tqfindPrinter(printer); + prt = mgr->findPrinter(printer); else prt = mgr->defaultPrinter(); diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp index 4871b74de..4613edeb8 100644 --- a/kdeprint/slave/kio_print.cpp +++ b/kdeprint/slave/kio_print.cpp @@ -180,23 +180,23 @@ void KIO_Print::listDir(const KURL& url) { PRINT_DEBUG << "listing group " << path[0] << endl; - int tqmask; + int mask; QString mimeType; KIO::UDSEntry entry; if (group == "printers") { - tqmask = KMPrinter::Printer; + mask = KMPrinter::Printer; mimeType = "print/printer"; } else if (group == "classes") { - tqmask = KMPrinter::Class | KMPrinter::Implicit; + mask = KMPrinter::Class | KMPrinter::Implicit; mimeType = "print/class"; } else if (group == "specials") { - tqmask = KMPrinter::Special; + mask = KMPrinter::Special; mimeType = "print/printer"; } else @@ -208,7 +208,7 @@ void KIO_Print::listDir(const KURL& url) TQPtrListIterator<KMPrinter> it(*(KMManager::self()->printerList())); for (;it.current();++it) { - if (!(it.current()->type() & tqmask) || !it.current()->instanceName().isEmpty()) + if (!(it.current()->type() & mask) || !it.current()->instanceName().isEmpty()) { PRINT_DEBUG << "rejecting " << it.current()->name() << endl; continue; @@ -587,7 +587,7 @@ void KIO_Print::get(const KURL& url) PRINT_DEBUG << "extracted printer name = " << printer << endl; KMManager::self()->printerList(false); - mprinter = KMManager::self()->tqfindPrinter(printer); + mprinter = KMManager::self()->findPrinter(printer); if (!mprinter) path = locateData(printer.isEmpty() ? group : printer); @@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) mimeType("text/html"); QString 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"); QString 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) QStringList members(printer->members()); for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { - memberContent.append(TQString::tqfromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it)); + memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it)); } memberContent.append("</ul>\n"); @@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) mimeType("text/html"); QString 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) { - QFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename)); + QFile f(locate("data", TQString::fromLatin1("kdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { QTextStream t(&f); @@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) } QString 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"); QString 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; |