Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 22b5a4c81..5c3f7df69 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -165,7 +165,7 @@ namespace KMail {
     label = new TQLabel( mAliasEdit, i18n("Email a&liases:"), tab );
     glay->addWidget( label, row, 0, TQt::AlignTop );
     msg = i18n("<qt><h3>Email aliases</h3>"
-               "<p>This field contains alias addresses that should also "
+               "<p>This field tqcontains alias addresses that should also "
                "be considered as belonging to this identity (as opposed "
                "to representing a different identity).</p>"
                "<p>Example:</p>"
@@ -427,16 +427,16 @@ namespace KMail {
     // Tab Widget: Signature
     //
     mSignatureConfigurator = new SignatureConfigurator( tabWidget );
-    mSignatureConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mSignatureConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mSignatureConfigurator, i18n("&Signature") );
 
     mXFaceConfigurator = new XFaceConfigurator( tabWidget );
-    mXFaceConfigurator->layout()->setMargin( KDialog::marginHint() );
+    mXFaceConfigurator->tqlayout()->setMargin( KDialog::marginHint() );
     tabWidget->addTab( mXFaceConfigurator, i18n("&Picture") );
 
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    if ( geometry.hasKey( "Identity Dialog size" ) )
-      resize( geometry.readSizeEntry( "Identity Dialog size" ) );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    if ( tqgeometry.hasKey( "Identity Dialog size" ) )
+      resize( tqgeometry.readSizeEntry( "Identity Dialog size" ) );
     mNameEdit->setFocus();
 
     connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)),
@@ -444,8 +444,8 @@ namespace KMail {
   }
 
   IdentityDialog::~IdentityDialog() {
-    KConfigGroup geometry( KMKernel::config(), "Geometry" );
-    geometry.writeEntry( "Identity Dialog size", size() );
+    KConfigGroup tqgeometry( KMKernel::config(), "Geometry" );
+    tqgeometry.writeEntry( "Identity Dialog size", size() );
   }
 
   void IdentityDialog::slotAboutToShow( TQWidget * w ) {