diff options
| -rw-r--r-- | tdecore/README.kiosk | 12 | ||||
| -rw-r--r-- | tdecore/tdeconfigbase.cpp | 21 |
2 files changed, 1 insertions, 32 deletions
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index 826fc6da6..ae4f72d47 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -642,18 +642,6 @@ The following syntax is also supported: Name[$ei]=${USER} -Shell Commands in KDE config files. -=================================== - -In KDE3.1 arbitrary entries in configuration files can contain shell -commands. This way the value of a configuration entry can be determined -dynamically at runtime. In order to use this the entry must be marked -with [$e]. - -Example: -Host[$e]=$(hostname) - - KDE3 Kiosk Application API ========================== diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp index 1e8310a74..340afdfe4 100644 --- a/tdecore/tdeconfigbase.cpp +++ b/tdecore/tdeconfigbase.cpp @@ -276,26 +276,7 @@ TQString TDEConfigBase::readEntry( const char *pKey, while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ - if( (aValue)[nDollarPos+1] == '(' ) { - uint nEndPos = nDollarPos+1; - // the next character is no $ - while ( (nEndPos <= aValue.length()) && (aValue[nEndPos]!=')') ) - nEndPos++; - nEndPos++; - TQString cmd = aValue.mid( nDollarPos+2, nEndPos-nDollarPos-3 ); - - TQString result; - FILE *fs = popen(TQFile::encodeName(cmd).data(), "r"); - if (fs) - { - { - TQTextStream ts(fs, IO_ReadOnly); - result = ts.read().stripWhiteSpace(); - } - pclose(fs); - } - aValue.replace( nDollarPos, nEndPos-nDollarPos, result ); - } else if( (aValue)[nDollarPos+1] != '$' ) { + if( (aValue)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ TQString aVarName; |