From 4f070eb987ea6e0dd71f6266835c14e8fcbeb18b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 19:11:39 -0600 Subject: Rename KDEHOME and KDEDIR --- kopete/INSTALL | 6 +++--- kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp | 2 +- kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp | 2 +- kopete/libkopete/tests/kopetecontactlist_test.cpp | 2 +- kopete/libkopete/tests/kopeteemoticontest.cpp | 2 +- kopete/libkopete/tests/kopetemessage_test.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kopete') diff --git a/kopete/INSTALL b/kopete/INSTALL index 1fc6e9d4..a8f262e7 100644 --- a/kopete/INSTALL +++ b/kopete/INSTALL @@ -200,7 +200,7 @@ console and restart Kopete when it finishes. If that doesn't help, please read on. KDE applications by default look in all directories listed in the -/etc/kderc file, the $KDEDIRS environment variable, in $KDEDIR if +/etc/kderc file, the $TDEDIRS environment variable, in $TDEDIR if this variable doesn't exist, and ultimately in the directory where tdelibs is installed. Unless you take special precautions applications will _NOT_ look in other directories, even if you install additional @@ -216,8 +216,8 @@ If you don't have write access to /etc/kderc, or if you want to use more parallel builds of KDE and/or Kopete you need to rely on the environment variables instead. -If $KDEDIRS currently points to /opt/trinity and you installed Kopete -to /usr/local then you need to set $KDEDIRS to '/opt/trinity:/usr/local'. +If $TDEDIRS currently points to /opt/trinity and you installed Kopete +to /usr/local then you need to set $TDEDIRS to '/opt/trinity:/usr/local'. You need to store this change in a file that is picked up by all shells and for all users, like /etc/profile. The name of the preferred version varies from system to system. diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp index 2f6ea711..91626e66 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp @@ -33,7 +33,7 @@ void ChatWindowStyle_Test::allTests() testStyle = new ChatWindowStyle(TQString(SRCDIR)+TQString("/TestStyle")); // change user data dir to avoid messing with user's .kde dir - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); testPaths(); testHtml(); diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index 4a2b648f..c3dd3edc 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -181,7 +181,7 @@ ChatWindowStyleRendering_Test::~ChatWindowStyleRendering_Test() void ChatWindowStyleRendering_Test::allTests() { // change user data dir to avoid messing with user's .kde dir - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); KApplication::disableAutoDcopRegistration(); //KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0); diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp index 933a67bb..3ac1b34a 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.cpp +++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp @@ -34,7 +34,7 @@ void KopeteContactList_Test::allTests() void KopeteContactList_Test::testSomething() { // change user data dir to avoid messing with user's .kde dir - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) ); if( ! filename.isEmpty() ) diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index e8ada405..1f3fd436 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -51,7 +51,7 @@ KUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest ); void KopeteEmoticonTest::allTests() { // change user data dir to avoid messing with user's .kde dir - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); //KApplication::disableAutoDcopRegistration(); //KApplication app; diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 5603b911..293da6b9 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -50,7 +50,7 @@ KUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test ); KopeteMessage_Test::KopeteMessage_Test() { // change user data dir to avoid messing with user's .kde dir - setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); + setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); // create fake objects needed to build a reasonable testeable message m_protocol = new Kopete::Test::Mock::Protocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); -- cgit v1.2.1