diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdehtml/tdehtml_part.cpp | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdehtml/tdehtml_part.cpp')
| -rw-r--r-- | tdehtml/tdehtml_part.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 185ded02d..2ebd55df8 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -75,9 +75,9 @@ using namespace DOM; #include <dcopref.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <kio/job.h> -#include <kio/global.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/global.h> +#include <tdeio/netaccess.h> #include <kprotocolmanager.h> #include <kdebug.h> #include <kiconloader.h> @@ -85,7 +85,7 @@ using namespace DOM; #include <kcharsets.h> #include <kmessagebox.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktrader.h> #include <kdatastream.h> #include <ktempfile.h> @@ -102,7 +102,7 @@ using namespace DOM; #include <ksslcertchain.h> #include <ksslinfodlg.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kurifilter.h> #include <kstatusbar.h> #include <kurllabel.h> @@ -1136,7 +1136,7 @@ void KHTMLPart::launchJSErrorDialog() { void KHTMLPart::launchJSConfigDialog() { TQStringList args; args << "tdehtml_java_js"; - TDEApplication::tdeinitExec( "kcmshell", args ); + TDEApplication::tdeinitExec( "tdecmshell", args ); } TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) |