From f62ebdf09ec164b504966b5cb648d562353c0859 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 7 Mar 2012 17:52:11 -0600 Subject: Rename straggling environment variables KDE->TDE. --- drkonqi/main.cpp | 2 +- kcheckpass/kcheckpass.c | 4 ++-- kdesktop/main.cc | 2 +- kioslave/DEBUG.howto | 6 +++--- kioslave/trash/testtrash.cpp | 6 +++--- ksmserver/main.cpp | 2 +- tdesu/tdesu/tdesu.cpp | 2 +- tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index e10a1ce81..b6fb5c982 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -65,7 +65,7 @@ int main( int argc, char* argv[] ) exit (255); // Make sure that DrKonqi doesn't start DrKonqi when it crashes :-] - setenv("KDE_DEBUG", "true", 1); + setenv("TDE_DEBUG", "true", 1); unsetenv("SESSION_MANAGER"); KAboutData aboutData( "drkonqi", diff --git a/kcheckpass/kcheckpass.c b/kcheckpass/kcheckpass.c index 6a0550969..75e972760 100644 --- a/kcheckpass/kcheckpass.c +++ b/kcheckpass/kcheckpass.c @@ -358,10 +358,10 @@ main(int argc, char **argv) #ifdef ACCEPT_ENV # ifdef HAVE_PAM - if ((p = getenv("KDE_PAM_ACTION"))) + if ((p = getenv("TDE_PAM_ACTION"))) caller = p; # endif - if ((p = getenv("KCHECKPASS_USER"))) + if ((p = getenv("TCHECKPASS_USER"))) username = p; #endif diff --git a/kdesktop/main.cc b/kdesktop/main.cc index e15596ffb..9a4c52f3c 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -101,7 +101,7 @@ static void signalHandler(int sigId) void KDesktop::slotUpAndRunning() { // Activate crash recovery - if (getenv("KDE_DEBUG") == NULL) + if (getenv("TDE_DEBUG") == NULL) KCrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash } diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto index a1d4925a5..d15cb7034 100644 --- a/kioslave/DEBUG.howto +++ b/kioslave/DEBUG.howto @@ -18,7 +18,7 @@ that slaves for a certain protocol are started in debug mode. E.g. to start all 'http' slaves in debug mode, you type: - KDE_SLAVE_DEBUG_WAIT=http tdeinit + TDE_SLAVE_DEBUG_WAIT=http tdeinit This will restart 'tdeinit' and 'klauncher'. @@ -51,13 +51,13 @@ Debugging io-slaves with valgrind KLauncher can be told to run certain io-slaves through valgrind. The following command can be used to let klauncher run all https io-slaves via valgrind: - KDE_SLAVE_VALGRIND=https tdeinit + TDE_SLAVE_VALGRIND=https tdeinit The valgrind output will appear as the stderr output of the tdeinit process. The $VALGRIND_OPTS environment variable can be used to pass options to valgrind. If you want to use a different skin: - KDE_SLAVE_VALGRIND_SKIN=calltree ( for example ) + TDE_SLAVE_VALGRIND_SKIN=calltree ( for example ) How to get debug output diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index fb6927d3e..94d33771a 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -73,14 +73,14 @@ int main(int argc, char *argv[]) // However this assume your $HOME doesn't use characters from other locales... setenv( "LC_ALL", "en_GB.ISO-8859-1", 1 ); #ifdef UTF8TEST - setenv( "KDE_UTF8_FILENAMES", "true", 1 ); + setenv( "TDE_UTF8_FILENAMES", "true", 1 ); #else - unsetenv( "KDE_UTF8_FILENAMES" ); + unsetenv( "TDE_UTF8_FILENAMES" ); #endif // Use another directory than the real one, just to keep things clean setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true ); - setenv( "KDE_FORK_SLAVES", "yes", true ); + setenv( "TDE_FORK_SLAVES", "yes", true ); KApplication::disableAutoDcopRegistration(); KCmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0); diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 26b93dfd9..d164bb242 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -70,7 +70,7 @@ void sanity_check( int argc, char* argv[] ) { TQCString msg; TQCString path = getenv("HOME"); - TQCString readOnly = getenv("KDE_HOME_READONLY"); + TQCString readOnly = getenv("TDE_HOME_READONLY"); if (path.isEmpty()) { msg = "$HOME not set!"; diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 889b92abf..f9ba44e6c 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -302,7 +302,7 @@ static int startApp() if (!new_dcop) { - TQCString ksycoca = "KDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca")); + TQCString ksycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca")); env << ksycoca; options += "xf"; // X-only, dcop forwarding enabled. diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp index 2b9d5e5bb..947109afd 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp @@ -41,9 +41,9 @@ bool TQKDEIntegration::enabled() static TQCString findLibrary() { - if( getenv( "KDE_FULL_SESSION" ) == NULL ) + if( getenv( "TDE_FULL_SESSION" ) == NULL ) return ""; - if( getenv( "KDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "KDE_FULL_SESSION" )[ 0 ] != '1' ) + if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' ) return ""; if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) -- cgit v1.2.3