diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kmtrace | |
parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmtrace')
-rw-r--r-- | kmtrace/kde.excludes | 10 | ||||
-rw-r--r-- | kmtrace/kmtrace.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kmtrace/kde.excludes b/kmtrace/kde.excludes index fb2e3b90..d36cb2f9 100644 --- a/kmtrace/kde.excludes +++ b/kmtrace/kde.excludes @@ -34,11 +34,11 @@ k_bindtextdomain _nl_find_domain KIconTheme::list KIconTheme::current -KGlobalSettings::toolBarFont -KGlobalSettings::menuFont -KGlobalSettings::fixedFont -KGlobalSettings::generalFont -KGlobalSettings::toolBarFont +TDEGlobalSettings::toolBarFont +TDEGlobalSettings::menuFont +TDEGlobalSettings::fixedFont +TDEGlobalSettings::generalFont +TDEGlobalSettings::toolBarFont KImageIOFactory::self objMap # Some C functions that allocate data for initialisation diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index fb568582..ae82af4a 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -258,8 +258,8 @@ void lookupUnknownSymbols(const char *appname) inputFile.close(); TQCString command; command.sprintf("addr2line -e %s -f -C -s < %s > %s", appname, - TQFile::encodeName(KProcess::quote(inputFile.name())).data(), - TQFile::encodeName(KProcess::quote(outputFile.name())).data()); + TQFile::encodeName(TDEProcess::quote(inputFile.name())).data(), + TQFile::encodeName(TDEProcess::quote(outputFile.name())).data()); system(command.data()); fInputFile = fopen(TQFile::encodeName(outputFile.name()), "r"); if (!fInputFile) |