3 files changed, 22 insertions, 22 deletions
diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java
index 40bc6b93..00202b9d 100644
--- a/languages/java/app_templates/kappjava/app.java
+++ b/languages/java/app_templates/kappjava/app.java
@@ -43,10 +43,10 @@ public class %{APPNAME} extends TDEMainWindow
     setupGUI();
 	
     // allow the view to change the statusbar and caption
-    connect(m_view, SIGNAL("signalChangeStatusbar(String)"),
-            this,   SLOT("changeStatusbar(String)"));
-    connect(m_view, SIGNAL("signalChangeCaption(String)"),
-            this,   SLOT("changeCaption(String)"));
+    connect(m_view, TQ_SIGNAL("signalChangeStatusbar(String)"),
+            this,   TQ_SLOT("changeStatusbar(String)"));
+    connect(m_view, TQ_SIGNAL("signalChangeCaption(String)"),
+            this,   TQ_SLOT("changeCaption(String)"));
 
 }
 
@@ -76,20 +76,20 @@ public void load(KURL url)
 
 public void setupActions()
 {
-    TDEApplication kapp = TDEApplication.kApplication();
-    KStdAction.openNew(this, SLOT("fileNew()"), actionCollection());
-    KStdAction.open(this, SLOT("fileOpen()"), actionCollection());
-    KStdAction.save(this, SLOT("fileSave()"), actionCollection());
-    KStdAction.saveAs(this, SLOT("fileSaveAs()"), actionCollection());
-    KStdAction.print(this, SLOT("filePrint()"), actionCollection());
-    KStdAction.quit(kapp, SLOT("quit()"), actionCollection());
+    TDEApplication tdeApp = TDEApplication.tdeApplication();
+    KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection());
+    KStdAction.open(this, TQ_SLOT("fileOpen()"), actionCollection());
+    KStdAction.save(this, TQ_SLOT("fileSave()"), actionCollection());
+    KStdAction.saveAs(this, TQ_SLOT("fileSaveAs()"), actionCollection());
+    KStdAction.print(this, TQ_SLOT("filePrint()"), actionCollection());
+    KStdAction.quit(tdeApp, TQ_SLOT("quit()"), actionCollection());
 
-    KStdAction.preferences(this, SLOT("optionsPreferences()"), actionCollection());
+    KStdAction.preferences(this, TQ_SLOT("optionsPreferences()"), actionCollection());
 
     // this doesn't do anything useful.  it's just here to illustrate
     // how to insert a custom menu and menu item
     TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(),
-                                  this, SLOT("optionsPreferences()"),
+                                  this, TQ_SLOT("optionsPreferences()"),
                                   actionCollection(), "custom_action");
 }
 
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
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index 0d79ac31..4a1e9f84 100644
--- a/languages/java/app_templates/kappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
@@ -71,10 +71,10 @@ public %{APPNAME}View(TQWidget parent)
         return;
     }
 
-    connect(m_html, SIGNAL("setWindowCaption(String)"),
-            this,   SLOT("slotSetTitle(String)"));
-    connect(m_html, SIGNAL("setStatusBarText(String)"),
-            this,   SLOT("slotOnURL(String)"));
+    connect(m_html, TQ_SIGNAL("setWindowCaption(String)"),
+            this,   TQ_SLOT("slotSetTitle(String)"));
+    connect(m_html, TQ_SIGNAL("setStatusBarText(String)"),
+            this,   TQ_SLOT("slotOnURL(String)"));
 
 }