Rename many classes and header files to avoid conflicts with KDE4

5 files changed, 38 insertions, 38 deletions

diff --git a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
index 421267305..edd6007fd 100644
--- a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
+++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro
@@ -21,7 +21,7 @@ SOURCES = \
     tdetexteditor.cpp \
     editinterface.cpp editinterfaceext.cpp \
     clipboardinterface.cpp  selectioninterface.cpp searchinterface.cpp \
-    codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \
+    codecompletioninterface.cpp wordwrapinterface.cpp bloctdeselectioninterface.cpp \
     configinterface.cpp cursorinterface.cpp  dynwordwrapinterface.cpp \
     printinterface.cpp highlightinginterface.cpp markinterface.cpp \
     popupmenuinterface.cpp undointerface.cpp viewcursorinterface.cpp \
@@ -30,7 +30,7 @@ SOURCES = \
     searchdcopinterface.cpp  markinterfaceextension.cpp \
     configinterfaceextension.cpp encodinginterface.cpp sessionconfiginterface.cpp \
     viewstatusmsginterface.cpp  editorchooser.cpp \
-    blockselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
+    bloctdeselectiondcopinterface.cpp documentinfo.cpp documentdcopinfo.cpp\
     encodingdcopinterface.cpp \
     printdcopinterface.cpp  \
     undodcopinterface.cpp viewcursordcopinterface.cpp \
@@ -48,7 +48,7 @@ undodcopinterface_skel.cpp \
 printdcopinterface_skel.cpp \
 encodingdcopinterface_skel.cpp \
 documentdcopinfo_skel.cpp \
-blockselectiondcopinterface_skel.cpp \
+bloctdeselectiondcopinterface_skel.cpp \
 searchdcopinterface_skel.cpp \
 selectiondcopinterface_skel.cpp \
 clipboarddcopinterface_skel.cpp \
@@ -61,7 +61,7 @@ undodcopinterface_stub.cpp \
 printdcopinterface_stub.cpp \
 encodingdcopinterface_stub.cpp \
 documentdcopinfo_stub.cpp \
-blockselectiondcopinterface_stub.cpp \
+bloctdeselectiondcopinterface_stub.cpp \
 searchdcopinterface_stub.cpp \
 selectiondcopinterface_stub.cpp \
 clipboarddcopinterface_stub.cpp \
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index 15056d021..da790d7d1 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -145,8 +145,8 @@ tdefile/kopenwith.cpp \
 tdefile/kpreviewprops.cpp \
 tdefile/kpreviewwidgetbase.cpp \
 tdefile/kpropertiesdialog.cpp \
-tdefile/krecentdirs.cpp \
-tdefile/krecentdocument.cpp \
+tdefile/tderecentdirs.cpp \
+tdefile/tderecentdocument.cpp \
 tdefile/kurlbar.cpp \
 tdefile/kurlcombobox.cpp \
 tdefile/kurlrequester.cpp \
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 0e868d6f9..56db79c55 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -58,16 +58,16 @@ tdeconfigbackend.cpp \
 tdeconfigbase.cpp \
 tdeconfigskeleton.cpp \
 klockfile.cpp \
-kstdaccel.cpp \
+tdestdaccel.cpp \
 kcheckaccelerators.cpp \
 kkeyserver_x11.cpp \
 kkeynative_x11.cpp \
-kaccelbase.cpp \
-kaccel.cpp \
-kaccelmanager.cpp \
-kshortcut.cpp \
-kshortcutmenu.cpp \
-kshortcutlist.cpp \
+tdeaccelbase.cpp \
+tdeaccel.cpp \
+tdeaccelmanager.cpp \
+tdeshortcut.cpp \
+tdeshortcutmenu.cpp \
+tdeshortcutlist.cpp \
 kinstance.cpp \
 tdeversion.cpp \
 klocale.cpp \
@@ -78,7 +78,7 @@ kglobalsettings.cpp \
 kckey.cpp \
 kglobalaccel.cpp \
 kglobalaccel_win.cpp \
-kaccelaction.cpp \
+tdeaccelaction.cpp \
 kuniqueapplication.cpp \
 tdesycoca.cpp \
 tdesycocadict.cpp \
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index b6a0a44d2..f4bde24ec 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -18,10 +18,10 @@ SOURCES = \
 kaboutapplication.cpp \
 kaboutdialog.cpp \
 kaboutkde.cpp \
-kactionclasses.cpp \
-kactioncollection.cpp \
-kaction.cpp \
-kactionselector.cpp \
+tdeactionclasses.cpp \
+tdeactioncollection.cpp \
+tdeaction.cpp \
+tdeactionselector.cpp \
 kactivelabel.cpp \
 kanimwidget.cpp \
 karrowbutton.cpp \
@@ -52,9 +52,9 @@ keditcl1.cpp \
 keditcl2.cpp \
 keditlistbox.cpp \
 kedittoolbar.cpp \
-kfontcombo.cpp \
-kfontdialog.cpp \
-kfontrequester.cpp \
+tdefontcombo.cpp \
+tdefontdialog.cpp \
+tdefontrequester.cpp \
 kguiitem.cpp \
 khelpmenu.cpp \
 kiconview.cpp \
@@ -66,11 +66,11 @@ klanguagebutton.cpp \
 kled.cpp \
 klineedit.cpp \
 klineeditdlg.cpp \
-klistbox.cpp \
-klistview.cpp \
-klistviewsearchline.cpp \
-kmainwindowiface.cpp \
-kmainwindow.cpp \
+tdelistbox.cpp \
+tdelistview.cpp \
+tdelistviewsearchline.cpp \
+tdemainwindowiface.cpp \
+tdemainwindow.cpp \
 kmenubar.cpp \
 knuminput.cpp \
 knumvalidator.cpp \
@@ -83,16 +83,16 @@ kpassivepopup.cpp \
 kpixmapio.cpp \
 kpixmapregionselectordialog.cpp \
 kpixmapregionselectorwidget.cpp \
-kpopupmenu.cpp \
+tdepopupmenu.cpp \
 kprogress.cpp \
 kpushbutton.cpp \
 krestrictedline.cpp \
 krootpixmap.cpp \
 kruler.cpp \
 ksconfig.cpp \
-kselect.cpp \
+tdeselect.cpp \
 kseparator.cpp \
-kshortcutdialog.cpp \
+tdeshortcutdialog.cpp \
 tdespell.cpp \
 tdespelldlg.cpp \
 ksplashscreen.cpp \
@@ -107,10 +107,10 @@ ktabctl.cpp \
 ktextbrowser.cpp \
 ktextedit.cpp \
 ktip.cpp \
-ktoolbar.cpp \
-ktoolbarbutton.cpp \
-ktoolbarhandler.cpp \
-ktoolbarradiogroup.cpp \
+tdetoolbar.cpp \
+tdetoolbarbutton.cpp \
+tdetoolbarhandler.cpp \
+tdetoolbarradiogroup.cpp \
 kurllabel.cpp \
 kwhatsthismanager.cpp \
 twindowinfo.cpp \
@@ -137,12 +137,12 @@ exists( kmessagebox_win.cpp ) {
 
 # generated:
 SOURCES += \
-kmainwindowiface_stub.cpp \
-kmainwindowiface_skel.cpp
+tdemainwindowiface_stub.cpp \
+tdemainwindowiface_skel.cpp
 
 FORMS = \
-kshortcutdialog_advanced.ui \
-kshortcutdialog_simple.ui \
+tdeshortcutdialog_advanced.ui \
+tdeshortcutdialog_simple.ui \
 tdespellui.ui
 
 HEADERS =
diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h
index d8b4da08a..8e7d39d99 100644
--- a/win/tdelibs_global_win.h
+++ b/win/tdelibs_global_win.h
@@ -162,7 +162,7 @@ declared but not defined. The compiler was unable to find any destructors for th
 # pragma warning(disable: 4250)
 
 # pragma warning(disable: 4006) /*libxxx : warning LNK4006: 
-         ".... already defined in kaction.obj; second definition ignored" */
+         ".... already defined in tdeaction.obj; second definition ignored" */
 
 /* disable C4100: unreferenced formal parameter */
 # pragma warning(disable: 4100)