diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-07 22:21:31 -0600 |
| commit | 06227c5420ce8eeef7bd44406a395188c61e1703 (patch) | |
| tree | c18c25b31413479e63fec92f61067b95759fc3b0 /kio | |
| parent | ce5d3d7fd554b9832a69350cffa8d79c5002753e (diff) | |
| parent | 70d7c59d2ac9ad3718f92a20c07937d3b6cfb928 (diff) | |
| download | tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.tar.gz tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kio')
| -rw-r--r-- | kio/kio/lex.c | 2 | ||||
| -rw-r--r-- | kio/kio/slave.cpp | 4 | ||||
| -rw-r--r-- | kio/kio/slavebase.cpp | 2 | ||||
| -rw-r--r-- | kio/tests/kurifiltertest.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kio/kio/lex.c b/kio/kio/lex.c index 4b8cb21f7..99848a2f3 100644 --- a/kio/kio/lex.c +++ b/kio/kio/lex.c @@ -1584,7 +1584,7 @@ static void yy_fatal_error( msg ) char msg[]; #endif { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "[lex] %s\n", msg ); exit( YY_EXIT_FAILURE ); } diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp index 4826c8da8..3a501d681 100644 --- a/kio/kio/slave.cpp +++ b/kio/kio/slave.cpp @@ -390,8 +390,8 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error // for the slave to connect to the application. // In such case we start the slave via KProcess. // It's possible to force this by setting the env. variable - // KDE_FORK_SLAVES, Clearcase seems to require this. - static bool bForkSlaves = !TQCString(getenv("KDE_FORK_SLAVES")).isEmpty(); + // TDE_FORK_SLAVES, Clearcase seems to require this. + static bool bForkSlaves = !TQCString(getenv("TDE_FORK_SLAVES")).isEmpty(); if (bForkSlaves || !client->isAttached() || client->isAttachedToForeignServer()) { diff --git a/kio/kio/slavebase.cpp b/kio/kio/slavebase.cpp index 6641f6e23..c237bd490 100644 --- a/kio/kio/slavebase.cpp +++ b/kio/kio/slavebase.cpp @@ -168,7 +168,7 @@ SlaveBase::SlaveBase( const TQCString &protocol, { s_protocol = protocol.data(); #ifdef Q_OS_UNIX - if (!getenv("KDE_DEBUG")) + if (!getenv("TDE_DEBUG")) { KCrash::setCrashHandler( sigsegv_handler ); signal(SIGILL,&sigsegv_handler); diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index c448cca90..a1ebf2e46 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -156,7 +156,7 @@ int main(int argc, char **argv) // Ensure that user configuration doesn't change the results of those tests // TDEHOME needs to be writable though, for a ksycoca database setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true ); - setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup + setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KAboutData aboutData(appName, programName, version, description); KCmdLineArgs::init(argc, argv, &aboutData); |