From 4aa698f778b36049a5d64b3087be47e35b7b1808 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 7 Nov 2024 22:53:46 +0900
Subject: [PATCH] Don't use obsolete header kapp.h and fix some renames

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 35a1f253290b150e19e90c4dd3254f51f0d3784c)
---
 doc/tde_app_devel/index.docbook                       |  2 +-
 languages/java/app_templates/kappjava/app_client.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
index f24131a9..32a16a42 100644
--- a/doc/tde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -1276,7 +1276,7 @@ As an example, we have a look at the "New File" button in a generic application:
 </para>
 <para>
 There, the part i18n("New File") provides a tool-tip message. It is enclosed by the i18n()
-macro provided by kapp.h to translate the tool-tip towards the currently selected language. 
+macro provided by tdeapplication.h to translate the tool-tip towards the currently selected language. 
 </para>
 <para>
 Tool-tips can also be added to any custom widget by using the <classname>QToolTip</classname> 
diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java
index ab327d4c..4b310179 100644
--- a/languages/java/app_templates/kappjava/app_client.java
+++ b/languages/java/app_templates/kappjava/app_client.java
@@ -2,10 +2,10 @@
  * Copyright (C) %{YEAR} %{AUTHOR} <%{EMAIL}>
  */
 
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <qdatastream.h>
-#include <qstring.h>
+#include <tqdatastream.h>
+#include <tqstring.h>
 
 int main(int argc, char **argv)
 {
@@ -16,8 +16,8 @@ int main(int argc, char **argv)
     client->attach();
 
     // do a 'send' for now
-    QByteArray data;
-    QDataStream ds(data, IO_WriteOnly);
+    TQByteArray data;
+    TQDataStream ds(data, IO_WriteOnly);
     if (argc > 1)
         ds << TQString(argv[1]);
     else