From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 win/pro_files/kabc/kabc.pro        |  4 ++--
 win/pro_files/kabc/vcard/vcard.pro |  4 ++--
 win/pro_files/kio/kio.pro          |  6 +++---
 win/pro_files/tdecore/tdecore.pro  | 10 +++++-----
 win/pro_files/tdeui/tdeui.pro      |  4 ++--
 win/tools/build_tdelibs_dbg        |  2 +-
 win/tools/build_tdelibs_rel        |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'win')

diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index 7e38e3c7d..b3eae05b4 100644
--- a/win/pro_files/kabc/kabc.pro
+++ b/win/pro_files/kabc/kabc.pro
@@ -8,8 +8,8 @@ LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUF
 	$$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX
 
-INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
-	$(KDELIBS)/kabc/vcardparser
+INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \
+	$(KDELIBS)/tdeabc/vcardparser
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro
index 8dedc015e..e2de8e6d7 100644
--- a/win/pro_files/kabc/vcard/vcard.pro
+++ b/win/pro_files/kabc/vcard/vcard.pro
@@ -7,8 +7,8 @@ DEFINES += MAKE_KVCARD_LIB
 
 LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX 
 
-INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
-	$(KDELIBS)/kabc/vcardparser
+INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \
+	$(KDELIBS)/tdeabc/vcardparser
 
 system( bash kmoc )
 system( bash kdcopidl )
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index da790d7d1..dc16d76b8 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -46,7 +46,7 @@ tdeio/kdcopservicestarter.cpp \
 tdeio/kdirlister.cpp \
 tdeio/kdirnotify.cpp \
 tdeio/kdirwatch.cpp \
-tdeio/kemailsettings.cpp \
+tdeio/tdeemailsettings.cpp \
 tdeio/tdefilefilter.cpp \
 tdeio/tdefileitem.cpp \
 tdeio/tdefilemetainfo.cpp \
@@ -59,7 +59,7 @@ tdeio/kmimetype.cpp \
 tdeio/kmimetypechooser.cpp \
 tdeio/knfsshare.cpp \
 tdeio/kprotocolinfo.cpp \
-tdeio/kprotocolmanager.cpp \
+tdeio/tdeprotocolmanager.cpp \
 tdeio/kremoteencoding.cpp \
 tdeio/krun.cpp \
 tdeio/ksambashare.cpp \
@@ -118,7 +118,7 @@ bookmarks/kbookmarkmenu.cc \
 \
 tdefile/kcombiview.cpp \
 tdefile/kcustommenueditor.cpp \
-tdefile/kdiroperator.cpp \
+tdefile/tdediroperator.cpp \
 tdefile/kdirselectdialog.cpp \
 tdefile/kdirsize.cpp \
 tdefile/kdiskfreesp.cpp \
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 7e564a250..fbc415726 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -49,9 +49,9 @@ kstandarddirs.cpp \
 tdeconfig.cpp \
 tdeconfigdialogmanager.cpp \
 kcharsets.cpp \
-kglobal.cpp \
+tdeglobal.cpp \
 kdebug.cpp \
-ktempfile.cpp \
+tdetempfile.cpp \
 ktempdir.cpp \
 ksavefile.cpp \
 tdeconfigbackend.cpp \
@@ -70,11 +70,11 @@ tdeshortcutmenu.cpp \
 tdeshortcutlist.cpp \
 kinstance.cpp \
 tdeversion.cpp \
-klocale.cpp \
+tdelocale.cpp \
 kicontheme.cpp \
 kiconloader.cpp \
 kiconeffect.cpp \
-kglobalsettings.cpp \
+tdeglobalsettings.cpp \
 kckey.cpp \
 kglobalaccel.cpp \
 kglobalaccel_win.cpp \
@@ -120,7 +120,7 @@ kqiodevicegzip_p.cpp
 #network/tdesocketdevice.cpp \
 #network/ksockssocketdevice.cpp
 
-#kstartupinfo.cpp \
+#tdestartupinfo.cpp \
 #todo: kextsock.cpp \
 #todo: ksock.cpp \
 #todo: ksocks.cpp \
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index b5a506f8b..aa1065c7d 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -71,7 +71,7 @@ tdelistview.cpp \
 tdelistviewsearchline.cpp \
 tdemainwindowiface.cpp \
 tdemainwindow.cpp \
-kmenubar.cpp \
+tdemenubar.cpp \
 knuminput.cpp \
 knumvalidator.cpp \
 kpanelapplet.cpp \
@@ -132,7 +132,7 @@ exists( kmessagebox_win.cpp ) {
  SOURCES += kmessagebox_win.cpp
 }
 !exists( kmessagebox_win.cpp ) {
- SOURCES += kmessagebox.cpp
+ SOURCES += tdemessagebox.cpp
 }
 
 # generated:
diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg
index 3fcfe0c20..79f3b0f32 100644
--- a/win/tools/build_tdelibs_dbg
+++ b/win/tools/build_tdelibs_dbg
@@ -48,7 +48,7 @@ tdecore \
 tdeui \
 kio \
 tderesources \
-kabc/vcard \
+tdeabc/vcard \
 kabc \
 tdeutils \
 tdeparts \
diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel
index 399dcadda..2fe77ef36 100644
--- a/win/tools/build_tdelibs_rel
+++ b/win/tools/build_tdelibs_rel
@@ -48,7 +48,7 @@ tdeui \
 kstyles/thinkeramik/widget-engine \
 kio \
 tderesources \
-kabc/vcard \
+tdeabc/vcard \
 kabc \
 tdeutils \
 tdeparts \
-- 
cgit v1.2.1