From 225aca6edcb3be930e4dda017e64e42dd2235a27 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 2 Nov 2024 13:14:46 +0900
Subject: Fix FTBFS caused by removal of tqtinterface

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kalyptus/kalyptusCxxToJNI.pm  | 10 +++++-----
 kalyptus/kalyptusCxxToJava.pm | 10 +++++-----
 kalyptus/kalyptusDataDict.pm  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kalyptus')

diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 332b44de..61d31c7a 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -439,7 +439,7 @@ EOF
 	$qtExtras = <<EOF;
 	/** This member allows a typecast of an instance which wraps a Qt instance,
 		to a more specialized type. Invokes the private qtjava.dynamicCast()
-		via reflection, as that method isn't part of the public Qt api */
+		via reflection, as that method isn't part of the public TQt api */
 	public static QtSupport dynamicCast(String type, QtSupport source) {
 		Method		method = null;
 		
@@ -447,7 +447,7 @@ EOF
 			method = qtjava.class.getDeclaredMethod(	"dynamicCast",
 														new Class[] { String.class, QtSupport.class } );
 		} catch (NoSuchMethodException e1) {
-			Qt.tqWarning("No such method : qtjava.dynamicCast()");
+			TQt.tqWarning("No such method : qtjava.dynamicCast()");
 		}
 
 		try {
@@ -455,10 +455,10 @@ EOF
 			Object result = method.invoke(qtjava.class, new Object[] { type, source } );
 			return (QtSupport) result;
 		} catch (InvocationTargetException e) {
-			Qt.tqWarning("Invocation failed : qtjava.dynamicCast()");
+			TQt.tqWarning("Invocation failed : qtjava.dynamicCast()");
 			return null;
 		} catch (IllegalAccessException e) {
-			Qt.tqWarning("Invocation failed : qtjava.dynamicCast()");
+			TQt.tqWarning("Invocation failed : qtjava.dynamicCast()");
 			return null;
 		}
 	}
@@ -2886,7 +2886,7 @@ sub writeClassDoc
 			# Special case these two classes as they have methods that use ArrayList added as 'extras'
 	    	print CLASS "import java.util.ArrayList;\n";
 		}
-	    print CLASS "import org.trinitydesktop.qt.Qt;\n";
+	    print CLASS "import org.trinitydesktop.qt.TQt;\n";
 	}
 	
 	if ( kalyptusDataDict::interfacemap($javaClassName) ne () ) {
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index b75b9fb2..aca7339b 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -234,7 +234,7 @@ EOF
 	$qtExtras = <<EOF;
 	/** This member allows a typecast of an instance which wraps a Qt instance,
 		to a more specialized type. Invokes the private qtjava.dynamicCast()
-		via reflection, as that method isn't part of the public Qt api */
+		via reflection, as that method isn't part of the public TQt api */
 	public static QtSupport dynamicCast(String type, QtSupport source) {
 		Method		method = null;
 		
@@ -242,7 +242,7 @@ EOF
 			method = qtjava.class.getDeclaredMethod(	"dynamicCast",
 														new Class[] { String.class, QtSupport.class } );
 		} catch (NoSuchMethodException e1) {
-			Qt.tqWarning("No such method : qtjava.dynamicCast()");
+			TQt.tqWarning("No such method : qtjava.dynamicCast()");
 		}
 
 		try {
@@ -250,10 +250,10 @@ EOF
 			Object result = method.invoke(qtjava.class, new Object[] { type, source } );
 			return (QtSupport) result;
 		} catch (InvocationTargetException e) {
-			Qt.tqWarning("Invocation failed : qtjava.dynamicCast()");
+			TQt.tqWarning("Invocation failed : qtjava.dynamicCast()");
 			return null;
 		} catch (IllegalAccessException e) {
-			Qt.tqWarning("Invocation failed : qtjava.dynamicCast()");
+			TQt.tqWarning("Invocation failed : qtjava.dynamicCast()");
 			return null;
 		}
 	}
@@ -1175,7 +1175,7 @@ sub writeClassDoc
 			# Special case these two classes as they have methods that use ArrayList added as 'extras'
 	    	print CLASS "import java.util.ArrayList;\n";
 		}
-	    print CLASS "import org.trinitydesktop.qt.Qt;\n";
+	    print CLASS "import org.trinitydesktop.qt.TQt;\n";
 	}
 	
 	if ( kalyptusDataDict::interfacemap($javaClassName) ne () ) {
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 55188a9d..744f9907 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -2271,7 +2271,7 @@ BEGIN
 'TQ_UINT8*'  =>  'unsigned char*' ,
 'TQ_ULONG&' => 'long',
 'TQ_ULONG' => 'long',
-'Qt*'  =>  'qt_Qt*' ,
+'TQt*'  =>  'qt_Qt*' ,
 'TQt::ArrowType'  =>  'int' ,
 'TQt::BackgroundMode' => 'int',
 'TQt::DateFormat' => 'int',
-- 
cgit v1.2.1