summaryrefslogtreecommitdiffstats
path: root/tdeprint
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.h2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdpage.h6
-rw-r--r--tdeprint/cups/image.cpp4
-rw-r--r--tdeprint/cups/imagepreview.cpp2
-rw-r--r--tdeprint/cups/ipprequest.h2
-rw-r--r--tdeprint/cups/kmconfigcupsdir.cpp2
-rw-r--r--tdeprint/cups/kmcupsuimanager.cpp2
-rw-r--r--tdeprint/driver.cpp12
-rw-r--r--tdeprint/driver.h10
-rw-r--r--tdeprint/driveritem.cpp4
-rw-r--r--tdeprint/droptionview.cpp4
-rw-r--r--tdeprint/foomatic/kfoomaticprinterimpl.cpp4
-rw-r--r--tdeprint/foomatic/kmfoomaticmanager.cpp12
-rw-r--r--tdeprint/fooscanner.l2
-rw-r--r--tdeprint/kmjob.cpp4
-rw-r--r--tdeprint/kmjob.h8
-rw-r--r--tdeprint/kmmanager.cpp2
-rw-r--r--tdeprint/kmmanager.h2
-rw-r--r--tdeprint/kmprinter.cpp6
-rw-r--r--tdeprint/kmspecialmanager.cpp6
-rw-r--r--tdeprint/kmthreadjob.cpp2
-rw-r--r--tdeprint/kmvirtualmanager.cpp16
-rw-r--r--tdeprint/kpmarginpage.cpp6
-rw-r--r--tdeprint/kpqtpage.cpp4
-rw-r--r--tdeprint/kprintdialog.cpp6
-rw-r--r--tdeprint/kprintdialogpage.h4
-rw-r--r--tdeprint/kprinter.cpp10
-rw-r--r--tdeprint/kprinterimpl.cpp2
-rw-r--r--tdeprint/kprintpreview.cpp6
-rw-r--r--tdeprint/kprintprocess.h2
-rw-r--r--tdeprint/lpd/gschecker.cpp2
-rw-r--r--tdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--tdeprint/lpd/kmlpdmanager.cpp34
-rw-r--r--tdeprint/lpd/lpdtools.cpp14
-rw-r--r--tdeprint/lpd/lpdtools.h12
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.cpp2
-rw-r--r--tdeprint/lpr/klprprinterimpl.cpp4
-rw-r--r--tdeprint/lpr/klprprinterimpl.h2
-rw-r--r--tdeprint/lpr/lprsettings.h4
-rw-r--r--tdeprint/management/jobitem.h2
-rw-r--r--tdeprint/management/kmconfigpage.h6
-rw-r--r--tdeprint/management/kmiconview.h2
-rw-r--r--tdeprint/management/kminfopage.cpp2
-rw-r--r--tdeprint/management/kmlistview.cpp2
-rw-r--r--tdeprint/management/kmprinterview.cpp2
-rw-r--r--tdeprint/management/kmprinterview.h2
-rw-r--r--tdeprint/management/kmpropwidget.h6
-rw-r--r--tdeprint/management/kmwizardpage.h2
-rw-r--r--tdeprint/management/kmwlpd.cpp2
-rw-r--r--tdeprint/management/kmwname.cpp2
-rw-r--r--tdeprint/management/kmwsocketutil.h4
-rw-r--r--tdeprint/ppdparser.y14
-rw-r--r--tdeprint/ppdscanner.l4
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp6
-rw-r--r--tdeprint/tdeprintcheck.cpp8
-rw-r--r--tdeprint/tests/richpage.cpp2
56 files changed, 149 insertions, 149 deletions
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.h b/tdeprint/cups/cupsdconf2/cupsddialog.h
index 2d1de6689..683e998d7 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.h
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.h
@@ -52,7 +52,7 @@ protected:
private:
TQPtrList<CupsdPage> pagelist_;
CupsdConf *conf_;
- QString filename_;
+ TQString filename_;
};
#endif
diff --git a/tdeprint/cups/cupsdconf2/cupsdpage.h b/tdeprint/cups/cupsdconf2/cupsdpage.h
index 41209a5c0..9d8008d1f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdpage.h
@@ -46,9 +46,9 @@ protected:
protected:
CupsdConf *conf_;
- QString label_;
- QString header_;
- QString pixmap_;
+ TQString label_;
+ TQString header_;
+ TQString pixmap_;
};
#endif
diff --git a/tdeprint/cups/image.cpp b/tdeprint/cups/image.cpp
index ce56bb4b9..d26b01400 100644
--- a/tdeprint/cups/image.cpp
+++ b/tdeprint/cups/image.cpp
@@ -249,10 +249,10 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne
{
float mat[3][3] = {{1.0,0.0,0.0},{0.0,1.0,0.0},{0.0,0.0,1.0}};
int lut[3][3][256];
- QRgb c;
+ TQRgb c;
int r,g,b,v,r2,g2,b2;
float gam = 1.0/(float(gamma)/1000.0);
- QImage img(image);
+ TQImage img(image);
saturate(mat,saturation*0.01);
huerotate(mat,(float)hue);
diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp
index e2401d6d3..549010f44 100644
--- a/tdeprint/cups/imagepreview.cpp
+++ b/tdeprint/cups/imagepreview.cpp
@@ -55,7 +55,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga
}
void ImagePreview::paintEvent(TQPaintEvent*){
- QImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
+ TQImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;
TQPixmap buffer(width(), height());
diff --git a/tdeprint/cups/ipprequest.h b/tdeprint/cups/ipprequest.h
index 84a7c5b18..8577c9b93 100644
--- a/tdeprint/cups/ipprequest.h
+++ b/tdeprint/cups/ipprequest.h
@@ -102,7 +102,7 @@ protected:
private:
ipp_t *request_;
- QString host_;
+ TQString host_;
int port_;
bool connect_;
int dump_;
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 10a455226..ab82d290b 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -55,7 +55,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
void KMConfigCupsDir::loadConfig(TDEConfig *conf)
{
conf->setGroup("CUPS");
- QString dir = conf->readPathEntry("InstallDir");
+ TQString dir = conf->readPathEntry("InstallDir");
m_stddir->setChecked(dir.isEmpty());
m_installdir->setURL(dir);
}
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index 03b85bb0a..b1d4e60f6 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -134,7 +134,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard)
backend->addBackend(KMWizard::Class,i18n("Cl&ass of printers"),false,whatsThisClassOfPrinters);
IppRequest req;
- QString uri;
+ TQString uri;
req.setOperation(CUPS_GET_DEVICES);
uri = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp
index 92eb7fc84..f4a07aa88 100644
--- a/tdeprint/driver.cpp
+++ b/tdeprint/driver.cpp
@@ -66,7 +66,7 @@ void DrBase::setOptions(const TQMap<TQString,TQString>& opts)
void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
{
- QString val = valueText();
+ TQString val = valueText();
if ( incldef || get( "persistent" ) == "1" || get("default") != val )
opts[name()] = val;
}
@@ -455,7 +455,7 @@ DrIntegerOption::~DrIntegerOption()
TQString DrIntegerOption::valueText()
{
- QString s = TQString::number(m_value);
+ TQString s = TQString::number(m_value);
return s;
}
@@ -505,7 +505,7 @@ DrFloatOption::~DrFloatOption()
TQString DrFloatOption::valueText()
{
- QString s = TQString::number(m_value,'f',3);
+ TQString s = TQString::number(m_value,'f',3);
return s;
}
@@ -555,7 +555,7 @@ DrListOption::~DrListOption()
TQString DrListOption::valueText()
{
- QString s = (m_current ? m_current->name() : TQString::null);
+ TQString s = (m_current ? m_current->name() : TQString::null);
return s;
}
@@ -654,7 +654,7 @@ bool DrConstraint::check(DrMain *driver)
if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice())
{
bool f1(false), f2(false);
- QString c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name());
+ TQString c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name());
// check choices
if (m_choice1.isEmpty())
f1 = (c1 != "None" && c1 != "Off" && c1 != "False");
@@ -665,7 +665,7 @@ bool DrConstraint::check(DrMain *driver)
else
f2 = (c2 == m_choice2);
// tag options
- QString s((f1 && f2 ? "1" : "0"));
+ TQString s((f1 && f2 ? "1" : "0"));
if (!m_option1->conflict()) m_option1->setConflict(f1 && f2);
if (!m_option2->conflict()) m_option2->setConflict(f1 && f2);
// return value
diff --git a/tdeprint/driver.h b/tdeprint/driver.h
index 813c0b7f6..9848be9a6 100644
--- a/tdeprint/driver.h
+++ b/tdeprint/driver.h
@@ -87,7 +87,7 @@ public:
protected:
TQMap<TQString,TQString> m_map;
- QString m_name; // used as a search key, better to have defined directly
+ TQString m_name; // used as a search key, better to have defined directly
Type m_type;
bool m_conflict;
};
@@ -212,7 +212,7 @@ public:
virtual void setValueText(const TQString& s);
protected:
- QString m_value;
+ TQString m_value;
};
/**********************************
@@ -336,8 +336,8 @@ public:
bool check(DrMain*);
protected:
- QString m_opt1, m_opt2;
- QString m_choice1, m_choice2;
+ TQString m_opt1, m_opt2;
+ TQString m_choice1, m_choice2;
DrListOption *m_option1, *m_option2;
};
@@ -376,7 +376,7 @@ public:
TQSize margins() const;
protected:
- QString m_name;
+ TQString m_name;
float m_width, m_height, m_left, m_bottom, m_right, m_top;
};
diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp
index 0b66c51d9..9bf17565c 100644
--- a/tdeprint/driveritem.cpp
+++ b/tdeprint/driveritem.cpp
@@ -44,7 +44,7 @@ void DriverItem::updateText()
{
if (m_item)
{
- QString s(m_item->get("text"));
+ TQString s(m_item->get("text"));
if (m_item->isOption())
s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText()));
if (m_item->type() == DrBase::List)
@@ -96,7 +96,7 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
else
{
int w1(0);
- QString s(m_item->get("text") + ": <");
+ TQString s(m_item->get("text") + ": <");
w1 = p->fontMetrics().width(s);
p->setPen(cg.text());
p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index de20a62fa..e6c0552f3 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -123,7 +123,7 @@ void OptionNumericView::slotSliderChanged(int value)
{
if (blockSS) return;
- QString txt;
+ TQString txt;
if (m_integer)
txt = TQString::number(value);
else
@@ -226,7 +226,7 @@ void OptionListView::slotSelectionChanged()
{
if (blockSS) return;
- QString s = m_choices[m_list->currentItem()];
+ TQString s = m_choices[m_list->currentItem()];
emit valueChanged(s);
}
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index dd694b31b..df3949903 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -35,13 +35,13 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl()
// look for executable
TQString KFoomaticPrinterImpl::executable()
{
- QString exe = TDEStandardDirs::findExe("foomatic-printjob");
+ TQString exe = TDEStandardDirs::findExe("foomatic-printjob");
return exe;
}
bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
{
- QString exe = executable();
+ TQString exe = executable();
if (!exe.isEmpty())
{
cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());
diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp
index e1e741003..6953be7cc 100644
--- a/tdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/tdeprint/foomatic/kmfoomaticmanager.cpp
@@ -76,7 +76,7 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool)
return NULL;
}
- QString cmd = "foomatic-combo-xml -p ";
+ TQString cmd = "foomatic-combo-xml -p ";
cmd += TDEProcess::quote(printer->option("printer"));
cmd += " -d ";
cmd += TDEProcess::quote(printer->option("driver"));
@@ -99,7 +99,7 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem)
printer->setState(KMPrinter::Idle);
/*if (printer->name().find('/') != -1)
{
- QString s(printer->name());
+ TQString s(printer->name());
int p = s.find('/');
printer->setPrinterName(s.left(p));
printer->setInstanceName(s.mid(p+1));
@@ -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());
+ TQString s = TQString::fromLatin1("%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);
@@ -148,14 +148,14 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
{
if (o.tagName() == "option")
{
- QString type = o.attribute("type");
+ TQString type = o.attribute("type");
DrBase *dropt(0);
if (type == "bool" || type == "enum")
{
if (type == "bool") dropt = new DrBooleanOption();
else dropt = new DrListOption();
- QString defval = o.namedItem("arg_defval").toElement().text(), valuetext;
+ TQString defval = o.namedItem("arg_defval").toElement().text(), valuetext;
QDomNode val = o.namedItem("enum_vals").firstChild();
while (!val.isNull())
{
@@ -177,7 +177,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
else dropt = new DrFloatOption();
dropt->set("minval", o.namedItem("arg_min").toElement().text());
dropt->set("maxval", o.namedItem("arg_max").toElement().text());
- QString defval = o.namedItem("arg_defval").toElement().text();
+ TQString defval = o.namedItem("arg_defval").toElement().text();
dropt->set("default", defval);
dropt->setValueText(defval);
}
diff --git a/tdeprint/fooscanner.l b/tdeprint/fooscanner.l
index df8f6e778..7770f28bb 100644
--- a/tdeprint/fooscanner.l
+++ b/tdeprint/fooscanner.l
@@ -72,7 +72,7 @@ D [[:digit:]]
%%
-void tdeprint_foomatic2scanner_init( QIODevice *d )
+void tdeprint_foomatic2scanner_init( TQIODevice *d )
{
tdeprint_foomatic2scanner_device = d;
}
diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index 9f314539e..c0974d646 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -78,7 +78,7 @@ TQString KMJob::pixmap()
return TQString::fromLatin1("application-x-executable");
// normal case
- QString str("tdeprint_job");
+ TQString str("tdeprint_job");
switch (m_state)
{
case KMJob::Printing:
@@ -104,7 +104,7 @@ TQString KMJob::pixmap()
TQString KMJob::stateString()
{
- QString str;
+ TQString str;
switch (m_state)
{
case KMJob::Printing:
diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h
index 51b4f90d1..7b9f8c3c1 100644
--- a/tdeprint/kmjob.h
+++ b/tdeprint/kmjob.h
@@ -111,9 +111,9 @@ protected:
protected:
// normal members
int m_ID;
- QString m_name;
- QString m_printer;
- QString m_owner;
+ TQString m_name;
+ TQString m_printer;
+ TQString m_owner;
int m_state;
int m_size;
int m_type;
@@ -123,7 +123,7 @@ protected:
bool m_remote;
// internal members
- QString m_uri;
+ TQString m_uri;
TQValueVector<TQString> m_attributes;
};
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 19fdbc7cc..3393edc58 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -421,7 +421,7 @@ TQString KMManager::testPage()
{
TDEConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("General");
- QString tpage = conf->readPathEntry("TestPage");
+ TQString tpage = conf->readPathEntry("TestPage");
if (tpage.isEmpty())
tpage = locate("data","tdeprint/testprint.ps");
return tpage;
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index 3f42a1acc..67cca0978 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -170,7 +170,7 @@ protected:
virtual void checkUpdatePossibleInternal();
protected:
- QString m_errormsg;
+ TQString m_errormsg;
KMPrinterList m_printers, m_fprinters; // filtered printers
bool m_hasmanagement;
int m_printeroperationmask;
diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp
index c7676e382..3d28831ba 100644
--- a/tdeprint/kmprinter.cpp
+++ b/tdeprint/kmprinter.cpp
@@ -90,7 +90,7 @@ TQString KMPrinter::pixmap()
{
if (!m_pixmap.isEmpty()) return m_pixmap;
- QString str("tdeprint_printer");
+ TQString str("tdeprint_printer");
if (!isValid()) str.append("_defect");
else
{
@@ -133,7 +133,7 @@ int KMPrinter::compare(KMPrinter *p1, KMPrinter *p2)
TQString KMPrinter::stateString() const
{
- QString s;
+ TQString s;
switch (state())
{
case KMPrinter::Idle: s = i18n("Idle"); break;
@@ -184,7 +184,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent)
true);
dialog->setOperationMode (KFileDialog::Saving);
- QString mimetype = option("kde-special-mimetype");
+ TQString mimetype = option("kde-special-mimetype");
if (!mimetype.isEmpty())
{
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index 16a0ab616..84da26fe9 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -43,7 +43,7 @@ KMSpecialManager::KMSpecialManager(KMManager *parent, const char *name)
bool KMSpecialManager::savePrinters()
{
// for root, use a global location.
- QString confname;
+ TQString confname;
if (getuid() == 0)
{
confname = locate("data", "tdeprint/specials.desktop");
@@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename)
int n = conf.readNumEntry("Number",0);
for (int i=0;i<n;i++)
{
- QString grpname = TQString::fromLatin1("Printer %1").arg(i);
+ TQString grpname = TQString::fromLatin1("Printer %1").arg(i);
if (!conf.hasGroup(grpname)) continue;
conf.setGroup(grpname);
KMPrinter *printer = new KMPrinter;
@@ -213,7 +213,7 @@ DrMain* KMSpecialManager::loadDriver(KMPrinter *pr)
TQString KMSpecialManager::setupCommand(const TQString& cmd, const TQMap<TQString,TQString>& opts)
{
- QString s(cmd);
+ TQString s(cmd);
if (!s.isEmpty())
{
KXmlCommand *xmlCmd = loadCommand(cmd);
diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp
index 309da96a9..5759664c8 100644
--- a/tdeprint/kmthreadjob.cpp
+++ b/tdeprint/kmthreadjob.cpp
@@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob()
TQString KMThreadJob::jobFile()
{
- QString f = locateLocal("data","tdeprint/printjobs");
+ TQString f = locateLocal("data","tdeprint/printjobs");
return f;
}
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index 9262f3e3c..4bf58b3c1 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -38,7 +38,7 @@
static TQString instanceName(const TQString& prname, const TQString& instname)
{
- QString str(prname);
+ TQString str(prname);
if (!instname.isEmpty())
str.append("/"+instname);
return str;
@@ -60,7 +60,7 @@ KMPrinter* KMVirtualManager::findPrinter(const TQString& name)
KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name)
{
- QString instname(instanceName(p->printerName(),name));
+ TQString instname(instanceName(p->printerName(),name));
return findPrinter(instname);
}
@@ -96,7 +96,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag)
bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
{
- QString instname(instanceName(p->printerName(),name));
+ TQString instname(instanceName(p->printerName(),name));
KMPrinter *printer = findPrinter(instname);
if (printer)
return printer->isSoftDefault();
@@ -106,7 +106,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
void KMVirtualManager::create(KMPrinter *p, const TQString& name)
{
- QString instname = instanceName(p->printerName(),name);
+ TQString instname = instanceName(p->printerName(),name);
if (findPrinter(instname) != NULL) return;
KMPrinter *printer = new KMPrinter;
printer->setName(instname);
@@ -123,7 +123,7 @@ 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));
+ TQString instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name));
KMPrinter *prsrc = findPrinter(instsrc);
if (!prsrc || findPrinter(instname) != NULL) return;
KMPrinter *printer = new KMPrinter;
@@ -137,7 +137,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);
+ TQString instname = instanceName(p->printerName(),name);
KMPrinter *printer = findPrinter(instname);
if (!printer) return;
if (name.isEmpty())
@@ -153,7 +153,7 @@ void KMVirtualManager::remove(KMPrinter *p, const TQString& name)
void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget *parent)
{
- QString instname(instanceName(p->printerName(),name));
+ TQString instname(instanceName(p->printerName(),name));
if ( p->isSpecial() )
{
@@ -294,7 +294,7 @@ void KMVirtualManager::loadFile(const TQString& filename)
void KMVirtualManager::triggerSave()
{
- QString filename;
+ TQString filename;
if (getuid() == 0)
{
if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))
diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp
index 019cf34d9..8e814a49b 100644
--- a/tdeprint/kpmarginpage.cpp
+++ b/tdeprint/kpmarginpage.cpp
@@ -75,7 +75,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
if (driver() && m_usedriver )
{
- QString pageSize(ps);
+ TQString pageSize(ps);
if (pageSize.isEmpty())
{
@@ -105,7 +105,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts)
{
- QString orient = opts["orientation-requested"];
+ TQString orient = opts["orientation-requested"];
bool land = (orient.isEmpty()? opts["kde-orientation"] == "Landscape" : orient == "4" || orient == "5");
TQString ps = opts[ "kde-printsize" ];
if ( ps.isEmpty() )
@@ -120,7 +120,7 @@ void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts)
initPageSize(ps, land);
bool marginset(false);
- QString value;
+ TQString value;
if (!(value=opts["kde-margin-top"]).isEmpty() && value.toFloat() != m_margin->top())
{
marginset = true;
diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp
index c0ca5656e..97e8ea3aa 100644
--- a/tdeprint/kpqtpage.cpp
+++ b/tdeprint/kpqtpage.cpp
@@ -235,7 +235,7 @@ void KPQtPage::slotColorModeChanged(int ID)
void KPQtPage::slotNupChanged(int ID)
{
- QString pixstr;
+ TQString pixstr;
switch (ID)
{
case NUP_1: pixstr = "tdeprint_nup1"; break;
@@ -256,7 +256,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts)
slotColorModeChanged(ID);
if (driver())
{
- QString val = opts["PageSize"];
+ TQString val = opts["PageSize"];
if (!val.isEmpty())
{
DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize"));
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index e12d4bafe..fb1fbe812 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -554,7 +554,7 @@ void KPrintDialog::initialize(KPrinter *printer)
if (plist)
{
- QString oldP = d->m_printers->currentText();
+ TQString oldP = d->m_printers->currentText();
d->m_printers->clear();
TQPtrListIterator<KMPrinter> it(*plist);
int defsoft(-1), defhard(-1), defsearch(-1);
@@ -969,8 +969,8 @@ void KPrintDialog::slotOpenFileDialog()
KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
if (prt)
{
- QString mimetype(prt->option("kde-special-mimetype"));
- QString ext(prt->option("kde-special-extension"));
+ TQString mimetype(prt->option("kde-special-mimetype"));
+ TQString ext(prt->option("kde-special-extension"));
if (!mimetype.isEmpty())
{
diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h
index 353b68986..4cddf7f13 100644
--- a/tdeprint/kprintdialogpage.h
+++ b/tdeprint/kprintdialogpage.h
@@ -144,7 +144,7 @@ public:
* @returns the page title
* @see setTitle()
*/
- QString title() const { return m_title; }
+ TQString title() const { return m_title; }
/**
* Set the page title. This title will be used as tab name for this page in the print
* dialog.
@@ -183,7 +183,7 @@ protected:
KMPrinter *m_printer;
DrMain *m_driver;
int m_ID;
- QString m_title;
+ TQString m_title;
bool m_onlyreal;
};
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 740bac293..35d0dbe20 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -101,14 +101,14 @@ public:
bool m_restore;
bool m_previewonly;
WId m_parentId;
- QString m_docfilename;
+ TQString m_docfilename;
TQString m_docdirectory;
KPrinterWrapper *m_wrapper;
TQMap<TQString,TQString> m_options;
- QString m_tmpbuffer;
- QString m_printername;
- QString m_searchname;
- QString m_errormsg;
+ TQString m_tmpbuffer;
+ TQString m_printername;
+ TQString m_searchname;
+ TQString m_errormsg;
bool m_ready;
int m_pagenumber;
DrPageSize *m_pagesize;
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index edd380009..171b1b524 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -79,7 +79,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer)
// Find the page size:
// 1) print option
// 2) default driver option
- QString psname = printer->option("PageSize");
+ TQString psname = printer->option("PageSize");
if (psname.isEmpty())
{
DrListOption *opt = (DrListOption*)driver->findOption("PageSize");
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index d4de7925d..3882ecb6e 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -129,7 +129,7 @@ static KLibFactory* componentFactory()
static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOnly)
{
- QString msg(msg_);
+ TQString msg(msg_);
if (previewOnly)
{
KMessageBox::error(parent, msg);
@@ -275,7 +275,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
exe = conf->readPathEntry("PreviewCommand", "gv");
if (TDEStandardDirs::findExe(exe).isEmpty())
{
- QString msg = i18n("The preview program %1 cannot be found. "
+ TQString msg = i18n("The preview program %1 cannot be found. "
"Check that the program is correctly installed and "
"located in a directory included in your PATH "
"environment variable.").arg(exe);
@@ -314,7 +314,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
// start the preview process
if (!proc.startPreview())
{
- QString msg = i18n("Preview failed: unable to start program %1.").arg(exe);
+ TQString msg = i18n("Preview failed: unable to start program %1.").arg(exe);
return continuePrint(msg, parentW, previewOnly);
}
else if (!previewOnly)
diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h
index ede5eb3b6..544dd7e1e 100644
--- a/tdeprint/kprintprocess.h
+++ b/tdeprint/kprintprocess.h
@@ -54,7 +54,7 @@ protected slots:
void slotExited( TDEProcess* );
private:
- QString m_buffer;
+ TQString m_buffer;
TQStringList m_tempfiles;
TQString m_output, m_tempoutput, m_command;
int m_state;
diff --git a/tdeprint/lpd/gschecker.cpp b/tdeprint/lpd/gschecker.cpp
index 99044918b..2ea194453 100644
--- a/tdeprint/lpd/gschecker.cpp
+++ b/tdeprint/lpd/gschecker.cpp
@@ -41,7 +41,7 @@ void GsChecker::loadDriverList()
if (proc.open("gs -h",IO_ReadOnly))
{
QTextStream t(&proc);
- QString buffer, line;
+ TQString buffer, line;
bool ok(false);
while (!t.eof())
{
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index 3647f0b38..843e73409 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -40,7 +40,7 @@ TQString KLpdPrinterImpl::executable()
bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
{
- QString exestr = executable();
+ TQString exestr = executable();
if (exestr.isEmpty())
{
printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr"));
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index e72733f89..ab0a9d3dc 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -44,7 +44,7 @@
// only there to allow testing on my system. Should be removed
// when everything has proven to be working and stable
-QString lpdprefix = "";
+TQString lpdprefix = "";
TQString ptPrinterType(KMPrinter*);
//************************************************************************************************
@@ -83,7 +83,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
PrintcapEntry *entry = m_entries.find(printer->name());
if (entry)
{
- QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
+ TQString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
printer->setDescription(i18n("Local printer queue (%1)").arg(type.isEmpty() ? i18n("Unknown type of local printer queue", "Unknown") : type));
printer->setLocation(i18n("<Not available>"));
printer->setDriverInfo(driver.isEmpty() ? i18n("Unknown Driver", "Unknown") : driver);
@@ -221,7 +221,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer)
bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
{
KPipeProcess proc;
- QString cmd = programName(0);
+ TQString cmd = programName(0);
cmd += " ";
cmd += state ? "up" : "down";
cmd += " ";
@@ -229,7 +229,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
if (proc.open(cmd))
{
QTextStream t(&proc);
- QString buffer;
+ TQString buffer;
while (!t.eof())
buffer.append(t.readLine());
if (buffer.startsWith("?Privilege"))
@@ -287,11 +287,11 @@ TQString KMLpdManager::programName(int f)
void KMLpdManager::checkStatus()
{
KPipeProcess proc;
- QString cmd = programName(0) + " status all";
+ TQString cmd = programName(0) + " status all";
if (proc.open(cmd))
{
QTextStream t(&proc);
- QString line;
+ TQString line;
KMPrinter *printer(0);
int p(-1);
while (!t.eof())
@@ -326,7 +326,7 @@ void KMLpdManager::loadPrintcapFile(const TQString& filename)
if (f.exists() && f.open(IO_ReadOnly))
{
QTextStream t(&f);
- QString line, comment;
+ TQString line, comment;
PrintcapEntry *entry;
while (!t.eof())
{
@@ -391,7 +391,7 @@ void KMLpdManager::loadPrinttoolDb(const TQString& filename)
DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry)
{
- QString ptdbfilename = driverDirectory() + "/printerdb";
+ TQString ptdbfilename = driverDirectory() + "/printerdb";
if (entry->file == ptdbfilename)
{
PrinttoolEntry *ptentry = findPrinttoolEntry(entry->modelname);
@@ -419,7 +419,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config)
return NULL;
// check for printtool driver (only for configuration)
- QString sd = entry->arg("sd"), dr(entry->comment(7));
+ TQString sd = entry->arg("sd"), dr(entry->comment(7));
if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty())
{
TQMap<TQString,TQString> map = loadPrinttoolCfgFile(sd+"/postscript.cfg");
@@ -462,7 +462,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
if (f.exists() && f.open(IO_ReadOnly))
{
QTextStream t(&f);
- QString line, name, val;
+ TQString line, name, val;
int p(-1);
while (!t.eof())
{
@@ -488,14 +488,14 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQString& dirname, const TQMap<TQString,TQString>& options)
{
// defines input and output file
- QString fname = TQFileInfo(templatefile).fileName();
+ TQString fname = TQFileInfo(templatefile).fileName();
fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1(""));
QFile fin(templatefile);
QFile fout(dirname + "/" + fname);
if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly))
{
QTextStream tin(&fin), tout(&fout);
- QString line, name;
+ TQString line, name;
int p(-1);
while (!tin.eof())
{
@@ -525,7 +525,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;
+ TQString spooldir;
PrintcapEntry *ent = findPrintcapEntry(printer->printerName());
if (!ent)
return false;
@@ -541,7 +541,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
options["PS_SEND_EOF"] = "NO";
if (!checkGsDriver(options["GSDEVICE"]))
return false;
- QString resol(options["RESOLUTION"]), color(options["COLOR"]);
+ TQString 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");
@@ -565,7 +565,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry)
{
KURL dev(printer->device());
- QString prot = dev.protocol(), sd(entry->arg("sd"));
+ TQString prot = dev.protocol(), sd(entry->arg("sd"));
entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
if (prot == "smb" || prot == "ncp" || prot == "socket")
{
@@ -619,7 +619,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;
- QString sd = entry->arg("sd");
+ TQString sd = entry->arg("sd");
if (!TDEStandardDirs::exists(sd))
{
if (!TDEStandardDirs::makeDir(sd,0750))
@@ -641,7 +641,7 @@ bool KMLpdManager::validateDbDriver(KMDBEntry *entry)
TQString ptPrinterType(KMPrinter *p)
{
- QString type, prot = p->device().protocol();
+ TQString type, prot = p->device().protocol();
if (prot == "lpd") type = "REMOTE";
else if (prot == "smb") type = "SMB";
else if (prot == "ncp") type = "NCP";
diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp
index 54f19c405..4d45a9760 100644
--- a/tdeprint/lpd/lpdtools.cpp
+++ b/tdeprint/lpd/lpdtools.cpp
@@ -88,8 +88,8 @@ bool PrintcapEntry::readLine(const TQString& line)
{
int p = l[i].find('=');
if (p == -1) p = 2;
- QString key = l[i].left(p);
- QString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
+ TQString key = l[i].left(p);
+ TQString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
m_args[key] = value;
}
return true;
@@ -114,7 +114,7 @@ void PrintcapEntry::writeEntry(TQTextStream& t)
TQString PrintcapEntry::comment(int index)
{
- QString w;
+ TQString w;
if (m_comment.startsWith("##PRINTTOOL3##"))
{
int p(0);
@@ -166,7 +166,7 @@ TQStringList splitPrinttoolLine(const TQString& line)
bool PrinttoolEntry::readEntry(TQTextStream& t)
{
- QString line;
+ TQString line;
QStringList args;
m_resolutions.setAutoDelete(true);
@@ -264,7 +264,7 @@ DrMain* PrinttoolEntry::createDriver()
ch->set("text",TQString::fromLatin1("%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();
+ TQString defval = lopt->choices()->first()->name();
lopt->set("default",defval);
lopt->setValueText(defval);
}
@@ -290,7 +290,7 @@ DrMain* PrinttoolEntry::createDriver()
ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
lopt->addChoice(ch);
}
- QString defval = lopt->choices()->first()->name();
+ TQString defval = lopt->choices()->first()->name();
lopt->set("default",defval);
lopt->setValueText(defval);
}
@@ -394,7 +394,7 @@ DrMain* PrinttoolEntry::createDriver()
TQString getPrintcapLine(TQTextStream& t, TQString *lastcomment)
{
- QString line, buffer, comm;
+ TQString line, buffer, comm;
while (!t.eof())
{
buffer = t.readLine().stripWhiteSpace();
diff --git a/tdeprint/lpd/lpdtools.h b/tdeprint/lpd/lpdtools.h
index 692dd0fa2..ef28ff089 100644
--- a/tdeprint/lpd/lpdtools.h
+++ b/tdeprint/lpd/lpdtools.h
@@ -38,8 +38,8 @@ public:
TQString arg(const TQString& key) const { return m_args[key]; }
TQString comment(int i);
private:
- QString m_name;
- QString m_comment;
+ TQString m_name;
+ TQString m_comment;
TQMap<TQString,TQString> m_args;
};
@@ -48,13 +48,13 @@ private:
struct Resolution
{
int xdpi, ydpi;
- QString comment;
+ TQString comment;
};
struct BitsPerPixel
{
- QString bpp;
- QString comment;
+ TQString bpp;
+ TQString comment;
};
class PrinttoolEntry
@@ -64,7 +64,7 @@ public:
bool readEntry(TQTextStream& t);
DrMain* createDriver();
private:
- QString m_name, m_gsdriver, m_description, m_about;
+ TQString m_name, m_gsdriver, m_description, m_about;
TQPtrList<Resolution> m_resolutions;
TQPtrList<BitsPerPixel> m_depths;
};
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index e628a1c41..fe6a6aa7b 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -47,7 +47,7 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
// look for executable, starting with "lpr"
TQString KLpdUnixPrinterImpl::executable()
{
- QString exe = TDEStandardDirs::findExe("lpr");
+ TQString exe = TDEStandardDirs::findExe("lpr");
if (exe.isEmpty())
exe = TDEStandardDirs::findExe("lp");
return exe;
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 4dbe5e378..03a75001a 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -42,7 +42,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
return false;
cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
- QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
+ TQString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
if (!opts.isEmpty())
cmd += (" " + opts);
return true;
@@ -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()));
+ TQString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
KPrinterImpl::broadcastOption("PageSize",pagename);
}
}
diff --git a/tdeprint/lpr/klprprinterimpl.h b/tdeprint/lpr/klprprinterimpl.h
index 508173f1d..3d3e9a080 100644
--- a/tdeprint/lpr/klprprinterimpl.h
+++ b/tdeprint/lpr/klprprinterimpl.h
@@ -32,7 +32,7 @@ public:
void broadcastOption(const TQString& key, const TQString& value);
private:
- QString m_exepath;
+ TQString m_exepath;
};
#endif
diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h
index 590eafdff..2545993fc 100644
--- a/tdeprint/lpr/lprsettings.h
+++ b/tdeprint/lpr/lprsettings.h
@@ -58,9 +58,9 @@ protected:
private:
static LprSettings* m_self;
Mode m_mode;
- QString m_printcapfile;
+ TQString m_printcapfile;
bool m_local;
- QString m_spooldir;
+ TQString m_spooldir;
TQString m_defaultremotehost;
};
diff --git a/tdeprint/management/jobitem.h b/tdeprint/management/jobitem.h
index 580a1b84f..66beeb7d2 100644
--- a/tdeprint/management/jobitem.h
+++ b/tdeprint/management/jobitem.h
@@ -40,7 +40,7 @@ public:
private:
KMJob *m_job;
int m_ID;
- QString m_uri;
+ TQString m_uri;
};
inline int JobItem::jobID() const
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index da1cad014..533ff80f4 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -45,9 +45,9 @@ protected:
void setPagePixmap(const TQString& s) { m_pixmap = s; }
protected:
- QString m_name;
- QString m_header;
- QString m_pixmap;
+ TQString m_name;
+ TQString m_header;
+ TQString m_pixmap;
};
#endif
diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h
index 888ae9ad9..ba56cabb1 100644
--- a/tdeprint/management/kmiconview.h
+++ b/tdeprint/management/kmiconview.h
@@ -40,7 +40,7 @@ protected:
private:
int m_mode;
- QString m_pixmap;
+ TQString m_pixmap;
char m_state;
bool m_isclass;
};
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index bae2b6ad6..8b4683a20 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -125,7 +125,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
m_uri->setText(p->uri().prettyURL());
if (p->isClass(false))
{
- QString s;
+ TQString s;
for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it)
s.append(KURL(*it).prettyURL() + ", ");
s.truncate(s.length()-2);
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 806cc0d9f..046112502 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -81,7 +81,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
int st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0));
update = (oldstate != m_state);
- QString name = (p->isVirtual() ? p->instanceName() : p->name());
+ TQString name = (p->isVirtual() ? p->instanceName() : p->name());
if (name != text(0))
setText(0, name);
setPixmap(0, SmallIcon(p->pixmap(), 0, st));
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index d311f75c3..ddd0ff631 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -85,7 +85,7 @@ void KMPrinterView::setViewType(ViewType t)
default:
break;
}
- QString oldcurrent = m_current;
+ TQString oldcurrent = m_current;
if ( m_listset )
setPrinterList(KMManager::self()->printerList(false));
if (m_type == KMPrinterView::Tree)
diff --git a/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h
index e9ce4aa9f..b73bc46da 100644
--- a/tdeprint/management/kmprinterview.h
+++ b/tdeprint/management/kmprinterview.h
@@ -55,7 +55,7 @@ private:
KMIconView *m_iconview;
KMListView *m_listview;
ViewType m_type;
- QString m_current;
+ TQString m_current;
bool m_listset;
};
diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h
index 6e7a78d8d..3c8d0050d 100644
--- a/tdeprint/management/kmpropwidget.h
+++ b/tdeprint/management/kmpropwidget.h
@@ -53,9 +53,9 @@ protected:
virtual void configureWizard(KMWizard*);
protected:
- QString m_pixmap;
- QString m_title;
- QString m_header;
+ TQString m_pixmap;
+ TQString m_title;
+ TQString m_header;
KMPrinter *m_printer;
bool m_canchange;
};
diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h
index e7568c847..f2a2565d6 100644
--- a/tdeprint/management/kmwizardpage.h
+++ b/tdeprint/management/kmwizardpage.h
@@ -43,7 +43,7 @@ public:
bool needsInitOnBack() { return m_needsinitonback; }
protected:
- QString m_title;
+ TQString m_title;
int m_ID;
int m_nextpage;
bool m_needsinitonback;
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index 3c4794ad1..be14d0aa5 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -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));
+ TQString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
p->setDevice(dev);
}
diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp
index e8378371a..88f8fb416 100644
--- a/tdeprint/management/kmwname.cpp
+++ b/tdeprint/management/kmwname.cpp
@@ -50,7 +50,7 @@ bool KMWName::isValid(TQString& msg)
}
else if (text(0).find(TQRegExp("\\s")) != -1)
{
- QString conv = text(0);
+ TQString conv = text(0);
conv.replace(TQRegExp("\\s"), "");
int result = KMessageBox::warningYesNoCancel(this,
i18n("It is usually not a good idea to include spaces "
diff --git a/tdeprint/management/kmwsocketutil.h b/tdeprint/management/kmwsocketutil.h
index 643ff67d5..a0194e5c9 100644
--- a/tdeprint/management/kmwsocketutil.h
+++ b/tdeprint/management/kmwsocketutil.h
@@ -26,8 +26,8 @@
struct SocketInfo
{
- QString IP;
- QString Name;
+ TQString IP;
+ TQString Name;
int Port;
};
diff --git a/tdeprint/ppdparser.y b/tdeprint/ppdparser.y
index f750d9316..99677e65f 100644
--- a/tdeprint/ppdparser.y
+++ b/tdeprint/ppdparser.y
@@ -74,7 +74,7 @@ imgarea: IMGAREA OPTION ':' QUOTED { builder->putImageableArea
| IMGAREA OPTION '/' TRANSLATION ':' QUOTED { builder->putImageableArea($2[0], $6[0]); }
;
-openui: OPENUI OPTION ':' string { builder->openUi($2[0], QString::null, $4[0]); }
+openui: OPENUI OPTION ':' string { builder->openUi($2[0], TQString::null, $4[0]); }
| OPENUI OPTION '/' TRANSLATION ':' string { builder->openUi($2[0], $4[0], $6[0]); }
;
@@ -82,7 +82,7 @@ endui: CLOSEUI ':' string { builder->endUi($3[0]); }
| CLOSEUI string { builder->endUi($2[0]); }
;
-opengroup: OPENGROUP ':' string { builder->openGroup($3.join(" "), QString::null); }
+opengroup: OPENGROUP ':' string { builder->openGroup($3.join(" "), TQString::null); }
| OPENGROUP ':' string '/' TRANSLATION { builder->openGroup($3.join(" "), $5[0]); }
;
@@ -91,15 +91,15 @@ endgroup: CLOSEGROUP ':' string { builder->endGroup($3.join("
;
constraint: CONSTRAINT ':' KEYWORD OPTION KEYWORD OPTION { builder->putConstraint($3[0], $5[0], $4[0], $6[0]); }
- | CONSTRAINT ':' KEYWORD OPTION KEYWORD { builder->putConstraint($3[0], $5[0], $4[0], QString::null); }
- | CONSTRAINT ':' KEYWORD KEYWORD OPTION { builder->putConstraint($3[0], $4[0], QString::null, $5[0]); }
- | CONSTRAINT ':' KEYWORD KEYWORD { builder->putConstraint($3[0], $4[0], QString::null, QString::null); }
+ | CONSTRAINT ':' KEYWORD OPTION KEYWORD { builder->putConstraint($3[0], $5[0], $4[0], TQString::null); }
+ | CONSTRAINT ':' KEYWORD KEYWORD OPTION { builder->putConstraint($3[0], $4[0], TQString::null, $5[0]); }
+ | CONSTRAINT ':' KEYWORD KEYWORD { builder->putConstraint($3[0], $4[0], TQString::null, TQString::null); }
;
ppdelement: KEYWORD ':' value { builder->putStatement2($1[0], $3[0]); }
- | KEYWORD OPTION ':' value { builder->putStatement($1[0], $2[0], QString::null, $4); }
+ | KEYWORD OPTION ':' value { builder->putStatement($1[0], $2[0], TQString::null, $4); }
| KEYWORD OPTION '/' TRANSLATION ':' value { builder->putStatement($1[0], $2[0], $4[0], $6); }
- | KEYWORD OPTION '/' ':' value { builder->putStatement($1[0], $2[0], QString::null, $4); }
+ | KEYWORD OPTION '/' ':' value { builder->putStatement($1[0], $2[0], TQString::null, $4); }
| DEFAULT ':' string { builder->putDefault($1[0], $3[0]); }
| DEFAULT ':' string '/' TRANSLATION { builder->putDefault($1[0], $3[0]); }
| openui
diff --git a/tdeprint/ppdscanner.l b/tdeprint/ppdscanner.l
index 168e3a535..361f94317 100644
--- a/tdeprint/ppdscanner.l
+++ b/tdeprint/ppdscanner.l
@@ -25,7 +25,7 @@
#define yylval tdeprint_ppdlval
-QIODevice *tdeprint_ppdscanner_device = NULL;
+TQIODevice *tdeprint_ppdscanner_device = NULL;
#define YY_INPUT(buf,result,max_size) \
{ \
if (tdeprint_ppdscanner_device) \
@@ -122,7 +122,7 @@ L [[:alnum:]]
%%
-void tdeprint_ppdscanner_init(QIODevice *d)
+void tdeprint_ppdscanner_init(TQIODevice *d)
{
tdeprint_ppdscanner_device = d;
tdeprint_ppdscanner_lno = 1;
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 4ef5ebe1e..09653930c 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -44,10 +44,10 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
if (!rpr)
return false;
- QString host(rpr->option("host")), queue(rpr->option("queue"));
+ TQString host(rpr->option("host")), queue(rpr->option("queue"));
if (!host.isEmpty() && !queue.isEmpty())
{
- QString exestr = TDEStandardDirs::findExe("rlpr");
+ TQString exestr = TDEStandardDirs::findExe("rlpr");
if (exestr.isEmpty())
{
printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr"));
@@ -59,7 +59,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
// proxy settings
TDEConfig *conf = KMFactory::self()->printConfig();
conf->setGroup("RLPR");
- QString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
+ TQString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
if (!host.isEmpty())
{
cmd.append(" -X ").append(quote(host));
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index a1985e804..36cc935ec 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -74,7 +74,7 @@ bool KdeprintChecker::check(const TQStringList& uris)
bool KdeprintChecker::checkURL(const KURL& url)
{
- QString prot(url.protocol());
+ TQString prot(url.protocol());
if (prot == "config")
return checkConfig(url);
else if (prot == "exec")
@@ -89,7 +89,7 @@ bool KdeprintChecker::checkURL(const KURL& url)
bool KdeprintChecker::checkConfig(const KURL& url)
{
// get the config filename (may contain a path)
- QString f(url.path().mid(1));
+ TQString f(url.path().mid(1));
bool state(false);
// first check for standard KDE config file
@@ -116,13 +116,13 @@ bool KdeprintChecker::checkConfig(const KURL& url)
bool KdeprintChecker::checkExec(const KURL& url)
{
- QString execname(url.path().mid(1));
+ TQString execname(url.path().mid(1));
return !(TDEStandardDirs::findExe(execname).isEmpty());
}
bool KdeprintChecker::checkService(const KURL& url)
{
- QString serv(url.path().mid(1));
+ TQString serv(url.path().mid(1));
KExtendedSocket sock;
bool ok;
diff --git a/tdeprint/tests/richpage.cpp b/tdeprint/tests/richpage.cpp
index f12040b71..4abc71ea2 100644
--- a/tdeprint/tests/richpage.cpp
+++ b/tdeprint/tests/richpage.cpp
@@ -57,7 +57,7 @@ RichPage::~RichPage()
void RichPage::setOptions(const TQMap<TQString,TQString>& opts)
{
- QString value;
+ TQString value;
value = opts["app-rich-margin"];
if (!value.isEmpty())