diff options
Diffstat (limited to 'tdeprint')
44 files changed, 136 insertions, 136 deletions
diff --git a/tdeprint/ChangeLog b/tdeprint/ChangeLog index 5ce11bd36..cc18bd7eb 100644 --- a/tdeprint/ChangeLog +++ b/tdeprint/ChangeLog @@ -108,7 +108,7 @@ Since 2.2 release, Michael Goffioul <tdeprint@swing.be> * tdeprintfax: added possibility to view files being faxed and file action (remove and view) are enabled only when needed. * KPrinter: when printing to a file, support encoding and spaces - in file names + system --> KProcess. + in file names + system --> TDEProcess. 07/11/2001 Michael Goffioul <tdeprint@swing.be> * tdeprint: fixed some problems: diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index f0cb1c359..f0057235e 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -47,9 +47,9 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceived(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); @@ -145,7 +145,7 @@ void CupsAddSmb::slotActionClicked() m_proc.kill(); } -void CupsAddSmb::slotReceived(KProcess*, char *buf, int buflen) +void CupsAddSmb::slotReceived(TDEProcess*, char *buf, int buflen) { TQString line; int index(0); @@ -309,7 +309,7 @@ void CupsAddSmb::doNextAction() } } -void CupsAddSmb::slotProcessExited(KProcess*) +void CupsAddSmb::slotProcessExited(TDEProcess*) { kdDebug(500) << "PROCESS EXITED (" << m_state << ")" << endl; if (m_proc.normalExit() && m_state != Start && m_status) @@ -470,7 +470,7 @@ bool CupsAddSmb::startProcess() m_actionindex = 0; m_buffer.clear(); kdDebug(500) << "PROCESS STARTED = " << m_proc.args()[0] << endl; - return m_proc.start(KProcess::NotifyOnExit, KProcess::All); + return m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); } #include "cupsaddsmb2.moc" diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h index 84166f53c..9aeccdd4a 100644 --- a/tdeprint/cups/cupsaddsmb2.h +++ b/tdeprint/cups/cupsaddsmb2.h @@ -44,9 +44,9 @@ public: static bool exportDest(const TQString& dest, const TQString& datadir); protected slots: - void slotReceived(KProcess*, char*, int); + void slotReceived(TDEProcess*, char*, int); void doNextAction(); - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); void slotActionClicked(); protected: @@ -58,7 +58,7 @@ protected: void showError(const TQString& msg); private: - KProcess m_proc; + TDEProcess m_proc; TQStringList m_buffer; int m_state; TQStringList m_actions; diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index bc91f9ffe..5e6d4659d 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -113,8 +113,8 @@ const char* getPassword(const char*) CupsdDialog::CupsdDialog(TQWidget *parent, const char *name) : KDialogBase(IconList, "", Ok|Cancel|User1, Ok, parent, name, true, true, KGuiItem(i18n("Short Help"), "help")) { - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("cupsdconf"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("cupsdconf"); setShowIconsInTreeList(true); setRootIsDecorated(false); @@ -136,7 +136,7 @@ CupsdDialog::~CupsdDialog() void CupsdDialog::addConfPage(CupsdPage *page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pixmap(), KIcon::NoGroup, KIcon::SizeMedium @@ -207,9 +207,9 @@ bool CupsdDialog::restartServer(TQString& msg) else { bool success = false; - KProcess proc; + TDEProcess proc; proc << "tdesu" << "-c" << "/etc/init.d/cupsys restart"; - success = proc.start( KProcess::Block ) && proc.normalExit(); + success = proc.start( TDEProcess::Block ) && proc.normalExit(); if( !success ) msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid); } @@ -256,7 +256,7 @@ bool CupsdDialog::configure(const TQString& filename, TQWidget *parent, TQString } else { - KGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" + TDEGlobal::locale()->insertCatalogue("cupsdconf"); // Must be before dialog is created to translate "Short Help" CupsdDialog dlg(parent); if (dlg.setConfigFile(fn) && dlg.exec()) { diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp index 0fde06159..4edaefb58 100644 --- a/tdeprint/cups/ipprequest.cpp +++ b/tdeprint/cups/ipprequest.cpp @@ -208,8 +208,8 @@ void IppRequest::init() request_ = 0; } request_ = ippNew(); - //kdDebug(500) << "tdeprint: IPP request, lang=" << KGlobal::locale()->language() << endl; - TQCString langstr = KGlobal::locale()->language().latin1(); + //kdDebug(500) << "tdeprint: IPP request, lang=" << TDEGlobal::locale()->language() << endl; + TQCString langstr = TDEGlobal::locale()->language().latin1(); cups_lang_t* lang = cupsLangGet(langstr.data()); // default charset to UTF-8 (ugly hack) lang->encoding = CUPS_UTF8; diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp index 5c2de105b..5c2245e8d 100644 --- a/tdeprint/cups/kcupsprinterimpl.cpp +++ b/tdeprint/cups/kcupsprinterimpl.cpp @@ -155,5 +155,5 @@ static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd } } if (!optstr.isEmpty()) - cmd.append(" -o ").append( KProcess::quote( optstr ) ); + cmd.append(" -o ").append( TDEProcess::quote( optstr ) ); } diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index 66acb8daf..e5630652e 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -638,11 +638,11 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t cups -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index 6a4de31eb..19e8401d8 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -77,9 +77,9 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool) } QString cmd = "foomatic-combo-xml -p "; - cmd += KProcess::quote(printer->option("printer")); + cmd += TDEProcess::quote(printer->option("printer")); cmd += " -d "; - cmd += KProcess::quote(printer->option("driver")); + cmd += TDEProcess::quote(printer->option("driver")); KPipeProcess proc(cmd); QDomDocument doc; doc.setContent(&proc); diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 8daa2fe20..661d97764 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -113,8 +113,8 @@ KMFactory::KMFactory() if ( !ok ) settings.writeEntry( "/qt/embedFonts", true ); - KGlobal::iconLoader()->addAppDir("tdeprint"); - KGlobal::locale()->insertCatalogue("tdeprint"); + TDEGlobal::iconLoader()->addAppDir("tdeprint"); + TDEGlobal::locale()->insertCatalogue("tdeprint"); // create DCOP signal connection connectDCOPSignal(0, 0, "pluginChanged(pid_t)", "slot_pluginChanged(pid_t)", false); diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index d26515a16..84e120e77 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -47,7 +47,7 @@ bool KMSpecialManager::savePrinters() if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); - if (confname.startsWith(KGlobal::dirs()->localtdedir())) + if (confname.startsWith(TDEGlobal::dirs()->localtdedir())) { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " @@ -107,8 +107,8 @@ bool KMSpecialManager::loadPrinters() if (m_loaded) return true; bool result(true); - TQString localDir = KGlobal::dirs()->localtdedir(); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); + TQString localDir = TDEGlobal::dirs()->localtdedir(); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/specials.desktop"); // local files should processed last, so we need to reorder the list // and put local files at the end TQStringList orderedFiles; diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index b64ce075e..ea1ec61e3 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -440,7 +440,7 @@ void KPGeneralPage::initialize() for ( int i=HIGHSIZE_BEGIN+1; i<DEFAULT_SIZE; i+=2 ) m_pagesize->insertItem(i18n(default_size[i])); // set default page size using locale settings - TQString psname = pageSizeToPageName((KPrinter::PageSize)(KGlobal::locale()->pageSize())); + TQString psname = pageSizeToPageName((KPrinter::PageSize)(TDEGlobal::locale()->pageSize())); int index = findOption(default_size, DEFAULT_SIZE, psname); if (index >= 0) m_pagesize->setCurrentItem(index); diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 554679ee7..ab70211c8 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -62,7 +62,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) // first retrieve the Qt values for page size and margins TQPrinter prt(TQPrinter::PrinterResolution); prt.setFullPage(true); - prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? KGlobal::locale()->pageSize() : ps.toInt())); + prt.setPageSize((TQPrinter::PageSize)(ps.isEmpty() ? TDEGlobal::locale()->pageSize() : ps.toInt())); TQPaintDeviceMetrics metrics(&prt); float w = metrics.width(); float h = metrics.height(); diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 3a0982661..11b5a6574 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -203,7 +203,7 @@ void KPQtPage::init() for (int i=0; i<KPrinter::NPageSize-1; i++) m_pagesize->insertItem(i18n(page_sizes[i].text)); // default page size to locale settings - m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(KGlobal::locale()->pageSize()))); + m_pagesize->setCurrentItem(findIndex((KPrinter::PageSize)(TDEGlobal::locale()->pageSize()))); } else { diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 1e0e141a9..5e77f890a 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -439,7 +439,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) } else { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); expandDialog(!config->readBoolEntry("DialogReduced", (KMFactory::self()->settings()->application != KPrinter::StandAlone))); } @@ -447,7 +447,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) KPrintDialog::~KPrintDialog() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("KPrinter Settings"); config->writeEntry("DialogReduced", d->m_reduced); diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 86ef04f66..e62bf635b 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -174,7 +174,7 @@ void KPrinter::loadSettings() setSearchName(option("kde-searchname")); d->m_options.remove("kde-searchname"); - KConfig *conf = KGlobal::config(), *pconf = KMFactory::self()->printConfig(); + KConfig *conf = TDEGlobal::config(), *pconf = KMFactory::self()->printConfig(); conf->setGroup("KPrinter Settings"); pconf->setGroup("General"); @@ -199,7 +199,7 @@ void KPrinter::saveSettings() } // save latest used printer to config file - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("Printer",searchName()); // latest used print command @@ -850,7 +850,7 @@ void KPrinter::setFromTo(int m, int M) // if no page size defined, use the localized one KPrinter::PageSize KPrinter::pageSize() const -{ return (option("kde-pagesize").isEmpty() ? (PageSize)KGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } +{ return (option("kde-pagesize").isEmpty() ? (PageSize)TDEGlobal::locale()->pageSize() : (PageSize)option("kde-pagesize").toInt()); } KPrinter::PageSetType KPrinter::pageSet() const { return (option("kde-pageset").isEmpty() ? AllPages : (PageSetType)(option("kde-pageset").toInt())); } diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 171daf45d..9c62d25f8 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -158,9 +158,9 @@ bool KPrinterImpl::printFiles(KPrinter *p, const TQStringList& f, bool flag) } else { - KProcess proc; + TDEProcess proc; proc << (flag?"mv":"cp") << f[0] << p->outputFileName(); - if (!proc.start(KProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) + if (!proc.start(TDEProcess::Block) || !proc.normalExit() || proc.exitStatus() != 0) { p->setErrorMessage(i18n("Cannot save print file to %1. Check that you have write access to it.").arg(p->outputFileName())); return false; @@ -573,7 +573,7 @@ bool KPrinterImpl::setupSpecialCommand(TQString& cmd, KPrinter *p, const TQStrin } TQString KPrinterImpl::quote(const TQString& s) -{ return KProcess::quote(s); } +{ return TDEProcess::quote(s); } void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) { @@ -583,7 +583,7 @@ void KPrinterImpl::saveOptions(const TQMap<TQString,TQString>& opts) void KPrinterImpl::loadAppOptions() { - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); TQStringList opts = conf->readListEntry("ApplicationOptions"); for (uint i=0; i<opts.count(); i+=2) @@ -598,7 +598,7 @@ void KPrinterImpl::saveAppOptions() if (it.key().startsWith("app-")) optlist << it.key() << it.data(); - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("ApplicationOptions", optlist); } diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 32381af28..bd812b939 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -42,10 +42,10 @@ #include <kmimetype.h> KPreviewProc::KPreviewProc() -: KProcess() +: TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); + connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -63,7 +63,7 @@ bool KPreviewProc::startPreview() return false; } -void KPreviewProc::slotProcessExited(KProcess* proc) +void KPreviewProc::slotProcessExited(TDEProcess* proc) { kapp->exit_loop(); if ( proc->normalExit() && proc->exitStatus() == 0 ) diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h index 5fd581fe7..ae99fb405 100644 --- a/tdeprint/kprintpreview.h +++ b/tdeprint/kprintpreview.h @@ -47,7 +47,7 @@ private: KPrintPreviewPrivate *d; }; -class KPreviewProc : public KProcess +class KPreviewProc : public TDEProcess { Q_OBJECT public: @@ -57,7 +57,7 @@ public: bool startPreview(); protected slots: - void slotProcessExited(KProcess*); + void slotProcessExited(TDEProcess*); private: bool m_bOk; }; diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index fb1df2840..fbee05a0c 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotExited( KProcess* ) ) ); + connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } @@ -53,7 +53,7 @@ bool KPrintProcess::print() return start(NotifyOnExit,All); } -void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) +void KPrintProcess::slotReceivedStderr(TDEProcess *proc, char *buf, int len) { if (proc == this) { @@ -62,7 +62,7 @@ void KPrintProcess::slotReceivedStderr(KProcess *proc, char *buf, int len) } } -void KPrintProcess::slotExited( KProcess* ) +void KPrintProcess::slotExited( TDEProcess* ) { switch ( m_state ) { diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h index 976b35afe..5ceb3835e 100644 --- a/tdeprint/kprintprocess.h +++ b/tdeprint/kprintprocess.h @@ -50,8 +50,8 @@ signals: void printError( KPrintProcess*, const TQString& ); protected slots: - void slotReceivedStderr(KProcess*, char*, int); - void slotExited( KProcess* ); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotExited( TDEProcess* ); private: QString m_buffer; diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 212b53fb5..f2dcb99ce 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -393,7 +393,7 @@ TQString KXmlCommand::buildCommand(const TQMap<TQString,TQString>& opts, bool pi } else { - format.replace( re, KProcess::quote( dopt->valueText() ) ); + format.replace( re, TDEProcess::quote( dopt->valueText() ) ); } str.append(format).append(" "); } @@ -624,7 +624,7 @@ TQStringList KXmlCommandManager::commandList() { if (d->m_cmdlist.isEmpty()) { - TQStringList dirs = KGlobal::dirs()->findDirs("data", "tdeprint/filters/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeprint/filters/"); for (TQStringList::ConstIterator it=dirs.begin(); it!=dirs.end(); ++it) { diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index fcb79a052..a38aa4e26 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -185,9 +185,9 @@ bool KMLpdManager::createPrinter(KMPrinter *printer) // 4) change permissions of spool directory TQCString cmd = "chmod -R o-rwx,g+rwX "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); cmd += "&& chown -R lp.lp "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); if (system(cmd.data()) != 0) { setErrorMsg(i18n("Unable to set correct permissions on spool directory %1 for printer <b>%2</b>.").arg(ent->arg("sd")).arg(ent->m_name)); @@ -209,7 +209,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer) return false; } TQCString cmd = "rm -rf "; - cmd += TQFile::encodeName(KProcess::quote(ent->arg("sd"))); + cmd += TQFile::encodeName(TDEProcess::quote(ent->arg("sd"))); system(cmd.data()); delete ent; return true; @@ -225,7 +225,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) cmd += " "; cmd += state ? "up" : "down"; cmd += " "; - cmd += KProcess::quote(printer->printerName()); + cmd += TDEProcess::quote(printer->printerName()); if (proc.open(cmd)) { QTextStream t(&proc); @@ -549,9 +549,9 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) return false; // write various driver files using templates TQCString cmd = "cp "; - cmd += TQFile::encodeName(KProcess::quote(driverDirectory()+"/master-filter")); + cmd += TQFile::encodeName(TDEProcess::quote(driverDirectory()+"/master-filter")); cmd += " "; - cmd += TQFile::encodeName(KProcess::quote(spooldir + "/filter")); + cmd += TQFile::encodeName(TDEProcess::quote(spooldir + "/filter")); if (system(cmd.data()) == 0 && savePrinttoolCfgFile(driverDirectory()+"/general.cfg.in",spooldir,options) && savePrinttoolCfgFile(driverDirectory()+"/postscript.cfg.in",spooldir,options) && diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.h b/tdeprint/lpdunix/klpdunixprinterimpl.h index bbbda4104..c4a1ac671 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.h +++ b/tdeprint/lpdunix/klpdunixprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KLpdUnixPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 54f987c58..7ea114382 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -137,7 +137,7 @@ void KMLprManager::initHandlers() insertHandler(new LPRngToolHandler(this)); // now load external handlers - TQStringList l = KGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); + TQStringList l = TDEGlobal::dirs()->findAllResources("data", "tdeprint/lpr/*.la"); for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) { KLibrary *library = KLibLoader::self()->library(TQFile::encodeName(*it)); @@ -405,7 +405,7 @@ bool KMLprManager::removePrinter(KMPrinter *prt) { // printcap file saved, entry can be deleted now delete entry; - status = (::system(TQFile::encodeName("rm -rf " + KProcess::quote(sd))) == 0); + status = (::system(TQFile::encodeName("rm -rf " + TDEProcess::quote(sd))) == 0); if (!status) setErrorMsg(i18n("Unable to remove spool directory %1. " "Check that you have write permissions " diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 05d09c40a..2723eb842 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -235,7 +235,7 @@ bool LpcHelper::changeState(const TQString& printer, const TQString& op, TQStrin msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + " " + op + " " + KProcess::quote(printer)); + TQString result = execute(m_exepath + " " + op + " " + TDEProcess::quote(printer)); int status; switch (LprSettings::self()->mode()) @@ -273,7 +273,7 @@ bool LpcHelper::removeJob(KMJob *job, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lprm"); return false; } - TQString result = execute(m_lprmpath + " -P " + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_lprmpath + " -P " + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); if (result.find("dequeued") != -1) return true; else if (result.find("Permission denied") != -1 || result.find("no permissions") != -1) @@ -291,7 +291,7 @@ bool LpcHelper::changeJobState(KMJob *job, int state, TQString& msg) msg = i18n("The executable %1 couldn't be found in your PATH.").arg("lpc"); return false; } - TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + KProcess::quote(job->printer()) + " " + TQString::number(job->id())); + TQString result = execute(m_exepath + (state == KMJob::Held ? " hold " : " release ") + TDEProcess::quote(job->printer()) + " " + TQString::number(job->id())); TQString answer = lprngAnswer(result, job->printer()); if (answer == "no") { diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 30348f591..52a8d06c5 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -83,7 +83,7 @@ KMJob* LpqHelper::parseLineLPRng(const TQString& line) void LpqHelper::listJobs(TQPtrList<KMJob>& jobs, const TQString& prname, int limit) { KPipeProcess proc; - if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + KProcess::quote(prname))) + if (!m_exepath.isEmpty() && proc.open(m_exepath + " -P " + TDEProcess::quote(prname))) { TQTextStream t(&proc); TQString line; diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 49c33822d..4cabeae98 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -225,7 +225,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool) // changing printer name), the template would be also removed TQString origfilename = maticFile(entry); TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); - ::system(TQFile::encodeName("cp " + KProcess::quote(origfilename) + " " + KProcess::quote(filename))); + ::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename))); DrMain *driver = Foomatic2Loader::loadDriver(filename); if (driver) { @@ -258,11 +258,11 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) KPipeProcess in; TQFile out(tmpFile); - TQString cmd = KProcess::quote(exe); + TQString cmd = TDEProcess::quote(exe); cmd += " -t lpd -d "; - cmd += KProcess::quote(comps[2]); + cmd += TDEProcess::quote(comps[2]); cmd += " -p "; - cmd += KProcess::quote(comps[1]); + cmd += TDEProcess::quote(comps[1]); if (in.open(cmd) && out.open(IO_WriteOnly)) { TQTextStream tin(&in), tout(&out); @@ -329,7 +329,7 @@ bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMai inFile.close(); tmpFile.close(); - TQString cmd = "mv " + KProcess::quote(tmpFile.name()) + " " + KProcess::quote(outFile); + TQString cmd = "mv " + TDEProcess::quote(tmpFile.name()) + " " + TDEProcess::quote(outFile); int status = ::system(TQFile::encodeName(cmd).data()); TQFile::remove(tmpFile.name()); result = (status != -1 && WEXITSTATUS(status) == 0); diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 2bfebcfa4..b60be8510 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -19,7 +19,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) "0.1"); TDECmdLineArgs::addCmdLineOptions(options); - KGlobal::locale()->setMainCatalogue("tdelibs"); + TDEGlobal::locale()->setMainCatalogue("tdelibs"); TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tdeprint/management/kmconfigdialog.cpp b/tdeprint/management/kmconfigdialog.cpp index d26b2082d..cd823d540 100644 --- a/tdeprint/management/kmconfigdialog.cpp +++ b/tdeprint/management/kmconfigdialog.cpp @@ -60,7 +60,7 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) { if (page) { - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( page->pagePixmap(), KIcon::NoGroup, KIcon::SizeMedium diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 0e72906d7..9c315402f 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); + connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -95,7 +95,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena msg = i18n("The executable %1 could not be found in your " "PATH. Check that this program exists and is " "accessible in your PATH variable.").arg(exestr); - else if (!m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + else if (!m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) msg = i18n("Unable to start the creation of the driver " "database. The execution of %1 failed.").arg(exestr); if (!msg.isEmpty()) @@ -124,7 +124,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena return started; } -void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) +void KMDBCreator::slotReceivedStdout(TDEProcess*, char *buf, int len) { // save buffer TQString str( TQCString(buf, len) ); @@ -151,12 +151,12 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) } } -void KMDBCreator::slotReceivedStderr(KProcess*, char*, int) +void KMDBCreator::slotReceivedStderr(TDEProcess*, char*, int) { // just discard it for the moment } -void KMDBCreator::slotProcessExited(KProcess*) +void KMDBCreator::slotProcessExited(TDEProcess*) { // delete the progress dialog if (m_dlg) diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 319d270c0..4b1983ae6 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -40,16 +40,16 @@ public: bool status() const { return m_status; } protected slots: - void slotReceivedStdout(KProcess *p, char *bufm, int len); - void slotReceivedStderr(KProcess *p, char *bufm, int len); - void slotProcessExited(KProcess *p); + void slotReceivedStdout(TDEProcess *p, char *bufm, int len); + void slotReceivedStderr(TDEProcess *p, char *bufm, int len); + void slotProcessExited(TDEProcess *p); void slotCancelled(); signals: void dbCreated(); private: - KProcess m_proc; + TDEProcess m_proc; TQProgressDialog *m_dlg; bool m_status; bool m_firstflag; diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index c2bc28b20..22b9ac8e9 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -233,7 +233,7 @@ void KMMainView::initActions() KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); mact->setDelayed(false); connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); - TQStringList files = KGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); + TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); @@ -698,9 +698,9 @@ void KMMainView::slotServerConfigure() void KMMainView::slotServerConfigureAccess() { - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/system-config-printer-kde"; - proc->start(KProcess::DontCare); + proc->start(TDEProcess::DontCare); } void KMMainView::slotToggleToolBar(bool on) diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index e0526ad5a..5586f110f 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -57,7 +57,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) ctn->setWidget(w); connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), KIcon::NoGroup, KIcon::SizeMedium diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index fde3a3451..c5b40f942 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -49,11 +49,11 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_state = Idle; m_current = 0; - m_proc = new KProcess(); + m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); + connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); } @@ -91,7 +91,7 @@ void SmbView::startProcess(int state) m_buffer = TQString::null; m_state = state; TQApplication::setOverrideCursor(KCursor::waitCursor()); - m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout); + m_proc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout); emit running(true); } @@ -118,12 +118,12 @@ void SmbView::endProcess() m_proc->clearArguments(); } -void SmbView::slotProcessExited(KProcess*) +void SmbView::slotProcessExited(TDEProcess*) { endProcess(); } -void SmbView::slotReceivedStdout(KProcess*, char *buf, int len) +void SmbView::slotReceivedStdout(TDEProcess*, char *buf, int len) { m_buffer.append(TQString::fromLocal8Bit(buf,len)); } @@ -178,7 +178,7 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { // opening group m_current = item; *m_proc << "nmblookup"+m_wins_server+"-M "; - *m_proc << KProcess::quote(item->text(0)); + *m_proc << TDEProcess::quote(item->text(0)); *m_proc << " -S"; startProcess(ServerListing); } @@ -194,14 +194,14 @@ void SmbView::setOpen(TQListViewItem *item, bool on) { *m_proc << "smbclient -N -L "; } - *m_proc << KProcess::quote (item->text (0)); + *m_proc << TDEProcess::quote (item->text (0)); *m_proc << " -W "; - *m_proc << KProcess::quote (item->parent ()-> + *m_proc << TDEProcess::quote (item->parent ()-> text (0)); if (!krb5ccname) { *m_proc << " -A "; - *m_proc << KProcess:: + *m_proc << TDEProcess:: quote (m_passwdFile->name ()); } startProcess(ShareListing); diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index aea1d920d..9b571f4dd 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -22,7 +22,7 @@ #include <klistview.h> -class KProcess; +class TDEProcess; class KTempFile; class SmbView : public KListView @@ -49,15 +49,15 @@ protected: void processShares(); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotSelectionChanged(TQListViewItem*); private: enum State { GroupListing, ServerListing, ShareListing, Idle }; int m_state; TQListViewItem *m_current; - KProcess *m_proc; + TDEProcess *m_proc; TQString m_buffer; TQString m_login, m_password; KTempFile *m_passwdFile; diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index 141cadc56..3a809e06b 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -206,7 +206,7 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU if ( allowMetricUnit ) { - int mode = (KGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); + int mode = (TDEGlobal::locale()->measureSystem() == KLocale::Metric ? 2 : 1); m_top->setMode(mode); m_bottom->setMode(mode); m_left->setMode(mode); diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 241c53dbf..b76c0181a 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -53,9 +53,9 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { - m_process = new KProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( KProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ), TQT_SLOT( slotProcessExited( KProcess* ) ) ); + m_process = new TDEProcess; + connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -93,7 +93,7 @@ void PosterPreview::updatePoster() m_process->clearArguments(); *m_process << "poster" << "-F" << "-m" + m_mediasize << "-p" + m_postersize << "-c" + TQString::number( m_cutmargin ) + "%"; - if ( !m_process->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) + if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { m_rows = m_cols = 0; m_dirty = false; @@ -140,11 +140,11 @@ void PosterPreview::drawContents( TQPainter *painter ) for ( int j=0; j<m_cols; j++, x+=m_pw ) { bool selected = ( m_selectedpages.find( i*m_cols+j+1 ) != m_selectedpages.end() ); - p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? KGlobalSettings::highlightColor() : white ) ); + p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? TDEGlobalSettings::highlightColor() : white ) ); p->drawRect( x, y, m_pw, m_ph ); if ( pw > 0 && ph > 0 ) p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ), - ( selected ? TQColor(KGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); + ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); p->setPen( Qt::DotLine ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); p->setPen( Qt::SolidLine ); @@ -206,12 +206,12 @@ void PosterPreview::mousePressEvent( TQMouseEvent *e ) } } -void PosterPreview::slotProcessStderr( KProcess*, char *buf, int len ) +void PosterPreview::slotProcessStderr( TDEProcess*, char *buf, int len ) { m_buffer.append( TQCString( buf, len ) ); } -void PosterPreview::slotProcessExited( KProcess* ) +void PosterPreview::slotProcessExited( TDEProcess* ) { if ( m_process->normalExit() && m_process->exitStatus() == 0 ) parseBuffer(); diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h index d0c362a04..d9a23cb59 100644 --- a/tdeprint/posterpreview.h +++ b/tdeprint/posterpreview.h @@ -23,7 +23,7 @@ #include <tqframe.h> #include <tqvaluelist.h> -class KProcess; +class TDEProcess; class PosterPreview : public TQFrame { @@ -55,15 +55,15 @@ protected: void emitSelectedPages(); protected slots: - void slotProcessStderr( KProcess*, char*, int ); - void slotProcessExited( KProcess* ); + void slotProcessStderr( TDEProcess*, char*, int ); + void slotProcessExited( TDEProcess* ); private: int m_rows, m_cols; int m_pw, m_ph; // page size int m_mw, m_mh; // cur margins TQRect m_posterbb; // poster bounding box (without any margin) - KProcess *m_process; + TDEProcess *m_process; TQString m_buffer; TQString m_postersize, m_mediasize; int m_cutmargin; diff --git a/tdeprint/printerfilter.cpp b/tdeprint/printerfilter.cpp index e0161a50a..7e46139ef 100644 --- a/tdeprint/printerfilter.cpp +++ b/tdeprint/printerfilter.cpp @@ -44,7 +44,7 @@ void PrinterFilter::update() m_printers = conf->readListEntry("Printers"); // filter enable state is saved on a per application basis, // so this option is retrieve from the application config file - conf = KGlobal::config(); + conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); m_enabled = conf->readBoolEntry("FilterEnabled", false); } @@ -52,7 +52,7 @@ void PrinterFilter::update() void PrinterFilter::setEnabled(bool on) { m_enabled = on; - KConfig *conf = KGlobal::config(); + KConfig *conf = TDEGlobal::config(); conf->setGroup("KPrinter Settings"); conf->writeEntry("FilterEnabled", m_enabled); } diff --git a/tdeprint/rlpr/krlprprinterimpl.h b/tdeprint/rlpr/krlprprinterimpl.h index 7af98df0c..741a1a3c8 100644 --- a/tdeprint/rlpr/krlprprinterimpl.h +++ b/tdeprint/rlpr/krlprprinterimpl.h @@ -22,7 +22,7 @@ #include "kprinterimpl.h" -class KProcess; +class TDEProcess; class KRlprPrinterImpl : public KPrinterImpl { diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 86c8375cb..7777e19ce 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -124,12 +124,12 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla if ( !url.isLocalFile() ) { TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); - command.replace( re, KProcess::quote( tmpFilename ) ); + command.replace( re, TDEProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); } else - command.replace( re, KProcess::quote( re.cap( 1 ) ) ); + command.replace( re, TDEProcess::quote( re.cap( 1 ) ) ); } if ( checkFiles( command, files ) ) @@ -181,7 +181,7 @@ bool KDEPrintd::checkFiles(TQString& cmd, const TQStringList& files) i18n("Provide root's Password"), "provideRootsPassword") == KMessageBox::Continue) { - cmd = ("tdesu -c " + KProcess::quote(cmd)); + cmd = ("tdesu -c " + TDEProcess::quote(cmd)); break; } else diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h index 51cd09877..4ef54b894 100644 --- a/tdeprint/tdeprintd.h +++ b/tdeprint/tdeprintd.h @@ -28,7 +28,7 @@ #include <tqintdict.h> class KPrintProcess; -class KProcess; +class TDEProcess; class StatusWindow; class KDEPrintd : public KDEDModule diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index e4bc1e6f2..d9a1e2a72 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(slotProcessExited(KProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("exec")); @@ -196,7 +196,7 @@ void EscpWidget::startCommand(const TQString& arg) m_hasoutput = ( arg == "-i" || arg == "-d" ); for ( TQValueList<TQCString>::ConstIterator it=m_proc.args().begin(); it!=m_proc.args().end(); ++it ) kdDebug() << "ARG: " << *it << endl; - if (m_proc.start(KProcess::NotifyOnExit, KProcess::AllOutput)) + if (m_proc.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) setEnabled(false); else { @@ -206,7 +206,7 @@ void EscpWidget::startCommand(const TQString& arg) } } -void EscpWidget::slotProcessExited(KProcess*) +void EscpWidget::slotProcessExited(TDEProcess*) { setEnabled(true); if (!m_proc.normalExit() || m_proc.exitStatus() != 0) @@ -229,13 +229,13 @@ void EscpWidget::slotProcessExited(KProcess*) m_hasoutput = false; } -void EscpWidget::slotReceivedStdout(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStdout(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_outbuffer.append(bufstr); } -void EscpWidget::slotReceivedStderr(KProcess*, char *buf, int len) +void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) { TQString bufstr = TQCString(buf, len); m_errorbuffer.append(bufstr); diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h index 7e3ba55e8..4ad284d00 100644 --- a/tdeprint/tools/escputil/escpwidget.h +++ b/tdeprint/tools/escputil/escpwidget.h @@ -37,16 +37,16 @@ public: void setPrinterName(const TQString&); protected slots: - void slotReceivedStdout(KProcess*, char*, int); - void slotReceivedStderr(KProcess*, char*, int); - void slotProcessExited(KProcess*); + void slotReceivedStdout(TDEProcess*, char*, int); + void slotReceivedStderr(TDEProcess*, char*, int); + void slotProcessExited(TDEProcess*); void slotButtonClicked(); protected: void startCommand(const TQString& arg); private: - KProcess m_proc; + TDEProcess m_proc; KURL m_deviceURL; TQString m_errorbuffer, m_outbuffer; TQLabel *m_printer, *m_device; |