diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:26:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:26:01 -0600 |
| commit | 7251ddd58d498d631dc56bc00849f61cb4acdabd (patch) | |
| tree | 135cf378aaee8e8f2eeff5ae5c6732ed465e5b5a /src/utils.cpp | |
| parent | e6af9bb1ecd39082b6abc1f559d4e3e735259bde (diff) | |
| download | kvpnc-7251ddd58d498d631dc56bc00849f61cb4acdabd.tar.gz kvpnc-7251ddd58d498d631dc56bc00849f61cb4acdabd.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/utils.cpp')
| -rw-r--r-- | src/utils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/utils.cpp b/src/utils.cpp index b457bd3..a5d1c46 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -290,7 +290,7 @@ bool Utils::unloadKernelModule( TQString Name, TQApplication *app , bool force) bool Utils::doChmod( TQString file, TQString mode ) { config->appendLogEntry ( i18n( "\"%1\" begin." ).arg("chmod"),config->info ); - KProcess *chmodProcess = new KProcess; + TDEProcess *chmodProcess = new TDEProcess; *chmodProcess << "/bin/chmod"; *chmodProcess << mode; *chmodProcess << file; @@ -1107,7 +1107,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib) if ( pathToPkcs11Tool.isEmpty() ) return SmartcardSlots; - GetSmartcardSlotsProcess = new KProcess; + GetSmartcardSlotsProcess = new TDEProcess; *GetSmartcardSlotsProcess << pathToPkcs11Tool; if (!ProviderLib.isEmpty()) @@ -1117,11 +1117,11 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib) } *GetSmartcardSlotsProcess << "-L" ; - connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); + connect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); - if ( !GetSmartcardSlotsProcess->start ( KProcess::NotifyOnExit, KProcess::All ) ) + if ( !GetSmartcardSlotsProcess->start ( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { - disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); + disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); delete GetSmartcardSlotsProcess; GetSmartcardCertsFromSlotProcess=0L; config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error); @@ -1137,7 +1137,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib) usleep ( 500 ); config->appPointer->processEvents(); } - disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( KProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); + disconnect( GetSmartcardSlotsProcess, TQT_SIGNAL( receivedStdout ( TDEProcess *, char *, int)), this, TQT_SLOT(readOutGetSmartcardSlots())); delete GetSmartcardSlotsProcess; GetSmartcardCertsFromSlotProcess=0L; if (config->KvpncDebugLevel > 5) @@ -1661,7 +1661,7 @@ void Utils::readOutGetEmailAddressOfCert() } } -void Utils::readOutGetSmartcardSlots(KProcess * proc, char * buffer, int buflen) +void Utils::readOutGetSmartcardSlots(TDEProcess * proc, char * buffer, int buflen) { TQString msg_raw = TQString::fromLatin1(buffer, buflen); if (config->KvpncDebugLevel > 5) |