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 /tdeprint/slave | |
| 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 'tdeprint/slave')
| -rw-r--r-- | tdeprint/slave/Makefile.am | 2 | ||||
| -rw-r--r-- | tdeprint/slave/kio_print.cpp | 4 | ||||
| -rw-r--r-- | tdeprint/slave/kio_print.h | 4 | ||||
| -rw-r--r-- | tdeprint/slave/print.protocol | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tdeprint/slave/Makefile.am b/tdeprint/slave/Makefile.am index 46dbe4250..8cfba4dd7 100644 --- a/tdeprint/slave/Makefile.am +++ b/tdeprint/slave/Makefile.am @@ -19,4 +19,4 @@ servicesdir = $(kde_servicesdir) services_DATA = print.protocol printdb.protocol messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_print.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_print.pot diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 8c8001ddc..844934137 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -29,11 +29,11 @@ #include <klocale.h> #include <kdebug.h> #include <kinstance.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kmimetype.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kapplication.h> #include <kcmdlineargs.h> #include <kaboutdata.h> diff --git a/tdeprint/slave/kio_print.h b/tdeprint/slave/kio_print.h index afd337ba6..1b7158eb9 100644 --- a/tdeprint/slave/kio_print.h +++ b/tdeprint/slave/kio_print.h @@ -20,8 +20,8 @@ #ifndef KIO_PRINT_H #define KIO_PRINT_H -#include <kio/slavebase.h> -#include <kio/global.h> +#include <tdeio/slavebase.h> +#include <tdeio/global.h> #include <tqstring.h> #include <tqbuffer.h> diff --git a/tdeprint/slave/print.protocol b/tdeprint/slave/print.protocol index 38989160b..7fe7c7fd0 100644 --- a/tdeprint/slave/print.protocol +++ b/tdeprint/slave/print.protocol @@ -11,5 +11,5 @@ deleting=false moving=false linking=false Icon=postscript -DocPath=kioslave/print.html +DocPath=tdeioslave/print.html defaultMimetype=application/octet-stream |