summaryrefslogtreecommitdiffstats
path: root/kdeprint/cups/cupsdconf2
diff options
context:
space:
mode:
Diffstat (limited to 'kdeprint/cups/cupsdconf2')
-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
15 files changed, 46 insertions, 46 deletions
diff --git a/kdeprint/cups/cupsdconf2/addressdialog.cpp b/kdeprint/cups/cupsdconf2/addressdialog.cpp
index d4f5b900f..1811abf68 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.tqfind(' ');
+ int p = addr.find(' ');
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 f568d1bdc..cb6ddcf92 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 - tqStatus of operation */
+int /* O - Status 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 bd8f5f573..ae1a4c362 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 nettqmask (i.e. no CIDR support).</p>
+# you have a Class A, B, C, or D netmask (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 tqmask to allow for incoming browser
+# <u>BrowseAllow</u>: specifies an address mask to allow for incoming browser
# packets. The default is to allow packets from all addresses.</p>
# <p>
-# <u>BrowseDeny</u>: specifies an address tqmask to deny for incoming browser
+# <u>BrowseDeny</u>: specifies an address mask 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 a93a05e5e..7c2b6276a 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_.tqfindIndex("CUPS") != -1);
- slp_->setChecked(conf_->browseprotocols_.tqfindIndex("SLP") != -1);
+ cups_->setChecked(conf_->browseprotocols_.findIndex("CUPS") != -1);
+ slp_->setChecked(conf_->browseprotocols_.findIndex("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 fbef47b16..43847299b 100644
--- a/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdcomment.cpp
@@ -27,7 +27,7 @@
TQString Comment::comment()
{
TQString str = comment_;
- str.tqreplace(TQRegExp("<[^>]*>"), "");
+ str.replace(TQRegExp("<[^>]*>"), "");
str += ("#\n" + example_);
return str;
}
@@ -35,7 +35,7 @@ TQString Comment::comment()
TQString Comment::toolTip()
{
TQString str = comment_;
- str.tqreplace(TQRegExp("^#[\\s]*"), "").tqreplace(TQRegExp("\n#[\\s]*"), "\n");
+ str.replace(TQRegExp("^#[\\s]*"), "").replace(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_.tqfind(key);
+ Comment *comm = comments_.find(key);
if (comm)
return comm->comment();
}
@@ -103,7 +103,7 @@ TQString CupsdComment::toolTip(const TQString& key)
{
if (comments_.count() != 0 || loadComments())
{
- Comment *comm = comments_.tqfind(key);
+ Comment *comm = comments_.find(key);
if (comm)
return comm->toolTip();
}
diff --git a/kdeprint/cups/cupsdconf2/cupsdconf.cpp b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
index 3742656a5..f500d219c 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 tqfindDir(const TQStringList& list)
+TQString findDir(const TQStringList& list)
{
for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it)
if (TQFile::exists(*it))
@@ -42,7 +42,7 @@ TQString tqfindDir(const TQStringList& list)
void splitSizeSpec(const TQString& s, int& sz, int& suff)
{
- int p = s.tqfind(TQRegExp("\\D"));
+ int p = s.find(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 tqfind CUPS directories (useful later)
- datadir_ = tqfindDir(TQStringList("/usr/share/cups")
+ // start by trying to find CUPS directories (useful later)
+ datadir_ = findDir(TQStringList("/usr/share/cups")
<< "/usr/local/share/cups"
<< "/opt/share/cups"
<< "/opt/local/share/cups");
- documentdir_ = tqfindDir(TQStringList(datadir_+"/doc-root")
+ documentdir_ = findDir(TQStringList(datadir_+"/doc-root")
<< datadir_.left(datadir_.length()-5)+"/doc/cups");
//fontpath_ << (datadir_+"/fonts");
- requestdir_ = tqfindDir(TQStringList("/var/spool/cups")
+ requestdir_ = findDir(TQStringList("/var/spool/cups")
<< "/var/cups");
- serverbin_ = tqfindDir(TQStringList("/usr/lib" KDELIBSUFF "/cups")
+ serverbin_ = findDir(TQStringList("/usr/lib" KDELIBSUFF "/cups")
<< "/usr/local/lib" KDELIBSUFF "/cups"
<< "/opt/lib" KDELIBSUFF "/cups"
<< "/opt/local/lib" KDELIBSUFF "/cups");
- serverfiles_ = tqfindDir(TQStringList("/etc/cups")
+ serverfiles_ = findDir(TQStringList("/etc/cups")
<< "/usr/local/etc/cups");
tmpfiles_ = requestdir_+"/tmp";
@@ -100,7 +100,7 @@ CupsdConf::CupsdConf()
maxrequestsize_ = "0";
clienttimeout_ = 300;
// listenaddresses_
- QString logdir = tqfindDir(TQStringList("/var/log/cups")
+ QString logdir = findDir(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.tqfind(' ')) != -1)
+ if ((p=l.find(' ')) != -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.tqfind("all") != prots.end())
+ if (prots.find("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.tqfind(' '), p2 = line.tqfind('>');
+ int p1 = line.find(' '), p2 = line.find('>');
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.tqfind(' ')) != -1)
+ if ((p=l.find(' ')) != -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.tqfind(' ');
+ int p = value.find(' ');
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.tqfind(i18n("Class")) == 0) return RESOURCE_CLASS;
- else if (text.tqfind(i18n("Printer")) == 0) return RESOURCE_PRINTER;
+ else if (text.find(i18n("Class")) == 0) return RESOURCE_CLASS;
+ else if (text.find(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.tqfind(i18n("Printer")) == 0)
+ else if (text.find(i18n("Printer")) == 0)
{
path = "/printers/";
path.append(text.right(text.length()-i18n("Printer").length()-1));
}
- else if (text.tqfind(i18n("Class")) == 0)
+ else if (text.find(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.tqfind("/printers/") == 0)
+ else if (path.find("/printers/") == 0)
{
text = i18n("Printer");
text.append(" ");
text.append(path.right(path.length()-10));
}
- else if (path.tqfind("/classes/") == 0)
+ else if (path.find("/classes/") == 0)
{
text = i18n("Class");
text.append(" ");
diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
index 65d7aca0c..8023aeef7 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 tqfind a running CUPS server");
+ msg = i18n("Unable to find a running CUPS server");
}
else
{
@@ -337,7 +337,7 @@ int CupsdDialog::serverOwner()
while (!t.eof())
{
str = t.readLine();
- if (str.tqfind("Uid:",0,false) == 0)
+ if (str.find("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 dc16f9b36..0bf290fb9 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 tqreplace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue)
+ if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue)
{
index = locs_.at();
locs_.remove();
diff --git a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index 2ef255c76..cc0804f5b 100644
--- a/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -29,7 +29,7 @@
#include <klocale.h>
-int tqfindComboItem(TQComboBox *cb, const TQString& str)
+int findComboItem(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 = tqfindComboItem(charset_, conf_->charset_.upper());
+ int index = findComboItem(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 754e7cbd5..9dd7581a8 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_->tqsetAlignment(Qt::AlignCenter);
+ cupslogo_->setAlignment(Qt::AlignCenter);
QLabel *kupslogo_ = new TQLabel(this);
logopath = locate("data", TQString("kdeprint/kde_logo.png"));
kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
- kupslogo_->tqsetAlignment(Qt::AlignCenter);
+ kupslogo_->setAlignment(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 d65edaeff..a91fdc3d3 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_->tqfindItem(s, Qt::ExactMatch);
+ QListBoxItem *it = list_->findItem(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_->tqfindItem(s, Qt::ExactMatch))
+ if (!list_->findItem(s, Qt::ExactMatch))
list_->insertItem(s);
}
void EditList::insertItem(const TQPixmap& icon, const TQString& s)
{
- if (!list_->tqfindItem(s, Qt::ExactMatch))
+ if (!list_->findItem(s, Qt::ExactMatch))
list_->insertItem(icon, s);
}
diff --git a/kdeprint/cups/cupsdconf2/locationdialog.cpp b/kdeprint/cups/cupsdconf2/locationdialog.cpp
index 1ea94d66f..d360d62e2 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_.tqfindRef(loc->resource_);
+ int index = conf_->resources_.findRef(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 184005c13..e17e2b081 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.tqfind(' ');
+ int p = s.find(' ');
if (p != -1)
{
dlg.usessl_->setChecked(s.left(p).startsWith("SSL"));
QString addr = s.mid(p+1).stripWhiteSpace();
- int p1 = addr.tqfind(':');
+ int p1 = addr.find(':');
if (p1 == -1)
{
dlg.address_->setText(addr);
diff --git a/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/kdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index 7b96d4ef9..1daca81cb 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->tqsizeHint().height()*2));
+ m_view->setFixedHeight(QMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().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 5920c30a9..d77fe5aaa 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.tqfind( TQRegExp( "\\D" ) );
+ int p = sz.find( TQRegExp( "\\D" ) );
m_size->setValue( sz.left( p ).toInt() );
switch( sz[ p ].latin1() )
{
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 15:35:14 +0000