From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/crypto/certgen.ui | 66 +++++++++++++++++++++++----------------------- kcontrol/crypto/crypto.cpp | 42 ++++++++++++++--------------- 2 files changed, 54 insertions(+), 54 deletions(-) (limited to 'kcontrol/crypto') diff --git a/kcontrol/crypto/certgen.ui b/kcontrol/crypto/certgen.ui index 19ee05535..cbffdf872 100644 --- a/kcontrol/crypto/certgen.ui +++ b/kcontrol/crypto/certgen.ui @@ -4,7 +4,7 @@ D_GenCert - + 0 0 @@ -19,7 +19,7 @@ TextLabel2 - + 10 40 @@ -41,7 +41,7 @@ TextLabel3 - + 10 100 @@ -57,7 +57,7 @@ TextLabel4 - + 10 130 @@ -73,7 +73,7 @@ T_CertType - + 10 10 @@ -89,7 +89,7 @@ TextLabel2_2 - + 10 70 @@ -105,7 +105,7 @@ TextLabel5 - + 10 160 @@ -121,7 +121,7 @@ TextLabel6 - + 10 190 @@ -137,7 +137,7 @@ TextLabel7 - + 10 220 @@ -153,7 +153,7 @@ TextLabel8 - + 10 250 @@ -169,7 +169,7 @@ L_CertType - + 180 10 @@ -182,7 +182,7 @@ LineEdit3 - + 180 100 @@ -198,7 +198,7 @@ TextLabel9 - + 10 280 @@ -214,7 +214,7 @@ LineEdit4_2_2_2 - + 180 220 @@ -230,7 +230,7 @@ LineEdit4_2_2_2_2 - + 180 250 @@ -246,7 +246,7 @@ LineEdit4_2_2_2_3 - + 180 280 @@ -262,7 +262,7 @@ E_Passphrase - + 180 40 @@ -281,7 +281,7 @@ E_Passphrase_2 - + 180 70 @@ -300,7 +300,7 @@ TextLabel10 - + 10 310 @@ -316,7 +316,7 @@ SpinBox1 - + 180 310 @@ -338,7 +338,7 @@ TextLabel11 - + 320 40 @@ -354,7 +354,7 @@ CheckBox1 - + 320 10 @@ -373,7 +373,7 @@ TextLabel12 - + 320 70 @@ -389,7 +389,7 @@ LineEdit19 - + 380 70 @@ -402,7 +402,7 @@ LineEdit4_2_2 - + 180 190 @@ -418,7 +418,7 @@ LineEdit4_2 - + 180 160 @@ -434,7 +434,7 @@ ComboBox2 - + 380 40 @@ -447,7 +447,7 @@ CheckBox2 - + 320 100 @@ -463,7 +463,7 @@ TextLabel13 - + 320 130 @@ -479,7 +479,7 @@ ComboBox5 - + 400 130 @@ -492,7 +492,7 @@ LineEdit4 - + 180 130 @@ -508,6 +508,6 @@ kdialog.h - - + + diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index d39c09752..4194fdaec 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -128,7 +128,7 @@ OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQStr m_module = module; KSSLX509Map cert(sub); setText(0, cert.getValue("O")); - setText(1, cert.getValue("CN").replace("\n", ", ")); + setText(1, cert.getValue("CN").tqreplace("\n", ", ")); if (_exp.date().year() > 3000 || _exp.date().year() < 1900) _exp.setDate(TQDate(3000,1,1)); @@ -151,7 +151,7 @@ YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQSt { m_module = module; KSSLX509Map cert(name); - TQString tmp = cert.getValue("CN").replace("\n", ", "); + TQString tmp = cert.getValue("CN").tqreplace("\n", ", "); setText(0, tmp); setText(1, cert.getValue("Email")); _pkcs = pkcs; @@ -180,10 +180,10 @@ KSSLX509Map mcert(name); TQString tmp; setText(0, mcert.getValue("O")); tmp = mcert.getValue("OU"); - tmp.replace("\n", ", "); + tmp.tqreplace("\n", ", "); setText(1, tmp); tmp = mcert.getValue("CN"); - tmp.replace("\n", ", "); + tmp.tqreplace("\n", ", "); setText(2, tmp); _name = name; _cert = cert; @@ -269,7 +269,7 @@ TQString whatstr; grid->addWidget(mUseTLS, 0, 0); whatstr = i18n("TLS is the newest revision of the SSL protocol." " It integrates better with other protocols and has" - " replaced SSL in protocols such as POP3 and SMTP."); + " tqreplaced SSL in protocols such as POP3 and SMTP."); TQWhatsThis::add(mUseTLS, whatstr); mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL); @@ -842,7 +842,7 @@ TQString whatstr; tabs->addTab(tabSSLCOpts, i18n("Validation Options")); #endif - tabs->resize(tabs->sizeHint()); + tabs->resize(tabs->tqsizeHint()); load(); } @@ -1214,7 +1214,7 @@ void KCryptoConfig::save() pcerts->sync(); authcfg->sync(); - // insure proper permissions -- contains sensitive data + // insure proper permissions -- tqcontains sensitive data TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); @@ -1480,7 +1480,7 @@ TQString iss = TQString::null; TQPalette cspl; iss = cert->getIssuer(); cspl = validFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1488,7 +1488,7 @@ TQString iss = TQString::null; validFrom->setPalette(cspl); cspl = validUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1498,7 +1498,7 @@ TQString iss = TQString::null; validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) - : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); + : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; @@ -1587,7 +1587,7 @@ TryImportPassAgain: i; i = static_cast(i->nextSibling())) { if (i->configName() == name) { - rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to replace it?"), i18n("SSL"), i18n("Replace")); + rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to tqreplace it?"), i18n("SSL"), i18n("Replace")); if (rc == KMessageBox::Cancel) { delete cert; return; @@ -1718,7 +1718,7 @@ TQString iss; TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1726,7 +1726,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1758,7 +1758,7 @@ TQString iss; KSSLCertificate *cert = pkcs->getCertificate(); iss = cert->getIssuer(); cspl = yValidFrom->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1766,7 +1766,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1921,7 +1921,7 @@ void KCryptoConfig::slotCAImport() { if (certStore) { KOSSL::self()->X509_STORE_free(certStore); certStore = NULL; } - if (certtext.contains("-----BEGIN CERTIFICATE-----")) { + if (certtext.tqcontains("-----BEGIN CERTIFICATE-----")) { qf.reset(); certtext = TQString::null; while (!qf.atEnd()) { @@ -1929,10 +1929,10 @@ void KCryptoConfig::slotCAImport() { qf.readLine(xx, qf.size()); certtext += xx; } - certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null); - certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null); + certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString::null); + certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString::null); certtext = certtext.stripWhiteSpace(); - certtext = certtext.replace("\n", TQString::null); + certtext = certtext.tqreplace("\n", TQString::null); } else { // Must [could?] be DER qf.close(); @@ -2350,7 +2350,7 @@ SSL_CONST SSL_METHOD *meth; break; // Leak of sc*? TQString scn(sc->name); - if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { + if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { continue; } k = SSL_CIPHER_get_bits(sc, &j); @@ -2378,7 +2378,7 @@ SSL_CONST SSL_METHOD *meth; break; // Leak of sc*? TQString scn(sc->name); - if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { + if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { continue; } k = SSL_CIPHER_get_bits(sc, &j); -- cgit v1.2.1