summaryrefslogtreecommitdiffstats
path: root/tdeio/tdeio/Makefile.am
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /tdeio/tdeio/Makefile.am
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeio/tdeio/Makefile.am')
-rw-r--r--tdeio/tdeio/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeio/tdeio/Makefile.am b/tdeio/tdeio/Makefile.am
index f0766f5c8..587cfe511 100644
--- a/tdeio/tdeio/Makefile.am
+++ b/tdeio/tdeio/Makefile.am
@@ -53,8 +53,8 @@ include_HEADERS = \
kshellcompletion.h tdefileitem.h tdefileshare.h ksambashare.h knfsshare.h \
kdirlister.h kservicegroup.h \
kimageio.h kdirnotify.h kdirnotify_stub.h \
- kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
- kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
+ kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h \
+ kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h kdatatool.h \
karchive.h tdefilefilter.h tdefilemetainfo.h renamedlgplugin.h \
kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
kmimetypechooser.h
@@ -67,7 +67,7 @@ include_HEADERS += kacl.h
libtdeiocore_la_SOURCES = authinfo.cpp \
kshred.cpp \
- kprotocolmanager.cpp \
+ tdeprotocolmanager.cpp \
slave.cpp slaveinterface.cpp observer.stub \
sessiondata.cpp scheduler.cpp \
connection.cpp \
@@ -81,7 +81,7 @@ libtdeiocore_la_SOURCES = authinfo.cpp \
statusbarprogress.cpp \
kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp \
observer.cpp uiserver.stub observer.skel \
- kemailsettings.cpp \
+ tdeemailsettings.cpp \
kprotocolinfo.cpp \
renamedlg.cpp skipdlg.cpp kremoteencoding.cpp \
kmimetypechooser.cpp