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 /kcontrol/kfontinst/kio | |
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 'kcontrol/kfontinst/kio')
-rw-r--r-- | kcontrol/kfontinst/kio/KioFonts.cpp | 10 | ||||
-rw-r--r-- | kcontrol/kfontinst/kio/KioFonts.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index c7c03d107..4c28a1c33 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -44,11 +44,11 @@ #include <sys/resource.h> #include <unistd.h> #include <fcntl.h> -#include <kio/global.h> -#include <kio/ioslave_defaults.h> -#include <kio/netaccess.h> -#include <kio/slaveinterface.h> -#include <kio/connection.h> +#include <tdeio/global.h> +#include <tdeio/ioslave_defaults.h> +#include <tdeio/netaccess.h> +#include <tdeio/slaveinterface.h> +#include <tdeio/connection.h> #include <tqtextstream.h> #include <kmimetype.h> #include <kmessagebox.h> diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 1de87f5f1..ec8c69c4e 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -31,7 +31,7 @@ #include <fontconfig/fontconfig.h> #include <time.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <kurl.h> #include <klocale.h> #include <tqstring.h> |