Rename many classes and header files to avoid conflicts with KDE4

8 files changed, 14 insertions, 14 deletions

diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
index b0a9851e..126352b8 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
@@ -31,7 +31,7 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kis_canvas_subject.h>
 #include <kis_iterators_pixel.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
index 8b54f7da..97e2f2ac 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
@@ -67,7 +67,7 @@ ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStr
 
         // Selection manager takes ownership?
         TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection");
-        TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection");
+        TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrintdeselection");
         TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection");
 
         TQ_CHECK_PTR(a);
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.rc b/chalk/plugins/viewplugins/modify_selection/modify_selection.rc
index 999aaaaa..6870e045 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.rc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.rc
@@ -3,7 +3,7 @@
     <MenuBar>
         <Menu name="Select"><text>&amp;Select</text>
             <Action name="growselection"/>
-            <Action name="shrinkselection"/>
+            <Action name="shrintdeselection"/>
             <Action name="borderselection"/>
         </Menu>
     </MenuBar>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index e3c4d680..bcb0bf03 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -28,10 +28,10 @@
 #include <tqclipboard.h>
 #include <tqvbox.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <knotifyclient.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstartupinfo.h>
 
diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
index 20333271..295f6980 100644
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@@ -5,23 +5,23 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-kde_module_LTLIBRARIES = chalkselectopaque.la
+kde_module_LTLIBRARIES = chaltdeselectopaque.la
 
-chalkselectopaque_la_SOURCES = selectopaque.cc 
+chaltdeselectopaque_la_SOURCES = selectopaque.cc 
 noinst_HEADERS = selectopaque.h
 
-chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+chaltdeselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
 	../../../../chalk/chalkcolor/libchalkcolor.la \
 	../../../../chalk/core/libchalkimage.la \
 	../../../../chalk/ui/libchalkui.la
-chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
+chaltdeselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
 
 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = selectopaque.rc
 EXTRA_DIST = $(chalkrc_DATA)
 
-kde_services_DATA = chalkselectopaque.desktop
+kde_services_DATA = chaltdeselectopaque.desktop
 
-chalkselectopaque_la_METASOURCES = AUTO
+chaltdeselectopaque_la_METASOURCES = AUTO
 
 KDE_OPTIONS = nofinal
diff --git a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
index 654e809c..db8e883c 100644
--- a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
+++ b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop
@@ -22,5 +22,5 @@ Name[uk]=Виділення непрозорих ділянок
 Name[zh_TW]=選擇不透明
 ServiceTypes=Chalk/ViewPlugin
 Type=Service
-X-TDE-Library=chalkselectopaque
+X-TDE-Library=chaltdeselectopaque
 X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
index 57e32dce..ced4fd9a 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
@@ -51,7 +51,7 @@
 #include "selectopaque.h"
 
 typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory;
-K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdeselectopaque, SelectOpaqueFactory( "chalk" ) )
 
 SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &)
     : KParts::Plugin(parent, name)
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
index a4809d59..6ff21abf 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="chalkselectopaque" version="1">
+<kpartgui library="chaltdeselectopaque" version="1">
 <MenuBar>
     <Menu name="Select"><text>Select</text>
 	<Separator/>