Rename many classes and header files to avoid conflicts with KDE4

4 files changed, 19 insertions, 19 deletions

diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index 6de9e90dc..2ea458449 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -61,20 +61,20 @@ WhatsThis=A TQCombo Box showing the installed system fonts (with preview)
 Group=Input (KDE)
 
 [TDEFontChooser]
-IncludeFile=kfontdialog.h
-IconSet=kfontcombo.png
+IncludeFile=tdefontdialog.h
+IconSet=tdefontcombo.png
 ToolTip=Font Chooser (KDE)
 WhatsThis=A font type, size and style selection widget complete with preview
 Group=Input (KDE)
 
 [TDEFontRequester]
-IncludeFile=kfontrequester.h
+IncludeFile=tdefontrequester.h
 ToolTip=Font Requester (KDE)
 WhatsThis=A compact font selection and preview widget
 Group=Input (KDE)
 
 [KGradientSelector]
-IncludeFile=kselect.h
+IncludeFile=tdeselect.h
 WhatsThis=A widget that allows the user to select two colors to form a gradient
 Group=Graphics (KDE)
 
@@ -115,7 +115,7 @@ ConstructorArgs=(parent, 0, name)
 
 [TDEListViewSearchLineWidget]
 ToolTip=ListView Search Line Widget (KDE)
-IncludeFile=klistviewsearchline.h
+IncludeFile=tdelistviewsearchline.h
 Group=Input (KDE)
 ConstructorArgs=(0, parent, name)
 
@@ -244,7 +244,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent)
 
 [TDEActionSelector]
-IncludeFile=kactionselector.h
+IncludeFile=tdeactionselector.h
 ToolTip=A widget for selecting and arranging actions/objects
 Group=Views (KDE)
 
diff --git a/kdewidgets/pics/CMakeLists.txt b/kdewidgets/pics/CMakeLists.txt
index b122c8b28..f398f174d 100644
--- a/kdewidgets/pics/CMakeLists.txt
+++ b/kdewidgets/pics/CMakeLists.txt
@@ -13,15 +13,15 @@
 
 install( FILES
     klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png
-    kfontrequester.png kurlrequester.png kcombobox.png kiconview.png
+    tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png
     kintspinbox.png kled.png ksqueezedtextlabel.png  kprogress.png
     kurllabel.png kruler.png tdecmodule.png kdoublespinbox.png
-    kdoublenuminput.png klistbox.png klistview.png kactivelabel.png
+    kdoublenuminput.png tdelistbox.png tdelistview.png kactivelabel.png
     kiconbutton.png kcolorcombo.png khsselector.png kcolorbutton.png
     kgradientselector.png kdualcolorbutton.png ktimewidget.png
     kpushbutton.png kcharselect.png kdatepicker.png
-    kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png
+    kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png
     kintnuminput.png krestrictedline.png ktextedit.png
     kurlcomborequester.png kkeybutton.png kpalettetable.png
-    kactionselector.png kdatetable.png kdatetimewidget.png
+    tdeactionselector.png kdatetable.png kdatetimewidget.png
   DESTINATION ${DATA_INSTALL_DIR}/kdewidgets/pics )
diff --git a/kdewidgets/pics/Makefile.am b/kdewidgets/pics/Makefile.am
index aeda8e4cb..0d4ee1e61 100644
--- a/kdewidgets/pics/Makefile.am
+++ b/kdewidgets/pics/Makefile.am
@@ -1,15 +1,15 @@
 kdewidgetsdata_DATA =  klineedit.png ktextbrowser.png kpasswordedit.png kdatewidget.png \
-             kfontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
+             tdefontrequester.png kurlrequester.png kcombobox.png kiconview.png kintspinbox.png \
              kled.png ksqueezedtextlabel.png  kprogress.png kurllabel.png \
              kruler.png tdecmodule.png kdoublespinbox.png kdoublenuminput.png \
-             klistbox.png klistview.png kactivelabel.png kiconbutton.png \
+             tdelistbox.png tdelistview.png kactivelabel.png kiconbutton.png \
              kcolorcombo.png khsselector.png kcolorbutton.png \
              kgradientselector.png kdualcolorbutton.png ktimewidget.png \
              kpushbutton.png kcharselect.png kdatepicker.png \
-             kdialog.png keditlistbox.png kfontcombo.png khistorycombo.png \
+             kdialog.png keditlistbox.png tdefontcombo.png khistorycombo.png \
              kintnuminput.png krestrictedline.png ktextedit.png \
              kurlcomborequester.png kkeybutton.png kpalettetable.png \
-	     kactionselector.png kdatetable.png kdatetimewidget.png 
+	     tdeactionselector.png kdatetable.png kdatetimewidget.png 
 
 
 kdewidgetsdatadir = $(kde_datadir)/kdewidgets/pics
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index 92874ec30..d223f8995 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -61,20 +61,20 @@ WhatsThis=A QCombo Box showing the installed system fonts (with preview)
 Group=Input (KDE)
 
 [TDEFontChooser]
-IncludeFile=kfontdialog.h
-IconSet=kfontcombo.png
+IncludeFile=tdefontdialog.h
+IconSet=tdefontcombo.png
 ToolTip=Font Chooser (KDE)
 WhatsThis=A font type, size and style selection widget complete with preview
 Group=Input (KDE)
 
 [TDEFontRequester]
-IncludeFile=kfontrequester.h
+IncludeFile=tdefontrequester.h
 ToolTip=Font Requester (KDE)
 WhatsThis=A compact font selection and preview widget
 Group=Input (KDE)
 
 [KGradientSelector]
-IncludeFile=kselect.h
+IncludeFile=tdeselect.h
 WhatsThis=A widget that allows the user to select two colors to form a gradient
 Group=Graphics (KDE)
 
@@ -233,7 +233,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent)
 
 [TDEActionSelector]
-IncludeFile=kactionselector.h
+IncludeFile=tdeactionselector.h
 ToolTip=A widget for selecting and arranging actions/objects
 Group=Views (KDE)