summaryrefslogtreecommitdiffstats
path: root/karbon
diff options
context:
space:
mode:
Diffstat (limited to 'karbon')
-rw-r--r--karbon/TODO2
-rw-r--r--karbon/commands/vcommand.cc2
-rw-r--r--karbon/karbon_tool_factory.h2
-rw-r--r--karbon/karbon_tool_registry.cc4
-rw-r--r--karbon/karbon_view.cc2
-rw-r--r--karbon/tools/vtexttool.cc4
-rw-r--r--karbon/vtool.h2
-rw-r--r--karbon/widgets/vcolorslider.cc2
-rw-r--r--karbon/widgets/vgradienttabwidget.cc2
-rw-r--r--karbon/widgets/vselecttoolbar.h2
10 files changed, 12 insertions, 12 deletions
diff --git a/karbon/TODO b/karbon/TODO
index 1c98b1da..c09f9a59 100644
--- a/karbon/TODO
+++ b/karbon/TODO
@@ -24,7 +24,7 @@ BIG TOPICS:
- help text
- options widget
- command
- - kaction?
+ - tdeaction?
2) selection redesign
- unify object and or node selection?
- achieve tight selection (exact selection-object collision test)
diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc
index a793115d..57826185 100644
--- a/karbon/commands/vcommand.cc
+++ b/karbon/commands/vcommand.cc
@@ -19,7 +19,7 @@
*/
-#include "kaction.h"
+#include "tdeaction.h"
#include "klocale.h"
#include "vcommand.h"
diff --git a/karbon/karbon_tool_factory.h b/karbon/karbon_tool_factory.h
index 1589f065..37339679 100644
--- a/karbon/karbon_tool_factory.h
+++ b/karbon/karbon_tool_factory.h
@@ -21,7 +21,7 @@
#ifndef KARBON_TOOL_FACTORY_H_
#define KARBON_TOOL_FACTORY_H_
-#include "kactioncollection.h"
+#include "tdeactioncollection.h"
#include "karbon_view.h"
#include <koffice_export.h>
#include <vtool.h>
diff --git a/karbon/karbon_tool_registry.cc b/karbon/karbon_tool_registry.cc
index 6c0506ae..bc699d45 100644
--- a/karbon/karbon_tool_registry.cc
+++ b/karbon/karbon_tool_registry.cc
@@ -19,8 +19,8 @@
*/
#include <kdebug.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
#include "vtool.h"
#include "karbon_part.h"
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 42d6f51b..432d243d 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -27,7 +27,7 @@
#include <tqpaintdevicemetrics.h>
#include <tqpainter.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcolordrag.h>
#include <klocale.h>
#include <kiconloader.h>
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index ca3ba1ea..50a81e15 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -31,8 +31,8 @@
#include <tqtabwidget.h>
#include <kdebug.h>
-#include <kfontcombo.h>
-#include <kfontdialog.h>
+#include <tdefontcombo.h>
+#include <tdefontdialog.h>
#include <kiconloader.h>
#include <knuminput.h>
#include <kglobalsettings.h>
diff --git a/karbon/vtool.h b/karbon/vtool.h
index 48533ec6..4b085cba 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -21,7 +21,7 @@
#define __VTOOL_H__
#include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <KoPoint.h>
#include <koffice_export.h>
diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc
index 25cb58e6..42c4f058 100644
--- a/karbon/widgets/vcolorslider.cc
+++ b/karbon/widgets/vcolorslider.cc
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tqlabel.h>
#include <knuminput.h>
-#include <kselect.h>
+#include <tdeselect.h>
#include "vcolorslider.h"
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index 22c58b43..8f0c4fc3 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -28,7 +28,7 @@
#include <knuminput.h>
#include <kcombobox.h>
#include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kiconloader.h>
#include "vgradientwidget.h"
diff --git a/karbon/widgets/vselecttoolbar.h b/karbon/widgets/vselecttoolbar.h
index 17a38981..5d33c766 100644
--- a/karbon/widgets/vselecttoolbar.h
+++ b/karbon/widgets/vselecttoolbar.h
@@ -22,7 +22,7 @@
#ifndef VSELECTTOOLBAR_H
#define VSELECTTOOLBAR_H
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
class KoUnitDoubleSpinBox;
class KarbonView;