Rename straggling environment variables KDE->TDE.

certmanager/lib/tests/Makefile.am

@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/certmanager/lib \
 	-I$(top_srcdir)/libtdenetwork \
-	$(GPGME_CFLAGS) $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
+	$(GPGME_CFLAGS) $(all_includes) -DTDESRCDIR=\"$(srcdir)\"
 
 check_PROGRAMS = test_keylister test_keygen test_keyselectiondialog \
 		test_cryptoconfig test_gnupgprocessbase test_jobs test_verify

certmanager/lib/tests/test_verify.cpp

@@ -49,7 +49,7 @@
 
 int main( int argc, char **argv )
 {
-  setenv("GNUPGHOME", KDESRCDIR "/gnupg_home", 1 );
+  setenv("GNUPGHOME", TDESRCDIR "/gnupg_home", 1 );
   setenv("LC_ALL", "C", 1);
   setenv("TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-unit-test" ), 1);
 
@@ -57,8 +57,8 @@ int main( int argc, char **argv )
   KCmdLineArgs::init( argc, argv, &aboutData );
   KApplication app( false, false );
 
-  const TQString sigFileName = KDESRCDIR "/test.data.sig";
-  const TQString dataFileName = KDESRCDIR "/test.data";
+  const TQString sigFileName = TDESRCDIR "/test.data.sig";
+  const TQString dataFileName = TDESRCDIR "/test.data";
 
   TQFile sigFile( sigFileName );
   assert( sigFile.open( IO_ReadOnly ) );
@@ -77,7 +77,7 @@ int main( int argc, char **argv )
   assert( sig.creationTime() == 1189650248L );
   assert( sig.validity() == GpgME::Signature::Full );
 
-  const TQString opaqueFileName = KDESRCDIR "/test.data.gpg";
+  const TQString opaqueFileName = TDESRCDIR "/test.data.gpg";
   TQFile opaqueFile( opaqueFileName );
   assert( opaqueFile.open( IO_ReadOnly ) );
   TQByteArray clearText;

karm/test/locking.cpp

@@ -133,7 +133,7 @@ int main( int argc, char *argv[] )
   setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true );
 
   // Copied from Till's test in libkcal.  Not sure what this is for.
-  setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+  setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
   // Copied from Till's test in libkcal.  Not sure what this is for.
   KApplication::disableAutoDcopRegistration();

kmail/tests/Makefile.am

@@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/kmail -I$(top_srcdir)/mimelib $(all_includes)
-AM_CPPFLAGS = -DKDESRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -DTDESRCDIR=\"$(srcdir)\"
 METASOURCES = AUTO
 
 check_LTLIBRARIES = kunittest_storagelayermodule.la \

kmail/tests/mimelibtests.cpp

@@ -73,10 +73,10 @@ void MimeLibTester::setUp()
 {
   // This multipart-mixed mail has a part that starts without headers;
   // the newline after the (empty) headers must be preserved.
-  mMultipartMixedMail = readFile( KDESRCDIR "/multipartmixed.mbox" );
+  mMultipartMixedMail = readFile( TDESRCDIR "/multipartmixed.mbox" );
   // This is the full signed mail which was simplified to above.
   // Kept around in case we want to do anything else with a signed mail later :)
-  mSignedMail = readFile( KDESRCDIR "/signedmail.mbox" );
+  mSignedMail = readFile( TDESRCDIR "/signedmail.mbox" );
 }
 
 void MimeLibTester::tearDown()

ktnef/tests/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DKDESRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/ktnef $(all_includes) -DTDESRCDIR=\"$(srcdir)\"
 LDADD = ../lib/libktnef.la $(LIB_TDECORE)
 
 check_PROGRAMS = parsertest

ktnef/tests/parsertest.cpp

@@ -28,7 +28,7 @@
 void ParserTest::testSingleAttachment()
 {
   KTNEFParser parser;
-  assert( parser.openFile( KDESRCDIR "/one-file.tnef" ) == true );
+  assert( parser.openFile( TDESRCDIR "/one-file.tnef" ) == true );
 
   KTNEFMessage *msg = parser.message();
   assert( msg != 0 );
@@ -45,7 +45,7 @@ void ParserTest::testSingleAttachment()
 void ParserTest::testTwoAttachments()
 {
   KTNEFParser parser;
-  assert( parser.openFile( KDESRCDIR "/two-files.tnef" ) == true );
+  assert( parser.openFile( TDESRCDIR "/two-files.tnef" ) == true );
 
   KTNEFMessage *msg = parser.message();
   assert( msg != 0 );
@@ -67,7 +67,7 @@ void ParserTest::testTwoAttachments()
 void ParserTest::testMAPIAttachments()
 {
   KTNEFParser parser;
-  assert( parser.openFile( KDESRCDIR "/mapi_attach_data_obj.tnef" ) == true );
+  assert( parser.openFile( TDESRCDIR "/mapi_attach_data_obj.tnef" ) == true );
 
   KTNEFMessage *msg = parser.message();
   assert( msg != 0 );

libkcal/tests/testresource.cpp

@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     // Use another directory than the real one, just to keep things clean
     // TDEHOME needs to be writable though, for a ksycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testresource" ), true );
-    setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+    setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KApplication::disableAutoDcopRegistration();
     KCmdLineArgs::init(argc,argv,"testresource", 0, 0, 0, 0);

libtdepim/tests/testdistrlist.cpp

@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
     // Use another directory than the real one, just to keep things clean
     // TDEHOME needs to be writable though, for a ksycoca database
     setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-testdistrlist" ), true );
-    setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
+    setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
 
     KApplication::disableAutoDcopRegistration();
     KCmdLineArgs::init(argc,argv,"testdistrlist", 0, 0, 0, 0);