Rename KABC namespace

4 files changed, 45 insertions, 45 deletions

diff --git a/interfaces/tdeimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h
index f3212df6d..a370a91a0 100644
--- a/interfaces/tdeimproxy/interface/kimiface.h
+++ b/interfaces/tdeimproxy/interface/kimiface.h
@@ -40,7 +40,7 @@
  *
  * Contacts are identified using unique identifier strings (UID) used by
  * KABC, the KDE address book library.
- * The UID generation is handled by KABC::Addressee so the your application
+ * The UID generation is handled by TDEABC::Addressee so the your application
  * will either have to access the address book or provide a possibility
  * for associating a contact of your application with an entry of the address
  * book.
@@ -76,8 +76,8 @@
  * @c SOURCES list in your @c Makefile.am
  *
  * @see KIMProxy
- * @see KABC::AddressBook
- * @see KABC::Addressee
+ * @see TDEABC::AddressBook
+ * @see TDEABC::Addressee
  *
  * @since 3.3
  * @author Will Stephenson <lists@stevello.free-online.co.uk>
@@ -100,7 +100,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see fileTransferContacts()
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList allContacts() = 0;
 
@@ -120,7 +120,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see fileTransferContacts()
 	 * @see messageContact()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList reachableContacts() = 0;
 
@@ -138,7 +138,7 @@ k_dcop:
 	 * @see fileTransferContacts()
 	 * @see messageContact()
 	 * @see chatWithContact()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList onlineContacts() = 0;
 
@@ -163,7 +163,7 @@ k_dcop:
 	 * @see onlineContacts()
 	 * @see canReceiveFiles()
 	 * @see sendFile()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQStringList fileTransferContacts() = 0;
 
@@ -180,7 +180,7 @@ k_dcop:
 	 * @see allContacts()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool isPresent( const TQString & uid ) = 0;
 
@@ -198,7 +198,7 @@ k_dcop:
 	 * @see isPresent()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString displayName( const TQString & uid ) = 0;
 
@@ -215,7 +215,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString presenceString( const TQString & uid ) = 0;
 
@@ -245,7 +245,7 @@ k_dcop:
 	 *
 	 * @see isPresent()
 	 * @see presenceString()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual int presenceStatus( const TQString & uid ) = 0;
 
@@ -256,7 +256,7 @@ k_dcop:
 	 * @return whether the specified contact can receive files
 	 *
 	 * @see fileTransferContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool canReceiveFiles( const TQString & uid ) = 0;
 
@@ -274,7 +274,7 @@ k_dcop:
 	 * @return whether the specified contact can respond
 	 *
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual bool canRespond( const TQString & uid ) = 0;
 
@@ -291,7 +291,7 @@ k_dcop:
 	 * @see protocols()
 	 * @see addContact()
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0;
 
@@ -310,7 +310,7 @@ k_dcop:
 	 * @see isPresent()
 	 * @see presenceString()
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQPixmap icon( const TQString & uid ) = 0;
 
@@ -325,7 +325,7 @@ k_dcop:
 	 *         supported or if the contact is unknown
 	 *
 	 * @see isPresent()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual TQString context( const TQString & uid ) = 0;
 
@@ -372,7 +372,7 @@ k_dcop:
 	 * @see sendFile()
 	 * @see isPresent()
 	 * @see reachableContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void messageContact( const TQString &uid, const TQString& message ) = 0;
 
@@ -410,7 +410,7 @@ k_dcop:
 	 * @see sendFile()
 	 * @see isPresent()
 	 * @see reachableContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void chatWithContact( const TQString &uid ) = 0;
 
@@ -436,7 +436,7 @@ k_dcop:
 	 * @see chatWithContact()
 	 * @see isPresent()
 	 * @see fileTransferContacts()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 */
 	virtual void sendFile(const TQString &uid, const KURL &sourceURL,
 		const TQString &altFileName = TQString::null, uint fileSize = 0) = 0;
@@ -479,7 +479,7 @@ k_dcop_signals:
 	 * @param presence the new presence's numeric value. See presenceStatus()
 	 *
 	 * @see presenceStatus()
-	 * @see KABC::Addressee::uid()
+	 * @see TDEABC::Addressee::uid()
 	 * @see DCOPClient::appId()
 	 */
 	void contactPresenceChanged( TQString uid, TQCString appId, int presence );
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index 1a20c4b22..84b7d37dd 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -98,8 +98,8 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
  * availability, capability and presence (online status) of IM-contacts.
  *
  * @see KIMIface
- * @see KABC::AddressBook
- * @see KABC::Addressee
+ * @see TDEABC::AddressBook
+ * @see TDEABC::Addressee
  *
  * @since 3.3
  * @author Will Stephenson <lists@stevello.free-online.co.uk>
@@ -161,7 +161,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see onlineContacts()
 		 * @see fileTransferContacts()
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList allContacts();
 
@@ -177,7 +177,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see onlineContacts()
 		 * @see fileTransferContacts()
 		 * @see messageContact()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList reachableContacts();
 
@@ -197,7 +197,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see fileTransferContacts()
 		 * @see messageContact()
 		 * @see chatWithContact()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList onlineContacts();
 
@@ -219,7 +219,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see reachableContacts()
 		 * @see onlineContacts()
 		 * @see canReceiveFiles()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQStringList fileTransferContacts();
 
@@ -239,7 +239,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see allContacts()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool isPresent( const TQString& uid );
 
@@ -261,7 +261,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString displayName( const TQString& uid );
 
@@ -302,7 +302,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see presenceString()
 		 * @see presenceIcon()
 		 * @see KIMIface::presenceStatus()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		int presenceNumeric( const TQString& uid );
 
@@ -338,7 +338,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceNumeric()
 		 * @see presenceIcon()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString presenceString( const TQString& uid );
 
@@ -367,7 +367,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceString()
 		 * @see presenceNumeric()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQPixmap presenceIcon( const TQString& uid );
 
@@ -384,7 +384,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @return whether the specified contact can receive files
 		 *
 		 * @see fileTransferContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool canReceiveFiles( const TQString & uid );
 
@@ -409,7 +409,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @return whether the specified contact can respond
 		 *
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		bool canRespond( const TQString & uid );
 
@@ -427,7 +427,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see KIMIface::protocols()
 		 * @see addContact()
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString locate( const TQString & contactId, const TQString & protocol );
 
@@ -449,7 +449,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 *         supported or if the contact is unknown
 		 *
 		 * @see isPresent()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		TQString context( const TQString & uid );
 
@@ -462,7 +462,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see sendFile()
 		 * @see isPresent()
 		 * @see reachableContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void chatWithContact( const TQString& uid );
 
@@ -479,7 +479,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see sendFile()
 		 * @see isPresent()
 		 * @see reachableContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void messageContact( const TQString& uid, const TQString& message );
 
@@ -498,7 +498,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see chatWithContact()
 		 * @see isPresent()
 		 * @see fileTransferContacts()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void sendFile(const TQString &uid, const KURL &sourceURL,
 			 const TQString &altFileName = TQString::null, uint fileSize = 0);
@@ -586,7 +586,7 @@ class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 		 * @see isPresent()
 		 * @see presenceNumeric()
 		 * @see presenceIcon()
-		 * @see KABC::Addressee::uid()
+		 * @see TDEABC::Addressee::uid()
 		 */
 		void sigContactPresenceChanged( const TQString &uid );
 
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index 4035a17f0..7588019e2 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -23,7 +23,7 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \
 
 
 libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
+libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI)
 
 tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \
                              selectioninterface.h cursorinterface.h \
diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index 01e0c292f..25c103196 100644
--- a/interfaces/tdetexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -54,16 +54,16 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix
 
 #define INITKABC do { \
   if (addrBook==0) { \
-    addrBook=KABC::StdAddressBook::self(); \
+    addrBook=TDEABC::StdAddressBook::self(); \
     userAddress=addrBook->whoAmI(); \
     if (userAddress.isEmpty()) { \
       if ( KMessageBox::questionYesNo(parentWindow, \
            i18n( "This template uses personal data that is stored in the TDE addressbook, but you have not selected a personal entry. You can still use the template without one, but you will have to type personal data. Would you like to select one now?" ), \
            "Personal data requested", \
            KStdGuiItem::yes(), KStdGuiItem::no(), "select personal data entry") == KMessageBox::Yes ) { \
-        userAddress = KABC::AddresseeDialog::getAddressee(parentWindow); \
+        userAddress = TDEABC::AddresseeDialog::getAddressee(parentWindow); \
         if ( ! userAddress.isEmpty() ) \
-          KABC::StdAddressBook::self()->setWhoAmI( userAddress ); \
+          TDEABC::StdAddressBook::self()->setWhoAmI( userAddress ); \
       }\
       /*return false;//no, why??*/ \
     } \
@@ -72,8 +72,8 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix
 
 bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *parentWindow )
 {
-  KABC::StdAddressBook *addrBook = 0;
-  KABC::Addressee userAddress;
+  TDEABC::StdAddressBook *addrBook = 0;
+  TDEABC::Addressee userAddress;
   TQDateTime datetime = TQDateTime::currentDateTime();
   TQDate date = TQT_TQDATE_OBJECT(datetime.date());
   TQTime time = TQT_TQTIME_OBJECT(datetime.time());