First attempt at submitting a patch, so hopefully I'm doing this right.
svn patch attached.
ebn issue, so not sure what number if anything I should refer to.
currently is issue #6 on the ebn kopete list.
--
Samir
Index: plugins/cryptography/cryptographyguiclient.cpp
===================================================================
--- plugins/cryptography/cryptographyguiclient.cpp (revision 703598)
+++ plugins/cryptography/cryptographyguiclient.cpp (working copy)
@@ -129,7 +129,7 @@
// ask user if they want to use key found in
address book
if ( keys.count() == 1 ) {
- if ( KMessageBox::questionYesNo (
csn->view()->mainWidget(), i18n ( QString ("Cryptography plugin has found an
encryption key for " + mc->displayName() + " (" + addressee.assembledName() +
")" + " in your KDE address book. Do you want to use key " + keys.first().right
( 8 ).prepend ( "0x" ) + " as this contact's public key?").toLocal8Bit() ),
i18n ( "Public Key Found" ) ) == KMessageBox::Yes ) {
+ if ( KMessageBox::questionYesNo (
csn->view()->mainWidget(), i18n ( QString ("Cryptography plugin has found an
encryption key for " + mc->displayName() + " (" + addressee.assembledName() +
')' + " in your KDE address book. Do you want to use key " + keys.first().right
( 8 ).prepend ( "0x" ) + " as this contact's public key?").toLocal8Bit() ),
i18n ( "Public Key Found" ) ) == KMessageBox::Yes ) {
mc->setPluginData (
CryptographyPlugin::plugin(), "gpgKey", keys.first() );
}
}
@@ -143,7 +143,7 @@
dialog.setCaption ( i18n ("Public Keys
Found") );
dialog.setButtons ( KDialog::Ok |
KDialog::Cancel );
dialog.setMainWidget (&w);
- ui.label->setText ( i18n (
QString("Cryptography plugin has found multiple encryption keys for " +
mc->displayName() + " (" + addressee.assembledName() + ")" + " in your KDE
address book. To use one of these keys, select it and choose OK."
).toLocal8Bit() ) );
+ ui.label->setText ( i18n (
QString("Cryptography plugin has found multiple encryption keys for " +
mc->displayName() + " (" + addressee.assembledName() + ')' + " in your KDE
address book. To use one of these keys, select it and choose OK."
).toLocal8Bit() ) );
for (int i = 0; i < keys.count(); i++)
ui.keyList->addItem ( new
QListWidgetItem ( KIconLoader::global()->loadIconSet ("kgpg-key1-kopete",
K3Icon::Small), keys[i].right(8).prepend("0x"), ui.keyList) );
ui.keyList->addItems (keys);
Index: plugins/cryptography/cryptographyselectuserkey.cpp
===================================================================
--- plugins/cryptography/cryptographyselectuserkey.cpp (revision 703598)
+++ plugins/cryptography/cryptographyselectuserkey.cpp (working copy)
@@ -84,7 +84,7 @@
dialog.setCaption ( i18n ( "Public Keys Found" ) );
dialog.setButtons ( KDialog::Ok | KDialog::Cancel );
dialog.setMainWidget ( &w );
- ui.label->setText ( i18n ( QString ( "Cryptography
plugin has found multiple encryption keys for " + mc->displayName() + " (" +
addressee.assembledName() + ")" + " in your KDE address book. To use one of
these keys, select it and choose OK." ).toLocal8Bit() ) );
+ ui.label->setText ( i18n ( QString ( "Cryptography
plugin has found multiple encryption keys for " + mc->displayName() + " (" +
addressee.assembledName() + ')' + " in your KDE address book. To use one of
these keys, select it and choose OK." ).toLocal8Bit() ) );
for ( int i = 0; i < keys.count(); i++ )
ui.keyList->addItem ( new QListWidgetItem (
KIconLoader::global()->loadIconSet ("kgpg-key1-kopete", K3Icon::Small),
keys[i].right(8).prepend("0x"), ui.keyList) );
if ( dialog.exec() )
Index: plugins/cryptography/cryptographyplugin.cpp
===================================================================
--- plugins/cryptography/cryptographyplugin.cpp (revision 703598)
+++ plugins/cryptography/cryptographyplugin.cpp (working copy)
@@ -276,7 +276,7 @@
addressee.insertCustom ( "KADDRESSBOOK", "OPENPGPFP", key );
key = key.right ( 8 ).prepend ( "0x" );
- key = key + " " + mc->displayName() + " (" + addressee.assembledName()
+ ")";
+ key = key + ' ' + mc->displayName() + " (" + addressee.assembledName()
+ ')';
if ( KMessageBox::warningContinueCancel (
Kopete::UI::Global::mainWidget(), i18n ( QString ( "The key \"" + key + "\"
will be exported. If no address book has been linked to this meta-contact, one
will be created.").toAscii().constData() ), i18n ( "Export Public Key" ) ) ==
KMessageBox::Continue) {
Kopete::KABCPersistence::self()->addressBook()->insertAddressee
(addressee);
Kopete::KABCPersistence::self()->writeAddressBook(addressee.resource());
Index: plugins/cryptography/exportkeys.cpp
===================================================================
--- plugins/cryptography/exportkeys.cpp (revision 703598)
+++ plugins/cryptography/exportkeys.cpp (working copy)
@@ -60,7 +60,7 @@
addressee.insertCustom ("KADDRESSBOOK", "OPENPGPFP", key);
key = key.right(8).prepend("0x");
- key = key + " " + mc->displayName() + " (" +
addressee.assembledName() + ")";
+ key = key + ' ' + mc->displayName() + " (" +
addressee.assembledName() + ')';
QListWidgetItem * tmpItem = new QListWidgetItem (
KIconLoader::global()->loadIconSet ("kgpg-export-kgpg", K3Icon::Small), key,
mUi->keyList);
tmpItem->setFlags (Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
tmpItem->setCheckState (Qt::Checked);
Index: protocols/yahoo/libkyahoo/logintask.cpp
===================================================================
--- protocols/yahoo/libkyahoo/logintask.cpp (revision 703598)
+++ protocols/yahoo/libkyahoo/logintask.cpp (working copy)
@@ -257,16 +257,16 @@
{
QString cookie;
cookie = t->nthParam( 59, i );
- if( cookie.startsWith( "Y" ) )
+ if( cookie.startsWith( 'Y' ) )
{
m_yCookie = getcookie( cookie.toLatin1() );
m_loginCookie = getlcookie( cookie.toLatin1() );
}
- else if( cookie.startsWith( "T" ) )
+ else if( cookie.startsWith( 'T' ) )
{
m_tCookie = getcookie( cookie.toLatin1() );
}
- else if( cookie.startsWith( "C" ) )
+ else if( cookie.startsWith( 'C' ) )
{
m_cCookie = getcookie( cookie.toLatin1() );
}
Index: protocols/yahoo/libkyahoo/messagereceivertask.cpp
===================================================================
--- protocols/yahoo/libkyahoo/messagereceivertask.cpp (revision 703598)
+++ protocols/yahoo/libkyahoo/messagereceivertask.cpp (working copy)
@@ -98,7 +98,7 @@
continue;
}
- if( utf8.startsWith( "1" ) )
+ if( utf8.startsWith( '1' ) )
msg = QString::fromUtf8( msg.toLatin1() );
if( t->service() == Yahoo::ServiceSysMessage )
@@ -129,7 +129,7 @@
;
else if( type.startsWith( "WEBCAMINVITE" ) )
{
- if( ind.startsWith(" ") )
+ if( ind.startsWith(' ') )
{
kDebug(YAHOO_RAW_DEBUG) << "Got a WebcamInvitation.";
emit gotWebcamInvite( from );
Index: protocols/oscar/liboscar/userdetails.cpp
===================================================================
--- protocols/oscar/liboscar/userdetails.cpp (revision 703598)
+++ protocols/oscar/liboscar/userdetails.cpp (working copy)
@@ -430,7 +430,7 @@
ver = mirandaVersionToString( mver );
if ( isUnicode )
ver += " Unicode";
- ver += " (ICQ v" + mirandaVersionToString( iver ) + ")";
+ ver += " (ICQ v" + mirandaVersionToString( iver ) + ')';
}
return ver;
}
@@ -473,14 +473,14 @@
else
{
m_clientName = QString::fromLatin1( "Miranda IM" );
- m_clientName += " " + getMirandaVersion(
m_dcLastExtInfoUpdateTime, 0, false );
+ m_clientName += ' ' + getMirandaVersion(
m_dcLastExtInfoUpdateTime, 0, false );
}
}
else if ( m_dcLastInfoUpdateTime == 0x7FFFFFFF )
{
// Miranda with unicode core
m_clientName = QString::fromLatin1( "Miranda IM" );
- m_clientName += " " + getMirandaVersion(
m_dcLastExtInfoUpdateTime, 0, true );
+ m_clientName += ' ' + getMirandaVersion(
m_dcLastExtInfoUpdateTime, 0, true );
}
else if ( m_dcLastInfoUpdateTime & 0xFF7F0000 == 0x7D000000 )
{
@@ -527,14 +527,14 @@
// this is R&Q (Rapid Edition)
m_clientName = QString::fromLatin1( "R&Q" );
m_clientVersion.sprintf( "%u", m_dcLastExtInfoUpdateTime );
- m_clientName += " " + m_clientVersion;
+ m_clientName += ' ' + m_clientVersion;
}
// parse capabilities
if ( hasCap( CAP_KOPETE ) )
{
m_clientName = i18n( "Kopete" );
m_clientVersion.sprintf( "%d.%d.%d", m_identCap.data().at(12),
m_identCap.data().at(13), m_identCap.data().at(14) * 100 +
m_identCap.data().at(15) );
- m_clientName += " " + m_clientVersion;
+ m_clientName += ' ' + m_clientVersion;
return;
}
if ( hasCap ( CAP_MIRANDA ) )
@@ -542,7 +542,7 @@
m_clientName = QString::fromLatin1( "Miranda IM" );
Oscar::DWORD iver = m_identCap.data().at(12) << 0x18 |
m_identCap.data().at(13) << 0x10 | m_identCap.data().at(14) << 0x08 |
m_identCap.data().at(15);
Oscar::DWORD mver = m_identCap.data().at(8) << 0x18 |
m_identCap.data().at(9) << 0x10 | m_identCap.data().at(10) << 0x08 |
m_identCap.data().at(11);
- m_clientName += " " + getMirandaVersion( iver, mver,
m_dcLastInfoUpdateTime == 0x7FFFFFFF );
+ m_clientName += ' ' + getMirandaVersion( iver, mver,
m_dcLastInfoUpdateTime == 0x7FFFFFFF );
return;
}
if ( hasCap( CAP_QIP ) )
@@ -557,7 +557,7 @@
{
build.sprintf( "(%d%d%d%d)", m_dcLastInfoUpdateTime >>
0x18, (m_dcLastInfoUpdateTime >> 0x10) & 0xFF, (m_dcLastInfoUpdateTime >> 0x08)
& 0xFF, m_dcLastInfoUpdateTime & 0xFF );
}
- m_clientName += " " + m_clientVersion + " " + build;
+ m_clientName += ' ' + m_clientVersion + ' ' + build;
return;
}
if ( hasCap( CAP_QIPINFIUM ) )
@@ -591,7 +591,7 @@
if ( hasCap( CAP_JIMM ) )
{
m_clientName = QString::fromLatin1( "Jimm" );
- m_clientName += " " + getVersionFromCap( m_identCap, 5 );
+ m_clientName += ' ' + getVersionFromCap( m_identCap, 5 );
return;
}
if ( hasCap( CAP_SIMNEW ) )
@@ -603,7 +603,7 @@
else if ( m_identCap.data().at(15) & 0x40 )
m_clientVersion += QString::fromLatin1( " (MacOS X)" );
// Linux version? Fix last number
- m_clientName += " " + m_clientVersion;
+ m_clientName += ' ' + m_clientVersion;
return;
}
if ( hasCap( CAP_SIMOLD ) )
@@ -629,21 +629,21 @@
m_clientVersion.sprintf( "%d.%d.%d", m_identCap.data().at(12),
m_identCap.data().at(13) % 100, m_identCap.data().at(14) );
if ( m_identCap.data().at(15) )
m_clientVersion += " SSL";
- m_clientName += " " + m_clientVersion;
+ m_clientName += ' ' + m_clientVersion;
return;
}
if ( hasCap( CAP_ANDRQ ) )
{
m_clientName = QString::fromLatin1( "&RQ" );
m_clientVersion.sprintf( "%d.%d.%d.%d",
m_identCap.data().at(12), m_identCap.data().at(11), m_identCap.data().at(10),
m_identCap.data().at(9) );
- m_clientName += " " + m_clientVersion;
+ m_clientName += ' ' + m_clientVersion;
return;
}
if ( hasCap( CAP_RANDQ ) )
{
m_clientName = QString::fromLatin1("R&Q");
m_clientVersion.sprintf("%d.%d.%d.%d",
m_identCap.data().at(12), m_identCap.data().at(11), m_identCap.data().at(10),
m_identCap.data().at(9));
- m_clientName += " " + m_clientVersion;
+ m_clientName += ' ' + m_clientVersion;
return;
}
_______________________________________________
kopete-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kopete-devel
