6 files changed, 29 insertions, 30 deletions
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c43620ea..f81bc3b1 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -1,4 +1,3 @@
-// -*- mode: C++; c-file-style: "gnu" -*-
 // tdemidentity.cpp
 // License: GPL
 
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index c1af97e1..bdc31385 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -1,4 +1,4 @@
-/* -*- mode: C++; c-file-style: "gnu" -*-
+/*
  * User identity information
  *
  * Author: Stefan Taferner <taferner@kde.org>
@@ -9,7 +9,7 @@
 
 #include <kleo/enum.h>
 
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 #include <tqstring.h>
 #include <tqcstring.h>
@@ -26,17 +26,17 @@ class TQDataStream;
 
 namespace KPIM {
 
-KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig );
-KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig );
+TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig );
+TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig );
 
-KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident );
-KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident );
+TDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident );
+TDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident );
 
 /**
  * @short abstraction of a signature (aka "footer").
  * @author Marc Mutz <mutz@kde.org>
  */
-class KDE_EXPORT Signature {
+class TDE_EXPORT Signature {
   friend class Identity;
 
   friend TQDataStream & KPIM::operator<<( TQDataStream & stream, const Signature & sig );
@@ -92,7 +92,7 @@ private:
 };
 
 /** User identity information */
-class KDE_EXPORT Identity
+class TDE_EXPORT Identity
 {
   // only the identity manager should be able to construct and
   // destruct us, but then we get into problems with using
@@ -186,8 +186,8 @@ public:
   TQString organization() const { return mOrganization; }
   void setOrganization(const TQString&);
 
-  KDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); }
-  KDE_DEPRECATED void setPgpIdentity( const TQCString & key ) {
+  TDE_DEPRECATED TQCString pgpIdentity() const { return pgpEncryptionKey(); }
+  TDE_DEPRECATED void setPgpIdentity( const TQCString & key ) {
     setPGPEncryptionKey( key );
     setPGPSigningKey( key );
   }
@@ -212,8 +212,8 @@ public:
   void setPreferredCryptoMessageFormat( Kleo::CryptoMessageFormat format ) { mPreferredCryptoMessageFormat = format; }
 
   /** email address (without the user name - only name\@host) */
-  KDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); }
-  KDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); }
+  TDE_DEPRECATED TQString emailAddr() const { return primaryEmailAddress(); }
+  TDE_DEPRECATED void setEmailAddr( const TQString & email ) { setPrimaryEmailAddress( email ); }
 
   /** primary email address (without the user name - only name\@host).
       The primary email address is used for all outgoing mail. */
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index adc79efd..200f93ac 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitycombo.cpp
 
     This file is part of KMail, the KDE mail client.
@@ -48,9 +48,9 @@ IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * parent, const
 {
   reloadCombo();
   reloadUoidList();
-  connect( this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotEmitChanged(int)) );
-  connect( manager, TQT_SIGNAL(changed()),
-	   TQT_SLOT(slotIdentityManagerChanged()) );
+  connect( this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotEmitChanged(int)) );
+  connect( manager, TQ_SIGNAL(changed()),
+	   TQ_SLOT(slotIdentityManagerChanged()) );
 }
 
 TQString IdentityCombo::currentIdentityName() const {
diff --git a/libkpimidentities/identitycombo.h b/libkpimidentities/identitycombo.h
index 1644f9c2..5b780b9a 100644
--- a/libkpimidentities/identitycombo.h
+++ b/libkpimidentities/identitycombo.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitycombo.h
 
     This file is part of KMail, the KDE mail client.
@@ -34,7 +34,7 @@
 
 #include <tqcombobox.h>
 #include <tqvaluelist.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 class TQString;
 
@@ -48,8 +48,8 @@ class Identity;
  * @author Marc Mutz <mutz@kde.org>
  **/
 
-class KDE_EXPORT IdentityCombo : public TQComboBox {
-  Q_OBJECT
+class TDE_EXPORT IdentityCombo : public TQComboBox {
+  TQ_OBJECT
   
 public:
   IdentityCombo( IdentityManager* manager, TQWidget * parent=0, const char * name=0 );
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index c7b97216..a087974d 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -1,4 +1,4 @@
-/*  -*- mode: C++; c-file-style: "gnu" -*-
+/*
     identitymanager.cpp
 
     This file is part of KMail, the KDE mail client.
@@ -156,9 +156,9 @@ void IdentityManager::commit()
   // The emitter is always set to KPIM::IdentityManager, so that the connect works
   // This is why we can't use k_dcop_signals here, but need to use emitDCOPSignal
   TQByteArray data; TQDataStream arg( data, IO_WriteOnly );
-  arg << kapp->dcopClient()->appId();
+  arg << tdeApp->dcopClient()->appId();
   arg << DCOPObject::objId(); // the real objId, for checking in slotIdentitiesChanged
-  kapp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data );
+  tdeApp->dcopClient()->emitDCOPSignal( "KPIM::IdentityManager", "identitiesChanged(TQCString,TQCString)", data );
 }
 
 void IdentityManager::rollback()
@@ -487,7 +487,7 @@ int IdentityManager::newUoid()
                   // default identity
 
   do {
-    uoid = kapp->random();
+    uoid = tdeApp->random();
   } while ( usedUOIDs.find( uoid ) != usedUOIDs.end() );
 
   return uoid;
@@ -506,7 +506,7 @@ void KPIM::IdentityManager::slotIdentitiesChanged( TQCString appId, TQCString ob
 {
   // From standalone kmail to standalone korganizer, the appId will differ
   // From kontact the appId will match, so we need to test the objId
-  if ( kapp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) {
+  if ( tdeApp->dcopClient()->appId() != appId || DCOPObject::objId() != objId ) {
     mConfig->reparseConfiguration();
     Q_ASSERT( !hasPendingChanges() );
     readConfig( mConfig );
diff --git a/libkpimidentities/identitymanager.h b/libkpimidentities/identitymanager.h
index b0aee59d..69a18f50 100644
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@@ -1,4 +1,4 @@
-/*  -*- c++ -*-
+/*
     identitymanager.h
 
     This file is part of KMail, the KDE mail client.
@@ -35,7 +35,7 @@
 
 #include <tqvaluelist.h>
 #include <dcopobject.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 class TDEConfigBase;
 class TDEConfig;
@@ -50,11 +50,11 @@ class Identity;
  * @short Manages the list of identities.
  * @author Marc Mutz <mutz@kde.org>
  **/
-#define IdentityManager KDE_EXPORT IdentityManager
+#define IdentityManager TDE_EXPORT IdentityManager
 class IdentityManager : public ConfigManager, public DCOPObject
 #undef IdentityManager
 {
-  Q_OBJECT
+  TQ_OBJECT
 //  
   K_DCOP