Rename KWallet to TDEWallet.

12 files changed, 36 insertions, 36 deletions

diff --git a/mimetypes/application/CMakeLists.txt b/mimetypes/application/CMakeLists.txt
index 8b2d94e29..521e9e64b 100644
--- a/mimetypes/application/CMakeLists.txt
+++ b/mimetypes/application/CMakeLists.txt
@@ -58,7 +58,7 @@ install( FILES
     x-msaccess.desktop x-gettext.desktop x-ruby.desktop x-kcsrc.desktop
     x-php.desktop x-font-ttc.desktop x-font-otf.desktop
     vnd.mozilla.xul+xml.desktop vnd.sun.xml.draw.desktop
-    x-kde-wallet.desktop x-cue.desktop x-ica.desktop x-iso.desktop x-ace.desktop
+    x-tde-wallet.desktop x-cue.desktop x-ica.desktop x-iso.desktop x-ace.desktop
     x-afm.desktop x-arc.desktop vnd.rn-realmedia.desktop x-dbase.desktop
     vnd.sun.xml.calc.template.desktop vnd.sun.xml.writer.template.desktop
     vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop
diff --git a/mimetypes/application/Makefile.am b/mimetypes/application/Makefile.am
index 371e391f5..a753d8fe3 100644
--- a/mimetypes/application/Makefile.am
+++ b/mimetypes/application/Makefile.am
@@ -45,7 +45,7 @@ mimetypeapplicationdata_DATA = x-dvi.desktop x-gzdvi.desktop x-bz2dvi.desktop \
 	x-msaccess.desktop x-gettext.desktop x-ruby.desktop x-kcsrc.desktop \
 	x-php.desktop x-font-ttc.desktop x-font-otf.desktop \
 	vnd.mozilla.xul+xml.desktop vnd.sun.xml.draw.desktop \
-	x-kde-wallet.desktop x-cue.desktop x-ica.desktop x-iso.desktop x-ace.desktop \
+	x-tde-wallet.desktop x-cue.desktop x-ica.desktop x-iso.desktop x-ace.desktop \
 	x-afm.desktop x-arc.desktop vnd.rn-realmedia.desktop x-dbase.desktop \
 	vnd.sun.xml.calc.template.desktop vnd.sun.xml.writer.template.desktop \
 	vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \
diff --git a/mimetypes/application/x-kde-wallet.desktop b/mimetypes/application/x-tde-wallet.desktop
index 499cc0951..a15ae3d47 100644
--- a/mimetypes/application/x-kde-wallet.desktop
+++ b/mimetypes/application/x-tde-wallet.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=MimeType
-MimeType=application/x-kde-wallet
+MimeType=application/x-tde-wallet
 Comment=TDE Wallet File
 Comment[af]=TDE Beursie Lêer
 Comment[ar]=ملف محفظة TDE
diff --git a/tdeio/magic b/tdeio/magic
index df55ff39c..01b05bd6d 100644
--- a/tdeio/magic
+++ b/tdeio/magic
@@ -1036,7 +1036,7 @@
 
 #------------------------------------------------------------------------------
 # TDEWallet file
-0	string		KWALLET\012\015\000\015\012	application/x-kde-wallet
+0	string		TDEWALLET\012\015\000\015\012	application/x-tde-wallet
 
 #------------------------------------------------------------------------------
 # ICA Client configuration files
diff --git a/tdeio/misc/tdewalletd/tdewalletd.desktop b/tdeio/misc/tdewalletd/tdewalletd.desktop
index 537d1cc6f..23cb66c06 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.desktop
+++ b/tdeio/misc/tdewalletd/tdewalletd.desktop
@@ -65,7 +65,7 @@ Name[sl]=Modul demona TDEListnica
 Name[sq]=Demoni për Modulin TDEWallet
 Name[sr]=TDEWallet демон модул
 Name[sr@Latn]=TDEWallet demon modul
-Name[sv]=Kwallet-demonmodul
+Name[sv]=TDEwallet-demonmodul
 Name[ta]=TDEWallet டெமான் பகுதி
 Name[te]=కెవాలెట్ సూత్రధారి మాడ్యూల్
 Name[tg]=Модули Демон TDEWallet
@@ -77,8 +77,8 @@ Name[uz]=TDEWallet xizmatining moduli
 Name[uz@cyrillic]=TDEWallet хизматининг модули
 Name[vi]=Mô-đun trình nền TDEWallet
 Name[zh_CN]=TDEWallet 守护进程模块
-Name[zh_HK]=KWAllet 伺服程式模組
-Name[zh_TW]=KWAllet 服務程式模組
+Name[zh_HK]=TDEWallet 伺服程式模組
+Name[zh_TW]=TDEWallet 服務程式模組
 Comment=TDEWallet daemon module for KDED
 Comment[af]=KBeursie bediener module vir KDED
 Comment[be]=Модуль сервіса TDEWallet для KDED
@@ -135,7 +135,7 @@ Comment[sk]=Modul démona TDEWallet pre KDED
 Comment[sl]=Modul demona TDEListnica za KDED
 Comment[sr]=TDEWallet демон модул за KDED
 Comment[sr@Latn]=TDEWallet demon modul za KDED
-Comment[sv]=Kwallet-demonmodul för KDED
+Comment[sv]=TDEwallet-demonmodul för KDED
 Comment[ta]=KDEDக்கான TDEWallet Daemon  தொகுதி
 Comment[te]=కెడిఈడి కొరకు కెవాలెట్ సూత్రధారి మాడ్యూల్
 Comment[tg]=Модули Демон TDEWallet барои KDED
diff --git a/tdeio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h
index 406b88d12..c35ebc630 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.h
+++ b/tdeio/misc/tdewalletd/tdewalletd.h
@@ -19,8 +19,8 @@
    Boston, MA 02110-1301, USA.
 
 */
-#ifndef _KWALLETD_H_
-#define _KWALLETD_H_
+#ifndef _TDEWALLETD_H_
+#define _TDEWALLETD_H_
 
 #include <kded/kdedmodule.h>
 #include <tqintdict.h>
diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc
index e8bc45d2c..84160ba03 100644
--- a/tdewallet/backend/tdewalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cc
@@ -39,19 +39,19 @@
 
 #include <assert.h>
 
-#define KWALLET_VERSION_MAJOR		0
-#define KWALLET_VERSION_MINOR		0
+#define TDEWALLET_VERSION_MAJOR		0
+#define TDEWALLET_VERSION_MINOR		0
 
-#define KWALLET_CIPHER_BLOWFISH_CBC	0
-#define KWALLET_CIPHER_3DES_CBC		1 // unsupported
+#define TDEWALLET_CIPHER_BLOWFISH_CBC	0
+#define TDEWALLET_CIPHER_3DES_CBC		1 // unsupported
 
-#define KWALLET_HASH_SHA1		0
-#define KWALLET_HASH_MD5		1 // unsupported
+#define TDEWALLET_HASH_SHA1		0
+#define TDEWALLET_HASH_MD5		1 // unsupported
 
 
 using namespace TDEWallet;
 
-#define KWMAGIC "KWALLET\n\r\0\r\n"
+#define KWMAGIC "TDEWALLET\n\r\0\r\n"
 #define KWMAGIC_LEN 12
 
 static void initTDEWalletDir()
@@ -317,19 +317,19 @@ int Backend::open(const TQByteArray& password) {
 	db.readBlock(magicBuf, 4);
 
 	// First byte is major version, second byte is minor version
-	if (magicBuf[0] != KWALLET_VERSION_MAJOR) {
+	if (magicBuf[0] != TDEWALLET_VERSION_MAJOR) {
 		return -4;         // unknown version
 	}
 
-	if (magicBuf[1] != KWALLET_VERSION_MINOR) {
+	if (magicBuf[1] != TDEWALLET_VERSION_MINOR) {
 		return -4;	   // unknown version
 	}
 
-	if (magicBuf[2] != KWALLET_CIPHER_BLOWFISH_CBC) {
+	if (magicBuf[2] != TDEWALLET_CIPHER_BLOWFISH_CBC) {
 		return -42;	   // unknown cipher
 	}
 
-	if (magicBuf[3] != KWALLET_HASH_SHA1) {
+	if (magicBuf[3] != TDEWALLET_HASH_SHA1) {
 		return -42;	   // unknown hash
 	}
 
@@ -501,10 +501,10 @@ int Backend::sync(const TQByteArray& password) {
 
 	// Write the version number
 	TQByteArray version(4);
-	version[0] = KWALLET_VERSION_MAJOR;
-	version[1] = KWALLET_VERSION_MINOR;
-	version[2] = KWALLET_CIPHER_BLOWFISH_CBC;
-	version[3] = KWALLET_HASH_SHA1;
+	version[0] = TDEWALLET_VERSION_MAJOR;
+	version[1] = TDEWALLET_VERSION_MINOR;
+	version[2] = TDEWALLET_CIPHER_BLOWFISH_CBC;
+	version[3] = TDEWALLET_HASH_SHA1;
 	qf->writeBlock(version, 4);
 
 	// Holds the hashes we write out
diff --git a/tdewallet/backend/tdewalletbackend.h b/tdewallet/backend/tdewalletbackend.h
index dbbddba79..71c1da120 100644
--- a/tdewallet/backend/tdewalletbackend.h
+++ b/tdewallet/backend/tdewalletbackend.h
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef _KWALLETBACKEND_H
-#define _KWALLETBACKEND_H
+#ifndef _TDEWALLETBACKEND_H
+#define _TDEWALLETBACKEND_H
 
 #include <kmdcodec.h>
 
diff --git a/tdewallet/backend/tdewalletentry.h b/tdewallet/backend/tdewalletentry.h
index 641b52195..4261fc439 100644
--- a/tdewallet/backend/tdewalletentry.h
+++ b/tdewallet/backend/tdewalletentry.h
@@ -19,8 +19,8 @@
  */ 
 
 
-#ifndef _KWALLETENTRY_H
-#define _KWALLETENTRY_H
+#ifndef _TDEWALLETENTRY_H
+#define _TDEWALLETENTRY_H
 
 #include <tqstring.h>
 #include <tqdatastream.h>
diff --git a/tdewallet/client/tdewallet.h b/tdewallet/client/tdewallet.h
index e9bb65cec..613231908 100644
--- a/tdewallet/client/tdewallet.h
+++ b/tdewallet/client/tdewallet.h
@@ -19,8 +19,8 @@
  */ 
 
 
-#ifndef _KWALLET_H
-#define _KWALLET_H
+#ifndef _TDEWALLET_H
+#define _TDEWALLET_H
 
 #include <tqglobal.h>
 
@@ -521,5 +521,5 @@ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
 
 #endif //Q_OS_UNIX
 
-#endif //_KWALLET_H
+#endif //_TDEWALLET_H
 
diff --git a/tdewallet/client/tdewallettypes.h b/tdewallet/client/tdewallettypes.h
index 918dc0a3f..032324d40 100644
--- a/tdewallet/client/tdewallettypes.h
+++ b/tdewallet/client/tdewallettypes.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */ 
 
-#ifndef KWALLET_TYPES_H
-#define KWALLET_TYPES_H
+#ifndef TDEWALLET_TYPES_H
+#define TDEWALLET_TYPES_H
 
 #include <tqmap.h>
 
diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h
index e379a6cb4..a3ce51e48 100644
--- a/tdewallet/tests/tdewallettest.h
+++ b/tdewallet/tests/tdewallettest.h
@@ -1,5 +1,5 @@
-#ifndef KWALLETASYNC_H
-#define KWALLETASYNC_H
+#ifndef TDEWALLETASYNC_H
+#define TDEWALLETASYNC_H
 
 #include <tqobject.h>