summaryrefslogtreecommitdiffstats
path: root/tdeprint/cups
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint/cups')
-rw-r--r--tdeprint/cups/cupsaddsmb2.cpp12
-rw-r--r--tdeprint/cups/cupsaddsmb2.h6
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.cpp12
-rw-r--r--tdeprint/cups/ipprequest.cpp4
-rw-r--r--tdeprint/cups/kcupsprinterimpl.cpp2
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp6
6 files changed, 21 insertions, 21 deletions
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);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 14:05:40 +0000