summaryrefslogtreecommitdiffstats
path: root/kopete/plugins/cryptography
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/plugins/cryptography')
-rw-r--r--kopete/plugins/cryptography/cryptographyguiclient.cpp4
-rw-r--r--kopete/plugins/cryptography/cryptographyplugin.cpp26
-rw-r--r--kopete/plugins/cryptography/cryptographyprefsbase.ui2
-rw-r--r--kopete/plugins/cryptography/cryptographyselectuserkey.cpp2
-rw-r--r--kopete/plugins/cryptography/cryptographyuserkey_ui.ui2
-rw-r--r--kopete/plugins/cryptography/kgpginterface.cpp4
-rw-r--r--kopete/plugins/cryptography/kgpgselkey.cpp8
-rw-r--r--kopete/plugins/cryptography/popuppublic.cpp12
8 files changed, 30 insertions, 30 deletions
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index 898e7f1a..11f30f48 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -48,8 +48,8 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent )
setInstance( KGenericFactory<CryptographyPlugin>::instance() );
- m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
- m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ;
+ m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::tqfromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
+ m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::tqfromLatin1("off") ) ;
setXMLFile("cryptographychatui.rc");
}
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 12533044..135cf636 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <stylesheet.h>
+#include <tqstylesheet.h>
#include <tqtimer.h>
#include <tqregexp.h>
@@ -45,7 +45,7 @@
//In Jabber, the JEP says it's not. so we don't use richtext in our message, but some client did.
//We limit the html to some basis tag to limit security problem (bad links)
// - Olivier
-const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
+const TQRegExp CryptographyPlugin::isHTML( TQString::tqfromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory;
static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" );
@@ -154,8 +154,8 @@ bool CryptographyPlugin::passphraseHandling()
void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
{
TQString body = msg.plainBody();
- if( !body.startsWith( TQString::fromLatin1("-----BEGIN PGP MESSAGE----") )
- || !body.contains( TQString::fromLatin1("-----END PGP MESSAGE----") ) )
+ if( !body.startsWith( TQString::tqfromLatin1("-----BEGIN PGP MESSAGE----") )
+ || !body.contains( TQString::tqfromLatin1("-----END PGP MESSAGE----") ) )
return;
if( msg.direction() != Kopete::Message::Inbound )
@@ -179,16 +179,16 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
plainBody = TQStyleSheet::escape( plainBody );
//this is the same algoritm as in Kopete::Message::escapedBody();
- plainBody.replace( TQString::fromLatin1( "\n" ), TQString::fromLatin1( "<br/>" ) )
- .replace( TQString::fromLatin1( "\t" ), TQString::fromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
- .replace( TQRegExp( TQString::fromLatin1( "\\s\\s" ) ), TQString::fromLatin1( "&nbsp; " ) );
+ plainBody.replace( TQString::tqfromLatin1( "\n" ), TQString::tqfromLatin1( "<br/>" ) )
+ .replace( TQString::tqfromLatin1( "\t" ), TQString::tqfromLatin1( "&nbsp;&nbsp;&nbsp;&nbsp;" ) )
+ .replace( TQRegExp( TQString::tqfromLatin1( "\\s\\s" ) ), TQString::tqfromLatin1( "&nbsp; " ) );
}
- msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+ msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+ i18n("Outgoing Encrypted Message: ")
- + TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+ + TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+ plainBody
- + TQString::fromLatin1(" </td></tr></table>")
+ + TQString::tqfromLatin1(" </td></tr></table>")
, Kopete::Message::RichText );
}
@@ -215,11 +215,11 @@ void CryptographyPlugin::slotIncomingMessage( Kopete::Message& msg )
body = Kopete::Message::escape( body );
}
- msg.setBody( TQString::fromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+ msg.setBody( TQString::tqfromLatin1("<table width=\"100%\" border=0 cellspacing=0 cellpadding=0><tr><td class=\"highlight\"><font size=\"-1\"><b>")
+ i18n("Incoming Encrypted Message: ")
- + TQString::fromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+ + TQString::tqfromLatin1("</b></font></td></tr><tr><td class=\"highlight\">")
+ body
- + TQString::fromLatin1(" </td></tr></table>")
+ + TQString::tqfromLatin1(" </td></tr></table>")
, Kopete::Message::RichText );
}
diff --git a/kopete/plugins/cryptography/cryptographyprefsbase.ui b/kopete/plugins/cryptography/cryptographyprefsbase.ui
index 2a6ec002..00a7b4c0 100644
--- a/kopete/plugins/cryptography/cryptographyprefsbase.ui
+++ b/kopete/plugins/cryptography/cryptographyprefsbase.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>50</height>
diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
index ae92647b..9d692e08 100644
--- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
+++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp
@@ -35,7 +35,7 @@ CryptographySelectUserKey::CryptographySelectUserKey(const TQString& key ,Kopete
connect (view->m_selectKey , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotSelectPressed()));
connect (view->m_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotRemovePressed()));
- view->m_titleLabel->setText(i18n("Select public key for %1").arg(mc->displayName()));
+ view->m_titleLabel->setText(i18n("Select public key for %1").tqarg(mc->displayName()));
view->m_editKey->setText(key);
}
CryptographySelectUserKey::~CryptographySelectUserKey()
diff --git a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
index 8a5b1379..fb71e0a1 100644
--- a/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
+++ b/kopete/plugins/cryptography/cryptographyuserkey_ui.ui
@@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kopete/plugins/cryptography/kgpginterface.cpp b/kopete/plugins/cryptography/kgpginterface.cpp
index 73858012..fb407523 100644
--- a/kopete/plugins/cryptography/kgpginterface.cpp
+++ b/kopete/plugins/cryptography/kgpginterface.cpp
@@ -96,9 +96,9 @@ TQString KgpgInterface::KgpgDecryptText(TQString text,TQString userID)
/// pipe for passphrase
//userID=TQString::fromUtf8(userID);
userID.replace('<',"&lt;");
- TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").arg(userID);
+ TQString passdlg=i18n("Enter passphrase for <b>%1</b>:").tqarg(userID);
if (counter>1)
- passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").arg(TQString::number(4-counter)));
+ passdlg.prepend(i18n("<b>Bad passphrase</b><br> You have %1 tries left.<br>").tqarg(TQString::number(4-counter)));
/// pipe for passphrase
int code=KPasswordDialog::getPassword(password,passdlg);
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 865584a1..e095c0e8 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <sys/wait.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <klistview.h>
@@ -122,7 +122,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
tst=tst.section(":",9,9);
// FIXME: Same here: don't use popen! - Martijn
- fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).arg( KShellProcess::quote( id ) ).latin1(), "r" );
+ fp2 = popen( TQString( "gpg --no-tty --with-colon --list-key %1" ).tqarg( KShellProcess::quote( id ) ).latin1(), "r" );
bool dead=true;
while ( fgets( line, sizeof(line), fp2))
{
@@ -147,7 +147,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
if (!tst.isEmpty() && (!dead))
{
KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst));
- KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val));
+ KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").tqarg(id).tqarg(tr).tqarg(val));
sub->setSelectable(false);
item->setPixmap(0,keyPair);
}
@@ -163,7 +163,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
keysListpr->setSelected(keysListpr->firstChild(),true);
page->show();
- resize(this->minimumSize());
+ resize(this->tqminimumSize());
setMainWidget(page);
}
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index c7b33b33..5e990386 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -18,7 +18,7 @@
***************************************************************************/
//////////////////////////////////////////////////////// code for choosing a public key from a list for encryption
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqptrlist.h>
#include <tqwhatsthis.h>
@@ -73,14 +73,14 @@ def=isDefault;
}
-void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment)
+void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment)
{
if ((def) && (column<2)) {
TQFont font(p->font());
font.setBold(true);
p->setFont(font);
}
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ KListViewItem::paintCell(p, cg, column, width, tqalignment);
}
TQString UpdateViewItem2 :: key(int c,bool ) const
@@ -108,7 +108,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
- if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile));
+ if (filemode) setCaption(i18n("Select Public Key for %1").tqarg(sfile));
fmode=filemode;
TQHButtonGroup *hBar=new TQHButtonGroup(page);
@@ -174,7 +174,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
(CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible"));
TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>");
- KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").arg(shredWhatsThis),parentBox );
+ KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox );
shredBox->addWidget(CBshred);
shredBox->addWidget(warn);
}
@@ -452,7 +452,7 @@ void popupPublic::slotprocread(KProcIO *p)
bool isDefaultKey=false;
if (id.right(8)==defaultKey) isDefaultKey=true;
UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey);
- //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
+ //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").tqarg(id).tqarg(tr).tqarg(val));
//sub->setSelectable(false);
if (seclist.find(tst,0,FALSE)!=-1)
item->setPixmap(0,keyPair);