summaryrefslogtreecommitdiffstats
path: root/kdeprint/cups
diff options
context:
space:
mode:
Diffstat (limited to 'kdeprint/cups')
-rw-r--r--kdeprint/cups/cupsaddsmb2.cpp12
-rw-r--r--kdeprint/cups/cupsaddsmb2.h2
-rw-r--r--kdeprint/cups/cupsdconf2/addressdialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cups-util.c2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsd.conf.template6
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdcomment.cpp8
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdconf.cpp40
-rw-r--r--kdeprint/cups/cupsdconf2/cupsddialog.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdserverpage.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/cupsdsplash.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/editlist.cpp6
-rw-r--r--kdeprint/cups/cupsdconf2/locationdialog.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/portdialog.cpp4
-rw-r--r--kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--kdeprint/cups/cupsdconf2/sizewidget.cpp2
-rw-r--r--kdeprint/cups/cupsinfos.cpp4
-rw-r--r--kdeprint/cups/image.cpp8
-rw-r--r--kdeprint/cups/imageposition.cpp6
-rw-r--r--kdeprint/cups/imageposition.h2
-rw-r--r--kdeprint/cups/imagepreview.cpp6
-rw-r--r--kdeprint/cups/imagepreview.h2
-rw-r--r--kdeprint/cups/ippreportdlg.cpp2
-rw-r--r--kdeprint/cups/ipprequest.cpp10
-rw-r--r--kdeprint/cups/kcupsprinterimpl.cpp10
-rw-r--r--kdeprint/cups/kmconfigcupsdir.cpp2
-rw-r--r--kdeprint/cups/kmcupsconfigwidget.cpp6
-rw-r--r--kdeprint/cups/kmcupsjobmanager.cpp28
-rw-r--r--kdeprint/cups/kmcupsmanager.cpp62
-rw-r--r--kdeprint/cups/kmpropquota.cpp4
-rw-r--r--kdeprint/cups/kmpropusers.cpp2
-rw-r--r--kdeprint/cups/kmwbanners.cpp8
-rw-r--r--kdeprint/cups/kmwfax.cpp4
-rw-r--r--kdeprint/cups/kmwipp.cpp2
-rw-r--r--kdeprint/cups/kmwippprinter.cpp10
-rw-r--r--kdeprint/cups/kmwippselect.cpp6
-rw-r--r--kdeprint/cups/kmwother.cpp4
-rw-r--r--kdeprint/cups/kmwquota.cpp4
-rw-r--r--kdeprint/cups/kphpgl2page.cpp6
-rw-r--r--kdeprint/cups/kpimagepage.cpp10
-rw-r--r--kdeprint/cups/kpschedulepage.cpp4
-rw-r--r--kdeprint/cups/kptagspage.cpp10
-rw-r--r--kdeprint/cups/kptagspage.h4
-rw-r--r--kdeprint/cups/kptextpage.cpp20
45 files changed, 176 insertions, 176 deletions
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.</p>
# <p>
# 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).</p>
+# you have a Class A, B, C, or D nettqmask (i.e. no CIDR support).</p>
# <p>
# <i>ex</i>: x.y.z.255, x.y.255.255</p>
$$
@@ -462,10 +462,10 @@ $$
%%browseallow
# <b>Browse allow/deny (BrowseAllow/BrowseDeny)</b>
# <p>
-# <u>BrowseAllow</u>: specifies an address mask to allow for incoming browser
+# <u>BrowseAllow</u>: specifies an address tqmask to allow for incoming browser
# packets. The default is to allow packets from all addresses.</p>
# <p>
-# <u>BrowseDeny</u>: specifies an address mask to deny for incoming browser
+# <u>BrowseDeny</u>: specifies an address tqmask to deny for incoming browser
# packets. The default is to deny packets from no addresses.</p>
# <p>
# 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 <cups/ipp.h>
#include <cups/language.h>
-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 <klocale.h>
-int findComboItem(TQComboBox *cb, const TQString& str)
+int tqfindComboItem(TQComboBox *cb, const TQString& str)
{
for (int i=0; i<cb->count(); 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( "<p>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<image.height();j++)
{
c = image.pixel(i,j);
- r = qRed(c);
- g = qGreen(c);
- b = qBlue(c);
+ r = tqRed(c);
+ g = tqGreen(c);
+ b = tqBlue(c);
v = lut[0][0][r] + lut[1][0][g] + lut[2][0][b];
if (gamma != 1000) v = (int)rint(pow(v,gam));
@@ -289,7 +289,7 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne
else if (v > 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;i<attr->num_values;i++)
{
switch (attr->value_tag)
@@ -504,7 +504,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& 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<TQString,TQString>& 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<KMJob>& jobs, int ac
if (argstr.isEmpty()) return false;
req.setOperation(CUPS_MOVE_JOB);
uri =
- TQString::fromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
+ TQString::tqfromLatin1("ipp://%1/printers/%2").arg(CupsInfos::self()->hostaddr(),
argstr);
req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri);
break;
@@ -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<TQString,TQString> 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<TQString,TQString>::ConstIterator it = map.find( ban );
+ TQMap<TQString,TQString>::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.</p>"));
setLabel(0,i18n("Host:"));
setLabel(1,i18n("Port:"));
- setText( 1, TQString::fromLatin1( "631" ) );
+ setText( 1, TQString::tqfromLatin1( "631" ) );
}
bool KMWIpp::isValid(TQString& msg)
diff --git a/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("<p>Either enter the printer URI directly, or use the network scanning facility.</p>"));
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("<b>Name</b>: %1<br>").arg(value));
if (req.text("printer-location",value) && !value.isEmpty()) txt.append(i18n("<b>Location</b>: %1<br>").arg(value));
- if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("<b>Description</b>: %1<br>").arg(value.replace(TQRegExp(";"),"<br>")));
+ if (req.text("printer-info",value) && !value.isEmpty()) txt.append(i18n("<b>Description</b>: %1<br>").arg(value.tqreplace(TQRegExp(";"),"<br>")));
if (req.uri("printer-uri-supported",value))
{
if (value[0] == '/')
- value.prepend(TQString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
+ value.prepend(TQString::tqfromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
m_uri->setText(value);
}
if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value));
diff --git a/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<TQString,TQString>& 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( " <qt> "
" <p><b>Position Preview Thumbnail</b></p> "
" <p>This position preview thumbnail indicates the position of the image on the paper sheet. "
- " <p>Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: "
+ " <p>Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: "
" <ul> "
" <li> center </li>"
" <li> top </li>"
@@ -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<TQString,TQString>& 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: <b>%1</b>.").arg(tag);
return false;
@@ -129,7 +129,7 @@ void KPTagsPage::setOptions(const TQMap<TQString,TQString>& 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<TQString,TQString>& 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<TQString,TQString>& 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( " <qt> "
" <p><b>Margins</b></p> "
" <p>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). </p> "
" <p>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. </p> "
@@ -134,7 +134,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
TQString whatsThisPrettyprintButtonOnTextPage = i18n( " <qt> "
" <p><b>Turn Text Printing with Syntax Highlighting (Prettyprint) On!</b></p> "
" <p>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.</p>"
" <p>This prettyprint option is handled by CUPS.</p> "
@@ -167,7 +167,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
TQString whatsThisPrettyprintFrameTextPage = i18n( " <qt> "
" <p><b>Print Text with Syntax Highlighting (Prettyprint)</b></p> "
" <p>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.</p>"
" <p>This prettyprint option is handled by CUPS.</p> "
@@ -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<TQString,TQString>& 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();