diff options
Diffstat (limited to 'kalyptus')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 12 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToSmoke.pm | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 2da2cc7..25c0afa 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -561,9 +561,9 @@ EOF EOF $qtjniExtras = <<EOF; -#include <qapplication.h> -#include <qstring.h> -#include <qcstring.h> +#include <ntqapplication.h> +#include <ntqstring.h> +#include <ntqcstring.h> JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_color0(JNIEnv* env, jclass cls) @@ -3098,14 +3098,14 @@ sub writeClassDoc } print JNISOURCE "\n"; - print JNISOURCE "#include <qtjava/QtSupport.h>\n"; + print JNISOURCE "#include <ntqtjava/QtSupport.h>\n"; if ($jniCode =~ /JavaSlot/) { - print JNISOURCE "#include <qtjava/JavaSlot.h>\n"; + print JNISOURCE "#include <ntqtjava/JavaSlot.h>\n"; } if ( $typeprefix eq "qt_" ) { - print JNISOURCE "#include <qtjava/$javaClassName" . ".h>\n"; + print JNISOURCE "#include <ntqtjava/$javaClassName" . ".h>\n"; } else { print JNISOURCE "#include <kdejava/KDESupport.h>\n"; print JNISOURCE "#include <kdejava/$javaClassName" . ".h>\n"; diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index e992ec0..6067499 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -919,13 +919,13 @@ my $fhn =1; # static map { for my $incl (keys %{$_->[2]}){ $includes{$incl}++ } } @code; # Hack - some Qt/KDE headers need other headers included, but omit suitable #includes - if (defined $includes{"qregexp.h"} || defined $includes{"qcstring.h"}) { - print $fh "#include <qregexp.h>\n"; - delete $includes{"qregexp.h"}; + if (defined $includes{"ntqregexp.h"} || defined $includes{"ntqcstring.h"}) { + print $fh "#include <ntqregexp.h>\n"; + delete $includes{"ntqregexp.h"}; } - if (defined $includes{"qmime.h"}) { - print $fh "#include <qurl.h>\n"; - delete $includes{"qurl.h"}; + if (defined $includes{"ntqmime.h"}) { + print $fh "#include <ntqurl.h>\n"; + delete $includes{"ntqurl.h"}; } if (defined $includes{"kshortcut.h"}) { print $fh "#include <kshortcut.h>\n"; @@ -946,9 +946,9 @@ my $fhn =1; # static print $fh "#include <$incl>\n"; } if ( $main::qt4 - and ( defined $includes{"qtreewidget.h"} - or defined $includes{"qlistwidget.h"} - or defined $includes{"qtablewidget.h"} ) ) + and ( defined $includes{"ntqtreewidget.h"} + or defined $includes{"ntqlistwidget.h"} + or defined $includes{"ntqtablewidget.h"} ) ) { print $fh "#include \"qwidgetitemdata_p.h\"\n"; } |