diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kdoctools | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdoctools')
| -rw-r--r-- | kdoctools/kio_help.cpp | 4 | ||||
| -rw-r--r-- | kdoctools/meinproc.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kdoctools/kio_help.cpp b/kdoctools/kio_help.cpp index 292c4de13..dda8fa324 100644 --- a/kdoctools/kio_help.cpp +++ b/kdoctools/kio_help.cpp @@ -42,9 +42,9 @@ TQString HelpProtocol::langLookup(const TQString& fname) TQStringList search; // assemble the local search paths - const TQStringList localDoc = KGlobal::dirs()->resourceDirs("html") + KGlobal::dirs()->resourceDirs("html-bundle"); + const TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html") + TDEGlobal::dirs()->resourceDirs("html-bundle"); - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 577d0341d..1c47ec43f 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -100,7 +100,7 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("kio_help"); TDEInstance ins("meinproc"); - KGlobal::locale(); + TDEGlobal::locale(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -171,7 +171,7 @@ int main(int argc, char **argv) { chdir( TQFile::encodeName( file.dirPath( true ) ) ); TQString cmd = exe; cmd += " --catalogs --valid --noout "; - cmd += KProcess::quote(file.fileName()); + cmd += TDEProcess::quote(file.fileName()); cmd += " 2>&1"; FILE *xmllint = popen( TQFile::encodeName( cmd ), "r"); char buf[ 512 ]; |