diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:06:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:06:29 -0600 |
| commit | c0b24fe164924298d7e6ae33964b3c65fadbcba3 (patch) | |
| tree | 2ba50375d78b077b266b224e4413150ef3e60a15 /lib/widgets/kdevhtmlpart.cpp | |
| parent | 33d15e862e09fbcbb05e209f832414bd8a01291e (diff) | |
| download | tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.tar.gz tdevelop-c0b24fe164924298d7e6ae33964b3c65fadbcba3.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'lib/widgets/kdevhtmlpart.cpp')
| -rw-r--r-- | lib/widgets/kdevhtmlpart.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 85990989..49ac87d2 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -12,7 +12,7 @@ #include <kmainwindow.h> #include <tdehtmlview.h> #include <tdehtml_settings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdevmainwindow.h> @@ -169,7 +169,7 @@ TQString KDevHTMLPart::context() const } -// Note: this function is a copy of code in tdecore/kconfigbase.cpp ;) +// Note: this function is a copy of code in tdecore/tdeconfigbase.cpp ;) static bool isUtf8(const char *buf) { int i, n; register unsigned char c; @@ -256,7 +256,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) TQString path = url; int nDollarPos = path.find( '$' ); - // Note: the while loop below is a copy of code in tdecore/kconfigbase.cpp ;) + // Note: the while loop below is a copy of code in tdecore/tdeconfigbase.cpp ;) while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) { // there is at least one $ if( (path)[nDollarPos+1] == '(' ) { |