summaryrefslogtreecommitdiffstats
path: root/lib/kross
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kross')
-rw-r--r--lib/kross/api/eventaction.cpp2
-rw-r--r--lib/kross/api/eventaction.h2
-rw-r--r--lib/kross/main/mainmodule.h2
-rw-r--r--lib/kross/main/scriptaction.h2
-rw-r--r--lib/kross/main/scriptguiclient.cpp2
-rw-r--r--lib/kross/main/wdgscriptsmanager.cpp4
-rw-r--r--lib/kross/main/wdgscriptsmanagerbase.ui6
-rw-r--r--lib/kross/python/cxx/cxx_extensions.cxx2
-rw-r--r--lib/kross/test/testaction.h4
-rw-r--r--lib/kross/test/testwindow.cpp2
-rw-r--r--lib/kross/test/testwindow.h2
11 files changed, 15 insertions, 15 deletions
diff --git a/lib/kross/api/eventaction.cpp b/lib/kross/api/eventaction.cpp
index 7578eb30..89a115f6 100644
--- a/lib/kross/api/eventaction.cpp
+++ b/lib/kross/api/eventaction.cpp
@@ -21,7 +21,7 @@
#include "variant.h"
//#include <tqobject.h>
-//#include <kaction.h>
+//#include <tdeaction.h>
using namespace Kross::Api;
diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h
index 602a697f..1561957d 100644
--- a/lib/kross/api/eventaction.h
+++ b/lib/kross/api/eventaction.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
//#include <tqobject.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <ksharedptr.h>
#include "event.h"
diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h
index 06a4836d..6465a070 100644
--- a/lib/kross/main/mainmodule.h
+++ b/lib/kross/main/mainmodule.h
@@ -34,7 +34,7 @@
#include <tqobject.h>
#include <ksharedptr.h>
-#include <kaction.h>
+#include <tdeaction.h>
namespace Kross { namespace Api {
diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h
index 4d60d4dc..ce6544bc 100644
--- a/lib/kross/main/scriptaction.h
+++ b/lib/kross/main/scriptaction.h
@@ -21,7 +21,7 @@
#define KROSS_API_SCRIPTACTION_H
#include <tqdom.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "scriptcontainer.h"
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 9dd304ae..ae449a42 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -23,7 +23,7 @@
#include "wdgscriptsmanager.h"
#include <kapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kmimetype.h>
#include <kmessagebox.h>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index de653fbd..4cbae081 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -28,12 +28,12 @@
#include <tdeversion.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
#if KDE_IS_VERSION(3, 4, 0)
// The KNewStuffSecure we use internaly for the GetHotNewStuff-functionality
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index 116b1ca3..1c9e7247 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -213,7 +213,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>
@@ -235,8 +235,8 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>klistview.h</includehint>
- <includehint>ktoolbar.h</includehint>
+ <includehint>tdelistview.h</includehint>
+ <includehint>tdetoolbar.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/lib/kross/python/cxx/cxx_extensions.cxx b/lib/kross/python/cxx/cxx_extensions.cxx
index f9c942ad..eb9bd450 100644
--- a/lib/kross/python/cxx/cxx_extensions.cxx
+++ b/lib/kross/python/cxx/cxx_extensions.cxx
@@ -316,7 +316,7 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam
#if PY_MAJOR_VERSION > 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 1)
// first defined in 2.1
table->tp_richcompare = 0L;
- table->tp_weaklistoffset = 0L;
+ table->tp_weatdelistoffset = 0L;
#else
table->tp_xxx7 = 0L;
table->tp_xxx8 = 0L;
diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h
index 32e6cdcd..8e2d355e 100644
--- a/lib/kross/test/testaction.h
+++ b/lib/kross/test/testaction.h
@@ -26,8 +26,8 @@
#include <tqwidget.h>
#include <tqstring.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
class TestAction : public TQWidget
{
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index f83d7ace..4175bc9e 100644
--- a/lib/kross/test/testwindow.cpp
+++ b/lib/kross/test/testwindow.cpp
@@ -30,7 +30,7 @@
#include <ktextedit.h>
#include <kpushbutton.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kmenubar.h>
#include <kstandarddirs.h>
diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h
index c3da5cc5..45f14de0 100644
--- a/lib/kross/test/testwindow.h
+++ b/lib/kross/test/testwindow.h
@@ -28,7 +28,7 @@
//#include <tqobject.h>
#include <tqstring.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class TQComboBox;
class KTextEdit;