From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/ChangeLog | 12 +-- kdeprint/Makefile.am | 4 +- kdeprint/TODO | 2 +- kdeprint/cups/cupsaddsmb2.cpp | 12 +-- kdeprint/cups/cupsaddsmb2.h | 2 +- kdeprint/cups/cupsdconf2/addressdialog.cpp | 2 +- kdeprint/cups/cupsdconf2/cups-util.c | 2 +- kdeprint/cups/cupsdconf2/cupsd.conf.template | 6 +- kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp | 4 +- kdeprint/cups/cupsdconf2/cupsdcomment.cpp | 8 +- kdeprint/cups/cupsdconf2/cupsdconf.cpp | 40 +++++----- kdeprint/cups/cupsdconf2/cupsddialog.cpp | 4 +- kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp | 2 +- kdeprint/cups/cupsdconf2/cupsdserverpage.cpp | 4 +- kdeprint/cups/cupsdconf2/cupsdsplash.cpp | 4 +- kdeprint/cups/cupsdconf2/editlist.cpp | 6 +- kdeprint/cups/cupsdconf2/locationdialog.cpp | 2 +- kdeprint/cups/cupsdconf2/portdialog.cpp | 4 +- kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 2 +- kdeprint/cups/cupsdconf2/sizewidget.cpp | 2 +- kdeprint/cups/cupsinfos.cpp | 4 +- kdeprint/cups/image.cpp | 8 +- kdeprint/cups/imageposition.cpp | 6 +- kdeprint/cups/imageposition.h | 2 +- kdeprint/cups/imagepreview.cpp | 6 +- kdeprint/cups/imagepreview.h | 2 +- kdeprint/cups/ippreportdlg.cpp | 2 +- kdeprint/cups/ipprequest.cpp | 10 +-- kdeprint/cups/kcupsprinterimpl.cpp | 10 +-- kdeprint/cups/kmconfigcupsdir.cpp | 2 +- kdeprint/cups/kmcupsconfigwidget.cpp | 6 +- kdeprint/cups/kmcupsjobmanager.cpp | 28 +++---- kdeprint/cups/kmcupsmanager.cpp | 62 +++++++-------- kdeprint/cups/kmpropquota.cpp | 4 +- kdeprint/cups/kmpropusers.cpp | 2 +- kdeprint/cups/kmwbanners.cpp | 8 +- kdeprint/cups/kmwfax.cpp | 4 +- kdeprint/cups/kmwipp.cpp | 2 +- kdeprint/cups/kmwippprinter.cpp | 10 +-- kdeprint/cups/kmwippselect.cpp | 6 +- kdeprint/cups/kmwother.cpp | 4 +- kdeprint/cups/kmwquota.cpp | 4 +- kdeprint/cups/kphpgl2page.cpp | 6 +- kdeprint/cups/kpimagepage.cpp | 10 +-- kdeprint/cups/kpschedulepage.cpp | 4 +- kdeprint/cups/kptagspage.cpp | 10 +-- kdeprint/cups/kptagspage.h | 4 +- kdeprint/cups/kptextpage.cpp | 20 ++--- kdeprint/driver.cpp | 30 ++++---- kdeprint/driver.h | 10 +-- kdeprint/driveritem.cpp | 6 +- kdeprint/driverview.cpp | 4 +- kdeprint/droptionview.cpp | 14 ++-- kdeprint/ext/ext.print | 4 +- kdeprint/filters/poster.desktop | 4 +- kdeprint/filters/psnup.xml | 2 +- kdeprint/foomatic/kfoomaticprinterimpl.cpp | 2 +- kdeprint/foomatic/kmfoomaticmanager.cpp | 6 +- kdeprint/foomatic2loader.cpp | 12 +-- kdeprint/fooparser.cpp | 2 +- kdeprint/fooscanner.cpp | 8 +- kdeprint/kdeprintcheck.cpp | 4 +- kdeprint/kdeprintd.cpp | 34 ++++----- kdeprint/kdeprintd.h | 4 +- kdeprint/kfilelist.cpp | 4 +- kdeprint/kfilelist.h | 2 +- kdeprint/kmdbentry.cpp | 6 +- kdeprint/kmfactory.cpp | 8 +- kdeprint/kmjob.cpp | 2 +- kdeprint/kmjobmanager.cpp | 14 ++-- kdeprint/kmjobmanager.h | 6 +- kdeprint/kmmanager.cpp | 36 ++++----- kdeprint/kmmanager.h | 16 ++-- kdeprint/kmprinter.cpp | 4 +- kdeprint/kmprinter.h | 2 +- kdeprint/kmspecialmanager.cpp | 6 +- kdeprint/kmspecialmanager.h | 2 +- kdeprint/kmthreadjob.cpp | 10 +-- kdeprint/kmthreadjob.h | 6 +- kdeprint/kmuimanager.h | 2 +- kdeprint/kmvirtualmanager.cpp | 30 ++++---- kdeprint/kmvirtualmanager.h | 4 +- kdeprint/kpcopiespage.cpp | 10 +-- kdeprint/kpfilterpage.cpp | 14 ++-- kdeprint/kpgeneralpage.cpp | 80 +++++++++---------- kdeprint/kpmarginpage.cpp | 4 +- kdeprint/kpposterpage.cpp | 12 +-- kdeprint/kpqtpage.cpp | 38 ++++----- kdeprint/kprintaction.cpp | 36 ++++----- kdeprint/kprintaction.h | 14 ++-- kdeprint/kprintdialog.cpp | 40 +++++----- kdeprint/kprinter.cpp | 16 ++-- kdeprint/kprinterimpl.cpp | 46 +++++------ kdeprint/kprinterimpl.h | 2 +- kdeprint/kprintpreview.cpp | 10 +-- kdeprint/kxmlcommand.cpp | 40 +++++----- kdeprint/kxmlcommand.h | 4 +- kdeprint/lpd/gschecker.cpp | 6 +- kdeprint/lpd/gschecker.h | 2 +- kdeprint/lpd/klpdprinterimpl.cpp | 2 +- kdeprint/lpd/kmlpdmanager.cpp | 102 ++++++++++++------------- kdeprint/lpd/kmlpdmanager.h | 6 +- kdeprint/lpd/lpdtools.cpp | 24 +++--- kdeprint/lpdunix/klpdunixprinterimpl.cpp | 4 +- kdeprint/lpdunix/kmlpdunixmanager.cpp | 26 +++---- kdeprint/lpr/apshandler.cpp | 22 +++--- kdeprint/lpr/klprprinterimpl.cpp | 4 +- kdeprint/lpr/kmlprmanager.cpp | 38 ++++----- kdeprint/lpr/kmlprmanager.h | 2 +- kdeprint/lpr/lpchelper.cpp | 34 ++++----- kdeprint/lpr/lpchelper.h | 6 +- kdeprint/lpr/lpqhelper.cpp | 6 +- kdeprint/lpr/lpqhelper.h | 2 +- kdeprint/lpr/lprhandler.cpp | 4 +- kdeprint/lpr/lprngtoolhandler.cpp | 26 +++---- kdeprint/lpr/matichandler.cpp | 38 ++++----- kdeprint/lpr/matichelper.cpp | 2 +- kdeprint/lpr/printcapentry.h | 2 +- kdeprint/lpr/printcapreader.cpp | 8 +- kdeprint/management/cjanuswidget.cpp | 20 ++--- kdeprint/management/cjanuswidget.h | 6 +- kdeprint/management/kiconselectaction.cpp | 2 +- kdeprint/management/kmconfigcommand.cpp | 2 +- kdeprint/management/kmconfigfilter.cpp | 4 +- kdeprint/management/kmconfigfonts.cpp | 4 +- kdeprint/management/kmconfiggeneral.cpp | 18 ++--- kdeprint/management/kmconfigjobs.cpp | 2 +- kdeprint/management/kmconfigpreview.cpp | 6 +- kdeprint/management/kmdbcreator.cpp | 4 +- kdeprint/management/kmdbcreator.h | 2 +- kdeprint/management/kmdriverdb.cpp | 28 +++---- kdeprint/management/kmdriverdb.h | 6 +- kdeprint/management/kmdriverdbwidget.cpp | 16 ++-- kdeprint/management/kmiconview.cpp | 8 +- kdeprint/management/kmiconview.h | 2 +- kdeprint/management/kminfopage.cpp | 22 +++--- kdeprint/management/kminstancepage.cpp | 14 ++-- kdeprint/management/kmjobviewer.cpp | 14 ++-- kdeprint/management/kmjobviewer.h | 2 +- kdeprint/management/kmlistview.cpp | 10 +-- kdeprint/management/kmlistview.h | 4 +- kdeprint/management/kmmainview.cpp | 68 ++++++++--------- kdeprint/management/kmmainview.h | 2 +- kdeprint/management/kmprinterview.cpp | 6 +- kdeprint/management/kmprinterview.h | 2 +- kdeprint/management/kmpropbackend.cpp | 2 +- kdeprint/management/kmpropcontainer.cpp | 2 +- kdeprint/management/kmpropdriver.cpp | 2 +- kdeprint/management/kmpropgeneral.cpp | 2 +- kdeprint/management/kmpropmembers.cpp | 2 +- kdeprint/management/kmspecialprinterdlg.cpp | 8 +- kdeprint/management/kmwbackend.cpp | 16 ++-- kdeprint/management/kmwbackend.h | 2 +- kdeprint/management/kmwclass.cpp | 4 +- kdeprint/management/kmwdriver.cpp | 4 +- kdeprint/management/kmwend.cpp | 14 ++-- kdeprint/management/kmwfile.cpp | 2 +- kdeprint/management/kmwizard.cpp | 8 +- kdeprint/management/kmwlocal.cpp | 4 +- kdeprint/management/kmwlpd.cpp | 6 +- kdeprint/management/kmwname.cpp | 4 +- kdeprint/management/kmwpassword.cpp | 8 +- kdeprint/management/kmwsocket.cpp | 4 +- kdeprint/management/kmwsocketutil.cpp | 22 +++--- kdeprint/management/kmwsocketutil.h | 2 +- kdeprint/management/kxmlcommanddlg.cpp | 60 +++++++-------- kdeprint/management/kxmlcommandselector.cpp | 8 +- kdeprint/management/networkscanner.cpp | 26 +++---- kdeprint/management/networkscanner.h | 2 +- kdeprint/management/sidepixmap.cpp | 4 +- kdeprint/management/sidepixmap.h | 2 +- kdeprint/management/smbview.cpp | 4 +- kdeprint/messagewindow.cpp | 12 +-- kdeprint/plugincombobox.cpp | 4 +- kdeprint/posterpreview.cpp | 14 ++-- kdeprint/ppdloader.cpp | 14 ++-- kdeprint/ppdloader.h | 2 +- kdeprint/ppdscanner.cpp | 10 +-- kdeprint/ppdscanner.l | 2 +- kdeprint/printerfilter.cpp | 2 +- kdeprint/printerfilter.h | 2 +- kdeprint/rlpr/kmproprlpr.cpp | 2 +- kdeprint/rlpr/kmproxywidget.cpp | 2 +- kdeprint/rlpr/kmrlprmanager.cpp | 4 +- kdeprint/rlpr/kmwrlpr.cpp | 14 ++-- kdeprint/rlpr/krlprprinterimpl.cpp | 4 +- kdeprint/signal_proc.c | 4 +- kdeprint/testprint.ps | 14 ++-- kdeprint/tests/drawdemo.cpp | 4 +- kdeprint/tests/helpwindow.cpp | 8 +- kdeprint/tests/richpage.cpp | 2 +- kdeprint/tools/escputil/escpwidget.cpp | 14 ++-- kdeprint/treecombobox.cpp | 4 +- kdeprint/util.cpp | 14 ++-- kdeprint/util.h | 2 +- 195 files changed, 1030 insertions(+), 1030 deletions(-) (limited to 'kdeprint') diff --git a/kdeprint/ChangeLog b/kdeprint/ChangeLog index 182044501..42ca0b863 100644 --- a/kdeprint/ChangeLog +++ b/kdeprint/ChangeLog @@ -93,7 +93,7 @@ Since 2.2 release, Michael Goffioul 18/10/2001 Michael Goffioul * kdeprintfax: don't hardcode program path, use the $PATH variable - first to find the program. Default to /usr/bin if not found. + first to tqfind the program. Default to /usr/bin if not found. 02/11/2001 Michael Goffioul * CUPS plugin: @@ -116,7 +116,7 @@ Since 2.2 release, Michael Goffioul of page selection on application-side. . set KPrinter object in KPrintDialog before adding other dialog pages (some pages may need it) - * wizard: changed button layout and added a side graphic. Not + * wizard: changed button tqlayout and added a side graphic. Not committed as the graphic comes from HP driver (copyright). 08/11/2001 Michael Goffioul @@ -234,7 +234,7 @@ Since 2.2 release, Michael Goffioul . pseudo-printers and filters are completely based on new XML object, though old style is supported (only requirements from previous mechanism are not used). - . KPrintFilter and KMFilterManager are now obsolete and replaced + . KPrintFilter and KMFilterManager are now obsolete and tqreplaced by KXmlCommand and KXmlCommandManager respectively. * kdeprintfax: made the log window a "real" log window. It is dynamically refreshed on new debug output arrival (suggested by user). @@ -299,7 +299,7 @@ Since 2.2 release, Michael Goffioul 10/01/2002 Michael Goffioul * general: added (temporary) workaround for drawing problems in fixed toolbars, until a real fix gets implemented: - static_cast(tb)->layout()->setMargin(1); + static_cast(tb)->tqlayout()->setMargin(1); * general: started to used new icons provided by Bogdan, for the toolbar * general: added KPrinter::autoConfigure(), to automatically configure a KPrinter object without the need for a print dialog. @@ -391,7 +391,7 @@ Since 2.2 release, Michael Goffioul 15/02/2002 Michael Goffioul * general: fixed infinite recursion bug in KIconSelectAction * CUPS: temporarily disabled edition of page-ranges as it seems CUPS is - buggy. I should find a workaround. + buggy. I should tqfind a workaround. * general (CUPS): enable some actions for jobs on remote hosts. It seems to work OK between my local LM-8.1 and a remote LM-7.2. @@ -401,7 +401,7 @@ Since 2.2 release, Michael Goffioul 17/02/2002 Michael GOffioul * preview: - . better algorithm to find a preview object + . better algorithm to tqfind a preview object . more comprehensive error report . possibility to cancel printing even with external PS viewers * general: added the backend stuff for printer filtering, needs GUI diff --git a/kdeprint/Makefile.am b/kdeprint/Makefile.am index 06f3a583c..81a200601 100644 --- a/kdeprint/Makefile.am +++ b/kdeprint/Makefile.am @@ -107,8 +107,8 @@ update_DATA = kdeprintrc.upd updatedir = $(kde_datadir)/kconf_update messages: rc.cpp - $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp - $(XGETTEXT) `find . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot + $(EXTRACTRC) `tqfind . -name "*.rc" -o -name "*.ui" | grep -v /cupsdconf` >> rc.cpp + $(XGETTEXT) `tqfind . -name "*.cpp" | grep -v /cupsdconf` -o $(podir)/kdeprint.pot include ../admin/Doxyfile.am diff --git a/kdeprint/TODO b/kdeprint/TODO index 8531c0380..ffda7f229 100644 --- a/kdeprint/TODO +++ b/kdeprint/TODO @@ -51,7 +51,7 @@ WISHES he wants - support new options for N-up printing in CUPS, put everything in - a separate page with graphical widgets, and replace the N-up zone + a separate page with graphical widgets, and tqreplace the N-up zone of the "General" page with Color/GrayScale. - allow to set the job title in kprinter diff --git a/kdeprint/cups/cupsaddsmb2.cpp b/kdeprint/cups/cupsaddsmb2.cpp index ef1b0f4e8..acb384abc 100644 --- a/kdeprint/cups/cupsaddsmb2.cpp +++ b/kdeprint/cups/cupsaddsmb2.cpp @@ -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) { @@ -191,7 +191,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) if (line.startsWith("smb:") || line.startsWith("rpcclient $")) { kdDebug(500) << "END OF ACTION" << endl; - checkActionStatus(); + checkActiontqStatus(); if (m_status) nextAction(); else @@ -216,7 +216,7 @@ void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) } } -void CupsAddSmb::checkActionStatus() +void CupsAddSmb::checkActiontqStatus() { m_status = false; // when checking the status, we need to take into account the @@ -231,7 +231,7 @@ void CupsAddSmb::checkActionStatus() m_status = (m_buffer.count() == 0); break; case MkDir: - m_status = (m_buffer.count() == 1 || m_buffer[1].find("ERRfilexists") != -1); + m_status = (m_buffer.count() == 1 || m_buffer[1].tqfind("ERRfilexists") != -1); break; case AddDriver: case AddPrinter: @@ -315,7 +315,7 @@ void CupsAddSmb::slotProcessExited(KProcess*) if (m_proc.normalExit() && m_state != Start && m_status) { // last process went OK. If it was smbclient, then switch to rpcclient - if (qstrncmp(m_proc.args().first(), "smbclient", 9) == 0) + if (tqstrncmp(m_proc.args().first(), "smbclient", 9) == 0) { doInstall(); return; @@ -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/kdeprint/cups/cupsaddsmb2.h b/kdeprint/cups/cupsaddsmb2.h index 1f396840f..3ef9cbc48 100644 --- a/kdeprint/cups/cupsaddsmb2.h +++ b/kdeprint/cups/cupsaddsmb2.h @@ -50,7 +50,7 @@ protected slots: void slotActionClicked(); protected: - void checkActionStatus(); + void checkActiontqStatus(); void nextAction(); bool startProcess(); bool doExport(); diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp index 1811abf68..d4f5b900f 100644 --- a/kdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/kdeprint/cups/cupsdconf2/addressdialog.cpp @@ -76,7 +76,7 @@ TQString AddressDialog::newAddress(TQWidget *parent) TQString AddressDialog::editAddress(const TQString& addr, TQWidget *parent) { AddressDialog dlg(parent); - int p = addr.find(' '); + int p = addr.tqfind(' '); if (p != -1) { dlg.type_->setCurrentItem(addr.left(p).lower() == "deny" ? 1 : 0); diff --git a/kdeprint/cups/cupsdconf2/cups-util.c b/kdeprint/cups/cupsdconf2/cups-util.c index cb6ddcf92..f568d1bdc 100644 --- a/kdeprint/cups/cupsdconf2/cups-util.c +++ b/kdeprint/cups/cupsdconf2/cups-util.c @@ -250,7 +250,7 @@ cupsGetConf(void) return (filename); } -int /* O - Status of operation */ +int /* O - tqStatus of operation */ cupsPutConf(const char *name) /* I - Name of the config file to send */ { int fd; /* PPD file */ diff --git a/kdeprint/cups/cupsdconf2/cupsd.conf.template b/kdeprint/cups/cupsdconf2/cupsd.conf.template index ae1a4c362..bd8f5f573 100644 --- a/kdeprint/cups/cupsdconf2/cupsd.conf.template +++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template @@ -450,7 +450,7 @@ $$ # default browsing information is broadcast to all active interfaces.

#

# Note: HP-UX 10.20 and earlier do not properly handle broadcast unless -# you have a Class A, B, C, or D netmask (i.e. no CIDR support).

+# you have a Class A, B, C, or D nettqmask (i.e. no CIDR support).

#

# ex: x.y.z.255, x.y.255.255

$$ @@ -462,10 +462,10 @@ $$ %%browseallow # Browse allow/deny (BrowseAllow/BrowseDeny) #

-# BrowseAllow: specifies an address mask to allow for incoming browser +# BrowseAllow: specifies an address tqmask to allow for incoming browser # packets. The default is to allow packets from all addresses.

#

-# BrowseDeny: specifies an address mask to deny for incoming browser +# BrowseDeny: specifies an address tqmask to deny for incoming browser # packets. The default is to deny packets from no addresses.

#

# Both "BrowseAllow" and "BrowseDeny" accept the following notations for diff --git a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 7c2b6276a..a93a05e5e 100644 --- a/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -127,8 +127,8 @@ bool CupsdBrowsingPage::loadConfig(CupsdConf *conf, TQString&) { conf_ = conf; browsing_->setChecked(conf_->browsing_); - cups_->setChecked(conf_->browseprotocols_.findIndex("CUPS") != -1); - slp_->setChecked(conf_->browseprotocols_.findIndex("SLP") != -1); + cups_->setChecked(conf_->browseprotocols_.tqfindIndex("CUPS") != -1); + slp_->setChecked(conf_->browseprotocols_.tqfindIndex("SLP") != -1); browseport_->setValue(conf_->browseport_); browseinterval_->setValue(conf_->browseinterval_); browsetimeout_->setValue(conf_->browsetimeout_); diff --git a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp index 43847299b..fbef47b16 100644 --- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -27,7 +27,7 @@ TQString Comment::comment() { TQString str = comment_; - str.replace(TQRegExp("<[^>]*>"), ""); + str.tqreplace(TQRegExp("<[^>]*>"), ""); str += ("#\n" + example_); return str; } @@ -35,7 +35,7 @@ TQString Comment::comment() TQString Comment::toolTip() { TQString str = comment_; - str.replace(TQRegExp("^#[\\s]*"), "").replace(TQRegExp("\n#[\\s]*"), "\n"); + str.tqreplace(TQRegExp("^#[\\s]*"), "").tqreplace(TQRegExp("\n#[\\s]*"), "\n"); return i18n("Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)", str.utf8()); } @@ -92,7 +92,7 @@ TQString CupsdComment::comment(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.find(key); + Comment *comm = comments_.tqfind(key); if (comm) return comm->comment(); } @@ -103,7 +103,7 @@ TQString CupsdComment::toolTip(const TQString& key) { if (comments_.count() != 0 || loadComments()) { - Comment *comm = comments_.find(key); + Comment *comm = comments_.tqfind(key); if (comm) return comm->toolTip(); } diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp index f500d219c..3742656a5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp @@ -31,7 +31,7 @@ #include #include -TQString findDir(const TQStringList& list) +TQString tqfindDir(const TQStringList& list) { for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) if (TQFile::exists(*it)) @@ -42,7 +42,7 @@ TQString findDir(const TQStringList& list) void splitSizeSpec(const TQString& s, int& sz, int& suff) { - int p = s.find(TQRegExp("\\D")); + int p = s.tqfind(TQRegExp("\\D")); sz = s.mid(0, p).toInt(); if (p != -1) { @@ -61,21 +61,21 @@ void splitSizeSpec(const TQString& s, int& sz, int& suff) CupsdConf::CupsdConf() { - // start by trying to find CUPS directories (useful later) - datadir_ = findDir(TQStringList("/usr/share/cups") + // start by trying to tqfind CUPS directories (useful later) + datadir_ = tqfindDir(TQStringList("/usr/share/cups") << "/usr/local/share/cups" << "/opt/share/cups" << "/opt/local/share/cups"); - documentdir_ = findDir(TQStringList(datadir_+"/doc-root") + documentdir_ = tqfindDir(TQStringList(datadir_+"/doc-root") << datadir_.left(datadir_.length()-5)+"/doc/cups"); //fontpath_ << (datadir_+"/fonts"); - requestdir_ = findDir(TQStringList("/var/spool/cups") + requestdir_ = tqfindDir(TQStringList("/var/spool/cups") << "/var/cups"); - serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups") + serverbin_ = tqfindDir(TQStringList("/usr/lib" KDELIBSUFF "/cups") << "/usr/local/lib" KDELIBSUFF "/cups" << "/opt/lib" KDELIBSUFF "/cups" << "/opt/local/lib" KDELIBSUFF "/cups"); - serverfiles_ = findDir(TQStringList("/etc/cups") + serverfiles_ = tqfindDir(TQStringList("/etc/cups") << "/usr/local/etc/cups"); tmpfiles_ = requestdir_+"/tmp"; @@ -100,7 +100,7 @@ CupsdConf::CupsdConf() maxrequestsize_ = "0"; clienttimeout_ = 300; // listenaddresses_ - QString logdir = findDir(TQStringList("/var/log/cups") + QString logdir = tqfindDir(TQStringList("/var/log/cups") << "/var/spool/cups/log" << "/var/cups/log"); accesslog_ = logdir+"/access_log"; @@ -484,7 +484,7 @@ bool CupsdConf::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.find(' ')) != -1) + if ((p=l.tqfind(' ')) != -1) { keyword = l.left(p).lower(); value = l.mid(p+1); @@ -508,7 +508,7 @@ bool CupsdConf::parseOption(const TQString& line) { browseprotocols_.clear(); TQStringList prots = TQStringList::split(TQRegExp("\\s"), value, false); - if (prots.find("all") != prots.end()) + if (prots.tqfind("all") != prots.end()) browseprotocols_ << "CUPS" << "SLP"; else for (TQStringList::ConstIterator it=prots.begin(); it!=prots.end(); ++it) @@ -718,7 +718,7 @@ CupsLocation::CupsLocation(const CupsLocation& loc) bool CupsLocation::parseResource(const TQString& line) { QString str = line.simplifyWhiteSpace(); - int p1 = line.find(' '), p2 = line.find('>'); + int p1 = line.tqfind(' '), p2 = line.tqfind('>'); if (p1 != -1 && p2 != -1) { resourcename_ = str.mid(p1+1,p2-p1-1); @@ -732,7 +732,7 @@ bool CupsLocation::parseOption(const TQString& line) int p(-1); TQString keyword, value, l(line.simplifyWhiteSpace()); - if ((p=l.find(' ')) != -1) + if ((p=l.tqfind(' ')) != -1) { keyword = l.left(p).lower(); value = l.mid(p+1); @@ -760,7 +760,7 @@ bool CupsLocation::parseOption(const TQString& line) else if (keyword == "authgroupname") authname_ = value; else if (keyword == "require") { - int p = value.find(' '); + int p = value.tqfind(' '); if (p != -1) { authname_ = value.mid(p+1); @@ -810,8 +810,8 @@ int CupsResource::typeFromText(const TQString& text) { if (text == i18n("Base", "Root") || text == i18n("All printers") || text == i18n("All classes") || text == i18n("Print jobs")) return RESOURCE_GLOBAL; else if (text == i18n("Administration")) return RESOURCE_ADMIN; - else if (text.find(i18n("Class")) == 0) return RESOURCE_CLASS; - else if (text.find(i18n("Printer")) == 0) return RESOURCE_PRINTER; + else if (text.tqfind(i18n("Class")) == 0) return RESOURCE_CLASS; + else if (text.tqfind(i18n("Printer")) == 0) return RESOURCE_PRINTER; else return RESOURCE_PRINTER; } @@ -832,12 +832,12 @@ TQString CupsResource::textToPath(const TQString& text) else if (text == i18n("All classes")) path = "/classes"; else if (text == i18n("Print jobs")) path = "/jobs"; else if (text == i18n("Base", "Root")) path = "/"; - else if (text.find(i18n("Printer")) == 0) + else if (text.tqfind(i18n("Printer")) == 0) { path = "/printers/"; path.append(text.right(text.length()-i18n("Printer").length()-1)); } - else if (text.find(i18n("Class")) == 0) + else if (text.tqfind(i18n("Class")) == 0) { path = "/classes/"; path.append(text.right(text.length()-i18n("Class").length()-1)); @@ -853,13 +853,13 @@ TQString CupsResource::pathToText(const TQString& path) else if (path == "/classes") text = i18n("All classes"); else if (path == "/") text = i18n("Root"); else if (path == "/jobs") text = i18n("Print jobs"); - else if (path.find("/printers/") == 0) + else if (path.tqfind("/printers/") == 0) { text = i18n("Printer"); text.append(" "); text.append(path.right(path.length()-10)); } - else if (path.find("/classes/") == 0) + else if (path.tqfind("/classes/") == 0) { text = i18n("Class"); text.append(" "); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 8023aeef7..65d7aca0c 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -202,7 +202,7 @@ bool CupsdDialog::restartServer(TQString& msg) msg.truncate(0); if (serverPid <= 0) { - msg = i18n("Unable to find a running CUPS server"); + msg = i18n("Unable to tqfind a running CUPS server"); } else { @@ -337,7 +337,7 @@ int CupsdDialog::serverOwner() while (!t.eof()) { str = t.readLine(); - if (str.find("Uid:",0,false) == 0) + if (str.tqfind("Uid:",0,false) == 0) { QStringList list = TQStringList::split('\t', str, false); if (list.count() >= 2) diff --git a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 0bf290fb9..dc16f9b36 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -125,7 +125,7 @@ void CupsdSecurityPage::slotAdd() for (locs_.first(); locs_.current(); locs_.next()) if (locs_.current()->resource_ == loc->resource_) { - if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to tqreplace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { index = locs_.at(); locs_.remove(); diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp index cc0804f5b..2ef255c76 100644 --- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -29,7 +29,7 @@ #include -int findComboItem(TQComboBox *cb, const TQString& str) +int tqfindComboItem(TQComboBox *cb, const TQString& str) { for (int i=0; icount(); i++) if (cb->text(i) == str) @@ -133,7 +133,7 @@ bool CupsdServerPage::loadConfig(CupsdConf *conf, TQString&) classoverride_->setChecked(conf_->classoverride_); if (conf->classification_ == CLASS_OTHER) otherclassname_->setText(conf_->otherclassname_); - int index = findComboItem(charset_, conf_->charset_.upper()); + int index = tqfindComboItem(charset_, conf_->charset_.upper()); if (index != -1) charset_->setCurrentItem(index); language_->setText(conf_->language_); diff --git a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp index 9dd7581a8..754e7cbd5 100644 --- a/kdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/kdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) QLabel *cupslogo_ = new TQLabel(this); QString logopath = locate("data", TQString("kdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - cupslogo_->setAlignment(Qt::AlignCenter); + cupslogo_->tqsetAlignment(Qt::AlignCenter); QLabel *kupslogo_ = new TQLabel(this); logopath = locate("data", TQString("kdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - kupslogo_->setAlignment(Qt::AlignCenter); + kupslogo_->tqsetAlignment(Qt::AlignCenter); QLabel *helptxt_ = new TQLabel(this); helptxt_->setText(i18n( "

This tool will help you to configure graphically the server of the CUPS printing system. " diff --git a/kdeprint/cups/cupsdconf2/editlist.cpp b/kdeprint/cups/cupsdconf2/editlist.cpp index a91fdc3d3..d65edaeff 100644 --- a/kdeprint/cups/cupsdconf2/editlist.cpp +++ b/kdeprint/cups/cupsdconf2/editlist.cpp @@ -81,7 +81,7 @@ void EditList::setText(int index, const TQString& s) { if (list_->text(index) != s) { - QListBoxItem *it = list_->findItem(s, Qt::ExactMatch); + QListBoxItem *it = list_->tqfindItem(s, Qt::ExactMatch); if (!it) list_->changeItem(s, index); else @@ -97,13 +97,13 @@ void EditList::clear() void EditList::insertItem(const TQString& s) { - if (!list_->findItem(s, Qt::ExactMatch)) + if (!list_->tqfindItem(s, Qt::ExactMatch)) list_->insertItem(s); } void EditList::insertItem(const TQPixmap& icon, const TQString& s) { - if (!list_->findItem(s, Qt::ExactMatch)) + if (!list_->tqfindItem(s, Qt::ExactMatch)) list_->insertItem(icon, s); } diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp index d360d62e2..1ea94d66f 100644 --- a/kdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/kdeprint/cups/cupsdconf2/locationdialog.cpp @@ -141,7 +141,7 @@ void LocationDialog::fillLocation(CupsLocation *loc) void LocationDialog::setLocation(CupsLocation *loc) { - int index = conf_->resources_.findRef(loc->resource_); + int index = conf_->resources_.tqfindRef(loc->resource_); resource_->setCurrentItem(index); authtype_->setCurrentItem(loc->authtype_); authclass_->setCurrentItem(loc->authclass_); diff --git a/kdeprint/cups/cupsdconf2/portdialog.cpp b/kdeprint/cups/cupsdconf2/portdialog.cpp index e17e2b081..184005c13 100644 --- a/kdeprint/cups/cupsdconf2/portdialog.cpp +++ b/kdeprint/cups/cupsdconf2/portdialog.cpp @@ -93,12 +93,12 @@ TQString PortDialog::editListen(const TQString& s, TQWidget *parent, CupsdConf * { PortDialog dlg(parent); dlg.setInfos(conf); - int p = s.find(' '); + int p = s.tqfind(' '); if (p != -1) { dlg.usessl_->setChecked(s.left(p).startsWith("SSL")); QString addr = s.mid(p+1).stripWhiteSpace(); - int p1 = addr.find(':'); + int p1 = addr.tqfind(':'); if (p1 == -1) { dlg.address_->setText(addr); diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index 1daca81cb..7b96d4ef9 100644 --- a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -44,7 +44,7 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); - m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2)); + m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2)); QHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); QVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); diff --git a/kdeprint/cups/cupsdconf2/sizewidget.cpp b/kdeprint/cups/cupsdconf2/sizewidget.cpp index d77fe5aaa..5920c30a9 100644 --- a/kdeprint/cups/cupsdconf2/sizewidget.cpp +++ b/kdeprint/cups/cupsdconf2/sizewidget.cpp @@ -45,7 +45,7 @@ SizeWidget::SizeWidget( TQWidget *parent, const char *name ) void SizeWidget::setSizeString( const TQString& sz ) { - int p = sz.find( TQRegExp( "\\D" ) ); + int p = sz.tqfind( TQRegExp( "\\D" ) ); m_size->setValue( sz.left( p ).toInt() ); switch( sz[ p ].latin1() ) { diff --git a/kdeprint/cups/cupsinfos.cpp b/kdeprint/cups/cupsinfos.cpp index 839f83612..78bbeb458 100644 --- a/kdeprint/cups/cupsinfos.cpp +++ b/kdeprint/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/kdeprint/cups/image.cpp b/kdeprint/cups/image.cpp index 4fe214bc1..9e32ce771 100644 --- a/kdeprint/cups/image.cpp +++ b/kdeprint/cups/image.cpp @@ -267,9 +267,9 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne for (int j=0;j 255) b2 = 255; else b2 = v; - img.setPixel(i,j,qRgb(r2,g2,b2)); + img.setPixel(i,j,tqRgb(r2,g2,b2)); } return img; } diff --git a/kdeprint/cups/imageposition.cpp b/kdeprint/cups/imageposition.cpp index bc2b207fd..9e0ab4941 100644 --- a/kdeprint/cups/imageposition.cpp +++ b/kdeprint/cups/imageposition.cpp @@ -44,8 +44,8 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name) : TQWidget(parent,name) { position_ = Center; - setMinimumSize(sizeHint()); - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + setMinimumSize(tqsizeHint()); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); pix_.load(locate("data", "kdeprint/preview-mini.png")); } @@ -147,7 +147,7 @@ void ImagePosition::paintEvent(TQPaintEvent*) p.end(); } -TQSize ImagePosition::sizeHint() const +TQSize ImagePosition::tqsizeHint() const { return TQSize(60, 80); } diff --git a/kdeprint/cups/imageposition.h b/kdeprint/cups/imageposition.h index caaa63ca2..b54415189 100644 --- a/kdeprint/cups/imageposition.h +++ b/kdeprint/cups/imageposition.h @@ -45,7 +45,7 @@ public: void setPosition(int horiz = 1, int vert = 1); PositionType position() const { return (PositionType)position_; } TQString positionString() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/kdeprint/cups/imagepreview.cpp b/kdeprint/cups/imagepreview.cpp index 7ae5dabf0..9272399e4 100644 --- a/kdeprint/cups/imagepreview.cpp +++ b/kdeprint/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*){ @@ -59,7 +59,7 @@ void ImagePreview::paintEvent(TQPaintEvent*){ int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; QPixmap buffer(width(), height()); - buffer.fill(parentWidget(), 0, 0); + buffer.fill(tqparentWidget(), 0, 0); QPainter p(&buffer); p.drawImage(x,y,tmpImage); p.end(); @@ -72,7 +72,7 @@ void ImagePreview::setBlackAndWhite(bool on){ update(); } -TQSize ImagePreview::minimumSizeHint() const +TQSize ImagePreview::tqminimumSizeHint() const { return image_.size(); } diff --git a/kdeprint/cups/imagepreview.h b/kdeprint/cups/imagepreview.h index 1967efdc2..dfbdf742d 100644 --- a/kdeprint/cups/imagepreview.h +++ b/kdeprint/cups/imagepreview.h @@ -32,7 +32,7 @@ public: void setParameters(int brightness, int hue, int saturation, int gamma); void setImage(const TQImage& image); void setBlackAndWhite(bool on); - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; private: // Private attributes int brightness_; diff --git a/kdeprint/cups/ippreportdlg.cpp b/kdeprint/cups/ippreportdlg.cpp index 343cd4118..20882d8c4 100644 --- a/kdeprint/cups/ippreportdlg.cpp +++ b/kdeprint/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()); QString s = caption() + ": " + TQString::number(page); QRect 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/kdeprint/cups/ipprequest.cpp b/kdeprint/cups/ipprequest.cpp index 0b32e45e7..2310b7f5f 100644 --- a/kdeprint/cups/ipprequest.cpp +++ b/kdeprint/cups/ipprequest.cpp @@ -55,8 +55,8 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString:: kdDebug(500) << "ID = 0x" << TQString::number(req->request.status.request_id, 16) << endl; if (answer) { - kdDebug(500) << "Status = 0x" << TQString::number(req->request.status.status_code, 16) << endl; - kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl; + kdDebug(500) << "tqStatus = 0x" << TQString::number(req->request.status.status_code, 16) << endl; + kdDebug(500) << "tqStatus message = " << ippErrorString(req->request.status.status_code) << endl; } else kdDebug(500) << "Operation = 0x" << TQString::number(req->request.op.operation_id, 16) << endl; @@ -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;inum_values;i++) { switch (attr->value_tag) @@ -504,7 +504,7 @@ void IppRequest::setMap(const TQMap& opts) if (it.key().startsWith("kde-") || it.key().startsWith("app-")) continue; QString value = it.data().stripWhiteSpace(), lovalue; - value.replace(re, ""); + value.tqreplace(re, ""); lovalue = value.lower(); // handles specific cases: boolean, empty strings, or option that has that boolean @@ -522,7 +522,7 @@ void IppRequest::setMap(const TQMap& opts) cupsEncodeOptions(request_, n, options); cupsFreeOptions(n, options); - // find an remove that annoying "document-format" attribute + // tqfind an remove that annoying "document-format" attribute #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME); ippDeleteAttribute(request_, attr); diff --git a/kdeprint/cups/kcupsprinterimpl.cpp b/kdeprint/cups/kcupsprinterimpl.cpp index 1bf6d55bf..7fa6da140 100644 --- a/kdeprint/cups/kcupsprinterimpl.cpp +++ b/kdeprint/cups/kcupsprinterimpl.cpp @@ -37,9 +37,9 @@ TQSize rangeToSize(const TQString& s) int p(-1); int from, to; - if ((p=range.find(',')) != -1) + if ((p=range.tqfind(',')) != -1) range.truncate(p); - if ((p=range.find('-')) != -1) + if ((p=range.tqfind('-')) != -1) { from = range.left(p).toInt(); to = range.right(range.length()-p-1).toInt(); @@ -67,8 +67,8 @@ bool KCupsPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) // check printer object if (!printer) return false; - QString 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())); + QString 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()) { QString 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") { - QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + QString pagename = TQString::tqfromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); // simple hack for classes KPrinterImpl::broadcastOption("media",pagename); diff --git a/kdeprint/cups/kmconfigcupsdir.cpp b/kdeprint/cups/kmconfigcupsdir.cpp index 5e6958565..7bbef9db4 100644 --- a/kdeprint/cups/kmconfigcupsdir.cpp +++ b/kdeprint/cups/kmconfigcupsdir.cpp @@ -44,7 +44,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_dirbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10); + TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->tqlayout(), 10); lay1->addWidget(m_stddir); lay1->addWidget(m_installdir); diff --git a/kdeprint/cups/kmcupsconfigwidget.cpp b/kdeprint/cups/kmcupsconfigwidget.cpp index 684d8b850..ad27d9652 100644 --- a/kdeprint/cups/kmcupsconfigwidget.cpp +++ b/kdeprint/cups/kmcupsconfigwidget.cpp @@ -83,17 +83,17 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) m_loginlabel->setBuddy(m_login); m_passwordlabel->setBuddy(m_password); - // layout creation + // tqlayout creation QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); lay0->addWidget(m_hostbox,1); lay0->addWidget(m_loginbox,1); - QGridLayout *lay2 = new TQGridLayout(m_hostbox->layout(), 2, 2, 10); + QGridLayout *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); - QGridLayout *lay3 = new TQGridLayout(m_loginbox->layout(), 4, 2, 10); + QGridLayout *lay3 = new TQGridLayout(m_loginbox->tqlayout(), 4, 2, 10); lay3->setColStretch(1,1); lay3->addWidget(m_loginlabel,0,0); lay3->addWidget(m_passwordlabel,1,0); diff --git a/kdeprint/cups/kmcupsjobmanager.cpp b/kdeprint/cups/kmcupsjobmanager.cpp index 011256cd6..4e083c38a 100644 --- a/kdeprint/cups/kmcupsjobmanager.cpp +++ b/kdeprint/cups/kmcupsjobmanager.cpp @@ -93,7 +93,7 @@ bool KMCupsJobManager::sendCommandSystemJob(const TQPtrList& 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; @@ -131,7 +131,7 @@ bool KMCupsJobManager::listJobs(const TQString& prname, KMJobManager::JobType ty req.setOperation(IPP_GET_JOBS); // add printer-uri - KMPrinter *mp = KMManager::self()->findPrinter(prname); + KMPrinter *mp = KMManager::self()->tqfindPrinter(prname); if (!mp) return false; @@ -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); @@ -212,13 +212,13 @@ void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr) else if (name == "job-printer-uri" && !pr->isRemote()) { QString str(attr->values[0].string.text); - int p = str.findRev('/'); + int p = str.tqfindRev('/'); if (p != -1) job->setPrinter(str.mid(p+1)); } 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") { @@ -356,7 +356,7 @@ static TQString processRange(const TQString& range) for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { s.append(*it); - if ((*it).find('-') == -1) + if ((*it).tqfind('-') == -1) s.append("-").append(*it); s.append(","); } @@ -387,22 +387,22 @@ bool KMCupsJobManager::editJobAttributes(KMJob *j) TQMap opts = req.toMap(IPP_TAG_JOB); // translate the "Copies" option to non-CUPS syntax - if (opts.contains("copies")) + if (opts.tqcontains("copies")) opts["kde-copies"] = opts["copies"]; - if (opts.contains("page-set")) + if (opts.tqcontains("page-set")) opts["kde-pageset"] = (opts["page-set"] == "even" ? "2" : (opts["page-set"] == "odd" ? "1" : "0")); - if (opts.contains("OutputOrder")) + if (opts.tqcontains("OutputOrder")) opts["kde-pageorder"] = opts["OutputOrder"]; - if (opts.contains("multiple-document-handling")) + if (opts.tqcontains("multiple-document-handling")) opts["kde-collate"] = (opts["multiple-document-handling"] == "separate-documents-collated-copies" ? "Collate" : "Uncollate"); - if (opts.contains("page-ranges")) + if (opts.tqcontains("page-ranges")) opts["kde-range"] = opts["page-ranges"]; - // find printer and construct dialog - KMPrinter *prt = KMManager::self()->findPrinter(j->printer()); + // tqfind printer and construct dialog + KMPrinter *prt = KMManager::self()->tqfindPrinter(j->printer()); if (!prt) { - KMManager::self()->setErrorMsg(i18n("Unable to find printer %1.").arg(j->printer())); + KMManager::self()->setErrorMsg(i18n("Unable to tqfind printer %1.").arg(j->printer())); return false; } KMManager::self()->completePrinterShort(prt); diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index 2d923a371..2b1f14ddd 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -95,7 +95,7 @@ KMCupsManager::~KMCupsManager() TQString KMCupsManager::driverDbCreationProgram() { - return TQString::fromLatin1("/opt/kde3/bin/make_driver_db_cups"); + return TQString::tqfromLatin1("/opt/kde3/bin/make_driver_db_cups"); } TQString KMCupsManager::driverDirectory() @@ -148,7 +148,7 @@ bool KMCupsManager::createPrinter(KMPrinter *p) req.setOperation(CUPS_ADD_PRINTER); // only set the device-uri if needed, otherwise you may loose authentification // data (login/password in URI's like smb or ipp). - KMPrinter *otherP = findPrinter(p->printerName()); + KMPrinter *otherP = tqfindPrinter(p->printerName()); if (!otherP || otherP->device() != p->device()) { /** @@ -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,9 +287,9 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) delete kes; m_hostSuccess = false; } else { - TQDateTime tm = TQDateTime::currentDateTime().addSecs(2); - while (!m_lookupDone && (TQDateTime::currentDateTime() < tm)) - qApp->processEvents(); + TQDateTime tm = TQDateTime::tqcurrentDateTime().addSecs(2); + while (!m_lookupDone && (TQDateTime::tqcurrentDateTime() < tm)) + tqApp->processEvents(); kes->cancelAsyncConnect(); @@ -347,7 +347,7 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) QStringList members; for (TQStringList::ConstIterator it=values.begin(); it!=values.end(); ++it) { - int p = (*it).findRev('/'); + int p = (*it).tqfindRev('/'); if (p != -1) members.append((*it).right((*it).length()-p-1)); } @@ -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,12 +453,12 @@ 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/")) { QString s = TQString::null; req.name("printer-name",s); - setHardDefault(findPrinter(s)); + setHardDefault(tqfindPrinter(s)); } // This request may fails for example if no printer is defined. Just // discard the error message. Indeed as we successfully got printers @@ -536,12 +536,12 @@ DrMain* KMCupsManager::loadPrinterDriver(KMPrinter *p, bool) if (p->isClass(true)) { KMPrinter *first_class_member = NULL; - /* find the first printer in the class */ - first_class_member = findPrinter(p->members().first()); + /* tqfind the first printer in the class */ + first_class_member = tqfindPrinter(p->members().first()); if (first_class_member == NULL) { - /* we didn't find a printer in the class */ + /* we didn't tqfind a printer in the class */ return NULL; } else @@ -576,11 +576,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { QStringList comps = TQStringList::split('/', drname, false); QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { - setErrorMsg(i18n("Unable to find the executable foomatic-datafile " + setErrorMsg(i18n("Unable to tqfind the executable foomatic-datafile " "in your PATH. Check that Foomatic is correctly installed.")); return NULL; } @@ -655,30 +655,30 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) if (line.startsWith("*% COMDATA #")) { int p(-1), q(-1); - if ((p=line.find("'name'")) != -1) + if ((p=line.tqfind("'name'")) != -1) { - p = line.find('\'',p+6)+1; - q = line.find('\'',p); + p = line.tqfind('\'',p+6)+1; + q = line.tqfind('\'',p); keyword = line.mid(p,q-p); - opt = driver->findOption(keyword); + opt = driver->tqfindOption(keyword); if (opt && (opt->type() == DrBase::Integer || opt->type() == DrBase::Float)) isnumeric = true; else isnumeric = false; } - /*else if ((p=line.find("'type'")) != -1) + /*else if ((p=line.tqfind("'type'")) != -1) { - p = line.find('\'',p+6)+1; - if (line.find("float",p) != -1 || line.find("int",p) != -1) + p = line.tqfind('\'',p+6)+1; + if (line.tqfind("float",p) != -1 || line.tqfind("int",p) != -1) isnumeric = true; else isnumeric = false; }*/ - else if ((p=line.find("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) + else if ((p=line.tqfind("'default'")) != -1 && !keyword.isEmpty() && opt && isnumeric) { QString prefix = line.left(p+9); tout << prefix << " => '" << opt->valueText() << '\''; - if (line.find(',',p) != -1) + if (line.tqfind(',',p) != -1) tout << ','; tout << endl; continue; @@ -687,13 +687,13 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) } else if (line.startsWith("*Default")) { - int p = line.find(':',8); + int p = line.tqfind(':',8); keyword = line.mid(8,p-8); DrBase *bopt = 0; if ( keyword == "PageRegion" || keyword == "ImageableArea" || keyword == "PaperDimension" ) - bopt = driver->findOption( TQString::fromLatin1( "PageSize" ) ); + bopt = driver->tqfindOption( TQString::tqfromLatin1( "PageSize" ) ); else - bopt = driver->findOption( keyword ); + bopt = driver->tqfindOption( keyword ); if (bopt) switch (bopt->type()) { @@ -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 @@ -1056,7 +1056,7 @@ static TQString downloadDriver(KMPrinter *p) cupsSetServer(p->uri().host().local8Bit()); ippSetPort(p->uri().port()); // strip any "@..." from the printer name - prname = prname.replace(TQRegExp("@.*"), ""); + prname = prname.tqreplace(TQRegExp("@.*"), ""); changed = true; } */ diff --git a/kdeprint/cups/kmpropquota.cpp b/kdeprint/cups/kmpropquota.cpp index 12e360746..9c6b34565 100644 --- a/kdeprint/cups/kmpropquota.cpp +++ b/kdeprint/cups/kmpropquota.cpp @@ -27,7 +27,7 @@ // some forward declarations (see kmwquota.cpp) const char* unitKeyword(int); -int findUnit(int&); +int tqfindUnit(int&); KMPropQuota::KMPropQuota(TQWidget *parent, const char *name) : KMPropWidget(parent,name) @@ -74,7 +74,7 @@ void KMPropQuota::setPrinter(KMPrinter *p) if (si == 0 && pa == 0) qu = -1; if (qu > 0) - un = findUnit(qu); + un = tqfindUnit(qu); m_period->setText(qu == -1 ? i18n("No quota") : TQString::number(qu).append(" ").append(i18n(unitKeyword(un)))); m_sizelimit->setText(si ? TQString::number(si) : i18n("None")); m_pagelimit->setText(pa ? TQString::number(pa) : i18n("None")); diff --git a/kdeprint/cups/kmpropusers.cpp b/kdeprint/cups/kmpropusers.cpp index 3f0792d9c..35d6f0fe1 100644 --- a/kdeprint/cups/kmpropusers.cpp +++ b/kdeprint/cups/kmpropusers.cpp @@ -29,7 +29,7 @@ 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); QVBoxLayout *l0 = new TQVBoxLayout(this, 10, 0); diff --git a/kdeprint/cups/kmwbanners.cpp b/kdeprint/cups/kmwbanners.cpp index 80a21a37c..a92381b21 100644 --- a/kdeprint/cups/kmwbanners.cpp +++ b/kdeprint/cups/kmwbanners.cpp @@ -70,7 +70,7 @@ TQString mapBanner( const TQString& ban ) if ( map.size() == 0 ) for ( int i=0; bannermap[ i ].banner; i++ ) map[ bannermap[ i ].banner ] = bannermap[ i ].name; - TQMap::ConstIterator it = map.find( ban ); + TQMap::ConstIterator it = map.tqfind( ban ); if ( it == map.end() ) return ban; else @@ -120,7 +120,7 @@ void KMWBanners::initPrinter(KMPrinter *p) m_bans = TQStringList::split(',',p->option("kde-banners-supported"),false); if (m_bans.count() == 0) m_bans = defaultBanners(); - if (m_bans.find("none") == m_bans.end()) + if (m_bans.tqfind("none") == m_bans.end()) m_bans.prepend("none"); for ( TQStringList::Iterator it=m_bans.begin(); it!=m_bans.end(); ++it ) { @@ -131,8 +131,8 @@ void KMWBanners::initPrinter(KMPrinter *p) QStringList l = TQStringList::split(',',p->option("kde-banners"),false); while (l.count() < 2) l.append("none"); - m_start->setCurrentItem(m_bans.findIndex(l[0])); - m_end->setCurrentItem(m_bans.findIndex(l[1])); + m_start->setCurrentItem(m_bans.tqfindIndex(l[0])); + m_end->setCurrentItem(m_bans.tqfindIndex(l[1])); } } diff --git a/kdeprint/cups/kmwfax.cpp b/kdeprint/cups/kmwfax.cpp index ea5b98f3b..45cd502fd 100644 --- a/kdeprint/cups/kmwfax.cpp +++ b/kdeprint/cups/kmwfax.cpp @@ -48,7 +48,7 @@ KMWFax::KMWFax(TQWidget *parent, const char *name) // initialize IppRequest req; req.setOperation(CUPS_GET_DEVICES); - QString uri = TQString::fromLatin1("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + QString 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/kdeprint/cups/kmwipp.cpp b/kdeprint/cups/kmwipp.cpp index c0d30c452..81bcf584c 100644 --- a/kdeprint/cups/kmwipp.cpp +++ b/kdeprint/cups/kmwipp.cpp @@ -41,7 +41,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name) "before continuing.

")); 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/kdeprint/cups/kmwippprinter.cpp b/kdeprint/cups/kmwippprinter.cpp index 4900a584b..417bb4a77 100644 --- a/kdeprint/cups/kmwippprinter.cpp +++ b/kdeprint/cups/kmwippprinter.cpp @@ -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("

Either enter the printer URI directly, or use the network scanning facility.

")); m_ippreport = new KPushButton(KGuiItem(i18n("&IPP Report"), "kdeprint_report"), this); @@ -77,7 +77,7 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport())); - // layout + // tqlayout QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0); QHBoxLayout *lay4 = new TQHBoxLayout(0, 0, 0); @@ -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"); @@ -172,11 +172,11 @@ void KMWIppPrinter::slotPrinterSelected(TQListViewItem *item) int state; if (req.name("printer-name",value)) txt.append(i18n("Name: %1
").arg(value)); if (req.text("printer-location",value) && !value.isEmpty()) txt.append(i18n("Location: %1
").arg(value)); - if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("Description: %1
").arg(value.replace(TQRegExp(";"),"
"))); + if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("Description: %1
").arg(value.tqreplace(TQRegExp(";"),"
"))); 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("Model: %1
").arg(value)); diff --git a/kdeprint/cups/kmwippselect.cpp b/kdeprint/cups/kmwippselect.cpp index fbfa597c7..38fff88df 100644 --- a/kdeprint/cups/kmwippselect.cpp +++ b/kdeprint/cups/kmwippselect.cpp @@ -75,16 +75,16 @@ void KMWIppSelect::initPrinter(KMPrinter *p) IppRequest req; QString 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("kdeprint_printer"),TQString::fromLatin1(attr->values[0].string.text)); + m_list->insertItem(SmallIcon("kdeprint_printer"),TQString::tqfromLatin1(attr->values[0].string.text)); attr = attr->next; } m_list->sort(); diff --git a/kdeprint/cups/kmwother.cpp b/kdeprint/cups/kmwother.cpp index 36e80c76d..f7c91cca0 100644 --- a/kdeprint/cups/kmwother.cpp +++ b/kdeprint/cups/kmwother.cpp @@ -89,7 +89,7 @@ void KMWOther::initPrinter(KMPrinter *p) TQString prt = *( ++it ); if ( !prt.isEmpty() ) desc.append( " [" + prt + "]" ); - TQListViewItem *parent = parents.find( cl ); + TQListViewItem *parent = parents.tqfind( cl ); if ( !parent ) { parent = new TQListViewItem( root, lastparent, cl ); @@ -105,7 +105,7 @@ void KMWOther::initPrinter(KMPrinter *p) lastparent = parent; parents.insert( cl, parent ); } - item = new TQListViewItem( parent, last.find( cl ), desc, uri); + item = new TQListViewItem( parent, last.tqfind( cl ), desc, uri); last.insert( cl, item ); } } diff --git a/kdeprint/cups/kmwquota.cpp b/kdeprint/cups/kmwquota.cpp index f9c34c04a..cb4b93ca1 100644 --- a/kdeprint/cups/kmwquota.cpp +++ b/kdeprint/cups/kmwquota.cpp @@ -51,7 +51,7 @@ static const char* time_keywords[] = { I18N_NOOP("month(s)") }; -int findUnit(int& period) +int tqfindUnit(int& period) { int unit(0); for (int i=N_TIME_LIMITS-1;i>=0;i--) @@ -146,7 +146,7 @@ void KMWQuota::initPrinter(KMPrinter *p) m_pagelimit->setValue(pa); if (qu > 0) { - un = findUnit(qu); + un = tqfindUnit(qu); } m_timeunit->setCurrentItem(un); m_period->setValue(qu); diff --git a/kdeprint/cups/kphpgl2page.cpp b/kdeprint/cups/kphpgl2page.cpp index 7ec413e52..7abb40de5 100644 --- a/kdeprint/cups/kphpgl2page.cpp +++ b/kdeprint/cups/kphpgl2page.cpp @@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) l0->addWidget(box); l0->addStretch(1); - QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10); + QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), 10); l1->addWidget(m_blackplot); l1->addWidget(m_fitplot); l1->addWidget(m_penwidth); @@ -142,9 +142,9 @@ KPHpgl2Page::~KPHpgl2Page() void KPHpgl2Page::setOptions(const TQMap& opts) { QString value; - if (opts.contains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true")) + if (opts.tqcontains("blackplot") && ((value=opts["blackplot"]).isEmpty() || value == "true")) m_blackplot->setChecked(true); - if (opts.contains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true")) + if (opts.tqcontains("fitplot") && ((value=opts["fitplot"]).isEmpty() || value == "true")) m_fitplot->setChecked(true); if (!(value=opts["penwidth"]).isEmpty()) m_penwidth->setValue(value.toInt()); diff --git a/kdeprint/cups/kpimagepage.cpp b/kdeprint/cups/kpimagepage.cpp index c4cf50e48..03ea4b984 100644 --- a/kdeprint/cups/kpimagepage.cpp +++ b/kdeprint/cups/kpimagepage.cpp @@ -192,7 +192,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPreviewPositionImagePage = i18n( " " "

Position Preview Thumbnail

" "

This position preview thumbnail indicates the position of the image on the paper sheet. " - "

Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: " + "

Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: " "

    " "
  • center
    • " "
  • top
    • " @@ -313,7 +313,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) QRadioButton *left = new TQRadioButton(positionbox); QRadioButton *right = new TQRadioButton(positionbox); QRadioButton *hcenter = new TQRadioButton(positionbox); - QSize sz = bottom->sizeHint(); + QSize sz = bottom->tqsizeHint(); bottom->setFixedSize(sz); vcenter->setFixedSize(sz); top->setFixedSize(sz); @@ -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); - QGridLayout *l1 = new TQGridLayout(colorbox->layout(), 5, 2, 10); + QGridLayout *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); - QVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3); + QVBoxLayout *l2 = new TQVBoxLayout(sizebox->tqlayout(), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); l2->addSpacing(10); l2->addWidget(m_size); l2->addStretch(1); - QGridLayout *l3 = new TQGridLayout(positionbox->layout(), 2, 2, 10); + QGridLayout *l3 = new TQGridLayout(positionbox->tqlayout(), 2, 2, 10); QHBoxLayout *l4 = new TQHBoxLayout(0, 0, 10); QVBoxLayout *l5 = new TQVBoxLayout(0, 0, 10); l3->addLayout(l4, 0, 1); diff --git a/kdeprint/cups/kpschedulepage.cpp b/kdeprint/cups/kpschedulepage.cpp index 3c2edaf0f..4ee29438f 100644 --- a/kdeprint/cups/kpschedulepage.cpp +++ b/kdeprint/cups/kpschedulepage.cpp @@ -233,10 +233,10 @@ void KPSchedulePage::setOptions(const TQMap& opts) } QRegExp re("^\"|\"$"); t = opts["job-billing"].stripWhiteSpace(); - t.replace(re, ""); + t.tqreplace(re, ""); m_billing->setText(t); t = opts["page-label"].stripWhiteSpace(); - t.replace(re, ""); + t.tqreplace(re, ""); m_pagelabel->setText(t); int val = opts["job-priority"].toInt(); if (val != 0) diff --git a/kdeprint/cups/kptagspage.cpp b/kdeprint/cups/kptagspage.cpp index 7a1fd0924..b817b4e8b 100644 --- a/kdeprint/cups/kptagspage.cpp +++ b/kdeprint/cups/kptagspage.cpp @@ -93,7 +93,7 @@ KPTagsPage::KPTagsPage(bool ro, TQWidget *parent, const char *name) QFont f = lab->font(); f.setBold(true); lab->setFont(f); - lab->setAlignment(AlignVCenter|AlignRight); + lab->tqsetAlignment(AlignVCenter|AlignRight); l0->addWidget(lab); } } @@ -110,7 +110,7 @@ bool KPTagsPage::isValid(TQString& msg) QString tag(m_tags->text(r, 0)); if (tag.isEmpty()) continue; - else if (tag.find(re) != -1) + else if (tag.tqfind(re) != -1) { msg = i18n("The tag name must not contain any spaces, tabs or quotes: %1.").arg(tag); return false; @@ -129,7 +129,7 @@ void KPTagsPage::setOptions(const TQMap& opts) { m_tags->setText(r, 0, it.key().mid(9)); QString data = it.data(); - m_tags->setText(r, 1, data.replace(re, "")); + m_tags->setText(r, 1, data.tqreplace(re, "")); r++; } } @@ -153,12 +153,12 @@ void KPTagsPage::getOptions(TQMap& opts, bool) } } -TQSize KPTagsPage::sizeHint() const +TQSize KPTagsPage::tqsizeHint() const { return TQSize(-1, -1); } -TQSize KPTagsPage::minimumSizeHint() const +TQSize KPTagsPage::tqminimumSizeHint() const { return TQSize(-1, -1); } diff --git a/kdeprint/cups/kptagspage.h b/kdeprint/cups/kptagspage.h index 46b85c000..fc5c88046 100644 --- a/kdeprint/cups/kptagspage.h +++ b/kdeprint/cups/kptagspage.h @@ -34,8 +34,8 @@ public: void setOptions(const TQMap& opts); bool isValid(TQString& msg); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; private: QTable *m_tags; diff --git a/kdeprint/cups/kptextpage.cpp b/kdeprint/cups/kptextpage.cpp index 75fc838cc..d6de3e0a1 100644 --- a/kdeprint/cups/kptextpage.cpp +++ b/kdeprint/cups/kptextpage.cpp @@ -108,7 +108,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisMarginsTextPage = i18n( " " "

    Margins

    " "

    These settings control the margins of printouts on the paper. They are not valid for " - " jobs originating from applications which define their own page layout internally and " + " jobs originating from applications which define their own page tqlayout internally and " " send PostScript to KDEPrint (such as KOffice or OpenOffice.org).

    " "

    When printing from KDE applications, such as KMail and Konqueror, or printing an ASCII text " " file through kprinter, you can choose your preferred margin settings here.

    " @@ -134,7 +134,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPrettyprintButtonOnTextPage = i18n( " " "

    Turn Text Printing with Syntax Highlighting (Prettyprint) On!

    " "

    ASCII text file printouts can be 'prettyfied' by enabling this option. If you do so, " - " a header is printed at the top of each page. The header contains " + " a header is printed at the top of each page. The header tqcontains " " the page number, job title (usually the filename), and the date. In addition, C and " " C++ keywords are highlighted, and comment lines are italicized.

    " "

    This prettyprint option is handled by CUPS.

    " @@ -167,7 +167,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPrettyprintFrameTextPage = i18n( " " "

    Print Text with Syntax Highlighting (Prettyprint)

    " "

    ASCII file printouts can be 'prettyfied' by enabling this option. If you do so, " - " a header is printed at the top of each page. The header contains " + " a header is printed at the top of each page. The header tqcontains " " the page number, job title (usually the filename), and the date. In addition, C and " " C++ keywords are highlighted, and comment lines are italicized.

    " "

    This prettyprint option is handled by CUPS.

    " @@ -212,7 +212,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_prettypix = new TQLabel(prettybox); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); - m_prettypix->setAlignment(Qt::AlignCenter); + m_prettypix->tqsetAlignment(Qt::AlignCenter); QRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); QRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); @@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) l0->addWidget(formatbox, 0, 0); l0->addWidget(prettybox, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); - QVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5); + QVBoxLayout *l1 = new TQVBoxLayout(formatbox->tqlayout(), 5); l1->addWidget(m_cpi); l1->addWidget(m_lpi); l1->addWidget(sep); l1->addWidget(m_columns); - QGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10); + QGridLayout *l2 = new TQGridLayout(prettybox->tqlayout(), 2, 2, 10); l2->addWidget(off, 0, 0); l2->addWidget(on, 1, 0); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); - QVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10); + QVBoxLayout *l3 = new TQVBoxLayout(marginbox->tqlayout(), 10); l3->addWidget(m_margin); } @@ -261,7 +261,7 @@ void KPTextPage::setOptions(const TQMap& opts) if (!(value=opts["columns"]).isEmpty()) m_columns->setValue(value.toInt()); int ID(0); - if (opts.contains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true")) + if (opts.tqcontains("prettyprint") && (opts["prettyprint"].isEmpty() || opts["prettyprint"] == "true")) ID = 1; m_prettyprint->setButton(ID); slotPrettyChanged(ID); @@ -348,13 +348,13 @@ void KPTextPage::initPageSize(bool landscape) { if (m_currentps.isEmpty()) { - DrListOption *o = (DrListOption*)driver()->findOption("PageSize"); + DrListOption *o = (DrListOption*)driver()->tqfindOption("PageSize"); if (o) m_currentps = o->get("default"); } if (!m_currentps.isEmpty()) { - DrPageSize *ps = driver()->findPageSize(m_currentps); + DrPageSize *ps = driver()->tqfindPageSize(m_currentps); if (ps) { w = ps->pageWidth(); diff --git a/kdeprint/driver.cpp b/kdeprint/driver.cpp index ce411f0a4..39ca77e06 100644 --- a/kdeprint/driver.cpp +++ b/kdeprint/driver.cpp @@ -61,7 +61,7 @@ DriverItem* DrBase::createItem(DriverItem *parent, DriverItem *after) void DrBase::setOptions(const TQMap& opts) { - if (opts.contains(name())) setValueText(opts[name()]); + if (opts.tqcontains(name())) setValueText(opts[name()]); } void DrBase::getOptions(TQMap& opts, bool incldef) @@ -138,7 +138,7 @@ void DrMain::addPageSize(DrPageSize *ps) void DrMain::removeOptionGlobally(const TQString& name) { DrGroup *grp(0); - DrBase *opt = findOption(name, &grp); + DrBase *opt = tqfindOption(name, &grp); if (opt && grp) { @@ -151,7 +151,7 @@ void DrMain::removeOptionGlobally(const TQString& name) void DrMain::removeGroupGlobally(DrGroup *grp) { DrGroup *parent(0); - if (findGroup(grp, &parent) && parent) + if (tqfindGroup(grp, &parent) && parent) { parent->removeGroup(grp); if (parent->isEmpty() && parent != this) @@ -224,7 +224,7 @@ void DrGroup::addObject(DrBase *optgrp) void DrGroup::removeOption(const TQString& name) { - DrBase *opt = m_options.find(name); + DrBase *opt = m_options.tqfind(name); if (opt) { m_listoptions.removeRef(opt); @@ -262,28 +262,28 @@ void DrGroup::createTree(DriverItem *parent) item = dit.current()->createItem(parent, item); } -DrBase* DrGroup::findOption(const TQString& name, DrGroup **parentGroup) +DrBase* DrGroup::tqfindOption(const TQString& name, DrGroup **parentGroup) { - DrBase *opt = m_options.find(name); + DrBase *opt = m_options.tqfind(name); if (!opt) { TQPtrListIterator it(m_subgroups); for (;it.current() && !opt; ++it) - opt = it.current()->findOption(name, parentGroup); + opt = it.current()->tqfindOption(name, parentGroup); } else if (parentGroup) *parentGroup = this; return opt; } -DrGroup* DrGroup::findGroup(DrGroup *grp, DrGroup ** parentGroup) +DrGroup* DrGroup::tqfindGroup(DrGroup *grp, DrGroup ** parentGroup) { - DrGroup *group = (m_subgroups.findRef(grp) == -1 ? 0 : grp); + DrGroup *group = (m_subgroups.tqfindRef(grp) == -1 ? 0 : grp); if (!group) { TQPtrListIterator it(m_subgroups); for (;it.current() && !group; ++it) - group = it.current()->findGroup(grp, parentGroup); + group = it.current()->tqfindGroup(grp, parentGroup); } else if (parentGroup) *parentGroup = this; @@ -334,7 +334,7 @@ void DrGroup::flattenGroup(TQMap& 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; @@ -567,7 +567,7 @@ TQString DrListOption::prettyText() void DrListOption::setValueText(const TQString& s) { - m_current = findChoice(s); + m_current = tqfindChoice(s); if (!m_current) { bool ok; @@ -577,7 +577,7 @@ void DrListOption::setValueText(const TQString& s) } } -DrBase* DrListOption::findChoice(const TQString& txt) +DrBase* DrListOption::tqfindChoice(const TQString& txt) { TQPtrListIterator it(m_choices); for (;it.current();++it) @@ -647,8 +647,8 @@ DrConstraint::DrConstraint(const DrConstraint& d) bool DrConstraint::check(DrMain *driver) { - if (!m_option1) m_option1 = (DrListOption*)driver->findOption(m_opt1); - if (!m_option2) m_option2 = (DrListOption*)driver->findOption(m_opt2); + if (!m_option1) m_option1 = (DrListOption*)driver->tqfindOption(m_opt1); + if (!m_option2) m_option2 = (DrListOption*)driver->tqfindOption(m_opt2); if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice()) { bool f1(false), f2(false); diff --git a/kdeprint/driver.h b/kdeprint/driver.h index a2ccab8a8..485024460 100644 --- a/kdeprint/driver.h +++ b/kdeprint/driver.h @@ -71,7 +71,7 @@ public: const TQString& get(const TQString& key) const { return m_map[key]; } void set(const TQString& key, const TQString& val) { m_map[key] = val; } - bool has(const TQString& key) const { return m_map.contains(key); } + bool has(const TQString& key) const { return m_map.tqcontains(key); } const TQString& name() const { return m_name; } void setName(const TQString& s) { m_name = s; } bool conflict() const { return m_conflict; } @@ -118,8 +118,8 @@ public: bool isEmpty(); virtual DriverItem* createItem(DriverItem *parent, DriverItem *after = 0); - DrBase* findOption(const TQString& name, DrGroup **parentGroup = 0); - DrGroup* findGroup(DrGroup *grp, DrGroup **parentGroup = 0); + DrBase* tqfindOption(const TQString& name, DrGroup **parentGroup = 0); + DrGroup* tqfindGroup(DrGroup *grp, DrGroup **parentGroup = 0); void setOptions(const TQMap& opts); void getOptions(TQMap& opts, bool incldef = false); DrBase* clone(); @@ -159,7 +159,7 @@ public: DriverItem* createTreeView(TQListView *parent); void addConstraint(DrConstraint *c) { m_constraints.append(c); } int checkConstraints(); - DrPageSize* findPageSize(const TQString& name) { return m_pagesizes.find(name); } + DrPageSize* tqfindPageSize(const TQString& name) { return m_pagesizes.tqfind(name); } void addPageSize(DrPageSize *sz); void removeOptionGlobally(const TQString& name); void removeGroupGlobally(DrGroup *grp); @@ -285,7 +285,7 @@ public: void addChoice(DrBase *ch) { m_choices.append(ch); } TQPtrList* choices() { return &m_choices; } DrBase* currentChoice() const { return m_current; } - DrBase* findChoice(const TQString& txt); + DrBase* tqfindChoice(const TQString& txt); void setChoice(int choicenum); virtual TQString valueText(); diff --git a/kdeprint/driveritem.cpp b/kdeprint/driveritem.cpp index 7bb1715aa..8bbfff6a4 100644 --- a/kdeprint/driveritem.cpp +++ b/kdeprint/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/kdeprint/driverview.cpp b/kdeprint/driverview.cpp index 8b1ad67c7..90656681e 100644 --- a/kdeprint/driverview.cpp +++ b/kdeprint/driverview.cpp @@ -46,7 +46,7 @@ DriverView::DriverView(TQWidget *parent, const char *name) //WhatsThis strings.... (added by pfeifle@kde.org) TQString whatsThisPPDOptionsDriverPage = i18n( " " " List of Driver Options (from PPD). " - "

    The upper pane of this dialog page contains all printjob options as laid " + "

    The upper pane of this dialog page tqcontains all printjob options as laid " " down in the printer's description file (PostScript Printer Description == 'PPD')

    " "

    Click on any item in the list and watch the lower pane of this dialog page " " display the available values.

    " @@ -70,7 +70,7 @@ DriverView::DriverView(TQWidget *parent, const char *name) TQString whatsThisOptionSettingsDriverPage = i18n( " " " List of Possible Values for given Option (from PPD). " - "

    The lower pane of this dialog page contains all possible values of the printoption " + "

    The lower pane of this dialog page tqcontains all possible values of the printoption " " highlighted above, as laid " " down in the printer's description file (PostScript Printer Description == 'PPD')

    " "

    Select the value you want and proceed.

    " diff --git a/kdeprint/droptionview.cpp b/kdeprint/droptionview.cpp index f4ccedca4..468ee11c8 100644 --- a/kdeprint/droptionview.cpp +++ b/kdeprint/droptionview.cpp @@ -219,7 +219,7 @@ void OptionListView::setOption(DrBase *opt) void OptionListView::setValue(const TQString& val) { - m_list->setCurrentItem(m_choices.findIndex(val)); + m_list->setCurrentItem(m_choices.tqfindIndex(val)); } void OptionListView::slotSelectionChanged() @@ -255,9 +255,9 @@ void OptionBooleanView::setOption(DrBase *opt) { TQPtrListIterator it(*(((DrBooleanOption*)opt)->choices())); m_choices.clear(); - m_group->find(0)->setText(it.toFirst()->get("text")); + m_group->tqfind(0)->setText(it.toFirst()->get("text")); m_choices.append(it.toFirst()->name()); - m_group->find(1)->setText(it.toLast()->get("text")); + m_group->tqfind(1)->setText(it.toLast()->get("text")); m_choices.append(it.toLast()->name()); setValue(opt->valueText()); } @@ -265,7 +265,7 @@ void OptionBooleanView::setOption(DrBase *opt) void OptionBooleanView::setValue(const TQString& val) { - int ID = m_choices.findIndex(val); + int ID = m_choices.tqfindIndex(val); m_group->setButton(ID); } @@ -306,9 +306,9 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name) setTitle(i18n("No Option Selected")); setColumnLayout(0, Qt::Vertical ); - layout()->setSpacing( KDialog::spacingHint() ); - layout()->setMargin( KDialog::marginHint() ); - QVBoxLayout *main_ = new TQVBoxLayout(layout(), KDialog::marginHint()); + tqlayout()->setSpacing( KDialog::spacingHint() ); + tqlayout()->setMargin( KDialog::marginHint() ); + QVBoxLayout *main_ = new TQVBoxLayout(tqlayout(), KDialog::marginHint()); main_->addWidget(m_stack); m_item = 0; diff --git a/kdeprint/ext/ext.print b/kdeprint/ext/ext.print index ce300e5ae..195d9b51a 100644 --- a/kdeprint/ext/ext.print +++ b/kdeprint/ext/ext.print @@ -8,7 +8,7 @@ Comment[be]=Друкаваць праз вонкавую праграму (пр Comment[bn]=বহিঃস্থ প্রোগ্রামের (generic) সাহায্যে ছাপানো হোক Comment[bs]=Štampajte pomoću eksternog programa (generic) Comment[ca]=Impressió mitjançant un programa extern (genèric) -Comment[cs]=Tisk pomocí externího programu (obecné) +Comment[cs]=Tisk potqmocí externího programu (obecné) Comment[csb]=Drëkùjë brëkùjąc bùtnowi programë Comment[cy]=Argraffu drwy Raglen Allanol (cyffredinol) Comment[da]=Udskriv gennem et eksternt program (generisk) @@ -58,7 +58,7 @@ Comment[ro]=Tipăreşte prin intermediul unui program extern (generic) Comment[ru]=Печать посредством внешней программы (общая) Comment[rw]=Gucapa uciye muri Porogaramu y'Inyuma (rusange) Comment[se]=Čálit olggoldas prográmma bokte (oppalaš) -Comment[sk]=Tlač pomocou externého programu (generické) +Comment[sk]=Tlač potqmocou externého programu (generické) Comment[sl]=Tiskanje skozi zunanji program (splošno) Comment[sq]=Shtyp përmes një programi të jashtëm (përgjithshëm) Comment[sr]=Штампање преко спољњег програма (генерички) diff --git a/kdeprint/filters/poster.desktop b/kdeprint/filters/poster.desktop index 843290fab..79d44ab4f 100644 --- a/kdeprint/filters/poster.desktop +++ b/kdeprint/filters/poster.desktop @@ -92,8 +92,8 @@ Description[ca]=Utilitat per a imprimir grans pòsters en diversos fulls de pape Description[cs]=Nástroj pro tisk velkých plakátů na více menších listů. Aby bylo možné použít tento nástroj, je nutné aby byl dostupný program poster, tj. aby byl k nalezení v cestě udané promněnnou PATH. Zdrojový kó tohoto nástroje je možné nalézt na www stránce nástroje KDEPrint.

    VAROVÁNÍ: Balík, který je možné nalézt na webové stránce KDEPrintu je upravená verze originálu, který je k nalezení na každém archívu CTANu. Originální balík nebude s KDE fungovat. Musíte požít balík ze stránkyKDEPrintu. Description[csb]=Nôrzãdze do drëkòwaniô wiôldżich plakatów (pòsterów) na wielu môłëch kôrtkach papióru. Bë gó brëkòwac na stegnie (zmiennô PATH) mòszi bëc przistãpnô programa poster. Zdrojowi kòd do ti programë je mòżno nalezc na internetowi starnie Systemë Drëkù KDE.

    BÔCZËNK: Paczét na starnie Systemë Drëkù KDE je zmòdifikòwóną wersëją paczétu, chtërnegò originał przistãpny je w kôżdim archiwùm CPAN. Òriginôł równak nie dzałô pòd KDE. Mùszebnô je wersëjô ze staronë Systemë Drëkù KDE. Description[cy]=Cyleuster i argraffu posteri mawr ar dalennau bach lluosol o bapur. Er mwyn defnyddio'r gorchymyn yma, rhaid i'r gweithredadwyn poster fod yn gyraeddadwy yn eich PATH. Gall côd tarddiad i'r cyfleuster yma fod ar y wefan KDEPrint.

    RHYBUDD:Mae'r pecyn sydd ar gael ar y wefan KDEPrint yn fersiwn addasiedig o'r un gwreiddiol sydd i'w ganfod ar unrhyw drych archif CTAN, ond ni fydd y pecyn gwreiddiol yn gweithio efo KDE. Rhaid i chi ddefnyddio'r pecyn sydd ar gael ar y wefan KDEPrint. -Description[da]=Værktøj til udskrift af store plakater på flere små ark papir. Programmet poster skal være tilgængelig fra din sti (PATH) for at du kan bruge denne kommando. Værktøjets kildekode kan findes på KDEPrint's hjemmeside.

    ADVARSEL: Pakken der findes på KDEPrint's hjemmeside, er en ændret version af den oprindelige som kan findes på enhver CTAN-arkivspejlside, men den oprindelige pakke vil ikke fungere med KDE. Du er nødt til at bruge pakken fra KDEPrint's hjemmeside. -Description[de]=Dienstprogramm zum Drucken von Plakaten auf mehreren kleineren Blättern. Um diesen Befehl verwenden zu können, muss sich das Programm poster in Ihrem PATH befinden. Der Quellcode dafür lässt sich über die Webseiten des KDEPrint-Projekts herunterladen.

    Achtung: Das Paket auf den KDEPrint-Seiten weist einige Veränderungen gegenüber dem Original auf. Letzeres ist beziehbar über jeden Spiegelserver des CTAN-Archivs, aber leider funktioniert diese Originalversion nicht mit KDE. Verwenden Sie also bitte die Version auf den KDEPrint-Seiten. +Description[da]=Værktøj til udskrift af store plakater på flere små ark papir. Programmet poster skal være tilgængelig fra din sti (PATH) for at du kan bruge denne kommando. Værktøjets kildekode kan tqfindes på KDEPrint's hjemmeside.

    ADVARSEL: Pakken der tqfindes på KDEPrint's hjemmeside, er en ændret version af den oprindelige som kan tqfindes på enhver CTAN-arkivspejlside, men den oprindelige pakke vil ikke fungere med KDE. Du er nødt til at bruge pakken fra KDEPrint's hjemmeside. +Description[de]=Dienstprogramm zum Drucken von Plakaten auf mehreren kleineren Blättern. Um diesen Befehl verwenden zu können, muss sich das Programm poster in Ihrem PATH betqfinden. Der Quellcode dafür lässt sich über die Webseiten des KDEPrint-Projekts herunterladen.

    Achtung: Das Paket auf den KDEPrint-Seiten weist einige Veränderungen gegenüber dem Original auf. Letzeres ist beziehbar über jeden Spiegelserver des CTAN-Archivs, aber leider funktioniert diese Originalversion nicht mit KDE. Verwenden Sie also bitte die Version auf den KDEPrint-Seiten. Description[el]=Εργαλείο για εκτύπωση μεγάλων αφισών σε πολλές μικρές σελίδες. Για να χρησιμοποιήσετε αυτή την εντολή, το εκτελέσιμο poster πρέπει να βρίσκεται στο PATH σας. Ο πηγαίος κώδικας γι' αυτό το εργαλείο μπορεί να βρεθεί στο Δικτυακός τόπος του KDEPrint.

    ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Το πακέτο που βρίσκεται στο δικτυακό τόπο του KDEPrint είναι μια τροποποιημένη έκδοση του πρωτότυπου που μπορεί να βρεθεί σε οποιοδήποτε αρχειοθήκη CTAN, αλλά το αρχικό πακέτο δε θα δουλέψει με το KDE. Πρέπει να χρησιμοποιήσετε το πακέτο που βρίσκεται στο Δικτυακός τόπος του KDEPrint. Description[eo]=Ilo por presi grandajn plakatojn al multaj malgrandaj paperfolioj. Vi bezonas la programon poster. La kodon por tiu programo troveblas ĉe: KDEPresado ttt-paĝo.

    AVERTO: la programo trovebla sur la KDEPresado ttt-paĝo estas ŝanĝita versio de tiu sur la CTAN-ttt-paĝo. La origina pakaĵo de CTAN ne laborus sub la KDE sistemo. Vi devas uzi la pakaĵon trovebla ĉe KDEPresado ttt-paĝo. Description[es]=Aplicación para imprimir posters grandes en varias hojas de papel. Para usar esta orden, el ejecutable poster debe estar accesible en su PATH. El código fuente de esta utilidad puede encontrarse en la página web de KDEPrint.

    AVISO: el paquete en la página web KDEPrint es una versión modificada de la original que se puede encontrar en cualquier réplica de archivos de CTAN. Pero el paquete original no funciona con KDE,. Usted debe usar el paquete que se encuentra en el servidor web de KDEPrint. diff --git a/kdeprint/filters/psnup.xml b/kdeprint/filters/psnup.xml index 54b71531f..7e2477455 100644 --- a/kdeprint/filters/psnup.xml +++ b/kdeprint/filters/psnup.xml @@ -16,7 +16,7 @@ - + diff --git a/kdeprint/foomatic/kfoomaticprinterimpl.cpp b/kdeprint/foomatic/kfoomaticprinterimpl.cpp index b72fbd191..7e47a505f 100644 --- a/kdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/kdeprint/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/kdeprint/foomatic/kmfoomaticmanager.cpp b/kdeprint/foomatic/kmfoomaticmanager.cpp index 57edf07c9..76ca31a4e 100644 --- a/kdeprint/foomatic/kmfoomaticmanager.cpp +++ b/kdeprint/foomatic/kmfoomaticmanager.cpp @@ -97,10 +97,10 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem) printer->setName(e.text()); printer->setPrinterName(e.text()); printer->setState(KMPrinter::Idle); - /*if (printer->name().find('/') != -1) + /*if (printer->name().tqfind('/') != -1) { QString s(printer->name()); - int p = s.find('/'); + int p = s.tqfind('/'); printer->setPrinterName(s.left(p)); printer->setInstanceName(s.mid(p+1)); printer->addType(KMPrinter::Virtual); @@ -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/kdeprint/foomatic2loader.cpp b/kdeprint/foomatic2loader.cpp index 4ca1464dd..2e00feae3 100644 --- a/kdeprint/foomatic2loader.cpp +++ b/kdeprint/foomatic2loader.cpp @@ -141,7 +141,7 @@ DrMain* Foomatic2Loader::buildDriver() const if ( m_foodata.isEmpty() ) return NULL; - TQVariant v = m_foodata.find( "VAR" ).data(); + TQVariant v = m_foodata.tqfind( "VAR" ).data(); if ( !v.isNull() && v.type() == TQVariant::Map ) { DrMain *driver = new DrMain; @@ -151,8 +151,8 @@ DrMain* Foomatic2Loader::buildDriver() const driver->set( "matic_printer", v.mapFind( "id" ).data().toString() ); driver->set( "matic_driver", v.mapFind( "driver" ).data().toString() ); driver->set( "text", TQString( "%1 %2 (%3)" ).arg( driver->get( "manufacturer" ) ).arg( driver->get( "model" ) ).arg( driver->get( "matic_driver" ) ) ); - if ( m_foodata.contains( "POSTPIPE" ) ) - driver->set( "postpipe", m_foodata.find( "POSTPIPE" ).data().toString() ); + if ( m_foodata.tqcontains( "POSTPIPE" ) ) + driver->set( "postpipe", m_foodata.tqfind( "POSTPIPE" ).data().toString() ); v = v.mapFind( "args" ).data(); if ( !v.isNull() && v.type() == TQVariant::List ) { @@ -166,7 +166,7 @@ DrMain* Foomatic2Loader::buildDriver() const { TQString group = DrGroup::groupForOption( opt->name() ); DrGroup *grp = NULL; - if ( !groups.contains( group ) ) + if ( !groups.tqcontains( group ) ) { grp = new DrGroup; grp->set( "text", group ); @@ -211,7 +211,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const TQValueList optList; DrGroup *grp = NULL; - TQVariant V = m_foodata.find( "VAR" ).data(); + TQVariant V = m_foodata.tqfind( "VAR" ).data(); if ( !V.isNull() && V.type() == TQVariant::Map ) { TQVariant v = V.mapFind( "args" ).data(); @@ -268,7 +268,7 @@ DrMain* Foomatic2Loader::modifyDriver( DrMain *driver ) const grp->set( "text", i18n( "Adjustments" ) ); driver->addGroup( grp ); } - DrBase *oldOpt = driver->findOption( opt->name() ); + DrBase *oldOpt = driver->tqfindOption( opt->name() ); if ( oldOpt && oldOpt->type() == DrBase::List ) { TQPtrListIterator it( *( static_cast( oldOpt )->choices() ) ); diff --git a/kdeprint/fooparser.cpp b/kdeprint/fooparser.cpp index 329f80ca5..099aef1c2 100644 --- a/kdeprint/fooparser.cpp +++ b/kdeprint/fooparser.cpp @@ -261,7 +261,7 @@ static const short yycheck[] = { 4, #endif /* Note: there must be only one dollar sign in this file. - It is replaced by the list of actions, each action + It is tqreplaced by the list of actions, each action as one case of the switch. */ #define yyerrok (yyerrstatus = 0) diff --git a/kdeprint/fooscanner.cpp b/kdeprint/fooscanner.cpp index cab7426ab..ecbdca705 100644 --- a/kdeprint/fooscanner.cpp +++ b/kdeprint/fooscanner.cpp @@ -681,7 +681,7 @@ yy_match: } while ( yy_base[yy_current_state] != 94 ); -yy_find_action: +yy_tqfind_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ @@ -703,7 +703,7 @@ do_action: /* This label is used only to access EOF actions. */ *yy_cp = yy_hold_char; yy_cp = yy_last_accepting_cpos; yy_current_state = yy_last_accepting_state; - goto yy_find_action; + goto yy_tqfind_action; case 1: *yy_cp = yy_hold_char; /* undo effects of setting up yytext */ @@ -878,7 +878,7 @@ case YY_STATE_EOF(INITIAL): else { yy_cp = yy_c_buf_p; - goto yy_find_action; + goto yy_tqfind_action; } } @@ -931,7 +931,7 @@ case YY_STATE_EOF(INITIAL): yy_cp = yy_c_buf_p; yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; + goto yy_tqfind_action; } break; } diff --git a/kdeprint/kdeprintcheck.cpp b/kdeprint/kdeprintcheck.cpp index 5c807ae9b..114477191 100644 --- a/kdeprint/kdeprintcheck.cpp +++ b/kdeprint/kdeprintcheck.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/kdeprint/kdeprintd.cpp b/kdeprint/kdeprintd.cpp index 198147463..1d1231467 100644 --- a/kdeprint/kdeprintd.cpp +++ b/kdeprint/kdeprintd.cpp @@ -48,10 +48,10 @@ extern "C" } } -class StatusWindow : public QWidget +class tqStatusWindow : public QWidget { public: - StatusWindow(int pid = -1); + tqStatusWindow(int pid = -1); void setMessage(const TQString&); int pid() const { return m_pid; } @@ -62,15 +62,15 @@ private: QLabel *m_icon; }; -StatusWindow::StatusWindow(int pid) -: TQWidget(NULL, "StatusWindow", WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose), m_pid(pid) +tqStatusWindow::tqStatusWindow(int pid) +: TQWidget(NULL, "tqStatusWindow", WType_TopLevel|WStyle_DialogBorder|WStyle_StaysOnTop|WDestructiveClose), m_pid(pid) { m_label = new TQLabel(this); - m_label->setAlignment(AlignCenter); + m_label->tqsetAlignment(AlignCenter); m_button = new KPushButton(KStdGuiItem::close(), this); m_icon = new TQLabel(this); m_icon->setPixmap(DesktopIcon("fileprint")); - m_icon->setAlignment(AlignCenter); + m_icon->tqsetAlignment(AlignCenter); KWin::setIcons(winId(), *(m_icon->pixmap()), SmallIcon("fileprint")); QGridLayout *l0 = new TQGridLayout(this, 2, 3, 10, 10); l0->setRowStretch(0, 1); @@ -82,17 +82,17 @@ StatusWindow::StatusWindow(int pid) resize(200, 50); } -void StatusWindow::setMessage(const TQString& msg) +void tqStatusWindow::setMessage(const TQString& msg) { //QSize oldSz = size(); m_label->setText(msg); - //QSize sz = m_label->sizeHint(); - //sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->sizeHint().height()); + //QSize sz = m_label->tqsizeHint(); + //sz += TQSize(tqlayout()->margin()*2, tqlayout()->margin()*2+tqlayout()->spacing()+m_button->tqsizeHint().height()); // dialog will never be smaller //sz = sz.expandedTo(oldSz); //resize(sz); //setFixedSize(sz); - //layout()->activate(); + //tqlayout()->activate(); } //***************************************************************************************************** @@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla if ( !url.isLocalFile() ) { TQString tmpFilename = locateLocal( "tmp", "kdeprint_" + kapp->randomString( 8 ) ); - command.replace( re, KProcess::quote( tmpFilename ) ); + command.tqreplace( re, KProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); } else - command.replace( re, KProcess::quote( re.cap( 1 ) ) ); + command.tqreplace( re, KProcess::quote( re.cap( 1 ) ) ); } if ( checkFiles( command, files ) ) @@ -192,14 +192,14 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appName) { - StatusWindow *w = m_windows.find(pid); + tqStatusWindow *w = m_windows.tqfind(pid); if (!w && !msg.isEmpty()) { - w = new StatusWindow(pid); + w = new tqStatusWindow(pid); if (appName.isEmpty()) - w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")")); + w->setCaption(i18n("Printing tqStatus - %1").arg("(pid="+TQString::number(pid)+")")); else - w->setCaption(i18n("Printing Status - %1").arg(appName)); + w->setCaption(i18n("Printing tqStatus - %1").arg(appName)); connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed())); w->show(); m_windows.insert(pid, w); @@ -215,7 +215,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN void KDEPrintd::slotClosed() { - const StatusWindow *w = static_cast(sender()); + const tqStatusWindow *w = static_cast(sender()); if (w) { m_windows.remove(w->pid()); diff --git a/kdeprint/kdeprintd.h b/kdeprint/kdeprintd.h index 48fcdd021..2d7ff38a5 100644 --- a/kdeprint/kdeprintd.h +++ b/kdeprint/kdeprintd.h @@ -29,7 +29,7 @@ class KPrintProcess; class KProcess; -class StatusWindow; +class tqStatusWindow; class KDEPrintd : public KDEDModule { @@ -59,7 +59,7 @@ protected: private: class Request; TQPtrList m_processpool; - TQIntDict m_windows; + TQIntDict m_windows; TQPtrList m_requestsPending; }; diff --git a/kdeprint/kfilelist.cpp b/kdeprint/kfilelist.cpp index c61f3b948..c32c20ab7 100644 --- a/kdeprint/kfilelist.cpp +++ b/kdeprint/kfilelist.cpp @@ -123,7 +123,7 @@ KFileList::KFileList(TQWidget *parent, const char *name) m_remove->setEnabled(false); m_open = new TQToolButton(this); - m_open->setIconSet(SmallIconSet("filefind")); + m_open->setIconSet(SmallIconSet("filetqfind")); connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile())); TQToolTip::add(m_open, i18n("Open file")); TQWhatsThis::add(m_open, whatsThisOpenFileButton); @@ -263,7 +263,7 @@ void KFileList::slotOpenFile() } } -TQSize KFileList::sizeHint() const +TQSize KFileList::tqsizeHint() const { return TQSize(100, 100); } diff --git a/kdeprint/kfilelist.h b/kdeprint/kfilelist.h index ca4d925c8..9df1c3037 100644 --- a/kdeprint/kfilelist.h +++ b/kdeprint/kfilelist.h @@ -37,7 +37,7 @@ public: void setFileList(const TQStringList&); TQStringList fileList() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected slots: void slotAddFile(); diff --git a/kdeprint/kmdbentry.cpp b/kdeprint/kmdbentry.cpp index 9402dd02c..9c57b5220 100644 --- a/kdeprint/kmdbentry.cpp +++ b/kdeprint/kmdbentry.cpp @@ -27,7 +27,7 @@ KMDBEntry::KMDBEntry() : recommended(false) bool KMDBEntry::validate(bool checkIt) { - // check model: if one of "model" or "modelname" is empty, replace + // check model: if one of "model" or "modelname" is empty, tqreplace // by the other one. At the end, "model" must be non empty. if (model.isEmpty()) { @@ -43,13 +43,13 @@ bool KMDBEntry::validate(bool checkIt) // check manufacturer if (manufacturer.isEmpty()) { - int p = model.find(' ',0); + int p = model.tqfind(' ',0); if (p != -1) manufacturer = model.left(p); if (manufacturer.isEmpty()) return false; } // extract manufacturer from model - if (model.find(manufacturer,0,false) == 0) + if (model.tqfind(manufacturer,0,false) == 0) { model = model.right(model.length()-manufacturer.length()-1).stripWhiteSpace(); if (model.isEmpty()) return false; diff --git a/kdeprint/kmfactory.cpp b/kdeprint/kmfactory.cpp index 96397adc4..407fc485f 100644 --- a/kdeprint/kmfactory.cpp +++ b/kdeprint/kmfactory.cpp @@ -213,7 +213,7 @@ void KMFactory::loadFactory(const TQString& syst) if (sys.isEmpty()) // load default configured print plugin sys = printSystem(); - QString libname = TQString::fromLatin1("kdeprint_%1").arg(sys); + QString libname = TQString::tqfromLatin1("kdeprint_%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) { QString path(name); if (path[0] != '/') - path = locate("data", TQString::fromLatin1("kdeprint/plugins/%1.print").arg(name)); + path = locate("data", TQString::tqfromLatin1("kdeprint/plugins/%1.print").arg(name)); KSimpleConfig conf(path); PluginInfo info; @@ -333,7 +333,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) void KMFactory::registerObject(KPReloadObject *obj, bool priority) { // check if object already registered, then add it - if (m_objects.findRef(obj) == -1) + if (m_objects.tqfindRef(obj) == -1) { if (priority) m_objects.prepend(obj); @@ -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/kdeprint/kmjob.cpp b/kdeprint/kmjob.cpp index 0576303e2..5c904538b 100644 --- a/kdeprint/kmjob.cpp +++ b/kdeprint/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("kdeprint_job"); diff --git a/kdeprint/kmjobmanager.cpp b/kdeprint/kmjobmanager.cpp index afbca7a2f..ef6b56632 100644 --- a/kdeprint/kmjobmanager.cpp +++ b/kdeprint/kmjobmanager.cpp @@ -60,7 +60,7 @@ void KMJobManager::removeDiscardedJobs() } } -/*KMJob* KMJobManager::findJob(int ID) +/*KMJob* KMJobManager::tqfindJob(int ID) { TQPtrListIterator it(m_jobs); for (;it.current();++it) @@ -69,7 +69,7 @@ void KMJobManager::removeDiscardedJobs() return 0; }*/ -KMJob* KMJobManager::findJob(const TQString& uri) +KMJob* KMJobManager::tqfindJob(const TQString& uri) { TQPtrListIterator it(m_jobs); for (;it.current();++it) @@ -83,7 +83,7 @@ void KMJobManager::addJob(KMJob *job) // only keep it if "printer" is not empty, and in printer filter if (!job->uri().isEmpty() && !job->printer().isEmpty()) { - KMJob *aJob = findJob(job->uri()); + KMJob *aJob = tqfindJob(job->uri()); if (aJob) { aJob->copy(*job); @@ -101,7 +101,7 @@ void KMJobManager::addJob(KMJob *job) /*bool KMJobManager::sendCommand(int ID, int action, const TQString& arg) { - KMJob *job = findJob(ID); + KMJob *job = tqfindJob(ID); if (job) { TQPtrList l; @@ -114,7 +114,7 @@ void KMJobManager::addJob(KMJob *job) bool KMJobManager::sendCommand(const TQString& uri, int action, const TQString& arg) { - KMJob *job = findJob(uri); + KMJob *job = tqfindJob(uri); if (job) { TQPtrList l; @@ -214,7 +214,7 @@ void KMJobManager::validatePluginActions(KActionCollection*, const TQPtrListm_type[type] = QMAX(0, jf->m_type[type]-1); diff --git a/kdeprint/kmjobmanager.h b/kdeprint/kmjobmanager.h index 643be34d1..a4eae0835 100644 --- a/kdeprint/kmjobmanager.h +++ b/kdeprint/kmjobmanager.h @@ -43,7 +43,7 @@ class KAction; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMJobManager : public QObject +class KDEPRINT_EXPORT KMJobManager : public TQObject { Q_OBJECT @@ -68,8 +68,8 @@ public: int limit(); void setLimit(int val); - //KMJob* findJob(int ID); - KMJob* findJob(const TQString& uri); + //KMJob* tqfindJob(int ID); + KMJob* tqfindJob(const TQString& uri); //bool sendCommand(int ID, int action, const TQString& arg = TQString::null); bool sendCommand(const TQString& uri, int action, const TQString& arg = TQString::null); bool sendCommand(const TQPtrList& jobs, int action, const TQString& arg = TQString::null); diff --git a/kdeprint/kmmanager.cpp b/kdeprint/kmmanager.cpp index ec161d755..82136ca78 100644 --- a/kdeprint/kmmanager.cpp +++ b/kdeprint/kmmanager.cpp @@ -42,8 +42,8 @@ KMManager::KMManager(TQObject *parent, const char *name) m_printers.setAutoDelete(true); m_fprinters.setAutoDelete(false); m_hasmanagement = false; - m_printeroperationmask = 0; - m_serveroperationmask = 0; + m_printeroperationtqmask = 0; + m_serveroperationtqmask = 0; m_printerfilter = new PrinterFilter(this); m_specialmgr = new KMSpecialManager(this); @@ -98,7 +98,7 @@ bool KMManager::removePrinter(KMPrinter*) bool KMManager::removePrinter(const TQString& name) { - KMPrinter *p = findPrinter(name); + KMPrinter *p = tqfindPrinter(name); return (p ? removePrinter(p) : false); } @@ -109,7 +109,7 @@ bool KMManager::enablePrinter(KMPrinter*, bool) bool KMManager::enablePrinter(const TQString& name, bool state) { - KMPrinter *p = findPrinter(name); + KMPrinter *p = tqfindPrinter(name); return (p ? enablePrinter(p, state) : false); } @@ -120,7 +120,7 @@ bool KMManager::startPrinter(KMPrinter*, bool) bool KMManager::startPrinter(const TQString& name, bool state) { - KMPrinter *p = findPrinter(name); + KMPrinter *p = tqfindPrinter(name); return (p ? startPrinter(p, state) : false); } @@ -145,7 +145,7 @@ bool KMManager::completePrinterShort(KMPrinter *p) bool KMManager::completePrinter(const TQString& name) { - KMPrinter *p = findPrinter(name); + KMPrinter *p = tqfindPrinter(name); return (p ? completePrinter(p) : false); } @@ -156,7 +156,7 @@ bool KMManager::setDefaultPrinter(KMPrinter*) bool KMManager::setDefaultPrinter(const TQString& name) { - KMPrinter *p = findPrinter(name); + KMPrinter *p = tqfindPrinter(name); return (p ? setDefaultPrinter(p) : false); } @@ -170,7 +170,7 @@ bool KMManager::testPrinter(KMPrinter *prt) return false; } KPrinter pr; - bool prExist = (findPrinter(prt->printerName()) != 0), result(false); + bool prExist = (tqfindPrinter(prt->printerName()) != 0), result(false); pr.setPrinterName(prt->printerName()); pr.setSearchName(prt->name()); pr.setDocName("KDE Print Test"); @@ -186,7 +186,7 @@ bool KMManager::testPrinter(KMPrinter *prt) // return notImplemented(); } -KMPrinter* KMManager::findPrinter(const TQString& name) +KMPrinter* KMManager::tqfindPrinter(const TQString& name) { TQPtrListIterator it(m_printers); for (;it.current();++it) @@ -263,12 +263,12 @@ TQPtrList* KMManager::printerList(bool reload) m_fprinters.append(prt); } - // try to find the default printer from these situations: + // try to tqfind the default printer from these situations: // - it already exists from .lpoptions file // - use the PRINTER variable if (!softDefault()) { - KMPrinter *defprinter = findPrinter(TQString::fromLatin1(getenv("PRINTER"))); + KMPrinter *defprinter = tqfindPrinter(TQString::tqfromLatin1(getenv("PRINTER"))); if (defprinter) setSoftDefault(defprinter); } @@ -297,7 +297,7 @@ void KMManager::addPrinter(KMPrinter *p) delete p; else { - KMPrinter *other = findPrinter(p->name()); + KMPrinter *other = tqfindPrinter(p->name()); if (other) { other->copy(*p); @@ -400,7 +400,7 @@ void KMManager::setSoftDefault(KMPrinter *p) if (p) { p->setSoftDefault(true); - KMPrinter *pp = findPrinter(p->printerName()); + KMPrinter *pp = tqfindPrinter(p->printerName()); if (pp) pp->setOwnSoftDefault(true); } @@ -443,7 +443,7 @@ bool KMManager::createSpecialPrinter(KMPrinter *p) { if (p && p->isSpecial()) { - KMPrinter *old = findPrinter(p->name()); + KMPrinter *old = tqfindPrinter(p->name()); if (old && !old->isSpecial()) { setErrorMsg(i18n("Can't overwrite regular printer with special printer settings.")); @@ -458,7 +458,7 @@ bool KMManager::createSpecialPrinter(KMPrinter *p) bool KMManager::removeSpecialPrinter(KMPrinter *p) { - if (p && p->isSpecial() && m_printers.findRef(p) != -1) + if (p && p->isSpecial() && m_printers.tqfindRef(p) != -1) { m_printers.removeRef(p); return m_specialmgr->savePrinters(); @@ -475,7 +475,7 @@ TQStringList KMManager::detectLocalPrinters() { QStringList list; for (int i=0; i<3; i++) - list << TQString::null << TQString::fromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null; + list << TQString::null << TQString::tqfromLatin1("parallel:/dev/lp%1").arg(i) << i18n("Parallel Port #%1").arg(i+1) << TQString::null; return list; } @@ -488,7 +488,7 @@ int KMManager::addPrinterWizard(TQWidget *parent) { int (*func)(TQWidget*) = (int(*)(TQWidget*))lib->symbol("add_printer_wizard"); if (!func) - setErrorMsg(i18n("Unable to find wizard object in management library.")); + setErrorMsg(i18n("Unable to tqfind wizard object in management library.")); else return func(parent); } @@ -504,7 +504,7 @@ bool KMManager::invokeOptionsDialog(TQWidget *parent) { bool (*func)(TQWidget*) = (bool(*)(TQWidget*))lib->symbol("config_dialog"); if (!func) - setErrorMsg(i18n("Unable to find options dialog in management library.")); + setErrorMsg(i18n("Unable to tqfind options dialog in management library.")); else return func(parent); } diff --git a/kdeprint/kmmanager.h b/kdeprint/kmmanager.h index 8826273a0..304245730 100644 --- a/kdeprint/kmmanager.h +++ b/kdeprint/kmmanager.h @@ -45,7 +45,7 @@ class PrinterFilter; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMManager : public QObject +class KDEPRINT_EXPORT KMManager : public TQObject { Q_OBJECT @@ -97,7 +97,7 @@ public: bool startPrinter(const TQString& name, bool state); bool completePrinter(const TQString& name); bool setDefaultPrinter(const TQString& name); - int printerOperationMask() const { return m_printeroperationmask; } + int printerOperationMask() const { return m_printeroperationtqmask; } int addPrinterWizard(TQWidget *parent = 0); // special printer management functions @@ -105,7 +105,7 @@ public: bool removeSpecialPrinter(KMPrinter *p); // printer listing functions - KMPrinter* findPrinter(const TQString& name); + KMPrinter* tqfindPrinter(const TQString& name); TQPtrList* printerList(bool reload = true); TQPtrList* printerListComplete(bool reload = true); KMPrinter* defaultPrinter(); @@ -129,7 +129,7 @@ public: virtual TQString stateInformation(); // server functions - int serverOperationMask() const { return m_serveroperationmask; } + int serverOperationMask() const { return m_serveroperationtqmask; } virtual bool restartServer(); virtual bool configureServer(TQWidget *parent = 0); virtual TQStringList detectLocalPrinters(); @@ -161,8 +161,8 @@ protected: bool uncompressFile(const TQString& srcname, TQString& destname); bool notImplemented(); void setHasManagement(bool on) { m_hasmanagement = on; } - void setPrinterOperationMask(int m) { m_printeroperationmask = m; } - void setServerOperationMask(int m) { m_serveroperationmask = m; } + void setPrinterOperationMask(int m) { m_printeroperationtqmask = m; } + void setServerOperationMask(int m) { m_serveroperationtqmask = m; } TQString testPage(); void discardAllPrinters(bool); void setUpdatePossible( bool ); @@ -172,8 +172,8 @@ protected: QString m_errormsg; KMPrinterList m_printers, m_fprinters; // filtered printers bool m_hasmanagement; - int m_printeroperationmask; - int m_serveroperationmask; + int m_printeroperationtqmask; + int m_serveroperationtqmask; KMSpecialManager *m_specialmgr; KMVirtualManager *m_virtualmgr; PrinterFilter *m_printerfilter; diff --git a/kdeprint/kmprinter.cpp b/kdeprint/kmprinter.cpp index 5749a47c5..f08cf4109 100644 --- a/kdeprint/kmprinter.cpp +++ b/kdeprint/kmprinter.cpp @@ -165,7 +165,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent) fName = ( printer->docName() + "." + ext ); else { - int p = fName.findRev( '.' ); + int p = fName.tqfindRev( '.' ); if ( p == -1 ) fName.append( "." ).append( ext ); else @@ -216,7 +216,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent) TQString KMPrinter::deviceProtocol() const { - int p = m_device.find( ':' ); + int p = m_device.tqfind( ':' ); if ( p != -1 ) return m_device.left( p ); else diff --git a/kdeprint/kmprinter.h b/kdeprint/kmprinter.h index 8a43e7b13..0c8465ad3 100644 --- a/kdeprint/kmprinter.h +++ b/kdeprint/kmprinter.h @@ -147,7 +147,7 @@ public: void setOwnSoftDefault(bool on) { m_ownsoftdefault = on; } static int compare(KMPrinter *p1, KMPrinter *p2); const TQString& option(const TQString& key) const { return m_options[key]; } - bool hasOption(const TQString& key) const { return m_options.contains(key); } + bool hasOption(const TQString& key) const { return m_options.tqcontains(key); } void setOption(const TQString& key, const TQString& value) { if (!key.isEmpty()) m_options[key] = value; } void removeOption(const TQString& key) { m_options.remove(key); } TQMap options() const { return m_options; } diff --git a/kdeprint/kmspecialmanager.cpp b/kdeprint/kmspecialmanager.cpp index 7ccebedff..bb2caea24 100644 --- a/kdeprint/kmspecialmanager.cpp +++ b/kdeprint/kmspecialmanager.cpp @@ -66,7 +66,7 @@ bool KMSpecialManager::savePrinters() conf.setGroup("General"); int n = conf.readNumEntry("Number",0); for (int i=0;iisSpecial() || 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 0) - return m_jobs.find(pid); + return m_jobs.tqfind(pid); } return NULL; } @@ -150,7 +150,7 @@ void KMThreadJob::createJob(KMJob *job) if (job->id() > 0) { loadJobs(); - if (!m_jobs.find(job->id())) + if (!m_jobs.tqfind(job->id())) { m_jobs.insert(job->id(),job); saveJobs(); diff --git a/kdeprint/kmthreadjob.h b/kdeprint/kmthreadjob.h index 3d2e6cf2f..d967c08bf 100644 --- a/kdeprint/kmthreadjob.h +++ b/kdeprint/kmthreadjob.h @@ -26,14 +26,14 @@ class KMJob; class KMJobManager; -class KMThreadJob : public QObject +class KMThreadJob : public TQObject { public: KMThreadJob(TQObject *parent = 0, const char *name = 0); ~KMThreadJob(); - KMJob* findJob(int ID); - KMJob* findJob(const TQString& uri); + KMJob* tqfindJob(int ID); + KMJob* tqfindJob(const TQString& uri); bool removeJob(int ID); void createJob(KMJob*); void updateManager(KMJobManager*); diff --git a/kdeprint/kmuimanager.h b/kdeprint/kmuimanager.h index 3c6a74719..478dbc0df 100644 --- a/kdeprint/kmuimanager.h +++ b/kdeprint/kmuimanager.h @@ -33,7 +33,7 @@ class KPrinterPropertyDialog; class KMConfigDialog; class TQListView; -class KDEPRINT_EXPORT KMUiManager : public QObject +class KDEPRINT_EXPORT KMUiManager : public TQObject { Q_OBJECT public: diff --git a/kdeprint/kmvirtualmanager.cpp b/kdeprint/kmvirtualmanager.cpp index 268da3eac..349a8ae21 100644 --- a/kdeprint/kmvirtualmanager.cpp +++ b/kdeprint/kmvirtualmanager.cpp @@ -53,22 +53,22 @@ KMVirtualManager::~KMVirtualManager() { } -KMPrinter* KMVirtualManager::findPrinter(const TQString& name) +KMPrinter* KMVirtualManager::tqfindPrinter(const TQString& name) { - return m_manager->findPrinter(name); + return m_manager->tqfindPrinter(name); } -KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name) +KMPrinter* KMVirtualManager::tqfindInstance(KMPrinter *p, const TQString& name) { QString instname(instanceName(p->printerName(),name)); - return findPrinter(instname); + return tqfindPrinter(instname); } void KMVirtualManager::addPrinter(KMPrinter *p) { if (p && p->isValid()) { - KMPrinter *other = findPrinter(p->name()); + KMPrinter *other = tqfindPrinter(p->name()); if (other) { other->copy(*p); @@ -97,7 +97,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag) bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name) { QString instname(instanceName(p->printerName(),name)); - KMPrinter *printer = findPrinter(instname); + KMPrinter *printer = tqfindPrinter(instname); if (printer) return printer->isSoftDefault(); else @@ -107,7 +107,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name) void KMVirtualManager::create(KMPrinter *p, const TQString& name) { QString instname = instanceName(p->printerName(),name); - if (findPrinter(instname) != NULL) return; + if (tqfindPrinter(instname) != NULL) return; KMPrinter *printer = new KMPrinter; printer->setName(instname); printer->setPrinterName(p->printerName()); @@ -124,8 +124,8 @@ void KMVirtualManager::create(KMPrinter *p, const TQString& name) void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& name) { QString instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name)); - KMPrinter *prsrc = findPrinter(instsrc); - if (!prsrc || findPrinter(instname) != NULL) return; + KMPrinter *prsrc = tqfindPrinter(instsrc); + if (!prsrc || tqfindPrinter(instname) != NULL) return; KMPrinter *printer = new KMPrinter; printer->copy(*prsrc); printer->setName(instname); @@ -138,7 +138,7 @@ void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& n void KMVirtualManager::remove(KMPrinter *p, const TQString& name) { QString instname = instanceName(p->printerName(),name); - KMPrinter *printer = findPrinter(instname); + KMPrinter *printer = tqfindPrinter(instname); if (!printer) return; if (name.isEmpty()) { // remove default instance => only remove options, keep the KMPrinter object @@ -167,11 +167,11 @@ void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget return; } - KMPrinter *printer = findPrinter(instname); + KMPrinter *printer = tqfindPrinter(instname); if (!printer) { // create it if necessary create(p,name); - printer = findPrinter(instname); + printer = tqfindPrinter(instname); } if (printer) setDefault(printer,true); @@ -210,7 +210,7 @@ void KMVirtualManager::refresh() void KMVirtualManager::checkPrinter(KMPrinter *p) { - KMPrinter *realprinter = m_manager->findPrinter(p->printerName()); + KMPrinter *realprinter = m_manager->tqfindPrinter(p->printerName()); if (!realprinter || realprinter->isDiscarded()) { p->setType(KMPrinter::Invalid); @@ -263,7 +263,7 @@ void KMVirtualManager::loadFile(const TQString& filename) words = TQStringList::split(' ',line,false); if (words.count() < 2) continue; pair = TQStringList::split('/',words[1],false); - realprinter = m_manager->findPrinter(KURL::decode_string(pair[0])); + realprinter = m_manager->tqfindPrinter(KURL::decode_string(pair[0])); if (realprinter && !realprinter->isDiscarded()) { // keep only instances corresponding to an existing and // non discarded printer. @@ -286,7 +286,7 @@ void KMVirtualManager::loadFile(const TQString& filename) addPrinter(printer); // don't use "printer" after this point !!! // check default state if (words[0].lower().startsWith("default")) - setDefault(findPrinter(KURL::decode_string(words[1])),false); + setDefault(tqfindPrinter(KURL::decode_string(words[1])),false); } } } diff --git a/kdeprint/kmvirtualmanager.h b/kdeprint/kmvirtualmanager.h index 5725854e2..4ace8d609 100644 --- a/kdeprint/kmvirtualmanager.h +++ b/kdeprint/kmvirtualmanager.h @@ -43,8 +43,8 @@ public: void virtualList(TQPtrList& list, const TQString& prname); void triggerSave(); - KMPrinter* findPrinter(const TQString& name); - KMPrinter* findInstance(KMPrinter *p, const TQString& name); + KMPrinter* tqfindPrinter(const TQString& name); + KMPrinter* tqfindInstance(KMPrinter *p, const TQString& name); void setDefault(KMPrinter *p, bool save = true); TQString defaultPrinterName(); bool isDefault(KMPrinter *p, const TQString& name); diff --git a/kdeprint/kpcopiespage.cpp b/kdeprint/kpcopiespage.cpp index 1a7756913..a19d6744b 100644 --- a/kdeprint/kpcopiespage.cpp +++ b/kdeprint/kpcopiespage.cpp @@ -186,7 +186,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) m_order = new TQCheckBox(i18n("Re&verse"), m_copybox); TQWhatsThis::add(m_order, whatsThisReverseLabel); m_collatepix = new TQLabel(m_copybox); - m_collatepix->setAlignment(Qt::AlignCenter); + m_collatepix->tqsetAlignment(Qt::AlignCenter); m_collatepix->setMinimumHeight(70); QLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox); m_copies = new TQSpinBox(m_copybox); @@ -213,14 +213,14 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) TQWidget::setTabOrder( m_copies, m_collate ); TQWidget::setTabOrder( m_collate, m_order ); - // layout creation + // tqlayout creation QGridLayout *l1 = new TQGridLayout(this, 2, 2, 0, 5); l1->setRowStretch(1,1); l1->setColStretch(0,1); l1->setColStretch(1,1); l1->addWidget(m_pagebox,0,0); l1->addWidget(m_copybox,0,1); - QVBoxLayout *l3 = new TQVBoxLayout(m_pagebox->layout(), 5); + QVBoxLayout *l3 = new TQVBoxLayout(m_pagebox->tqlayout(), 5); l3->addWidget(m_all); l3->addWidget(m_current); QHBoxLayout *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); - QGridLayout *l5 = new TQGridLayout(m_copybox->layout(), 4, 2, 10); + QGridLayout *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& 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/kdeprint/kpfilterpage.cpp b/kdeprint/kpfilterpage.cpp index d7906a290..a55b0bbe2 100644 --- a/kdeprint/kpfilterpage.cpp +++ b/kdeprint/kpfilterpage.cpp @@ -100,7 +100,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) " the filtering chain fail. For example: if your file is ASCII text, and you want the " " output being processed by the 'Multipage per Sheet' filter, the first filter must be " " one that processes ASCII into PostScript.

    " - "

    KDEPrint can utilize any external filtering program which you may find useful " + "

    KDEPrint can utilize any external filtering program which you may tqfind useful " " through this interface.

    " "

    KDEPrint ships preconfigured with support for a selection of common filters. These " " filters however need to be " @@ -295,7 +295,7 @@ void KPFilterPage::setOptions(const TQMap& opts) TQDictIterator dit(m_activefilters); for (;dit.current();) { - if (filters.find(dit.currentKey()) == filters.end()) + if (filters.tqfind(dit.currentKey()) == filters.end()) m_activefilters.remove(dit.currentKey()); else { @@ -309,7 +309,7 @@ void KPFilterPage::setOptions(const TQMap& opts) for (TQStringList::ConstIterator sit=filters.begin(); sit!=filters.end(); ++sit) { KXmlCommand *f(0); - if ((f=m_activefilters.find(*sit)) == 0) + if ((f=m_activefilters.tqfind(*sit)) == 0) { f = KXmlCommandManager::self()->loadCommand(*sit); if (f) @@ -329,7 +329,7 @@ void KPFilterPage::getOptions(TQMap& opts, bool incldef) QStringList filters = activeList(); for (TQStringList::ConstIterator it=filters.begin(); it!=filters.end(); ++it) { - KXmlCommand *f = m_activefilters.find(*it); + KXmlCommand *f = m_activefilters.tqfind(*it); if (f) f->getOptions(opts, incldef); } @@ -355,7 +355,7 @@ KXmlCommand* KPFilterPage::currentFilter() { KXmlCommand *filter(0); if (m_view->selectedItem()) - filter = m_activefilters.find(m_view->selectedItem()->text(1)); + filter = m_activefilters.tqfind(m_view->selectedItem()->text(1)); return filter; } @@ -367,10 +367,10 @@ void KPFilterPage::checkFilterChain() while (item) { item->setPixmap(0, (ok ? SmallIcon("filter") : SmallIcon("filterstop"))); - KXmlCommand *f1 = m_activefilters.find(item->text(1)); + KXmlCommand *f1 = m_activefilters.tqfind(item->text(1)); if (f1 && item->nextSibling()) { - KXmlCommand *f2 = m_activefilters.find(item->nextSibling()->text(1)); + KXmlCommand *f2 = m_activefilters.tqfind(item->nextSibling()->text(1)); if (f2) { if (!f2->acceptMimeType(f1->mimeType())) diff --git a/kdeprint/kpgeneralpage.cpp b/kdeprint/kpgeneralpage.cpp index 73f21f4af..7452ba785 100644 --- a/kdeprint/kpgeneralpage.cpp +++ b/kdeprint/kpgeneralpage.cpp @@ -71,7 +71,7 @@ static void setComboItem(TQComboBox *cb, const TQString& txt) } } -static int findOption(const char *strs[], int n, const TQString& txt) +static int tqfindOption(const char *strs[], int n, const TQString& txt) { for (int i=0;i " "

    \"General\"

    " - "

    This dialog page contains general print job settings." + "

    This dialog page tqcontains general print job settings." " General settings are applicable to most printers, most jobs " " and most job file types. " "

    To get more specific help, enable the \"WhatsThis\" cursor and click on any of the " @@ -244,7 +244,7 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const " The page image does not get scaled if you print 1 page per sheet (the default setting.). " "

    Note 2: If you select multiple pages per sheet here, the scaling and re-arranging is done " " by your printing system. Be aware, that some printers can by themselves print multiple pages per sheet. " - " In this case you find the option in the printer driver settings. Be careful: if you enable multiple " + " In this case you tqfind the option in the printer driver settings. Be careful: if you enable multiple " " pages per sheet in both places, your printout will not look as you intended.

    " "
    " "
    " @@ -261,15 +261,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const // widget creation QLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel); QLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this); - m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_papertypelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel); QLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this); - m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_inputslotlabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel); m_pagesize = new TQComboBox(this); @@ -304,19 +304,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_portrait->setChecked(true); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->tqsetAlignment(Qt::AlignCenter); QRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox); QRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox); QRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox); m_dupnone->setChecked(true); m_duplexpix = new TQLabel(m_duplexbox); - m_duplexpix->setAlignment(Qt::AlignCenter); + m_duplexpix->tqsetAlignment(Qt::AlignCenter); QRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); QRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); QRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); m_nup1->setChecked(true); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->tqsetAlignment(Qt::AlignCenter); m_startbanner = new TQComboBox(m_bannerbox); m_endbanner = new TQComboBox(m_bannerbox); QLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox); @@ -324,7 +324,7 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_startbannerlabel->setBuddy(m_startbanner); m_endbannerlabel->setBuddy(m_endbanner); - // layout creation + // tqlayout creation QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQWhatsThis::add(this, whatsThisPrintPropertiesGeneralPage); QGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint()); @@ -346,27 +346,27 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const lay2->addWidget(m_nupbox, 1, 1); lay2->setColStretch(0, 1); lay2->setColStretch(1, 1); - QGridLayout *lay3 = new TQGridLayout(m_orientbox->layout(), 4, 2, + QGridLayout *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); - QGridLayout *lay4 = new TQGridLayout(m_duplexbox->layout(), 3, 2, + QGridLayout *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 ); - QGridLayout *lay5 = new TQGridLayout(m_nupbox->layout(), 3, 2, + QGridLayout *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); - QGridLayout *lay6 = new TQGridLayout(m_bannerbox->layout(), 2, 2, + QGridLayout *lay6 = new TQGridLayout(m_bannerbox->tqlayout(), 2, 2, KDialog::spacingHint()); lay6->addWidget(m_startbannerlabel, 0, 0); lay6->addWidget(m_endbannerlabel, 1, 0); @@ -392,28 +392,28 @@ void KPGeneralPage::initialize() if (driver()) { // Size, Type and Source - DrListOption *opt = (DrListOption*)driver()->findOption("PageSize"); + DrListOption *opt = (DrListOption*)driver()->tqfindOption("PageSize"); if (opt) initCombo(m_pagesize,opt); else m_pagesize->setEnabled(false); - opt = (DrListOption*)driver()->findOption("MediaType"); + opt = (DrListOption*)driver()->tqfindOption("MediaType"); if (opt) initCombo(m_papertype,opt); else m_papertype->setEnabled(false); - opt = (DrListOption*)driver()->findOption("InputSlot"); + opt = (DrListOption*)driver()->tqfindOption("InputSlot"); if (opt) initCombo(m_inputslot,opt); else m_inputslot->setEnabled(false); // Duplex - opt = (DrListOption*)driver()->findOption("Duplex"); + opt = (DrListOption*)driver()->tqfindOption("Duplex"); if (opt) { if ( opt->choices()->count() == 2 ) { // probably a On/Off option instead of the standard PS one - TQButton *btn = m_duplexbox->find( DUPLEX_SHORT_ID ); + TQButton *btn = m_duplexbox->tqfind( DUPLEX_SHORT_ID ); m_duplexbox->remove( btn ); btn->hide(); //delete btn; - m_duplexbox->find( DUPLEX_NONE_ID )->setText( i18n( "Disabled" ) ); - m_duplexbox->find( DUPLEX_LONG_ID )->setText( i18n( "Enabled" ) ); + m_duplexbox->tqfind( DUPLEX_NONE_ID )->setText( i18n( "Disabled" ) ); + m_duplexbox->tqfind( DUPLEX_LONG_ID )->setText( i18n( "Enabled" ) ); m_duplexpix->hide(); } if (opt->currentChoice()) @@ -440,7 +440,7 @@ void KPGeneralPage::initialize() m_pagesize->insertItem(i18n(default_size[i])); // set default page size using locale settings QString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize())); - int index = findOption(default_size, DEFAULT_SIZE, psname); + int index = tqfindOption(default_size, DEFAULT_SIZE, psname); if (index >= 0) m_pagesize->setCurrentItem(index); // MediaType @@ -487,20 +487,20 @@ void KPGeneralPage::setOptions(const TQMap& opts) { value = *it; DrBase *ch; - if ((ch = (driver()->findOption("PageSize"))) && - (ch = (static_cast(ch))->findChoice(value))) + if ((ch = (driver()->tqfindOption("PageSize"))) && + (ch = (static_cast(ch))->tqfindChoice(value))) { if (m_pagesize->isEnabled()) setComboItem(m_pagesize, ch->get("text")); } - else if ((ch = (driver()->findOption("MediaType"))) && - (ch = (static_cast(ch))->findChoice(value))) + else if ((ch = (driver()->tqfindOption("MediaType"))) && + (ch = (static_cast(ch))->tqfindChoice(value))) { if (m_papertype->isEnabled()) setComboItem(m_papertype, ch->get("text")); } - else if ((ch = (driver()->findOption("InputSlot"))) && - (ch = static_cast(ch)->findChoice(value))) + else if ((ch = (driver()->tqfindOption("InputSlot"))) && + (ch = static_cast(ch)->tqfindChoice(value))) { if (m_inputslot) setComboItem(m_inputslot, ch->get("text")); @@ -513,19 +513,19 @@ void KPGeneralPage::setOptions(const TQMap& opts) value = opts["PageSize"]; if (m_pagesize->isEnabled() && !value.isEmpty()) { - DrBase *ch = ((DrListOption*)driver()->findOption("PageSize"))->findChoice(value); + DrBase *ch = ((DrListOption*)driver()->tqfindOption("PageSize"))->tqfindChoice(value); if (ch) setComboItem(m_pagesize, ch->get("text")); } value = opts["MediaType"]; if (m_papertype->isEnabled() && !value.isEmpty()) { - DrBase *ch = ((DrListOption*)driver()->findOption("MediaType"))->findChoice(value); + DrBase *ch = ((DrListOption*)driver()->tqfindOption("MediaType"))->tqfindChoice(value); if (ch) setComboItem(m_papertype, ch->get("text")); } value = opts["InputSlot"]; if (m_inputslot && m_inputslot->isEnabled() && !value.isEmpty()) { - DrBase *ch = ((DrListOption*)driver()->findOption("InputSlot"))->findChoice(value); + DrBase *ch = ((DrListOption*)driver()->tqfindOption("InputSlot"))->tqfindChoice(value); if (ch) setComboItem(m_inputslot, ch->get("text")); } @@ -541,7 +541,7 @@ void KPGeneralPage::setOptions(const TQMap& opts) } else { - // Try to find "media" option + // Try to tqfind "media" option value = opts["media"]; if (!value.isEmpty()) { @@ -551,18 +551,18 @@ void KPGeneralPage::setOptions(const TQMap& opts) { value = *it; - if ((index=findOption(default_size,DEFAULT_SIZE,value)) >= 0) + if ((index=tqfindOption(default_size,DEFAULT_SIZE,value)) >= 0) m_pagesize->setCurrentItem(index); - else if ((index=findOption(default_type,DEFAULT_TYPE,value)) >= 0) + else if ((index=tqfindOption(default_type,DEFAULT_TYPE,value)) >= 0) m_papertype->setCurrentItem(index); - else if ((index=findOption(default_source,DEFAULT_SOURCE,value)) >= 0) + else if ((index=tqfindOption(default_source,DEFAULT_SOURCE,value)) >= 0) m_inputslot->setCurrentItem(index); else kdWarning() << "media option '" << value << "' not handled." << endl; } } - // Try to find "sides" option + // Try to tqfind "sides" option value = opts["sides"]; int ID(0); if (value == "two-sided-long-edge") ID = 1; @@ -619,23 +619,23 @@ void KPGeneralPage::getOptions(TQMap& opts, bool incldef) if (driver()) { DrListOption *opt; - if ((opt=(DrListOption*)driver()->findOption("PageSize")) != NULL) + if ((opt=(DrListOption*)driver()->tqfindOption("PageSize")) != NULL) { DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["PageSize"] = ch->name(); } - if ((opt=(DrListOption*)driver()->findOption("MediaType")) != NULL) + if ((opt=(DrListOption*)driver()->tqfindOption("MediaType")) != NULL) { DrBase *ch = opt->choices()->at(m_papertype->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["MediaType"] = ch->name(); } - if ((opt=(DrListOption*)driver()->findOption("InputSlot")) != NULL) + if ((opt=(DrListOption*)driver()->tqfindOption("InputSlot")) != NULL) { DrBase *ch = opt->choices()->at(m_inputslot->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["InputSlot"] = ch->name(); } - if (m_duplexbox->isEnabled() && (opt=(DrListOption*)driver()->findOption("Duplex")) != NULL) + if (m_duplexbox->isEnabled() && (opt=(DrListOption*)driver()->tqfindOption("Duplex")) != NULL) { bool twoChoices = ( m_duplexbox->count() == 2 ); switch (m_duplexbox->id(m_duplexbox->selected())) diff --git a/kdeprint/kpmarginpage.cpp b/kdeprint/kpmarginpage.cpp index 9b91ce56f..b1c5f4390 100644 --- a/kdeprint/kpmarginpage.cpp +++ b/kdeprint/kpmarginpage.cpp @@ -79,13 +79,13 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) if (pageSize.isEmpty()) { - DrListOption *o = (DrListOption*)driver()->findOption("PageSize"); + DrListOption *o = (DrListOption*)driver()->tqfindOption("PageSize"); if (o) pageSize = o->get("default"); } if (!pageSize.isEmpty()) { - DrPageSize *dps = driver()->findPageSize(pageSize); + DrPageSize *dps = driver()->tqfindPageSize(pageSize); if (dps) { w = dps->pageWidth(); diff --git a/kdeprint/kpposterpage.cpp b/kdeprint/kpposterpage.cpp index fa4b1481b..f29f3cd4e 100644 --- a/kdeprint/kpposterpage.cpp +++ b/kdeprint/kpposterpage.cpp @@ -194,7 +194,7 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name ) m_lockbtn->setToggleButton( true ); m_lockbtn->setPixmap( SmallIcon( "encrypted" ) ); m_lockbtn->setOn( true ); - m_lockbtn->setFixedSize( m_lockbtn->sizeHint() ); + m_lockbtn->setFixedSize( m_lockbtn->tqsizeHint() ); TQToolTip::add( m_lockbtn, i18n( "Link/unlink poster and print size" ) ); for ( int i=0; iinsertItem( page_sizes[ i ].text ); m_printsize->insertItem( page_sizes[ i ].text ); } - m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) ); + m_postersize->setCurrentItem( tqfindIndex( KPrinter::A3 ) ); slotPosterSizeChanged( m_postersize->currentItem() ); connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) ); @@ -265,18 +265,18 @@ void KPPosterPage::setOptions( const TQMap& opts ) m_mediasize->setText( ps ); m_preview->setMediaSize( ps ); - if ( opts[ "_kde-filters" ].find( "poster" ) != -1 ) + if ( opts[ "_kde-filters" ].tqfind( "poster" ) != -1 ) { m_postercheck->setChecked( true ); ps = opts[ "_kde-poster-size" ]; TQString prtsize = opts[ "kde-printsize" ]; if ( !ps.isEmpty() ) { - m_postersize->setCurrentItem( findIndex( pageNameToPageSize( ps ) ) ); + m_postersize->setCurrentItem( tqfindIndex( pageNameToPageSize( ps ) ) ); m_lockbtn->setOn( !prtsize.isEmpty() && page_sizes[ m_postersize->currentItem() ].ID == prtsize.toInt() ); if ( !m_lockbtn->isOn() ) - m_printsize->setCurrentItem( findIndex( prtsize.toInt() ) ); + m_printsize->setCurrentItem( tqfindIndex( prtsize.toInt() ) ); slotPosterSizeChanged( m_postersize->currentItem() ); } if ( !opts[ "_kde-poster-cut" ].isEmpty() ) @@ -302,7 +302,7 @@ void KPPosterPage::getOptions( TQMap& opts, bool ) } else { - if ( !o.contains( "poster" ) ) + if ( !o.tqcontains( "poster" ) ) o.append( "poster" ); opts[ "_kde-filters" ] = o.join( "," ); opts[ "_kde-poster-media" ] = m_mediasize->text(); diff --git a/kdeprint/kpqtpage.cpp b/kdeprint/kpqtpage.cpp index c6d19a506..54955a834 100644 --- a/kdeprint/kpqtpage.cpp +++ b/kdeprint/kpqtpage.cpp @@ -55,7 +55,7 @@ KPQtPage::KPQtPage(TQWidget *parent, const char *name) } KPQtPage::KPQtPage(DrMain *driver, TQWidget *parent, const char *name) -: KPrintDialogPage(0, (driver && driver->findOption("PageSize") ? driver : 0), parent, name) +: KPrintDialogPage(0, (driver && driver->tqfindOption("PageSize") ? driver : 0), parent, name) { init(); } @@ -116,7 +116,7 @@ void KPQtPage::init() m_pagesize = new TQComboBox(this); TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel); QLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->tqsetAlignment(Qt::AlignVCenter|Qt::AlignRight); m_pagesizelabel->setBuddy(m_pagesize); m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel); @@ -129,7 +129,7 @@ void KPQtPage::init() TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel); QRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox); @@ -137,7 +137,7 @@ void KPQtPage::init() QRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox); m_colorpix = new TQLabel(m_colorbox); - m_colorpix->setAlignment(Qt::AlignCenter); + m_colorpix->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel); m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); @@ -152,10 +152,10 @@ void KPQtPage::init() TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->tqsetAlignment(Qt::AlignCenter); TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel); - // layout creation + // tqlayout creation QGridLayout *lay0 = new TQGridLayout(this, 3, 2, 0, 10); lay0->setRowStretch(1,1); lay0->setRowStretch(2,1); @@ -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); - QGridLayout *lay1 = new TQGridLayout(m_orientbox->layout(), 2, 2, 10); + QGridLayout *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); - QGridLayout *lay2 = new TQGridLayout(m_colorbox->layout(), 2, 2, 10); + QGridLayout *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); - QGridLayout *lay3 = new TQGridLayout(m_nupbox->layout(), 4, 2, 5); + QGridLayout *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); @@ -203,11 +203,11 @@ void KPQtPage::init() for (int i=0; iinsertItem(i18n(page_sizes[i].text)); // default page size to locale settings - m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize()))); + m_pagesize->setCurrentItem(tqfindIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize()))); } else { - DrListOption *lopt = static_cast(driver()->findOption("PageSize")); + DrListOption *lopt = static_cast(driver()->tqfindOption("PageSize")); TQPtrListIterator it(*(lopt->choices())); for (; it.current(); ++it) { @@ -259,18 +259,18 @@ void KPQtPage::setOptions(const TQMap& opts) QString val = opts["PageSize"]; if (!val.isEmpty()) { - DrListOption *opt = static_cast(driver()->findOption("PageSize")); - DrBase *ch = opt->findChoice(val); + DrListOption *opt = static_cast(driver()->tqfindOption("PageSize")); + DrBase *ch = opt->tqfindChoice(val); if (ch) - m_pagesize->setCurrentItem(opt->choices()->findRef(ch)); + m_pagesize->setCurrentItem(opt->choices()->tqfindRef(ch)); } } else if (!opts["kde-pagesize"].isEmpty()) - m_pagesize->setCurrentItem(findIndex(opts["kde-pagesize"].toInt())); + m_pagesize->setCurrentItem(tqfindIndex(opts["kde-pagesize"].toInt())); ID = NUP_1; - if (opts["_kde-filters"].find("psnup") != -1) + if (opts["_kde-filters"].tqfind("psnup") != -1) { - if (opts.contains("_kde-psnup-nup")) { + if (opts.tqcontains("_kde-psnup-nup")) { ID = opts["_kde-psnup-nup"].toInt(); if (ID == 1 || ID == 2 || ID == 4) { @@ -302,7 +302,7 @@ void KPQtPage::getOptions(TQMap& opts, bool incldef) opts["kde-colormode"] = (m_colorbox->id(m_colorbox->selected()) == COLORMODE_GRAYSCALE_ID ? "GrayScale" : "Color"); if (driver()) { - DrListOption *opt = static_cast(driver()->findOption("PageSize")); + DrListOption *opt = static_cast(driver()->tqfindOption("PageSize")); if (opt) { DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); @@ -323,7 +323,7 @@ void KPQtPage::getOptions(TQMap& opts, bool incldef) else if (ID != NUP_OTHER) { int nup(ID == NUP_2 ? 2 : 4); - if (s.find("psnup") == -1) + if (s.tqfind("psnup") == -1) { QStringList fl = TQStringList::split(',', s, false); KXmlCommandManager::self()->insertCommand(fl, "psnup"); diff --git a/kdeprint/kprintaction.cpp b/kdeprint/kprintaction.cpp index 4e62e791b..a319e64eb 100644 --- a/kdeprint/kprintaction.cpp +++ b/kdeprint/kprintaction.cpp @@ -31,33 +31,33 @@ public: KPrintActionPrivate() { type = All; - parentWidget = 0; + tqparentWidget = 0; } PrinterType type; QStringList printers; - TQWidget *parentWidget; + TQWidget *tqparentWidget; }; -KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) : KActionMenu(text, parent, name) { d = new KPrintActionPrivate(); - initialize(type, parentWidget); + initialize(type, tqparentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, parentWidget); + initialize(type, tqparentWidget); } -KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction::KPrintAction(const TQString& text, const TQString& icon, PrinterType type, TQWidget *tqparentWidget, TQObject *parent, const char *name) : KActionMenu(text, icon, parent, name) { d = new KPrintActionPrivate(); - initialize(type, parentWidget); + initialize(type, tqparentWidget); } KPrintAction::~KPrintAction() @@ -65,13 +65,13 @@ KPrintAction::~KPrintAction() delete d; } -void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) +void KPrintAction::initialize(PrinterType type, TQWidget *tqparentWidget) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); d->type = type; - d->parentWidget = parentWidget; + d->tqparentWidget = tqparentWidget; } void KPrintAction::slotAboutToShow() @@ -104,27 +104,27 @@ void KPrintAction::slotAboutToShow() void KPrintAction::slotActivated(int ID) { KPrinter printer(false); - KMPrinter *mprt = KMManager::self()->findPrinter(d->printers[ID]); - if (mprt && mprt->autoConfigure(&printer, d->parentWidget)) + KMPrinter *mprt = KMManager::self()->tqfindPrinter(d->printers[ID]); + if (mprt && mprt->autoConfigure(&printer, d->tqparentWidget)) { // emit the signal emit print(&printer); } } -KPrintAction* KPrintAction::exportAll(TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportAll(TQWidget *tqparentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), All, parentWidget, parent, (name ? name : "export_all")); + return new KPrintAction(i18n("&Export..."), All, tqparentWidget, parent, (name ? name : "export_all")); } -KPrintAction* KPrintAction::exportRegular(TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportRegular(TQWidget *tqparentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Regular, parentWidget, parent, (name ? name : "export_regular")); + return new KPrintAction(i18n("&Export..."), Regular, tqparentWidget, parent, (name ? name : "export_regular")); } -KPrintAction* KPrintAction::exportSpecial(TQWidget *parentWidget, TQObject *parent, const char *name) +KPrintAction* KPrintAction::exportSpecial(TQWidget *tqparentWidget, TQObject *parent, const char *name) { - return new KPrintAction(i18n("&Export..."), Specials, parentWidget, parent, (name ? name : "export_special")); + return new KPrintAction(i18n("&Export..."), Specials, tqparentWidget, parent, (name ? name : "export_special")); } #include "kprintaction.moc" diff --git a/kdeprint/kprintaction.h b/kdeprint/kprintaction.h index eb23d6e31..b9ba54add 100644 --- a/kdeprint/kprintaction.h +++ b/kdeprint/kprintaction.h @@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KPrintAction : public KActionMenu public: enum PrinterType { All, Regular, Specials }; - KPrintAction(const TQString& text, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, const TQIconSet& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + KPrintAction(const TQString& text, const TQString& icon, PrinterType type = All, TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); virtual ~KPrintAction(); - static KPrintAction* exportAll(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - static KPrintAction* exportRegular(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); - static KPrintAction* exportSpecial(TQWidget *parentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportAll(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportRegular(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); + static KPrintAction* exportSpecial(TQWidget *tqparentWidget = 0, TQObject *parent = 0, const char *name = 0); signals: void print(KPrinter*); @@ -47,7 +47,7 @@ protected slots: void slotActivated(int); protected: - void initialize(PrinterType type, TQWidget *parentWidget); + void initialize(PrinterType type, TQWidget *tqparentWidget); private: class KPrintActionPrivate; diff --git a/kdeprint/kprintdialog.cpp b/kdeprint/kprintdialog.cpp index c84472677..ac3fc1d18 100644 --- a/kdeprint/kprintdialog.cpp +++ b/kdeprint/kprintdialog.cpp @@ -111,7 +111,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) "     " ); TQString whatsThisPrinterSelect = i18n( " Printer Selection Menu: " "

    Use this combo box to select the printer to which you want to print." - " Initially (if you run KDEPrint for the first time), you may only find the " + " Initially (if you run KDEPrint for the first time), you may only tqfind the " " KDE special printers (which save" " jobs to disk [as PostScript- or PDF-files], or deliver jobs via" " email (as a PDF" @@ -237,7 +237,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) TQString whatsThisPreviewCheckBox = i18n(" Print Preview" " Enable this checkbox if you want to see a preview of" " your printout. A preview lets you check if, for instance," - " your intended \"poster\" or \"pamphlet\" layout" + " your intended \"poster\" or \"pamphlet\" tqlayout" " looks like you expected, without wasting paper first. It" " also lets you cancel the job if something looks wrong. " "

    Note: The preview feature (and therefore this checkbox) " @@ -277,7 +277,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) d->m_printers->setMinimumHeight(25); QLabel *m_printerlabel = new TQLabel(i18n("&Name:"), m_pbox); TQWhatsThis::add(m_printerlabel, whatsThisPrinterSelect); - QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), m_pbox); + QLabel *m_statelabel = new TQLabel(i18n("tqStatus", "State:"), m_pbox); TQWhatsThis::add(m_statelabel, whatsThisPrinterState); QLabel *m_typelabel = new TQLabel(i18n("Type:"), m_pbox); TQWhatsThis::add(m_typelabel, whatsThisPrinterType); @@ -347,7 +347,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) TQWidget::setTabOrder( m_help, d->m_ok ); TQWidget::setTabOrder( d->m_ok, m_cancel ); - // layout creation + // tqlayout creation QVBoxLayout *l1 = new TQVBoxLayout(this, 10, 10); l1->addWidget(m_pbox,0); l1->addWidget(d->m_dummy,1); @@ -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); - QGridLayout *l3 = new TQGridLayout(m_pbox->layout(),3,3,7); + QGridLayout *l3 = new TQGridLayout(m_pbox->tqlayout(),3,3,7); l3->setColStretch(1,1); l3->setRowStretch(0,1); QGridLayout *l4 = new TQGridLayout(0, 5, 2, 0, 5); @@ -546,7 +546,7 @@ void KPrintDialog::initialize(KPrinter *printer) TQPtrList *plist = KMFactory::self()->manager()->printerList(); if (!KMManager::self()->errorMsg().isEmpty()) { - KMessageBox::error(parentWidget(), + KMessageBox::error(tqparentWidget(), ""+ i18n("An error occurred while retrieving the printer list:") +"

    "+KMManager::self()->errorMsg()+"    "); @@ -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()) @@ -580,9 +580,9 @@ void KPrintDialog::initialize(KPrinter *printer) else if (defsearch == -1 && it.current()->name() == printer->searchName()) defsearch = d->m_printers->count()-1; } - int defindex = (defsearch != -1 ? defsearch : (defsoft != -1 ? defsoft : QMAX(defhard,0))); - d->m_printers->setCurrentItem(defindex); - //slotPrinterSelected(defindex); + int detqfindex = (defsearch != -1 ? defsearch : (defsoft != -1 ? defsoft : QMAX(defhard,0))); + d->m_printers->setCurrentItem(detqfindex); + //slotPrinterSelected(detqfindex); } // Initialize output filename @@ -614,7 +614,7 @@ void KPrintDialog::slotPrinterSelected(int index) if (index >= 0 && index < d->m_printers->count()) { KMManager *mgr = KMFactory::self()->manager(); - KMPrinter *p = mgr->findPrinter(d->m_printers->text(index)); + KMPrinter *p = mgr->tqfindPrinter(d->m_printers->text(index)); if (p) { if (!p->isSpecial()) mgr->completePrinterShort(p); @@ -638,14 +638,14 @@ void KPrintDialog::slotProperties() { if (!d->m_printer) return; - KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText()); + KMPrinter *prt = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText()); if (prt) KPrinterPropertyDialog::setupPrinter(prt, this); } void KPrintDialog::slotSetDefault() { - KMPrinter *p = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText()); + KMPrinter *p = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText()); if (p) KMFactory::self()->virtualManager()->setDefault(p); } @@ -674,7 +674,7 @@ void KPrintDialog::done(int result) // add options from the dialog itself // TODO: ADD PRINTER CHECK MECHANISM !!! - prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText()); + prt = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText()); if (prt->isSpecial() && prt->option("kde-special-file") == "1") { if (!checkOutputFile()) return; @@ -800,7 +800,7 @@ void KPrintDialog::setOutputFileExtension(const TQString& ext) { KURL url( d->m_file->url() ); TQString f( url.fileName() ); - int p = f.findRev( '.' ); + int p = f.tqfindRev( '.' ); // change "file.ext"; don't change "file", "file." or ".file" but do change ".file.ext" if ( p > 0 && p != int (f.length () - 1) ) { @@ -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*tqlayout()->spacing()); if (isVisible() || !d->m_dummy->isVisible() || !d->m_plugin->isVisible()) { d->m_dummy->show(); @@ -876,7 +876,7 @@ void KPrintDialog::expandDialog(bool on) } else { - sz.setHeight(sz.height()-d->m_dummy->height()-d->m_plugin->height()-2*layout()->spacing()); + sz.setHeight(sz.height()-d->m_dummy->height()-d->m_plugin->height()-2*tqlayout()->spacing()); if (!isVisible() || d->m_dummy->isVisible() || d->m_plugin->isVisible()) { d->m_dummy->hide(); @@ -890,7 +890,7 @@ void KPrintDialog::expandDialog(bool on) if (needResize) { - layout()->activate(); + tqlayout()->activate(); resize(sz); } } @@ -934,7 +934,7 @@ void KPrintDialog::slotUpdatePossible( bool flag ) { MessageWindow::remove( this ); if ( !flag ) - KMessageBox::error(parentWidget(), + KMessageBox::error(tqparentWidget(), ""+ i18n("An error occurred while retrieving the printer list:") +"

    "+KMManager::self()->errorMsg()+"    "); @@ -966,7 +966,7 @@ void KPrintDialog::slotOpenFileDialog() dialog->setMode(d->m_file->fileDialog()->mode() & ~KFile::LocalOnly); dialog->setOperationMode( KFileDialog::Saving ); - KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText()); + KMPrinter *prt = KMFactory::self()->manager()->tqfindPrinter(d->m_printers->currentText()); if (prt) { QString mimetype(prt->option("kde-special-mimetype")); diff --git a/kdeprint/kprinter.cpp b/kdeprint/kprinter.cpp index c96db7a8d..3bdbfd92b 100644 --- a/kdeprint/kprinter.cpp +++ b/kdeprint/kprinter.cpp @@ -486,7 +486,7 @@ TQValueList KPrinter::pageList() const QStringList ranges = TQStringList::split(',',option("kde-range"),false); for (TQStringList::ConstIterator it=ranges.begin();it!=ranges.end();++it) { - int p = (*it).find('-'); + int p = (*it).tqfind('-'); bool ok; if (p == -1) { @@ -519,7 +519,7 @@ TQValueList KPrinter::pageList() const if (pageOrder() == LastPageFirst) { for (uint i=0;i<(list.count()/2);i++) - qSwap(list[i],list[list.count()-1-i]); + tqSwap(list[i],list[list.count()-1-i]); } // select page set if needed @@ -638,7 +638,7 @@ void KPrinter::setOptions(const TQMap& opts) tmpset.remove( "kde-resolution" ); tmpset.remove( "kde-fonts" ); for (TQMap::ConstIterator it=tmpset.begin();it!=tmpset.end();++it) - if (it.key().left(4) == "kde-" && !(d->m_options.contains(it.key()))) + if (it.key().left(4) == "kde-" && !(d->m_options.tqcontains(it.key()))) d->m_options[it.key()] = it.data(); } @@ -673,7 +673,7 @@ bool KPrinter::autoConfigure(const TQString& prname, TQWidget *parent) if (prname.isEmpty()) mprt = mgr->defaultPrinter(); else - mprt = mgr->findPrinter(prname); + mprt = mgr->tqfindPrinter(prname); if (mprt) return mprt->autoConfigure(this, parent); @@ -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 @@ -880,16 +880,16 @@ void KPrinter::setPrintProgram(const TQString& prg) else { QString s(prg); - if (s.find("%in") == -1) + if (s.tqfind("%in") == -1) s.append(" %in"); - setOutputToFile( s.find( "%out" ) != -1 ); + setOutputToFile( s.tqfind( "%out" ) != -1 ); setOption("kde-isspecial", "1"); setOption("kde-special-command", s); } } TQString KPrinter::printerSelectionOption() const -{ return TQString::fromLatin1(""); } +{ return TQString::tqfromLatin1(""); } void KPrinter::setPrinterSelectionOption(const TQString&) {} diff --git a/kdeprint/kprinterimpl.cpp b/kdeprint/kprinterimpl.cpp index 94750b607..1e6f10837 100644 --- a/kdeprint/kprinterimpl.cpp +++ b/kdeprint/kprinterimpl.cpp @@ -69,11 +69,11 @@ KPrinterImpl::~KPrinterImpl() void KPrinterImpl::preparePrinting(KPrinter *printer) { - // page size -> try to find page size and margins from driver file - // use "PageSize" as option name to find the wanted page size. It's + // page size -> try to tqfind page size and margins from driver file + // use "PageSize" as option name to tqfind the wanted page size. It's // up to the driver loader to use that option name. KMManager *mgr = KMFactory::self()->manager(); - DrMain *driver = mgr->loadPrinterDriver(mgr->findPrinter(printer->printerName()), false); + DrMain *driver = mgr->loadPrinterDriver(mgr->tqfindPrinter(printer->printerName()), false); if (driver) { // Find the page size: @@ -82,13 +82,13 @@ void KPrinterImpl::preparePrinting(KPrinter *printer) QString psname = printer->option("PageSize"); if (psname.isEmpty()) { - DrListOption *opt = (DrListOption*)driver->findOption("PageSize"); + DrListOption *opt = (DrListOption*)driver->tqfindOption("PageSize"); if (opt) psname = opt->get("default"); } if (!psname.isEmpty()) { printer->setOption("kde-pagesize",TQString::number((int)pageNameToPageSize(psname))); - DrPageSize *ps = driver->findPageSize(psname); + DrPageSize *ps = driver->tqfindPageSize(psname); if (ps) { printer->setRealPageSize( ps ); @@ -104,7 +104,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer) TQString res = printer->option( "Resolution" ); if ( res.isEmpty() ) { - DrBase *opt = driver->findOption( "Resolution" ); + DrBase *opt = driver->tqfindOption( "Resolution" ); if ( opt ) res = opt->get( "default" ); if ( res.isEmpty() ) @@ -225,7 +225,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) kdDebug(500) << "kdeprint: status message: " << msg << endl; KConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); - if (!conf->readBoolEntry("ShowStatusMsg", true)) + if (!conf->readBoolEntry("ShowtqStatusMsg", true)) return; QString message(msg); @@ -252,7 +252,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T QString command(cmd), filestr; QStringList printfiles; - if (command.find("%in") == -1) command.append(" %in"); + if (command.tqfind("%in") == -1) command.append(" %in"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) if (TQFile::exists(*it)) @@ -266,7 +266,7 @@ bool KPrinterImpl::startPrinting(const TQString& cmd, KPrinter *printer, const T if (printfiles.count() > 0) { - command.replace("%in",filestr); + command.tqreplace("%in",filestr); int pid = dcopPrint(command,files,flag); if (pid > 0) { @@ -317,7 +317,7 @@ int KPrinterImpl::filterFiles(KPrinter *printer, TQStringList& files, bool flag) !printer->option("kde-range").isEmpty() || printer->pageSet() != KPrinter::AllPages)) { - if (flist.findIndex("psselect") == -1) + if (flist.tqfindIndex("psselect") == -1) { int index = KXmlCommandManager::self()->insertCommand(flist, "psselect", false); if (index == -1 || !KXmlCommandManager::self()->checkCommand("psselect")) @@ -378,8 +378,8 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ QString ps = pageSizeToPageName( printer->option( "kde-printsize" ).isEmpty() ? printer->pageSize() : ( KPrinter::PageSize )printer->option( "kde-printsize" ).toInt() ); for (TQStringList::Iterator it=files.begin(); it!=files.end(); ++it) { - QString mime = KMimeMagic::self()->findFileType(*it)->mimeType(); - if (inputMimeTypes.find(mime) == inputMimeTypes.end()) + QString mime = KMimeMagic::self()->tqfindFileType(*it)->mimeType(); + if (inputMimeTypes.tqfind(mime) == inputMimeTypes.end()) { if (KMessageBox::warningContinueCancel(0, "

    " + i18n("The MIME type %1 is not supported as input of the filter chain " @@ -434,10 +434,10 @@ int KPrinterImpl::doFilterFiles(KPrinter *printer, TQStringList& files, const TQ QString tmpfile = tempFile(); QString cmd(filtercmd); - cmd.replace(rout,quote(tmpfile)); - cmd.replace(rpsl,ps.lower()); - cmd.replace(rpsu,ps); - cmd.replace(rin,quote(*it)); // Replace as last, filename could contain "%psl" + cmd.tqreplace(rout,quote(tmpfile)); + cmd.tqreplace(rpsl,ps.lower()); + cmd.tqreplace(rpsu,ps); + cmd.tqreplace(rin,quote(*it)); // Replace as last, filename could contain "%psl" statusMessage(i18n("Filtering print data"), printer); int status = system(TQFile::encodeName(cmd)); if (status < 0 || WEXITSTATUS(status) == 127) @@ -479,7 +479,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool int status(0), result; for (TQStringList::Iterator it=files.begin(); it!=files.end(); ) { - QString mime = KMimeMagic::self()->findFileType(*it)->mimeType(); + QString mime = KMimeMagic::self()->tqfindFileType(*it)->mimeType(); if ( mime == "application/x-zerosize" ) { // special case of empty file @@ -491,7 +491,7 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool it = files.remove( it ); continue; } - else if (mimeTypes.findIndex(mime) == -1) + else if (mimeTypes.tqfindIndex(mime) == -1) { if ((result=KMessageBox::warningYesNoCancel(NULL, i18n("The file format %1 is not directly supported by the current print system. You " @@ -508,9 +508,9 @@ int KPrinterImpl::autoConvertFiles(KPrinter *printer, TQStringList& files, bool TQString::null, i18n("Convert"), i18n("Keep"), - TQString::fromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) + TQString::tqfromLatin1("kdeprintAutoConvert"))) == KMessageBox::Yes) { - // find the filter chain + // tqfind the filter chain QStringList flist = KXmlCommandManager::self()->autoConvert(mime, primaryMimeType); if (flist.count() == 0) { @@ -565,9 +565,9 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin s = KMFactory::self()->specialManager()->setupCommand(s, p->options()); QString ps = pageSizeToPageName( p->option( "kde-printsize" ).isEmpty() ? p->pageSize() : ( KPrinter::PageSize )p->option( "kde-printsize" ).toInt() ); - s.replace("%psl", ps.lower()); - s.replace("%psu", ps); - s.replace("%out", "$out{" + p->outputFileName() + "}"); // Replace as last + s.tqreplace("%psl", ps.lower()); + s.tqreplace("%psu", ps); + s.tqreplace("%out", "$out{" + p->outputFileName() + "}"); // Replace as last cmd = s; return true; } diff --git a/kdeprint/kprinterimpl.h b/kdeprint/kprinterimpl.h index ae6b8b75d..b06d77706 100644 --- a/kdeprint/kprinterimpl.h +++ b/kdeprint/kprinterimpl.h @@ -31,7 +31,7 @@ class KPrinter; class KMPrinter; -class KDEPRINT_EXPORT KPrinterImpl : public QObject +class KDEPRINT_EXPORT KPrinterImpl : public TQObject { Q_OBJECT public: diff --git a/kdeprint/kprintpreview.cpp b/kdeprint/kprintpreview.cpp index 5ad8a428f..034285543 100644 --- a/kdeprint/kprintpreview.cpp +++ b/kdeprint/kprintpreview.cpp @@ -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; @@ -217,7 +217,7 @@ void KPrintPreview::initView(KLibFactory *factory) d->toolbar_->setMovingEnabled(false); //d->adjustSize(); - // construct the layout + // construct the tqlayout QVBoxLayout *l0 = new TQVBoxLayout(d->mainwidget_, 0, 0); l0->addWidget(d->toolbar_, AlignTop); if (d->gvpart_) @@ -239,7 +239,7 @@ bool KPrintPreview::isValid() const bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId) { - KMimeType::Ptr mime = KMimeType::findByPath( file ); + KMimeType::Ptr mime = KMimeType::tqfindByPath( file ); bool isPS = ( mime->name() == "application/postscript" ); if ( !isPS ) kdDebug( 500 ) << "Previewing a non PostScript file, built-in preview disabled" << endl; @@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId conf->setGroup("General"); KLibFactory *factory(0); bool externalPreview = conf->readBoolEntry("ExternalPreview", false); - QWidget *parentW = TQWidget::find(parentId); + QWidget *parentW = TQWidget::tqfind(parentId); QString exe; if (!externalPreview && isPS && (factory = componentFactory()) != 0) { @@ -304,7 +304,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId "viewer (KGhostView) nor any other external PostScript " "viewer could be found."); else - msg = i18n( "Preview failed: KDE could not find any application " + msg = i18n( "Preview failed: KDE could not tqfind any application " "to preview files of type %1." ).arg( mime->name() ); return continuePrint(msg, parentW, previewOnly); diff --git a/kdeprint/kxmlcommand.cpp b/kdeprint/kxmlcommand.cpp index 27f8c6642..7a1949885 100644 --- a/kdeprint/kxmlcommand.cpp +++ b/kdeprint/kxmlcommand.cpp @@ -161,7 +161,7 @@ void KXmlCommand::setMimeType(const TQString& s) bool KXmlCommand::acceptMimeType(const TQString& s) { check(); - return (d->m_inputMime.find(s) != d->m_inputMime.end()); + return (d->m_inputMime.tqfind(s) != d->m_inputMime.end()); } TQStringList KXmlCommand::inputMimeTypes() @@ -378,31 +378,31 @@ TQString KXmlCommand::buildCommand(const TQMap& opts, bool pi d->m_driver->getOptions(fopts, false); for (TQMap::ConstIterator it=fopts.begin(); it!=fopts.end(); ++it) { - DrBase *dopt = d->m_driver->findOption(it.key()); + DrBase *dopt = d->m_driver->tqfindOption(it.key()); if (dopt) { QString format = dopt->get("format"); TQString value = dopt->valueText(); - if ( format.find( quotedRe ) != -1 ) + if ( format.tqfind( quotedRe ) != -1 ) { if ( ( value.right( 1 ) == "'" && value.left( 1 ) == "'" ) || ( value.right( 1 ) == "\"" && value.left( 1 ) == "\"" ) ) - format.replace( quotedRe, value ); + format.tqreplace( quotedRe, value ); else - format.replace( re, value ); + format.tqreplace( re, value ); } else { - format.replace( re, KProcess::quote( dopt->valueText() ) ); + format.tqreplace( re, KProcess::quote( dopt->valueText() ) ); } str.append(format).append(" "); } } - cmd.replace("%filterargs", str); + cmd.tqreplace("%filterargs", str); } - cmd.replace("%filterinput", d->m_io[0].m_format[(pipein?1:0)]); - cmd.replace("%filteroutput", d->m_io[1].m_format[(pipeout?1:0)]); + cmd.tqreplace("%filterinput", d->m_io[0].m_format[(pipein?1:0)]); + cmd.tqreplace("%filteroutput", d->m_io[1].m_format[(pipeout?1:0)]); return cmd; } @@ -463,7 +463,7 @@ void KXmlCommand::saveXml() TQDomElement KXmlCommand::createIO(TQDomDocument& doc, int n, const TQString& tag) { QDomElement elem = doc.createElement(tag); - if (d->m_command.find("%"+tag) != -1) + if (d->m_command.tqfind("%"+tag) != -1) { for (int i=0; i<2; i++) { @@ -499,7 +499,7 @@ TQDomElement KXmlCommand::createElement(TQDomDocument& doc, DrBase *opt) QDomElement elem = doc.createElement("filterarg"); QString elemName = opt->name(); if (elemName.startsWith("_kde-")) - elemName.replace(0, name().length()+6, ""); + elemName.tqreplace(0, name().length()+6, ""); elem.setAttribute("name", elemName); elem.setAttribute("format", opt->get("format")); elem.setAttribute("description", opt->get("text")); @@ -632,7 +632,7 @@ TQStringList KXmlCommandManager::commandList() for (TQStringList::ConstIterator it2=list.begin(); it2!=list.end(); ++it2) { QString cmdName = (*it2).left((*it2).length()-8); - if (d->m_cmdlist.find(cmdName) == d->m_cmdlist.end()) + if (d->m_cmdlist.tqfind(cmdName) == d->m_cmdlist.end()) d->m_cmdlist.append(cmdName); } } @@ -666,7 +666,7 @@ TQString KXmlCommandManager::selectCommand(TQWidget *parent) TQString ( *func )( TQWidget* ) = ( TQString( * )( TQWidget* ) )lib->symbol( "select_command" ); if ( !func ) { - KMessageBox::error( parent, i18n( "Unable to find wizard object in management library." ) ); + KMessageBox::error( parent, i18n( "Unable to tqfind wizard object in management library." ) ); return TQString::null; } else @@ -676,7 +676,7 @@ TQString KXmlCommandManager::selectCommand(TQWidget *parent) KXmlCommand* KXmlCommandManager::command(const TQString& xmlId) const { - return (d->m_cmdmap.contains(xmlId) ? d->m_cmdmap[xmlId] : 0); + return (d->m_cmdmap.tqcontains(xmlId) ? d->m_cmdmap[xmlId] : 0); } int KXmlCommandManager::insertCommand(TQStringList& list, const TQString& filtername, bool defaultToStart) @@ -728,7 +728,7 @@ TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQSt preload(); - if (d->m_mimemap.contains(mimesrc)) + if (d->m_mimemap.tqcontains(mimesrc)) { const TQValueList l = d->m_mimemap[mimesrc]; for (TQValueList::ConstIterator it=l.begin(); it!=l.end(); ++it) @@ -743,16 +743,16 @@ TQStringList KXmlCommandManager::autoConvert(const TQString& mimesrc, const TQSt chain = TQStringList((*it)->name()); break; } - // non direct filter: find the shortest way between + // non direct filter: tqfind the shortest way between // its output and mimedest (do not consider cyling filters) else if ((*it)->mimeType() != mimesrc) { QStringList subchain = autoConvert((*it)->mimeType(), mimedest); // If chain length is 0, then there's no possible filter between those 2 - // mime types. Just discard it. If the subchain contains also the current + // mime types. Just discard it. If the subchain tqcontains also the current // considered filter, then discard it: it denotes of a cycle in filter // chain. - if (subchain.count() > 0 && subchain.findIndex((*it)->name()) == -1) + if (subchain.count() > 0 && subchain.tqfindIndex((*it)->name()) == -1) { subchain.prepend((*it)->name()); if (subchain.count() < score || score == 0) @@ -791,12 +791,12 @@ bool KXmlCommandManager::checkCommand(const TQString& xmlId, int inputCheck, int QString cmd = (xmlCmd ? xmlCmd->command() : xmlId); if (status && !cmd.isEmpty() && (inputCheck > None || outputCheck > None)) { - if (inputCheck > None && (cmd.find("%in") == -1 || inputCheck == Advanced) && cmd.find("%filterinput") == -1) + if (inputCheck > None && (cmd.tqfind("%in") == -1 || inputCheck == Advanced) && cmd.tqfind("%filterinput") == -1) { status = false; errmsg = i18n("The command does not contain the required tag %1.").arg(inputCheck == Advanced ? "%filterinput" : "{%in,%filterinput}"); } - if (status && outputCheck > None && (cmd.find("%out") == -1 || outputCheck == Advanced) && cmd.find("filteroutput") == -1) + if (status && outputCheck > None && (cmd.tqfind("%out") == -1 || outputCheck == Advanced) && cmd.tqfind("filteroutput") == -1) { status = false; errmsg = i18n("The command does not contain the required tag %1.").arg(outputCheck == Advanced ? "%filteroutput" : "{%out,%filteroutput}"); diff --git a/kdeprint/kxmlcommand.h b/kdeprint/kxmlcommand.h index c6e4c25fc..e24266f49 100644 --- a/kdeprint/kxmlcommand.h +++ b/kdeprint/kxmlcommand.h @@ -30,7 +30,7 @@ class DrMain; class DrGroup; class DrBase; -class KDEPRINT_EXPORT KXmlCommand : public QObject +class KDEPRINT_EXPORT KXmlCommand : public TQObject { friend class KXmlCommandManager; @@ -86,7 +86,7 @@ private: KXmlCommandPrivate *d; }; -class KDEPRINT_EXPORT KXmlCommandManager : public QObject +class KDEPRINT_EXPORT KXmlCommandManager : public TQObject { public: enum IO_CheckType { None = 0, Basic, Advanced }; diff --git a/kdeprint/lpd/gschecker.cpp b/kdeprint/lpd/gschecker.cpp index 8f23fcc32..d9f58b859 100644 --- a/kdeprint/lpd/gschecker.cpp +++ b/kdeprint/lpd/gschecker.cpp @@ -32,7 +32,7 @@ bool GsChecker::checkGsDriver(const TQString& name) { if (m_driverlist.count() == 0) loadDriverList(); - return m_driverlist.contains(name); + return m_driverlist.tqcontains(name); } void GsChecker::loadDriverList() @@ -48,12 +48,12 @@ void GsChecker::loadDriverList() line = t.readLine().stripWhiteSpace(); if (ok) { - if (line.find(':') != -1) + if (line.tqfind(':') != -1) break; 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/kdeprint/lpd/gschecker.h b/kdeprint/lpd/gschecker.h index 65f247380..1814ca1d7 100644 --- a/kdeprint/lpd/gschecker.h +++ b/kdeprint/lpd/gschecker.h @@ -24,7 +24,7 @@ #include #include -class GsChecker : public QObject +class GsChecker : public TQObject { public: GsChecker(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/lpd/klpdprinterimpl.cpp b/kdeprint/lpd/klpdprinterimpl.cpp index 8a04927e6..8b365cbd1 100644 --- a/kdeprint/lpd/klpdprinterimpl.cpp +++ b/kdeprint/lpd/klpdprinterimpl.cpp @@ -46,6 +46,6 @@ bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) printer->setErrorMessage(i18n("The %1 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/kdeprint/lpd/kmlpdmanager.cpp b/kdeprint/lpd/kmlpdmanager.cpp index 95623a56f..e7e640bc9 100644 --- a/kdeprint/lpd/kmlpdmanager.cpp +++ b/kdeprint/lpd/kmlpdmanager.cpp @@ -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) @@ -80,7 +80,7 @@ bool KMLpdManager::completePrinter(KMPrinter *printer) bool KMLpdManager::completePrinterShort(KMPrinter *printer) { - PrintcapEntry *entry = m_entries.find(printer->name()); + PrintcapEntry *entry = m_entries.tqfind(printer->name()); if (entry) { QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); @@ -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 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"]); } @@ -127,7 +127,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) bool KMLpdManager::createPrinter(KMPrinter *printer) { // 1) create the printcap entry - PrintcapEntry *ent = findPrintcapEntry(printer->printerName()); + PrintcapEntry *ent = tqfindPrintcapEntry(printer->printerName()); if (!ent) { ent = new PrintcapEntry(); @@ -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().tqreplace("/",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; @@ -199,7 +199,7 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) bool KMLpdManager::removePrinter(KMPrinter *printer) { - PrintcapEntry *ent = findPrintcapEntry(printer->printerName()); + PrintcapEntry *ent = tqfindPrintcapEntry(printer->printerName()); if (ent) { ent = m_entries.take(printer->printerName()); @@ -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 it(m_entries); for (;it.current();++it) @@ -268,7 +268,7 @@ void KMLpdManager::listPrinters() addPrinter(printer); } - checkStatus(); + checktqStatus(); } TQString KMLpdManager::programName(int f) @@ -284,7 +284,7 @@ TQString KMLpdManager::programName(int f) return TQString::null; } -void KMLpdManager::checkStatus() +void KMLpdManager::checktqStatus() { KPipeProcess proc; QString cmd = programName(0) + " status all"; @@ -299,11 +299,11 @@ void KMLpdManager::checkStatus() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - if ((p=line.find(':')) != -1) - printer = findPrinter(line.left(p)); + if ((p=line.tqfind(':')) != -1) + printer = tqfindPrinter(line.left(p)); else if (line.startsWith("printing") && printer) - printer->setState(line.find("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped); - else if (line.find("entries") != -1 && printer) + printer->setState(line.tqfind("enabled") != -1 ? KMPrinter::Idle : KMPrinter::Stopped); + else if (line.tqfind("entries") != -1 && printer) if (!line.startsWith("no") && printer->state() == KMPrinter::Idle) printer->setState(KMPrinter::Processing); } @@ -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; @@ -363,13 +363,13 @@ bool KMLpdManager::writePrintcapFile(const TQString& filename) return false; } -PrinttoolEntry* KMLpdManager::findPrinttoolEntry(const TQString& name) +PrinttoolEntry* KMLpdManager::tqfindPrinttoolEntry(const TQString& name) { if (m_ptentries.count() == 0) loadPrinttoolDb(driverDirectory()+"/printerdb"); - PrinttoolEntry *ent = m_ptentries.find(name); + PrinttoolEntry *ent = m_ptentries.tqfind(name); if (!ent) - setErrorMsg(i18n("Couldn't find driver %1 in printtool database.").arg(name)); + setErrorMsg(i18n("Couldn't tqfind driver %1 in printtool database.").arg(name)); return ent; } @@ -394,7 +394,7 @@ DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry) QString ptdbfilename = driverDirectory() + "/printerdb"; if (entry->file == ptdbfilename) { - PrinttoolEntry *ptentry = findPrinttoolEntry(entry->modelname); + PrinttoolEntry *ptentry = tqfindPrinttoolEntry(entry->modelname); if (ptentry) { DrMain *dr = ptentry->createDriver(); @@ -404,17 +404,17 @@ DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry) return NULL; } -PrintcapEntry* KMLpdManager::findPrintcapEntry(const TQString& name) +PrintcapEntry* KMLpdManager::tqfindPrintcapEntry(const TQString& name) { - PrintcapEntry *ent = m_entries.find(name); + PrintcapEntry *ent = m_entries.tqfind(name); if (!ent) - setErrorMsg(i18n("Couldn't find printer %1 in printcap file.").arg(name)); + setErrorMsg(i18n("Couldn't tqfind printer %1 in printcap file.").arg(name)); return ent; } DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config) { - PrintcapEntry *entry = findPrintcapEntry(printer->name()); + PrintcapEntry *entry = tqfindPrintcapEntry(printer->name()); if (!entry) return NULL; @@ -423,7 +423,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config) if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty()) { TQMap map = loadPrinttoolCfgFile(sd+"/postscript.cfg"); - PrinttoolEntry *ptentry = findPrinttoolEntry(dr); + PrinttoolEntry *ptentry = tqfindPrinttoolEntry(dr); if (!ptentry) return NULL; DrMain *dr = ptentry->createDriver(); @@ -470,13 +470,13 @@ TQMap KMLpdManager::loadPrinttoolCfgFile(const TQString& file if (line.isEmpty()) break; if (line.startsWith("export ")) - line.replace(0,7,""); - if ((p=line.find('=')) != -1) + line.tqreplace(0,7,""); + if ((p=line.tqfind('=')) != -1) { name = line.left(p); val = line.right(line.length()-p-1); - val.replace("\"",""); - val.replace("'",""); + val.tqreplace("\"",""); + val.tqreplace("'",""); if (!name.isEmpty() && !val.isEmpty()) map[name] = val; } @@ -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.tqreplace(TQRegExp("\\.in$"),TQString::tqfromLatin1("")); QFile fin(templatefile); QFile fout(dirname + "/" + fname); if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly)) @@ -508,9 +508,9 @@ bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQSt if (line.startsWith("export ")) { tout << "export "; - line.replace(0,7,TQString::fromLatin1("")); + line.tqreplace(0,7,TQString::tqfromLatin1("")); } - if ((p=line.find('=')) != -1) + if ((p=line.tqfind('=')) != -1) { name = line.left(p); tout << name << '=' << options[name] << endl; @@ -526,7 +526,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) // To be able to save a printer driver, a printcap entry MUST exist. // We can then retrieve the spool directory from it. QString spooldir; - PrintcapEntry *ent = findPrintcapEntry(printer->printerName()); + PrintcapEntry *ent = tqfindPrintcapEntry(printer->printerName()); if (!ent) return false; spooldir = ent->arg("sd"); @@ -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().tqreplace("/",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)) { @@ -633,7 +633,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) bool KMLpdManager::validateDbDriver(KMDBEntry *entry) { - PrinttoolEntry *ptentry = findPrinttoolEntry(entry->modelname); + PrinttoolEntry *ptentry = tqfindPrinttoolEntry(entry->modelname); return (ptentry && checkGsDriver(ptentry->m_gsdriver)); } diff --git a/kdeprint/lpd/kmlpdmanager.h b/kdeprint/lpd/kmlpdmanager.h index 0af2d1e15..be7aa4ab1 100644 --- a/kdeprint/lpd/kmlpdmanager.h +++ b/kdeprint/lpd/kmlpdmanager.h @@ -61,10 +61,10 @@ protected: bool checkGsDriver(const TQString& gsdriver); bool createSpooldir(PrintcapEntry*); bool createPrinttoolEntry(KMPrinter*, PrintcapEntry*); - PrintcapEntry* findPrintcapEntry(const TQString& name); - PrinttoolEntry* findPrinttoolEntry(const TQString& name); + PrintcapEntry* tqfindPrintcapEntry(const TQString& name); + PrinttoolEntry* tqfindPrinttoolEntry(const TQString& name); TQString programName(int); - void checkStatus(); + void checktqStatus(); bool enablePrinter(KMPrinter*, bool); private: diff --git a/kdeprint/lpd/lpdtools.cpp b/kdeprint/lpd/lpdtools.cpp index 3b1651337..ee919ff95 100644 --- a/kdeprint/lpd/lpdtools.cpp +++ b/kdeprint/lpd/lpdtools.cpp @@ -60,7 +60,7 @@ TQString nextWord(const TQString& s, int& pos) if (s[p1] == '{') { p1++; - p2 = s.find('}',p1); + p2 = s.tqfind('}',p1); } else { @@ -81,12 +81,12 @@ bool PrintcapEntry::readLine(const TQString& line) m_name = l[0]; int p(-1); // discard aliases - if ((p=m_name.find('|')) != -1) + if ((p=m_name.tqfind('|')) != -1) m_name = m_name.left(p); m_args.clear(); for (uint i=1; isetName(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/kdeprint/lpdunix/klpdunixprinterimpl.cpp b/kdeprint/lpdunix/klpdunixprinterimpl.cpp index 7a9a3ad81..8a680ae6e 100644 --- a/kdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/kdeprint/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/kdeprint/lpdunix/kmlpdunixmanager.cpp b/kdeprint/lpdunix/kmlpdunixmanager.cpp index f288702eb..0985a487c 100644 --- a/kdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/kdeprint/lpdunix/kmlpdunixmanager.cpp @@ -114,12 +114,12 @@ TQMap readEntry(KTextBuffer& t) if (l.count() > 0) { int p(-1); - if ((p=l[0].find('|')) != -1) + if ((p=l[0].tqfind('|')) != -1) entry["printer-name"] = l[0].left(p); // only keep first name (discard aliases else entry["printer-name"] = l[0]; for (uint i=1; i %2").arg(pcentry.mid(1)).arg(printcap); + QString 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()); } @@ -192,14 +192,14 @@ void KMLpdUnixManager::parseEtcPrintcap() while (!t.eof()) { entry = readEntry(t); - if (entry.isEmpty() || !entry.contains("printer-name") || entry.contains("server")) + if (entry.isEmpty() || !entry.tqcontains("printer-name") || entry.tqcontains("server")) continue; if (entry["printer-name"] == "all") { - if (entry.contains("all")) + if (entry.tqcontains("all")) { - // find separator - int p = entry["all"].find(TQRegExp("[^a-zA-Z0-9_\\s-]")); + // tqfind separator + int p = entry["all"].tqfind(TQRegExp("[^a-zA-Z0-9_\\s-]")); if (p != -1) { QChar c = entry["all"][p]; @@ -216,7 +216,7 @@ void KMLpdUnixManager::parseEtcPrintcap() else { KMPrinter *printer = ::createPrinter(entry); - if (entry.contains("rm")) + if (entry.tqcontains("rm")) printer->setDescription(i18n("Remote printer queue on %1").arg(entry["rm"])); else printer->setDescription(i18n("Local printer")); @@ -234,7 +234,7 @@ TQString getEtcPrintersConfName() { // standard file not found, try NIS printersconf = locateLocal("tmp","printers.conf"); - QString cmd = TQString::fromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); + QString cmd = TQString::tqfromLatin1("ypcat printers.conf.byname > %1").arg(printersconf); kdDebug() << "printers.conf obtained from NIS server: " << cmd << endl; ::system(TQFile::encodeName(cmd)); } @@ -254,18 +254,18 @@ void KMLpdUnixManager::parseEtcPrintersConf() while (!t.eof()) { entry = readEntry(t); - if (entry.isEmpty() || !entry.contains("printer-name")) + if (entry.isEmpty() || !entry.tqcontains("printer-name")) continue; QString prname = entry["printer-name"]; if (prname == "_default") { - if (entry.contains("use")) + if (entry.tqcontains("use")) default_printer = entry["use"]; } else if (prname != "_all") { KMPrinter *printer = ::createPrinter(entry); - if (entry.contains("bsdaddr")) + if (entry.tqcontains("bsdaddr")) { QStringList l = TQStringList::split(',',entry["bsdaddr"],false); printer->setDescription(i18n("Remote printer queue on %1").arg(l[0])); @@ -277,7 +277,7 @@ void KMLpdUnixManager::parseEtcPrintersConf() } if (!default_printer.isEmpty()) - setSoftDefault(findPrinter(default_printer)); + setSoftDefault(tqfindPrinter(default_printer)); } } diff --git a/kdeprint/lpr/apshandler.cpp b/kdeprint/lpr/apshandler.cpp index fc6ade276..fb8a47fed 100644 --- a/kdeprint/lpr/apshandler.cpp +++ b/kdeprint/lpr/apshandler.cpp @@ -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); } @@ -63,7 +63,7 @@ bool ApsHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shor if (!shortmode) { TQMap opts = loadResources(entry); - if (opts.contains("PRINTER")) + if (opts.tqcontains("PRINTER")) { prt->setDescription(i18n("APS Driver (%1)").arg(opts["PRINTER"])); prt->setDriverInfo(prt->description()); @@ -103,7 +103,7 @@ bool ApsHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool shor opts[ "NCP_PRINTER" ], opts[ "NCP_USER" ], opts[ "NCP_PASSWD" ] ); - uri.replace( 0, 3, "ncp" ); + uri.tqreplace( 0, 3, "ncp" ); prt->setDevice(uri); } prot = "ncp"; @@ -148,7 +148,7 @@ TQMap ApsHandler::loadVarFile(const TQString& filename) while (!t.atEnd()) { line = t.readLine().stripWhiteSpace(); - if (line.isEmpty() || line[0] == '#' || (p = line.find('=')) == -1) + if (line.isEmpty() || line[0] == '#' || (p = line.tqfind('=')) == -1) continue; QString variable = line.left(p).stripWhiteSpace(); QString value = line.mid(p+1).stripWhiteSpace(); @@ -166,7 +166,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config if (driver /* && config */ ) // Load resources in all case, to get the correct page size { TQMap opts = loadResources(entry); - if ( !config && opts.contains( "PAPERSIZE" ) ) + if ( !config && opts.tqcontains( "PAPERSIZE" ) ) { // this is needed to keep applications informed // about the current selected page size @@ -175,7 +175,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config // default page size needs to be set to the actual // value of the printer driver, otherwise it's blocked // to A4 - DrBase *opt = driver->findOption( "PageSize" ); + DrBase *opt = driver->tqfindOption( "PageSize" ); if ( opt ) opt->set( "default", opts[ "PageSize" ] ); } @@ -187,7 +187,7 @@ DrMain* ApsHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool config DrMain* ApsHandler::loadDbDriver(const TQString& s) { - int p = s.find('/'); + int p = s.tqfind('/'); DrMain *driver = loadApsDriver(true); if (driver) driver->set("gsdriver", s.mid(p+1)); @@ -272,7 +272,7 @@ PrintcapEntry* ApsHandler::createEntry(KMPrinter *prt) { TQString work, server, printer, user, passwd; TQString uri = prt->device(); - uri.replace( 0, 3, "smb" ); + uri.tqreplace( 0, 3, "smb" ); if ( splitSmbURI( uri, work, server, printer, user, passwd ) ) { QTextStream t(&f); @@ -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/kdeprint/lpr/klprprinterimpl.cpp b/kdeprint/lpr/klprprinterimpl.cpp index 1d77b166c..9f0956ff3 100644 --- a/kdeprint/lpr/klprprinterimpl.cpp +++ b/kdeprint/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(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/kdeprint/lpr/kmlprmanager.cpp b/kdeprint/lpr/kmlprmanager.cpp index 65b08eb67..787504064 100644 --- a/kdeprint/lpr/kmlprmanager.cpp +++ b/kdeprint/lpr/kmlprmanager.cpp @@ -148,7 +148,7 @@ void KMLprManager::initHandlers() if (func) insertHandler(func(this)); else - kdDebug() << "couldn't find the symbol 'create_handler'" << endl; + kdDebug() << "couldn't tqfind the symbol 'create_handler'" << endl; } } @@ -156,11 +156,11 @@ void KMLprManager::initHandlers() insertHandler(new LprHandler("default", this)); } -LprHandler* KMLprManager::findHandler(KMPrinter *prt) +LprHandler* KMLprManager::tqfindHandler(KMPrinter *prt) { QString handlerstr(prt->option("kde-lpr-handler")); LprHandler *handler(0); - if (handlerstr.isEmpty() || (handler = m_handlers.find(handlerstr)) == NULL) + if (handlerstr.isEmpty() || (handler = m_handlers.tqfind(handlerstr)) == NULL) { return NULL; } @@ -169,7 +169,7 @@ LprHandler* KMLprManager::findHandler(KMPrinter *prt) PrintcapEntry* KMLprManager::findEntry(KMPrinter *prt) { - PrintcapEntry *entry = m_entries.find(prt->printerName()); + PrintcapEntry *entry = m_entries.tqfind(prt->printerName()); if (!entry) { return NULL; @@ -179,7 +179,7 @@ PrintcapEntry* KMLprManager::findEntry(KMPrinter *prt) bool KMLprManager::completePrinter(KMPrinter *prt) { - LprHandler *handler = findHandler(prt); + LprHandler *handler = tqfindHandler(prt); PrintcapEntry *entry = findEntry(prt); if (handler && entry) return handler->completePrinter(prt, entry, false); @@ -188,7 +188,7 @@ bool KMLprManager::completePrinter(KMPrinter *prt) bool KMLprManager::completePrinterShort(KMPrinter *prt) { - LprHandler *handler = findHandler(prt); + LprHandler *handler = tqfindHandler(prt); PrintcapEntry *entry = findEntry(prt); if (!handler || !entry) return false; @@ -216,7 +216,7 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config) if (!prt) return NULL; - LprHandler *handler = findHandler(prt); + LprHandler *handler = tqfindHandler(prt); PrintcapEntry *entry = findEntry(prt); if (handler && entry) { @@ -230,9 +230,9 @@ DrMain* KMLprManager::loadPrinterDriver(KMPrinter *prt, bool config) DrMain* KMLprManager::loadFileDriver(const TQString& filename) { - int p = filename.find('/'); - QString handler_str = (p != -1 ? filename.left(p) : TQString::fromLatin1("default")); - LprHandler *handler = m_handlers.find(handler_str); + int p = filename.tqfind('/'); + QString handler_str = (p != -1 ? filename.left(p) : TQString::tqfromLatin1("default")); + LprHandler *handler = m_handlers.tqfind(handler_str); if (handler) { DrMain *driver = handler->loadDbDriver(filename); @@ -267,7 +267,7 @@ bool KMLprManager::startPrinter(KMPrinter *prt, bool state) bool KMLprManager::savePrinterDriver(KMPrinter *prt, DrMain *driver) { - LprHandler *handler = findHandler(prt); + LprHandler *handler = tqfindHandler(prt); PrintcapEntry *entry = findEntry(prt); if (handler && entry) { @@ -311,7 +311,7 @@ bool KMLprManager::savePrintcapFile() bool KMLprManager::createPrinter(KMPrinter *prt) { // remove existing printcap entry - PrintcapEntry *oldEntry = m_entries.find(prt->printerName()); + PrintcapEntry *oldEntry = m_entries.tqfind(prt->printerName()); // look for the handler and re-create entry LprHandler *handler(0); @@ -320,11 +320,11 @@ bool KMLprManager::createPrinter(KMPrinter *prt) // or we use the handler of the existing printer // (modifying something else, handler stays the same) if (prt->driver()) - handler = m_handlers.find(prt->driver()->get("handler")); + handler = m_handlers.tqfind(prt->driver()->get("handler")); else if (oldEntry) - handler = findHandler(prt); + handler = tqfindHandler(prt); else - handler = m_handlers.find("default"); + handler = m_handlers.tqfind("default"); if (!handler) { setErrorMsg(i18n("Internal error: no handler defined.")); @@ -390,7 +390,7 @@ bool KMLprManager::createPrinter(KMPrinter *prt) bool KMLprManager::removePrinter(KMPrinter *prt) { - LprHandler *handler = findHandler(prt); + LprHandler *handler = tqfindHandler(prt); PrintcapEntry *entry = findEntry(prt); if (handler && entry) { @@ -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() @@ -442,11 +442,11 @@ TQString KMLprManager::driverDirectory() TQString KMLprManager::printOptions(KPrinter *prt) { - KMPrinter *mprt = findPrinter(prt->printerName()); + KMPrinter *mprt = tqfindPrinter(prt->printerName()); QString opts; if (mprt) { - LprHandler *handler = findHandler(mprt); + LprHandler *handler = tqfindHandler(mprt); if (handler) return handler->printOptions(prt); } diff --git a/kdeprint/lpr/kmlprmanager.h b/kdeprint/lpr/kmlprmanager.h index 516494f95..f7b31ba28 100644 --- a/kdeprint/lpr/kmlprmanager.h +++ b/kdeprint/lpr/kmlprmanager.h @@ -66,7 +66,7 @@ protected: void initHandlers(); void insertHandler(LprHandler*); PrintcapEntry* findEntry(KMPrinter*); - LprHandler* findHandler(KMPrinter*); + LprHandler* tqfindHandler(KMPrinter*); void checkPrinterState(KMPrinter*); bool savePrintcapFile(); diff --git a/kdeprint/lpr/lpchelper.cpp b/kdeprint/lpr/lpchelper.cpp index 516e85af3..1ef43ed79 100644 --- a/kdeprint/lpr/lpchelper.cpp +++ b/kdeprint/lpr/lpchelper.cpp @@ -62,7 +62,7 @@ LpcHelper::~LpcHelper() KMPrinter::PrinterState LpcHelper::state(const TQString& prname) const { - if (m_state.contains(prname)) + if (m_state.tqcontains(prname)) return m_state[prname]; return KMPrinter::Unknown; } @@ -72,7 +72,7 @@ KMPrinter::PrinterState LpcHelper::state(KMPrinter *prt) const return state(prt->printerName()); } -void LpcHelper::parseStatusLPR(TQTextStream &t) +void LpcHelper::parsetqStatusLPR(TQTextStream &t) { QString printer, line; int p(-1); @@ -82,32 +82,32 @@ void LpcHelper::parseStatusLPR(TQTextStream &t) line = t.readLine(); if (line.isEmpty()) continue; - else if (!line[0].isSpace() && (p = line.find(':')) != -1) + else if (!line[0].isSpace() && (p = line.tqfind(':')) != -1) { printer = line.left(p); m_state[printer] = KMPrinter::Idle; } - else if (line.find("printing is disabled") != -1) + else if (line.tqfind("printing is disabled") != -1) { if (!printer.isEmpty()) m_state[printer] = KMPrinter::PrinterState((KMPrinter::Stopped) | (m_state[printer] & ~KMPrinter::StateMask)); } - else if (line.find("queuing is disabled") != -1) + else if (line.tqfind("queuing is disabled") != -1) { if (!printer.isEmpty()) m_state[printer] = KMPrinter::PrinterState((KMPrinter::Rejecting) | (m_state[printer] & KMPrinter::StateMask)); } - else if (line.find("entries") != -1) + else if (line.tqfind("entries") != -1) { if (!printer.isEmpty() && (m_state[printer] & KMPrinter::StateMask) != KMPrinter::Stopped && - line.find("no entries") == -1) + line.tqfind("no entries") == -1) m_state[printer] = KMPrinter::PrinterState((m_state[printer] & ~KMPrinter::StateMask) | KMPrinter::Processing); } } } -void LpcHelper::parseStatusLPRng(TQTextStream& t) +void LpcHelper::parsetqStatusLPRng(TQTextStream& t) { QStringList l; int p(-1); @@ -121,7 +121,7 @@ void LpcHelper::parseStatusLPRng(TQTextStream& t) l = TQStringList::split(TQRegExp("\\s"), t.readLine(), false); if (l.count() < 4) continue; - p = l[0].find('@'); + p = l[0].tqfind('@'); if (p == 0) printer = l[0]; else @@ -152,10 +152,10 @@ void LpcHelper::updateStates() { default: case LprSettings::LPR: - parseStatusLPR(t); + parsetqStatusLPR(t); break; case LprSettings::LPRng: - parseStatusLPRng(t); + parsetqStatusLPRng(t); break; } proc.close(); @@ -206,11 +206,11 @@ static TQString lprngAnswer(const TQString& result, const TQString& printer) { int p, q; - p = result.find("\n" + printer); + p = result.tqfind("\n" + printer); if (p != -1) { - q = result.find(':', p)+2; - p = result.find('\n', q); + q = result.tqfind(':', p)+2; + p = result.tqfind('\n', q); QString answer = result.mid(q, p-q).stripWhiteSpace(); return answer; } @@ -260,7 +260,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin break; default: case 1: - msg = i18n("Unknown error: %1").arg(result.replace(TQRegExp("\\n"), " ")); + msg = i18n("Unknown error: %1").arg(result.tqreplace(TQRegExp("\\n"), " ")); break; } return (status == 0); @@ -274,9 +274,9 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg) return false; } QString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); - if (result.find("dequeued") != -1) + if (result.tqfind("dequeued") != -1) return true; - else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1) + else if (result.tqfind("Permission denied") != -1 || result.tqfind("no permissions") != -1) msg = i18n("Permission denied."); else msg = i18n("Execution of lprm failed: %1").arg(result); diff --git a/kdeprint/lpr/lpchelper.h b/kdeprint/lpr/lpchelper.h index d7e6c7897..ee0182a5a 100644 --- a/kdeprint/lpr/lpchelper.h +++ b/kdeprint/lpr/lpchelper.h @@ -27,7 +27,7 @@ class KMJob; -class LpcHelper : public QObject +class LpcHelper : public TQObject { public: LpcHelper(TQObject *parent = 0, const char *name = 0); @@ -46,8 +46,8 @@ public: protected: bool changeState(const TQString&, const TQString&, TQString&); - void parseStatusLPR(TQTextStream&); - void parseStatusLPRng(TQTextStream&); + void parsetqStatusLPR(TQTextStream&); + void parsetqStatusLPRng(TQTextStream&); int parseStateChangeLPR(const TQString&, const TQString&); int parseStateChangeLPRng(const TQString&, const TQString&); diff --git a/kdeprint/lpr/lpqhelper.cpp b/kdeprint/lpr/lpqhelper.cpp index 2675c9d41..aa8e19879 100644 --- a/kdeprint/lpr/lpqhelper.cpp +++ b/kdeprint/lpr/lpqhelper.cpp @@ -46,7 +46,7 @@ KMJob* LpqHelper::parseLineLpr(const TQString& line) job->setOwner(line.mid(7, 11).stripWhiteSpace()); job->setId(line.mid(18, 5).toInt()); job->setName(line.mid(23, 38).stripWhiteSpace()); - int p = line.find(' ', 61); + int p = line.tqfind(' ', 61); if (p != -1) { job->setSize(line.mid(61, p-61).toInt() / 1000); @@ -61,14 +61,14 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line) return NULL; KMJob *job = new KMJob; job->setState((rank[0].isDigit() ? KMJob::Queued : (rank == "hold" ? KMJob::Held : KMJob::Printing))); - int p = line.find('@', 7), q = line.find(' ', 7); + int p = line.tqfind('@', 7), q = line.tqfind(' ', 7); job->setOwner(line.mid(7, QMIN(p,q)-7)); while (line[q].isSpace()) q++; q++; while (line[q].isSpace()) q++; - p = line.find(' ', q); + p = line.tqfind(' ', q); job->setId(line.mid(q, p-q).toInt()); while (line[p].isSpace()) p++; diff --git a/kdeprint/lpr/lpqhelper.h b/kdeprint/lpr/lpqhelper.h index b41521f66..d79903f57 100644 --- a/kdeprint/lpr/lpqhelper.h +++ b/kdeprint/lpr/lpqhelper.h @@ -25,7 +25,7 @@ class KMJob; -class LpqHelper : public QObject +class LpqHelper : public TQObject { public: LpqHelper(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/lpr/lprhandler.cpp b/kdeprint/lpr/lprhandler.cpp index 600df4796..4a2a96b0f 100644 --- a/kdeprint/lpr/lprhandler.cpp +++ b/kdeprint/lpr/lprhandler.cpp @@ -61,7 +61,7 @@ bool LprHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool) KURL uri; if (!val.isEmpty() && val != "/dev/null") { - int p = val.find('@'); + int p = val.tqfind('@'); if (p != -1) { prt->setLocation(i18n("Remote queue (%1) on %2").arg(val.left(p)).arg(val.mid(p+1))); @@ -69,7 +69,7 @@ bool LprHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool) uri.setHost(val.mid(p+1)); uri.setPath("/" + val.left(p)); } - else if ((p = val.find('%')) != -1) + else if ((p = val.tqfind('%')) != -1) { prt->setLocation(i18n("Network printer (%1)").arg("socket")); uri.setProtocol("socket"); diff --git a/kdeprint/lpr/lprngtoolhandler.cpp b/kdeprint/lpr/lprngtoolhandler.cpp index 3710496a9..d4e448ad4 100644 --- a/kdeprint/lpr/lprngtoolhandler.cpp +++ b/kdeprint/lpr/lprngtoolhandler.cpp @@ -40,7 +40,7 @@ LPRngToolHandler::LPRngToolHandler(KMManager *mgr) bool LPRngToolHandler::validate(PrintcapEntry *entry) { if (entry->comment.startsWith("##LPRNGTOOL##") && - entry->comment.find("UNKNOWN") == -1) + entry->comment.tqfind("UNKNOWN") == -1) return true; return false; } @@ -82,14 +82,14 @@ bool LPRngToolHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, boo if (!(str=entry->field("ifhp")).isEmpty()) { QString model; - int p = str.find("model"); + int p = str.tqfind("model"); if (p != -1) { - p = str.find('=', p); + p = str.tqfind('=', p); if (p != -1) { p++; - int q = str.find(',', p); + int q = str.tqfind(',', p); if (q == -1) model = str.mid(p); else @@ -142,7 +142,7 @@ void LPRngToolHandler::loadAuthFile(const TQString& filename, TQString& user, TQ line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - int p = line.find('='); + int p = line.tqfind('='); if (p != -1) { QString key = line.left(p); @@ -182,7 +182,7 @@ DrMain* LPRngToolHandler::loadDriver(KMPrinter *prt, PrintcapEntry *entry, bool DrMain* LPRngToolHandler::loadDbDriver(const TQString& s) { - int p = s.find('/'); + int p = s.tqfind('/'); DrMain* driver = loadToolDriver(locate("data", "kdeprint/lprngtooldriver1")); if (driver) driver->set("driverID", s.mid(p+1)); @@ -207,15 +207,15 @@ TQValueList< QPair > LPRngToolHandler::loadChoiceDict(con dict << QPair(key, l); l.clear(); key = TQString::null; - if (line.contains('|') == 2 || line.right(7) == "BOOLEAN") + if (line.tqcontains('|') == 2 || line.right(7) == "BOOLEAN") { - int p = line.find('|', 7); + int p = line.tqfind('|', 7); key = line.mid(7, p-7); } } else if (line.startsWith("CHOICE")) { - int p = line.find('|', 7); + int p = line.tqfind('|', 7); l << line.mid(7, p-7); } } @@ -239,7 +239,7 @@ TQMap LPRngToolHandler::parseZOptions(const TQString& optstr) bool found(false); for (TQValueList< QPair >::ConstIterator p=m_dict.begin(); p!=m_dict.end() && !found; ++p) { - if ((*p).second.find(*it) != (*p).second.end()) + if ((*p).second.tqfind(*it) != (*p).second.end()) { opts[(*p).first] = (*it); found = true; @@ -308,7 +308,7 @@ PrintcapEntry* LPRngToolHandler::createEntry(KMPrinter *prt) QString 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)); QFile 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 opts; QString optstr; driver->getOptions(opts, false); diff --git a/kdeprint/lpr/matichandler.cpp b/kdeprint/lpr/matichandler.cpp index f3f0d4cdc..cf1a55f56 100644 --- a/kdeprint/lpr/matichandler.cpp +++ b/kdeprint/lpr/matichandler.cpp @@ -85,7 +85,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh { prt->setLocation(i18n("Local printer on %1").arg(val)); KURL url(val); - if (val.find("usb") != -1) + if (val.tqfind("usb") != -1) url.setProtocol("usb"); else url.setProtocol("parallel"); @@ -104,7 +104,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh KURL url ( parsePostpipe(postpipe) ); if (!url.isEmpty()) { - QString ds = TQString::fromLatin1("%1 (%2)").arg(prt->location()).arg(url.protocol()); + QString 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())); } } } @@ -126,7 +126,7 @@ bool MaticHandler::completePrinter(KMPrinter *prt, PrintcapEntry *entry, bool sh TQString MaticHandler::parsePostpipe(const TQString& s) { QString url; - int p = s.findRev('|'); + int p = s.tqfindRev('|'); QStringList args = TQStringList::split(" ", s.right(s.length()-p-1)); if (args.count() != 0) @@ -167,7 +167,7 @@ TQString MaticHandler::parsePostpipe(const TQString& s) else { QString host = (args[i].length() == 2 ? args[i+1] : args[i].right(args[i].length()-2)); - int p = host.find("\\@"); + int p = host.tqfind("\\@"); if (p != -1) { url = "lpd://" + host.right(host.length()-p-2) + "/" + host.left(p); @@ -247,11 +247,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) } QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { - manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " + manager()->setErrorMsg(i18n("Unable to tqfind the executable foomatic-datafile " "in your PATH. Check that Foomatic is correctly installed.")); return NULL; } @@ -309,15 +309,15 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai line = tin.readLine(); if (line.stripWhiteSpace().startsWith("$postpipe")) continue; - else if ((p = line.find("'name'")) != -1) + else if ((p = line.tqfind("'name'")) != -1) { - p = line.find('\'', p+6)+1; - q = line.find('\'', p); + p = line.tqfind('\'', p+6)+1; + q = line.tqfind('\'', p); optname = line.mid(p, q-p); } - else if ((p = line.find("'default'")) != -1) + else if ((p = line.tqfind("'default'")) != -1) { - DrBase *opt = driver->findOption(optname); + DrBase *opt = driver->tqfindOption(optname); if (opt) { tout << line.left(p+9) << " => '" << opt->valueText() << "'," << endl; @@ -351,11 +351,11 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) if (mdriver.isEmpty() || mprinter.isEmpty()) return true; - QString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); + QString PATH = getenv("PATH") + TQString::tqfromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); QString exe = KStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) { - manager()->setErrorMsg(i18n("Unable to find the executable foomatic-datafile " + manager()->setErrorMsg(i18n("Unable to tqfind the executable foomatic-datafile " "in your PATH. Check that Foomatic is correctly installed.")); return false; } @@ -372,12 +372,12 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) line = tin.readLine(); if (line.startsWith("*% COMDATA #")) { - if (line.find("'default'") != -1) + if (line.tqfind("'default'") != -1) { - DrBase *opt = (optname.isEmpty() ? NULL : driver->findOption(optname)); + DrBase *opt = (optname.isEmpty() ? NULL : driver->tqfindOption(optname)); if (opt) { - line.replace(foo2, "'"+opt->valueText()+"',"); + line.tqreplace(foo2, "'"+opt->valueText()+"',"); } } else if (foo.search(line) != -1) @@ -385,7 +385,7 @@ bool MaticHandler::savePpdFile(DrMain *driver, const TQString& filename) } else if (re.search(line) != -1) { - DrBase *opt = driver->findOption(re.cap(1)); + DrBase *opt = driver->tqfindOption(re.cap(1)); if (opt) { QString val = opt->valueText(); @@ -423,7 +423,7 @@ PrintcapEntry* MaticHandler::createEntry(KMPrinter *prt) } if (m_exematicpath.isEmpty()) { - manager()->setErrorMsg(i18n("Unable to find executable lpdomatic. " + manager()->setErrorMsg(i18n("Unable to tqfind executable lpdomatic. " "Check that Foomatic is correctly installed " "and that lpdomatic is installed in a standard " "location.")); diff --git a/kdeprint/lpr/matichelper.cpp b/kdeprint/lpr/matichelper.cpp index 544db8c71..918d8f22d 100644 --- a/kdeprint/lpr/matichelper.cpp +++ b/kdeprint/lpr/matichelper.cpp @@ -29,7 +29,7 @@ TQString maticFile(PrintcapEntry *entry) s = entry->field("filter_options"); if (!s.isEmpty()) { - int p = s.findRev(' '); + int p = s.tqfindRev(' '); if (p != -1) s = s.mid(p+1); } diff --git a/kdeprint/lpr/printcapentry.h b/kdeprint/lpr/printcapentry.h index 15adafddd..e3617a34f 100644 --- a/kdeprint/lpr/printcapentry.h +++ b/kdeprint/lpr/printcapentry.h @@ -72,7 +72,7 @@ public: TQMap fields; QString postcomment; - bool has(const TQString& f) const { return fields.contains(f); } + bool has(const TQString& f) const { return fields.tqcontains(f); } TQString field(const TQString& f) const { return fields[f].value; } bool writeEntry(TQTextStream&); void addField(const TQString& name, Field::Type type = Field::Boolean, const TQString& value = TQString::null); diff --git a/kdeprint/lpr/printcapreader.cpp b/kdeprint/lpr/printcapreader.cpp index a3ab30e8f..7abd094f9 100644 --- a/kdeprint/lpr/printcapreader.cpp +++ b/kdeprint/lpr/printcapreader.cpp @@ -101,7 +101,7 @@ PrintcapEntry* PrintcapReader::nextEntry() // now parse the entry kdDebug() << "COMMENT: " << comment << endl; kdDebug() << "LINE: " << buf << endl; - int p = buf.find(':'); + int p = buf.tqfind(':'); if (p == -1) name = buf; else @@ -132,14 +132,14 @@ PrintcapEntry* PrintcapReader::nextEntry() for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { Field f; - int p = (*it).find('='); + int p = (*it).tqfind('='); if (p == -1) { - p = (*it).find('#'); + p = (*it).tqfind('#'); if (p == -1) { f.type = Field::Boolean; - p = (*it).find('@'); + p = (*it).tqfind('@'); if (p == -1) { f.name = (*it); diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp index 7bad07264..1cb6693e8 100644 --- a/kdeprint/management/cjanuswidget.cpp +++ b/kdeprint/management/cjanuswidget.cpp @@ -118,7 +118,7 @@ void CJanusWidget::CListBox::computeWidth() item = item->next(); } if (verticalScrollBar()->isVisible()) - w += verticalScrollBar()->sizeHint().width(); + w += verticalScrollBar()->tqsizeHint().width(); w += (frameWidth()*2); setFixedWidth(w); } @@ -169,7 +169,7 @@ void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& he page->m_text = text; page->m_header = header; page->m_pixmap = pix; - page->m_item = new CListBoxItem(m_iconlist,findPrevItem(page),pix,text); + page->m_item = new CListBoxItem(m_iconlist,tqfindPrevItem(page),pix,text); m_iconlist->computeWidth(); m_stack->addWidget(w,m_pages.count()); @@ -179,10 +179,10 @@ void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& he void CJanusWidget::enablePage(TQWidget *w) { - CPage *page = findPage(w); + CPage *page = tqfindPage(w); if (page && !page->m_item) { - page->m_item = new CListBoxItem(m_iconlist,findPrevItem(page),page->m_pixmap,page->m_text); + page->m_item = new CListBoxItem(m_iconlist,tqfindPrevItem(page),page->m_pixmap,page->m_text); m_iconlist->computeWidth(); if (m_iconlist->count() == 1) m_iconlist->setSelected(page->m_item,true); @@ -191,7 +191,7 @@ void CJanusWidget::enablePage(TQWidget *w) void CJanusWidget::disablePage(TQWidget *w) { - CPage *page = findPage(w); + CPage *page = tqfindPage(w); if (page && page->m_item) { bool needReselect(m_iconlist->isSelected(page->m_item)); @@ -208,7 +208,7 @@ void CJanusWidget::disablePage(TQWidget *w) void CJanusWidget::slotSelected(TQListBoxItem *item) { - CPage *page = findPage(item); + CPage *page = tqfindPage(item); if (page) { m_stack->raiseWidget(page->m_widget); @@ -221,7 +221,7 @@ void CJanusWidget::slotSelected(TQListBoxItem *item) } } -CJanusWidget::CPage* CJanusWidget::findPage(TQWidget *w) +CJanusWidget::CPage* CJanusWidget::tqfindPage(TQWidget *w) { TQPtrListIterator it(m_pages); for (;it.current();++it) @@ -230,7 +230,7 @@ CJanusWidget::CPage* CJanusWidget::findPage(TQWidget *w) return 0; } -CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i) +CJanusWidget::CPage* CJanusWidget::tqfindPage(TQListBoxItem *i) { TQPtrListIterator it(m_pages); for (;it.current();++it) @@ -239,9 +239,9 @@ CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i) return 0; } -TQListBoxItem* CJanusWidget::findPrevItem(CPage *p) +TQListBoxItem* CJanusWidget::tqfindPrevItem(CPage *p) { - if (m_pages.findRef(p) == -1) + if (m_pages.tqfindRef(p) == -1) m_pages.last(); else m_pages.prev(); diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h index 2b06aed21..5ed401e49 100644 --- a/kdeprint/management/cjanuswidget.h +++ b/kdeprint/management/cjanuswidget.h @@ -49,9 +49,9 @@ public: class CListBoxItem; private: - CPage* findPage(TQWidget *w); - CPage* findPage(TQListBoxItem *i); - TQListBoxItem* findPrevItem(CPage*); + CPage* tqfindPage(TQWidget *w); + CPage* tqfindPage(TQListBoxItem *i); + TQListBoxItem* tqfindPrevItem(CPage*); private: TQPtrList m_pages; diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp index d2c4c873f..538d6660b 100644 --- a/kdeprint/management/kiconselectaction.cpp +++ b/kdeprint/management/kiconselectaction.cpp @@ -85,7 +85,7 @@ int KIconSelectAction::plug(TQWidget* widget, int index) { KToolBar* bar = static_cast(widget); int id = KAction::getToolButtonID(); - // To have a correct layout in the toolbar, a non + // To have a correct tqlayout in the toolbar, a non // empty icon has to be used. Use "unknown" by default. QString iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown"); diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp index 21a1a330b..5a1d1b54b 100644 --- a/kdeprint/management/kmconfigcommand.cpp +++ b/kdeprint/management/kmconfigcommand.cpp @@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(gb); l0->addStretch(1); - QVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint()); + QVBoxLayout *l2 = new TQVBoxLayout(gb->tqlayout(), KDialog::spacingHint()); l2->addWidget(lab); l2->addWidget(sel); } diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp index 10dff4749..bfcf2bf81 100644 --- a/kdeprint/management/kmconfigfilter.cpp +++ b/kdeprint/management/kmconfigfilter.cpp @@ -63,7 +63,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 1); - QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint()); l1->addWidget(lab); QGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); l1->addLayout(l2); @@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(KConfig *conf) { if (!it.current()->isSpecial() && !it.current()->isVirtual()) { - KListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2); + KListBox *lb = (m_plist.tqfind(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2); lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName()); } } diff --git a/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp index e59f75728..16006b2bb 100644 --- a/kdeprint/management/kmconfigfonts.cpp +++ b/kdeprint/management/kmconfigfonts.cpp @@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) QLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); lab0->setBuddy(m_addpath); - QVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l0 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint()); l0->addWidget(m_embedfonts); - QVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box2->tqlayout(), KDialog::spacingHint()); l1->addWidget(m_fontpath); QHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l2); diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp index c729c6516..d6f35b071 100644 --- a/kdeprint/management/kmconfiggeneral.cpp +++ b/kdeprint/management/kmconfiggeneral.cpp @@ -57,7 +57,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) QGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this); m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_testpage = new KURLRequester(m_testpagebox,"TestPage"); - m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); + m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filetqfind"), m_testpagebox); connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool))); connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool))); connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview())); @@ -70,16 +70,16 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox); m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); - //layout + //tqlayout QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_timerbox); lay0->addWidget(m_testpagebox); lay0->addWidget(m_statusbox); lay0->addStretch(1); - QVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(), + QVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->tqlayout(), KDialog::spacingHint()); lay1->addWidget(m_timer); - QVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(), + QVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->tqlayout(), KDialog::spacingHint()); QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); lay2->addWidget(m_defaulttestpage); @@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay2->addLayout(lay3); lay3->addStretch(1); lay3->addWidget(m_preview); - QVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(), + QVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->tqlayout(), KDialog::spacingHint()); lay4->addWidget(m_statusmsg); lay4->addWidget(m_uselast); @@ -114,7 +114,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf) m_defaulttestpage->setChecked(true); m_testpage->setURL(tpage); } - m_statusmsg->setChecked(conf->readBoolEntry("ShowStatusMsg", true)); + m_statusmsg->setChecked(conf->readBoolEntry("ShowtqStatusMsg", true)); m_uselast->setChecked(conf->readBoolEntry("UseLast", true)); } @@ -123,10 +123,10 @@ void KMConfigGeneral::saveConfig(KConfig *conf) conf->setGroup("General"); conf->writeEntry("TimerDelay",m_timer->value()); conf->writePathEntry("TestPage",(m_defaulttestpage->isChecked() ? m_testpage->url() : TQString::null)); - if (m_defaulttestpage->isChecked() && KMimeMagic::self()->findFileType(m_testpage->url())->mimeType() != "application/postscript") + if (m_defaulttestpage->isChecked() && KMimeMagic::self()->tqfindFileType(m_testpage->url())->mimeType() != "application/postscript") KMessageBox::sorry(this, i18n("The selected test page is not a PostScript file. You may not " "be able to test your printer anymore.")); - conf->writeEntry("ShowStatusMsg", m_statusmsg->isChecked()); + conf->writeEntry("ShowtqStatusMsg", m_statusmsg->isChecked()); conf->writeEntry("UseLast", m_uselast->isChecked()); } @@ -136,7 +136,7 @@ void KMConfigGeneral::slotTestPagePreview() if (tpage.isEmpty()) KMessageBox::error(this, i18n("Empty file name.")); else - KRun::runURL(KURL( tpage ), KMimeMagic::self()->findFileType(tpage)->mimeType()); + KRun::runURL(KURL( tpage ), KMimeMagic::self()->tqfindFileType(tpage)->mimeType()); } #include "kmconfiggeneral.moc" diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp index 1aaf0ec26..b28cf46da 100644 --- a/kdeprint/management/kmconfigjobs.cpp +++ b/kdeprint/management/kmconfigjobs.cpp @@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 0); l0->addStretch(1); - QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint()); l1->addWidget(m_limit); } diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp index 1bd9f46e5..a84df457a 100644 --- a/kdeprint/management/kmconfigpreview.cpp +++ b/kdeprint/management/kmconfigpreview.cpp @@ -34,7 +34,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) { setPageName(i18n("Preview")); setPageHeader(i18n("Preview Settings")); - setPagePixmap("filefind"); + setPagePixmap("filetqfind"); TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); @@ -43,14 +43,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) QLabel *lab = new TQLabel(box); lab->setText(i18n("You can use an external preview program (PS viewer) instead of the " "KDE built-in preview system. Note that if the KDE default PS viewer " - "(KGhostView) cannot be found, KDE tries automatically to find another " + "(KGhostView) cannot be found, KDE tries automatically to tqfind another " "external PostScript viewer")); lab->setTextFormat(Qt::RichText); QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box); l0->addStretch(1); - QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint()); l1->addWidget(lab); l1->addWidget(m_useext); l1->addWidget(m_program); diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp index 3b271ff00..cce83605d 100644 --- a/kdeprint/management/kmdbcreator.cpp +++ b/kdeprint/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())); @@ -133,7 +133,7 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) // the toInt() will return 0. If that occurs for the first number, // then the number of steps will be also 0. bool ok; - int p = str.find('\n'); + int p = str.tqfind('\n'); int n = str.mid(0, p).toInt(&ok); // process the number received diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h index 82fa5469e..d4281a51d 100644 --- a/kdeprint/management/kmdbcreator.h +++ b/kdeprint/management/kmdbcreator.h @@ -28,7 +28,7 @@ class TQWidget; class TQProgressDialog; -class KMDBCreator : public QObject +class KMDBCreator : public TQObject { Q_OBJECT public: diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp index 6e275a6d4..adb7fb807 100644 --- a/kdeprint/management/kmdriverdb.cpp +++ b/kdeprint/management/kmdriverdb.cpp @@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB() TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - QString filename = locateLocal("data",TQString::fromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + QString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } @@ -110,23 +110,23 @@ void KMDriverDB::slotDbCreated() KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model) { - TQDict *models = m_entries.find(manu); + TQDict *models = m_entries.tqfind(manu); if (models) - return models->find(model); + return models->tqfind(model); return 0; } -KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& model) +KMDBEntryList* KMDriverDB::tqfindPnpEntry(const TQString& manu, const TQString& model) { - TQDict *models = m_pnpentries.find(manu); + TQDict *models = m_pnpentries.tqfind(manu); if (models) - return models->find(model); + return models->tqfind(model); return 0; } -TQDict* KMDriverDB::findModels(const TQString& manu) +TQDict* KMDriverDB::tqfindModels(const TQString& manu) { - return m_entries.find(manu); + return m_entries.tqfind(manu); } void KMDriverDB::insertEntry(KMDBEntry *entry) @@ -140,14 +140,14 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) } // insert it in normal entries - TQDict *models = m_entries.find(entry->manufacturer); + TQDict *models = m_entries.tqfind(entry->manufacturer); if (!models) { models = new TQDict(17,false); models->setAutoDelete(true); m_entries.insert(entry->manufacturer,models); } - KMDBEntryList *list = models->find(entry->model); + KMDBEntryList *list = models->tqfind(entry->model); if (!list) { list = new KMDBEntryList; @@ -159,14 +159,14 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) if (!entry->pnpmanufacturer.isEmpty() && !entry->pnpmodel.isEmpty()) { // insert it in PNP entries - models = m_pnpentries.find(entry->manufacturer); + models = m_pnpentries.tqfind(entry->manufacturer); if (!models) { models = new TQDict(17,false); models->setAutoDelete(true); m_pnpentries.insert(entry->manufacturer,models); } - list = models->find(entry->model); + list = models->tqfind(entry->model); if (!list) { list = new KMDBEntryList; @@ -209,7 +209,7 @@ void KMDriverDB::loadDbFile() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - int p = line.find('='); + int p = line.tqfind('='); if (p == -1) continue; words.clear(); @@ -235,7 +235,7 @@ void KMDriverDB::loadDbFile() else if (words[0] == "RECOMMANDED" && entry && words[1].lower() == "yes") entry->recommended = true; else if (words[0] == "DRIVERCOMMENT" && entry) - entry->drivercomment = (""+words[1].replace("<", "<").replace(">", ">")+""); + entry->drivercomment = (""+words[1].tqreplace("<", "<").tqreplace(">", ">")+""); } if (entry) insertEntry(entry); diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h index 1ffecdc0a..e18ce971e 100644 --- a/kdeprint/management/kmdriverdb.h +++ b/kdeprint/management/kmdriverdb.h @@ -29,7 +29,7 @@ class KMDBCreator; -class KMDriverDB : public QObject +class KMDriverDB : public TQObject { Q_OBJECT public: @@ -40,8 +40,8 @@ public: void init(TQWidget *parent = 0); KMDBEntryList* findEntry(const TQString& manu, const TQString& model); - KMDBEntryList* findPnpEntry(const TQString& manu, const TQString& model); - TQDict* findModels(const TQString& manu); + KMDBEntryList* tqfindPnpEntry(const TQString& manu, const TQString& model); + TQDict* tqfindModels(const TQString& manu); const TQDict< TQDict >& manufacturers() const { return m_entries; } protected: diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp index fdd3d263c..45b305087 100644 --- a/kdeprint/management/kmdriverdbwidget.cpp +++ b/kdeprint/management/kmdriverdbwidget.cpp @@ -58,7 +58,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) l1->setBuddy(m_manu); l2->setBuddy(m_model); - // build layout + // build tqlayout QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); QGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); QHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); @@ -95,17 +95,17 @@ KMDriverDbWidget::~KMDriverDbWidget() void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model) { - QListBoxItem *item = m_manu->findItem(manu); + QListBoxItem *item = m_manu->tqfindItem(manu); QString model_(model); if (item) { m_manu->setCurrentItem(item); - item = m_model->findItem(model_); + item = m_model->tqfindItem(model_); if (!item) // 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->tqfindItem(model_.tqreplace(0,manu.length()+1,TQString::tqfromLatin1(""))); if (item) m_model->setCurrentItem(item); } @@ -186,7 +186,7 @@ void KMDriverDbWidget::slotError(const TQString& msg) void KMDriverDbWidget::slotManufacturerSelected(const TQString& name) { m_model->clear(); - TQDict *models = KMDriverDB::self()->findModels(name); + TQDict *models = KMDriverDB::self()->tqfindModels(name); if (models) { QStrIList ilist(true); @@ -203,18 +203,18 @@ void KMDriverDbWidget::slotPostscriptToggled(bool on) { if (on) { - QListBoxItem *item = m_manu->findItem("GENERIC"); + QListBoxItem *item = m_manu->tqfindItem("GENERIC"); if (item) { m_manu->setCurrentItem(item); - item = m_model->findItem( "POSTSCRIPT PRINTER" ); + item = m_model->tqfindItem( "POSTSCRIPT PRINTER" ); if ( item ) { m_model->setCurrentItem( item ); return; } } - KMessageBox::error(this,i18n("Unable to find the PostScript driver.")); + KMessageBox::error(this,i18n("Unable to tqfind the PostScript driver.")); m_postscript->setChecked(false); } } diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index 5d16e34d0..8fbe0ecea 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/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); } @@ -137,7 +137,7 @@ KMIconView::~KMIconView() { } -KMIconViewItem* KMIconView::findItem(KMPrinter *p) +KMIconViewItem* KMIconView::tqfindItem(KMPrinter *p) { if (p) { @@ -167,7 +167,7 @@ void KMIconView::setPrinterList(TQPtrList *list) // only keep real printers (no instances) if (!it.current()->instanceName().isEmpty()) continue; - item = findItem(it.current()); + item = tqfindItem(it.current()); if (!item) { item = new KMIconViewItem(this,it.current()); diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h index 1c3aeb542..96bf92b84 100644 --- a/kdeprint/management/kmiconview.h +++ b/kdeprint/management/kmiconview.h @@ -68,7 +68,7 @@ protected slots: void slotSelectionChanged(); private: - KMIconViewItem* findItem(KMPrinter *p); + KMIconViewItem* tqfindItem(KMPrinter *p); private: TQPtrList m_items; diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp index e06fa3c28..d6db9ec43 100644 --- a/kdeprint/management/kminfopage.cpp +++ b/kdeprint/management/kminfopage.cpp @@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) { m_title = new TQLabel(this); m_titlepixmap = new TQLabel(this); - m_titlepixmap->setAlignment(Qt::AlignCenter); + m_titlepixmap->tqsetAlignment(Qt::AlignCenter); KSeparator* sep = new KSeparator( KSeparator::HLine, this); m_type = new TQLabel(this); m_description = new TQLabel(this); @@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) m_uri = new TQLabel(this); m_device = new TQLabel(this); QLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); - m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_loclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_desclabel = new TQLabel(i18n("Description:"), this); - m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_desclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_typelabel = new TQLabel(i18n("Type:"), this); - m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); - m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_typelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); + QLabel *m_statelabel = new TQLabel(i18n("tqStatus", "State:"), this); + m_statelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_urilabel = new TQLabel(i18n("URI:"), this); - m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_urilabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); m_devlabel = new TQLabel(i18n("Device:"), this); - m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_devlabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QLabel *m_modellabel = new TQLabel(i18n("Model:"), this); - m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_modellabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter); QGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); @@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) } else { - m_title->setText(TQString::fromLatin1("%1").arg(p->name())); + m_title->setText(TQString::tqfromLatin1("%1").arg(p->name())); m_titlepixmap->setPixmap(SmallIcon(p->pixmap())); if (p->isImplicit()) m_type->setText(i18n("Implicit class")); else if (p->isClass(false)) @@ -133,7 +133,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) } else { - // double decoding in case printer name contains + // double decoding in case printer name tqcontains // annoying chars like '#' KURL dev(p->device()); m_device->setText(KURL::decode_string(dev.prettyURL())); diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp index 6e6fcc391..8089c3890 100644 --- a/kdeprint/management/kminstancepage.cpp +++ b/kdeprint/management/kminstancepage.cpp @@ -121,9 +121,9 @@ void KMInstancePage::setPrinter(KMPrinter *p) //iif (!oldText.isEmpty()) //{ - QListBoxItem *item = m_view->findItem(oldText); + QListBoxItem *item = m_view->tqfindItem(oldText); if (!item) - item = m_view->findItem(i18n("(Default)")); + item = m_view->tqfindItem(i18n("(Default)")); if (item) m_view->setSelected(item,true); //} @@ -138,7 +138,7 @@ void KMInstancePage::slotNew() i18n("(Default)"),&ok,this); if (ok) { - if (name.find(TQRegExp("[/\\s]")) != -1) + if (name.tqfind(TQRegExp("[/\\s]")) != -1) KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes.")); else { @@ -183,7 +183,7 @@ void KMInstancePage::slotCopy() i18n("(Default)"),&ok,this); if (ok) { - if (name.find(TQRegExp("[/\\s]")) != -1) + if (name.tqfind(TQRegExp("[/\\s]")) != -1) KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes.")); else { @@ -208,9 +208,9 @@ void KMInstancePage::slotSettings() if (!src.isEmpty()) { if (src == i18n("(Default)")) src = TQString::null; - KMPrinter *pr = KMFactory::self()->virtualManager()->findInstance(m_printer,src); + KMPrinter *pr = KMFactory::self()->virtualManager()->tqfindInstance(m_printer,src); if ( !pr ) - KMessageBox::error( this, i18n( "Unable to find instance %1." ).arg( m_view->currentText() ) ); + KMessageBox::error( this, i18n( "Unable to tqfind instance %1." ).arg( m_view->currentText() ) ); else if ( !pr->isSpecial() && !KMFactory::self()->manager()->completePrinterShort( pr ) ) KMessageBox::error( this, i18n( "Unable to retrieve printer information. Message from printing system: %1." ).arg( KMFactory::self()->manager()->errorMsg() ) ); else @@ -259,7 +259,7 @@ void KMInstancePage::slotTest() { if (src == i18n("(Default)")) src = TQString::null; - KMPrinter *mpr = KMFactory::self()->virtualManager()->findInstance(m_printer,src); + KMPrinter *mpr = KMFactory::self()->virtualManager()->tqfindInstance(m_printer,src); if (!mpr) KMessageBox::error(this,i18n("Internal error: printer not found.")); else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), TQString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue) diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index a5e419fc6..03c3dc620 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -149,7 +149,7 @@ void KMJobViewer::updateCaption() if (!m_prname.isEmpty()) { setCaption(i18n("Print Jobs for %1").arg(m_prname)); - KMPrinter *prt = KMManager::self()->findPrinter(m_prname); + KMPrinter *prt = KMManager::self()->tqfindPrinter(m_prname); if (prt) pixname = prt->pixmap(); } @@ -183,7 +183,7 @@ void KMJobViewer::addToManager() } else if (!m_prname.isEmpty()) { - KMPrinter *prt = KMManager::self()->findPrinter( m_prname ); + KMPrinter *prt = KMManager::self()->tqfindPrinter( m_prname ); bool isSpecial = ( prt ? prt->isSpecial() : false ); m_manager->addPrinter(m_prname, (KMJobManager::JobType)m_type, isSpecial); } @@ -235,7 +235,7 @@ void KMJobViewer::init() m_view->addColumn(i18n("Job ID")); m_view->addColumn(i18n("Owner")); m_view->addColumn(i18n("Name"), 150); - m_view->addColumn(i18n("Status", "State")); + m_view->addColumn(i18n("tqStatus", "State")); m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Page(s)")); m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter); @@ -280,7 +280,7 @@ void KMJobViewer::initActions() connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); - m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_userfield->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); if (!m_pop) @@ -387,7 +387,7 @@ void KMJobViewer::updateJobs() for (;it.current();++it) { KMJob *j(it.current()); - JobItem *item = findItem(j->uri()); + JobItem *item = tqfindItem(j->uri()); if (item) { item->setDiscarded(false); @@ -407,7 +407,7 @@ void KMJobViewer::updateJobs() slotSelectionChanged(); } -JobItem* KMJobViewer::findItem(const TQString& uri) +JobItem* KMJobViewer::tqfindItem(const TQString& uri) { TQPtrListIterator it(m_items); for (;it.current();++it) @@ -586,7 +586,7 @@ void KMJobViewer::loadPluginActions() KAction *act = actionCollection()->action("job_restart"); for (int i=0;icontainerCount();i++) { - if (menuBar()->findItem(act->itemId(i), &menu)) + if (menuBar()->tqfindItem(act->itemId(i), &menu)) { menuindex = mpopindex = menu->indexOf(act->itemId(i))+1; break; diff --git a/kdeprint/management/kmjobviewer.h b/kdeprint/management/kmjobviewer.h index 98cd73656..2838ee17e 100644 --- a/kdeprint/management/kmjobviewer.h +++ b/kdeprint/management/kmjobviewer.h @@ -91,7 +91,7 @@ protected: void init(); void updateJobs(); void initActions(); - JobItem* findItem(const TQString& uri); + JobItem* tqfindItem(const TQString& uri); void jobSelection(TQPtrList& l); void send(int cmd, const TQString& name, const TQString& arg = TQString::null); void loadPrinters(); diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index e754cfe1d..2ffc9b730 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/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) @@ -147,7 +147,7 @@ void KMListView::slotRightButtonClicked(TQListViewItem *item, const TQPoint& p, emit rightButtonClicked(item && item->depth() == 2 ? item->text(0) : TQString::null, p); } -KMListViewItem* KMListView::findItem(KMPrinter *p) +KMListViewItem* KMListView::tqfindItem(KMPrinter *p) { if (p) { @@ -169,7 +169,7 @@ KMListViewItem* KMListView::findItem(KMPrinter *p) return 0; } -KMListViewItem* KMListView::findItem(const TQString& prname) +KMListViewItem* KMListView::tqfindItem(const TQString& prname) { TQPtrListIterator it(m_items); for (; it.current(); ++it) @@ -192,12 +192,12 @@ void KMListView::setPrinterList(TQPtrList *list) KMListViewItem *item (0); for (;it.current();++it) { - item = findItem(it.current()); + item = tqfindItem(it.current()); if (!item) { if (it.current()->isVirtual()) { - KMListViewItem *pItem = findItem(it.current()->printerName()); + KMListViewItem *pItem = tqfindItem(it.current()->printerName()); if (!pItem) continue; item = new KMListViewItem(pItem, it.current()); diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h index e9a6b29e5..c037eba4f 100644 --- a/kdeprint/management/kmlistview.h +++ b/kdeprint/management/kmlistview.h @@ -48,8 +48,8 @@ protected slots: void slotOnViewport(); protected: - KMListViewItem* findItem(KMPrinter*); - KMListViewItem* findItem(const TQString&); + KMListViewItem* tqfindItem(KMPrinter*); + KMListViewItem* tqfindItem(const TQString&); private: TQPtrList m_items; diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp index f422832cc..11b77a48e 100644 --- a/kdeprint/management/kmmainview.cpp +++ b/kdeprint/management/kmmainview.cpp @@ -68,7 +68,7 @@ int kdeprint_management_add_printer_wizard( TQWidget* parent ) { flag = 1; // check if the printer already exists, and ask confirmation if needed. - if (KMFactory::self()->manager()->findPrinter(dlg.printer()->name()) != 0) + if (KMFactory::self()->manager()->tqfindPrinter(dlg.printer()->name()) != 0) if (KMessageBox::warningContinueCancel(parent,i18n("The printer %1 already exists. Continuing will overwrite existing printer. Do you want to continue?").arg(dlg.printer()->name())) == KMessageBox::Cancel) flag = 0; // try to add printer only if flag is true. @@ -99,16 +99,16 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co m_menubar->setIconText( KToolBar::IconTextRight ); m_menubar->setMovingEnabled( false ); - // layout - QVBoxLayout *m_layout = new TQVBoxLayout(this, 0, 0); - m_layout->addWidget(m_toolbar); - m_layout->addWidget( m_menubar ); - m_boxlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0); - m_layout->addLayout(m_boxlayout); - m_boxlayout->addWidget(m_printerview); - m_boxlayout->addWidget(m_printerpages); - m_layout->addSpacing(5); - m_layout->addWidget(m_plugin, 0); + // tqlayout + QVBoxLayout *m_tqlayout = new TQVBoxLayout(this, 0, 0); + m_tqlayout->addWidget(m_toolbar); + m_tqlayout->addWidget( m_menubar ); + m_boxtqlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0); + m_tqlayout->addLayout(m_boxtqlayout); + m_boxtqlayout->addWidget(m_printerview); + m_boxtqlayout->addWidget(m_printerpages); + m_tqlayout->addSpacing(5); + m_tqlayout->addWidget(m_plugin, 0); // connections connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); @@ -374,7 +374,7 @@ void KMMainView::slotTimer() void KMMainView::slotPrinterSelected(const TQString& prname) { - KMPrinter *p = KMManager::self()->findPrinter(prname); + KMPrinter *p = KMManager::self()->tqfindPrinter(prname); m_current = p; if (p && !p->isSpecial()) KMFactory::self()->manager()->completePrinter(p); @@ -384,26 +384,26 @@ void KMMainView::slotPrinterSelected(const TQString& prname) // problem). //if (m_toolbar->isEnabled()) //{ - int mask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0); + int tqmask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0); bool sp = !(p && p->isSpecial()); -// m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit())); - m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && !p->isImplicit())); - m_actions->action("printer_configure")->setEnabled(!sp || ((mask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/)); - m_actions->action("printer_hard_default")->setEnabled((sp && (mask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal())); +// m_actions->action("printer_remove")->setEnabled(!sp || ((tqmask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit())); + m_actions->action("printer_remove")->setEnabled(!sp || ((tqmask & KMManager::PrinterRemoval) && p && !p->isImplicit())); + m_actions->action("printer_configure")->setEnabled(!sp || ((tqmask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/)); + m_actions->action("printer_hard_default")->setEnabled((sp && (tqmask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal())); m_actions->action("printer_soft_default")->setEnabled((p && !p->isSoftDefault())); - m_actions->action("printer_test")->setEnabled((sp && (mask & KMManager::PrinterTesting) && p && !p->isClass(true))); - bool stmask = (sp && (mask & KMManager::PrinterEnabling) && p); - m_actions->action("printer_state_change")->setEnabled(stmask && p->isLocal()); - m_actions->action("printer_spool_change")->setEnabled(stmask); - m_actions->action("printer_start")->setEnabled((stmask && p->state() == KMPrinter::Stopped)); - m_actions->action("printer_stop")->setEnabled((stmask && p->state() != KMPrinter::Stopped)); - m_actions->action("printer_enable")->setEnabled((stmask && !p->acceptJobs())); - m_actions->action("printer_disable")->setEnabled((stmask && p->acceptJobs())); - - m_actions->action("printer_add")->setEnabled((mask & KMManager::PrinterCreation)); - mask = m_manager->serverOperationMask(); - m_actions->action("server_restart")->setEnabled((mask & KMManager::ServerRestarting)); - m_actions->action("server_configure")->setEnabled((mask & KMManager::ServerConfigure)); + m_actions->action("printer_test")->setEnabled((sp && (tqmask & KMManager::PrinterTesting) && p && !p->isClass(true))); + bool sttqmask = (sp && (tqmask & KMManager::PrinterEnabling) && p); + m_actions->action("printer_state_change")->setEnabled(sttqmask && p->isLocal()); + m_actions->action("printer_spool_change")->setEnabled(sttqmask); + m_actions->action("printer_start")->setEnabled((sttqmask && p->state() == KMPrinter::Stopped)); + m_actions->action("printer_stop")->setEnabled((sttqmask && p->state() != KMPrinter::Stopped)); + m_actions->action("printer_enable")->setEnabled((sttqmask && !p->acceptJobs())); + m_actions->action("printer_disable")->setEnabled((sttqmask && p->acceptJobs())); + + m_actions->action("printer_add")->setEnabled((tqmask & KMManager::PrinterCreation)); + tqmask = m_manager->serverOperationMask(); + m_actions->action("server_restart")->setEnabled((tqmask & KMManager::ServerRestarting)); + m_actions->action("server_configure")->setEnabled((tqmask & KMManager::ServerConfigure)); KMFactory::self()->manager()->validatePluginActions(m_actions, p); //} @@ -428,7 +428,7 @@ void KMMainView::slotChangeView(int ID) void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p) { - KMPrinter *printer = KMManager::self()->findPrinter(prname); + KMPrinter *printer = KMManager::self()->tqfindPrinter(prname); // construct popup menu m_pop->clear(); if (printer) @@ -622,11 +622,11 @@ void KMMainView::setOrientation(int o) } int KMMainView::orientation() const -{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } +{ return (m_boxtqlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } void KMMainView::slotChangeDirection(int d) { - m_boxlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom); + m_boxtqlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom); } void KMMainView::slotTest() @@ -807,7 +807,7 @@ void KMMainView::loadPluginActions() KMFactory::self()->manager()->createPluginActions(m_actions); TQValueList pactions = m_actions->actions("plugin"); int index = m_pactionsindex; - //TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup(); + //TQPopupMenu *menu = m_menubar->tqfindItem( m_menubar->idAt( 1 ) )->popup(); TQPopupMenu *menu = m_menubar->getButton( 1 )->popup(); for (TQValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) { diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h index 8f60aec2d..597b44663 100644 --- a/kdeprint/management/kmmainview.h +++ b/kdeprint/management/kmmainview.h @@ -122,7 +122,7 @@ private: int m_pactionsindex; QStringList m_toollist; bool m_first; - QBoxLayout *m_boxlayout; + QBoxLayout *m_boxtqlayout; class KMainWindowPrivate; KMainWindowPrivate *d; KToolBar *m_menubar; diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp index 794683f54..f43f8f62a 100644 --- a/kdeprint/management/kmprinterview.cpp +++ b/kdeprint/management/kmprinterview.cpp @@ -47,7 +47,7 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); setViewType(m_type); - setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); } KMPrinterView::~KMPrinterView() @@ -105,9 +105,9 @@ void KMPrinterView::slotPrinterSelected(const TQString& p) m_current = p; } -TQSize KMPrinterView::minimumSizeHint() const +TQSize KMPrinterView::tqminimumSizeHint() const { - return TQWidgetStack::minimumSizeHint(); + return TQWidgetStack::tqminimumSizeHint(); } #include "kmprinterview.moc" diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h index 5ea565dba..d6cf04de3 100644 --- a/kdeprint/management/kmprinterview.h +++ b/kdeprint/management/kmprinterview.h @@ -42,7 +42,7 @@ public: void setViewType(ViewType t); ViewType viewType() const { return m_type; } - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; signals: void printerSelected(const TQString&); diff --git a/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp index ea6434563..468f5e84a 100644 --- a/kdeprint/management/kmpropbackend.cpp +++ b/kdeprint/management/kmpropbackend.cpp @@ -34,7 +34,7 @@ KMPropBackend::KMPropBackend(TQWidget *parent, const char *name) QLabel *l1 = new TQLabel(i18n("Printer type:"), this); QLabel *l2 = new TQLabel(i18n("URI:"), this); - // layout + // tqlayout QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); diff --git a/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp index 90be6da19..363fd7029 100644 --- a/kdeprint/management/kmpropcontainer.cpp +++ b/kdeprint/management/kmpropcontainer.cpp @@ -56,7 +56,7 @@ void KMPropContainer::setWidget(KMPropWidget *w) connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange())); connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool))); connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool))); - QVBoxLayout *lay = dynamic_cast(layout()); + QVBoxLayout *lay = dynamic_cast(tqlayout()); if (lay) { lay->insertWidget(0,m_widget,1); diff --git a/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp index 6b88f63ea..c20a8c4e0 100644 --- a/kdeprint/management/kmpropdriver.cpp +++ b/kdeprint/management/kmpropdriver.cpp @@ -37,7 +37,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) QLabel *l2 = new TQLabel(i18n("Printer model:"), this); QLabel *l3 = new TQLabel(i18n("Driver info:"), this); - // layout + // tqlayout QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp index 1c9389941..3691076ab 100644 --- a/kdeprint/management/kmpropgeneral.cpp +++ b/kdeprint/management/kmpropgeneral.cpp @@ -38,7 +38,7 @@ KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name) QLabel *l2 = new TQLabel(i18n("Physical Location", "Location:"), this); QLabel *l3 = new TQLabel(i18n("Description:"), this); - // layout + // tqlayout QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp index 775c71f89..6fa76cba9 100644 --- a/kdeprint/management/kmpropmembers.cpp +++ b/kdeprint/management/kmpropmembers.cpp @@ -29,7 +29,7 @@ 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); QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp index 20d8d17b7..c9cd1eb2d 100644 --- a/kdeprint/management/kmspecialprinterdlg.cpp +++ b/kdeprint/management/kmspecialprinterdlg.cpp @@ -103,7 +103,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) TQWhatsThis::add(m_usefile, i18n("

    The command will use an output file. If checked, make sure the " - "command contains an output tag.

    ")); + "command tqcontains an output tag.

    ")); TQWhatsThis::add(m_command, i18n("

    The command to execute when printing on this special printer. Either enter " "the command to execute directly, or associate/create a command object with/for " @@ -122,7 +122,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) TQWhatsThis::add(m_extensionlabel, extensionWhatsThis); TQWhatsThis::add(m_extension, extensionWhatsThis); - // layout creation + // tqlayout creation QVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); QGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); l0->addLayout(l1); @@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) l0->addWidget(sep); l0->addWidget(m_gb); l0->addWidget(m_outfile_gb); - QGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10); + QGridLayout *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); @@ -186,7 +186,7 @@ void KMSpecialPrinterDlg::setPrinter(KMPrinter *printer) { m_command->setCommand(printer->option("kde-special-command")); m_usefile->setChecked(printer->option("kde-special-file") == "1"); - int index = m_mimelist.findIndex(printer->option("kde-special-mimetype")); + int index = m_mimelist.tqfindIndex(printer->option("kde-special-mimetype")); m_mimetype->setCurrentItem(index == -1 ? 0 : index); m_extension->setText(printer->option("kde-special-extension")); m_name->setText(printer->name()); diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp index 53803d383..eb5c6e4b9 100644 --- a/kdeprint/management/kmwbackend.cpp +++ b/kdeprint/management/kmwbackend.cpp @@ -56,8 +56,8 @@ KMWBackend::KMWBackend(TQWidget *parent, const char *name) m_buttons = new TQButtonGroup(this); m_buttons->hide(); - m_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - m_layout->addStretch(1); + m_tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + m_tqlayout->addStretch(1); m_count = 0; } @@ -91,7 +91,7 @@ void KMWBackend::initPrinter(KMPrinter *p) else if (p->members().count() > 0) ID = KMWizard::Class; } - if (m_buttons->find(ID)) + if (m_buttons->tqfind(ID)) m_buttons->setButton(ID); } @@ -102,9 +102,9 @@ void KMWBackend::updatePrinter(KMPrinter *p) else p->setType(KMPrinter::Printer); p->setOption("kde-backend",TQString::number(ID)); QString s = m_buttons->selected()->text(); - s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1("")); + s.tqreplace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1("")); p->setOption("kde-backend-description",s); - setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error)); + setNextPage((m_map.tqcontains(ID) ? m_map[ID] : KMWizard::Error)); } void KMWBackend::addBackend( int ID, bool on, int nextpage ) @@ -154,7 +154,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString if (ID == -1) { KSeparator* sep = new KSeparator( KSeparator::HLine, this); - m_layout->insertWidget(m_count, sep); + m_tqlayout->insertWidget(m_count, sep); } else { @@ -164,14 +164,14 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString TQWhatsThis::add( btn, whatsThis ); m_buttons->insert(btn, ID); m_map[ID] = (nextpage == -1 ? ID : nextpage); // use nextpage if specified, default to ID - m_layout->insertWidget(m_count, btn); + m_tqlayout->insertWidget(m_count, btn); } m_count++; } void KMWBackend::enableBackend(int ID, bool on) { - QButton *btn = m_buttons->find(ID); + QButton *btn = m_buttons->tqfind(ID); if (btn) btn->setEnabled(on); } diff --git a/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h index 2013b8035..421ce4db4 100644 --- a/kdeprint/management/kmwbackend.h +++ b/kdeprint/management/kmwbackend.h @@ -42,7 +42,7 @@ public: private: QButtonGroup *m_buttons; - QVBoxLayout *m_layout; + QVBoxLayout *m_tqlayout; // keep a map between button ID and the real next page to switch to. This enables // to have different backends switching to the same page (like backends requiring // a password). If the next page is not given when adding the backend, the ID is diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp index d432af8e1..c308d5aa2 100644 --- a/kdeprint/management/kmwclass.cpp +++ b/kdeprint/management/kmwclass.cpp @@ -94,7 +94,7 @@ void KMWClass::initPrinter(KMPrinter *p) { TQPtrListIterator it(*list); for (;it.current();++it) - if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.contains(it.current()->name())) + if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.tqcontains(it.current()->name())) m_list1->insertItem(SmallIcon(it.current()->pixmap()), it.current()->name()); m_list1->sort(); } @@ -103,7 +103,7 @@ void KMWClass::initPrinter(KMPrinter *p) m_list2->clear(); for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { - KMPrinter *pr = mgr->findPrinter(*it); + KMPrinter *pr = mgr->tqfindPrinter(*it); if (pr) m_list2->insertItem(SmallIcon(pr->pixmap()), *it); } m_list2->sort(); diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp index a50454d0b..eae9d4ef9 100644 --- a/kdeprint/management/kmwdriver.cpp +++ b/kdeprint/management/kmwdriver.cpp @@ -49,11 +49,11 @@ void KMWDriver::initPrinter(KMPrinter *p) { // use auto-detection info instead: split the string // into make/model pair at the first space character - int p = autoDetect.find( ' ' ); + int p = autoDetect.tqfind( ' ' ); if ( p != -1 ) { TQString manu = autoDetect.left( p ), model = autoDetect.mid( p+1 ); - KMDBEntryList *l = KMDriverDB::self()->findPnpEntry( manu, model ); + KMDBEntryList *l = KMDriverDB::self()->tqfindPnpEntry( manu, model ); if ( l && l->count() > 0 ) { m_widget->setDriver( l->getFirst()->manufacturer, l->getFirst()->model ); diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp index 5fd3c7fc0..3616cb1ce 100644 --- a/kdeprint/management/kmwend.cpp +++ b/kdeprint/management/kmwend.cpp @@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name) void KMWEnd::initPrinter(KMPrinter *p) { QString txt; - QString s(TQString::fromLatin1("

  • %1: %2
    • ")); + QString s(TQString::tqfromLatin1("
  • %1: %2
    • ")); int ID = p->option("kde-backend").toInt(); // general information - txt.append(TQString::fromLatin1("%1
      ").arg(i18n("General"))); + txt.append(TQString::tqfromLatin1("%1
        ").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("%1
          ").arg(i18n("Members"))); + txt.append(TQString::tqfromLatin1("%1
            ").arg(i18n("Members"))); QStringList m(p->members()); - QString s1(TQString::fromLatin1("
          • %1
            • ")); + QString s1(TQString::tqfromLatin1("
          • %1
            • ")); for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it) txt.append(s1.arg(*it)); txt.append("

          "); @@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p) else { // backend information - txt.append(TQString::fromLatin1("%1
            ").arg(i18n("Backend"))); + txt.append(TQString::tqfromLatin1("%1
              ").arg(i18n("Backend"))); KURL url ( p->device() ); switch (ID) { @@ -91,7 +91,7 @@ void KMWEnd::initPrinter(KMPrinter *p) if (url.hasUser()) txt.append(s.arg(i18n("Account")).arg(url.user())); break; default: - // double decoding in case the printer name contains chars like '#' that are + // double decoding in case the printer name tqcontains chars like '#' that are // not decoded by "prettyURL". txt.append(s.arg(i18n("URI")).arg(KURL( p->device()).prettyURL())); break; @@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p) if (p->option("kde-driver") == "raw" || p->driver()) { // driver information - txt.append(TQString::fromLatin1("%1
                ").arg(i18n("Driver"))); + txt.append(TQString::tqfromLatin1("%1
                  ").arg(i18n("Driver"))); if (p->option("kde-driver") == "raw") txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer"))); else diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp index 9daeee77b..33deb0836 100644 --- a/kdeprint/management/kmwfile.cpp +++ b/kdeprint/management/kmwfile.cpp @@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg) void KMWFile::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("file:%1").arg(m_url->url()); + QString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url()); p->setDevice(dev); } diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp index 6a793dd5a..7a4fa3aa8 100644 --- a/kdeprint/management/kmwizard.cpp +++ b/kdeprint/management/kmwizard.cpp @@ -86,7 +86,7 @@ KMWizard::KMWizard(TQWidget *parent, const char *name) m_side = 0; } - // layout + // tqlayout TQVBoxLayout *main0_ = new TQVBoxLayout(this, 10, 10); QVBoxLayout *main_ = new TQVBoxLayout(0, 0, 0); TQHBoxLayout *main1_ = new TQHBoxLayout(0, 0, 10); @@ -178,17 +178,17 @@ void KMWizard::configure(int start, int end, bool inclusive) void KMWizard::setNextPage(int page, int next) { - KMWizardPage *p = m_pagepool.find(page); + KMWizardPage *p = m_pagepool.tqfind(page); if (p) p->setNextPage(next); } void KMWizard::setCurrentPage(int ID, bool back) { - KMWizardPage *page = m_pagepool.find(ID); + KMWizardPage *page = m_pagepool.tqfind(ID); if (!page) { - KMessageBox::error(this,i18n("Unable to find the requested page."),i18n("Add Printer Wizard")); + KMessageBox::error(this,i18n("Unable to tqfind the requested page."),i18n("Add Printer Wizard")); return; } diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp index 1a89babe0..cb5ac7bb1 100644 --- a/kdeprint/management/kmwlocal.cpp +++ b/kdeprint/management/kmwlocal.cpp @@ -78,7 +78,7 @@ bool KMWLocal::isValid(TQString& msg) msg = i18n("The URI is empty","Empty URI."); return false; } - else if (m_uris.findIndex(m_localuri->text()) == -1) + else if (m_uris.tqfindIndex(m_localuri->text()) == -1) { if (KMessageBox::warningContinueCancel(this, i18n("The local URI doesn't correspond to a detected port. Continue?")) == KMessageBox::Cancel) { @@ -173,7 +173,7 @@ void KMWLocal::initialize() ++it; QString uri = *it; - int p = uri.find( ':' ); + int p = uri.tqfind( ':' ); QString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null ); QString printer = *(++it); int index(-1); diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp index c2686b481..ef223a55a 100644 --- a/kdeprint/management/kmwlpd.cpp +++ b/kdeprint/management/kmwlpd.cpp @@ -58,7 +58,7 @@ bool KMWLpd::isValid(TQString& msg) // check LPD queue if (!checkLpdQueue(text(0).latin1(),text(1).latin1())) { - if (KMessageBox::warningContinueCancel(this, i18n("Cannot find queue %1 on server %2; do you want to continue anyway?").arg(text(1)).arg(text(0))) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(this, i18n("Cannot tqfind queue %1 on server %2; do you want to continue anyway?").arg(text(1)).arg(text(0))) == KMessageBox::Cancel) return false; } return true; @@ -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); } @@ -81,7 +81,7 @@ bool checkLpdQueue(const char *host, const char *queue) char res[64] = {0}; snprintf(res,64,"%c%s\n",(char)4,queue); - if (sock.writeBlock(res, strlen(res)) != (Q_LONG)(strlen(res))) + if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) return false; char buf[1024] = {0}; diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp index d46b104a7..709b986ea 100644 --- a/kdeprint/management/kmwname.cpp +++ b/kdeprint/management/kmwname.cpp @@ -48,10 +48,10 @@ bool KMWName::isValid(TQString& msg) msg = i18n("You must supply at least a name."); return false; } - else if (text(0).find(TQRegExp("\\s")) != -1) + else if (text(0).tqfind(TQRegExp("\\s")) != -1) { QString conv = text(0); - conv.replace(TQRegExp("\\s"), ""); + conv.tqreplace(TQRegExp("\\s"), ""); int result = KMessageBox::warningYesNoCancel(this, i18n("It is usually not a good idea to include spaces " "in printer name: it may prevent your printer from " diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp index a84b8f904..ef3e74011 100644 --- a/kdeprint/management/kmwpassword.cpp +++ b/kdeprint/management/kmwpassword.cpp @@ -66,7 +66,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool))); connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool))); - // layout + // tqlayout TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 ); main_->addWidget( infotext_ ); main_->addSpacing( 10 ); @@ -99,12 +99,12 @@ void KMWPassword::initPrinter( KMPrinter* p ) if ( p->option( "kde-backend" ).toInt() != KMWizard::SMB ) { int ID = m_btngroup->selectedId(); - m_btngroup->find( 1 )->hide(); + m_btngroup->tqfind( 1 )->hide(); if ( ID == 1 ) m_btngroup->setButton( 0 ); } else - m_btngroup->find( 1 )->show(); + m_btngroup->tqfind( 1 )->show(); } void KMWPassword::updatePrinter(KMPrinter *p) @@ -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/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp index 749ab8ea7..f50c5c6b6 100644 --- a/kdeprint/management/kmwsocket.cpp +++ b/kdeprint/management/kmwsocket.cpp @@ -66,7 +66,7 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name) connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); - // layout + // tqlayout QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0); @@ -88,7 +88,7 @@ KMWSocket::~KMWSocket() void KMWSocket::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); + QString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); p->setDevice(dev); } diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp index d3f838ce7..658a3c4a7 100644 --- a/kdeprint/management/kmwsocketutil.cpp +++ b/kdeprint/management/kmwsocketutil.cpp @@ -49,27 +49,27 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na QWidget *dummy = new TQWidget(this); setMainWidget(dummy); KIntValidator *val = new KIntValidator( this ); - QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy); + QLabel *tqmasklabel = new TQLabel(i18n("&Subnetwork:"),dummy); QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); QLineEdit *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); - mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + tqmask_ = new TQLineEdit(dummy); + tqmask_->tqsetAlignment(Qt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); tout_ = new TQLineEdit(dummy); tout_->setValidator( val ); - masklabel->setBuddy(mask_); + tqmasklabel->setBuddy(tqmask_); portlabel->setBuddy(port_); toutlabel->setBuddy(tout_); - mask_->setText(util->root_); + tqmask_->setText(util->root_); port_->insertItem("631"); port_->insertItem("9100"); port_->insertItem("9101"); @@ -79,13 +79,13 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10); QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5); - main_->addWidget(masklabel, 0, 0); + main_->addWidget(tqmasklabel, 0, 0); main_->addWidget(portlabel, 1, 0); main_->addWidget(toutlabel, 2, 0); main_->addLayout(lay1, 0, 1); main_->addWidget(port_, 1, 1); main_->addWidget(tout_, 2, 1); - lay1->addWidget(mask_,1); + lay1->addWidget(tqmask_,1); lay1->addWidget(mm,0); resize(250,130); @@ -100,7 +100,7 @@ void SocketConfig::slotOk() { QString msg; QRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})"); - if (!re.exactMatch(mask_->text())) + if (!re.exactMatch(tqmask_->text())) msg = i18n("Wrong subnetwork specification."); else { @@ -189,7 +189,7 @@ void KMWSocketUtil::configureScan(TQWidget *parent) SocketConfig *dlg = new SocketConfig(this,parent); if (dlg->exec()) { - root_ = dlg->mask_->text(); + root_ = dlg->tqmask_->text(); port_ = dlg->port_->currentText().toInt(); timeout_ = dlg->tout_->text().toInt(); } @@ -209,7 +209,7 @@ TQString localRootIP() if (infos.count() > 0) { QString IPstr = infos.first()->address()->nodeName(); - int p = IPstr.findRev('.'); + int p = IPstr.tqfindRev('.'); IPstr.truncate(p); return IPstr; } diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h index ad17b8113..563dd3712 100644 --- a/kdeprint/management/kmwsocketutil.h +++ b/kdeprint/management/kmwsocketutil.h @@ -48,7 +48,7 @@ protected slots: void slotOk(); private: - QLineEdit *mask_, *tout_; + QLineEdit *tqmask_, *tout_; QComboBox *port_; }; diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index 24e6f4adf..029143753 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -52,11 +52,11 @@ TQString generateId(const TQMap& map) { int index(-1); - while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ; - return TQString::fromLatin1("item%1").arg(index); + while (map.tqcontains(TQString::tqfromLatin1("item%1").arg(++index))) ; + return TQString::tqfromLatin1("item%1").arg(index); } -TQListViewItem* findPrev(TQListViewItem *item) +TQListViewItem* tqfindPrev(TQListViewItem *item) { QListViewItem *prev = item->itemAbove(); while (prev && prev->depth() > item->depth()) @@ -67,7 +67,7 @@ TQListViewItem* findPrev(TQListViewItem *item) return 0; } -TQListViewItem* findNext(TQListViewItem *item) +TQListViewItem* tqfindNext(TQListViewItem *item) { QListViewItem *next = item->itemBelow(); while (next && next->depth() > item->depth()) @@ -230,9 +230,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); - QGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2, + QGridLayout *l8 = new TQGridLayout(gb_input->tqlayout(), 2, 2, KDialog::spacingHint()); - QGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2, + QGridLayout *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); - QVBoxLayout *l11 = new TQVBoxLayout(gb->layout()); + QVBoxLayout *l11 = new TQVBoxLayout(gb->tqlayout()); l11->addWidget(m_stack); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); @@ -296,7 +296,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam TQWhatsThis::add( m_format, i18n( "The format of the option. This determines how the option is formatted " "for inclusion in the global command line. The tag %value can be used " - "to represent the user selection. This tag will be replaced at run-time by a " + "to represent the user selection. This tag will be tqreplaced at run-time by a " "string representation of the option value." ) ); TQWhatsThis::add( m_formatlab, TQWhatsThis::textFor( m_format ) ); TQWhatsThis::add( m_default, i18n( @@ -311,7 +311,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam "value does not match with the actual default value of the underlying utility." ) ); TQWhatsThis::add( m_command, i18n( "The full command line to execute the associated underlying utility. This " - "command line is based on a mechanism of tags that are replaced at run-time. " + "command line is based on a mechanism of tags that are tqreplaced at run-time. " "The supported tags are:
                    " "
                  • %filterargs: command options
                    • " "
                  • %filterinput: input specification
                    • " @@ -454,7 +454,7 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item) m_name->setText(item->text(1)); m_desc->setText(item->text(0)); - DrBase *opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0); + DrBase *opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0); if (opt) { bool isgroup = (opt->type() < DrBase::String); @@ -497,9 +497,9 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item) m_addgrp->setEnabled(isgroup); m_addopt->setEnabled(isgroup); - QListViewItem *prevItem = findPrev(item), *nextItem = findNext(item); - DrBase *prevOpt = (prevItem && m_opts.contains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0); - DrBase *nextOpt = (nextItem && m_opts.contains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0); + QListViewItem *prevItem = tqfindPrev(item), *nextItem = tqfindNext(item); + DrBase *prevOpt = (prevItem && m_opts.tqcontains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0); + DrBase *nextOpt = (nextItem && m_opts.tqcontains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0); m_up->setEnabled(prevOpt && !(prevOpt->type() < DrBase::String && opt->type() >= DrBase::String)); m_down->setEnabled(nextOpt && !(isgroup && nextOpt->type() >= DrBase::String)); @@ -571,7 +571,7 @@ void KXmlCommandAdvancedDlg::slotApplyChanges() m_apply->setEnabled(false); - DrBase *opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0); + DrBase *opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0); m_opts.remove(item->text(1)); delete opt; @@ -706,10 +706,10 @@ void KXmlCommandAdvancedDlg::removeItem(TQListViewItem *item) void KXmlCommandAdvancedDlg::slotMoveUp() { QListViewItem *item = m_view->currentItem(), *prev = 0; - if (item && (prev=findPrev(item))) + if (item && (prev=tqfindPrev(item))) { QListViewItem *after(0); - if ((after=findPrev(prev)) != 0) + if ((after=tqfindPrev(prev)) != 0) item->moveItem(after); else { @@ -725,7 +725,7 @@ void KXmlCommandAdvancedDlg::slotMoveUp() void KXmlCommandAdvancedDlg::slotMoveDown() { QListViewItem *item = m_view->currentItem(), *next = 0; - if (item && (next=findNext(item))) + if (item && (next=tqfindNext(item))) { item->moveItem(next); m_view->setSelected(item, true); @@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown() void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd) { - m_inputfile->parentWidget()->setEnabled(cmd.find("%filterinput") != -1); - m_outputfile->parentWidget()->setEnabled(cmd.find("%filteroutput") != -1); - m_view->setEnabled(cmd.find("%filterargs") != -1); - m_name->parentWidget()->setEnabled(m_view->isEnabled()); + m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1); + m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1); + m_view->setEnabled(cmd.tqfind("%filterargs") != -1); + m_name->tqparentWidget()->setEnabled(m_view->isEnabled()); slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0)); m_view->setOpen(m_view->firstChild(), m_view->isEnabled()); } @@ -751,7 +751,7 @@ void KXmlCommandAdvancedDlg::slotValueSelected(TQListViewItem *item) void KXmlCommandAdvancedDlg::slotOptionRenamed(TQListViewItem *item, int) { - if (item && m_opts.contains(item->text(1))) + if (item && m_opts.tqcontains(item->text(1))) { DrBase *opt = m_opts[item->text(1)]; opt->set("text", item->text(0)); @@ -767,7 +767,7 @@ void KXmlCommandAdvancedDlg::recreateGroup(TQListViewItem *item, DrGroup *grp) QListViewItem *child = item->firstChild(); while (child) { - DrBase *opt = (m_opts.contains(child->text(1)) ? m_opts[child->text(1)] : 0); + DrBase *opt = (m_opts.tqcontains(child->text(1)) ? m_opts[child->text(1)] : 0); if (opt) { if (opt->type() == DrBase::Group) @@ -804,10 +804,10 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, TQWidget *parent) xmlcmd->setIo(xmldlg->m_inputpipe->text(), true, true); xmlcmd->setIo(xmldlg->m_outputfile->text(), false, false); xmlcmd->setIo(xmldlg->m_outputpipe->text(), false, true); - xmlcmd->setComment( xmldlg->m_comment->text().replace( TQRegExp( "\n" ), " " ) ); + xmlcmd->setComment( xmldlg->m_comment->text().tqreplace( TQRegExp( "\n" ), " " ) ); // need to recreate the driver tree structure - DrMain *driver = (xmldlg->m_opts.contains("__root__") ? static_cast(xmldlg->m_opts["__root__"]) : 0); + DrMain *driver = (xmldlg->m_opts.tqcontains("__root__") ? static_cast(xmldlg->m_opts["__root__"]) : 0); if (!driver && xmldlg->m_opts.count() > 0) { kdDebug() << "KXmlCommandAdvancedDlg: driver structure not found, creating one" << endl; @@ -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); - QGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10); + QGridLayout *l2 = new TQGridLayout(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); - QHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10); + QHBoxLayout *l4 = new TQHBoxLayout(m_gb2->tqlayout(), 10); l4->addWidget(m_requirements); QVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); @@ -951,7 +951,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd) item->setRenameEnabled(0, true); } - int index = m_mimelist.findIndex(xmlCmd->mimeType()); + int index = m_mimelist.tqfindIndex(xmlCmd->mimeType()); if (index != -1) m_mimetype->setCurrentItem(index); else @@ -964,7 +964,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd) for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) { m_selectedmime->insertItem(*it); - delete m_availablemime->findItem(*it, Qt::ExactMatch); + delete m_availablemime->tqfindItem(*it, Qt::ExactMatch); } } @@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime() void KXmlCommandDlg::slotEditCommand() { - KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget()); + KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget()); } void KXmlCommandDlg::slotAddReq() diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp index 4e57b3922..c6eccda28 100644 --- a/kdeprint/management/kxmlcommandselector.cpp +++ b/kdeprint/management/kxmlcommandselector.cpp @@ -137,7 +137,7 @@ void KXmlCommandSelector::loadCommands() } m_cmd->insertStringList(desclist); - int index = m_cmdlist.findIndex(thisCmd); + int index = m_cmdlist.tqfindIndex(thisCmd); if (index != -1) m_cmd->setCurrentItem(index); if (m_cmd->currentItem() != -1 && m_cmd->isEnabled()) @@ -156,7 +156,7 @@ TQString KXmlCommandSelector::command() const void KXmlCommandSelector::setCommand(const TQString& cmd) { - int index = m_cmdlist.findIndex(cmd); + int index = m_cmdlist.tqfindIndex(cmd); if (m_usefilter) m_usefilter->setChecked(index != -1); @@ -176,7 +176,7 @@ void KXmlCommandSelector::slotAddCommand() { bool added(true); - if (m_cmdlist.findIndex(cmdId) != -1) + if (m_cmdlist.tqfindIndex(cmdId) != -1) { if (KMessageBox::warningContinueCancel( this, @@ -275,7 +275,7 @@ void KXmlCommandSelector::slotHelpCommand() { KPopupFrame *pop = new KPopupFrame( m_helpbtn ); KActiveLabel *lab = new KActiveLabel( m_help, pop ); - lab->resize( lab->sizeHint() ); + lab->resize( lab->tqsizeHint() ); pop->setMainWidget( lab ); pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) ); pop->close( 0 ); diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp index 41b368ab0..72d2ad68d 100644 --- a/kdeprint/management/networkscanner.cpp +++ b/kdeprint/management/networkscanner.cpp @@ -80,7 +80,7 @@ TQString NetworkScanner::NetworkScannerPrivate::localPrefix() if (infos.count() > 0) { QString IPstr = infos.first()->address()->nodeName(); - int p = IPstr.findRev('.'); + int p = IPstr.tqfindRev('.'); IPstr.truncate(p); return IPstr; } @@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked() if ( !d->scanning ) { if ( d->localPrefix() == d->prefixaddress || - KMessageBox::warningContinueCancel( this->parentWidget(), + KMessageBox::warningContinueCancel( this->tqparentWidget(), i18n( "You are about to scan a subnet (%1.*) that does not " "correspond to the current subnet of this computer (%2.*). Do you want " "to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ), @@ -312,7 +312,7 @@ void NetworkScanner::setPort( int p ) bool NetworkScanner::checkPrinter( const TQString& host, int port ) { - // try first to find it in the SocketInfo list + // try first to tqfind it in the SocketInfo list TQPtrListIterator it( d->printers ); for ( ; it.current(); ++it ) { @@ -335,27 +335,27 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * QWidget *dummy = new TQWidget(this); setMainWidget(dummy); KIntValidator *val = new KIntValidator( this ); - QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy); + QLabel *tqmasklabel = new TQLabel(i18n("&Subnetwork:"),dummy); QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); QLineEdit *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); - mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + tqmask_ = new TQLineEdit(dummy); + tqmask_->tqsetAlignment(Qt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); tout_ = new TQLineEdit(dummy); tout_->setValidator( val ); - masklabel->setBuddy(mask_); + tqmasklabel->setBuddy(tqmask_); portlabel->setBuddy(port_); toutlabel->setBuddy(tout_); - mask_->setText(scanner_->subnet()); + tqmask_->setText(scanner_->subnet()); port_->insertItem("631"); port_->insertItem("9100"); port_->insertItem("9101"); @@ -365,13 +365,13 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10); QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5); - main_->addWidget(masklabel, 0, 0); + main_->addWidget(tqmasklabel, 0, 0); main_->addWidget(portlabel, 1, 0); main_->addWidget(toutlabel, 2, 0); main_->addLayout(lay1, 0, 1); main_->addWidget(port_, 1, 1); main_->addWidget(tout_, 2, 1); - lay1->addWidget(mask_,1); + lay1->addWidget(tqmask_,1); lay1->addWidget(mm,0); resize(250,130); @@ -386,7 +386,7 @@ void NetworkScannerConfig::slotOk() { QString msg; QRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})"); - if (!re.exactMatch(mask_->text())) + if (!re.exactMatch(tqmask_->text())) msg = i18n("Wrong subnetwork specification."); else { @@ -412,7 +412,7 @@ void NetworkScannerConfig::slotOk() } scanner_->setTimeout( tout_->text().toInt() ); - scanner_->setSubnet( mask_->text() ); + scanner_->setSubnet( tqmask_->text() ); scanner_->setPort( port_->currentText().toInt() ); KDialogBase::slotOk(); diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h index 462d26427..19996c163 100644 --- a/kdeprint/management/networkscanner.h +++ b/kdeprint/management/networkscanner.h @@ -87,7 +87,7 @@ protected slots: void slotOk(); private: - QLineEdit *mask_, *tout_; + QLineEdit *tqmask_, *tout_; QComboBox *port_; NetworkScanner *scanner_; }; diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp index 99a1e6198..696d7b025 100644 --- a/kdeprint/management/sidepixmap.cpp +++ b/kdeprint/management/sidepixmap.cpp @@ -32,7 +32,7 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name) m_tileup.load(locate("data", "kdeprint/tileup.png")); m_tiledown.load(locate("data", "kdeprint/tiledown.png")); - setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); } bool SidePixmap::isValid() @@ -42,7 +42,7 @@ bool SidePixmap::isValid() && (m_side.width() == m_tiledown.width())); } -TQSize SidePixmap::sizeHint() const +TQSize SidePixmap::tqsizeHint() const { return (TQSize(m_side.width()+lineWidth(), 300+lineWidth())); } diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h index 33db2275c..93324a251 100644 --- a/kdeprint/management/sidepixmap.h +++ b/kdeprint/management/sidepixmap.h @@ -29,7 +29,7 @@ class KDEPRINT_EXPORT SidePixmap : public QFrame { public: SidePixmap(TQWidget *parent = 0, const char *name = 0); - TQSize sizeHint() const; + TQSize tqsizeHint() const; bool isValid(); protected: diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp index 08f8487f7..104820193 100644 --- a/kdeprint/management/smbview.cpp +++ b/kdeprint/management/smbview.cpp @@ -140,7 +140,7 @@ void SmbView::init() while (!smb_stream.atEnd ()) { TQString smb_line = smb_stream.readLine (); - if (smb_line.contains (wins_keyword, FALSE) > 0) + if (smb_line.tqcontains (wins_keyword, FALSE) > 0) { TQString key = smb_line.section ('=', 0, 0); key = key.stripWhiteSpace(); @@ -216,7 +216,7 @@ void SmbView::processGroups() clear(); for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it) { - int p = (*it).find("<1d>"); + int p = (*it).tqfind("<1d>"); if (p == -1) continue; QListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace()); diff --git a/kdeprint/messagewindow.cpp b/kdeprint/messagewindow.cpp index d4c4ae40d..553d78e21 100644 --- a/kdeprint/messagewindow.cpp +++ b/kdeprint/messagewindow.cpp @@ -55,13 +55,13 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, MessageWindow::~MessageWindow() { - m_windows.remove( parentWidget() ); + m_windows.remove( tqparentWidget() ); } void MessageWindow::slotTimer() { - TQSize psz = parentWidget()->size(), sz = sizeHint(); - move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); + TQSize psz = tqparentWidget()->size(), sz = tqsizeHint(); + move( tqparentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); if ( !isVisible() ) { show(); @@ -85,7 +85,7 @@ void MessageWindow::add( TQWidget *parent, const TQString& txt, int delay ) kdWarning( 500 ) << "Cannot add a message window to a null parent" << endl; else { - MessageWindow *w = m_windows.find( parent ); + MessageWindow *w = m_windows.tqfind( parent ); if ( w ) w->setText( txt ); else @@ -96,14 +96,14 @@ void MessageWindow::add( TQWidget *parent, const TQString& txt, int delay ) void MessageWindow::remove( TQWidget *parent ) { if ( parent ) - delete m_windows.find( parent ); + delete m_windows.tqfind( parent ); } void MessageWindow::change( TQWidget *parent, const TQString& txt ) { if ( parent ) { - MessageWindow *w = m_windows.find( parent ); + MessageWindow *w = m_windows.tqfind( parent ); if ( w ) w->setText( txt ); else diff --git a/kdeprint/plugincombobox.cpp b/kdeprint/plugincombobox.cpp index 038e9ddbd..768ac0fa6 100644 --- a/kdeprint/plugincombobox.cpp +++ b/kdeprint/plugincombobox.cpp @@ -44,7 +44,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name) TQWhatsThis::add(m_combo, whatsThisCurrentPrintsystem); QLabel *m_label = new TQLabel(i18n("Print s&ystem currently used:"), this); TQWhatsThis::add(m_label, whatsThisCurrentPrintsystem); - m_label->setAlignment(AlignVCenter|AlignRight); + m_label->tqsetAlignment(AlignVCenter|AlignRight); m_label->setBuddy(m_combo); m_plugininfo = new TQLabel("Plugin information", this); QGridLayout *l0 = new TQGridLayout(this, 2, 2, 0, 5); @@ -81,7 +81,7 @@ void PluginComboBox::reload() { QString syst = KMFactory::self()->printSystem(); int index(-1); - if ((index=m_pluginlist.findIndex(syst)) != -1) + if ((index=m_pluginlist.tqfindIndex(syst)) != -1) m_combo->setCurrentItem(index); configChanged(); } diff --git a/kdeprint/posterpreview.cpp b/kdeprint/posterpreview.cpp index fbdfe5200..608431b15 100644 --- a/kdeprint/posterpreview.cpp +++ b/kdeprint/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 @@ -139,7 +139,7 @@ void PosterPreview::drawContents( TQPainter *painter ) { for ( int j=0; jfillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) ); p->drawRect( x, y, m_pw, m_ph ); if ( pw > 0 && ph > 0 ) @@ -169,7 +169,7 @@ void PosterPreview::mouseMoveEvent( TQMouseEvent *e ) { if ( m_boundingrect.isValid() ) { - if ( m_boundingrect.contains( e->pos() ) ) + if ( m_boundingrect.tqcontains( e->pos() ) ) setCursor( KCursor::handCursor() ); else setCursor( KCursor::arrowCursor() ); @@ -180,14 +180,14 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton && m_boundingrect.isValid() ) { - if ( m_boundingrect.contains( e->pos() ) ) + if ( m_boundingrect.tqcontains( e->pos() ) ) { int c, r; c = ( e->pos().x()-m_boundingrect.x() )/( m_boundingrect.width()/m_cols ) + 1; r = m_rows - ( e->pos().y()-m_boundingrect.y() )/( m_boundingrect.height()/m_rows ); int pagenum = ( r-1 )*m_cols+c; - if ( m_selectedpages.find( pagenum ) == m_selectedpages.end() || + if ( m_selectedpages.tqfind( pagenum ) == m_selectedpages.end() || !( e->state() & Qt::ShiftButton ) ) { if ( !( e->state() & Qt::ShiftButton ) ) @@ -267,7 +267,7 @@ void PosterPreview::setSelectedPages( const TQString& s ) for ( TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it ) { int p; - if ( ( p = ( *it ).find( '-' ) ) == -1 ) + if ( ( p = ( *it ).tqfind( '-' ) ) == -1 ) m_selectedpages.append( ( *it ).toInt() ); else { diff --git a/kdeprint/ppdloader.cpp b/kdeprint/ppdloader.cpp index 9fbecc774..c6ef9154b 100644 --- a/kdeprint/ppdloader.cpp +++ b/kdeprint/ppdloader.cpp @@ -78,7 +78,7 @@ static TQValueList splitNumberString( const TQString& _s ) int p1 = 1, p2 = 0; while ( true ) { - p2 = s.find( ' ', p1 ); + p2 = s.tqfind( ' ', p1 ); if ( p2 != -1 ) { l.append( s.mid( p1, p2-p1 ).toFloat() ); @@ -215,12 +215,12 @@ bool PPDLoader::endUi( const TQString& name ) { // we don't have any group defined, create the // most adapted one. - grp = findOrCreateGroupForOption( m_option->name() ); + grp = tqfindOrCreateGroupForOption( m_option->name() ); } else grp = m_groups.top(); grp->addOption( m_option ); - if ( grp->get( "text" ).contains( "install", false ) ) + if ( grp->get( "text" ).tqcontains( "install", false ) ) m_option->set( "fixed", "1" ); } m_option = 0; @@ -402,7 +402,7 @@ bool PPDLoader::putFooProcessedData( const TQVariant& var ) o->setValueText( o->get( "default" ) ); DrGroup *grp = 0; - DrBase *old = m_groups.top()->findOption( o->name(), &grp ); + DrBase *old = m_groups.top()->tqfindOption( o->name(), &grp ); if ( old ) { if ( old->type() == DrBase::List ) @@ -431,7 +431,7 @@ bool PPDLoader::putPaperDimension( const TQString& name, const TQString& s ) { TQValueList l = splitNumberString( s ); - PS_private *ps = m_ps.find( name ); + PS_private *ps = m_ps.tqfind( name ); if ( !ps ) { ps = new PS_private; @@ -448,7 +448,7 @@ bool PPDLoader::putImageableArea( const TQString& name, const TQString& s ) { TQValueList l = splitNumberString( s ); - PS_private *ps = m_ps.find( name ); + PS_private *ps = m_ps.tqfind( name ); if ( !ps ) { ps = new PS_private; @@ -463,7 +463,7 @@ bool PPDLoader::putImageableArea( const TQString& name, const TQString& s ) return true; } -DrGroup* PPDLoader::findOrCreateGroupForOption( const TQString& optname ) +DrGroup* PPDLoader::tqfindOrCreateGroupForOption( const TQString& optname ) { TQString grpname; if ( optname == "PageSize" || diff --git a/kdeprint/ppdloader.h b/kdeprint/ppdloader.h index 703303fe8..9d33ac9c6 100644 --- a/kdeprint/ppdloader.h +++ b/kdeprint/ppdloader.h @@ -67,7 +67,7 @@ private: TQString m_errormsg; friend int kdeprint_ppdparse(void*); - DrGroup* findOrCreateGroupForOption( const TQString& ); + DrGroup* tqfindOrCreateGroupForOption( const TQString& ); void processPageSizes( DrMain* ); }; diff --git a/kdeprint/ppdscanner.cpp b/kdeprint/ppdscanner.cpp index 1b138a491..4f94eb186 100644 --- a/kdeprint/ppdscanner.cpp +++ b/kdeprint/ppdscanner.cpp @@ -788,7 +788,7 @@ yy_match: } while ( yy_base[yy_current_state] != 303 ); -yy_find_action: +yy_tqfind_action: yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ @@ -810,7 +810,7 @@ do_action: /* This label is used only to access EOF actions. */ *yy_cp = yy_hold_char; yy_cp = yy_last_accepting_cpos; yy_current_state = yy_last_accepting_state; - goto yy_find_action; + goto yy_tqfind_action; case 1: #line 65 "./ppdscanner.l" @@ -933,7 +933,7 @@ YY_RULE_SETUP case 24: YY_RULE_SETUP #line 100 "./ppdscanner.l" -{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } +{ yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].tqcontains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } YY_BREAK case 25: YY_RULE_SETUP @@ -1079,7 +1079,7 @@ case YY_STATE_EOF(constr): else { yy_cp = yy_c_buf_p; - goto yy_find_action; + goto yy_tqfind_action; } } @@ -1132,7 +1132,7 @@ case YY_STATE_EOF(constr): yy_cp = yy_c_buf_p; yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; + goto yy_tqfind_action; } break; } diff --git a/kdeprint/ppdscanner.l b/kdeprint/ppdscanner.l index b71edcd89..079e34c1d 100644 --- a/kdeprint/ppdscanner.l +++ b/kdeprint/ppdscanner.l @@ -97,7 +97,7 @@ L [[:alnum:]] /** * Value state */ -\"[^\"]*\" { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].contains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } +\"[^\"]*\" { yylval = yytext; kdeprint_ppdscanner_lno += yylval[0].tqcontains('\n'); QDEBUG1("Quoted value: %s",yytext); return QUOTED; } {WORD} { yylval = yytext; QDEBUG1("String part: %s",yytext); return STRINGPART; } "/" { BEGIN(translation_2); return '/'; } "\n" { kdeprint_ppdscanner_lno++; BEGIN(INITIAL); } diff --git a/kdeprint/printerfilter.cpp b/kdeprint/printerfilter.cpp index a6f02f077..2590f41a4 100644 --- a/kdeprint/printerfilter.cpp +++ b/kdeprint/printerfilter.cpp @@ -62,7 +62,7 @@ bool PrinterFilter::filter(KMPrinter *prt) if (m_enabled) { if ((!m_locationRe.isEmpty() && m_locationRe.exactMatch(prt->location())) || - m_printers.find(prt->printerName()) != m_printers.end()) + m_printers.tqfind(prt->printerName()) != m_printers.end()) return true; else return false; diff --git a/kdeprint/printerfilter.h b/kdeprint/printerfilter.h index 7deb9d345..4d1798890 100644 --- a/kdeprint/printerfilter.h +++ b/kdeprint/printerfilter.h @@ -26,7 +26,7 @@ class KMPrinter; -class PrinterFilter : QObject +class PrinterFilter : TQObject { public: PrinterFilter(TQObject *parent = 0, const char *name = 0); diff --git a/kdeprint/rlpr/kmproprlpr.cpp b/kdeprint/rlpr/kmproprlpr.cpp index 3296949a3..46906fd83 100644 --- a/kdeprint/rlpr/kmproprlpr.cpp +++ b/kdeprint/rlpr/kmproprlpr.cpp @@ -34,7 +34,7 @@ KMPropRlpr::KMPropRlpr(TQWidget *parent, const char *name) QLabel *l1 = new TQLabel(i18n("Host:"), this); QLabel *l2 = new TQLabel(i18n("Queue:"), this); - // layout + // tqlayout QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); diff --git a/kdeprint/rlpr/kmproxywidget.cpp b/kdeprint/rlpr/kmproxywidget.cpp index c6dd59189..49e6f29ee 100644 --- a/kdeprint/rlpr/kmproxywidget.cpp +++ b/kdeprint/rlpr/kmproxywidget.cpp @@ -46,7 +46,7 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); - QGridLayout *lay0 = new TQGridLayout(layout(), 3, 2, 10); + QGridLayout *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/kdeprint/rlpr/kmrlprmanager.cpp b/kdeprint/rlpr/kmrlprmanager.cpp index f455fd1ff..3ed7a48cb 100644 --- a/kdeprint/rlpr/kmrlprmanager.cpp +++ b/kdeprint/rlpr/kmrlprmanager.cpp @@ -59,7 +59,7 @@ bool KMRlprManager::createPrinter(KMPrinter *p) bool KMRlprManager::removePrinter(KMPrinter *p) { - if (m_printers.findRef(p) == -1) + if (m_printers.tqfindRef(p) == -1) setErrorMsg(i18n("Printer not found.")); else { @@ -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/kdeprint/rlpr/kmwrlpr.cpp b/kdeprint/rlpr/kmwrlpr.cpp index 78f483db6..784fa2fa1 100644 --- a/kdeprint/rlpr/kmwrlpr.cpp +++ b/kdeprint/rlpr/kmwrlpr.cpp @@ -32,7 +32,7 @@ #include #include -static TQListViewItem* findChild(TQListViewItem *c, const TQString& txt) +static TQListViewItem* tqfindChild(TQListViewItem *c, const TQString& txt) { QListViewItem *item(c); while (item) @@ -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); @@ -94,10 +94,10 @@ void KMWRlpr::initPrinter(KMPrinter *p) { m_host->setText(p->option("host")); m_queue->setText(p->option("queue")); - QListViewItem *item = findChild(m_view->firstChild(),m_host->text()); + QListViewItem *item = tqfindChild(m_view->firstChild(),m_host->text()); if (item) { - item = findChild(item->firstChild(),m_queue->text()); + item = tqfindChild(item->firstChild(),m_queue->text()); if (item) { item->parent()->setOpen(true); @@ -109,7 +109,7 @@ void KMWRlpr::initPrinter(KMPrinter *p) void KMWRlpr::updatePrinter(KMPrinter *p) { - QString uri = TQString::fromLatin1("lpd://%1/%2").arg(m_host->text()).arg(m_queue->text()); + QString 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()); @@ -140,7 +140,7 @@ void KMWRlpr::initialize() line = t.readLine().stripWhiteSpace(); if (line.isEmpty()) continue; - if ((p=line.find(':')) != -1) + if ((p=line.tqfind(':')) != -1) { host = line.left(p).stripWhiteSpace(); QListViewItem *hitem = new TQListViewItem(m_view,host); @@ -180,7 +180,7 @@ void KMWRlpr::initialize() } if (buffer.isEmpty()) continue; - int p = buffer.find(':'); + int p = buffer.tqfind(':'); if (p != -1) { QString name = buffer.left(p); diff --git a/kdeprint/rlpr/krlprprinterimpl.cpp b/kdeprint/rlpr/krlprprinterimpl.cpp index 1d4845bde..e51908b62 100644 --- a/kdeprint/rlpr/krlprprinterimpl.cpp +++ b/kdeprint/rlpr/krlprprinterimpl.cpp @@ -40,7 +40,7 @@ KRlprPrinterImpl::~KRlprPrinterImpl() bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { // retrieve the KMPrinter object, to get host and queue name - KMPrinter *rpr = KMFactory::self()->manager()->findPrinter(printer->printerName()); + KMPrinter *rpr = KMFactory::self()->manager()->tqfindPrinter(printer->printerName()); if (!rpr) return false; @@ -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/kdeprint/signal_proc.c b/kdeprint/signal_proc.c index 40fac6049..432f7d155 100644 --- a/kdeprint/signal_proc.c +++ b/kdeprint/signal_proc.c @@ -21,7 +21,7 @@ void commandFromPid(int pid, char *name) name[i] = 0; } -int findPid(const char *progname) +int tqfindPid(const char *progname) { char name[256]; DIR *dir; @@ -89,7 +89,7 @@ int main(int argc, char **argv) return -1; } - pid = findPid(progname); + pid = tqfindPid(progname); if (pid == -1) { fprintf(stderr, "no such program: %s\n", progname); diff --git a/kdeprint/testprint.ps b/kdeprint/testprint.ps index bcebfcb21..1a9167ba7 100644 --- a/kdeprint/testprint.ps +++ b/kdeprint/testprint.ps @@ -110,13 +110,13 @@ /CUPSLOGO { % Draw the CUPS logo % height CUPSLOGO % Start with a big C... - /Helvetica findfont 1 index scalefont setfont + /Helvetica tqfindfont 1 index scalefont setfont 0 setgray 0 0 moveto (C) show % Then "UNIX Printing System" much smaller... - /Helvetica-Bold findfont 1 index 9 div scalefont setfont + /Helvetica-Bold tqfindfont 1 index 9 div scalefont setfont 0.25 mul dup dup 2.0 mul moveto (UNIX) show @@ -186,14 +186,14 @@ 0 setgray rectstroke - /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont + /Helvetica-BoldOblique tqfindfont 1 index 3 div scalefont setfont dup 40 div dup 4 mul 1 index 25 mul moveto (E) show dup 10 mul 1 index 15 mul moveto (S) show dup 16 mul 1 index 5 mul moveto (P) show - /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont + /Helvetica-BoldOblique tqfindfont 2 index 5 div scalefont setfont dup 14 mul 1 index 29 mul moveto (asy) show dup 20 mul 1 index 19 mul moveto (oftware) show dup 26 mul 1 index 9 mul moveto (roducts) show @@ -231,13 +231,13 @@ gsave ifelse def % Create fonts... - /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold + /bigFont /Helvetica-Bold tqfindfont % bigFont = Helvetica-Bold pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) - /mediumFont /Helvetica findfont % mediumFont = Helvetica + /mediumFont /Helvetica tqfindfont % mediumFont = Helvetica pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) - /smallFont /Times-Roman findfont % smallFont = Times-Roman + /smallFont /Times-Roman tqfindfont % smallFont = Times-Roman pageHeight scalefont def % size = pageHeight (nominally 11) % Offset page to account for lower-left margin... diff --git a/kdeprint/tests/drawdemo.cpp b/kdeprint/tests/drawdemo.cpp index 443cc89e8..20fc3d12e 100644 --- a/kdeprint/tests/drawdemo.cpp +++ b/kdeprint/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/kdeprint/tests/helpwindow.cpp b/kdeprint/tests/helpwindow.cpp index c2cdb1b22..f4c76555a 100644 --- a/kdeprint/tests/helpwindow.cpp +++ b/kdeprint/tests/helpwindow.cpp @@ -67,7 +67,7 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P ); file->insertSeparator(); file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q ); - file->insertItem( "E&xit", qApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); + file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -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 ); @@ -333,13 +333,13 @@ void HelpWindow::readBookmarks() void HelpWindow::histChosen( int i ) { - if ( mHistory.contains( i ) ) + if ( mHistory.tqcontains( i ) ) browser->setSource( mHistory[ i ] ); } void HelpWindow::bookmChosen( int i ) { - if ( mBookmarks.contains( i ) ) + if ( mBookmarks.tqcontains( i ) ) browser->setSource( mBookmarks[ i ] ); } diff --git a/kdeprint/tests/richpage.cpp b/kdeprint/tests/richpage.cpp index f12040b71..38569c1a3 100644 --- a/kdeprint/tests/richpage.cpp +++ b/kdeprint/tests/richpage.cpp @@ -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.tqfindIndex(TQString::tqfromLatin1("times"))); if (fontname_->currentItem() < 0) fontname_->setCurrentItem(0); QLabel *l1 = new TQLabel("Margin:",this); diff --git a/kdeprint/tools/escputil/escpwidget.cpp b/kdeprint/tools/escputil/escpwidget.cpp index ef0e2390b..4a65a380d 100644 --- a/kdeprint/tools/escputil/escpwidget.cpp +++ b/kdeprint/tools/escputil/escpwidget.cpp @@ -97,20 +97,20 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); QLabel *printerlab = new TQLabel(i18n("Printer:"), this); - printerlab->setAlignment(AlignRight|AlignVCenter); + printerlab->tqsetAlignment(AlignRight|AlignVCenter); QLabel *devicelab = new TQLabel(i18n("Device:"), this); - devicelab->setAlignment(AlignRight|AlignVCenter); + devicelab->tqsetAlignment(AlignRight|AlignVCenter); QLabel *cleanlab = new TQLabel(i18n("Clea&n print head"), this); QLabel *nozzlelab = new TQLabel(i18n("&Print a nozzle test pattern"), this); QLabel *alignlab = new TQLabel(i18n("&Align print head"), this); QLabel *inklab = new TQLabel(i18n("&Ink level"), this); QLabel *identlab = new TQLabel(i18n("P&rinter identification"), this); - cleanlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - nozzlelab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - alignlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - inklab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); - identlab->setAlignment(AlignLeft|AlignVCenter|ShowPrefix); + cleanlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + nozzlelab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + alignlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + inklab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); + identlab->tqsetAlignment(AlignLeft|AlignVCenter|ShowPrefix); cleanbtn->setAccel(TQAccel::shortcutKey(cleanlab->text())); nozzlebtn->setAccel(TQAccel::shortcutKey(nozzlelab->text())); diff --git a/kdeprint/treecombobox.cpp b/kdeprint/treecombobox.cpp index 1e4f1b694..e41a028f1 100644 --- a/kdeprint/treecombobox.cpp +++ b/kdeprint/treecombobox.cpp @@ -44,7 +44,7 @@ TreeListBoxItem::TreeListBoxItem(TQListBox *lb, const TQPixmap& pix, const TQStr else { QString parentStr = txt.left(txt.length()-m_path[m_depth].length()-1); - TreeListBoxItem *parentItem = static_cast(lb->findItem(parentStr, Qt::ExactMatch)); + TreeListBoxItem *parentItem = static_cast(lb->tqfindItem(parentStr, Qt::ExactMatch)); if (!parentItem) { // parent not found, add parent first into QListBox @@ -102,7 +102,7 @@ void TreeListBoxItem::paint(TQPainter *p) if (m_depth > 0) { QPen oldPen = p->pen(); - p->setPen(listBox()->colorGroup().mid()); + p->setPen(listBox()->tqcolorGroup().mid()); TreeListBoxItem *item = this; int s = xo-stepSize()/2; diff --git a/kdeprint/util.cpp b/kdeprint/util.cpp index d95ca2c0c..343f52d45 100644 --- a/kdeprint/util.cpp +++ b/kdeprint/util.cpp @@ -44,11 +44,11 @@ KURL smbToUrl(const TQString& s) { // allow to handle non-encoded chars in login/password KURL url; - int p = s.find('@'); + int p = s.tqfind('@'); if (p == -1) { // assumes url starts with "smb://". Use encoding in - // case the printer name contains chars like '#'. + // case the printer name tqcontains chars like '#'. url = KURL("smb://" + KURL::encode_string(s.mid(6))); } else @@ -56,7 +56,7 @@ KURL smbToUrl(const TQString& s) // assumes URL starts with "smb://" QString username = s.mid(6, p-6); url = KURL("smb://" + KURL::encode_string(s.mid(p+1))); - int q = username.find(':'); + int q = username.tqfind(':'); if (q == -1) url.setUser(username); else @@ -68,7 +68,7 @@ KURL smbToUrl(const TQString& s) return url; } -int findIndex(int ID) +int tqfindIndex(int ID) { for (int i=0; i