diff options
| author | Timothy Pearson <[email protected]> | 2012-03-07 22:21:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-07 22:21:23 -0600 |
| commit | b6609bb30d91121e98eb2bbe2cf89ff144680e84 (patch) | |
| tree | 5d8a9133155e9e2e9cde60e2cc3670de03ae5d35 /kioslave | |
| parent | 2242eb95a7bcd686207e2043340fed5ccc8b7609 (diff) | |
| parent | 56a663b7c2cf18978a349015b6e19f1d898e8bb9 (diff) | |
| download | tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.tar.gz tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kioslave')
| -rw-r--r-- | kioslave/DEBUG.howto | 6 | ||||
| -rw-r--r-- | kioslave/man/kio_man.h | 4 | ||||
| -rw-r--r-- | kioslave/man/man2html.h | 6 | ||||
| -rw-r--r-- | kioslave/trash/testtrash.cpp | 6 |
4 files changed, 11 insertions, 11 deletions
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/man/kio_man.h b/kioslave/man/kio_man.h index 617245f80..3a0db59e6 100644 --- a/kioslave/man/kio_man.h +++ b/kioslave/man/kio_man.h @@ -90,8 +90,8 @@ private: TQString mySgml2RoffPath; void getProgramPath(); - TQCString m_htmlPath; ///< Path to KDE resources, encoded for HTML - TQCString m_cssPath; ///< Path to KDE resources, encoded for CSS + TQCString m_htmlPath; ///< Path to TDE resources, encoded for HTML + TQCString m_cssPath; ///< Path to TDE resources, encoded for CSS TQBuffer m_outputBuffer; ///< Buffer for the output TQString m_manCSSFile; ///< Path to kio_man.css }; diff --git a/kioslave/man/man2html.h b/kioslave/man/man2html.h index e4d19a87b..68b01efe9 100644 --- a/kioslave/man/man2html.h +++ b/kioslave/man/man2html.h @@ -12,10 +12,10 @@ void scan_man_page(const char *man_page); /** - * Set the paths to KDE resources + * Set the paths to TDE resources * - * \param htmlPath Path to the KDE resources, encoded for HTML - * \param cssPath Path to the KDE resources, encoded for CSS + * \param htmlPath Path to the TDE resources, encoded for HTML + * \param cssPath Path to the TDE resources, encoded for CSS * \since 3.5 * */ 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); |