diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdeprint/management/kmdbcreator.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeprint/management/kmdbcreator.cpp')
| -rw-r--r-- | tdeprint/management/kmdbcreator.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 0e72906d7..6154ebea2 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -24,8 +24,8 @@ #include <tqprogressdialog.h> #include <tqfileinfo.h> #include <tqdir.h> -#include <klocale.h> -#include <kapplication.h> +#include <tdelocale.h> +#include <tdeapplication.h> #include <kstandarddirs.h> #include <kdebug.h> @@ -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() @@ -91,11 +91,11 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena if (exestr.isEmpty()) msg = i18n("No executable defined for the creation of the " "driver database. This operation is not implemented."); - else if (KStandardDirs::findExe(exestr).isEmpty()) + else if (TDEStandardDirs::findExe(exestr).isEmpty()) 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) |