From 7dbaf66b3a0daef4d15c891735fff4b51a17e3bf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:25:05 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/magiclabel.cpp | 10 +++++----- src/magiclabel.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/magiclabel.cpp b/src/magiclabel.cpp index 57d50c7..3f603af 100644 --- a/src/magiclabel.cpp +++ b/src/magiclabel.cpp @@ -67,24 +67,24 @@ void MagicLabel::getCommandOutput() for (int i = 0; i < parts.count(); i++) *proc << parts[i]; - connect(proc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(processExited(KProcess*))); - connect(proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(receivedStdout(KProcess*, char*, int))); + connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited(TDEProcess*))); + connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); mValue = ""; - if (!proc->start(KProcess::Block, KProcess::Stdout)) + if (!proc->start(TDEProcess::Block, TDEProcess::Stdout)) KMessageBox::information(0, TQString("Could not start process: %1").arg(cmd)); } -void MagicLabel::receivedStdout(KProcess *proc, char *buffer, int buflen) +void MagicLabel::receivedStdout(TDEProcess *proc, char *buffer, int buflen) { TQString buf = TQString::fromLatin1(buffer, buflen); mValue += buf.replace("\n", ""); } -void MagicLabel::processExited(KProcess* proc) +void MagicLabel::processExited(TDEProcess* proc) { delete proc; } diff --git a/src/magiclabel.h b/src/magiclabel.h index 5ce87a1..8f26d42 100644 --- a/src/magiclabel.h +++ b/src/magiclabel.h @@ -33,8 +33,8 @@ class MagicLabel : TQObject void getCommandOutput(); private slots: - void processExited(KProcess* proc); - void receivedStdout(KProcess *proc, char *buffer, int buflen); + void processExited(TDEProcess* proc); + void receivedStdout(TDEProcess *proc, char *buffer, int buflen); public: MagicLabel(TQString s, bool translate); -- cgit v1.2.1