summaryrefslogtreecommitdiffstats
path: root/chalk/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/ui')
-rw-r--r--chalk/ui/kis_controlframe.cc6
-rw-r--r--chalk/ui/kis_controlframe.h2
-rw-r--r--chalk/ui/kis_filter_manager.cc2
-rw-r--r--chalk/ui/kis_filter_manager.h2
-rw-r--r--chalk/ui/kis_gradient_slider_widget.cc2
-rw-r--r--chalk/ui/kis_grid_manager.cpp2
-rw-r--r--chalk/ui/kis_layerbox.cc2
-rw-r--r--chalk/ui/kis_layerlist.cc2
-rw-r--r--chalk/ui/kis_paintop_box.cc4
-rw-r--r--chalk/ui/kis_palette_view.cc2
-rw-r--r--chalk/ui/kis_palette_widget.cc2
-rw-r--r--chalk/ui/kis_perspective_grid_manager.cpp2
-rw-r--r--chalk/ui/kis_selection_manager.cc2
-rw-r--r--chalk/ui/kis_text_brush.cc2
-rw-r--r--chalk/ui/kis_tool.cc2
-rw-r--r--chalk/ui/kis_tool.h2
-rw-r--r--chalk/ui/kis_tool_dummy.cc4
-rw-r--r--chalk/ui/kis_tool_factory.h2
-rw-r--r--chalk/ui/kis_tool_freehand.cc2
-rw-r--r--chalk/ui/kis_tool_registry.cc2
-rw-r--r--chalk/ui/kis_view.cc6
-rw-r--r--chalk/ui/kobirdeyepanel.cpp4
-rw-r--r--chalk/ui/layerlist.cpp2
-rw-r--r--chalk/ui/layerlist.h2
-rw-r--r--chalk/ui/wdgbirdeye.ui4
25 files changed, 33 insertions, 33 deletions
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index 2d0dd8564..f4af08a14 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -29,14 +29,14 @@
#include <tqwidget.h>
#include <tqevent.h>
-#include <ktoolbar.h>
-#include <kmainwindow.h>
+#include <tdetoolbar.h>
+#include <tdemainwindow.h>
#include <kglobalsettings.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <klocale.h>
#include <koFrameButton.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
#include "kis_resourceserver.h"
#include "kis_controlframe.h"
diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h
index d052fc77c..1c07b0669 100644
--- a/chalk/ui/kis_controlframe.h
+++ b/chalk/ui/kis_controlframe.h
@@ -24,7 +24,7 @@
#include <tqpopupmenu.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <koFrameButton.h>
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index 4428b0f4f..b7b84d881 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -26,7 +26,7 @@
#include <kguiitem.h>
#include <kis_cursor.h>
-#include "kaction.h"
+#include "tdeaction.h"
#include "kis_part_layer.h"
#include "kis_id.h"
diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h
index 602ebd8ad..f39e31b22 100644
--- a/chalk/ui/kis_filter_manager.h
+++ b/chalk/ui/kis_filter_manager.h
@@ -23,7 +23,7 @@
#include "tqobject.h"
#include "tqptrlist.h"
#include "tqsignalmapper.h"
-#include "kactionclasses.h"
+#include "tdeactionclasses.h"
#include "kis_image.h"
#include "kis_selection.h"
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 531b320e8..3325517a3 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include "kis_autogradient_resource.h"
diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp
index 83969e78c..04adc0c22 100644
--- a/chalk/ui/kis_grid_manager.cpp
+++ b/chalk/ui/kis_grid_manager.cpp
@@ -30,7 +30,7 @@
#include <tqradiobutton.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdialogbase.h>
#include <klocale.h>
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 34a5e411b..e5b8dea4f 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -38,7 +38,7 @@
#include <kdebug.h>
#include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <kiconloader.h>
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 3f1ff0181..4fdd9f1f0 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -21,7 +21,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <KoPartSelectAction.h>
#include <tqimage.h>
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 9751e2462..b2fcc2124 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -25,12 +25,12 @@
#include <tqtooltip.h>
#include <klocale.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
#include <kglobalsettings.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index 398c3b8ae..487195ddf 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -42,7 +42,7 @@
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kseparator.h>
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index 2719fab2f..ec3558b82 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -39,7 +39,7 @@
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kseparator.h>
diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp
index 174e13950..dae4bd464 100644
--- a/chalk/ui/kis_perspective_grid_manager.cpp
+++ b/chalk/ui/kis_perspective_grid_manager.cpp
@@ -20,7 +20,7 @@
#include "kis_perspective_grid_manager.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index 718dbf029..ca17d1adf 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -23,7 +23,7 @@
#include <tqcursor.h>
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kstdaction.h>
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc
index db5e8c462..8666f1a19 100644
--- a/chalk/ui/kis_text_brush.cc
+++ b/chalk/ui/kis_text_brush.cc
@@ -22,7 +22,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <klineedit.h>
#include "kis_text_brush.h"
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index 807b8ffcc..53b8fceeb 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -18,7 +18,7 @@
#include <tqwidget.h>
#include <tqstring.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqlabel.h>
#include <klocale.h>
diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h
index 45f3fbd12..c217e3071 100644
--- a/chalk/ui/kis_tool.h
+++ b/chalk/ui/kis_tool.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
#include <ksharedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "kis_shared_ptr_vector.h"
#include "kis_canvas_observer.h"
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index 743113915..eb961b33b 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -18,10 +18,10 @@
#include <tqwidget.h>
#include <tqstring.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqlabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include "kis_canvas_controller.h"
diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h
index 24cf5d727..bc5171a8a 100644
--- a/chalk/ui/kis_tool_factory.h
+++ b/chalk/ui/kis_tool_factory.h
@@ -23,7 +23,7 @@
#include "kis_id.h"
#include "kis_types.h"
-#include "kactioncollection.h"
+#include "tdeactioncollection.h"
class KisToolFactory : public TDEShared
{
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index a44acfbc4..fe6ac1a21 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -25,7 +25,7 @@
#include <tqrect.h>
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcommand.h>
#include <klocale.h>
diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc
index 32e57e129..036e538fc 100644
--- a/chalk/ui/kis_tool_registry.cc
+++ b/chalk/ui/kis_tool_registry.cc
@@ -17,7 +17,7 @@
*/
#include "kdebug.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 357be9d2a..dd406ac75 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -45,7 +45,7 @@
#include <kis_meta_registry.h>
#include <kglobalsettings.h>
#include <dcopobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcolordialog.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
@@ -58,10 +58,10 @@
#include <kstdaction.h>
#include <kinputdialog.h>
#include <kurldrag.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kdebug.h>
#include <ksharedptr.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 3db739d41..5b1d4442f 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -29,8 +29,8 @@
#include <kdebug.h>
#include <kglobalsettings.h>
-#include <kaction.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
#include <knuminput.h>
#include <klocale.h>
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 790765b44..6db5a21ad 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -37,7 +37,7 @@
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstringhandler.h>
class LayerItemIterator: public TQListViewItemIterator
diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index b51a1c682..03284849a 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -22,7 +22,7 @@
#define LAYERLIST_H
#include <tqiconset.h>
-#include <klistview.h>
+#include <tdelistview.h>
class TQMouseEvent;
class TQString;
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index 0f18a51b8..fcc464a95 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -267,7 +267,7 @@
<customwidgets>
<customwidget>
<class>TDEToolBar</class>
- <header location="local">ktoolbar.h</header>
+ <header location="local">tdetoolbar.h</header>
<sizehint>
<width>20</width>
<height>100</height>
@@ -298,7 +298,7 @@
<pixmapfunction>BarIcon</pixmapfunction>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>ktoolbar.h</includehint>
+ <includehint>tdetoolbar.h</includehint>
<includehint>knuminput.h</includehint>
</includehints>
</UI>