Fix a number of tdebindings build issues

This partially resolves Bug 597
Thanks to Darrell Anderson for the patch!

12 files changed, 31 insertions, 35 deletions

diff --git a/configure.in.in b/configure.in.in
index a190718b..7dbc82d8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -302,4 +302,4 @@ dnl Check if knewstuff is present, if not don't bother..
 KDE_CHECK_KNS
 
 dnl remove when fixed
-DO_NOT_COMPILE="$DO_NOT_COMPILE dcopjava qtsharp"
+DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"
diff --git a/dcopc/configure.in.in b/dcopc/configure.in.in
index a1cac53e..56d3e9bc 100644
--- a/dcopc/configure.in.in
+++ b/dcopc/configure.in.in
@@ -1,7 +1,3 @@
-dnl if test "$GTK_CONFIG" = "no"; then 
-    DO_NOT_COMPILE="$DO_NOT_COMPILE dcopc"
-dnl fi
-dnl 
 dnl AC_CHECK_GETHOSTNAME
 
 AC_GTK_2
diff --git a/dcopperl/DCOP.xs b/dcopperl/DCOP.xs
index 7c6280dc..e5384478 100644
--- a/dcopperl/DCOP.xs
+++ b/dcopperl/DCOP.xs
@@ -26,11 +26,11 @@
 #undef vform
 #endif
 
-#include <qpoint.h>
-#include <qrect.h>
-#include <qregexp.h>
-#include <qsize.h>
-#include <qstringlist.h>
+#include <tqpoint.h>
+#include <tqrect.h>
+#include <tqregexp.h>
+#include <tqsize.h>
+#include <tqstringlist.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL
index 66121e65..fbd26f0a 100644
--- a/dcopperl/Makefile.PL
+++ b/dcopperl/Makefile.PL
@@ -4,30 +4,30 @@ use Config;
 # the contents of the Makefile that is written.
 
 print "Trying to find some configuration information...\n";
-my $kde_dirs = $ENV{TDEDIRS} || '/usr/local/kde';
-my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt';
-my $kde_inc = "$kde_dirs/include";
-my $kde_lib = "$kde_dirs/lib";
+my $tde_dirs = $ENV{TDEDIRS} || '/opt/trinity';
+my $qt_dir = $ENV{QTDIR} || '/opt/trinity/lib';
+my $tde_inc = "$tde_dirs/include";
+my $tde_lib = "$tde_dirs/lib";
 my $qt_inc = "$qt_dir/include";
 my $qt_lib = "$qt_dir/lib";
-$kde_inc = undef unless -f "$kde_inc/dcopclient.h"; 
-$kde_lib = undef unless -f "$kde_lib/libDCOP.$Config{dlext}";
+$tde_inc = undef unless -f "$tde_inc/dcopclient.h";
+$tde_lib = undef unless -f "$tde_lib/libDCOP.$Config{dlext}";
 $qt_dir = undef unless -f "$qt_inc/qglobal.h";
 
 print "Path to Qt headers? [$qt_inc]: ";
 chomp $input, $qt_inc = $input if (($input = <>) =~ /\S/);
 print "Path to Qt libraries? [$qt_lib]: ";
 chomp $input, $qt_lib = $input if (($input = <>) =~ /\S/);
-print "Path to KDE headers? [$kde_inc]: ";
-chomp $input, $kde_inc = $input if (($input = <>) =~ /\S/);
-print "Path to KDE libraries? [$kde_lib]: ";
-chomp $input, $kde_lib = $input if (($input = <>) =~ /\S/);
+print "Path to TDE headers? [$tde_inc]: ";
+chomp $input, $tde_inc = $input if (($input = <>) =~ /\S/);
+print "Path to TDE libraries? [$tde_lib]: ";
+chomp $input, $tde_lib = $input if (($input = <>) =~ /\S/);
 
 WriteMakefile(
     NAME	=> 'DCOP',
     VERSION_FROM => 'DCOP.pm',
-    INC		=> "-I$qt_inc -I$kde_inc",
-    LIBS	=> "-L$qt_lib -ltqt-mt -L$kde_lib -ltdecore -lDCOP",
+    INC		=> "-I$qt_inc -I$tde_inc -I/usr/include/tqt",
+    LIBS	=> "-L$qt_lib -ltqt-mt -L$tde_lib -ltdecore -lDCOP",
     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
     XSOPT	=> '-C++',
     CCFLAGS	=> '-x c++',
diff --git a/dcopperl/Makefile.PL.in b/dcopperl/Makefile.PL.in
index 3c5e0c18..a1b7b3e2 100644
--- a/dcopperl/Makefile.PL.in
+++ b/dcopperl/Makefile.PL.in
@@ -4,16 +4,16 @@ use Config;
 # the contents of the Makefile that is written.
 
 print "Trying to find some configuration information...\n";
-my $kde_inc = "@kde_includes@";
-my $kde_lib = "@kde_libraries@";
+my $tde_inc = "@tde_includes@";
+my $tde_lib = "@tde_libraries@";
 my $qt_inc = "@qt_includes@";
 my $qt_lib = "@qt_libraries@";
- 
+
 WriteMakefile(
     NAME	=> 'DCOP',
     VERSION_FROM => '@srcdir@/DCOP.pm',
-    INC		=> "-I$qt_inc -I$kde_inc",
-    LIBS	=> "-L$qt_lib -ltqt-mt -L$kde_lib -ltdecore -lDCOP",
+    INC		=> "-I$qt_inc -I$tde_inc -I/usr/include/tqt",
+    LIBS	=> "-L$qt_lib -ltqt-mt -L$tde_lib -ltdecore -lDCOP",
     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
     XSOPT	=> '-C++',
     CCFLAGS	=> '-x c++',
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index cf551fa0..7c3bffb3 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -2250,7 +2250,7 @@ BEGIN
 'TQWindowsStyle*' => 'qt_QWindowsStyle*',
 'TQWizard*' => 'qt_QWizard*',
 'TQWorkspace*' => 'qt_QWorkspace*',
-'TQXEmbed*'  =>  'qt_QXEmbed*' ,
+'QXEmbed*'  =>  'qt_QXEmbed*' ,
 'TQXmlAttributes&'  =>  'qt_QXmlAttributes*' ,
 'TQXmlAttributes*' => 'qt_QXmlAttributes*',
 'TQXmlContentHandler*'  =>  'qt_QXmlContentHandler*' ,
diff --git a/korundum/rubylib/examples/uimodules/uimisc.rb b/korundum/rubylib/examples/uimodules/uimisc.rb
index bbd0604f..1fda5fd9 100644
--- a/korundum/rubylib/examples/uimodules/uimisc.rb
+++ b/korundum/rubylib/examples/uimodules/uimisc.rb
@@ -259,7 +259,7 @@ def UIMisc.miscKThemeBase(parent)
     parent.currentPageObj = PageNotImpl.new(parent)
 end
 
-def UIMisc.miscTQXEmbed(parent)
+def UIMisc.miscQXEmbed(parent)
     parent.currentPageObj = PageNotImpl.new(parent)
 end
 
diff --git a/korundum/rubylib/examples/uisampler.rb b/korundum/rubylib/examples/uisampler.rb
index ea17fbf6..b24b59aa 100644
--- a/korundum/rubylib/examples/uisampler.rb
+++ b/korundum/rubylib/examples/uisampler.rb
@@ -112,7 +112,7 @@ $listItems = {"Dialogs" =>
                  "KDE::SharedPixmap" => [],
                  "KDE::SystemTray" => [],
                  "KDE::ThemeBase" => ["KDE::ThemeCache", "KDE::ThemePixmap", "KDE::ThemeStyle"],
-                 "TQXEmbed" => []}}
+                 "QXEmbed" => []}}
 
 BLANK_MSG = <<END_OF_STRING 
 <b>UISampler</b> - provides examples of <b>Korundum</b> widgets<p>
diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs
index 458de169..cb90c4b8 100644
--- a/qtsharp/src/generator/Printer.cs
+++ b/qtsharp/src/generator/Printer.cs
@@ -226,7 +226,7 @@ namespace QtCSharp {
 		{
 			if (check)
 				return "\n\n\t\t\tif ((qparent = parent) != null)\n" +
-					   "\t\t\t\parent.AddChild (this);\n";
+					   "\t\t\tparent.AddChild (this);\n";
 			else
 				return "";
 		}
diff --git a/xparts/configure.in.in b/xparts/configure.in.in
index 284c0cf5..0e54b28f 100644
--- a/xparts/configure.in.in
+++ b/xparts/configure.in.in
@@ -1 +1 @@
-DO_NOT_COMPILE="$DO_NOT_COMPILE xparts"
+# DO_NOT_COMPILE="$DO_NOT_COMPILE xparts"
diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp
index 79815337..8610c4c5 100644
--- a/xparts/src/kde/xparthost_kpart.cpp
+++ b/xparts/src/kde/xparthost_kpart.cpp
@@ -21,7 +21,7 @@ XPartHost_KPart::XPartHost_KPart( TQWidget *parentWidget, const char *widgetName
 {
     m_stub = 0;
     be = 0;
-    embed = new TQXEmbed(parentWidget, widgetName);
+    embed = new QXEmbed(parentWidget, widgetName);
     setWidget(embed);
 }
 
diff --git a/xparts/src/kde/xparthost_kpart.h b/xparts/src/kde/xparthost_kpart.h
index 0daf20f7..527178d2 100644
--- a/xparts/src/kde/xparthost_kpart.h
+++ b/xparts/src/kde/xparthost_kpart.h
@@ -7,7 +7,7 @@
 
 class XPart_stub;
 class KBrowserSignals;
-class TQXEmbed;
+class QXEmbed;
 
 
 /** 
@@ -68,7 +68,7 @@ private:
     DCOPRef m_part;
     XPart_stub *m_stub;
     KBrowserSignals *be;
-    TQXEmbed *embed;
+    QXEmbed *embed;
 };
 
 #endif