diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/remoteencodingplugin/kremoteencodingplugin.cpp')
| -rw-r--r-- | konqueror/remoteencodingplugin/kremoteencodingplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 838f2aad7..ec9d6ef2a 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -28,14 +28,14 @@ #include <kaction.h> #include <klocale.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcharsets.h> #include <kpopupmenu.h> #include <dcopclient.h> #include <kgenericfactory.h> #include <kprotocolmanager.h> #include <kprotocolinfo.h> -#include <kio/slaveconfig.h> +#include <tdeio/slaveconfig.h> #include <konq_dirpart.h> #include <tdeparts/browserextension.h> |