diff options
Diffstat (limited to 'libkgpgfile/kgpgfile.cpp')
-rw-r--r-- | libkgpgfile/kgpgfile.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp index 5dc3b69..56f3dd5 100644 --- a/libkgpgfile/kgpgfile.cpp +++ b/libkgpgfile/kgpgfile.cpp @@ -85,7 +85,7 @@ KGPGFile::~KGPGFile() void KGPGFile::init(void) { setFlags(IO_Sequential); - seStatus(IO_Ok); + setStatus(IO_Ok); setState(0); } @@ -151,19 +151,19 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) TQStringList args; if(cmdArgs.isEmpty()) { - args << "--homedir" << TQString("\"%1\"").tqarg(m_homedir) + args << "--homedir" << TQString("\"%1\"").arg(m_homedir) << "-q" << "--batch"; if(isWritable()) { args << "-ea" << "-z" << "6" - << "--comment" << TQString("\"%1\"").tqarg(m_comment) + << "--comment" << TQString("\"%1\"").arg(m_comment) << "--trust-model=always" - << "-o" << TQString("\"%1\"").tqarg(m_fn); + << "-o" << TQString("\"%1\"").arg(m_fn); TQValueList<TQCString>::Iterator it; for(it = m_recipient.begin(); it != m_recipient.end(); ++it) - args << "-r" << TQString("\"%1\"").tqarg(TQString(*it)); + args << "-r" << TQString("\"%1\"").arg(TQString(*it)); // some versions of GPG had trouble to replace a file // so we delete it first @@ -174,7 +174,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) args << "--passphrase-fd" << "0"; else args << "--use-agent"; - args << "--no-default-recipient" << TQString("\"%1\"").tqarg(m_fn); + args << "--no-default-recipient" << TQString("\"%1\"").arg(m_fn); } } else { args = TQStringList::split(" ", cmdArgs); @@ -218,7 +218,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd) } setState( IO_Open ); - tqat( 0 ); + at( 0 ); // qDebug("File open"); return true; } @@ -444,7 +444,7 @@ void KGPGFile::slotGPGExited(KProcess* ) if(m_process->normalExit()) { m_exitStatus = m_process->exitStatus(); if(m_exitStatus != 0) - seStatus(IO_UnspecifiedError); + setStatus(IO_UnspecifiedError); } else { m_exitStatus = -1; } @@ -542,7 +542,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern) KGPGFile file; TQString args("--list-keys --with-colons"); if(!pattern.isEmpty()) - args += TQString(" %1").tqarg(pattern); + args += TQString(" %1").arg(pattern); file.open(IO_ReadOnly, args, true); while((len = file.readBlock(buffer, sizeof(buffer)-1)) != EOF) { buffer[len] = 0; @@ -569,13 +569,13 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern) TQDate expiration = TQDate::fromString(fields[6], Qt::ISODate); if(expiration > TQDate::currentDate()) { currentKey = fields[4]; - val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]); + val = TQString("%1:%2").arg(currentKey).arg(fields[9]); map[val] = val; } else { qDebug("'%s' is expired", fields[9].data()); } } else if(fields[0] == "uid") { - val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]); + val = TQString("%1:%2").arg(currentKey).arg(fields[9]); map[val] = val; } } @@ -614,9 +614,9 @@ void KGPGFile::secretKeyList(TQStringList& list) TQStringList fields = TQStringList::split(":", (*it), true); if(fields[0] == "sec") { currentKey = fields[4]; - list << TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]); + list << TQString("%1:%2").arg(currentKey).arg(fields[9]); } else if(fields[0] == "uid") { - list << TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]); + list << TQString("%1:%2").arg(currentKey).arg(fields[9]); } } } |