diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:55:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:55:42 -0600 |
| commit | bc71c5b1f383050cd74e96812fda7e91f88f4dfa (patch) | |
| tree | 6db2129df9836d876966b3fd2435a1578104021a /iso | |
| parent | ecb4aba1737ce20e9e8aa3f719e7beea95e0b162 (diff) | |
| download | krusader-bc71c5b1f383050cd74e96812fda7e91f88f4dfa.tar.gz krusader-bc71c5b1f383050cd74e96812fda7e91f88f4dfa.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'iso')
| -rw-r--r-- | iso/Makefile.am | 4 | ||||
| -rw-r--r-- | iso/iso.h | 2 | ||||
| -rw-r--r-- | iso/iso.protocol | 2 | ||||
| -rw-r--r-- | iso/kiso.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/iso/Makefile.am b/iso/Makefile.am index 53cb2b2..cb08ad6 100644 --- a/iso/Makefile.am +++ b/iso/Makefile.am @@ -25,12 +25,12 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/ $(INSTALL_DATA) $(srcdir)/isoservice.desktop $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop $(mkinstalldirs) $(DESTDIR)$(kde_confdir)/ - $(INSTALL_DATA) $(srcdir)/kio_isorc $(DESTDIR)$(kde_confdir)/kio_isorc + $(INSTALL_DATA) $(srcdir)/tdeio_isorc $(DESTDIR)$(kde_confdir)/tdeio_isorc uninstall-local: -rm -f $(DESTDIR)$(kde_servicesdir)/iso.protocol -rm -f $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop - -rm -f $(DESTDIR)$(kde_confdir)/kio_isorc + -rm -f $(DESTDIR)$(kde_confdir)/tdeio_isorc # These paths are KDE specific. Use them: # kde_appsdir Where your application's menu entry (.desktop) should go to. @@ -22,7 +22,7 @@ #ifndef _ISO_H #define _ISO_H -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <sys/types.h> #include "kisofile.h" diff --git a/iso/iso.protocol b/iso/iso.protocol index 0e7d71b..cd2d1d2 100644 --- a/iso/iso.protocol +++ b/iso/iso.protocol @@ -7,5 +7,5 @@ output=filesystem reading=true source=true Icon=cd -Description=A kioslave for ISO9660 filesystems +Description=A tdeioslave for ISO9660 filesystems MimeType=application/x-iso diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 4ab5c53..060f1fd 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <kurl.h> #include <kmimetype.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kfilterdev.h> #include <kfilterbase.h> |